From 9a4305cae10d64af3f9c5bdf5b35d5cb43ba02d3 Mon Sep 17 00:00:00 2001 From: Alexandre Mestiashvili Date: Fri, 12 Oct 2018 09:00:27 +0100 Subject: [PATCH] Import libzstd_1.3.5+dfsg-2.debian.tar.xz [dgit import tarball libzstd 1.3.5+dfsg-2 libzstd_1.3.5+dfsg-2.debian.tar.xz] --- README.Debian | 6 + README.source | 1 + changelog | 262 ++++++++++++++++++ compat | 1 + control | 60 ++++ copyright | 132 +++++++++ libzstd-dev.examples | 1 + libzstd1.symbols | 196 +++++++++++++ ...ng-zstd-list-When-stdin-is-not-a-tty.patch | 70 +++++ ...se-bash-for-test-script-portablitity.patch | 16 ++ patches/0008-Address-embedded-zlib.patch | 45 +++ patches/0013-skip-memory-greedy-tests.patch | 37 +++ patches/0014-Reproducible-build.patch | 16 ++ patches/series | 5 + rules | 50 ++++ source/format | 1 + tests/control | 1 + watch | 4 + zstd.docs | 2 + zstd.install | 2 + zstd.lintian-overrides | 5 + zstd.manpages | 1 + 22 files changed, 914 insertions(+) create mode 100644 README.Debian create mode 100644 README.source create mode 100644 changelog create mode 100644 compat create mode 100644 control create mode 100644 copyright create mode 100644 libzstd-dev.examples create mode 100644 libzstd1.symbols create mode 100644 patches/0001-Allow-Invoking-zstd-list-When-stdin-is-not-a-tty.patch create mode 100644 patches/0006-Use-bash-for-test-script-portablitity.patch create mode 100644 patches/0008-Address-embedded-zlib.patch create mode 100644 patches/0013-skip-memory-greedy-tests.patch create mode 100644 patches/0014-Reproducible-build.patch create mode 100644 patches/series create mode 100755 rules create mode 100644 source/format create mode 100644 tests/control create mode 100644 watch create mode 100644 zstd.docs create mode 100644 zstd.install create mode 100644 zstd.lintian-overrides create mode 100644 zstd.manpages diff --git a/README.Debian b/README.Debian new file mode 100644 index 0000000..5341295 --- /dev/null +++ b/README.Debian @@ -0,0 +1,6 @@ +1.2.0-1 +------- + +some patches have been removed, makefile had a lot of changes, +the long running tests skip patch has been removed but may need +further investigation to see if it is still needed. diff --git a/README.source b/README.source new file mode 100644 index 0000000..50aef85 --- /dev/null +++ b/README.source @@ -0,0 +1 @@ +The examples were removed from the upstream tarball due to #869581 diff --git a/changelog b/changelog new file mode 100644 index 0000000..f4d74c5 --- /dev/null +++ b/changelog @@ -0,0 +1,262 @@ +libzstd (1.3.5+dfsg-2) unstable; urgency=medium + + * Add udeb package for libzstd1, Closes: #908834 + * Bump Policy to 4.2.1 + * Call dh_makeshlibs with -V 'libzstd1 (>= 1.3.5)', since this version + introduced new public symbols + + -- Alexandre Mestiashvili Fri, 12 Oct 2018 08:00:27 +0000 + +libzstd (1.3.5+dfsg-1) unstable; urgency=medium + + [ Alexandre Mestiashvili ] + * Add attribuition for the patch + * Fix varying number of threads in pzstd man page, making build reproducible + * New upstream version 1.3.5+dfsg + * Refresh and drop patches applied by upstream + * Update d/zstd.lintian-overrides + + [ Balint Reczey ] + * Update symbols file + * Allow Invoking `zstd --list` When `stdin` is not a `tty` + + -- Alexandre Mestiashvili Fri, 21 Sep 2018 18:46:28 +0000 + +libzstd (1.3.4+dfsg-3) unstable; urgency=medium + + * Add patch provided by Chris Lamb making build reproducible, + Closes: #897904 + * Update patch skipping heavy tests on mips(el) and hurd + * Add patch fixing tests on GNU/Hurd + * Drop not needed override_dh_auto_test + + -- Alexandre Mestiashvili Wed, 09 May 2018 19:25:10 +0200 + +libzstd (1.3.4+dfsg-2) unstable; urgency=medium + + * Add liblzma-dev and liblz4-dev to build-depends to enable xz and lz4 support + * Patch tests to avoid FTBFS on mips(el) architectures + * Use help2man for pzstd man page, drop patches providing obsolete man pages + * Update zstd.lintian-overrides, add more binaries without man pages + * Add override for dh_auto_test, on hurd run only simple tests + * Update 0012-typos.patch, forward to upstream + + -- Alexandre Mestiashvili Wed, 02 May 2018 15:43:16 +0200 + +libzstd (1.3.4+dfsg-1) unstable; urgency=medium + + * Team upload. + + [ Alexandre Mestiashvili ] + * New upstream version 1.3.4+dfsg + * Refresh patches, remove indexes + * Update d/libzstd1.symbols fixing minimal-version + * Update d/copyright, starting from 1.3.1 patent claim is removed + * Add comments to unstable symbols + + [ Mattia Rizzolo ] + * Update copyright after the new upstream release. + + [ Sascha Steinbiss ] + * Remove obsolete patch. + * Reword patch description. + + -- Alexandre Mestiashvili Wed, 25 Apr 2018 10:39:39 +0200 + +libzstd (1.3.3+dfsg-2) unstable; urgency=medium + + * Team upload. + + [ Dimitri John Ledkov ] + * Mark -dev and library packages Multi-Arch same. + * Update Vcs fields for salsa. + * Cleanup unused patches. + + [ Andreas Hasenack ] + * d/rules: also run the clean Makefile target in the pzstd directory. + + [ Alexandre Mestiashvili ] + * d/control: Update my email address. + * d/rules: + + Disable tests if DEB_BUILD_OPTIONS set to nocheck. + + Use dh_auto_build instead of $(MAKE) to avoid cross build failures. + Thanks to Helmut Grohne for the patch. Closes: #895925 + + Use dh_auto_clean instead of $(MAKE). + + [ Adam Borowski ] + * Enable build on riscv64. Closes: #895259 + + [ Mattia Rizzolo ] + * Bump debhelper compat level to 11. + * Bump Standards-Version to 4.1.4, no changes needed. + * Remove patch skipping a test on hurd-i386: allegedly the underlying issue + has been fixed instead. + + -- Mattia Rizzolo Sat, 21 Apr 2018 11:26:59 +0200 + +libzstd (1.3.3+dfsg-1) unstable; urgency=medium + + * Update File-Excluded list in d/copyright + * New upstream version 1.3.3+dfsg, Closes: #883816 + * Refresh patches + * Add zlib1g-dev to Build-Deps to enable gzip support in zstd, Closes: #883827 + + -- Alexandre Mestiashvili Thu, 21 Dec 2017 14:25:26 +0100 + +libzstd (1.3.2+dfsg2-2) unstable; urgency=medium + + * Team upload. + * Do not depend libzstd in zstd package since static linking seems + to be the preferred way to create the executable + Closes: #884876 + * Standards-Version: 4.1.2 + + -- Andreas Tille Thu, 21 Dec 2017 11:43:12 +0100 + +libzstd (1.3.2+dfsg2-1) unstable; urgency=medium + + * Update d/copyright: + - don't strip examples from source tarball + - note BSD and GPL-2 license for examples + * New upstream version 1.3.2+dfsg2 + Closes: #883271 + * Drop override_dh_auto_clean in d/rules as examples are back + * Drop 0010-do_not_make_examples.patch as examples are back + * Remove ruby-ronn from Build-Depends, as it renders libzstd package + not installable on many architectures. + Use man page shipped by upstream + * Apply cme fix dpkg, reformat 0010-do-not.. patch header, + fix VCS-Browser field + * Add override for manpage-has-errors-from-man lintian warning + * Install examples with libzstd-dev + + -- Alexandre Mestiashvili Fri, 01 Dec 2017 17:18:39 +0100 + +libzstd (1.3.2+dfsg1-1) unstable; urgency=medium + + [ Alexandre Mestiashvili ] + * Update Files-Excluded section in d/copyright + * New upstream version 1.3.2+dfsg1 + * Update d/rules: + - trick dh_auto_clean with empty exmaples dir + - force man page generation + * Add symbols file for libzstd1 + * Add 0011-skip-long-running-tests_on_hurd.patch fixing tests on gnu hurd + * Add d/patches/0012-typos.patch fixing a typo + * Enable autopkgtests via d/tests/control + * Override lintian's complain about missing man pages + * Add myself to uploaders + * Add ruby-ronn to build-deps, needed for man page generation + + [ Andreas Tille ] + * d/watch: Fix version mangling + + -- Alexandre Mestiashvili Thu, 30 Nov 2017 23:32:41 +0100 + +libzstd (1.3.2+dfsg-1) unstable; urgency=medium + + * Team upload + * New upstream version + Closes: #881187 + * Standards-Version: 4.1.1 + + -- Andreas Tille Thu, 09 Nov 2017 07:55:32 +0100 + +libzstd (1.3.1+dfsg-2) unstable; urgency=medium + + * Team upload + * Follow hint given by James Cowgill to recude number of threads + on 32Bit MIPS architecture + Closes: #876416 + + -- Andreas Tille Fri, 22 Sep 2017 15:29:35 +0200 + +libzstd (1.3.1+dfsg-1) unstable; urgency=medium + + * Team upload + * New upstream version + * Exclude examples from upstream tarball + Closes: #869581 + * debhelper 10 + * cme fix dpkg-control + * Standards-Version: 4.1.0 (no changes needed) + * Fix copyright + + -- Andreas Tille Wed, 06 Sep 2017 15:29:29 +0200 + +libzstd (1.2.0-1) unstable; urgency=medium + + * New upstream release (Closes: #863159). + + -- Olivier Sallou Wed, 24 May 2017 11:28:27 +0000 + +libzstd (1.1.2-1) unstable; urgency=medium + + * Team upload. + * New upstream version 1.1.2 + + -- Sascha Steinbiss Sun, 15 Jan 2017 08:08:53 +0000 + +libzstd (1.1.1-1) unstable; urgency=medium + + * New upstream version 1.1.1 (Closes: #844248) + * Whitespace fix to d/control + * Ensure hardening flags pass through to compiler by appending to CPPFLAGS + + -- Kevin Murray Sun, 20 Nov 2016 16:12:58 +0100 + +libzstd (1.1.0-1) unstable; urgency=medium + + * New upstream version 1.1.0 (Closes: #839960) + * Change uploader email + * Build new pzstd binary, including manpage + * Fix miscellaneous issues with d/rules and d/*.install + * Move docs from libzstd-dev to the zstd binary + + -- Kevin Murray Sun, 13 Nov 2016 11:23:03 +0000 + +libzstd (1.0.0-1) unstable; urgency=medium + + * Imported Upstream version 1.0.0 (Closes: #836574) + * Bump library package name to libzstd1 + * Changed project URLs, copyrights after move to facebook. + * d/rules: hardening=+all + + -- Kevin Murray Sun, 04 Sep 2016 14:45:24 +1000 + +libzstd (0.8.0-1) unstable; urgency=medium + + [ Kevin Murray ] + * New upstream version (Closes: #834114) + + [ Andreas Tille ] + * hardening=+bindnow + + -- Kevin Murray Thu, 21 Jul 2016 10:56:02 +1000 + +libzstd (0.5.1-1) unstable; urgency=medium + + [ Kevin Murray ] + * New upstream version (fixes a FTBFS) + * Package pkgconfig file (Closes: #813854) + * Fix path to tagged archives in d/watch + * Add vcs URLs + * Bump to standards version 3.9.7 + + [ Mattia Rizzolo ] + * debian/rules: Remove a lot of uneeded comments and lines + + -- Kevin Murray Thu, 17 Mar 2016 12:59:04 +0000 + +libzstd (0.4.7-1) unstable; urgency=low + + * New upstream version + * Remove build date encoding to enable reproducible build + + -- Kevin Murray Wed, 03 Feb 2016 11:26:21 +0200 + +libzstd (0.4.5-1) unstable; urgency=low + + * Initial release (Closes: #806767) + + -- Kevin Murray Tue, 01 Dec 2015 13:54:36 +1100 diff --git a/compat b/compat new file mode 100644 index 0000000..b4de394 --- /dev/null +++ b/compat @@ -0,0 +1 @@ +11 diff --git a/control b/control new file mode 100644 index 0000000..390b11f --- /dev/null +++ b/control @@ -0,0 +1,60 @@ +Source: libzstd +Maintainer: Debian Med Packaging Team +Uploaders: Kevin Murray , + Olivier Sallou , + Alexandre Mestiashvili +Section: libs +Priority: optional +Build-Depends: d-shlibs, + debhelper (>= 11), + help2man, + liblz4-dev, + liblzma-dev, + zlib1g-dev +Standards-Version: 4.2.1 +Vcs-Browser: https://salsa.debian.org/med-team/libzstd +Vcs-Git: https://salsa.debian.org/med-team/libzstd.git +Homepage: https://github.com/facebook/zstd + +Package: libzstd-dev +Architecture: any +Multi-Arch: same +Section: libdevel +Depends: libzstd1 (= ${binary:Version}), + ${misc:Depends} +Description: fast lossless compression algorithm -- development files + Zstd, short for Zstandard, is a fast lossless compression algorithm, targeting + real-time compression scenarios at zlib-level compression ratio. + . + This package contains the headers and static library. + +Package: libzstd1 +Architecture: any +Multi-Arch: same +Section: libs +Depends: ${misc:Depends}, + ${shlibs:Depends} +Description: fast lossless compression algorithm + Zstd, short for Zstandard, is a fast lossless compression algorithm, targeting + real-time compression scenarios at zlib-level compression ratio. + . + This package contains the shared library. + +Package: zstd +Architecture: any +Section: utils +Depends: ${misc:Depends}, + ${shlibs:Depends} +Description: fast lossless compression algorithm -- CLI tool + Zstd, short for Zstandard, is a fast lossless compression algorithm, targeting + real-time compression scenarios at zlib-level compression ratio. + . + This package contains the CLI program implementing zstd. + +Package: libzstd1-udeb +Architecture: any +Section: debian-installer +Depends: ${misc:Depends}, + ${shlibs:Depends} +Package-Type: udeb +Description: fast lossless compression algorithm library for debian-installer diff --git a/copyright b/copyright new file mode 100644 index 0000000..5e8fadb --- /dev/null +++ b/copyright @@ -0,0 +1,132 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: Zstd +Source: https://github.com/facebook/zstd +Files-Excluded: appveyor.yml + circle.yml + build/* + programs/windres/* + .travis.yml + .buckversion + .buckconfig + +Files: * +Copyright: 2013-2018, Yann Collet + 2016, Przemyslaw Skibinski + 2016-2018, Facebook, Inc. +License: BSD-3-clause and GPL-2 +Comment: Starting from 1.3.1 zstd's patent claim is removed + see: https://github.com/facebook/zstd/pull/801 + +Files: zlibWrapper/examples/*.c +Copyright: 1995-2006, 2011 Jean-loup Gailly +License: zlib + +Files: zlibWrapper/gz*.c +Copyright: (C) 2004, 2005, 2010, 2011, 2012, 2013 Mark Adler +License: zlib + +License: zlib + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + . + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + . + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgement in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + +Files: contrib/linux-kernel/fs/squashfs/* +Copyright: 2017 Facebook +License: GPL-2+ + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2, + or (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + On Debian systems you can find a full copy of the GNU General Public + License version 2 at /usr/share/common-licenses/GPL-2. + +Files: lib/dictBuilder/divsufsort.* +Copyright: 2003-2008, Yuta Mori +License: Expat + +Files: examples/* +Copyright: 2016-present, Yann Collet, Facebook, Inc. +License: BSD-3-clause and GPL-2 + +Files: debian/* +Copyright: 2015-2016 Kevin Murray +License: Expat + +License: Expat + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + . + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. + +License: GPL-2 + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License, v2, as + published by the Free Software Foundation + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + . + On Debian systems, the complete text of the GNU General Public + License version 2 can be found in `/usr/share/common-licenses/GPL-2'. + +License: BSD-3-clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + * Neither the name of cereal nor the + names of its contributors may be used to endorse or promote products + derived from this software without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY + DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/libzstd-dev.examples b/libzstd-dev.examples new file mode 100644 index 0000000..e39721e --- /dev/null +++ b/libzstd-dev.examples @@ -0,0 +1 @@ +examples/* diff --git a/libzstd1.symbols b/libzstd1.symbols new file mode 100644 index 0000000..b5bf6df --- /dev/null +++ b/libzstd1.symbols @@ -0,0 +1,196 @@ +libzstd.so.1 libzstd1 #MINVER# + ZBUFF_compressContinue@Base 1.3.2 + ZBUFF_compressEnd@Base 1.3.2 + ZBUFF_compressFlush@Base 1.3.2 + ZBUFF_compressInit@Base 1.3.2 + ZBUFF_compressInitDictionary@Base 1.3.2 + ZBUFF_compressInit_advanced@Base 1.3.2 + ZBUFF_createCCtx@Base 1.3.2 + ZBUFF_createCCtx_advanced@Base 1.3.2 + ZBUFF_createDCtx@Base 1.3.2 + ZBUFF_createDCtx_advanced@Base 1.3.2 + ZBUFF_decompressContinue@Base 1.3.2 + ZBUFF_decompressInit@Base 1.3.2 + ZBUFF_decompressInitDictionary@Base 1.3.2 + ZBUFF_freeCCtx@Base 1.3.2 + ZBUFF_freeDCtx@Base 1.3.2 + ZBUFF_getErrorName@Base 1.3.2 + ZBUFF_isError@Base 1.3.2 + ZBUFF_recommendedCInSize@Base 1.3.2 + ZBUFF_recommendedCOutSize@Base 1.3.2 + ZBUFF_recommendedDInSize@Base 1.3.2 + ZBUFF_recommendedDOutSize@Base 1.3.2 + ZDICT_addEntropyTablesFromBuffer@Base 1.3.2 + ZDICT_finalizeDictionary@Base 1.3.2 + ZDICT_getDictID@Base 1.3.2 + ZDICT_getErrorName@Base 1.3.2 + ZDICT_isError@Base 1.3.2 + ZDICT_optimizeTrainFromBuffer_cover@Base 1.3.2 + ZDICT_trainFromBuffer@Base 1.3.2 + ZDICT_trainFromBuffer_cover@Base 1.3.2 + ZDICT_trainFromBuffer_legacy@Base 1.3.2 + ZSTDMT_compressCCtx@Base 1.3.2 + ZSTDMT_compressStream@Base 1.3.2 + ZSTDMT_compressStream_generic@Base 1.3.2 + ZSTDMT_compress_advanced@Base 1.3.2 + ZSTDMT_createCCtx@Base 1.3.2 + ZSTDMT_createCCtx_advanced@Base 1.3.2 + ZSTDMT_endStream@Base 1.3.2 + ZSTDMT_flushStream@Base 1.3.2 + ZSTDMT_freeCCtx@Base 1.3.2 + ZSTDMT_getMTCtxParameter@Base 1.3.5 + ZSTDMT_initCStream@Base 1.3.2 + ZSTDMT_initCStream_advanced@Base 1.3.2 + ZSTDMT_initCStream_usingCDict@Base 1.3.2 + ZSTDMT_resetCStream@Base 1.3.2 + ZSTDMT_setMTCtxParameter@Base 1.3.2 + ZSTDMT_sizeof_CCtx@Base 1.3.2 + ZSTD_CCtxParam_getParameter@Base 1.3.5 + ZSTD_CCtxParam_setParameter@Base 1.3.2 + (should only be used when static linking)ZSTD_CCtxParams_init@Base 1.3.4 + (should only be used when static linking)ZSTD_CCtxParams_init_advanced@Base 1.3.4 + (should only be used when static linking)ZSTD_CCtxParams_reset@Base 1.3.4 + ZSTD_CCtx_getParameter@Base 1.3.5 + ZSTD_CCtx_loadDictionary@Base 1.3.2 + ZSTD_CCtx_loadDictionary_advanced@Base 1.3.2 + ZSTD_CCtx_loadDictionary_byReference@Base 1.3.2 + ZSTD_CCtx_refCDict@Base 1.3.2 + ZSTD_CCtx_refPrefix@Base 1.3.2 + ZSTD_CCtx_refPrefix_advanced@Base 1.3.2 + ZSTD_CCtx_reset@Base 1.3.2 + ZSTD_CCtx_resetParameters@Base 1.3.5 + ZSTD_CCtx_setParameter@Base 1.3.2 + ZSTD_CCtx_setParametersUsingCCtxParams@Base 1.3.2 + ZSTD_CCtx_setPledgedSrcSize@Base 1.3.2 + ZSTD_CStreamInSize@Base 1.3.2 + ZSTD_CStreamOutSize@Base 1.3.2 + ZSTD_DCtx_loadDictionary@Base 1.3.4 + ZSTD_DCtx_loadDictionary_advanced@Base 1.3.4 + ZSTD_DCtx_loadDictionary_byReference@Base 1.3.4 + ZSTD_DCtx_refDDict@Base 1.3.4 + ZSTD_DCtx_refPrefix@Base 1.3.4 + ZSTD_DCtx_refPrefix_advanced@Base 1.3.4 + ZSTD_DCtx_reset@Base 1.3.2 + ZSTD_DCtx_setFormat@Base 1.3.2 + ZSTD_DCtx_setMaxWindowSize@Base 1.3.2 + ZSTD_DStreamInSize@Base 1.3.2 + ZSTD_DStreamOutSize@Base 1.3.2 + ZSTD_adjustCParams@Base 1.3.2 + ZSTD_checkCParams@Base 1.3.2 + ZSTD_compress@Base 1.3.2 + ZSTD_compressBegin@Base 1.3.2 + ZSTD_compressBegin_advanced@Base 1.3.2 + ZSTD_compressBegin_usingCDict@Base 1.3.2 + ZSTD_compressBegin_usingCDict_advanced@Base 1.3.2 + ZSTD_compressBegin_usingDict@Base 1.3.2 + ZSTD_compressBlock@Base 1.3.2 + ZSTD_compressBound@Base 1.3.2 + ZSTD_compressCCtx@Base 1.3.2 + ZSTD_compressContinue@Base 1.3.2 + ZSTD_compressEnd@Base 1.3.2 + ZSTD_compressStream@Base 1.3.2 + ZSTD_compress_advanced@Base 1.3.2 + ZSTD_compress_generic@Base 1.3.2 + ZSTD_compress_generic_simpleArgs@Base 1.3.2 + ZSTD_compress_usingCDict@Base 1.3.2 + ZSTD_compress_usingCDict_advanced@Base 1.3.2 + ZSTD_compress_usingDict@Base 1.3.2 + ZSTD_copyCCtx@Base 1.3.2 + ZSTD_copyDCtx@Base 1.3.2 + ZSTD_createCCtx@Base 1.3.2 + ZSTD_createCCtxParams@Base 1.3.2 + ZSTD_createCCtx_advanced@Base 1.3.2 + ZSTD_createCDict@Base 1.3.2 + ZSTD_createCDict_advanced@Base 1.3.2 + ZSTD_createCDict_byReference@Base 1.3.2 + ZSTD_createCStream@Base 1.3.2 + ZSTD_createCStream_advanced@Base 1.3.2 + ZSTD_createDCtx@Base 1.3.2 + ZSTD_createDCtx_advanced@Base 1.3.2 + ZSTD_createDDict@Base 1.3.2 + ZSTD_createDDict_advanced@Base 1.3.2 + ZSTD_createDDict_byReference@Base 1.3.2 + ZSTD_createDStream@Base 1.3.2 + ZSTD_createDStream_advanced@Base 1.3.2 + ZSTD_decodingBufferSize_min@Base 1.3.2 + ZSTD_decompress@Base 1.3.2 + ZSTD_decompressBegin@Base 1.3.2 + ZSTD_decompressBegin_usingDDict@Base 1.3.2 + ZSTD_decompressBegin_usingDict@Base 1.3.2 + ZSTD_decompressBlock@Base 1.3.2 + ZSTD_decompressContinue@Base 1.3.2 + ZSTD_decompressDCtx@Base 1.3.2 + ZSTD_decompressStream@Base 1.3.2 + ZSTD_decompress_generic@Base 1.3.2 + ZSTD_decompress_generic_simpleArgs@Base 1.3.2 + ZSTD_decompress_usingDDict@Base 1.3.2 + ZSTD_decompress_usingDict@Base 1.3.2 + ZSTD_endStream@Base 1.3.2 + ZSTD_estimateCCtxSize@Base 1.3.2 + ZSTD_estimateCCtxSize_usingCCtxParams@Base 1.3.2 + ZSTD_estimateCCtxSize_usingCParams@Base 1.3.2 + ZSTD_estimateCDictSize@Base 1.3.2 + ZSTD_estimateCDictSize_advanced@Base 1.3.2 + ZSTD_estimateCStreamSize@Base 1.3.2 + ZSTD_estimateCStreamSize_usingCCtxParams@Base 1.3.2 + ZSTD_estimateCStreamSize_usingCParams@Base 1.3.2 + ZSTD_estimateDCtxSize@Base 1.3.2 + ZSTD_estimateDDictSize@Base 1.3.2 + ZSTD_estimateDStreamSize@Base 1.3.2 + ZSTD_estimateDStreamSize_fromFrame@Base 1.3.2 + ZSTD_findDecompressedSize@Base 1.3.2 + ZSTD_findFrameCompressedSize@Base 1.3.2 + ZSTD_flushStream@Base 1.3.2 + ZSTD_frameHeaderSize@Base 1.3.2 + ZSTD_freeCCtx@Base 1.3.2 + ZSTD_freeCCtxParams@Base 1.3.2 + ZSTD_freeCDict@Base 1.3.2 + ZSTD_freeCStream@Base 1.3.2 + ZSTD_freeDCtx@Base 1.3.2 + ZSTD_freeDDict@Base 1.3.2 + ZSTD_freeDStream@Base 1.3.2 + ZSTD_getBlockSize@Base 1.3.2 + ZSTD_getCParams@Base 1.3.2 + ZSTD_getDecompressedSize@Base 1.3.2 + ZSTD_getDictID_fromDDict@Base 1.3.2 + ZSTD_getDictID_fromDict@Base 1.3.2 + ZSTD_getDictID_fromFrame@Base 1.3.2 + ZSTD_getErrorCode@Base 1.3.2 + ZSTD_getErrorName@Base 1.3.2 + ZSTD_getErrorString@Base 1.3.2 + ZSTD_getFrameContentSize@Base 1.3.2 + ZSTD_getFrameHeader@Base 1.3.2 + ZSTD_getFrameHeader_advanced@Base 1.3.5 + ZSTD_getParams@Base 1.3.2 + ZSTD_initCStream@Base 1.3.2 + ZSTD_initCStream_advanced@Base 1.3.2 + ZSTD_initCStream_srcSize@Base 1.3.2 + ZSTD_initCStream_usingCDict@Base 1.3.2 + ZSTD_initCStream_usingCDict_advanced@Base 1.3.2 + ZSTD_initCStream_usingDict@Base 1.3.2 + ZSTD_initDStream@Base 1.3.2 + ZSTD_initDStream_usingDDict@Base 1.3.2 + ZSTD_initDStream_usingDict@Base 1.3.2 + ZSTD_initStaticCCtx@Base 1.3.2 + ZSTD_initStaticCDict@Base 1.3.2 + ZSTD_initStaticCStream@Base 1.3.2 + ZSTD_initStaticDCtx@Base 1.3.2 + ZSTD_initStaticDDict@Base 1.3.2 + ZSTD_initStaticDStream@Base 1.3.2 + ZSTD_insertBlock@Base 1.3.2 + ZSTD_isError@Base 1.3.2 + ZSTD_isFrame@Base 1.3.2 + ZSTD_maxCLevel@Base 1.3.2 + ZSTD_nextInputType@Base 1.3.2 + ZSTD_nextSrcSizeToDecompress@Base 1.3.2 + ZSTD_resetCStream@Base 1.3.2 + ZSTD_resetDStream@Base 1.3.2 + ZSTD_setDStreamParameter@Base 1.3.2 + ZSTD_sizeof_CCtx@Base 1.3.2 + ZSTD_sizeof_CDict@Base 1.3.2 + ZSTD_sizeof_CStream@Base 1.3.2 + ZSTD_sizeof_DCtx@Base 1.3.2 + ZSTD_sizeof_DDict@Base 1.3.2 + ZSTD_sizeof_DStream@Base 1.3.2 + ZSTD_versionNumber@Base 1.3.2 + ZSTD_versionString@Base 1.3.2 diff --git a/patches/0001-Allow-Invoking-zstd-list-When-stdin-is-not-a-tty.patch b/patches/0001-Allow-Invoking-zstd-list-When-stdin-is-not-a-tty.patch new file mode 100644 index 0000000..6af6ac1 --- /dev/null +++ b/patches/0001-Allow-Invoking-zstd-list-When-stdin-is-not-a-tty.patch @@ -0,0 +1,70 @@ +From 712a9fd9721c314f4b0238577d803b012845f6d2 Mon Sep 17 00:00:00 2001 +From: "W. Felix Handte" +Date: Fri, 29 Jun 2018 15:33:44 -0400 +Subject: [PATCH] Allow Invoking `zstd --list` When `stdin` is not a `tty` + +Also now returns an error when no inputs are given. + +New proposed behavior: + +``` +felix@odin:~/prog/zstd (list-stdin-check)$ ./zstd -l; echo $? +No files given +1 +felix@odin:~/prog/zstd (list-stdin-check)$ ./zstd -l Makefile.zst; echo $? +Frames Skips Compressed Uncompressed Ratio Check Filename + 1 0 3.08 KB 10.92 KB 3.544 XXH64 Makefile.zst +0 +felix@odin:~/prog/zstd (list-stdin-check)$ ./zstd -l +Date: Mon, 14 Nov 2016 11:54:32 +1100 +Subject: Use bash for test script portablitity + +--- + tests/playTests.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- libzstd.orig/tests/playTests.sh ++++ libzstd/tests/playTests.sh +@@ -1,4 +1,4 @@ +-#!/bin/sh -e ++#!/bin/bash -e + + die() { + $ECHO "$@" 1>&2 diff --git a/patches/0008-Address-embedded-zlib.patch b/patches/0008-Address-embedded-zlib.patch new file mode 100644 index 0000000..bc47045 --- /dev/null +++ b/patches/0008-Address-embedded-zlib.patch @@ -0,0 +1,45 @@ +Description: Do not build zlibWrapper examples against embedded code copies. +Author: Sascha Steinbiss +--- libzstd.orig/zlibWrapper/Makefile ++++ libzstd/zlibWrapper/Makefile +@@ -13,7 +13,7 @@ + ZSTDLIBDIR = ../lib + ZSTDLIBRARY = $(ZSTDLIBDIR)/libzstd.a + ZLIBWRAPPER_PATH = . +-GZFILES = gzclose.o gzlib.o gzread.o gzwrite.o ++#GZFILES = gzclose.o gzlib.o gzread.o gzwrite.o + EXAMPLE_PATH = examples + PROGRAMS_PATH = ../programs + TEST_FILE = ../doc/zstd_compression_format.md +@@ -70,16 +70,16 @@ + #.c.o: + # $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< + +-minigzip: $(EXAMPLE_PATH)/minigzip.o $(ZLIBWRAPPER_PATH)/zstd_zlibwrapper.o $(GZFILES) $(ZSTDLIBRARY) ++minigzip: $(EXAMPLE_PATH)/minigzip.o $(ZLIBWRAPPER_PATH)/zstd_zlibwrapper.o $(ZSTDLIBRARY) + $(CC) $(LDFLAGS) $^ $(ZSTDLIBRARY) $(ZLIB_LIBRARY) -o $@ + +-minigzip_zstd: $(EXAMPLE_PATH)/minigzip.o $(ZLIBWRAPPER_PATH)/zstdTurnedOn_zlibwrapper.o $(GZFILES) $(ZSTDLIBRARY) ++minigzip_zstd: $(EXAMPLE_PATH)/minigzip.o $(ZLIBWRAPPER_PATH)/zstdTurnedOn_zlibwrapper.o $(ZSTDLIBRARY) + $(CC) $(LDFLAGS) $^ $(ZSTDLIBRARY) $(ZLIB_LIBRARY) -o $@ + +-example: $(EXAMPLE_PATH)/example.o $(ZLIBWRAPPER_PATH)/zstd_zlibwrapper.o $(GZFILES) $(ZSTDLIBRARY) ++example: $(EXAMPLE_PATH)/example.o $(ZLIBWRAPPER_PATH)/zstd_zlibwrapper.o $(ZSTDLIBRARY) + $(CC) $(LDFLAGS) $^ $(ZLIB_LIBRARY) -o $@ + +-example_zstd: $(EXAMPLE_PATH)/example.o $(ZLIBWRAPPER_PATH)/zstdTurnedOn_zlibwrapper.o $(GZFILES) $(ZSTDLIBRARY) ++example_zstd: $(EXAMPLE_PATH)/example.o $(ZLIBWRAPPER_PATH)/zstdTurnedOn_zlibwrapper.o $(ZSTDLIBRARY) + $(CC) $(LDFLAGS) $^ $(ZLIB_LIBRARY) -o $@ + + fitblk: $(EXAMPLE_PATH)/fitblk.o $(ZLIBWRAPPER_PATH)/zstd_zlibwrapper.o $(ZSTDLIBRARY) +--- libzstd.orig/zlibWrapper/examples/example.c ++++ libzstd/zlibWrapper/examples/example.c +@@ -27,7 +27,7 @@ + + /* @(#) $Id$ */ + +-#include "zstd_zlibwrapper.h" ++#include "zlib.h" + #include + + #ifdef STDC diff --git a/patches/0013-skip-memory-greedy-tests.patch b/patches/0013-skip-memory-greedy-tests.patch new file mode 100644 index 0000000..8df9acf --- /dev/null +++ b/patches/0013-skip-memory-greedy-tests.patch @@ -0,0 +1,37 @@ +Subject: Skip memory heavy tests causing FTBFS on mips(el) and hurd buildds +From: Alex Mestiashvili +--- libzstd.orig/tests/playTests.sh ++++ libzstd/tests/playTests.sh +@@ -799,8 +799,13 @@ + roundTripTest -g5000000000 -P99 1 + roundTripTest -g1700000000 -P0 "1 --zstd=strategy=6" # ensure btlazy2 can survive an overflow rescale + ++DEBARCH=$(dpkg-architecture -qDEB_HOST_ARCH) ++if [ "$DEBARCH" != 'hurd-i386' ] ++then + fileRoundTripTest -g4193M -P99 1 +- ++else ++ $ECHO "\n**** skip memory greedy tests on $DEBARCH **** " ++fi + + $ECHO "\n===> zstd long, long distance matching round-trip tests " + roundTripTest -g270000000 "1 --single-thread --long" +@@ -817,9 +822,14 @@ + $ECHO "\n===> zstdmt long round-trip tests " + roundTripTest -g80000000 -P99 "19 -T2" " " + roundTripTest -g5000000000 -P99 "1 -T2" " " +- roundTripTest -g500000000 -P97 "1 -T999" " " +- fileRoundTripTest -g4103M -P98 " -T0" " " +- roundTripTest -g400000000 -P97 "1 --long=24 -T2" " " ++ if [ "$DEBARCH" != 'mips' -a "$DEBARCH" != 'mipsel' -a "$DEBARCH" != 'hurd-i386' ] ++ then ++ roundTripTest -g500000000 -P97 "1 -T999" " " ++ fileRoundTripTest -g4103M -P98 " -T0" " " ++ roundTripTest -g400000000 -P97 "1 --long=24 -T2" " " ++ else ++ $ECHO "\n**** skip memory greedy tests on $DEBARCH **** " ++ fi + else + $ECHO "\n**** no multithreading, skipping zstdmt tests **** " + fi diff --git a/patches/0014-Reproducible-build.patch b/patches/0014-Reproducible-build.patch new file mode 100644 index 0000000..89bf031 --- /dev/null +++ b/patches/0014-Reproducible-build.patch @@ -0,0 +1,16 @@ +Description: Make the build reproducible +Author: Chris Lamb +Last-Update: 2018-05-04 +Applied-Upstream: https://github.com/facebook/zstd/commit/ef1abd3c071ce42a457404ee2bca6d5bebb87f62 + +--- libzstd.orig/contrib/pzstd/Options.cpp ++++ libzstd/contrib/pzstd/Options.cpp +@@ -88,7 +88,7 @@ + std::fprintf(stderr, " -p, --processes # : number of threads to use for (de)compression (default:)\n"); + + std::fprintf(stderr, "ZSTD options:\n"); +- std::fprintf(stderr, " -# : # compression level (1-%d, default:%d)\n", kMaxNonUltraCompressionLevel, kDefaultCompressionLevel); ++ std::fprintf(stderr, " -# : # compression level (1-%d, default:)\n", kMaxNonUltraCompressionLevel); + std::fprintf(stderr, " -d, --decompress : decompression\n"); + std::fprintf(stderr, " -o file : result stored into `file` (only if 1 input file)\n"); + std::fprintf(stderr, " -f, --force : overwrite output without prompting, (de)compress links\n"); diff --git a/patches/series b/patches/series new file mode 100644 index 0000000..81d79fa --- /dev/null +++ b/patches/series @@ -0,0 +1,5 @@ +0001-Allow-Invoking-zstd-list-When-stdin-is-not-a-tty.patch +0006-Use-bash-for-test-script-portablitity.patch +0008-Address-embedded-zlib.patch +0013-skip-memory-greedy-tests.patch +0014-Reproducible-build.patch diff --git a/rules b/rules new file mode 100755 index 0000000..aac622f --- /dev/null +++ b/rules @@ -0,0 +1,50 @@ +#!/usr/bin/make -f + +export DH_VERBOSE=1 + +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +export DEB_BUILD_MAINT_OPTIONS=hardening=+all + +# Upstream's makefiles will respect PREFIX, and this means we avoid a patch +export PREFIX=/usr + +HELP2MAN = help2man --no-info --help-option="'-h'" --no-discard-stderr +mandir := $(CURDIR)/debian/zstd/usr/share/man/man1 + +%: + dh $@ + +DH_AUTO_CONFIGURE_OPTS := +ifneq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) + DH_AUTO_CONFIGURE_OPTS += -DZSTD_BUILD_TESTS:BOOL=OFF +endif + +override_dh_auto_clean: + dh_auto_clean + dh_auto_clean --sourcedirectory=contrib/pzstd + +override_dh_auto_build: + dh_auto_build + dh_auto_build --sourcedirectory=contrib/pzstd/ -- pzstd + +override_dh_install: + # Call d-shlibmove to comply with library packaging guide + d-shlibmove --commit \ + --multiarch \ + --devunversioned \ + --exclude-la \ + --movedev "debian/tmp/usr/include/*" usr/include \ + --movedev "debian/tmp/usr/lib/pkgconfig/*" usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig \ + debian/tmp/usr/lib/lib*.so + cp -r debian/libzstd1/usr debian/libzstd1-udeb/ + dh_install + +override_dh_makeshlibs: + dh_makeshlibs -plibzstd1 -V'libzstd1 (>= 1.3.5)' --add-udeb=libzstd1-udeb + +override_dh_installman: + dh_installman + mkdir -p $(mandir) + $(HELP2MAN) --name='parallelised Zstandard compression, al la pigz' contrib/pzstd/pzstd \ + | perl -pe 's/(\(de\)compression\s\(default:)(\d+)(\))/$$1 All$$3/g' >$(mandir)/pzstd.1 diff --git a/source/format b/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/tests/control b/tests/control new file mode 100644 index 0000000..f853f74 --- /dev/null +++ b/tests/control @@ -0,0 +1 @@ +Test-Command: zstd -b1 >/dev/null 2>&1 diff --git a/watch b/watch new file mode 100644 index 0000000..993f185 --- /dev/null +++ b/watch @@ -0,0 +1,4 @@ +version=4 + +opts="repacksuffix=+dfsg,dversionmangle=s/\+dfsg\d*//g,repack,compression=xz" \ + https://github.com/facebook/zstd/releases .*/archive/v?@ANY_VERSION@@ARCHIVE_EXT@ diff --git a/zstd.docs b/zstd.docs new file mode 100644 index 0000000..8913f46 --- /dev/null +++ b/zstd.docs @@ -0,0 +1,2 @@ +NEWS +README.md diff --git a/zstd.install b/zstd.install new file mode 100644 index 0000000..3418174 --- /dev/null +++ b/zstd.install @@ -0,0 +1,2 @@ +contrib/pzstd/pzstd usr/bin +usr/bin diff --git a/zstd.lintian-overrides b/zstd.lintian-overrides new file mode 100644 index 0000000..4bdc0a6 --- /dev/null +++ b/zstd.lintian-overrides @@ -0,0 +1,5 @@ +zstd: binary-without-manpage usr/bin/zstdgrep +zstd: binary-without-manpage usr/bin/zstdless +zstd: binary-without-manpage usr/bin/zstdmt +zstd: binary-without-manpage usr/bin/unzstd +zstd: binary-without-manpage usr/bin/zstdcat diff --git a/zstd.manpages b/zstd.manpages new file mode 100644 index 0000000..b3ae7fe --- /dev/null +++ b/zstd.manpages @@ -0,0 +1 @@ +programs/zstd*.1 -- 2.30.2