diff --git a/canongnu.diff b/canongnu.diff index fed586e..cd8e81d 100644 --- a/canongnu.diff +++ b/canongnu.diff @@ -1,11 +1,32 @@ ---- CMakeLists.txt.orig 2023-10-13 12:38:26.953411554 +0000 -+++ CMakeLists.txt 2023-10-13 12:40:11.057239934 +0000 -@@ -144,7 +144,7 @@ function(makemacros) +--- CMakeLists.txt.orig 2024-02-07 09:57:31.944781372 +0000 ++++ CMakeLists.txt 2024-02-07 09:57:51.924739495 +0000 +@@ -138,14 +138,26 @@ function(makemacros) + + list(GET db_backends 0 DB_BACKEND) + +- set(host_cpu ${CMAKE_HOST_SYSTEM_PROCESSOR}) ++ if (RPM_HOST_SYSTEM_CPU) ++ set(host_cpu ${RPM_HOST_SYSTEM_CPU}) ++ else() ++ set(host_cpu ${CMAKE_HOST_SYSTEM_PROCESSOR}) ++ endif() + string(TOLOWER ${CMAKE_HOST_SYSTEM_NAME} host_os) + set(host_vendor ${RPM_VENDOR}) +- set(host ${host_cpu}-${host_vendor}-${host_os}) ++ if (RPM_HOST_SYSTEM_ABI) ++ set(host ${host_cpu}-${host_vendor}-${host_os}-${RPM_HOST_SYSTEM_ABI}) ++ else() ++ set(host ${host_cpu}-${host_vendor}-${host_os}) ++ endif() set(RPMCANONVENDOR ${host_vendor}) set(RPMCANONOS ${host_os}) - set(RPMCANONGNU -gnu) -+ set(RPMCANONGNU -gnu CACHE STRING "gnu os suffix") ++ if (RPM_HOST_SYSTEM_ABI) ++ set(RPMCANONGNU -${RPM_HOST_SYSTEM_ABI}) ++ else() ++ set(RPMCANONGNU -gnu) ++ endif() if (ENABLE_CUTF8) set(C_LOCALE "C.UTF-8") diff --git a/python-rpm.changes b/python-rpm.changes index 808fb53..cee2dd7 100644 --- a/python-rpm.changes +++ b/python-rpm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Feb 9 11:34:31 CET 2024 - mls@suse.de + +- update to rpm-4.19.1.1 + ------------------------------------------------------------------- Thu Feb 1 15:07:34 CET 2024 - mls@suse.de diff --git a/python-rpm.spec b/python-rpm.spec index 91ef653..5651fc8 100644 --- a/python-rpm.spec +++ b/python-rpm.spec @@ -20,7 +20,7 @@ # Enable Python build sourced from rpm spec %global with_python 1 Name: python-rpm -Version: 4.19.1 +Version: 4.19.1.1 Release: 0 Summary: Python Bindings for Manipulating RPM Packages License: GPL-2.0-or-later diff --git a/rpm-4.19.1.1.tar.bz2 b/rpm-4.19.1.1.tar.bz2 new file mode 100644 index 0000000..44cfb57 --- /dev/null +++ b/rpm-4.19.1.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:874091b80efe66f9de8e3242ae2337162e2d7131e3aa4ac99ac22155e9c521e5 +size 5849649 diff --git a/rpm-4.19.1.tar.bz2 b/rpm-4.19.1.tar.bz2 deleted file mode 100644 index d9a306e..0000000 --- a/rpm-4.19.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4de4dcd82f2a46cf48a83810fe94ebda3d4719b45d547ed908b43752a7581df1 -size 5940447 diff --git a/rpm.changes b/rpm.changes index 399deaf..0eb9f01 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Fri Feb 9 11:34:31 CET 2024 - mls@suse.de + +- update to rpm-4.19.1.1 + * don't warn about missing user/group on skipped files + * make user/group lookup caching thread-safe + * fix regression in Lua scriptlet runaway child detection + * restore readline support as an explicit option +- refreshed patches: + * rpmqpack.diff +- fix _host_cpu being wrong on arm and ppc + +------------------------------------------------------------------- +Wed Feb 7 10:34:35 CET 2024 - mls@suse.de + +- fix %_host not containing the abi suffix on arm [bnc#1219627] + updated patch: canongnu.diff + ------------------------------------------------------------------- Fri Feb 2 15:27:57 UTC 2024 - Ben Greiner diff --git a/rpm.spec b/rpm.spec index d09115a..3ef7166 100644 --- a/rpm.spec +++ b/rpm.spec @@ -57,7 +57,7 @@ Requires: rpm-config-SUSE Summary: The RPM Package Manager License: GPL-2.0-or-later Group: System/Packages -Version: 4.19.1 +Version: 4.19.1.1 Release: 0 URL: https://rpm.org/ #Git-Clone: https://github.com/rpm-software-management/rpm @@ -242,11 +242,18 @@ export LDFLAGS="-Wl,-Bsymbolic-functions -ffunction-sections" export CFLAGS="-g -O0 -fno-strict-aliasing -ffunction-sections" %endif +cpu="%{_target_cpu}" +# convert to gnu style cpu version, see config.sub +%ifarch ppc ppc64 ppc64le +cpu="${cpu/#ppc/powerpc}" +%endif + mkdir _build cd _build cmake .. \ + -DRPM_HOST_SYSTEM_CPU="$cpu" \ %ifarch %arm - -DRPMCANONGNU=-gnueabi \ + -DRPM_HOST_SYSTEM_ABI=gnueabi \ %endif -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \ -DCMAKE_INSTALL_MANDIR:PATH=share/man \ @@ -260,6 +267,7 @@ cmake .. \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DRPM_VENDOR=suse \ -DWITH_ARCHIVE=OFF \ + -DWITH_READLINE=OFF \ -DWITH_SELINUX=ON \ -DWITH_INTERNAL_OPENPGP=ON \ -DENABLE_NDB=ON \ diff --git a/rpmqpack.diff b/rpmqpack.diff index b5218a9..faee0f1 100644 --- a/rpmqpack.diff +++ b/rpmqpack.diff @@ -1,5 +1,5 @@ ---- docs/man/CMakeLists.txt.orig 2023-12-12 10:57:31.000000000 +0000 -+++ docs/man/CMakeLists.txt 2023-12-13 13:23:17.166128333 +0000 +--- docs/man/CMakeLists.txt.orig 2024-02-07 13:36:51.000000000 +0000 ++++ docs/man/CMakeLists.txt 2024-02-09 10:36:43.300952115 +0000 @@ -2,6 +2,7 @@ set(core gendiff.1 rpm2cpio.8 rpm.8 rpmbuild.8 rpmdb.8 rpmkeys.8 rpmsign.8 rpmspec.8 @@ -8,8 +8,8 @@ ) set(extra rpm2archive.8 rpm-plugins.8 rpm-plugin-prioreset.8 rpm-plugin-syslog.8 ---- docs/man/rpmqpack.8.orig 2023-12-13 13:23:17.166128333 +0000 -+++ docs/man/rpmqpack.8 2023-12-13 13:23:17.166128333 +0000 +--- docs/man/rpmqpack.8.orig 2024-02-09 10:36:43.300952115 +0000 ++++ docs/man/rpmqpack.8 2024-02-09 10:36:43.300952115 +0000 @@ -0,0 +1,25 @@ +.TH RPMQPACK 8 "Mar 2002" +.SH NAME @@ -36,8 +36,8 @@ + +.SH AUTHOR +Michael Schroeder ---- tools/CMakeLists.txt.orig 2023-12-13 13:24:27.374021318 +0000 -+++ tools/CMakeLists.txt 2023-12-13 13:25:03.557966164 +0000 +--- tools/CMakeLists.txt.orig 2024-02-07 13:36:51.000000000 +0000 ++++ tools/CMakeLists.txt 2024-02-09 10:37:32.932875459 +0000 @@ -7,6 +7,7 @@ add_executable(rpm2cpio rpm2cpio.c cliut add_executable(rpmsign rpmsign.c cliutils) add_executable(rpmbuild rpmbuild.c cliutils) @@ -46,17 +46,17 @@ add_executable(rpmdeps rpmdeps.c) add_executable(rpmgraph rpmgraph.c) -@@ -50,7 +51,7 @@ foreach(cmd rpmverify rpmquery) +@@ -60,7 +61,7 @@ foreach(cmd rpmverify rpmquery) endforeach() install(TARGETS rpm rpmdb rpmkeys rpm2cpio rpmsign rpmbuild rpmspec -- rpmlua rpmgraph rpmsort -+ rpmlua rpmgraph rpmsort rpmqpack +- rpmlua rpmgraph ++ rpmlua rpmgraph rpmqpack ) - install(TARGETS elfdeps rpmdeps rpmuncompress DESTINATION ${RPM_CONFIGDIR}) + install(TARGETS rpmdeps rpmuncompress DESTINATION ${RPM_CONFIGDIR}) ---- tools/rpmqpack.c.orig 2023-12-13 13:23:17.166128333 +0000 -+++ tools/rpmqpack.c 2023-12-13 13:23:17.166128333 +0000 +--- tools/rpmqpack.c.orig 2024-02-09 10:36:43.300952115 +0000 ++++ tools/rpmqpack.c 2024-02-09 10:36:43.300952115 +0000 @@ -0,0 +1,60 @@ +#include +#include