From 2c9f5c09cc291cc4ec430affe86520ccf43a968a82fc5732bc1930b1450bf8cd Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 14 Dec 2018 11:44:47 +0000 Subject: [PATCH 1/5] - Update to new upstream release 1.11~rc2 OBS-URL: https://build.opensuse.org/package/show/Archiving/lzlib?expand=0&rev=18 --- lzlib-1.10.tar.gz | 3 --- lzlib-1.10.tar.gz.sig | Bin 72 -> 0 bytes lzlib-1.11-rc2.tar.gz | 3 +++ lzlib.changes | 10 ++++++++++ lzlib.spec | 44 +++++++++++++++++++++--------------------- 5 files changed, 35 insertions(+), 25 deletions(-) delete mode 100644 lzlib-1.10.tar.gz delete mode 100644 lzlib-1.10.tar.gz.sig create mode 100644 lzlib-1.11-rc2.tar.gz diff --git a/lzlib-1.10.tar.gz b/lzlib-1.10.tar.gz deleted file mode 100644 index 519bd5b..0000000 --- a/lzlib-1.10.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1d6ab7800a5b43e56fd20607fd2cfda9e550350dc95f5beb6a4ce14f85b41043 -size 103328 diff --git a/lzlib-1.10.tar.gz.sig b/lzlib-1.10.tar.gz.sig deleted file mode 100644 index 483afa0b8bb96b00be75051e6f852b5255daf3011deb5559c4c225c83f9e30c2..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 72 zcmV-O0Jr~$Mg#y60ssaD0$P7CIRFX?5Rd7V0~0NGLXv#|pL5ULmkH%=m~QX$yu|b1 e9X8_%U;v+T*6(R=*A>XC^&k`2N0^=ZyxCY diff --git a/lzlib-1.11-rc2.tar.gz b/lzlib-1.11-rc2.tar.gz new file mode 100644 index 0000000..6f6342d --- /dev/null +++ b/lzlib-1.11-rc2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:11848d7b8589e625f8813986ca6437a382799c55be6479d2bb6969a8aa38c0de +size 105695 diff --git a/lzlib.changes b/lzlib.changes index 4e72d7f..a79216f 100644 --- a/lzlib.changes +++ b/lzlib.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Dec 14 11:42:47 UTC 2018 - Jan Engelhardt + +- Update to new upstream release 1.11~rc2: + * In case of decompression error caused by corrupt or truncated data, + LZ_decompress_read now does not signal the error immediately + to the application, but waits until all decoded bytes have + been read. This allows tools like tarlz to recover as much + data as possible from damaged members. + ------------------------------------------------------------------- Sun Feb 18 21:41:57 UTC 2018 - avindra@opensuse.org diff --git a/lzlib.spec b/lzlib.spec index d8ec700..26f6631 100644 --- a/lzlib.spec +++ b/lzlib.spec @@ -1,4 +1,3 @@ -# vim: set ts=4 sw=4 et: # # spec file for package lzlib # @@ -14,20 +13,21 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%define lname liblz1 Name: lzlib -Version: 1.10 +Version: 1.11~rc2 Release: 0 +%define lname liblz1 +%define xversion 1.11-rc2 Summary: LZMA Compression and Decompression Library License: BSD-2-Clause Group: Development/Libraries/C and C++ -Url: https://www.nongnu.org/lzip/lzlib.html -Source: https://download.savannah.gnu.org/releases/lzip/lzlib/%name-%version.tar.gz -Source2: https://download.savannah.gnu.org/releases/lzip/lzlib/%name-%version.tar.gz.sig +URL: https://www.nongnu.org/lzip/lzlib.html +Source: https://download.savannah.gnu.org/releases/lzip/lzlib/%name-%xversion.tar.gz +#Source2: https://download.savannah.gnu.org/releases/lzip/lzlib/%name-%version.tar.gz.sig Source3: %name.keyring PreReq: %install_info_prereq @@ -64,25 +64,25 @@ This subpackage contains libraries and header files for developing applications that want to make use of libcerror. %prep -%setup -q +%autosetup -n %name-%xversion %build # not autoconf! # don't use the configure macro here, as it will cause the configure script to # skip parameters as soon as it encounters one that it doesn't understand ./configure \ - --prefix="%{_prefix}" \ - --bindir="%{_bindir}" \ - --datadir="%{_datadir}" \ - --includedir="%{_includedir}" \ - --infodir="%{_infodir}" \ - --libdir="%{_libdir}" \ - --mandir="%{_mandir}" \ - --sysconfdir="%{_sysconfdir}" \ + --prefix="%_prefix" \ + --bindir="%_bindir" \ + --datadir="%_datadir" \ + --includedir="%_includedir" \ + --infodir="%_infodir" \ + --libdir="%_libdir" \ + --mandir="%_mandir" \ + --sysconfdir="%_sysconfdir" \ --enable-shared \ CXX="g++" \ - CPPFLAGS="%{optflags}" \ - CXXFLAGS="%{optflags}" + CPPFLAGS="%optflags" \ + CXXFLAGS="%optflags" make %{?_smp_mflags} @@ -105,11 +105,11 @@ make %{?_smp_mflags} check %files -n %lname %doc AUTHORS ChangeLog COPYING NEWS README -%{_libdir}/liblz.so.* +%_libdir/liblz.so.* %files devel -%{_includedir}/lzlib.h -%{_libdir}/liblz.so -%{_infodir}/lzlib.info%{ext_info} +%_includedir/lzlib.h +%_libdir/liblz.so +%_infodir/lzlib.info%ext_info %changelog From 11f0718ad6577c53599f81627a7d2d6e483f70b2e93a93c9bbd7327c7d445bc4 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 14 Dec 2018 11:58:09 +0000 Subject: [PATCH 2/5] use out-of-tree build OBS-URL: https://build.opensuse.org/package/show/Archiving/lzlib?expand=0&rev=19 --- lzlib.spec | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/lzlib.spec b/lzlib.spec index 26f6631..3080aaf 100644 --- a/lzlib.spec +++ b/lzlib.spec @@ -70,29 +70,26 @@ applications that want to make use of libcerror. # not autoconf! # don't use the configure macro here, as it will cause the configure script to # skip parameters as soon as it encounters one that it doesn't understand -./configure \ - --prefix="%_prefix" \ - --bindir="%_bindir" \ - --datadir="%_datadir" \ - --includedir="%_includedir" \ - --infodir="%_infodir" \ - --libdir="%_libdir" \ - --mandir="%_mandir" \ - --sysconfdir="%_sysconfdir" \ - --enable-shared \ - CXX="g++" \ - CPPFLAGS="%optflags" \ - CXXFLAGS="%optflags" - +mkdir build +pushd build/ +../configure --prefix="%_prefix" --bindir="%_bindir" --datadir="%_datadir" \ + --includedir="%_includedir" --infodir="%_infodir" --libdir="%_libdir" \ + --mandir="%_mandir" --sysconfdir="%_sysconfdir" --enable-shared \ + CC="%__cc" CFLAGS="%optflags" CXX="%__cxx" CXXFLAGS="%optflags" make %{?_smp_mflags} +popd %install -%make_install LDCONFIG=echo +pushd build/ +%make_install LDCONFIG=true +popd # configure had no --disable-static rm -f "%buildroot/%_libdir"/*.a %check +pushd build/ make %{?_smp_mflags} check +popd %post -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig @@ -110,6 +107,6 @@ make %{?_smp_mflags} check %files devel %_includedir/lzlib.h %_libdir/liblz.so -%_infodir/lzlib.info%ext_info +%_infodir/lzlib.info* %changelog From 171f4692859d47a87b659e1139fb2c89d64f81714c6fd51f5c457e2f4e67c347 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 14 Dec 2018 12:08:24 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/Archiving/lzlib?expand=0&rev=20 --- lzlib.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lzlib.changes b/lzlib.changes index a79216f..5565e1e 100644 --- a/lzlib.changes +++ b/lzlib.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Fri Dec 14 11:42:47 UTC 2018 - Jan Engelhardt -- Update to new upstream release 1.11~rc2: +- Update to new upstream release 1.11~rc2 * In case of decompression error caused by corrupt or truncated data, LZ_decompress_read now does not signal the error immediately to the application, but waits until all decoded bytes have From ab7898471c5790acdc96996e625b7dd3359f9c40a8d6d9090f174358b0bf4d2c Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 6 Feb 2019 09:23:57 +0000 Subject: [PATCH 4/5] - Update License field as per SR 658030 review OBS-URL: https://build.opensuse.org/package/show/Archiving/lzlib?expand=0&rev=21 --- lzlib.changes | 5 +++++ lzlib.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lzlib.changes b/lzlib.changes index 5565e1e..873ee11 100644 --- a/lzlib.changes +++ b/lzlib.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 6 09:23:43 UTC 2019 - Jan Engelhardt + +- Update License field as per SR 658030 review + ------------------------------------------------------------------- Fri Dec 14 11:42:47 UTC 2018 - Jan Engelhardt diff --git a/lzlib.spec b/lzlib.spec index 3080aaf..043841a 100644 --- a/lzlib.spec +++ b/lzlib.spec @@ -1,7 +1,7 @@ # # spec file for package lzlib # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2012 Pascal Bleser # # All modifications and additions to the file contributed by third parties @@ -23,7 +23,7 @@ Release: 0 %define lname liblz1 %define xversion 1.11-rc2 Summary: LZMA Compression and Decompression Library -License: BSD-2-Clause +License: BSD-2-Clause AND GPL-2.0-or-later Group: Development/Libraries/C and C++ URL: https://www.nongnu.org/lzip/lzlib.html Source: https://download.savannah.gnu.org/releases/lzip/lzlib/%name-%xversion.tar.gz From 36e9e5dd8a173fee93a05b4784824d41728ef1581de72f3a38c850a282b8b64f Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 6 Feb 2019 09:25:48 +0000 Subject: [PATCH 5/5] - Move to final release 1.11 OBS-URL: https://build.opensuse.org/package/show/Archiving/lzlib?expand=0&rev=22 --- lzlib-1.11-rc2.tar.gz | 3 --- lzlib-1.11.tar.gz | 3 +++ lzlib.changes | 6 ++++++ lzlib.spec | 4 ++-- 4 files changed, 11 insertions(+), 5 deletions(-) delete mode 100644 lzlib-1.11-rc2.tar.gz create mode 100644 lzlib-1.11.tar.gz diff --git a/lzlib-1.11-rc2.tar.gz b/lzlib-1.11-rc2.tar.gz deleted file mode 100644 index 6f6342d..0000000 --- a/lzlib-1.11-rc2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:11848d7b8589e625f8813986ca6437a382799c55be6479d2bb6969a8aa38c0de -size 105695 diff --git a/lzlib-1.11.tar.gz b/lzlib-1.11.tar.gz new file mode 100644 index 0000000..9be19a0 --- /dev/null +++ b/lzlib-1.11.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6c5c5f8759d1ab7c4c3c53788ea2d9daad04aeddcf338226893f8ff134914d36 +size 105873 diff --git a/lzlib.changes b/lzlib.changes index 873ee11..8dc9e26 100644 --- a/lzlib.changes +++ b/lzlib.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Feb 6 09:25:28 UTC 2019 - Jan Engelhardt + +- Move to final release 1.11 + * No visible changes + ------------------------------------------------------------------- Wed Feb 6 09:23:43 UTC 2019 - Jan Engelhardt diff --git a/lzlib.spec b/lzlib.spec index 043841a..2d0c168 100644 --- a/lzlib.spec +++ b/lzlib.spec @@ -18,10 +18,10 @@ Name: lzlib -Version: 1.11~rc2 +Version: 1.11 Release: 0 %define lname liblz1 -%define xversion 1.11-rc2 +%define xversion 1.11 Summary: LZMA Compression and Decompression Library License: BSD-2-Clause AND GPL-2.0-or-later Group: Development/Libraries/C and C++