CVS commit: pkgsrc/misc/rpm

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Sep  1 11:26:29 UTC 2025

Modified Files:
        pkgsrc/misc/rpm: Makefile PLIST distinfo
Added Files:
        pkgsrc/misc/rpm/patches: patch-CMakeLists.txt

Log Message:
rpm: updated to 4.20.1

RPM 4.20.1 released! (Feb 19 2025)

This is primarily a bugfix release addressing a handful of regressions in RPM 4.20.0 as well as various other issues.
See the release notes for details and download information.
Highlights include:
Support for fully locked user accounts in sysusers.d(5) files
Filter Lua deprecation warnings based on the originating RPM version
Fix regressions in rpmsign(8), rpmspec(8), %debug_package and more
Fix unmodified %config (and possibly other) files being removed in case of unpack failure
Fix IMA plugin causing transaction failures in rootless containers
Fix sqlite rpmdb growing over time


To generate a diff of this commit:
cvs rdiff -u -r1.110 -r1.111 pkgsrc/misc/rpm/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/misc/rpm/PLIST
cvs rdiff -u -r1.21 -r1.22 pkgsrc/misc/rpm/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/misc/rpm/patches/patch-CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/misc/rpm/Makefile
diff -u pkgsrc/misc/rpm/Makefile:1.110 pkgsrc/misc/rpm/Makefile:1.111
--- pkgsrc/misc/rpm/Makefile:1.110      Mon Apr 21 20:57:58 2025
+++ pkgsrc/misc/rpm/Makefile    Mon Sep  1 11:26:29 2025
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.110 2025/04/21 20:57:58 wiz Exp $
+# $NetBSD: Makefile,v 1.111 2025/09/01 11:26:29 adam Exp $
 
-DISTNAME=      rpm-4.20.0
-PKGREVISION=   2
+DISTNAME=      rpm-4.20.1
 CATEGORIES=    misc
 MASTER_SITES=  http://ftp.rpm.org/releases/rpm-${PKGVERSION_NOREV:R}.x/
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/misc/rpm/PLIST
diff -u pkgsrc/misc/rpm/PLIST:1.12 pkgsrc/misc/rpm/PLIST:1.13
--- pkgsrc/misc/rpm/PLIST:1.12  Fri Feb  7 15:06:18 2025
+++ pkgsrc/misc/rpm/PLIST       Mon Sep  1 11:26:29 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2025/02/07 15:06:18 adam Exp $
+@comment $NetBSD: PLIST,v 1.13 2025/09/01 11:26:29 adam Exp $
 bin/gendiff
 bin/rpm
 bin/rpm2archive
@@ -10,6 +10,7 @@ bin/rpmkeys
 bin/rpmlua
 bin/rpmquery
 bin/rpmsign
+bin/rpmsort
 bin/rpmspec
 bin/rpmverify
 include/rpm/argv.h
@@ -55,16 +56,16 @@ lib/cmake/rpm/rpm-targets-noconfig.cmake
 lib/cmake/rpm/rpm-targets.cmake
 lib/librpm.so
 lib/librpm.so.10
-lib/librpm.so.10.2.0
+lib/librpm.so.10.2.1
 lib/librpmbuild.so
 lib/librpmbuild.so.10
-lib/librpmbuild.so.10.2.0
+lib/librpmbuild.so.10.2.1
 lib/librpmio.so
 lib/librpmio.so.10
-lib/librpmio.so.10.2.0
+lib/librpmio.so.10.2.1
 lib/librpmsign.so
 lib/librpmsign.so.10
-lib/librpmsign.so.10.2.0
+lib/librpmsign.so.10.2.1
 lib/pkgconfig/rpm.pc
 lib/rpm-plugins/fapolicyd.so
 lib/rpm-plugins/prioreset.so
@@ -445,10 +446,12 @@ share/doc/rpm/API/nav_fd.png
 share/doc/rpm/API/nav_g.png
 share/doc/rpm/API/nav_h.png
 share/doc/rpm/API/nav_hd.png
+share/doc/rpm/API/navtree.css
 share/doc/rpm/API/open.png
 share/doc/rpm/API/pages.html
 share/doc/rpm/API/plus.svg
 share/doc/rpm/API/plusd.svg
+share/doc/rpm/API/resize.js
 share/doc/rpm/API/rpmarchive_8h.html
 share/doc/rpm/API/rpmarchive_8h__dep__incl.map
 share/doc/rpm/API/rpmarchive_8h__dep__incl.md5
@@ -822,6 +825,7 @@ share/doc/rpm/COPYING
 share/doc/rpm/CREDITS
 share/doc/rpm/INSTALL
 share/doc/rpm/README
+share/doc/rpm/about.md
 share/doc/rpm/arch_dependencies.md
 share/doc/rpm/autosetup.md
 share/doc/rpm/boolean_dependencies.md
@@ -839,6 +843,7 @@ share/doc/rpm/large_files.md
 share/doc/rpm/lua.md
 share/doc/rpm/macros.md
 share/doc/rpm/more_dependencies.md
+share/doc/rpm/philosophy.md
 share/doc/rpm/plugins.md
 share/doc/rpm/queryformat.md
 share/doc/rpm/relocatable.md

Index: pkgsrc/misc/rpm/distinfo
diff -u pkgsrc/misc/rpm/distinfo:1.21 pkgsrc/misc/rpm/distinfo:1.22
--- pkgsrc/misc/rpm/distinfo:1.21       Fri Feb  7 15:06:18 2025
+++ pkgsrc/misc/rpm/distinfo    Mon Sep  1 11:26:29 2025
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.21 2025/02/07 15:06:18 adam Exp $
+$NetBSD: distinfo,v 1.22 2025/09/01 11:26:29 adam Exp $
 
-BLAKE2s (rpm-4.20.0.tar.bz2) = 398a8ac763c7437842a6ff9fcfcd35d5b056ae510fbbf2db4b3833130c4a3211
-SHA512 (rpm-4.20.0.tar.bz2) = b340c66cfda3abed38e81f91c4a789f2c6c0d3ce408de71d861fef27e180b607ae698e046b6925c7781a7177cde9df4075943714ed2aad7c62645eca348f5544
-Size (rpm-4.20.0.tar.bz2) = 5984513 bytes
+BLAKE2s (rpm-4.20.1.tar.bz2) = 823611e488f6263c0d2c96c80cb0659baa3c2e3eb7ea016630a7d4253c5f2835
+SHA512 (rpm-4.20.1.tar.bz2) = 77979cb49dec5a8816fc5019cf5d0c817adddec10c0018c8ad9487db8ffc58613557fa21f8e2163b747197b55a6de202c29c88e19b70d1fa6b4c18d3a84bf681
+Size (rpm-4.20.1.tar.bz2) = 4534720 bytes
+SHA1 (patch-CMakeLists.txt) = 3abfa98de7530fa6edfd5835160f0cca9b8d983e
 SHA1 (patch-build_rpmfc.c) = 3c02113a7ad206bf0cf033b3f9350c642289ef3d
 SHA1 (patch-installplatform) = f53dfc2c0d3e1e534bc20fece6a40f1c22b4ff95
 SHA1 (patch-lib_backend_ndb_rpmxdb.c) = 2742f64345ed2bf8bb942b7d7dffa7e759e07335

Added files:

Index: pkgsrc/misc/rpm/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/misc/rpm/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Mon Sep  1 11:26:29 2025
+++ pkgsrc/misc/rpm/patches/patch-CMakeLists.txt        Mon Sep  1 11:26:29 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2025/09/01 11:26:29 adam Exp $
+
+-fhardened is not portable.
+
+--- CMakeLists.txt.orig        2025-09-01 10:25:27.516647611 +0000
++++ CMakeLists.txt
+@@ -415,7 +415,7 @@ if (ENABLE_ASAN OR ENABLE_UBSAN)
+ endif()
+ 
+ # try to ensure some compiler sanity and hardening options where supported
+-foreach (flag -fno-strict-overflow -fno-delete-null-pointer-checks -fhardened)
++foreach (flag -fno-strict-overflow -fno-delete-null-pointer-checks)
+       check_c_compiler_flag(${flag} found)
+       if (found)
+               add_compile_options(${flag})