Open Build Service

_service:tar_scm_kernel_repo:rpm.spec Changed

@@ -1,6 +1,6 @@
 Name:          rpm
 Version:       4.17.0
-Release:       36
+Release:       37
 Summary:       RPM Package Manager
 License:       GPLv2+
 URL:           http://www.rpm.org/
@@ -121,6 +121,12 @@
 Patch6083: backport-Fix-a-memleak-on-invalid-command-line-options.patch
 Patch6084: backport-Let-eBPF-ELF-files-be-packaged-in-noarch-packages.patch
 Patch6085: fix-macros-autopath-num-error.patch
+Patch6086: backport-Fix-some-int-enum-confusion-in-the-build-code.patch
+Patch6087: backport-Use-the-internal-DB_CTRL-enum-for-intenal-uses-consi.patch
+Patch6088: backport-An-enumeration-is-not-a-bitfield-use-an-integer-inst.patch
+Patch6089: backport-Fix-an-enum-int-type-mismatch-in-rpmfiArchiveReadToF.patch
+Patch6090: backport-Fix-an-enum-int-type-mismatch-in-transaction-verify-.patch
+Patch6091: backport-Fix-enum-type-mismatch-in-rpmTagGetValue.patch
 
 BuildRequires: gcc autoconf automake libtool make gawk popt-devel openssl-devel readline-devel
 BuildRequires: zlib-devel zstd-devel >= 1.3.8 xz-devel bzip2-devel libarchive-devel ima-evm-utils-devel
@@ -411,6 +417,9 @@
 %{_mandir}/man1/gendiff.1*
 
 %changelog
+* Tue May 7 2024 gengqihu<gengqihu2@h-partners.com> - 4.17.0-37
+- Backport some patches from upstream
+
 * Tue Mar 26 2024 yangchenguang <yangchenguang@kylinsec.com.cn> - 4.17.0-36
 - fix macros autopath num error

_service:tar_scm_kernel_repo:backport-An-enumeration-is-not-a-bitfield-use-an-integer-inst.patch Added

@@ -0,0 +1,38 @@
+From 7108c172f4e60c83ecc1eeb2a766eb7eaa5956d7 Mon Sep 17 00:00:00 2001
+From: Panu Matilainen <pmatilai@redhat.com>
+Date: Fri, 15 Mar 2024 10:03:26 +0200
+Subject: [PATCH] An enumeration is not a bitfield, use an integer instead
+
+Enums are good for individual bitfield flag names, but combination of
+the bits is not a legit value really.
+
+Conflict:don't modify rpmfileutil.h because 8ef29094fa is not mearged; modify
+rpmio/rpmmacro.h instead of include/rpm/rpmmacro.h because 650ba79f is not
+mearged; adapt context.
+Reference:https://github.com/rpm-software-management/rpm/commit/7108c172f4e60c83ecc1eeb2a766eb7eaa5956d7
+
+---
+ rpmio/rpmmacro.h    | 5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/rpmio/rpmmacro.h b/rpmio/rpmmacro.h
+index 979763a76..7b23fda59 100644
+--- a/rpmio/rpmmacro.h
++++ b/rpmio/rpmmacro.h
+@@ -62,10 +62,11 @@ extern const char * macrofiles;
+ /* rpm macro expansion flags */
+ #define RPMEXPAND_EXPAND_ARGS	(1 << 0)	/*!< expand arguments of parametric macros */
+ 
+-typedef enum rpmMacroFlags_e {
++enum rpmMacroFlags_e {
+     RPMMACRO_DEFAULT	= 0,
+     RPMMACRO_LITERAL	= (1 << 0),		/*!< do not expand body of macro */
+-} rpmMacroFlags;
++};
++typedef rpmFlags rpmMacroFlags;
+ 
+ /** \ingroup rpmmacro
+  * Print macros to file stream.
+-- 
+2.33.0
+

_service:tar_scm_kernel_repo:backport-Fix-an-enum-int-type-mismatch-in-rpmfiArchiveReadToF.patch Added

@@ -0,0 +1,33 @@
+From 6c01f4c84f768b6c6b247a11106bf51b40015e66 Mon Sep 17 00:00:00 2001
+From: Panu Matilainen <pmatilai@redhat.com>
+Date: Mon, 18 Mar 2024 09:56:51 +0200
+Subject: [PATCH] Fix an enum/int type mismatch in rpmfiArchiveReadToFilePsm()
+
+rpmfiDigestAlgo() hysterically returns a signed int (and that's what
+really ought to be changed) but lets at least make all these uses
+consistent.
+
+Conflict:modify pgpHashAlgo instead of rpmHashAlgo because
+01d6605d93e9b5 is not mearged.
+Reference:https://github.com/rpm-software-management/rpm/commit/6c01f4c84f768b6c6b247a11106bf51b40015e66
+
+---
+ lib/rpmfi.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/rpmfi.c b/lib/rpmfi.c
+index cfb388b4c..db1460711 100644
+--- a/lib/rpmfi.c
++++ b/lib/rpmfi.c
+@@ -2384,7 +2384,7 @@ int rpmfiArchiveReadToFilePsm(rpmfi fi, FD_t fd, int nodigest, rpmpsm psm)
+ 
+     rpm_loff_t left = rpmfiFSize(fi);
+     const unsigned char * fidigest = NULL;
+-    pgpHashAlgo digestalgo = 0;
++    int digestalgo = 0;
+     int rc = 0;
+     char buf[BUFSIZ*4];
+ 
+-- 
+2.33.0
+

_service:tar_scm_kernel_repo:backport-Fix-an-enum-int-type-mismatch-in-transaction-verify-.patch Added

_service:tar_scm_kernel_repo:backport-Fix-enum-type-mismatch-in-rpmTagGetValue.patch Added

_service:tar_scm_kernel_repo:backport-Fix-some-int-enum-confusion-in-the-build-code.patch Added

@@ -0,0 +1,68 @@
+From f2eb6fa6ba77fbf5f62add8a01544cce8c0beb6b Mon Sep 17 00:00:00 2001
+From: Panu Matilainen <pmatilai@redhat.com>
+Date: Fri, 15 Mar 2024 16:41:28 +0200
+Subject: [PATCH] Fix some int/enum confusion in the build code
+
+These things are not really returning rpmRC values, especially as they
+need to pass around RPMRC_MISSINGBUILDREQUIRES which is not part of the
+enum.
+
+For doRmSource(), 0 and 1 aren't any more enums values than 0 and -1 are,
+and besides, the sole caller isn't even checking the return code.
+
+Conflict:NA
+Reference:https://github.com/rpm-software-management/rpm/commit/f2eb6fa6ba77fbf5f62add8a01544cce8c0beb6b
+
+---
+ build/build.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/build/build.c b/build/build.c
+index 8e6c8f842..69ab69fc9 100644
+--- a/build/build.c
++++ b/build/build.c
+@@ -78,7 +78,7 @@ static char * buildHost(void)
+ 
+ /**
+  */
+-static rpmRC doRmSource(rpmSpec spec)
++static int doRmSource(rpmSpec spec)
+ {
+     struct Source *p;
+     Package pkg;
+@@ -100,7 +100,7 @@ static rpmRC doRmSource(rpmSpec spec)
+ 	}
+     }
+ exit:
+-    return !rc ? 0 : 1;
++    return rc;
+ }
+ 
+ /*
+@@ -290,9 +290,9 @@ static int doBuildRequires(rpmSpec spec, int test)
+     return rc;
+ }
+ 
+-static rpmRC doCheckBuildRequires(rpmts ts, rpmSpec spec, int test)
++static int doCheckBuildRequires(rpmts ts, rpmSpec spec, int test)
+ {
+-    rpmRC rc = RPMRC_OK;
++    int rc = RPMRC_OK;
+     rpmps ps = rpmSpecCheckDeps(ts, spec);
+ 
+     if (ps) {
+@@ -323,9 +323,9 @@ static rpmRC doBuildDir(rpmSpec spec, int test, StringBuf *sbp)
+     return rc;
+ }
+ 
+-static rpmRC buildSpec(rpmts ts, BTA_t buildArgs, rpmSpec spec, int what)
++static int buildSpec(rpmts ts, BTA_t buildArgs, rpmSpec spec, int what)
+ {
+-    rpmRC rc = RPMRC_OK;
++    int rc = RPMRC_OK;
+     int missing_buildreqs = 0;
+     int test = (what & RPMBUILD_NOBUILD);
+     char *cookie = buildArgs->cookie ? xstrdup(buildArgs->cookie) : NULL;
+-- 
+2.33.0
+

_service:tar_scm_kernel_repo:backport-Use-the-internal-DB_CTRL-enum-for-intenal-uses-consi.patch Added

Changes of Revision 35