Accepting request 1142679 from Base:System

OBS-URL: https://build.opensuse.org/request/show/1142679
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xz?expand=0&rev=84

xz-5.4.5.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:135c90b934aee8fbc0d467de87a05cb70d627da36abe518c357a873709e5b7d6
-size 2884510

xz-5.4.6.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:aeba3e03bf8140ddedf62a0a367158340520f6b384f75ca6045ccc6c0d43fd5c
+size 2889306

xz.changes

@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Mon Jan 29 21:36:02 UTC 2024 - Danilo Spinella <danilo.spinella@suse.com>
+
+- Build static library on SLE
+
+-------------------------------------------------------------------
+Sun Jan 28 10:10:07 UTC 2024 - Dirk Müller <dmueller@suse.com>
+
+- 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 <andrea.manzini@suse.com>
 

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
+Source0:        https://github.com/tukaani-project/xz/releases/download/v%{version}/xz-%{version}.tar.gz
-Source1:        https://tukaani.org/xz/%{name}-%{version}.tar.gz.sig
+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