From dabca671bd617b048d96b62e9b39323503359ea7fe5c9069850b053f1b29a5d0 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sat, 29 Sep 2018 00:49:32 +0000 Subject: [PATCH 1/2] - Rebase to 0.9.11 + Fix small bug where creating a zck_dl context fails when zck context is NULL + Fix security bugs found by Coverity + Fix test failures for zstd <= 1.3.4 + Add gen_xml_dictionary to libexecdir with zck_ prefix + Fix intermittent bug where auto-chunking wasn't deterministic + ABI (but not API change) - Use bool from stdbool.h + Allow specification of output file in zck + Set minimum and maximum chunk sizes for both automatic and manual chunking + New error handling functions + File format changes + API changes - Make requirements between subpackages stricter to avoid issues due to inter-subpackage ABI/API changes OBS-URL: https://build.opensuse.org/package/show/Archiving/zchunk?expand=0&rev=10 --- zchunk-0.7.6.tar.gz | 3 --- zchunk-0.9.11.tar.gz | 3 +++ zchunk.changes | 20 ++++++++++++++++++++ zchunk.spec | 15 +++++++++++---- 4 files changed, 34 insertions(+), 7 deletions(-) delete mode 100644 zchunk-0.7.6.tar.gz create mode 100644 zchunk-0.9.11.tar.gz diff --git a/zchunk-0.7.6.tar.gz b/zchunk-0.7.6.tar.gz deleted file mode 100644 index c42a063..0000000 --- a/zchunk-0.7.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cf734d4f988b348385f45f678582a091643203fbae7e8850cd0aecfd79408ef8 -size 130200 diff --git a/zchunk-0.9.11.tar.gz b/zchunk-0.9.11.tar.gz new file mode 100644 index 0000000..fc33601 --- /dev/null +++ b/zchunk-0.9.11.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ab521a7c99a4a273a924a7c21f0947b79285ff416b9217c6dbab760e4d306317 +size 1418276 diff --git a/zchunk.changes b/zchunk.changes index 1fdeae7..77384bc 100644 --- a/zchunk.changes +++ b/zchunk.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Sat Sep 29 00:40:50 UTC 2018 - Neal Gompa + +- Rebase to 0.9.11 + + Fix small bug where creating a zck_dl context fails when zck + context is NULL + + Fix security bugs found by Coverity + + Fix test failures for zstd <= 1.3.4 + + Add gen_xml_dictionary to libexecdir with zck_ prefix + + Fix intermittent bug where auto-chunking wasn't deterministic + + ABI (but not API change) - Use bool from stdbool.h + + Allow specification of output file in zck + + Set minimum and maximum chunk sizes for both automatic and + manual chunking + + New error handling functions + + File format changes + + API changes +- Make requirements between subpackages stricter to avoid issues + due to inter-subpackage ABI/API changes + ------------------------------------------------------------------- Wed Jul 18 08:09:07 UTC 2018 - Martin Pluskal diff --git a/zchunk.spec b/zchunk.spec index 05592f5..84bef8a 100644 --- a/zchunk.spec +++ b/zchunk.spec @@ -20,8 +20,9 @@ %global somajor 1 %global libname libzck%{somajor} %global devname libzck-devel + Name: zchunk -Version: 0.7.6 +Version: 0.9.11 Release: 0 Summary: Compressed file format that allows easy deltas License: BSD-2-Clause AND MIT @@ -34,6 +35,8 @@ BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(libzstd) BuildRequires: pkgconfig(openssl) Provides: bundled(buzhash-urlblock) = 0.1 +# ABI is unstable between components and ensures that patching doesn't break things +Requires: %{libname} = %{version}-%{release} %description zchunk is a compressed file format that splits the file into independent @@ -58,7 +61,7 @@ This package contains the zchunk library, libzck. %package -n %{devname} Summary: Headers for building against zchunk Group: Development/Libraries/C and C++ -Requires: %{libname} = %{version} +Requires: %{libname} = %{version}-%{release} Provides: %{name}-devel = %{version}-%{release} %description -n %{devname} @@ -77,11 +80,14 @@ library, libzck. rm -rf src/lib/hash/sha* %build -%meson -Dwith-zstd=yes -Dwith-openssl=yes +%meson -Dwith-openssl=enabled -Dwith-zstd=enabled %meson_build %install %meson_install +# Install dictionary generation script +mkdir -p %{buildroot}%{_libexecdir} +install -p contrib/gen_xml_dictionary %{buildroot}%{_libexecdir}/zck_gen_xml_dictionary %check %meson_test @@ -90,10 +96,11 @@ rm -rf src/lib/hash/sha* %postun -n %{libname} -p /sbin/ldconfig %files -%doc README.md +%doc README.md contrib %license LICENSE %{_bindir}/zck* %{_bindir}/unzck +%{_libexecdir}/zck_gen_xml_dictionary %files -n %{libname} %license LICENSE From b11e2c3c16967f9861fce68ee006f6e887ccc2834fa4c5c50e655d4452921d1a Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sat, 29 Sep 2018 00:52:20 +0000 Subject: [PATCH 2/2] - Bump meson build dependency to match meson.build requirement OBS-URL: https://build.opensuse.org/package/show/Archiving/zchunk?expand=0&rev=11 --- zchunk.changes | 5 +++++ zchunk.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/zchunk.changes b/zchunk.changes index 77384bc..2dce3b2 100644 --- a/zchunk.changes +++ b/zchunk.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Sep 29 00:51:14 UTC 2018 - Neal Gompa + +- Bump meson build dependency to match meson.build requirement + ------------------------------------------------------------------- Sat Sep 29 00:40:50 UTC 2018 - Neal Gompa diff --git a/zchunk.spec b/zchunk.spec index 84bef8a..f1cedb5 100644 --- a/zchunk.spec +++ b/zchunk.spec @@ -29,7 +29,7 @@ License: BSD-2-Clause AND MIT Group: Productivity/Archiving/Compression URL: https://github.com/zchunk/zchunk Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz -BuildRequires: meson +BuildRequires: meson >= 0.44.0 BuildRequires: pkgconfig BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(libzstd)