[packages/rpm/rpm6] - started update to 6.0.0

baggins baggins at pld-linux.org
Sat Sep 27 23:09:21 CEST 2025 

commit f10632c75c8304f8957f7d126cdc754f68ad3232
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Sep 28 01:08:34 2025 +0200

    - started update to 6.0.0

 allow-at-in-ver-rel.patch                |  4 ++--
 check-valid-arch-early.patch             |  4 ++--
 cpuinfo-deps.patch                       | 28 ++++++++++++++--------------
 missing-doc-terminate-build.patch        |  7 +++----
 missing-ghost-terminate-build.patch      |  4 ++--
 missing-macros.patch                     |  4 ++--
 no-exe-for-elf-req.patch                 |  4 ++--
 noexpand.patch                           | 18 +++++++++---------
 rpm-changelog_order_check_nonfatal.patch |  4 ++--
 rpm-clean-docdir.patch                   |  6 +++---
 rpm-ignore-missing-macro-files.patch     |  6 +++---
 rpm-perl-magic.patch                     |  4 ++--
 rpm-postun-nofail.patch                  |  4 ++--
 rpm-scripts-closefds.patch               |  4 ++--
 rpm.spec                                 | 14 +++++---------
 rpm5-db-compat.patch                     |  4 ++--
 rpmio-read-proc-files.patch              |  4 ++--
 shortcircuited-deps.patch                |  4 ++--
 skip-symlinks.patch                      |  4 ++--
 uname-deps.patch                         | 26 +++++++++++++-------------
 x32.patch                                | 18 +++++++++---------
 21 files changed, 85 insertions(+), 90 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index 4bdbce5..ab8b73a 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.1
-Release:	6
+Version:	6.0.0
+Release:	0.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:	f99ec35de1c178fa16ff7398ddf13b94
+Source0:	http://ftp.rpm.org/releases/rpm-6.0.x/%{name}-%{version}.tar.bz2
+# Source0-md5:	1236be21f762cc9728462a0e910e1497
 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
@@ -86,8 +86,6 @@ Patch27:	noexpand.patch
 Patch28:	skip-symlinks.patch
 Patch29:	build-locale.patch
 Patch30:	no-exe-for-elf-req.patch
-Patch31:	check-valid-arch-early.patch
-Patch32:	group-lookup.patch
 Patch33:	disable-sysusers.patch
 URL:		https://rpm.org/
 BuildRequires:	acl-devel
@@ -119,7 +117,7 @@ BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.750
 %endif
 BuildRequires:	readline-devel
-%{?with_sequoia:BuildRequires:	rpm-sequoia-devel >= 1.4.0}
+%{?with_sequoia:BuildRequires:	rpm-sequoia-devel >= 1.9.0}
 BuildRequires:	rpm-build >= 4.6
 BuildRequires:	sqlite3-devel >= 3.22.0
 BuildRequires:	tcl
@@ -645,8 +643,6 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch -P 28 -p1
 %patch -P 29 -p1
 %patch -P 30 -p1
-%patch -P 31 -p1
-%patch -P 32 -p1
 %patch -P 33 -p1
 
 # generate Group translations to *.po
diff --git a/allow-at-in-ver-rel.patch b/allow-at-in-ver-rel.patch
index 045935c..d375784 100644
--- a/allow-at-in-ver-rel.patch
+++ b/allow-at-in-ver-rel.patch
@@ -1,5 +1,5 @@
---- rpm-4.16.0/build/rpmbuild_internal.h~	2020-05-28 12:04:25.000000000 +0200
-+++ rpm-4.16.0/build/rpmbuild_internal.h	2020-11-21 19:32:47.432243301 +0100
+--- rpm-4.16.0/build/rpmbuild_internal.hh~	2020-05-28 12:04:25.000000000 +0200
++++ rpm-4.16.0/build/rpmbuild_internal.hh	2020-11-21 19:32:47.432243301 +0100
 @@ -18,7 +18,7 @@
  
  #define ALLOWED_CHARS_NAME ".-_+%{}"
diff --git a/check-valid-arch-early.patch b/check-valid-arch-early.patch
index f8241be..7023604 100644
--- a/check-valid-arch-early.patch
+++ b/check-valid-arch-early.patch
@@ -1,5 +1,5 @@
---- rpm-4.20.0/build/parsePreamble.c~	2024-10-07 11:35:46.000000000 +0200
-+++ rpm-4.20.0/build/parsePreamble.c	2025-02-12 23:12:25.436660137 +0100
+--- rpm-4.20.0/build/parsePreamble.cc~	2024-10-07 11:35:46.000000000 +0200
++++ rpm-4.20.0/build/parsePreamble.cc	2025-02-12 23:12:25.436660137 +0100
 @@ -1330,6 +1330,10 @@
  	rpmPushMacroFlags(spec->macros, "_buildrootdir", NULL,
  			    "%{dirname:%{buildroot}}", RMIL_GLOBAL, 0);
diff --git a/cpuinfo-deps.patch b/cpuinfo-deps.patch
index 8252f06..a201ca9 100644
--- a/cpuinfo-deps.patch
+++ b/cpuinfo-deps.patch
@@ -1,6 +1,6 @@
-diff -ur rpm-4.16.0/lib/depends.c rpm-4.16.0-cpuinfo/lib/depends.c
---- rpm-4.16.0/lib/depends.c	2020-11-08 20:19:15.625093667 +0100
-+++ rpm-4.16.0-cpuinfo/lib/depends.c	2020-11-08 20:23:46.685893216 +0100
+diff -ur rpm-4.16.0/lib/depends.cc rpm-4.16.0-cpuinfo/lib/depends.cc
+--- rpm-4.16.0/lib/depends.cc	2020-11-08 20:19:15.625093667 +0100
++++ rpm-4.16.0-cpuinfo/lib/depends.cc	2020-11-08 20:23:46.685893216 +0100
 @@ -697,6 +697,16 @@
  	}
      }
@@ -18,13 +18,13 @@ diff -ur rpm-4.16.0/lib/depends.c rpm-4.16.0-cpuinfo/lib/depends.c
      /* Dont look at pre-requisites of already installed packages */
      if (!adding && isTransientReq(dsflags))
  	goto exit;
-diff -ur rpm-4.16.0/lib/rpmds.c rpm-4.16.0-cpuinfo/lib/rpmds.c
---- rpm-4.16.0/lib/rpmds.c	2020-11-08 20:19:15.625093667 +0100
-+++ rpm-4.16.0-cpuinfo/lib/rpmds.c	2020-11-08 20:16:25.941242497 +0100
+diff -ur rpm-4.16.0/lib/rpmds.cc rpm-4.16.0-cpuinfo/lib/rpmds.cc
+--- rpm-4.16.0/lib/rpmds.cc	2020-11-08 20:19:15.625093667 +0100
++++ rpm-4.16.0-cpuinfo/lib/rpmds.cc	2020-11-08 20:16:25.941242497 +0100
 @@ -2,6 +2,8 @@
-  * \file lib/rpmds.c
   */
  #include "system.h"
+ #include <atomic>
 +#include <popt.h>
 +#include <ctype.h>
  #include <sys/utsname.h>
@@ -38,7 +38,7 @@ diff -ur rpm-4.16.0/lib/rpmds.c rpm-4.16.0-cpuinfo/lib/rpmds.c
 +
 +#include "rpmio_internal.h"	/* XXX for rpmioSlurp */
  
- #include "rpmds_internal.h"
+ #include "rpmds_internal.hh"
  
 @@ -1655,3 +1670,203 @@
  {
@@ -276,14 +276,14 @@ diff -ur rpm-4.16.0/include/rpm/rpmds.h rpm-4.16.0-cpuinfo/include/rpm/rpmds.h
  
  typedef enum rpmrichOp_e {
      RPMRICHOP_NONE    = 0,
-diff -ur rpm-4.16.0/lib/rpmts_internal.h rpm-4.16.0-cpuinfo/lib/rpmts_internal.h
---- rpm-4.16.0/lib/rpmts_internal.h	2020-11-08 20:19:15.625093667 +0100
-+++ rpm-4.16.0-cpuinfo/lib/rpmts_internal.h	2020-11-08 20:22:24.382319931 +0100
+diff -ur rpm-4.16.0/lib/rpmts_internal.hh rpm-4.16.0-cpuinfo/lib/rpmts_internal.hh
+--- rpm-4.16.0/lib/rpmts_internal.hh	2020-11-08 20:19:15.625093667 +0100
++++ rpm-4.16.0-cpuinfo/lib/rpmts_internal.hh	2020-11-08 20:22:24.382319931 +0100
 @@ -22,6 +22,7 @@
  
      rpmds rpmlib;		/*!< rpmlib() dependency set. */
      rpmds uname;		/*!< uname() dependency set. */
 +    rpmds cpuinfo;		/*!< cpuinfo() dependency set. */
-     rpmte * order;		/*!< Packages sorted by dependencies. */
-     int orderCount;		/*!< No. of transaction elements. */
-     int orderAlloced;		/*!< No. of allocated transaction elements. */
+     std::vector<rpmte> order;	/*!< Packages sorted by dependencies. */
+ } * tsMembers;
+ 
diff --git a/missing-doc-terminate-build.patch b/missing-doc-terminate-build.patch
index b13f202..59677a6 100644
--- a/missing-doc-terminate-build.patch
+++ b/missing-doc-terminate-build.patch
@@ -1,13 +1,12 @@
---- rpm-4.16.0/build/files.c.orig	2020-12-18 19:36:49.000000000 +0100
-+++ rpm-4.16.0/build/files.c	2020-12-18 19:48:35.711529643 +0100
-@@ -2394,17 +2394,19 @@
+--- rpm-4.16.0/build/files.cc.orig	2020-12-18 19:36:49.000000000 +0100
++++ rpm-4.16.0/build/files.cc	2020-12-18 19:48:35.711529643 +0100
+@@ -2394,16 +2394,18 @@
  		appendStringBuf(docScript, argv[j]);
  		appendStringBuf(docScript, "' $");
  		appendStringBuf(docScript, sdenv);
 -		appendLineStringBuf(docScript, " ||:");
  	    }
  	}
- 	free(origfile);
  	files[i] = argv;
      }
      free(basepath);
diff --git a/missing-ghost-terminate-build.patch b/missing-ghost-terminate-build.patch
index 9e7ef7a..d03a04e 100644
--- a/missing-ghost-terminate-build.patch
+++ b/missing-ghost-terminate-build.patch
@@ -1,5 +1,5 @@
---- rpm-4.16.0/build/files.c~	2020-12-18 19:15:59.000000000 +0100
-+++ rpm-4.16.0/build/files.c	2020-12-18 19:34:33.456509321 +0100
+--- rpm-4.16.0/build/files.cc~	2020-12-18 19:15:59.000000000 +0100
++++ rpm-4.16.0/build/files.cc	2020-12-18 19:34:33.456509321 +0100
 @@ -1401,7 +1401,6 @@
       * various cases, preserving historical behavior wrt %dev():
       * - for %dev() entries we fake it up whether the file exists or not
diff --git a/missing-macros.patch b/missing-macros.patch
index 9c734ec..c3975ed 100644
--- a/missing-macros.patch
+++ b/missing-macros.patch
@@ -19,9 +19,9 @@
 --- rpm-4.16.0/macros.in~	2020-11-21 19:41:19.000000000 +0100
 +++ rpm-4.16.0/macros.in	2020-11-22 19:45:24.182620411 +0100
 @@ -6,6 +6,7 @@
- # should be added to /etc/rpm/macros, while per-user configuration should
- # be added to ~/.rpmmacros.
  #
+ # See rpm-macros(7), rpm-macrofile(5) and rpm-config(5) rpmbuild-config(5)
+ # for more information.
 +%_rpmversion		@CMAKE_PROJECT_VERSION@
  
  #==============================================================================
diff --git a/no-exe-for-elf-req.patch b/no-exe-for-elf-req.patch
index 3aa7b0f..feb0ccb 100644
--- a/no-exe-for-elf-req.patch
+++ b/no-exe-for-elf-req.patch
@@ -1,5 +1,5 @@
---- rpm-4.16.1.3/tools/elfdeps.c.orig	2020-05-28 12:04:25.084136944 +0200
-+++ rpm-4.16.1.3/tools/elfdeps.c	2022-03-23 11:19:01.656202339 +0100
+--- rpm-4.16.1.3/tools/elfdeps.cc.orig	2020-05-28 12:04:25.084136944 +0200
++++ rpm-4.16.1.3/tools/elfdeps.cc	2022-03-23 11:19:01.656202339 +0100
 @@ -300,7 +300,8 @@
      if (ehdr->e_type == ET_DYN || ehdr->e_type == ET_EXEC) {
  	ei->marker = mkmarker(ehdr);
diff --git a/noexpand.patch b/noexpand.patch
index e75a513..cf8eb81 100644
--- a/noexpand.patch
+++ b/noexpand.patch
@@ -1,6 +1,6 @@
-diff -ur rpm-4.16.0/build/parseChangelog.c rpm-4.16.0-noexpand/build/parseChangelog.c
---- rpm-4.16.0/build/parseChangelog.c	2020-12-18 20:09:28.341535424 +0100
-+++ rpm-4.16.0-noexpand/build/parseChangelog.c	2020-12-18 20:01:53.963847399 +0100
+diff -ur rpm-4.16.0/build/parseChangelog.cc rpm-4.16.0-noexpand/build/parseChangelog.cc
+--- rpm-4.16.0/build/parseChangelog.cc	2020-12-18 20:09:28.341535424 +0100
++++ rpm-4.16.0-noexpand/build/parseChangelog.cc	2020-12-18 20:01:53.963847399 +0100
 @@ -321,7 +321,7 @@
  	goto exit;
      }
@@ -10,9 +10,9 @@ diff -ur rpm-4.16.0/build/parseChangelog.c rpm-4.16.0-noexpand/build/parseChange
  	goto exit;
  
      if (sb && addChangelog(spec->packages->header, sb)) {
-diff -ur rpm-4.16.0/build/parseSpec.c rpm-4.16.0-noexpand/build/parseSpec.c
---- rpm-4.16.0/build/parseSpec.c	2020-05-28 12:04:25.007136522 +0200
-+++ rpm-4.16.0-noexpand/build/parseSpec.c	2020-12-18 20:08:13.791373996 +0100
+diff -ur rpm-4.16.0/build/parseSpec.cc rpm-4.16.0-noexpand/build/parseSpec.cc
+--- rpm-4.16.0/build/parseSpec.cc	2020-05-28 12:04:25.007136522 +0200
++++ rpm-4.16.0-noexpand/build/parseSpec.cc	2020-12-18 20:08:13.791373996 +0100
 @@ -242,6 +242,9 @@
  	if (!spec->readStack->reading)
  	    return 0;
@@ -32,9 +32,9 @@ diff -ur rpm-4.16.0/build/parseSpec.c rpm-4.16.0-noexpand/build/parseSpec.c
  	goto after_classification;
  
      /* check ordering of the conditional */
-diff -ur rpm-4.16.0/build/rpmbuild_internal.h rpm-4.16.0-noexpand/build/rpmbuild_internal.h
---- rpm-4.16.0/build/rpmbuild_internal.h	2020-12-18 20:09:28.354868788 +0100
-+++ rpm-4.16.0-noexpand/build/rpmbuild_internal.h	2020-12-18 20:09:09.054827168 +0100
+diff -ur rpm-4.16.0/build/rpmbuild_internal.hh rpm-4.16.0-noexpand/build/rpmbuild_internal.hh
+--- rpm-4.16.0/build/rpmbuild_internal.hh	2020-12-18 20:09:28.354868788 +0100
++++ rpm-4.16.0-noexpand/build/rpmbuild_internal.hh	2020-12-18 20:09:09.054827168 +0100
 @@ -246,6 +246,7 @@
  #define STRIP_NOTHING             0
  #define STRIP_TRAILINGSPACE (1 << 0)
diff --git a/rpm-changelog_order_check_nonfatal.patch b/rpm-changelog_order_check_nonfatal.patch
index ae75fa4..7395d15 100644
--- a/rpm-changelog_order_check_nonfatal.patch
+++ b/rpm-changelog_order_check_nonfatal.patch
@@ -1,5 +1,5 @@
---- rpm-4.5/build/parseChangelog.c.orig	2012-07-24 14:46:12.856158625 +0200
-+++ rpm-4.5/build/parseChangelog.c	2012-07-24 14:47:55.293158624 +0200
+--- rpm-4.5/build/parseChangelog.cc.orig	2012-07-24 14:46:12.856158625 +0200
++++ rpm-4.5/build/parseChangelog.cc	2012-07-24 14:47:55.293158624 +0200
 @@ -181,9 +181,8 @@
  		trimtime = firstTime - trimage;
  	}
diff --git a/rpm-clean-docdir.patch b/rpm-clean-docdir.patch
index b5cb86e..b433df0 100644
--- a/rpm-clean-docdir.patch
+++ b/rpm-clean-docdir.patch
@@ -1,5 +1,5 @@
---- rpm-5.4.10/build/files.c~	2013-01-24 14:24:39.161982722 +0100
-+++ rpm-5.4.10/build/files.c	2013-01-24 14:27:50.620325354 +0100
+--- rpm-5.4.10/build/files.cc~	2013-01-24 14:24:39.161982722 +0100
++++ rpm-5.4.10/build/files.cc	2013-01-24 14:27:50.620325354 +0100
 @@ -2363,6 +2363,11 @@
      appendLineStringBuf(docScript, "export LC_ALL=" C_LOCALE);
      appendStringBuf(docScript, "export ");
@@ -11,4 +11,4 @@
 +    appendLineStringBuf(docScript, "\" ; fi");
      appendLineStringBuf(docScript, mkdocdir);
      for (i = 0; i < count; i++) {
- 	char *origfile = rpmCleanPath(rstrscat(NULL, basepath, "/",
+ 	std::string origfile = rpm::join_path({basepath, sd->files[i]}, false);
diff --git a/rpm-ignore-missing-macro-files.patch b/rpm-ignore-missing-macro-files.patch
index 53fb663..67b8cb9 100644
--- a/rpm-ignore-missing-macro-files.patch
+++ b/rpm-ignore-missing-macro-files.patch
@@ -1,8 +1,8 @@
---- 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
+--- rpm-5.4.15/rpmio/macro.cc~	2014-12-07 20:24:53.000000000 +0100
++++ rpm-5.4.15/rpmio/macro.cc	2014-12-07 20:44:45.739944044 +0100
 @@ -1795,6 +1795,7 @@
  	    size_t len = strlen(*path);
- 	    if (rpmFileHasSuffix(*path, ".rpmnew") || 
+ 	    if (rpmFileHasSuffix(*path, ".rpmnew") ||
  		rpmFileHasSuffix(*path, ".rpmsave") ||
 +		rpmFileHasSuffix(*path, "~") ||
  		rpmFileHasSuffix(*path, ".rpmorig") ||
diff --git a/rpm-perl-magic.patch b/rpm-perl-magic.patch
index 1faacf3..c83699f 100644
--- a/rpm-perl-magic.patch
+++ b/rpm-perl-magic.patch
@@ -1,5 +1,5 @@
---- rpm/build/rpmfc.c.orig	2014-10-07 15:53:03.185631053 +0100
-+++ rpm/build/rpmfc.c	2014-10-07 16:02:32.487591097 +0100
+--- rpm/build/rpmfc.cc.orig	2014-10-07 15:53:03.185631053 +0100
++++ rpm/build/rpmfc.cc	2014-10-07 16:02:32.487591097 +0100
 @@ -593,6 +593,7 @@
    { "GNU Info",			RPMFC_INCLUDE },
  
diff --git a/rpm-postun-nofail.patch b/rpm-postun-nofail.patch
index 2ab8817..c42fd86 100644
--- a/rpm-postun-nofail.patch
+++ b/rpm-postun-nofail.patch
@@ -1,5 +1,5 @@
---- rpm-4.5/lib/psm.c.org	2008-11-21 17:20:34.293584455 +0100
-+++ rpm-4.5/lib/psm.c	2008-11-21 17:21:41.482728047 +0100
+--- rpm-4.5/lib/psm.cc.org	2008-11-21 17:20:34.293584455 +0100
++++ rpm-4.5/lib/psm.cc	2008-11-21 17:21:41.482728047 +0100
 @@ -789,8 +789,8 @@
  	}
  
diff --git a/rpm-scripts-closefds.patch b/rpm-scripts-closefds.patch
index 222f3fd..3a8d539 100644
--- a/rpm-scripts-closefds.patch
+++ b/rpm-scripts-closefds.patch
@@ -1,5 +1,5 @@
---- rpm-4.16.0/lib/rpminstall.c.orig	2020-05-28 12:04:25.040136702 +0200
-+++ rpm-4.16.0/lib/rpminstall.c	2020-10-03 09:46:49.369707250 +0200
+--- rpm-4.16.0/lib/rpminstall.cc.orig	2020-05-28 12:04:25.040136702 +0200
++++ rpm-4.16.0/lib/rpminstall.cc	2020-10-03 09:46:49.369707250 +0200
 @@ -4,6 +4,7 @@
  
  #include "system.h"
diff --git a/rpm5-db-compat.patch b/rpm5-db-compat.patch
index 6d8ec64..c551070 100644
--- a/rpm5-db-compat.patch
+++ b/rpm5-db-compat.patch
@@ -1,5 +1,5 @@
---- rpm-4.15.1/lib/header.c~	2019-11-04 21:13:13.000000000 +0900
-+++ rpm-4.15.1/lib/header.c	2019-12-31 19:48:06.709777565 +0900
+--- rpm-4.15.1/lib/header.cc~	2019-11-04 21:13:13.000000000 +0900
++++ rpm-4.15.1/lib/header.cc	2019-12-31 19:48:06.709777565 +0900
 @@ -277,6 +277,12 @@
      for (i = 0; i < il; i++) {
  	ei2h(&pe[i], &info);
diff --git a/rpmio-read-proc-files.patch b/rpmio-read-proc-files.patch
index 27118bf..6407cb2 100644
--- a/rpmio-read-proc-files.patch
+++ b/rpmio-read-proc-files.patch
@@ -1,5 +1,5 @@
---- rpm-4.16.0/rpmio/rpmio.c~	2020-08-27 15:13:08.000000000 +0200
-+++ rpm-4.16.0/rpmio/rpmio.c	2020-11-08 21:31:26.311430982 +0100
+--- rpm-4.16.0/rpmio/rpmio.cc~	2020-08-27 15:13:08.000000000 +0200
++++ rpm-4.16.0/rpmio/rpmio.cc	2020-11-08 21:31:26.311430982 +0100
 @@ -1709,6 +1709,22 @@
  	}
  	b[blen] = '\0';
diff --git a/shortcircuited-deps.patch b/shortcircuited-deps.patch
index 2fc2cc4..d4d0652 100644
--- a/shortcircuited-deps.patch
+++ b/shortcircuited-deps.patch
@@ -1,5 +1,5 @@
---- rpm-4.16.0/build/build.c~	2020-05-28 12:04:24.000000000 +0200
-+++ rpm-4.16.0/build/build.c	2020-10-31 18:57:03.678941782 +0100
+--- rpm-4.16.0/build/build.cc~	2020-05-28 12:04:24.000000000 +0200
++++ rpm-4.16.0/build/build.cc	2020-10-31 18:57:03.678941782 +0100
 @@ -401,7 +401,7 @@
  		goto exit;
  
diff --git a/skip-symlinks.patch b/skip-symlinks.patch
index ccd24d1..8c2dba5 100644
--- a/skip-symlinks.patch
+++ b/skip-symlinks.patch
@@ -1,5 +1,5 @@
---- rpm-4.16.1.2/build/rpmfc.c~	2021-01-24 09:43:15.000000000 +0100
-+++ rpm-4.16.1.2/build/rpmfc.c	2021-02-19 09:14:46.031544586 +0100
+--- rpm-4.16.1.2/build/rpmfc.cc~	2021-01-24 09:43:15.000000000 +0100
++++ rpm-4.16.1.2/build/rpmfc.cc	2021-02-19 09:14:46.031544586 +0100
 @@ -1231,7 +1231,7 @@
  	int extension_index = 0;
  	int fcolor = RPMFC_BLACK;
diff --git a/uname-deps.patch b/uname-deps.patch
index a1a814c..cf48eaa 100644
--- a/uname-deps.patch
+++ b/uname-deps.patch
@@ -1,7 +1,7 @@
-diff --git a/lib/depends.c b/lib/depends.c
+diff --git a/lib/depends.cc b/lib/depends.cc
 index 28a4a784d..1d8ce1f8a 100644
---- a/lib/depends.c
-+++ b/lib/depends.c
+--- a/lib/depends.cc
++++ b/lib/depends.cc
 @@ -690,6 +690,17 @@ retry:
  	goto unsatisfied;
      }
@@ -20,14 +20,14 @@ index 28a4a784d..1d8ce1f8a 100644
      /* Dont look at pre-requisites of already installed packages */
      if (!adding && isTransientReq(dsflags))
  	goto exit;
-diff --git a/lib/rpmds.c b/lib/rpmds.c
+diff --git a/lib/rpmds.cc b/lib/rpmds.cc
 index f7ee76392..754969e39 100644
---- a/lib/rpmds.c
-+++ b/lib/rpmds.c
+--- a/lib/rpmds.cc
++++ b/lib/rpmds.cc
 @@ -2,6 +2,7 @@
-  * \file lib/rpmds.c
   */
  #include "system.h"
+ #include <atomic>
 +#include <sys/utsname.h>
  
  #include <rpm/rpmtypes.h>
@@ -126,15 +126,15 @@ index 90d54aa27..558252c04 100644
  
  typedef enum rpmrichOp_e {
      RPMRICHOP_NONE    = 0,
-diff --git a/lib/rpmts_internal.h b/lib/rpmts_internal.h
+diff --git a/lib/rpmts_internal.hh b/lib/rpmts_internal.hh
 index e69ef2584..ecdb12f0c 100644
---- a/lib/rpmts_internal.h
-+++ b/lib/rpmts_internal.h
+--- a/lib/rpmts_internal.hh
++++ b/lib/rpmts_internal.hh
 @@ -21,6 +21,7 @@ typedef struct tsMembers_s {
      rpmal addedPackages;	/*!< Set of packages being installed. */
  
      rpmds rpmlib;		/*!< rpmlib() dependency set. */
 +    rpmds uname;		/*!< uname() dependency set. */
-     rpmte * order;		/*!< Packages sorted by dependencies. */
-     int orderCount;		/*!< No. of transaction elements. */
-     int orderAlloced;		/*!< No. of allocated transaction elements. */
+     std::vector<rpmte> order;	/*!< Packages sorted by dependencies. */
+ } * tsMembers;
+ 
diff --git a/x32.patch b/x32.patch
index 7dc06db..5b7fc19 100644
--- a/x32.patch
+++ b/x32.patch
@@ -1,5 +1,5 @@
---- rpm-4.18.1/build/rpmfc.c.orig	2023-09-28 20:44:47.296539499 +0200
-+++ rpm-4.18.1/build/rpmfc.c	2023-09-28 20:56:50.552621285 +0200
+--- rpm-4.18.1/build/rpmfc.cc.orig	2023-09-28 20:44:47.296539499 +0200
++++ rpm-4.18.1/build/rpmfc.cc	2023-09-28 20:56:50.552621285 +0200
 @@ -648,6 +648,7 @@ static const struct rpmfcTokens_s rpmfcT
  
    { "ELF 32-bit",		RPMFC_ELF32|RPMFC_INCLUDE },
@@ -148,13 +148,13 @@ diff -ur rpm-4.16.1.2/rpmrc.in rpm-4.16.1.2.x32/rpmrc.in
  optflags: alpha -O2 -g -mieee
  optflags: alphaev5 -O2 -g -mieee -mtune=ev5
 @@ -155,6 +156,8 @@
- 
- archcolor: loongarch64 2
+ archcolor: x86_64_v3 2
+ archcolor: x86_64_v4 2
  
 +archcolor: x32 4
 +
- #############################################################
- # Canonical arch names and numbers
+ archcolor: sh3 1
+ archcolor: sh4 1
  
 @@ -170,6 +173,7 @@
  arch_canon:	amd64:	amd64	1
@@ -204,9 +204,9 @@ diff -ur rpm-4.16.1.2/rpmrc.in rpm-4.16.1.2.x32/rpmrc.in
  buildarch_compat: sh3: noarch
  buildarch_compat: sh4: noarch
  buildarch_compat: sh4a: sh4
-diff -ur rpm-4.16.1.2/tools/elfdeps.c rpm-4.16.1.2.x32/tools/elfdeps.c
---- rpm-4.16.1.2/tools/elfdeps.c	2020-05-28 12:04:25.084136944 +0200
-+++ rpm-4.16.1.2.x32/tools/elfdeps.c	2021-03-21 21:50:04.127398387 +0100
+diff -ur rpm-4.16.1.2/tools/elfdeps.cc rpm-4.16.1.2.x32/tools/elfdeps.cc
+--- rpm-4.16.1.2/tools/elfdeps.cc	2020-05-28 12:04:25.084136944 +0200
++++ rpm-4.16.1.2.x32/tools/elfdeps.cc	2021-03-21 21:50:04.127398387 +0100
 @@ -94,6 +94,9 @@
  	    break;
  	}
================================================================

---- gitweb:

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

More information about the pld-cvs-commit mailing list