package/rpm: bump to version 4.20.1

index 23d7da13b4..0a2db9dd76 100644
@@ -146,6 +146,12 @@ endif
 
 comment "Legacy options removed in 2025.08"
 
+config BR2_PACKAGE_RPM_RPM2ARCHIVE
+	bool "rpm2archive option has been removed"
+	select BR2_LEGACY
+	help
+	  rpm2archive is no longer optional in upstream.
+
 config BR2_PACKAGE_LIBWEBSOCK
 	bool "libwebsock has been removed"
 	select BR2_LEGACY

deleted file mode 100644
index 648040c663..0000000000
@@ -1,40 +0,0 @@
-From b960c0b43a080287a7c13533eeb2d9f288db1414 Mon Sep 17 00:00:00 2001
-From: Florian Festi <[email protected]>
-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: b960c0b43a080287a7c13533eeb2d9f288db1414
-Signed-off-by: James Knight <[email protected]>
----
- 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 */

58 lines not on this page · raw message

deleted file mode 100644
index ec920612e2..0000000000
@@ -1,26 +0,0 @@
-From f510770a214bd2e8144a39868c34cd568179599e Mon Sep 17 00:00:00 2001
-From: Calvin Buckley <[email protected]>
-Date: Tue, 11 Jul 2023 19:22:41 -0300
-Subject: [PATCH] Fix missing basename include on macOS
-
-Upstream: b2e67642fd8cb64d8cb1cca9e759396c1c10807d
-Signed-off-by: Thomas Petazzoni <[email protected]>
----
- tools/rpmuncompress.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tools/rpmuncompress.c b/tools/rpmuncompress.c
-index bd4146d54..58ddf5683 100644
---- a/tools/rpmuncompress.c
-+++ b/tools/rpmuncompress.c
-@@ -1,6 +1,7 @@
- #include "system.h"
- 
- #include <popt.h>
-+#include <libgen.h>
- #include <errno.h>
- #include <stdio.h>
- #include <string.h>
--- 
-2.49.0
-

new file mode 100644
index 0000000000..341c8005fd
@@ -0,0 +1,28 @@
+From e1d7046ba6662eac9e5e7638e484eb792afa36cc Mon Sep 17 00:00:00 2001
+From: Mike Gorse <[email protected]>
+Date: Sat, 22 Mar 2025 18:09:31 -0500
+Subject: [PATCH] Fix check_c_compiler_flag cmake tests
+
+Check_c_compiler_flag sets a cache variable, so CACHE needs to be passed
+in order to reset it for the next use.
+
+Upstream: https://github.com/rpm-software-management/rpm/commit/e1d7046ba6662eac9e5e7638e484eb792afa36cc
+See-also: https://github.com/rpm-software-management/rpm/commit/e14502834fe6a9c6c9a439401ac3d2c8fd979267
+Signed-off-by: James Knight <[email protected]>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 53d962d9bc..8e6bf65701 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -432,7 +432,7 @@ foreach (flag -fno-strict-overflow -fno-delete-null-pointer-checks -fhardened)
+ 	if (found)
+ 		add_compile_options(${flag})
+ 	endif()
+-	unset(found)
++	unset(found CACHE)
+ endforeach()
+ 
+ # generated sources

new file mode 100644
index 0000000000..2719cae795
@@ -0,0 +1,38 @@
+From 5ce7becd933383ed9515310f86fc51553cca43b7 Mon Sep 17 00:00:00 2001
+From: James Knight <[email protected]>
+Date: Tue, 1 Jul 2025 08:56:39 -0400
+Subject: [PATCH 1/1] suppress unsupported brace expansion support for musl
+
+rpm has refactored its glob-related implementation to rely on GNU
+glob(3), which means brace expansion no longer works for musl.
+Configuring this define allows musl environments to still be able to use
+rpm; however, without brace expansion support.
+
+Upstream: https://github.com/rpm-software-management/rpm/issues/2844
+Signed-off-by: James Knight <[email protected]>
+---
+ rpmio/rpmglob.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/rpmio/rpmglob.c b/rpmio/rpmglob.c
+index eb439cad8..15a51ccb9 100644
+--- a/rpmio/rpmglob.c
++++ b/rpmio/rpmglob.c
+@@ -33,6 +33,14 @@
+ 
+ #include "debug.h"
+ 
++// rpm has refactored its glob-related implementation to rely on GNU glob(3)
++// which means brace expansion no longer works for musl. Configuring this
++// define allows musl environments to still be able to use rpm; however,
++// without brace expansion support.
++#ifndef GLOB_BRACE
++#define GLOB_BRACE 0
++#endif
++
+ /* Return 1 if pattern contains a magic char, see glob(7) for a list */
+ static int ismagic(const char *pattern)
+ {
+-- 
+2.49.0
+

index 8730e15200..6d10995148 100644
@@ -1,6 +1,6 @@
-comment "rpm needs a toolchain w/ dynamic library, threads and lua >= 5.3"
+comment "rpm needs a toolchain w/ dynamic library, threads, lua >= 5.3 and wchar"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS \
-		|| !BR2_PACKAGE_LUA || BR2_PACKAGE_LUA_5_1
+		|| !BR2_PACKAGE_LUA || BR2_PACKAGE_LUA_5_1 || !BR2_USE_WCHAR
 	depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 	depends on BR2_USE_MMU
 

@@ -11,26 +11,13 @@ config BR2_PACKAGE_RPM
 	depends on BR2_PACKAGE_LUA && !BR2_PACKAGE_LUA_5_1
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_MMU # fork()
-	select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_LIBGCRYPT
+	depends on BR2_USE_WCHAR
 	select BR2_PACKAGE_FILE
+	select BR2_PACKAGE_LIBARCHIVE
+	select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_LIBGCRYPT
 	select BR2_PACKAGE_POPT
 	select BR2_PACKAGE_ZLIB
 	help
 	  The RPM Package Manager (RPM).
 
 	  http://www.rpm.org/
-
-if BR2_PACKAGE_RPM
-
-comment "rpm2archive support needs a toolchain w/ wchar"
-	depends on !BR2_USE_WCHAR
-
-config BR2_PACKAGE_RPM_RPM2ARCHIVE
-	bool "rpm2archive command"
-	default y
-	depends on BR2_USE_WCHAR
-	select BR2_PACKAGE_LIBARCHIVE
-	help
-	  Enable rpm2archive
-
-endif

index fd03f062bc..0013a74b63 100644
@@ -1,5 +1,5 @@
-# From https://rpm.org/wiki/Releases/4.18.1.html
-sha256  37f3b42c0966941e2ad3f10fde3639824a6591d07197ba8fd0869ca0779e1f56  rpm-4.18.1.tar.bz2
+# From https://rpm.org/wiki/Releases/4.20.1.html
+sha256  52647e12638364533ab671cbc8e485c96f9f08889d93fe0ed104a6632661124f  rpm-4.20.1.tar.bz2
 
 # Hash for license file
-sha256  171d94d9f1641316bff7f157a903237dc69cdb5fca405fed8c832c76ed8370f9  COPYING
+sha256  f4af48a570b4ac09fce37fbaaa80324565405bb07d257070f509bdaf9994b73b  COPYING

196 lines not on this page · raw message