mirror of
https://git.yoctoproject.org/poky
synced 2026-07-19 16:57:03 +00:00
Alexander Kanavin
a3db95dc42
Summary of changes from RPM 4.18.0 General bugfixes and enhancements Command line Fix signature reserved space not restored on --delsign (#2382, regression in 4.15.0) Copy original lead on signing instead of recreating (#1326, regression in 4.14.0) Issue a warning when signing created an OpenPGP v3 signature (#2286) Transactions Fix install of block and character special files (#2195, #2275, regression in 4.18.0) Handle downgrade within V-R when epoch goes away (RhBug:1845069) Package building Spec Restore BuildRequires check in rpmbuild -bp (regression in 4.15.0) Fix space handling in %setup (#2335, regression in 4.18.0) Issue a deprecation warning on %patchN syntax Macros Don’t embed CPU count of build system in packages (#2343) Make CPU and thread-related macros available on all platforms (#2265) Fix macro scoping level on re-entry from %[] expression (#2354) Split ___build_pre macro to make mocking rpm build environment easier Buildroot policies Fix xargs use in brp-remove-la-files on macOS (#2332, regression in 4.17.0) Generators Disable debuginfod server lookups in build and dependency generator scripts Exclude kernel modules from ELF dependency generation (regression in 4.17.0) Signatures and keys Fix type confusion bugs in the internal OpenPGP implementation Plugins Make write() non-blocking in fapolicyd plugin (RhBug:2110787) Add a handler for libselinux log messages (RhBug:2123719, RhBug:2050774) API changes N/A Internal improvements and cleanups Fix potential uninitialized variable use on public key import Fix various leaks during package build and install Fix getopt() usage to comply with POSIX Build process Generate Python egg-info from automake builds (#130, #2230) Revise ISANAME for loongarch Documentation Document %_binary_payload and %_source_payload syntax in RPM package format manual Various typo and grammar fixes in reference manuals Minor CONTRIBUTING.md updates Drop: 0001-docs-do-not-build-manpages-requires-pandoc.patch (pandoc is now detected from $PATH) fifofix.patch (upstream fixed the issue) (From OE-Core rev: 0206e2700e290f04cb4c4c2cf50c1e1f1f4ae6ee) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> (cherry picked from commit d8d673b2dc86e04cc278dc111b36d52d60bc25f7) Signed-off-by: Steve Sakoman <steve@sakoman.com>
40 lines
1.6 KiB
Diff
40 lines
1.6 KiB
Diff
From b960c0b43a080287a7c13533eeb2d9f288db1414 Mon Sep 17 00:00:00 2001
|
|
From: Florian Festi <ffesti@redhat.com>
|
|
Date: Thu, 16 Mar 2023 19:05:04 +0100
|
|
Subject: [PATCH] Fix compiler error on clang
|
|
|
|
Turns out variable declarations are not allowed after a label, even in
|
|
C99. And while some compilers don't seem to care others do.
|
|
|
|
Moving the declaration of mayopen to the start of the function to avoid
|
|
this problem.
|
|
|
|
Resolves: #2435
|
|
Upstream-Status: Backport [https://github.com/rpm-software-management/rpm/commit/b960c0b43a080287a7c13533eeb2d9f288db1414]
|
|
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
|
|
---
|
|
lib/fsm.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/lib/fsm.c b/lib/fsm.c
|
|
index 5671ac642d..183293edb0 100644
|
|
--- a/lib/fsm.c
|
|
+++ b/lib/fsm.c
|
|
@@ -879,6 +879,7 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfiles files,
|
|
int nodigest = (rpmtsFlags(ts) & RPMTRANS_FLAG_NOFILEDIGEST) ? 1 : 0;
|
|
int nofcaps = (rpmtsFlags(ts) & RPMTRANS_FLAG_NOCAPS) ? 1 : 0;
|
|
int firstlinkfile = -1;
|
|
+ int mayopen = 0;
|
|
char *tid = NULL;
|
|
struct filedata_s *fdata = xcalloc(fc, sizeof(*fdata));
|
|
struct filedata_s *firstlink = NULL;
|
|
@@ -1016,7 +1017,7 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfiles files,
|
|
|
|
setmeta:
|
|
/* Special files require path-based ops */
|
|
- int mayopen = S_ISREG(fp->sb.st_mode) || S_ISDIR(fp->sb.st_mode);
|
|
+ mayopen = S_ISREG(fp->sb.st_mode) || S_ISDIR(fp->sb.st_mode);
|
|
if (!rc && fd == -1 && mayopen) {
|
|
int flags = O_RDONLY;
|
|
/* Only follow safe symlinks, and never on temporary files */
|