[packages/rpm/dev-4.18] - update patches
baggins
baggins at pld-linux.org
Sun Nov 13 23:26:40 CET 2022
commit 36427552ae378c571498e6d0a5001132e395f3c5
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sun Nov 13 23:26:19 2022 +0100
- update patches
allow-at-in-ver-rel.patch | 2 +-
cpuinfo-deps.patch | 6 +++---
noexpand.patch | 4 ++--
rpm-scripts-closefds.patch | 7 +++----
rpm.spec | 4 +---
skip-symlinks.patch | 2 +-
uname-deps.patch | 6 +++---
x32.patch | 16 ++++++++--------
8 files changed, 22 insertions(+), 25 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index f703b9a..0c9f2fa 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -90,7 +90,6 @@ Patch30: missing-ghost-terminate-build.patch
Patch31: missing-doc-terminate-build.patch
Patch32: noexpand.patch
Patch34: skip-symlinks.patch
-Patch35: pl-po.patch
Patch36: build-locale.patch
Patch37: no-exe-for-elf-req.patch
Patch38: gem-in-package-builddir.patch
@@ -668,10 +667,9 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
%patch31 -p1
%patch32 -p1
%patch34 -p1
-%patch35 -p1
%patch36 -p1
%patch37 -p1
-%patch38 -p1
+#%patch38 -p1
%{__rm} po/*.gmo
diff --git a/allow-at-in-ver-rel.patch b/allow-at-in-ver-rel.patch
index 06241f8..045935c 100644
--- a/allow-at-in-ver-rel.patch
+++ b/allow-at-in-ver-rel.patch
@@ -1,9 +1,9 @@
--- 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
@@ -18,7 +18,7 @@
- #undef HTDATATYPE
#define ALLOWED_CHARS_NAME ".-_+%{}"
+ #define ALLOWED_FIRSTCHARS_NAME "_%"
-#define ALLOWED_CHARS_VERREL "._+%{}~^"
+#define ALLOWED_CHARS_VERREL "._+%{}~^@"
#define ALLOWED_CHARS_EVR ALLOWED_CHARS_VERREL "-:"
diff --git a/cpuinfo-deps.patch b/cpuinfo-deps.patch
index 1dab910..e239c8b 100644
--- a/cpuinfo-deps.patch
+++ b/cpuinfo-deps.patch
@@ -244,9 +244,9 @@ diff -ur rpm-4.16.0/lib/rpmds.c rpm-4.16.0-cpuinfo/lib/rpmds.c
+{
+ return rpmdsCpuinfoPool(NULL, dsp);
+}
-diff -ur rpm-4.16.0/lib/rpmds.h rpm-4.16.0-cpuinfo/lib/rpmds.h
---- rpm-4.16.0/lib/rpmds.h 2020-11-08 20:19:15.625093667 +0100
-+++ rpm-4.16.0-cpuinfo/lib/rpmds.h 2020-11-08 20:03:44.001865655 +0100
+diff -ur rpm-4.16.0/include/rpm/rpmds.h rpm-4.16.0-cpuinfo/include/rpm/rpmds.h
+--- rpm-4.16.0/include/rpm/rpmds.h 2020-11-08 20:19:15.625093667 +0100
++++ rpm-4.16.0-cpuinfo/include/rpm/rpmds.h 2020-11-08 20:03:44.001865655 +0100
@@ -419,6 +419,13 @@
*/
int rpmdsUname(rpmds * dsp);
diff --git a/noexpand.patch b/noexpand.patch
index e75a513..1a1a5b4 100644
--- a/noexpand.patch
+++ b/noexpand.patch
@@ -36,10 +36,10 @@ diff -ur rpm-4.16.0/build/rpmbuild_internal.h rpm-4.16.0-noexpand/build/rpmbuild
--- 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
@@ -246,6 +246,7 @@
- #define STRIP_NOTHING 0
#define STRIP_TRAILINGSPACE (1 << 0)
#define STRIP_COMMENTS (1 << 1)
-+#define STRIP_NOEXPAND (1 << 2)
+ #define STRIP_PARSED (1 << 2) /* Avoid adding to spec->parsed (hack) */
++#define STRIP_NOEXPAND (1 << 3)
#define ALLOW_EMPTY (1 << 16)
diff --git a/rpm-scripts-closefds.patch b/rpm-scripts-closefds.patch
index 6be392e..222f3fd 100644
--- a/rpm-scripts-closefds.patch
+++ b/rpm-scripts-closefds.patch
@@ -1,14 +1,13 @@
--- 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
-@@ -4,6 +4,8 @@
+@@ -4,6 +4,7 @@
#include "system.h"
+#include <fcntl.h>
-+
+ #include <string.h>
+
#include <rpm/rpmcli.h>
- #include <rpm/rpmtag.h>
- #include <rpm/rpmlib.h> /* rpmReadPackageFile, vercmp etc */
@@ -114,8 +116,15 @@
Fclose(fd);
fd = NULL;
diff --git a/skip-symlinks.patch b/skip-symlinks.patch
index 1f3eea5..ccd24d1 100644
--- a/skip-symlinks.patch
+++ b/skip-symlinks.patch
@@ -1,7 +1,7 @@
--- 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
@@ -1231,7 +1231,7 @@
- size_t slen = strlen(s);
+ int extension_index = 0;
int fcolor = RPMFC_BLACK;
rpm_mode_t mode = (fmode ? fmode[ix] : 0);
- int is_executable = (mode & (S_IXUSR|S_IXGRP|S_IXOTH));
diff --git a/uname-deps.patch b/uname-deps.patch
index 61ba652..d2f6a29 100644
--- a/uname-deps.patch
+++ b/uname-deps.patch
@@ -93,10 +93,10 @@ index f7ee76392..754969e39 100644
+{
+ return rpmdsUnamePool(NULL, dsp);
+}
-diff --git a/lib/rpmds.h b/lib/rpmds.h
+diff --git a/include/rpm/rpmds.h b/include/rpm/rpmds.h
index 90d54aa27..558252c04 100644
---- a/lib/rpmds.h
-+++ b/lib/rpmds.h
+--- a/include/rpm/rpmds.h
++++ b/include/rpm/rpmds.h
@@ -412,6 +412,13 @@ int rpmdsNVRMatchesDep(const Header h, const rpmds req, int nopromote);
*/
int rpmdsRpmlib(rpmds * dsp, const void * tblp);
diff --git a/x32.patch b/x32.patch
index 9eab78d..cef1f63 100644
--- a/x32.patch
+++ b/x32.patch
@@ -34,9 +34,9 @@ diff -ur rpm-4.16.1.2/build/rpmfc.c rpm-4.16.1.2.x32/build/rpmfc.c
break;
}
elf_end(elf);
-diff -ur rpm-4.16.1.2/build/rpmfc.h rpm-4.16.1.2.x32/build/rpmfc.h
---- rpm-4.16.1.2/build/rpmfc.h 2020-05-28 12:04:25.011136544 +0200
-+++ rpm-4.16.1.2.x32/build/rpmfc.h 2021-03-21 21:50:04.127398387 +0100
+diff -ur rpm-4.16.1.2/include/rpm/rpmfc.h rpm-4.16.1.2.x32/include/rpm/rpmfc.h
+--- rpm-4.16.1.2/include/rpm/rpmfc.h 2020-05-28 12:04:25.011136544 +0200
++++ rpm-4.16.1.2.x32/include/rpm/rpmfc.h 2021-03-21 21:50:04.127398387 +0100
@@ -26,8 +26,9 @@
RPMFC_BLACK = 0,
RPMFC_ELF32 = (1 << 0),
@@ -52,16 +52,16 @@ diff -ur rpm-4.16.1.2/configure.ac rpm-4.16.1.2.x32/configure.ac
--- rpm-4.16.1.2/configure.ac 2021-03-21 21:51:28.221530479 +0100
+++ rpm-4.16.1.2.x32/configure.ac 2021-03-21 21:50:04.127398387 +0100
@@ -930,6 +930,10 @@
- if echo "$host_os" | grep '.*-gnu' > /dev/null ; then
+ if echo "$host_os" | grep '.*-gnu$' > /dev/null ; then
host_os=`echo "${host_os}" | sed 's/-gnu$//'`
fi
+if echo "$host_os" | grep '.*-gnux32' > /dev/null ; then
+ host_os=`echo "${host_os}" | sed 's/-gnux32$//'`
+ host_os_gnu=-gnux32
+fi
-
- changequote(<, >)
- host_os_exact="${host_os}"
+ if echo "$host_os" | grep '.*-gnu[[^-]]*$' > /dev/null ; then
+ AC_MSG_ERROR([unrecognized GNU build triplet $host_os])
+ fi
diff -ur rpm-4.16.1.2/installplatform rpm-4.16.1.2.x32/installplatform
--- rpm-4.16.1.2/installplatform 2020-05-28 12:04:25.027136631 +0200
+++ rpm-4.16.1.2.x32/installplatform 2021-03-21 21:51:47.671145954 +0100
@@ -153,7 +153,7 @@ diff -ur rpm-4.16.1.2/rpmrc.in rpm-4.16.1.2.x32/rpmrc.in
optflags: alphaev5 -O2 -g -mieee -mtune=ev5
@@ -155,6 +156,8 @@
- archcolor: riscv64 2
+ archcolor: loongarch64 2
+archcolor: x32 4
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/36427552ae378c571498e6d0a5001132e395f3c5
More information about the pld-cvs-commit
mailing list