From fe2d187d694e80e98c0ebad7c85fcc45e0e5c0c5b2b74f57fe2216430376c667 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Schr=C3=B6der?= Date: Wed, 13 Dec 2023 13:38:30 +0000 Subject: [PATCH] update to rpm-4.19.1 OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=649 --- posttrans.diff | 4 +-- python-rpm.changes | 2 +- python-rpm.spec | 2 +- rpm-4.19.0.tar.bz2 | 3 -- rpm-4.19.1.tar.bz2 | 3 ++ rpm.changes | 3 +- rpm.spec | 2 +- rpmqpack.diff | 56 +++++++++++++++--------------- selinux_transactional_update.patch | 16 ++++----- 9 files changed, 45 insertions(+), 46 deletions(-) delete mode 100644 rpm-4.19.0.tar.bz2 create mode 100644 rpm-4.19.1.tar.bz2 diff --git a/posttrans.diff b/posttrans.diff index 1ba4d71..7df213a 100644 --- a/posttrans.diff +++ b/posttrans.diff @@ -350,8 +350,8 @@ + rpmtsEmpty(ts); + return rc; +} ---- rpm.c.orig 2023-09-19 10:10:10.000000000 +0000 -+++ rpm.c 2023-10-12 11:43:59.662617302 +0000 +--- tools/rpm.c.orig 2023-09-19 10:10:10.000000000 +0000 ++++ tools/rpm.c 2023-10-12 11:43:59.662617302 +0000 @@ -21,6 +21,7 @@ enum modes { MODE_ERASE = (1 << 2), MODE_RESTORE = (1 << 4), diff --git a/python-rpm.changes b/python-rpm.changes index b930939..4809906 100644 --- a/python-rpm.changes +++ b/python-rpm.changes @@ -7,7 +7,7 @@ Mon Oct 30 14:13:37 UTC 2023 - Matej Cepl ------------------------------------------------------------------- Wed Oct 11 17:07:14 CEST 2023 - mls@suse.de -- update to rpm-4.19.0 +- update to rpm-4.19.1 ------------------------------------------------------------------- Tue May 30 09:07:28 UTC 2023 - Jiri Srain diff --git a/python-rpm.spec b/python-rpm.spec index fcb1b73..bc94d6c 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.0 +Version: 4.19.1 Release: 0 Summary: Python Bindings for Manipulating RPM Packages License: GPL-2.0-or-later diff --git a/rpm-4.19.0.tar.bz2 b/rpm-4.19.0.tar.bz2 deleted file mode 100644 index 7ae6ab6..0000000 --- a/rpm-4.19.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b30916dc148cbeab077797e9fc365702931e3a9a7eacf70add84153b549b3f77 -size 5919326 diff --git a/rpm-4.19.1.tar.bz2 b/rpm-4.19.1.tar.bz2 new file mode 100644 index 0000000..d9a306e --- /dev/null +++ b/rpm-4.19.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4de4dcd82f2a46cf48a83810fe94ebda3d4719b45d547ed908b43752a7581df1 +size 5940447 diff --git a/rpm.changes b/rpm.changes index 0156b7e..a5567d9 100644 --- a/rpm.changes +++ b/rpm.changes @@ -6,7 +6,7 @@ Fri Oct 27 15:42:09 CEST 2023 - mls@suse.de ------------------------------------------------------------------- Wed Oct 11 17:07:14 CEST 2023 - mls@suse.de -- update to rpm-4.19.0 +- update to rpm-4.19.1 * new spec snippet support for dynamic spec generation * new sysusers.d integration for automated user and group handling * new CMake build system @@ -29,6 +29,7 @@ Wed Oct 11 17:07:14 CEST 2023 - mls@suse.de * rpm-findlang-inject-metainfo.patch * rpmqpack.diff * rpmrc.diff + * selinux_transactional_update.patch * weakdepscompat.diff * zstdpool.diff - deleted patches: diff --git a/rpm.spec b/rpm.spec index 1be4b29..08da00a 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.0 +Version: 4.19.1 Release: 0 URL: https://rpm.org/ #Git-Clone: https://github.com/rpm-software-management/rpm diff --git a/rpmqpack.diff b/rpmqpack.diff index e841c72..b5218a9 100644 --- a/rpmqpack.diff +++ b/rpmqpack.diff @@ -1,34 +1,15 @@ ---- CMakeLists.txt.orig 2023-10-09 12:50:53.949849590 +0000 -+++ CMakeLists.txt 2023-10-09 12:54:15.741481853 +0000 -@@ -403,6 +403,7 @@ add_executable(rpm2cpio rpm2cpio.c cliut - add_executable(rpmsign rpmsign.c cliutils) - add_executable(rpmbuild rpmbuild.c cliutils) - add_executable(rpmspec rpmspec.c cliutils) -+add_executable(rpmqpack rpmqpack.c) - - add_executable(rpmdeps tools/rpmdeps.c) - add_executable(rpmgraph tools/rpmgraph.c) -@@ -443,7 +444,7 @@ foreach(cmd rpmverify rpmquery) - endforeach() - install(TARGETS - rpm rpmdb rpmkeys rpm2cpio rpmsign rpmbuild rpmspec -- rpmlua rpmgraph rpmsort -+ rpmlua rpmgraph rpmsort rpmqpack - ) - install(TARGETS elfdeps rpmdeps rpmuncompress DESTINATION ${RPM_CONFIGDIR}) - ---- docs/man/CMakeLists.txt.orig 2023-10-09 12:55:04.805392271 +0000 -+++ docs/man/CMakeLists.txt 2023-10-09 12:55:18.745366812 +0000 -@@ -3,6 +3,7 @@ set(manuals +--- 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 +@@ -2,6 +2,7 @@ set(core gendiff.1 rpm2cpio.8 rpm.8 rpmbuild.8 rpmdb.8 rpmkeys.8 rpmsign.8 rpmspec.8 rpmdeps.8 rpmgraph.8 rpmlua.8 rpm-misc.8 rpmsort.8 + rpmqpack.8 ) - - if (WITH_ARCHIVE) ---- docs/man/rpmqpack.8.orig 2023-10-09 12:50:23.509904470 +0000 -+++ docs/man/rpmqpack.8 2023-10-09 12:50:23.509904470 +0000 + 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 @@ -0,0 +1,25 @@ +.TH RPMQPACK 8 "Mar 2002" +.SH NAME @@ -55,8 +36,27 @@ + +.SH AUTHOR +Michael Schroeder ---- rpmqpack.c.orig 2023-10-09 12:50:23.509904470 +0000 -+++ rpmqpack.c 2023-10-09 12:50:23.509904470 +0000 +--- tools/CMakeLists.txt.orig 2023-12-13 13:24:27.374021318 +0000 ++++ tools/CMakeLists.txt 2023-12-13 13:25:03.557966164 +0000 +@@ -7,6 +7,7 @@ add_executable(rpm2cpio rpm2cpio.c cliut + add_executable(rpmsign rpmsign.c cliutils) + add_executable(rpmbuild rpmbuild.c cliutils) + add_executable(rpmspec rpmspec.c cliutils) ++add_executable(rpmqpack rpmqpack.c) + + add_executable(rpmdeps rpmdeps.c) + add_executable(rpmgraph rpmgraph.c) +@@ -50,7 +51,7 @@ foreach(cmd rpmverify rpmquery) + endforeach() + install(TARGETS + rpm rpmdb rpmkeys rpm2cpio rpmsign rpmbuild rpmspec +- rpmlua rpmgraph rpmsort ++ rpmlua rpmgraph rpmsort rpmqpack + ) + install(TARGETS elfdeps 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 @@ -0,0 +1,60 @@ +#include +#include diff --git a/selinux_transactional_update.patch b/selinux_transactional_update.patch index bacc17f..a364713 100644 --- a/selinux_transactional_update.patch +++ b/selinux_transactional_update.patch @@ -1,14 +1,12 @@ ---- plugins/selinux.c.orig 2022-04-07 11:13:19.027518072 +0000 -+++ plugins/selinux.c 2022-12-02 13:59:42.185032111 +0000 -@@ -8,6 +8,7 @@ - #include - #include - #include "lib/rpmplugin.h" +--- plugins/selinux.c.orig 2023-12-12 10:57:31.000000000 +0000 ++++ plugins/selinux.c 2023-12-13 13:28:30.509647090 +0000 +@@ -1,3 +1,5 @@ +#include ++ + #include "system.h" - #include "debug.h" - -@@ -173,6 +174,13 @@ static rpmRC selinux_fsm_file_prepare(rp + #include +@@ -166,6 +168,13 @@ static rpmRC selinux_fsm_file_prepare(rp if (conrc == 0 || (conrc < 0 && errno == EOPNOTSUPP)) rc = RPMRC_OK;