From 32efb864b4b0a3337e71ae4d7cc733bca1fcf457b6d4b681fc31f65015f9eafd Mon Sep 17 00:00:00 2001 From: Bernhard Wiedemann Date: Fri, 14 Apr 2023 20:32:20 +0000 Subject: [PATCH 1/4] Accepting request 1079169 from home:dirkmueller:Factory - update to 1.5.5: * fix: fix rare corruption bug affecting the high compression mode, reported by @danlark1 * perf: improve mid-level compression speed * lib: deprecated bufferless block-level API (#3534) by @terrelln * cli: mmap large dictionaries to save memory, by @daniellerozenblit * cli: improve speed of --patch-from mode (~+50%) (#3545) by @daniellerozenblit * cli: improve i/o speed (~+10%) when processing lots of small files (#3479) by @felixhandte * cli: zstd no longer crashes when requested to write into write-protected directory (#3541) by @felixhandte * cli: fix decompression into block device using -o, reported by @georgmu * build: fix zstd CLI compiled with lzma support but not zlib support (#3494) by @Hello71 * build: fix cmake does no longer require 3.18 as minimum version (#3510) by @kou * build: fix MSVC+ClangCL linking issue (#3569) by @tru * build: fix zstd-dll, version of zstd CLI that links to the dynamic library (#3496) by @yoniko * build: fix MSVC warnings (#3495) by @embg * doc: updated zstd specification to clarify corner cases, by @Cyan4973 * doc: document how to create fat binaries for macos (#3568) by @rickmark * misc: improve seekable format ingestion speed (~+100%) for very small chunk sizes (#3544) by @Cyan4973 OBS-URL: https://build.opensuse.org/request/show/1079169 OBS-URL: https://build.opensuse.org/package/show/Archiving/zstd?expand=0&rev=84 --- zstd-1.5.4.tar.gz | 3 --- zstd-1.5.4.tar.gz.sig | 17 ----------------- zstd-1.5.5.tar.gz | 3 +++ zstd-1.5.5.tar.gz.sig | 17 +++++++++++++++++ zstd.changes | 36 ++++++++++++++++++++++++++++++++++++ zstd.spec | 2 +- 6 files changed, 57 insertions(+), 21 deletions(-) delete mode 100644 zstd-1.5.4.tar.gz delete mode 100644 zstd-1.5.4.tar.gz.sig create mode 100644 zstd-1.5.5.tar.gz create mode 100644 zstd-1.5.5.tar.gz.sig diff --git a/zstd-1.5.4.tar.gz b/zstd-1.5.4.tar.gz deleted file mode 100644 index 1c74667..0000000 --- a/zstd-1.5.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0f470992aedad543126d06efab344dc5f3e171893810455787d38347343a4424 -size 2161536 diff --git a/zstd-1.5.4.tar.gz.sig b/zstd-1.5.4.tar.gz.sig deleted file mode 100644 index e43da9f..0000000 --- a/zstd-1.5.4.tar.gz.sig +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQJFBAADCAAvFiEETvSsY0VfyfRUXZt974/plSi1L/0FAmPlnxIRHHNpZ25pbmdA -enN0ZC5uZXQACgkQ74/plSi1L/0HtQ//RlPwx5rGYTeVBenJXspAhOdsX0R2V33y -uUaziGTTlSf4VzANSEprcF9siCOhdsr7a5i6u57FtdtVZR4MHK1DGFcReyXr/vyJ -W5AOGhXGaIgSuRlVbZhv7XGiV5GNqEE4qu1HFEoBUEZ/RXReOH2IYAKQpNq6Phju -aHNH1Zmt/x1P2qzN3wr0livXcddSVThtCBscFCHqL6L4GA8GUtjx5mQV0mkdhaGf -J62FY71eeG8vxolk0hkMIZSnQlyE8rq/DZ+wM/Q3YFfh0NDvggh/Ogejc41SKSv/ -+uoobCmEKc+ypqeIYIsWUng3F/HrPnAJOfDc/b+jCJwQc9HQa5tsasQ15uuYqFhl -5fsHyJjFyaG1WZ4eGQ7BSIzhqz37JLY2UQPl5kylo008fFryuOuX2P8gzP94GH8Q -vL98/B13Aj5UM01YluhATj1uGw3AGvaIL9x1wuBKaLVVDypuRlYTkM5FjAEDyLFU -++Un7ZsZBAD1EIxEw+mCPE55wcp+LFBYIH70gIwCKk9aeI1TiJl6be1iptGb/3eV -06z86MghxV15cac8rSqB5i9t90c1kUz/8eU9XrlAYwKYAo9BcQR2G6em6E8f/5t8 -4APP0QYi2O78QAjoXUEwT9fbWs+F9hbGN7kj63PIzYLqiMc8MNcz7Unq9yxDNYBk -drCMUln4cHI= -=nV7j ------END PGP SIGNATURE----- diff --git a/zstd-1.5.5.tar.gz b/zstd-1.5.5.tar.gz new file mode 100644 index 0000000..c1358c2 --- /dev/null +++ b/zstd-1.5.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9c4396cc829cfae319a6e2615202e82aad41372073482fce286fac78646d3ee4 +size 2368543 diff --git a/zstd-1.5.5.tar.gz.sig b/zstd-1.5.5.tar.gz.sig new file mode 100644 index 0000000..f5b0847 --- /dev/null +++ b/zstd-1.5.5.tar.gz.sig @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- + +iQJFBAADCgAvFiEETvSsY0VfyfRUXZt974/plSi1L/0FAmQsotIRHHNpZ25pbmdA +enN0ZC5uZXQACgkQ74/plSi1L/16Jg//RoYFnXQxQFDLy1I47fIGKzBn7U5YXeeT +qbCfXqkv0Mr/XUW0z9eWXpKBTMIN+mARX/1gNiM7wIpb1jrah11ZJR6u3k5C/NFZ +pqM/HNxDdAjV+C/t6/fgT8VcZEq1jDOI7BM7fZPhi5kLp7UgWmfZfePIF3qMtadp +QewGQ9fzzc96XqNFycNZPRGHNVbj7YbT2tGK9RpiWDFbo23c8wuwibur7jX28jPQ +6esAmGckzirb3lElByQ4oJwtVwP0lkAtFwJZx/E3EhCszrvnS2j+X+6DgF3Fhz3E +7e9YCS5tF0wUr2WMhLeAAFbVYcKezYlLpym7KM5BX6LjAEbaX4eEx66KJECI0LYm +HrPo33mBkJcUEX5sXs2P3QQ3phLOIg/TC9ECN7YORLoZca/nj1C7JgdIJ6VFHFZK +4JMSO0DOxNiCuvDy+EU9EwCIKhfNTl/vlcyqMjrMJxZ9QO3bykcKUirsOgz8GpO7 +RwPupGog0E+pDv3GemSYn7kU+N2Vba4b/T/65WpssMJ4zC2z7jMFvEbeoyhKsV2m +xClHq4bgk3Tt2WlUS9fH5DMramwhXKIncPsXNlg3rTqiik3GuE+56AijsE/CBAlo +MHGAV/IvR2XIo+khZ5wIix15YW/WEbdxB4uT0CeKlBt+XXLTQ/kLAEI3o+IhA4EB +jBu+O1qqDVI= +=3yPb +-----END PGP SIGNATURE----- diff --git a/zstd.changes b/zstd.changes index 5c86cb6..0d28394 100644 --- a/zstd.changes +++ b/zstd.changes @@ -1,3 +1,39 @@ +------------------------------------------------------------------- +Thu Apr 13 11:15:39 UTC 2023 - Dirk Müller + +- update to 1.5.5: + * fix: fix rare corruption bug affecting the high compression + mode, reported by @danlark1 + * perf: improve mid-level compression speed + * lib: deprecated bufferless block-level API (#3534) by + @terrelln + * cli: mmap large dictionaries to save memory, by + @daniellerozenblit + * cli: improve speed of --patch-from mode (~+50%) (#3545) by + @daniellerozenblit + * cli: improve i/o speed (~+10%) when processing lots of small + files (#3479) by @felixhandte + * cli: zstd no longer crashes when requested to write into + write-protected directory (#3541) by @felixhandte + * cli: fix decompression into block device using -o, reported + by @georgmu + * build: fix zstd CLI compiled with lzma support but not zlib + support (#3494) by @Hello71 + * build: fix cmake does no longer require 3.18 as minimum + version (#3510) by @kou + * build: fix MSVC+ClangCL linking issue (#3569) by @tru + * build: fix zstd-dll, version of zstd CLI that links to the + dynamic library (#3496) by @yoniko + * build: fix MSVC warnings (#3495) by @embg + * doc: updated zstd specification to clarify corner cases, by + @Cyan4973 + * doc: document how to create fat binaries for macos (#3568) by + @rickmark + * misc: improve seekable format ingestion speed (~+100%) for + very small chunk sizes (#3544) by @Cyan4973 + * misc: tests/fullbench can benchmark multiple files (#3516) by + @dloidolt + ------------------------------------------------------------------- Wed Mar 8 09:28:33 UTC 2023 - Martin Pluskal diff --git a/zstd.spec b/zstd.spec index 92a8b71..efc112f 100644 --- a/zstd.spec +++ b/zstd.spec @@ -18,7 +18,7 @@ %define libname libzstd1 Name: zstd -Version: 1.5.4 +Version: 1.5.5 Release: 0 Summary: Zstandard compression tools License: BSD-3-Clause AND GPL-2.0-only From 0e5b261745d0a4a183df80f2f707060ed94264c82e6cb400efe297f7a8690c34 Mon Sep 17 00:00:00 2001 From: Bernhard Wiedemann Date: Fri, 14 Apr 2023 20:34:06 +0000 Subject: [PATCH 2/4] cleanup changelog OBS-URL: https://build.opensuse.org/package/show/Archiving/zstd?expand=0&rev=85 --- zstd.changes | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/zstd.changes b/zstd.changes index 0d28394..c29a34b 100644 --- a/zstd.changes +++ b/zstd.changes @@ -17,18 +17,6 @@ Thu Apr 13 11:15:39 UTC 2023 - Dirk Müller write-protected directory (#3541) by @felixhandte * cli: fix decompression into block device using -o, reported by @georgmu - * build: fix zstd CLI compiled with lzma support but not zlib - support (#3494) by @Hello71 - * build: fix cmake does no longer require 3.18 as minimum - version (#3510) by @kou - * build: fix MSVC+ClangCL linking issue (#3569) by @tru - * build: fix zstd-dll, version of zstd CLI that links to the - dynamic library (#3496) by @yoniko - * build: fix MSVC warnings (#3495) by @embg - * doc: updated zstd specification to clarify corner cases, by - @Cyan4973 - * doc: document how to create fat binaries for macos (#3568) by - @rickmark * misc: improve seekable format ingestion speed (~+100%) for very small chunk sizes (#3544) by @Cyan4973 * misc: tests/fullbench can benchmark multiple files (#3516) by From 4172bf1c18156435be6d45739bc5641a1e1fc34827d4ad310900b7445beef60e Mon Sep 17 00:00:00 2001 From: Bernhard Wiedemann Date: Mon, 17 Apr 2023 08:10:31 +0000 Subject: [PATCH 3/4] Accepting request 1079754 from home:hillwood:branches:Archiving - Build it by cmake - Add missing cmake profiles OBS-URL: https://build.opensuse.org/request/show/1079754 OBS-URL: https://build.opensuse.org/package/show/Archiving/zstd?expand=0&rev=86 --- zstd.changes | 6 ++++++ zstd.spec | 37 ++++++++++++++++++++++++------------- 2 files changed, 30 insertions(+), 13 deletions(-) diff --git a/zstd.changes b/zstd.changes index c29a34b..ef526ef 100644 --- a/zstd.changes +++ b/zstd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Apr 16 12:03:54 UTC 2023 - Hillwood Yang + +- Build it by cmake +- Add missing cmake profiles + ------------------------------------------------------------------- Thu Apr 13 11:15:39 UTC 2023 - Dirk Müller diff --git a/zstd.spec b/zstd.spec index efc112f..29b1e79 100644 --- a/zstd.spec +++ b/zstd.spec @@ -29,6 +29,7 @@ Source1: https://github.com/facebook/zstd/releases/download/v%{version}/% Source2: zstd.keyring Source99: baselibs.conf Patch1: pzstd.1.patch +BuildRequires: cmake BuildRequires: gcc # C++ is needed for pzstd only BuildRequires: gcc-c++ @@ -102,30 +103,37 @@ an optimized deflate/zlib handling. %prep %autosetup -p1 +sed -i '/build static library to build tests/d' build/cmake/CMakeLists.txt +sed -i 's/libzstd_static/libzstd_shared/g' build/cmake/tests/CMakeLists.txt %build %global _lto_cflags %{_lto_cflags} -ffat-lto-objects export CFLAGS="%{optflags}" export CXXFLAGS="%{optflags} -std=c++11" -# lib-mt is alias for multi-threaded library support -%make_build HAVE_ZLIB=1 prefix=%{_prefix} libdir=%{_libdir} -C lib lib-mt -for dir in programs contrib/pzstd; do - %make_build -C "$dir" -done +cd build/cmake +%cmake \ + -DCMAKE_BUILD_TYPE=None \ + -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DZSTD_ZLIB_SUPPORT=ON \ + -DZSTD_LZMA_SUPPORT=OFF \ + -DZSTD_LZ4_SUPPORT=OFF \ + -DZSTD_BUILD_CONTRIB=ON \ + -DZSTD_BUILD_STATIC=ON \ + -DZSTD_BUILD_TESTS=ON \ + -DZSTD_PROGRAMS_LINK_SHARED=ON +%cmake_build %check export CFLAGS="%{optflags}" export CXXFLAGS="%{optflags} -std=c++11" %make_build -C tests test-zstd -#make_build -C contrib/pzstd test-pzstd %install -%make_install V=1 VERBOSE=1 prefix=%{_prefix} libdir=%{_libdir} -install -D -m755 contrib/pzstd/pzstd %{buildroot}%{_bindir}/pzstd -install -D -m644 programs/zstd.1 %{buildroot}%{_mandir}/man1/pzstd.1 -ln -s zstd %{buildroot}/%{_bindir}/gzip -ln -s zstd %{buildroot}/%{_bindir}/gunzip -ln -s zstdcat %{buildroot}/%{_bindir}/zcat +cd build/cmake +%cmake_install +ln -sf %{_bindir}/zstd %{buildroot}%{_bindir}/gzip +ln -sf %{_bindir}/zstd %{buildroot}%{_bindir}/gunzip +ln -sf %{_bindir}/zstdcat %{buildroot}%{_bindir}/zcat %post -n %{libname} -p /sbin/ldconfig %postun -n %{libname} -p /sbin/ldconfig @@ -133,6 +141,8 @@ ln -s zstdcat %{buildroot}/%{_bindir}/zcat %files %license COPYING LICENSE %doc README.md CHANGELOG +%dir %{_datadir}/doc/%{name} +%{_datadir}/doc/%{name}/%{name}_manual.html %{_bindir}/pzstd %{_bindir}/unzstd %{_bindir}/zstd @@ -144,13 +154,14 @@ ln -s zstdcat %{buildroot}/%{_bindir}/zcat %files -n %{libname} %license COPYING LICENSE -%{_libdir}/libzstd.so.1* +%{_libdir}/libzstd.so.* %files -n lib%{name}-devel %license COPYING LICENSE %{_includedir}/*.h %{_libdir}/pkgconfig/libzstd.pc %{_libdir}/libzstd.so +%{_libdir}/cmake/%{name} %files -n lib%{name}-devel-static %{_libdir}/libzstd.a From 596f53d8200042afb7af73f75abef8b7250fa3e09266c152557eaf60b5b13286 Mon Sep 17 00:00:00 2001 From: Bernhard Wiedemann Date: Mon, 24 Apr 2023 13:44:36 +0000 Subject: [PATCH 4/4] revert cmake change, because we do not want to add it into Ring0 / Bootstrap. OBS-URL: https://build.opensuse.org/package/show/Archiving/zstd?expand=0&rev=87 --- zstd.changes | 6 ------ zstd.spec | 37 +++++++++++++------------------------ 2 files changed, 13 insertions(+), 30 deletions(-) diff --git a/zstd.changes b/zstd.changes index ef526ef..c29a34b 100644 --- a/zstd.changes +++ b/zstd.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Sun Apr 16 12:03:54 UTC 2023 - Hillwood Yang - -- Build it by cmake -- Add missing cmake profiles - ------------------------------------------------------------------- Thu Apr 13 11:15:39 UTC 2023 - Dirk Müller diff --git a/zstd.spec b/zstd.spec index 29b1e79..efc112f 100644 --- a/zstd.spec +++ b/zstd.spec @@ -29,7 +29,6 @@ Source1: https://github.com/facebook/zstd/releases/download/v%{version}/% Source2: zstd.keyring Source99: baselibs.conf Patch1: pzstd.1.patch -BuildRequires: cmake BuildRequires: gcc # C++ is needed for pzstd only BuildRequires: gcc-c++ @@ -103,37 +102,30 @@ an optimized deflate/zlib handling. %prep %autosetup -p1 -sed -i '/build static library to build tests/d' build/cmake/CMakeLists.txt -sed -i 's/libzstd_static/libzstd_shared/g' build/cmake/tests/CMakeLists.txt %build %global _lto_cflags %{_lto_cflags} -ffat-lto-objects export CFLAGS="%{optflags}" export CXXFLAGS="%{optflags} -std=c++11" -cd build/cmake -%cmake \ - -DCMAKE_BUILD_TYPE=None \ - -DCMAKE_INSTALL_PREFIX=%{_prefix} \ - -DZSTD_ZLIB_SUPPORT=ON \ - -DZSTD_LZMA_SUPPORT=OFF \ - -DZSTD_LZ4_SUPPORT=OFF \ - -DZSTD_BUILD_CONTRIB=ON \ - -DZSTD_BUILD_STATIC=ON \ - -DZSTD_BUILD_TESTS=ON \ - -DZSTD_PROGRAMS_LINK_SHARED=ON -%cmake_build +# lib-mt is alias for multi-threaded library support +%make_build HAVE_ZLIB=1 prefix=%{_prefix} libdir=%{_libdir} -C lib lib-mt +for dir in programs contrib/pzstd; do + %make_build -C "$dir" +done %check export CFLAGS="%{optflags}" export CXXFLAGS="%{optflags} -std=c++11" %make_build -C tests test-zstd +#make_build -C contrib/pzstd test-pzstd %install -cd build/cmake -%cmake_install -ln -sf %{_bindir}/zstd %{buildroot}%{_bindir}/gzip -ln -sf %{_bindir}/zstd %{buildroot}%{_bindir}/gunzip -ln -sf %{_bindir}/zstdcat %{buildroot}%{_bindir}/zcat +%make_install V=1 VERBOSE=1 prefix=%{_prefix} libdir=%{_libdir} +install -D -m755 contrib/pzstd/pzstd %{buildroot}%{_bindir}/pzstd +install -D -m644 programs/zstd.1 %{buildroot}%{_mandir}/man1/pzstd.1 +ln -s zstd %{buildroot}/%{_bindir}/gzip +ln -s zstd %{buildroot}/%{_bindir}/gunzip +ln -s zstdcat %{buildroot}/%{_bindir}/zcat %post -n %{libname} -p /sbin/ldconfig %postun -n %{libname} -p /sbin/ldconfig @@ -141,8 +133,6 @@ ln -sf %{_bindir}/zstdcat %{buildroot}%{_bindir}/zcat %files %license COPYING LICENSE %doc README.md CHANGELOG -%dir %{_datadir}/doc/%{name} -%{_datadir}/doc/%{name}/%{name}_manual.html %{_bindir}/pzstd %{_bindir}/unzstd %{_bindir}/zstd @@ -154,14 +144,13 @@ ln -sf %{_bindir}/zstdcat %{buildroot}%{_bindir}/zcat %files -n %{libname} %license COPYING LICENSE -%{_libdir}/libzstd.so.* +%{_libdir}/libzstd.so.1* %files -n lib%{name}-devel %license COPYING LICENSE %{_includedir}/*.h %{_libdir}/pkgconfig/libzstd.pc %{_libdir}/libzstd.so -%{_libdir}/cmake/%{name} %files -n lib%{name}-devel-static %{_libdir}/libzstd.a