diff --git a/xz-5.4.5.tar.gz b/xz-5.4.5.tar.gz deleted file mode 100644 index 905e207..0000000 --- a/xz-5.4.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:135c90b934aee8fbc0d467de87a05cb70d627da36abe518c357a873709e5b7d6 -size 2884510 diff --git a/xz-5.4.5.tar.gz.sig b/xz-5.4.5.tar.gz.sig deleted file mode 100644 index 8a1770a..0000000 Binary files a/xz-5.4.5.tar.gz.sig and /dev/null differ diff --git a/xz-5.4.6.tar.gz b/xz-5.4.6.tar.gz new file mode 100644 index 0000000..d2111e9 --- /dev/null +++ b/xz-5.4.6.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aeba3e03bf8140ddedf62a0a367158340520f6b384f75ca6045ccc6c0d43fd5c +size 2889306 diff --git a/xz-5.4.6.tar.gz.sig b/xz-5.4.6.tar.gz.sig new file mode 100644 index 0000000..2ff5950 Binary files /dev/null and b/xz-5.4.6.tar.gz.sig differ diff --git a/xz.changes b/xz.changes index 1f390b3..b02f56a 100644 --- a/xz.changes +++ b/xz.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Mon Jan 29 21:36:02 UTC 2024 - Danilo Spinella + +- Build static library on SLE + +------------------------------------------------------------------- +Sun Jan 28 10:10:07 UTC 2024 - Dirk Müller + +- update to 5.4.6: + * Fixed a bug involving internal function pointers in liblzma + not being initialized to NULL. The bug can only be + triggered if lzma_filters_update() is called on a LZMA1 + encoder, so it does not affect xz or any application known + to us that uses liblzma. + * Fixed a regression introduced in 5.4.2 that caused + encoding in the raw format to unnecessarily fail if --suffix + was not used. For instance, the following command no longer + reports that --suffix must be used: + echo foo | xz --format=raw --lzma2 | wc -c + * Fixed an issue on MinGW-w64 builds that prevented + reading from or writing to non-terminal character devices + like NUL. + * Added a new test. + ------------------------------------------------------------------- Tue Nov 7 16:10:26 UTC 2023 - Andrea Manzini @@ -451,7 +475,7 @@ Fri Sep 30 21:20:14 UTC 2022 - C J The uncompressed check is done first since that is more likely to occur than the unpadded or index field size overflows. - Vaccinate against an ill patch from RHEL/CentOS 7. - + * xzgrep: - Fix compatibility with old shells. Turns out that some old shells don't like apostrophes (') inside @@ -461,7 +485,7 @@ Fri Sep 30 21:20:14 UTC 2022 - C J a648978b20495b7aa4a8b029c5a810b5ad9d08ff (2022-07-19). 5.2.6 is the only stable release that included this problem. - + * Translations: Add Turkish translation. ------------------------------------------------------------------- @@ -750,7 +774,7 @@ Fri Dec 19 09:43:36 UTC 2014 - meissner@suse.com ------------------------------------------------------------------- Thu Dec 18 19:37:09 UTC 2014 - crrodriguez@opensuse.org -- Build XZ with full RELRO. +- Build XZ with full RELRO. ------------------------------------------------------------------- Tue Sep 23 00:11:27 UTC 2014 - andreas.stieger@gmx.de @@ -838,7 +862,7 @@ Fri Jul 6 10:18:06 UTC 2012 - sweet_f_a@gmx.de ------------------------------------------------------------------- Sun Feb 12 23:37:44 UTC 2012 - crrodriguez@opensuse.org -- Put libraries back in %{_libdir}, /usr merge project. +- Put libraries back in %{_libdir}, /usr merge project. ------------------------------------------------------------------- Sun Oct 9 15:25:02 UTC 2011 - sweet_f_a@gmx.de @@ -848,7 +872,7 @@ Sun Oct 9 15:25:02 UTC 2011 - sweet_f_a@gmx.de ------------------------------------------------------------------- Fri Sep 30 20:31:59 UTC 2011 - crrodriguez@opensuse.org -- Fix build in armv5el doesnt like profiling +- Fix build in armv5el doesnt like profiling ------------------------------------------------------------------- Tue Sep 27 13:05:34 UTC 2011 - sweet_f_a@gmx.de @@ -930,7 +954,7 @@ Thu Apr 7 20:43:05 UTC 2011 - crrodriguez@opensuse.org * "xzgrep -l foo bar.xz" works now. - * Polish translation was added. + * Polish translation was added. ------------------------------------------------------------------- Fri Mar 4 17:54:21 UTC 2011 - crrodriguez@opensuse.org @@ -966,7 +990,7 @@ Wed Oct 27 00:28:26 UTC 2010 - cristian.rodriguez@opensuse.org * Added support for XZ_DEFAULTS environment variable * The compression settings associated with the preset levels have been changed,they are now less likely to make compression worse. - * Support for "xz --list" was added + * Support for "xz --list" was added ------------------------------------------------------------------- Sat Apr 24 11:38:25 UTC 2010 - coolo@novell.com @@ -1005,12 +1029,12 @@ Thu Aug 20 15:51:47 CEST 2009 - coolo@novell.com ------------------------------------------------------------------- Sun Jun 7 19:39:45 CEST 2009 - crrodriguez@suse.de -- remove static libraries, see bnc#509945 for details +- remove static libraries, see bnc#509945 for details ------------------------------------------------------------------- Sun Feb 22 18:37:26 CET 2009 - ro@suse.de -- added baselibs.conf (for rpm-32bit) +- added baselibs.conf (for rpm-32bit) ------------------------------------------------------------------- Mon Feb 16 10:59:51 CET 2009 - coolo@suse.de diff --git a/xz.spec b/xz.spec index 3a0171a..d190312 100644 --- a/xz.spec +++ b/xz.spec @@ -1,7 +1,7 @@ # # spec file for package xz # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,16 +17,21 @@ # avoid bootstrapping problem +%if 0%{?suse_version} == 1500 +%bcond_without static +%else +%bcond_with static +%endif %define _binary_payload w9.bzdio Name: xz -Version: 5.4.5 +Version: 5.4.6 Release: 0 Summary: A Program for Compressing Files with the Lempel–Ziv–Markov algorithm License: GPL-2.0-or-later AND GPL-3.0-or-later AND LGPL-2.1-or-later AND SUSE-Public-Domain Group: Productivity/Archiving/Compression URL: https://tukaani.org/xz/ -Source0: https://tukaani.org/xz/%{name}-%{version}.tar.gz -Source1: https://tukaani.org/xz/%{name}-%{version}.tar.gz.sig +Source0: https://github.com/tukaani-project/xz/releases/download/v%{version}/xz-%{version}.tar.gz +Source1: https://github.com/tukaani-project/xz/releases/download/v%{version}/xz-%{version}.tar.gz.sig Source2: baselibs.conf Source3: https://tukaani.org/misc/jia_tan_pubkey.txt#/%{name}.keyring Source4: xznew @@ -73,6 +78,17 @@ Obsoletes: lzma-alpha-devel < %{version} This package contains the header files and libraries needed for compiling programs using the LZMA library. +%if %{with static} +%package static-devel +Summary: Static version of LZMA library +License: SUSE-Public-Domain +Group: Development/Libraries/C and C++ +Requires: lzma-devel = %{version} + +%description static-devel +Static library for the LZMA library +%endif + %prep %autosetup @@ -80,6 +96,15 @@ compiling programs using the LZMA library. %global _lto_cflags %{_lto_cflags} -ffat-lto-objects export CFLAGS="%{optflags} -D_REENTRANT -pipe -fPIE" export LDFLAGS="-Wl,-z,relro,-z,now -pie" +# Either we build it without pic enabled, or we build one at a time +%if %{with static} +%configure \ + --with-pic \ + --docdir=%{_docdir}/%{name} \ + --disable-shared CONFIG_SHELL=/bin/sh +%make_build +cp ./src/liblzma/.libs/liblzma.a liblzma.a +%endif %configure \ --with-pic \ --docdir=%{_docdir}/%{name} \ @@ -102,6 +127,9 @@ find %{buildroot} -type f -name "*.la" -delete -print %find_lang %{name} --all-name --with-man install -Dpm 0755 %{SOURCE4} %{buildroot}%{_bindir}/xznew install -Dpm 0644 %{SOURCE5} %{buildroot}%{_mandir}/man1/xznew.1 +%if %{with static} +install -Dpm 0644 liblzma.a %{buildroot}%{_libdir}/ +%endif rm -vf %{buildroot}%{_docdir}/%{name}/{COPYING,COPYING.GPLv2} %post -n liblzma5 -p /sbin/ldconfig @@ -178,4 +206,10 @@ rm -vf %{buildroot}%{_docdir}/%{name}/{COPYING,COPYING.GPLv2} %{_libdir}/liblzma.so %{_libdir}/pkgconfig/liblzma.pc +%if %{with static} +%files static-devel +%defattr(-, root, root) +%{_libdir}/liblzma.a +%endif + %changelog