[packages/rpm] up to 4.20.1

[atler]

commit f838325325f476ccb8ff9c83829dcfc62ef91bd2
Author: Jan Palus <atler at pld-linux.org>
Date:   Mon Feb 24 13:57:58 2025 +0100

    up to 4.20.1

 rpm-ignore-missing-macro-files.patch | 6 +++---
 rpm.spec                             | 7 +++----
 2 files changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index d077db4..78e107a 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -33,13 +33,13 @@ Summary(pt_BR.UTF-8):	Gerenciador de pacotes RPM
 Summary(ru.UTF-8):	Менеджер пакетов от RPM
 Summary(uk.UTF-8):	Менеджер пакетів від RPM
 Name:		rpm
-Version:	4.20.0
-Release:	10
+Version:	4.20.1
+Release:	1
 Epoch:		1
 License:	GPL v2 / LGPL v2.1
 Group:		Base
 Source0:	http://ftp.rpm.org/releases/rpm-4.20.x/%{name}-%{version}.tar.bz2
-# Source0-md5:	6aee0b0b66b40e1eb04b6c3b7d87cf9f
+# Source0-md5:	f99ec35de1c178fa16ff7398ddf13b94
 Source1:	ftp://ftp.pld-linux.org/dists/th/PLD-3.0-Th-GPG-key.asc
 # Source1-md5:	23914bb49fafe7153cee87126d966461
 Source100:	https://github.com/rpm-software-management/rpmpgp_legacy/archive/1.1/rpmpgp_legacy-1.1.tar.gz
@@ -684,7 +684,6 @@ cd build-cmake
 	-DWITH_CAP=ON \
 	-DWITH_FAPOLICYD=ON \
 	-DWITH_ACL=ON \
-	-DWITH_ARCHIVE=ON \
 	-DWITH_ZSTD=ON \
 	-DRPM_VENDOR=pld
 
diff --git a/rpm-ignore-missing-macro-files.patch b/rpm-ignore-missing-macro-files.patch
index b7e7ed0..53fb663 100644
--- a/rpm-ignore-missing-macro-files.patch
+++ b/rpm-ignore-missing-macro-files.patch
@@ -1,10 +1,10 @@
 --- rpm-5.4.15/rpmio/macro.c~	2014-12-07 20:24:53.000000000 +0100
 +++ rpm-5.4.15/rpmio/macro.c	2014-12-07 20:44:45.739944044 +0100
 @@ -1795,6 +1795,7 @@
- 	for (path = files; *path; path++) {
+ 	    size_t len = strlen(*path);
  	    if (rpmFileHasSuffix(*path, ".rpmnew") || 
  		rpmFileHasSuffix(*path, ".rpmsave") ||
 +		rpmFileHasSuffix(*path, "~") ||
- 		rpmFileHasSuffix(*path, ".rpmorig")) {
+ 		rpmFileHasSuffix(*path, ".rpmorig") ||
+ 		(len > 0 && !risalnum((*path)[len - 1]))) {
  		continue;
- 	    }
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/f838325325f476ccb8ff9c83829dcfc62ef91bd2