diff --git a/xz-5.4.2.tar.gz b/xz-5.4.2.tar.gz new file mode 100644 index 0000000..c3b69b7 --- /dev/null +++ b/xz-5.4.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:87947679abcf77cc509d8d1b474218fd16b72281e2797360e909deaee1ac9d05 +size 2799022 diff --git a/xz-5.4.2.tar.gz.sig b/xz-5.4.2.tar.gz.sig new file mode 100644 index 0000000..7876e92 Binary files /dev/null and b/xz-5.4.2.tar.gz.sig differ diff --git a/xz-5.4.6.tar.gz b/xz-5.4.6.tar.gz deleted file mode 100644 index d2111e9..0000000 --- a/xz-5.4.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index 2ff5950..0000000 Binary files a/xz-5.4.6.tar.gz.sig and /dev/null differ diff --git a/xz.changes b/xz.changes index 41cc3d6..8a06f28 100644 --- a/xz.changes +++ b/xz.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Fri Apr 12 16:22:12 UTC 2024 - Dirk Müller + +- revert the switch to tar_scm which dropped the signature + validation +- switch back to tarballs because the upstream tarballs are not + gone +- reinstanciate keyring from Lasse +- go back to the last release signed by Lasse (5.4.2) +- revert multibuild, drop service and rpmlintrc +- use real_ver for the Source, move everything else back to + %version like before the hectic XZ downgrade +- remove payload setting, we are using zstd now + +------------------------------------------------------------------- +Thu Apr 4 07:16:46 UTC 2024 - Dan Čermák + +- Switch to using tar_scm for fetching the sources as the upstream + tarballs on github are gone +- introduce _multibuild to allow building the translations outside + of Ring0 and everything else in Ring0 +- add rpmlintrc to silence harmless warnings + ------------------------------------------------------------------- Thu Mar 28 13:51:05 UTC 2024 - Dirk Müller diff --git a/xz.keyring b/xz.keyring index 597d039..c62c840 100644 --- a/xz.keyring +++ b/xz.keyring @@ -1,52 +1,52 @@ -----BEGIN PGP PUBLIC KEY BLOCK----- -mQINBGOsX3EBEADZxyfiZVg7aub+JoBG+sPChHUwbJc+SH7BWOPbu4HLNfk6ZUzi -/JSBYIGIIrqGkA60Pu1CbplkVF4UG0YBAAE/j11puWMHrydxTY9Hoc/rYOBq+0AE -mWnG0VINjpF3dNGlrmlikORzpW/FAHy8B1nD8P7vulPooc9FgkOmFM8nAP24TURU -h8G8cGY0jqpVxTiQqAi9KPxTlnY5s7hhgW0Nd3mIF4QSoPofMPnV5DTYS1LJw6XB -9K3DR4bsD7YYF2TdYGvlk/bJNu9DB1NuiWjpnzLIkPdtxpcPORXgiWE6wvzFncJn -G5tqbdQ//ylZAjOFbCntMMO7ve3JXWjEM6mDEuqlmlaHrF21Y+mQN5i2BdRKfMiQ -HB9KsveTz2Ev4cO9Tblzsm/oDvYR29LORjJl3PE3jqNSVbABih2OGnMAS9345a5u -n1vyP3x6/oAyZ7Q0iKzZml47nsl40dQk4z3aJp9ya3lph5ANQP3uzwQtDSZgkDy/ -JDyIL/z19FtAgA7QugWkx4HsSzmZnE5GQJImA0/XxXYNck2NqQ9YJ/RY8W3aD4dp -mnFAYE1Yi5kutrVlfqzKujBpi3/JfSM1hkJdcRJ7rrOw69JXVvbqVW1EiX8gp8Ka -GV6g0MN/G15dJT/AMY9/XwEFIYP7vZl32Qx7A67jokNB7bKCZxWexppRrQARAQAB -tBxKaWEgVGFuIDxqaWF0MDIxOEBnbWFpbC5jb20+iQJUBBMBCgA+FiEEItRl8rTB -c4A7IMbeWfzyB/6n9EUFAmOsX3ECGwMFCQlmAYAFCwkIBwIGFQoJCAsCBBYCAwEC -HgECF4AACgkQWfzyB/6n9EXJkhAAvvfTCu2w8FReaAv954ublcN6SFBuyXcXPeNZ -46ZBm6LfMErbj6wGyLzXiU3WMuPvwDliX5/Etkhj+juj/XlAK7DtRUa8Jf6R2u1o -FaGodx63gjzEoOXrSYoWt1ANwADLnMp5MT1P14PHJcCKSyj2qcVOaKVvWYRw2Yeo -Kd8tc0Wcm2NPxCk+nzUVPT8bO62kJN4pnalWA3ultozZiSoqcMelwI8czYUY3TiB -L+FqOUR2438TFnWDGnaI37ZXkjTYSEIRuneo3vjLcJDmSwrdyL3NsIbXySnN8ga3 -kZi6hgjIS/Th3KhKzyWpuj9ydBMAMniYUBRFbKl/pH8PtzQ258ToxVjiG/hBrEbq -X0P8RyAd6YiiHDOPjPqj1lnNeeliIytBtHzH1HB3a2Eg5ZY7iG4DMg82IU/qcL9l -aPHslYi93LhvaUR+APAjhd71PAexXxQkEtsUOPPybFTCVrG679RCLeV4M32PZ99c -BGY0ekPo653ITaAwBQyZJvAVsP5A0gbRPYok/c/qE+lfF8UuPPyUOBk0IYyiA4MR -W7qSu2gFkOHT5yJgyd7MtvzJvzVnt3kTQCsQdNGAIZ8NTx6PbWj9qtSmpXz3H+XR -JH/9xvXhL3v22q82uBfAEMk3h31KFESGo5pwarthwfQvQL/6MumdLJELXzijAY0v -w9nxEOW5Ag0EY6xfcQEQANCo3Vf8eHyTlhvusQ4inItxocgY06JhgBCkw9m/YiVI -0Pekf0WatCy1fNIJJlyNgjQGQ+37pLP6d2xwzdJc8Gm15bGlfrth5aYfNdcBLR1S -MJ7JnX0zcjRiPwI+Z8XAVoGu7vzGIScEopDMiI4xTdc7GlgPyE27Gd2A0MwzR2lQ -i03aSLloXh6h+j7GL4C3fYg+/Xct/w5d1stNWDpqOl3BQqrcT9PcvhZTSC93g4YW -hBFNZiYFL0pMg+Wg62/yJ49mjWOkcPKdhKmWDOx6vV88Pabwxh+sSKaWh3DZ23pW -iMohEN0tynwMIK1DT4D7BxuP4gCKhPkfxcL8dMkFHbqdgfUEgdDr1Ritxt4El3AZ -oCk3GSc0uESAWp1NQcM7ZiuWlmT90I0cHPmfxJLV6tRIM0iCxmowuVGQP82/qbT1 -C6G66HgRMmA5CnaUsDa1vVxMF8trdU8Pkr6OpPn12gmwz31j1JxvSq4RwSxLl77w -H3kTJY3qO/lMYhqx0+mK57CPaYsjoqA5xnqzVdtwfJI3tPwttlrjfoDQSn2baZu5 -9pvYC/IVxOgjTiyIguS8LSBj08iOqZLoLBuqPDzkQwvcCL8TcxEde2yoDi6wI+Ws -XevpBcY2fkItqcRDiPQJ7FuEAnRAa8SfcFLUG9cwHg7RmeSp5WrfOw+7xdqj1ImF -ABEBAAGJAjwEGAEKACYWIQQi1GXytMFzgDsgxt5Z/PIH/qf0RQUCY6xfcQIbDAUJ -CWYBgAAKCRBZ/PIH/qf0RW8dD/9tQqJ4bcRXLPXrQzbBiMpRBiLqRxlpeS2nwFUr -ryv7JCbAbgZ4GqKa3tR/5oUfICZwgSJhVUMeFfUtDAOuLVRBEHAksVxztUxpAVzF -2tH6ZrvTI26tzFQw5U+xrTEl3eazNgZF6Qsqv5313RI8SrUAhv95s0A8CdVIi3RZ -5LPPsoT/XggtaSz28iSaZxDChjY5jNNvC8sjp445+egpglXxjR24otShUDaZLd6Y -LfMHTR1raOoIZd8lbRoUAJ32vkXu2UUPgI6GC0HaEyHQQ3faG5SGUrcWuA6XOD9p -7Xtu3SDgAUE6gbxUeCQWiFm2c+dEoldtr4n3BXIOOKfPHi/hiNVDmGWzPsB2XzCb -oUPHfWj4p54I+IFf+wt3IuR0H9OqXipL/9yE2cHkp7zaIVuc43xPa2FVOkJL0XnF -M67tSMKVaKFA6myewHDrteBDyZVt4IH8clejhs6cwWOf9DOcbPQO1C94vMc+Glah -oCL0FGS1mU/CumiNB1zCP0o29IUXQvLk/mM8w/zL65sfilbfm7kLk1l8UOy/pUxk -4U9Kpv79Z7aIUwSZVXkkfQuHlmGCm0y6QKLTaZQL68uDXrMpWO2O2B+tOCJibGFz -ecPedd7w77GKqjMHXcVX3Hd2wnZAMTwIJsjHG4qO/LfA8jze5+Ohd3qzilP7ziwm -aK5MKg== -=d3XT +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 +888/gToe5kb8qYwy +=6rZC -----END PGP PUBLIC KEY BLOCK----- diff --git a/xz.spec b/xz.spec index 6330c41..3c30e74 100644 --- a/xz.spec +++ b/xz.spec @@ -22,7 +22,9 @@ %else %bcond_with static %endif -%define _binary_payload w9.bzdio + +%global real_ver 5.4.2 + Name: xz Version: 5.6.1.revertto5.4 Release: 0 @@ -30,15 +32,15 @@ Summary: A Program for Compressing Files with the Lempel–Ziv–Markov a License: 0BSD AND GPL-2.0-or-later AND GPL-3.0-or-later AND LGPL-2.1-or-later Group: Productivity/Archiving/Compression URL: https://tukaani.org/xz/ -Source0: https://github.com/tukaani-project/xz/releases/download/v5.4.6/xz-5.4.6.tar.gz -Source1: https://github.com/tukaani-project/xz/releases/download/v5.4.6/xz-5.4.6.tar.gz.sig +Source0: https://github.com/tukaani-project/xz/releases/download/v%{real_ver}/xz-%{real_ver}.tar.gz +Source1: https://github.com/tukaani-project/xz/releases/download/v%{real_ver}/xz-%{real_ver}.tar.gz.sig Source2: baselibs.conf -Source3: https://tukaani.org/misc/jia_tan_pubkey.txt#/%{name}.keyring +Source3: https://tukaani.org/misc/lasse_collin_pubkey.txt#/xz.keyring Source4: xznew Source5: xznew.1 BuildRequires: pkgconfig -Provides: lzma = 5.4.6 -Obsoletes: lzma < 5.4.6 +Provides: lzma = %{version} +Obsoletes: lzma < %{version} %{?suse_build_hwcaps_libs} %description @@ -54,13 +56,13 @@ The xz command is a program for compressing files. decompressing speed. * Very similar command line interface to what gzip and bzip2 have. + %lang_package %package -n liblzma5 Summary: Lempel–Ziv–Markov chain algorithm compression library License: 0BSD Group: System/Libraries -Provides: liblzma5 = 5.4.6 %description -n liblzma5 Library for encoding/decoding LZMA files. @@ -69,11 +71,11 @@ Library for encoding/decoding LZMA files. Summary: Development package for the LZMA library License: 0BSD Group: Development/Libraries/C and C++ -Requires: liblzma5 = 5.4.6 -Provides: lzma-devel = 5.4.6 -Obsoletes: lzma-devel < 5.4.6 -Provides: lzma-alpha-devel = 5.4.6 -Obsoletes: lzma-alpha-devel < 5.4.6 +Requires: liblzma5 = %{version} +Provides: lzma-devel = %{version} +Obsoletes: lzma-devel < %{version} +Provides: lzma-alpha-devel = %{version} +Obsoletes: lzma-alpha-devel < %{version} %description devel This package contains the header files and libraries needed for @@ -84,25 +86,27 @@ compiling programs using the LZMA library. Summary: Static version of LZMA library License: SUSE-Public-Domain Group: Development/Libraries/C and C++ -Requires: lzma-devel = 5.4.6 +Requires: xz-devel = %{version} %description static-devel Static library for the LZMA library %endif %prep -%autosetup -n xz-5.4.6 +%autosetup -n xz-%{real_ver} %build %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 @@ -136,15 +140,6 @@ rm -vf %{buildroot}%{_docdir}/%{name}/{COPYING,COPYING.GPLv2} %post -n liblzma5 -p /sbin/ldconfig %postun -n liblzma5 -p /sbin/ldconfig -%files lang -f %{name}.lang -%dir %{_mandir}/fr -%dir %{_mandir}/de -%dir %{_mandir}/ko -%if 0%{?suse_version} == 1500 -%dir %{_mandir}/ro -%dir %{_mandir}/uk -%endif - %files %license COPYING COPYING.GPLv2 %{_docdir}/%{name} @@ -197,6 +192,15 @@ rm -vf %{buildroot}%{_docdir}/%{name}/{COPYING,COPYING.GPLv2} %{_mandir}/man1/xzmore.1%{?ext_man} %{_mandir}/man1/xznew.1%{?ext_man} +%files lang -f %{name}.lang +%dir %{_mandir}/fr +%dir %{_mandir}/de +%dir %{_mandir}/ko +%if 0%{?suse_version} == 1500 +%dir %{_mandir}/ro +%dir %{_mandir}/uk +%endif + %files -n liblzma5 %{_libdir}/liblzma.so.5*