[packages/rpm] remove check-valid-arch-early and group-lookup patches

atler atler at pld-linux.org
Mon Jan 12 02:04:22 CET 2026


commit aa1ad8bfecd4441cd8d0cc5fa363b3b227a500fc
Author: Jan Palus <jpalus at fastmail.com>
Date:   Mon Jan 12 02:02:26 2026 +0100

    remove check-valid-arch-early and group-lookup patches
    
    dropped from spec in f10632c

 check-valid-arch-early.patch | 13 ----------
 group-lookup.patch           | 61 --------------------------------------------
 2 files changed, 74 deletions(-)
---
diff --git a/check-valid-arch-early.patch b/check-valid-arch-early.patch
deleted file mode 100644
index 7023604..0000000
--- a/check-valid-arch-early.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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);
-     }
-+    /* XXX Skip valid arch check if not building binary package */
-+    if (!(spec->flags & RPMSPEC_ANYARCH) && checkForValidArchitectures(spec)) {
-+	goto exit;
-+    }
- 
-     /* if we get down here nextPart has been set to non-error */
-     res = nextPart;
diff --git a/group-lookup.patch b/group-lookup.patch
deleted file mode 100644
index 6756df8..0000000
--- a/group-lookup.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- rpm-4.20.1/lib/rpmug.c.orig	2025-02-19 16:29:33.000000000 +0100
-+++ rpm-4.20.1/lib/rpmug.c	2025-02-26 20:58:54.695393189 +0100
-@@ -1,6 +1,7 @@
- #include "system.h"
- 
- #include <errno.h>
-+#include <rpm/argv.h>
- #include <rpm/rpmlog.h>
- #include <rpm/rpmstring.h>
- #include <rpm/rpmmacro.h>
-@@ -51,7 +52,8 @@
- 			char **ret)
- {
-     int rc = -1; /* assume not found */
--    char *str, buf[BUFSIZ];
-+    int nf = vcol > rcol ? vcol : rcol;
-+    char *str, buf[BUFSIZ], *lastret = NULL;
-     FILE *f = fopen(path, "r");
-     if (f == NULL) {
- 	rpmlog(RPMLOG_ERR, _("failed to open %s for id/name lookup: %s\n"),
-@@ -60,28 +62,27 @@
-     }
- 
-     while ((str = fgets(buf, sizeof(buf), f)) != NULL) {
--	int nf = vcol > rcol ? vcol : rcol;
--	const char *fields[nf + 1];
--	char *tok, *save = NULL;
--	int col = -1;
--
--	while ((tok = strtok_r(str, ":", &save)) != NULL) {
--	    fields[++col] = tok;
--	    str = NULL;
--	    if (col >= nf)
--		break;
--	}
-+	ARGV_t fields;
-+
-+	fields = argvSplitString(str, ":", ARGV_NONE);
- 
--	if (col >= nf) {
-+	if (argvCount(fields) > nf) {
- 	    if (rstreq(val, fields[vcol])) {
--		*ret = xstrdup(fields[rcol]);
-+		if (lastret != NULL)
-+		    free(lastret);
-+		lastret = xstrdup(fields[rcol]);
- 		rc = 0;
- 	    }
- 	}
-+
-+	argvFree(fields);
-     }
- 
-     fclose(f);
- 
-+    if (!rc)
-+	*ret = lastret;
-+
-     return rc;
- }
- 
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list