testing/rpm
SHA256
3
0
Fork 0
forked from pool/rpm
Code Pull Requests Activity

Accepting request 985299 from Base:System

Browse Source 
- make patches git quiltimport friendlier (forwarded request 985294 from lnussel)

OBS-URL: https://build.opensuse.org/request/show/985299
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpm?expand=0&rev=299
This commit is contained in:
Dominique Leuenberger 2022-06-29 14:00:11 +00:00 committed by Git OBS Bridge
commit 269d7f64ca
51 changed files with 171 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
assumeexec.diff
View File

@ -1,5 +1,5 @@
--- ./tools/elfdeps.c.orig 2014-06-26 06:51:55.768815677 +0000 --- tools/elfdeps.c.orig 2014-06-26 06:51:55.768815677 +0000
+++ ./tools/elfdeps.c 2014-08-04 13:02:16.981081591 +0000 +++ tools/elfdeps.c 2014-08-04 13:02:16.981081591 +0000
@@ -17,6 +17,7 @@ int soname_only = 0; @@ -17,6 +17,7 @@ int soname_only = 0;
int fake_soname = 1; int fake_soname = 1;
int filter_soname = 1; int filter_soname = 1;

4
brp-compress-no-img.patch
View File

@ -1,5 +1,5 @@
--- ./scripts/brp-compress.orig 2020-09-30 13:09:28.846434576 +0000 --- scripts/brp-compress.orig 2020-09-30 13:09:28.846434576 +0000
+++ ./scripts/brp-compress 2020-09-30 13:09:34.514422459 +0000 +++ scripts/brp-compress 2020-09-30 13:09:34.514422459 +0000
@@ -51,6 +51,7 @@ do @@ -51,6 +51,7 @@ do
find $d -type f ! -name dir | while read f find $d -type f ! -name dir | while read f
do do

8
brp.diff
View File

@ -1,5 +1,5 @@
--- ./scripts/brp-strip-comment-note.orig 2021-06-21 12:00:44.650612737 +0000 --- scripts/brp-strip-comment-note.orig 2021-06-21 12:00:44.650612737 +0000
+++ ./scripts/brp-strip-comment-note 2021-09-23 19:04:31.249193665 +0000 +++ scripts/brp-strip-comment-note 2021-09-23 19:04:31.249193665 +0000
@@ -16,6 +16,8 @@ esac @@ -16,6 +16,8 @@ esac
# for already stripped elf files in the build root # for already stripped elf files in the build root
for f in `find "$RPM_BUILD_ROOT" -type f \( -perm -0100 -or -perm -0010 -or -perm -0001 \) -exec file {} \; | \ for f in `find "$RPM_BUILD_ROOT" -type f \( -perm -0100 -or -perm -0010 -or -perm -0001 \) -exec file {} \; | \
@ -9,8 +9,8 @@
sed -n -e 's/^\(.*\):[ ]*ELF.*, stripped.*/\1/p'`; do sed -n -e 's/^\(.*\):[ ]*ELF.*, stripped.*/\1/p'`; do
note="-R .note" note="-R .note"
if $OBJDUMP -h $f | grep '^[ ]*[0-9]*[ ]*.note[ ]' -A 1 | \ if $OBJDUMP -h $f | grep '^[ ]*[0-9]*[ ]*.note[ ]' -A 1 | \
--- ./scripts/brp-strip.orig 2021-09-23 19:04:31.249193665 +0000 --- scripts/brp-strip.orig 2021-09-23 19:04:31.249193665 +0000
+++ ./scripts/brp-strip 2021-09-23 19:07:10.624868675 +0000 +++ scripts/brp-strip 2021-09-23 19:07:10.624868675 +0000
@@ -14,4 +14,4 @@ esac @@ -14,4 +14,4 @@ esac
# Strip ELF binaries # Strip ELF binaries

4
brpcompress.diff
View File

@ -1,5 +1,5 @@
--- ./scripts/brp-compress.orig 2020-05-28 10:04:25.075136894 +0000 --- scripts/brp-compress.orig 2020-05-28 10:04:25.075136894 +0000
+++ ./scripts/brp-compress 2020-10-27 15:23:57.970737863 +0000 +++ scripts/brp-compress 2020-10-27 15:23:57.970737863 +0000
@@ -5,6 +5,9 @@ if [ -z "$RPM_BUILD_ROOT" ] || [ "$RPM_B @@ -5,6 +5,9 @@ if [ -z "$RPM_BUILD_ROOT" ] || [ "$RPM_B
exit 0 exit 0
fi fi

4
checkfilesnoinfodir.diff
View File

@ -1,8 +1,8 @@
Exclude /usr/share/info/dir from check-files. Probably only Exclude /usr/share/info/dir from check-files. Probably only
interesting for SUSE. interesting for SUSE.
--- ./scripts/check-files.orig 2020-09-30 12:36:56.398762048 +0000 --- scripts/check-files.orig 2020-09-30 12:36:56.398762048 +0000
+++ ./scripts/check-files 2020-09-30 12:41:15.294176572 +0000 +++ scripts/check-files 2020-09-30 12:41:15.294176572 +0000
@@ -28,5 +28,5 @@ trap "rm -f \"${FILES_DISK}\"" 0 2 3 5 1 @@ -28,5 +28,5 @@ trap "rm -f \"${FILES_DISK}\"" 0 2 3 5 1
# Find non-directory files in the build root and compare to the manifest. # Find non-directory files in the build root and compare to the manifest.
# TODO: regex chars in last sed(1) expression should be escaped # TODO: regex chars in last sed(1) expression should be escaped

8
checksepwarn.diff
View File

@ -1,5 +1,5 @@
--- ./build/parseReqs.c.orig 2019-06-26 14:17:31.396985719 +0000 --- build/parseReqs.c.orig 2019-06-26 14:17:31.396985719 +0000
+++ ./build/parseReqs.c 2019-10-02 12:10:51.879570016 +0000 +++ build/parseReqs.c 2019-10-02 12:10:51.879570016 +0000
@@ -42,7 +42,7 @@ static rpmRC checkEpoch(const char *s, c @@ -42,7 +42,7 @@ static rpmRC checkEpoch(const char *s, c
return RPMRC_OK; return RPMRC_OK;
} }
@ -55,8 +55,8 @@
goto exit; goto exit;
if (nametag == RPMTAG_OBSOLETENAME) { if (nametag == RPMTAG_OBSOLETENAME) {
--- ./macros.in.orig 2019-10-02 12:10:45.431583601 +0000 --- macros.in.orig 2019-10-02 12:10:45.431583601 +0000
+++ ./macros.in 2019-10-02 12:10:51.879570016 +0000 +++ macros.in 2019-10-02 12:10:51.879570016 +0000
@@ -452,7 +452,7 @@ package or when debugging this package.\ @@ -452,7 +452,7 @@ package or when debugging this package.\
%_invalid_encoding_terminates_build 1 %_invalid_encoding_terminates_build 1

24
db_conversion.diff
View File

@ -1,5 +1,5 @@
--- ./lib/backend/bdb_ro.c.orig 2020-05-28 10:04:25.027136631 +0000 --- lib/backend/bdb_ro.c.orig 2020-05-28 10:04:25.027136631 +0000
+++ ./lib/backend/bdb_ro.c 2021-01-07 15:24:08.866776792 +0000 +++ lib/backend/bdb_ro.c 2021-01-07 15:24:08.866776792 +0000
@@ -790,6 +790,7 @@ static unsigned int bdbro_pkgdbKey(dbiIn @@ -790,6 +790,7 @@ static unsigned int bdbro_pkgdbKey(dbiIn
struct rpmdbOps_s bdbro_dbops = { struct rpmdbOps_s bdbro_dbops = {
.name = "bdb_ro", .name = "bdb_ro",
@ -8,8 +8,8 @@
.open = bdbro_Open, .open = bdbro_Open,
.close = bdbro_Close, .close = bdbro_Close,
--- ./lib/backend/dbi.c.orig 2020-08-31 09:14:07.991087349 +0000 --- lib/backend/dbi.c.orig 2020-08-31 09:14:07.991087349 +0000
+++ ./lib/backend/dbi.c 2021-01-07 15:24:08.866776792 +0000 +++ lib/backend/dbi.c 2021-01-07 15:24:08.866776792 +0000
@@ -119,11 +119,20 @@ exit: @@ -119,11 +119,20 @@ exit:
} }
@ -31,8 +31,8 @@
const char * dbiName(dbiIndex dbi) const char * dbiName(dbiIndex dbi)
{ {
return dbi->dbi_file; return dbi->dbi_file;
--- ./lib/backend/dbi.h.orig 2021-01-07 15:23:56.122812108 +0000 --- lib/backend/dbi.h.orig 2021-01-07 15:23:56.122812108 +0000
+++ ./lib/backend/dbi.h 2021-01-07 15:24:08.866776792 +0000 +++ lib/backend/dbi.h 2021-01-07 15:24:08.866776792 +0000
@@ -11,6 +11,7 @@ enum rpmdbFlags { @@ -11,6 +11,7 @@ enum rpmdbFlags {
RPMDB_FLAG_REBUILD = (1 << 1), RPMDB_FLAG_REBUILD = (1 << 1),
RPMDB_FLAG_VERIFYONLY = (1 << 2), RPMDB_FLAG_VERIFYONLY = (1 << 2),
@ -72,8 +72,8 @@
int (*open)(rpmdb rdb, rpmDbiTagVal rpmtag, dbiIndex * dbip, int flags); int (*open)(rpmdb rdb, rpmDbiTagVal rpmtag, dbiIndex * dbip, int flags);
int (*close)(dbiIndex dbi, unsigned int flags); int (*close)(dbiIndex dbi, unsigned int flags);
--- ./lib/backend/ndb/rpmpkg.c.orig 2021-01-07 15:24:37.266698082 +0000 --- lib/backend/ndb/rpmpkg.c.orig 2021-01-07 15:24:37.266698082 +0000
+++ ./lib/backend/ndb/rpmpkg.c 2021-01-07 15:27:46.678173133 +0000 +++ lib/backend/ndb/rpmpkg.c 2021-01-07 15:27:46.678173133 +0000
@@ -1116,11 +1116,12 @@ static int rpmpkgPutInternal(rpmpkgdb pk @@ -1116,11 +1116,12 @@ static int rpmpkgPutInternal(rpmpkgdb pk
if (rpmpkgWriteBlob(pkgdb, pkgidx, blkoff, blkcnt, blob, blobl, pkgdb->generation)) { if (rpmpkgWriteBlob(pkgdb, pkgidx, blkoff, blkcnt, blob, blobl, pkgdb->generation)) {
return RPMRC_FAIL; return RPMRC_FAIL;
@ -90,8 +90,8 @@
if (rpmpkgWriteslot(pkgdb, slotno, pkgidx, blkoff, blkcnt)) { if (rpmpkgWriteslot(pkgdb, slotno, pkgidx, blkoff, blkcnt)) {
free(pkgdb->slots); free(pkgdb->slots);
pkgdb->slots = 0; pkgdb->slots = 0;
--- ./lib/rpmdb.c.orig 2021-01-07 15:23:56.122812108 +0000 --- lib/rpmdb.c.orig 2021-01-07 15:23:56.122812108 +0000
+++ ./lib/rpmdb.c 2021-01-07 15:24:08.866776792 +0000 +++ lib/rpmdb.c 2021-01-07 15:24:08.866776792 +0000
@@ -516,7 +516,13 @@ static int openDatabase(const char * pre @@ -516,7 +516,13 @@ static int openDatabase(const char * pre
rpmsqActivate(1); rpmsqActivate(1);
} }
@ -158,8 +158,8 @@
rc = 1; rc = 1;
goto exit; goto exit;
} }
--- ./lib/rpmdb_internal.h.orig 2020-05-28 10:04:25.037136686 +0000 --- lib/rpmdb_internal.h.orig 2020-05-28 10:04:25.037136686 +0000
+++ ./lib/rpmdb_internal.h 2021-01-07 15:24:08.866776792 +0000 +++ lib/rpmdb_internal.h 2021-01-07 15:24:08.866776792 +0000
@@ -25,6 +25,7 @@ extern "C" { @@ -25,6 +25,7 @@ extern "C" {
enum rpmdbRebuildFlags_e { enum rpmdbRebuildFlags_e {

4
dbrointerruptable.diff
View File

@ -1,5 +1,5 @@
--- ./lib/rpmdb.c.orig 2020-05-28 10:04:25.037136686 +0000 --- lib/rpmdb.c.orig 2020-05-28 10:04:25.037136686 +0000
+++ ./lib/rpmdb.c 2020-09-30 12:23:50.708547165 +0000 +++ lib/rpmdb.c 2020-09-30 12:23:50.708547165 +0000
@@ -387,9 +387,11 @@ int rpmdbClose(rpmdb db) @@ -387,9 +387,11 @@ int rpmdbClose(rpmdb db)
{ {
rpmdb * prev, next; rpmdb * prev, next;

4
debuginfo-mono.patch
View File

@ -1,5 +1,5 @@
--- ./scripts/find-debuginfo.in.orig 2021-09-23 20:28:21.646855995 +0000 --- scripts/find-debuginfo.in.orig 2021-09-23 20:28:21.646855995 +0000
+++ ./scripts/find-debuginfo.in 2021-09-23 20:28:53.530790698 +0000 +++ scripts/find-debuginfo.in 2021-09-23 20:28:53.530790698 +0000
@@ -434,6 +434,16 @@ while read nlinks inum f; do @@ -434,6 +434,16 @@ while read nlinks inum f; do
;; ;;
*) continue ;; *) continue ;;

4
debuglink.diff
View File

@ -1,5 +1,5 @@
--- ./scripts/find-debuginfo.in.orig 2021-09-23 20:27:13.686995174 +0000 --- scripts/find-debuginfo.in.orig 2021-09-23 20:27:13.686995174 +0000
+++ ./scripts/find-debuginfo.in 2021-09-23 20:27:40.826939593 +0000 +++ scripts/find-debuginfo.in 2021-09-23 20:27:40.826939593 +0000
@@ -407,7 +407,7 @@ debug_link() @@ -407,7 +407,7 @@ debug_link()
get_debugfn() get_debugfn()
{ {

4
debugsubpkg.diff
View File

@ -1,5 +1,5 @@
--- ./scripts/find-debuginfo.in.orig 2021-09-23 20:25:41.059184871 +0000 --- scripts/find-debuginfo.in.orig 2021-09-23 20:25:41.059184871 +0000
+++ ./scripts/find-debuginfo.in 2021-09-23 20:26:40.363063418 +0000 +++ scripts/find-debuginfo.in 2021-09-23 20:26:40.363063418 +0000
@@ -643,19 +643,25 @@ if $run_dwz \ @@ -643,19 +643,25 @@ if $run_dwz \
fi fi
fi fi

4
emptymanifest.diff
View File

@ -1,5 +1,5 @@
--- ./macros.in.orig 2017-01-20 10:15:12.677868723 +0000 --- macros.in.orig 2017-01-20 10:15:12.677868723 +0000
+++ ./macros.in 2017-01-20 10:15:30.385819715 +0000 +++ macros.in 2017-01-20 10:15:30.385819715 +0000
@@ -403,7 +403,7 @@ package or when debugging this package.\ @@ -403,7 +403,7 @@ package or when debugging this package.\
# Should empty %files manifest file terminate a build? # Should empty %files manifest file terminate a build?
# #

8
enable-postin-scripts-error.diff
View File

@ -1,5 +1,5 @@
--- ./lib/rpmscript.c --- lib/rpmscript.c
+++ ./lib/rpmscript.c +++ lib/rpmscript.c
@@ -390,7 +390,7 @@ rpmRC rpmScriptRun(rpmScript script, int @@ -390,7 +390,7 @@ rpmRC rpmScriptRun(rpmScript script, int
if (script == NULL) return RPMRC_OK; if (script == NULL) return RPMRC_OK;
@ -19,8 +19,8 @@
+ flags |= RPMSCRIPT_FLAG_CRITICAL; + flags |= RPMSCRIPT_FLAG_CRITICAL;
+ return flags; + return flags;
} }
--- ./macros.in --- macros.in
+++ ./macros.in +++ macros.in
@@ -1293,5 +1293,10 @@ end @@ -1293,5 +1293,10 @@ end
%{expand:%__scm_setup_%{__scm} %{!-v:-q}}\ %{expand:%__scm_setup_%{__scm} %{!-v:-q}}\
%{!-N:%autopatch %{-v} %{-p:-p%{-p*}}} %{!-N:%autopatch %{-v} %{-p:-p%{-p*}}}

12
fileattrs.diff
View File

@ -1,20 +1,20 @@
--- ./fileattrs/elf.attr.orig 2021-09-23 19:29:51.474079693 +0000 --- fileattrs/elf.attr.orig 2021-09-23 19:29:51.474079693 +0000
+++ ./fileattrs/elf.attr 2021-09-23 19:35:43.413332593 +0000 +++ fileattrs/elf.attr 2021-09-23 19:35:43.413332593 +0000
@@ -1,3 +1,4 @@ @@ -1,3 +1,4 @@
%__elf_provides %{_rpmconfigdir}/elfdeps --provides %__elf_provides %{_rpmconfigdir}/elfdeps --provides
%__elf_requires %{_rpmconfigdir}/elfdeps --requires %__elf_requires %{_rpmconfigdir}/elfdeps --requires
%__elf_magic ^(setuid,? )?(setgid,? )?(sticky )?ELF (32|64)-bit.*$ %__elf_magic ^(setuid,? )?(setgid,? )?(sticky )?ELF (32|64)-bit.*$
+%__elf_exclude_path ^/usr/lib/debug/ +%__elf_exclude_path ^/usr/lib/debug/
--- ./fileattrs/perl.attr.orig 2021-06-21 12:00:44.587611741 +0000 --- fileattrs/perl.attr.orig 2021-06-21 12:00:44.587611741 +0000
+++ ./fileattrs/perl.attr 2021-09-23 19:29:51.474079693 +0000 +++ fileattrs/perl.attr 2021-09-23 19:29:51.474079693 +0000
@@ -1,3 +1,4 @@ @@ -1,3 +1,4 @@
-%__perl_requires %{_rpmconfigdir}/perl.req -%__perl_requires %{_rpmconfigdir}/perl.req
+# disabled for now +# disabled for now
+#%__perl_requires %{_rpmconfigdir}/perl.req +#%__perl_requires %{_rpmconfigdir}/perl.req
%__perl_magic ^.*[Pp]erl .*$ %__perl_magic ^.*[Pp]erl .*$
%__perl_flags exeonly %__perl_flags exeonly
--- ./fileattrs/perllib.attr.orig 2021-06-21 12:00:44.587611741 +0000 --- fileattrs/perllib.attr.orig 2021-06-21 12:00:44.587611741 +0000
+++ ./fileattrs/perllib.attr 2021-09-23 19:29:51.478079685 +0000 +++ fileattrs/perllib.attr 2021-09-23 19:29:51.478079685 +0000
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
%__perllib_provides %{_rpmconfigdir}/perl.prov %__perllib_provides %{_rpmconfigdir}/perl.prov
-%__perllib_requires %{_rpmconfigdir}/perl.req -%__perllib_requires %{_rpmconfigdir}/perl.req

4
find-lang-qt-qm.patch
View File

@ -1,5 +1,5 @@
--- ./scripts/find-lang.sh.orig 2021-09-23 19:57:49.046595975 +0000 --- scripts/find-lang.sh.orig 2021-09-23 19:57:49.046595975 +0000
+++ ./scripts/find-lang.sh 2021-09-23 19:59:36.182374732 +0000 +++ scripts/find-lang.sh 2021-09-23 19:59:36.182374732 +0000
@@ -305,7 +305,9 @@ s:%lang(C) :: @@ -305,7 +305,9 @@ s:%lang(C) ::
find "$TOP_DIR" -type f -o -type l|sed ' find "$TOP_DIR" -type f -o -type l|sed '

4
finddebuginfo-absolute-links.diff
View File

@ -1,5 +1,5 @@
--- ./scripts/find-debuginfo.in.orig 2021-09-23 20:23:21.967469723 +0000 --- scripts/find-debuginfo.in.orig 2021-09-23 20:23:21.967469723 +0000
+++ ./scripts/find-debuginfo.in 2021-09-23 20:24:51.623286108 +0000 +++ scripts/find-debuginfo.in 2021-09-23 20:24:51.623286108 +0000
@@ -391,7 +391,17 @@ debug_link() @@ -391,7 +391,17 @@ debug_link()
local l="/usr/lib/debug$2" local l="/usr/lib/debug$2"
local t="$1" local t="$1"

4
finddebuginfo.diff
View File

@ -1,5 +1,5 @@
--- ./scripts/find-debuginfo.in.orig 2021-07-26 23:05:31.867817624 +0000 --- scripts/find-debuginfo.in.orig 2021-07-26 23:05:31.867817624 +0000
+++ ./scripts/find-debuginfo.in 2021-09-23 20:20:03.763875636 +0000 +++ scripts/find-debuginfo.in 2021-09-23 20:20:03.763875636 +0000
@@ -412,12 +412,18 @@ trap 'rm -rf "$temp"' EXIT @@ -412,12 +412,18 @@ trap 'rm -rf "$temp"' EXIT
# Build a list of unstripped ELF files and their hardlinks # Build a list of unstripped ELF files and their hardlinks

4
findlang.diff
View File

@ -1,5 +1,5 @@
--- ./scripts/find-lang.sh.orig 2021-06-21 12:00:44.650612737 +0000 --- scripts/find-lang.sh.orig 2021-06-21 12:00:44.650612737 +0000
+++ ./scripts/find-lang.sh 2021-09-23 19:12:01.428275661 +0000 +++ scripts/find-lang.sh 2021-09-23 19:12:01.428275661 +0000
@@ -37,11 +37,11 @@ the top of the tree containing the files @@ -37,11 +37,11 @@ the top of the tree containing the files
PACKAGE_NAME is the %{name} of the package. This should also be PACKAGE_NAME is the %{name} of the package. This should also be
the basename of the .mo files. the output is written to the basename of the .mo files. the output is written to

8
findsupplements.diff
View File

@ -1,5 +1,5 @@
--- ./scripts/Makefile.am.orig 2021-09-23 20:01:42.554113780 +0000 --- scripts/Makefile.am.orig 2021-09-23 20:01:42.554113780 +0000
+++ ./scripts/Makefile.am 2021-09-23 20:02:13.466049945 +0000 +++ scripts/Makefile.am 2021-09-23 20:02:13.466049945 +0000
@@ -17,7 +17,7 @@ EXTRA_DIST = \ @@ -17,7 +17,7 @@ EXTRA_DIST = \
rpmdb_dump rpmdb_load \ rpmdb_dump rpmdb_load \
rpm.daily rpm.log rpm.supp rpm2cpio.sh \ rpm.daily rpm.log rpm.supp rpm2cpio.sh \
@ -18,8 +18,8 @@
perl.prov perl.req \ perl.prov perl.req \
pkgconfigdeps.sh \ pkgconfigdeps.sh \
ocamldeps.sh \ ocamldeps.sh \
--- ./scripts/find-supplements.orig 2021-09-23 20:01:42.554113780 +0000 --- scripts/find-supplements.orig 2021-09-23 20:01:42.554113780 +0000
+++ ./scripts/find-supplements 2021-09-23 20:01:42.554113780 +0000 +++ scripts/find-supplements 2021-09-23 20:01:42.554113780 +0000
@@ -0,0 +1,3 @@ @@ -0,0 +1,3 @@
+#!/bin/sh +#!/bin/sh
+ +

4
headerchk2.diff
View File

@ -1,5 +1,5 @@
--- ./lib/header.c.orig 2017-12-01 15:54:04.254399473 +0000 --- lib/header.c.orig 2017-12-01 15:54:04.254399473 +0000
+++ ./lib/header.c 2017-12-01 15:55:36.389131237 +0000 +++ lib/header.c 2017-12-01 15:55:36.389131237 +0000
@@ -929,7 +929,8 @@ rpmRC hdrblobImport(hdrblob blob, int fa @@ -929,7 +929,8 @@ rpmRC hdrblobImport(hdrblob blob, int fa
rdlen += REGION_TAG_COUNT; rdlen += REGION_TAG_COUNT;

4
ignore-auxv.diff
View File

@ -1,5 +1,5 @@
--- ./lib/rpmrc.c.orig 2020-09-30 07:48:01.215567727 +0000 --- lib/rpmrc.c.orig 2020-09-30 07:48:01.215567727 +0000
+++ ./lib/rpmrc.c 2020-09-30 12:22:46.612692258 +0000 +++ lib/rpmrc.c 2020-09-30 12:22:46.612692258 +0000
@@ -78,10 +78,12 @@ struct rpmOption { @@ -78,10 +78,12 @@ struct rpmOption {
int localize; int localize;
}; };

8
langnoc.diff
View File

@ -1,5 +1,5 @@
--- ./macros.in.orig 2021-09-23 19:54:19.515028659 +0000 --- macros.in.orig 2021-09-23 19:54:19.515028659 +0000
+++ ./macros.in 2021-09-23 19:54:25.495016311 +0000 +++ macros.in 2021-09-23 19:54:25.495016311 +0000
@@ -1150,6 +1150,7 @@ package or when debugging this package.\ @@ -1150,6 +1150,7 @@ package or when debugging this package.\
# %files -f %{name}.lang # %files -f %{name}.lang
# #
@ -8,8 +8,8 @@
# Commands + opts to use for retrieving remote files # Commands + opts to use for retrieving remote files
# Proxy opts can be set through --httpproxy/--httpport popt aliases, # Proxy opts can be set through --httpproxy/--httpport popt aliases,
--- ./scripts/find-lang.sh.orig 2021-09-23 19:54:19.507028675 +0000 --- scripts/find-lang.sh.orig 2021-09-23 19:54:19.507028675 +0000
+++ ./scripts/find-lang.sh 2021-09-23 19:54:25.495016311 +0000 +++ scripts/find-lang.sh 2021-09-23 19:54:25.495016311 +0000
@@ -75,6 +75,8 @@ MO= @@ -75,6 +75,8 @@ MO=
MO_NAME=${NAMES[0]}.lang MO_NAME=${NAMES[0]}.lang
ALL_NAME=# ALL_NAME=#

12
leave-malloc-check-set.diff
View File

@ -12,8 +12,8 @@ Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
sign/rpmgensig.c | 1 - sign/rpmgensig.c | 1 -
3 files changed, 5 deletions(-) 3 files changed, 5 deletions(-)
--- ./build/rpmfc.c --- build/rpmfc.c
+++ ./build/rpmfc.c +++ build/rpmfc.c
@@ -319,7 +319,6 @@ static int getOutputFrom(ARGV_t argv, @@ -319,7 +319,6 @@ static int getOutputFrom(ARGV_t argv,
if (buildRoot) if (buildRoot)
setenv("RPM_BUILD_ROOT", buildRoot, 1); setenv("RPM_BUILD_ROOT", buildRoot, 1);
@ -22,8 +22,8 @@ Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
execvp(argv[0], (char *const *)argv); execvp(argv[0], (char *const *)argv);
rpmlog(RPMLOG_ERR, _("Couldn't exec %s: %s\n"), rpmlog(RPMLOG_ERR, _("Couldn't exec %s: %s\n"),
argv[0], strerror(errno)); argv[0], strerror(errno));
--- ./lib/rpmscript.c --- lib/rpmscript.c
+++ ./lib/rpmscript.c +++ lib/rpmscript.c
@@ -245,9 +245,6 @@ static void doScriptExec(ARGV_const_t argv, ARGV_const_t prefixes, @@ -245,9 +245,6 @@ static void doScriptExec(ARGV_const_t argv, ARGV_const_t prefixes,
} }
@ -34,8 +34,8 @@ Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
xx = execv(argv[0], argv); xx = execv(argv[0], argv);
if (xx) { if (xx) {
rpmlog(RPMLOG_ERR, rpmlog(RPMLOG_ERR,
--- ./sign/rpmgensig.c --- sign/rpmgensig.c
+++ ./sign/rpmgensig.c +++ sign/rpmgensig.c
@@ -216,7 +216,6 @@ static int runGPG(sigTarget sigt, const char *sigfile) @@ -216,7 +216,6 @@ static int runGPG(sigTarget sigt, const char *sigfile)
dup2(pipefd[0], STDIN_FILENO); dup2(pipefd[0], STDIN_FILENO);
close(pipefd[1]); close(pipefd[1]);

4
localetag.diff
View File

@ -1,8 +1,8 @@
Convert output to the current locale. Assumes utf8 input if the Convert output to the current locale. Assumes utf8 input if the
decoding works, otherwise iso-8859-1. decoding works, otherwise iso-8859-1.
--- ./lib/tagexts.c.orig 2021-06-21 12:00:44.615612184 +0000 --- lib/tagexts.c.orig 2021-06-21 12:00:44.615612184 +0000
+++ ./lib/tagexts.c 2021-09-23 18:58:58.461872258 +0000 +++ lib/tagexts.c 2021-09-23 18:58:58.461872258 +0000
@@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@
* \file lib/formats.c * \file lib/formats.c
*/ */

4
macrosin.diff
View File

@ -1,5 +1,5 @@
--- ./macros.in.orig 2021-09-23 19:13:54.532045005 +0000 --- macros.in.orig 2021-09-23 19:13:54.532045005 +0000
+++ ./macros.in 2021-09-23 19:13:59.592034687 +0000 +++ macros.in 2021-09-23 19:13:59.592034687 +0000
@@ -170,6 +170,7 @@ @@ -170,6 +170,7 @@
%{?_unique_debug_names:--unique-debug-suffix "-%{VERSION}-%{RELEASE}.%{_arch}"} \\\ %{?_unique_debug_names:--unique-debug-suffix "-%{VERSION}-%{RELEASE}.%{_arch}"} \\\
%{?_unique_debug_srcs:--unique-debug-src-base "%{name}-%{VERSION}-%{RELEASE}.%{_arch}"} \\\ %{?_unique_debug_srcs:--unique-debug-src-base "%{name}-%{VERSION}-%{RELEASE}.%{_arch}"} \\\

8
nextiteratorheaderblob.diff
View File

@ -1,5 +1,5 @@
--- ./lib/rpmdb.c.orig 2020-11-27 13:09:17.968992873 +0000 --- lib/rpmdb.c.orig 2020-11-27 13:09:17.968992873 +0000
+++ ./lib/rpmdb.c 2020-11-27 13:14:21.524165780 +0000 +++ lib/rpmdb.c 2020-11-27 13:14:21.524165780 +0000
@@ -2679,6 +2679,48 @@ int rpmdbCtrl(rpmdb db, rpmdbCtrlOp ctrl @@ -2679,6 +2679,48 @@ int rpmdbCtrl(rpmdb db, rpmdbCtrlOp ctrl
return dbctrl ? dbCtrl(db, dbctrl) : 1; return dbctrl ? dbCtrl(db, dbctrl) : 1;
} }
@ -49,8 +49,8 @@
char *rpmdbCookie(rpmdb db) char *rpmdbCookie(rpmdb db)
{ {
void *cookie = NULL; void *cookie = NULL;
--- ./lib/rpmdb.h.orig 2020-11-27 13:09:17.968992873 +0000 --- lib/rpmdb.h.orig 2020-11-27 13:09:17.968992873 +0000
+++ ./lib/rpmdb.h 2020-11-27 13:09:36.352942782 +0000 +++ lib/rpmdb.h 2020-11-27 13:09:36.352942782 +0000
@@ -253,6 +253,14 @@ int rpmdbStat(const char *prefix, struct @@ -253,6 +253,14 @@ int rpmdbStat(const char *prefix, struct
*/ */
int rpmdbFStat(rpmdb db, struct stat *statbuf); int rpmdbFStat(rpmdb db, struct stat *statbuf);

4
nobuildcolor.diff
View File

@ -1,7 +1,7 @@
Disable file coloring for SUSE systems Disable file coloring for SUSE systems
--- ./build/rpmfc.c.orig 2020-09-30 13:06:07.502865543 +0000 --- build/rpmfc.c.orig 2020-09-30 13:06:07.502865543 +0000
+++ ./build/rpmfc.c 2020-09-30 13:07:08.530734545 +0000 +++ build/rpmfc.c 2020-09-30 13:07:08.530734545 +0000
@@ -1607,7 +1607,8 @@ rpmRC rpmfcGenerateDepends(const rpmSpec @@ -1607,7 +1607,8 @@ rpmRC rpmfcGenerateDepends(const rpmSpec
goto exit; goto exit;

4
nomagiccheck.diff
View File

@ -1,7 +1,7 @@
Don't let rpm complain about a missing /etc/magic.mgc file Don't let rpm complain about a missing /etc/magic.mgc file
--- ./build/rpmfc.c.orig 2020-09-30 13:08:18.770584384 +0000 --- build/rpmfc.c.orig 2020-09-30 13:08:18.770584384 +0000
+++ ./build/rpmfc.c 2020-09-30 13:08:54.306508417 +0000 +++ build/rpmfc.c 2020-09-30 13:08:54.306508417 +0000
@@ -1159,7 +1159,7 @@ static uint32_t getElfColor(const char * @@ -1159,7 +1159,7 @@ static uint32_t getElfColor(const char *
rpmRC rpmfcClassify(rpmfc fc, ARGV_t argv, rpm_mode_t * fmode) rpmRC rpmfcClassify(rpmfc fc, ARGV_t argv, rpm_mode_t * fmode)

4
noprereqdeprec.diff
View File

@ -1,5 +1,5 @@
--- ./build/parsePreamble.c.orig 2019-10-02 11:38:15.807736662 +0000 --- build/parsePreamble.c.orig 2019-10-02 11:38:15.807736662 +0000
+++ ./build/parsePreamble.c 2019-10-02 11:39:12.495617575 +0000 +++ build/parsePreamble.c 2019-10-02 11:39:12.495617575 +0000
@@ -1032,7 +1032,7 @@ static struct PreambleRec_s const preamb @@ -1032,7 +1032,7 @@ static struct PreambleRec_s const preamb
{RPMTAG_SUGGESTNAME, 0, 0, 0, LEN_AND_STR("suggests")}, {RPMTAG_SUGGESTNAME, 0, 0, 0, LEN_AND_STR("suggests")},
{RPMTAG_SUPPLEMENTNAME, 0, 0, 0, LEN_AND_STR("supplements")}, {RPMTAG_SUPPLEMENTNAME, 0, 0, 0, LEN_AND_STR("supplements")},

8
ocaml-cmxs.diff
View File

@ -12,8 +12,8 @@ Fixes: a6fe37c39b39acbcbd014dd1e6d5653ff84254a1
Signed-off-by: Olaf Hering <olaf@aepfle.de> Signed-off-by: Olaf Hering <olaf@aepfle.de>
--- ./fileattrs/ocaml.attr.orig 2021-06-21 12:00:44.587611741 +0000 --- fileattrs/ocaml.attr.orig 2021-06-21 12:00:44.587611741 +0000
+++ ./fileattrs/ocaml.attr 2021-12-22 13:54:20.384959876 +0000 +++ fileattrs/ocaml.attr 2021-12-22 13:54:20.384959876 +0000
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
%__ocaml_provides %{_rpmconfigdir}/ocamldeps.sh --provides %__ocaml_provides %{_rpmconfigdir}/ocamldeps.sh --provides
%__ocaml_requires %{_rpmconfigdir}/ocamldeps.sh --requires %__ocaml_requires %{_rpmconfigdir}/ocamldeps.sh --requires
@ -22,8 +22,8 @@ Signed-off-by: Olaf Hering <olaf@aepfle.de>
+%__ocaml_magic ^(Objective caml|OCaml) .*$ +%__ocaml_magic ^(Objective caml|OCaml) .*$
+%__ocaml_path .(cma|cmi|cmo|cmx|cmxa)$ +%__ocaml_path .(cma|cmi|cmo|cmx|cmxa)$
%__ocaml_flags magic_and_path %__ocaml_flags magic_and_path
--- ./scripts/ocamldeps.sh.orig 2021-06-21 12:00:44.650612737 +0000 --- scripts/ocamldeps.sh.orig 2021-06-21 12:00:44.650612737 +0000
+++ ./scripts/ocamldeps.sh 2021-12-22 13:54:20.384959876 +0000 +++ scripts/ocamldeps.sh 2021-12-22 13:54:20.384959876 +0000
@@ -32,6 +32,10 @@ @@ -32,6 +32,10 @@
# Implementations imported: # Implementations imported:
# HASH NAME_FROM_OTHER_MODULE # HASH NAME_FROM_OTHER_MODULE

4
platformin.diff
View File

@ -1,5 +1,5 @@
--- ./platform.in.orig 2014-06-26 06:51:54.822818260 +0000 --- platform.in.orig 2014-06-26 06:51:54.822818260 +0000
+++ ./platform.in 2014-08-04 12:38:55.389245494 +0000 +++ platform.in 2014-08-04 12:38:55.389245494 +0000
@@ -41,7 +41,7 @@ @@ -41,7 +41,7 @@
%_oldincludedir @oldincludedir@ %_oldincludedir @oldincludedir@
%_infodir @infodir@ %_infodir @infodir@

40
posttrans.diff
View File

@ -1,5 +1,5 @@
--- ./lib/poptI.c.orig 2021-04-09 11:28:12.359647290 +0000 --- lib/poptI.c.orig 2021-04-09 11:28:12.359647290 +0000
+++ ./lib/poptI.c 2021-04-09 11:28:15.523640983 +0000 +++ lib/poptI.c 2021-04-09 11:28:15.523640983 +0000
@@ -265,6 +265,10 @@ struct poptOption rpmInstallPoptTable[] @@ -265,6 +265,10 @@ struct poptOption rpmInstallPoptTable[]
&rpmIArgs.installInterfaceFlags, (INSTALL_REINSTALL|INSTALL_INSTALL), &rpmIArgs.installInterfaceFlags, (INSTALL_REINSTALL|INSTALL_INSTALL),
N_("reinstall package(s)"), N_("reinstall package(s)"),
@ -11,8 +11,8 @@
POPT_TABLEEND POPT_TABLEEND
}; };
--- ./lib/psm.c.orig 2021-04-09 11:28:12.359647290 +0000 --- lib/psm.c.orig 2021-04-09 11:28:12.359647290 +0000
+++ ./lib/psm.c 2021-04-09 11:28:15.527640975 +0000 +++ lib/psm.c 2021-04-09 11:28:15.527640975 +0000
@@ -810,7 +810,7 @@ static rpmRC rpmPackageErase(rpmts ts, r @@ -810,7 +810,7 @@ static rpmRC rpmPackageErase(rpmts ts, r
} }
if (rc) break; if (rc) break;
@ -22,8 +22,8 @@
/* Prepare post transaction uninstall triggers */ /* Prepare post transaction uninstall triggers */
rpmtriggersPrepPostUnTransFileTrigs(psm->ts, psm->te); rpmtriggersPrepPostUnTransFileTrigs(psm->ts, psm->te);
} }
--- ./lib/rpmcli.h.orig 2021-04-09 11:28:12.359647290 +0000 --- lib/rpmcli.h.orig 2021-04-09 11:28:12.359647290 +0000
+++ ./lib/rpmcli.h 2021-04-09 11:28:15.527640975 +0000 +++ lib/rpmcli.h 2021-04-09 11:28:15.527640975 +0000
@@ -304,6 +304,7 @@ enum rpmInstallFlags_e { @@ -304,6 +304,7 @@ enum rpmInstallFlags_e {
INSTALL_ERASE = (1 << 8), /*!< from --erase */ INSTALL_ERASE = (1 << 8), /*!< from --erase */
INSTALL_ALLMATCHES = (1 << 9), /*!< from --allmatches */ INSTALL_ALLMATCHES = (1 << 9), /*!< from --allmatches */
@ -48,8 +48,8 @@
*/ */
extern struct rpmInstallArguments_s rpmIArgs; extern struct rpmInstallArguments_s rpmIArgs;
--- ./lib/rpminstall.c.orig 2021-04-09 11:28:12.363647282 +0000 --- lib/rpminstall.c.orig 2021-04-09 11:28:12.363647282 +0000
+++ ./lib/rpminstall.c 2021-04-09 11:28:15.527640975 +0000 +++ lib/rpminstall.c 2021-04-09 11:28:15.527640975 +0000
@@ -4,6 +4,8 @@ @@ -4,6 +4,8 @@
#include "system.h" #include "system.h"
@ -92,8 +92,8 @@
+ argvFree(manifest); + argvFree(manifest);
+ return rc; + return rc;
+} +}
--- ./lib/rpmtriggers.c.orig 2021-04-09 11:28:12.363647282 +0000 --- lib/rpmtriggers.c.orig 2021-04-09 11:28:12.363647282 +0000
+++ ./lib/rpmtriggers.c 2021-04-09 11:31:46.999219563 +0000 +++ lib/rpmtriggers.c 2021-04-09 11:31:46.999219563 +0000
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
#include "system.h" #include "system.h"
@ -142,8 +142,8 @@
if (tm == RPMSCRIPT_FILETRIGGER) { if (tm == RPMSCRIPT_FILETRIGGER) {
priorityTag = RPMTAG_FILETRIGGERPRIORITIES; priorityTag = RPMTAG_FILETRIGGERPRIORITIES;
} else { } else {
--- ./lib/rpmtriggers.h.orig 2021-04-09 11:28:12.363647282 +0000 --- lib/rpmtriggers.h.orig 2021-04-09 11:28:12.363647282 +0000
+++ ./lib/rpmtriggers.h 2021-04-09 11:28:15.527640975 +0000 +++ lib/rpmtriggers.h 2021-04-09 11:28:15.527640975 +0000
@@ -27,6 +27,10 @@ rpmtriggers rpmtriggersCreate(unsigned i @@ -27,6 +27,10 @@ rpmtriggers rpmtriggersCreate(unsigned i
RPM_GNUC_INTERNAL RPM_GNUC_INTERNAL
rpmtriggers rpmtriggersFree(rpmtriggers triggers); rpmtriggers rpmtriggersFree(rpmtriggers triggers);
@ -155,8 +155,8 @@
/* /*
* Prepare post trans uninstall file triggers. After transcation uninstalled * Prepare post trans uninstall file triggers. After transcation uninstalled
* files are not saved anywhere. So we need during uninstalation of every * files are not saved anywhere. So we need during uninstalation of every
--- ./lib/rpmts.h.orig 2021-04-09 11:28:12.363647282 +0000 --- lib/rpmts.h.orig 2021-04-09 11:28:12.363647282 +0000
+++ ./lib/rpmts.h 2021-04-09 11:28:15.527640975 +0000 +++ lib/rpmts.h 2021-04-09 11:28:15.527640975 +0000
@@ -229,6 +229,15 @@ int rpmtsOrder(rpmts ts); @@ -229,6 +229,15 @@ int rpmtsOrder(rpmts ts);
int rpmtsRun(rpmts ts, rpmps okProbs, rpmprobFilterFlags ignoreSet); int rpmtsRun(rpmts ts, rpmps okProbs, rpmprobFilterFlags ignoreSet);
@ -173,8 +173,8 @@
* Reference a transaction set instance. * Reference a transaction set instance.
* @param ts transaction set * @param ts transaction set
* @return new transaction set reference * @return new transaction set reference
--- ./lib/rpmts_internal.h.orig 2021-04-09 11:28:12.363647282 +0000 --- lib/rpmts_internal.h.orig 2021-04-09 11:28:12.363647282 +0000
+++ ./lib/rpmts_internal.h 2021-04-09 11:28:15.527640975 +0000 +++ lib/rpmts_internal.h 2021-04-09 11:28:15.527640975 +0000
@@ -87,6 +87,7 @@ struct rpmts_s { @@ -87,6 +87,7 @@ struct rpmts_s {
rpmtriggers trigs2run; /*!< Transaction file triggers */ rpmtriggers trigs2run; /*!< Transaction file triggers */
@ -183,8 +183,8 @@
}; };
#ifdef __cplusplus #ifdef __cplusplus
--- ./lib/transaction.c.orig 2021-04-09 11:28:12.363647282 +0000 --- lib/transaction.c.orig 2021-04-09 11:28:12.363647282 +0000
+++ ./lib/transaction.c 2021-04-09 11:33:22.247029757 +0000 +++ lib/transaction.c 2021-04-09 11:33:22.247029757 +0000
@@ -1468,6 +1468,8 @@ static int rpmtsSetup(rpmts ts, rpmprobF @@ -1468,6 +1468,8 @@ static int rpmtsSetup(rpmts ts, rpmprobF
/* Get available space on mounted file systems. */ /* Get available space on mounted file systems. */
(void) rpmtsInitDSI(ts); (void) rpmtsInitDSI(ts);
@ -336,8 +336,8 @@
+ rpmtsEmpty(ts); + rpmtsEmpty(ts);
+ return rc; + return rc;
+} +}
--- ./rpm.c.orig 2021-04-09 11:28:12.363647282 +0000 --- rpm.c.orig 2021-04-09 11:28:12.363647282 +0000
+++ ./rpm.c 2021-04-09 11:28:15.527640975 +0000 +++ rpm.c 2021-04-09 11:28:15.527640975 +0000
@@ -19,6 +19,7 @@ enum modes { @@ -19,6 +19,7 @@ enum modes {
MODE_INSTALL = (1 << 1), MODE_INSTALL = (1 << 1),
MODE_ERASE = (1 << 2), MODE_ERASE = (1 << 2),

8
python-rpm-packaging.diff
View File

@ -1,13 +1,13 @@
--- ./fileattrs/pythondist.attr.orig 2021-09-23 20:14:04.880605674 +0000 --- fileattrs/pythondist.attr.orig 2021-09-23 20:14:04.880605674 +0000
+++ ./fileattrs/pythondist.attr 2021-09-23 20:15:23.392446317 +0000 +++ fileattrs/pythondist.attr 2021-09-23 20:15:23.392446317 +0000
@@ -1,3 +1,4 @@ @@ -1,3 +1,4 @@
%__pythondist_provides %{_rpmconfigdir}/pythondistdeps.py --provides --majorver-provides %__pythondist_provides %{_rpmconfigdir}/pythondistdeps.py --provides --majorver-provides
-%__pythondist_requires %{_rpmconfigdir}/pythondistdeps.py --requires -%__pythondist_requires %{_rpmconfigdir}/pythondistdeps.py --requires
+#disabled for now +#disabled for now
+#%__pythondist_requires %{_rpmconfigdir}/pythondistdeps.py --requires +#%__pythondist_requires %{_rpmconfigdir}/pythondistdeps.py --requires
%__pythondist_path /lib(64)?/python[[:digit:]]\\.[[:digit:]]+/site-packages/[^/]+\\.(dist-info|egg-info|egg-link)$ %__pythondist_path /lib(64)?/python[[:digit:]]\\.[[:digit:]]+/site-packages/[^/]+\\.(dist-info|egg-info|egg-link)$
--- ./scripts/pythondistdeps.py.orig 2021-09-23 20:14:26.496561795 +0000 --- scripts/pythondistdeps.py.orig 2021-09-23 20:14:26.496561795 +0000
+++ ./scripts/pythondistdeps.py 2021-09-23 20:14:30.748553177 +0000 +++ scripts/pythondistdeps.py 2021-09-23 20:14:30.748553177 +0000
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-#!/usr/bin/python -#!/usr/bin/python
+#!/usr/bin/python3 +#!/usr/bin/python3

4
refreshtestarch.diff
View File

@ -1,8 +1,8 @@
Also test architecture in "refresh" test when not colored. This allows Also test architecture in "refresh" test when not colored. This allows
updates to different architectures. updates to different architectures.
--- ./lib/psm.c.orig 2019-10-02 09:54:56.180565818 +0000 --- lib/psm.c.orig 2019-10-02 09:54:56.180565818 +0000
+++ ./lib/psm.c 2019-10-02 09:55:02.700552941 +0000 +++ lib/psm.c 2019-10-02 09:55:02.700552941 +0000
@@ -518,9 +518,9 @@ static void markReplacedInstance(rpmts t @@ -518,9 +518,9 @@ static void markReplacedInstance(rpmts t
rpmdbSetIteratorRE(mi, RPMTAG_EPOCH, RPMMIRE_STRCMP, rpmteE(te)); rpmdbSetIteratorRE(mi, RPMTAG_EPOCH, RPMMIRE_STRCMP, rpmteE(te));
rpmdbSetIteratorRE(mi, RPMTAG_VERSION, RPMMIRE_STRCMP, rpmteV(te)); rpmdbSetIteratorRE(mi, RPMTAG_VERSION, RPMMIRE_STRCMP, rpmteV(te));

4
remove-brp-strips.diff
View File

@ -3,8 +3,8 @@ Subject: remove references to removed brp scripts
Some brp-scripts are not used in openSUSE, remove references Some brp-scripts are not used in openSUSE, remove references
to it to it
--- ./platform.in.orig 2021-09-23 19:23:57.822814696 +0000 --- platform.in.orig 2021-09-23 19:23:57.822814696 +0000
+++ ./platform.in 2021-09-23 19:24:31.534745951 +0000 +++ platform.in 2021-09-23 19:24:31.534745951 +0000
@@ -96,8 +96,6 @@ @@ -96,8 +96,6 @@
%{?__brp_compress} \ %{?__brp_compress} \
%{?__brp_elfperms} \ %{?__brp_elfperms} \

4
remove-translations.diff
View File

@ -1,5 +1,5 @@
--- ./scripts/find-lang.sh.orig 2018-01-31 13:25:25.229266078 +0000 --- scripts/find-lang.sh.orig 2018-01-31 13:25:25.229266078 +0000
+++ ./scripts/find-lang.sh 2018-01-31 13:26:15.128133281 +0000 +++ scripts/find-lang.sh 2018-01-31 13:26:15.128133281 +0000
@@ -119,6 +119,23 @@ fi @@ -119,6 +119,23 @@ fi
MO_NAME_NEW=$MO_NAME.tmp.$$ MO_NAME_NEW=$MO_NAME.tmp.$$
rm -f $MO_NAME_NEW rm -f $MO_NAME_NEW

4
rpm-findlang-inject-metainfo.patch
View File

@ -1,5 +1,5 @@
--- ./scripts/find-lang.sh.orig 2018-01-31 13:37:22.810352621 +0000 --- scripts/find-lang.sh.orig 2018-01-31 13:37:22.810352621 +0000
+++ ./scripts/find-lang.sh 2018-01-31 13:39:38.117990971 +0000 +++ scripts/find-lang.sh 2018-01-31 13:39:38.117990971 +0000
@@ -32,6 +32,7 @@ Additional options: @@ -32,6 +32,7 @@ Additional options:
--with-man find localized man pages --with-man find localized man pages
--all-name match all package/domain names --all-name match all package/domain names

8
rpm-shorten-changelog.diff
View File

@ -1,5 +1,5 @@
--- ./build/pack.c --- build/pack.c.orig
+++ ./build/pack.c +++ build/pack.c
@@ -683,6 +683,71 @@ @@ -683,6 +683,71 @@
return rc; return rc;
} }
@ -84,8 +84,8 @@
headerPutString(pkg->header, RPMTAG_RPMVERSION, VERSION); headerPutString(pkg->header, RPMTAG_RPMVERSION, VERSION);
headerPutString(pkg->header, RPMTAG_BUILDHOST, spec->buildHost); headerPutString(pkg->header, RPMTAG_BUILDHOST, spec->buildHost);
--- ./build/parseChangelog.c --- build/parseChangelog.c.orig
+++ ./build/parseChangelog.c +++ build/parseChangelog.c
@@ -267,6 +267,11 @@ @@ -267,6 +267,11 @@
goto exit; goto exit;
} }

5
rpm.changes
View File

@ -52,6 +52,11 @@ Fri Jan 28 14:19:02 UTC 2022 - Dirk Müller <dmueller@suse.com>
- switch to glibc-locale-base to reduce system installation size - switch to glibc-locale-base to reduce system installation size
by ~220MB (bsc#1195390) by ~220MB (bsc#1195390)
-------------------------------------------------------------------
Thu Jan 27 13:26:07 UTC 2022 - Ludwig Nussel <lnussel@suse.de>
- make patches git quiltimport friendlier
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Dec 22 14:57:27 CET 2021 - olaf@aepfle.de Wed Dec 22 14:57:27 CET 2021 - olaf@aepfle.de

6
rpm.spec
View File

@ -88,7 +88,6 @@ Patch34: rpmrc.diff
Patch36: rpmqpack.diff Patch36: rpmqpack.diff
Patch38: build.diff Patch38: build.diff
Patch43: rpm-shorten-changelog.diff Patch43: rpm-shorten-changelog.diff
Patch45: whatrequires-doc.diff
Patch46: remove-brp-strips.diff Patch46: remove-brp-strips.diff
Patch51: specfilemacro.diff Patch51: specfilemacro.diff
Patch60: safeugid.diff Patch60: safeugid.diff
@ -118,6 +117,8 @@ Patch133: zstdpool.diff
Patch134: zstdthreaded.diff Patch134: zstdthreaded.diff
Patch135: ocaml-cmxs.diff Patch135: ocaml-cmxs.diff
Patch136: 0001-fix-minimize_writes.patch Patch136: 0001-fix-minimize_writes.patch
# touches a generated file
Patch180: whatrequires-doc.diff
Patch200: finddebuginfo.diff Patch200: finddebuginfo.diff
Patch201: finddebuginfo-absolute-links.diff Patch201: finddebuginfo-absolute-links.diff
Patch202: debugsubpkg.diff Patch202: debugsubpkg.diff
@ -237,7 +238,7 @@ rm -rf sqlite
%patch -P 5 -P 12 -P 13 -P 16 -P 18 %patch -P 5 -P 12 -P 13 -P 16 -P 18
%patch -P 24 -P 25 -P 26 -P 29 %patch -P 24 -P 25 -P 26 -P 29
%patch -P 30 -P 32 -P 33 -P 34 -P 36 -P 38 %patch -P 30 -P 32 -P 33 -P 34 -P 36 -P 38
%patch -P 43 -P 45 -P 46 %patch -P 43 -P 46
%patch -P 51 %patch -P 51
%patch -P 60 -P 61 -P 66 -P 67 -P 69 %patch -P 60 -P 61 -P 66 -P 67 -P 69
%patch -P 70 -P 71 -P 73 -P 77 -P 78 -P 79 %patch -P 70 -P 71 -P 73 -P 77 -P 78 -P 79
@ -247,6 +248,7 @@ rm -rf sqlite
%patch -P 117 %patch -P 117
%patch -P 122 -P 123 -P 131 -P 132 -P 133 -P 134 %patch -P 122 -P 123 -P 131 -P 132 -P 133 -P 134
%patch -P 135 -P 136 %patch -P 135 -P 136
%patch -P 180
# debugedit patches # debugedit patches
pushd debugedit-5.0 pushd debugedit-5.0

4
rpmpopt.diff
View File

@ -1,5 +1,5 @@
--- ./rpmpopt.in.orig 2017-12-01 14:58:11.404041985 +0000 --- rpmpopt.in.orig 2017-12-01 14:58:11.404041985 +0000
+++ ./rpmpopt.in 2017-12-01 14:59:06.275882759 +0000 +++ rpmpopt.in 2017-12-01 14:59:06.275882759 +0000
@@ -101,7 +101,8 @@ Relocations : %|PREFIXES?{[%{PREFIXES} ] @@ -101,7 +101,8 @@ Relocations : %|PREFIXES?{[%{PREFIXES} ]
%|URL?{URL : %{URL}\n}|\ %|URL?{URL : %{URL}\n}|\
%|BUGURL?{Bug URL : %{BUGURL}\n}|\ %|BUGURL?{Bug URL : %{BUGURL}\n}|\

16
rpmqpack.diff
View File

@ -1,5 +1,5 @@
--- ./Makefile.am.orig 2021-06-21 12:00:44.552611187 +0000 --- Makefile.am.orig 2021-06-21 12:00:44.552611187 +0000
+++ ./Makefile.am 2021-09-23 19:17:54.619555392 +0000 +++ Makefile.am 2021-09-23 19:17:54.619555392 +0000
@@ -175,6 +175,10 @@ rpmgraph_LDADD = lib/librpm.la rpmio/lib @@ -175,6 +175,10 @@ rpmgraph_LDADD = lib/librpm.la rpmio/lib
dist_bin_SCRIPTS = scripts/gendiff dist_bin_SCRIPTS = scripts/gendiff
@ -11,8 +11,8 @@
rpmconfig_DATA = rpmrc rpmconfig_DATA = rpmrc
rpmrc: $(top_srcdir)/rpmrc.in rpmrc: $(top_srcdir)/rpmrc.in
@$(SED) \ @$(SED) \
--- ./docs/man/Makefile.am.orig 2021-08-20 08:44:56.263259000 +0000 --- docs/man/Makefile.am.orig 2021-08-20 08:44:56.263259000 +0000
+++ ./docs/man/Makefile.am 2021-09-23 19:17:54.619555392 +0000 +++ docs/man/Makefile.am 2021-09-23 19:17:54.619555392 +0000
@@ -9,7 +9,7 @@ EXTRA_DIST += gendiff.1.md @@ -9,7 +9,7 @@ EXTRA_DIST += gendiff.1.md
man_man8dir = $(mandir)/man8 man_man8dir = $(mandir)/man8
@ -22,8 +22,8 @@
EXTRA_DIST += rpm.8.md rpm-misc.8.md rpmbuild.8.md rpmdeps.8.md rpmgraph.8.md EXTRA_DIST += rpm.8.md rpm-misc.8.md rpmbuild.8.md rpmdeps.8.md rpmgraph.8.md
EXTRA_DIST += rpm2cpio.8.md rpmdb.8.md rpmkeys.8.md rpmsign.8.md rpmspec.8.md EXTRA_DIST += rpm2cpio.8.md rpmdb.8.md rpmkeys.8.md rpmsign.8.md rpmspec.8.md
--- ./docs/man/rpmqpack.8.orig 2021-09-23 19:17:54.619555392 +0000 --- docs/man/rpmqpack.8.orig 2021-09-23 19:17:54.619555392 +0000
+++ ./docs/man/rpmqpack.8 2021-09-23 19:17:54.619555392 +0000 +++ docs/man/rpmqpack.8 2021-09-23 19:17:54.619555392 +0000
@@ -0,0 +1,25 @@ @@ -0,0 +1,25 @@
+.TH RPMQPACK 8 "Mar 2002" +.TH RPMQPACK 8 "Mar 2002"
+.SH NAME +.SH NAME
@ -50,8 +50,8 @@
+ +
+.SH AUTHOR +.SH AUTHOR
+Michael Schroeder <mls@suse.de> +Michael Schroeder <mls@suse.de>
--- ./rpmqpack.c.orig 2021-09-23 19:17:54.619555392 +0000 --- rpmqpack.c.orig 2021-09-23 19:17:54.619555392 +0000
+++ ./rpmqpack.c 2021-09-23 19:17:54.619555392 +0000 +++ rpmqpack.c 2021-09-23 19:17:54.619555392 +0000
@@ -0,0 +1,60 @@ @@ -0,0 +1,60 @@
+#include <sys/types.h> +#include <sys/types.h>
+#include <limits.h> +#include <limits.h>

4
rpmrc.diff
View File

@ -1,5 +1,5 @@
--- ./rpmrc.in.orig 2019-06-26 14:17:31.451985635 +0000 --- rpmrc.in.orig 2019-06-26 14:17:31.451985635 +0000
+++ ./rpmrc.in 2019-10-02 11:24:49.601403844 +0000 +++ rpmrc.in 2019-10-02 11:24:49.601403844 +0000
@@ -12,16 +12,16 @@ @@ -12,16 +12,16 @@
# "fat" binary with both archs, for Darwin # "fat" binary with both archs, for Darwin
optflags: fat -O2 -g -arch i386 -arch ppc optflags: fat -O2 -g -arch i386 -arch ppc

12
safeugid.diff
View File

@ -1,8 +1,8 @@
--- ../safeugid.diff 2019-10-02 13:37:13.191868203 +0200 --- ../safeugid.diff 2019-10-02 13:37:13.191868203 +0200
+++ P 2019-10-02 13:36:09.036002978 +0200 +++ P 2019-10-02 13:36:09.036002978 +0200
@@ -0,0 +1,211 @@ @@ -0,0 +1,211 @@
+--- ./lib/rpmchroot.c.orig 2019-06-26 14:17:31.411985696 +0000 +--- lib/rpmchroot.c.orig 2019-06-26 14:17:31.411985696 +0000
++++ ./lib/rpmchroot.c 2019-10-02 11:35:58.788024507 +0000 ++++ lib/rpmchroot.c 2019-10-02 11:35:58.788024507 +0000
+@@ -126,6 +126,7 @@ int rpmChrootIn(void) +@@ -126,6 +126,7 @@ int rpmChrootIn(void)
+ +
+ if (chdir("/") == 0 && chroot(rootState.rootDir) == 0) { + if (chdir("/") == 0 && chroot(rootState.rootDir) == 0) {
@ -19,8 +19,8 @@
+ } else { + } else {
+ rpmlog(RPMLOG_ERR, _("Unable to restore root directory: %m\n")); + rpmlog(RPMLOG_ERR, _("Unable to restore root directory: %m\n"));
+ rc = -1; + rc = -1;
+--- ./lib/rpmug.c.orig 2019-06-26 14:17:31.418985685 +0000 +--- lib/rpmug.c.orig 2019-06-26 14:17:31.418985685 +0000
++++ ./lib/rpmug.c 2019-10-02 11:35:58.788024507 +0000 ++++ lib/rpmug.c 2019-10-02 11:35:58.788024507 +0000
+@@ -11,6 +11,47 @@ +@@ -11,6 +11,47 @@
+ #include "lib/rpmug.h" + #include "lib/rpmug.h"
+ #include "debug.h" + #include "debug.h"
@ -203,8 +203,8 @@
++ inchroot = in; ++ inchroot = in;
++#endif ++#endif
++} ++}
+--- ./lib/rpmug.h.orig 2019-06-26 14:17:31.418985685 +0000 +--- lib/rpmug.h.orig 2019-06-26 14:17:31.418985685 +0000
++++ ./lib/rpmug.h 2019-10-02 11:35:58.788024507 +0000 ++++ lib/rpmug.h 2019-10-02 11:35:58.788024507 +0000
+@@ -15,4 +15,6 @@ int rpmugInit(void); +@@ -15,4 +15,6 @@ int rpmugInit(void);
+ +
+ void rpmugFree(void); + void rpmugFree(void);

4
singlefilemode.diff
View File

@ -1,5 +1,5 @@
--- ./scripts/find-debuginfo.in.orig 2021-09-24 09:10:06.477724685 +0000 --- scripts/find-debuginfo.in.orig 2021-09-24 09:10:06.477724685 +0000
+++ ./scripts/find-debuginfo.in 2021-09-24 09:10:26.557680705 +0000 +++ scripts/find-debuginfo.in 2021-09-24 09:10:26.557680705 +0000
@@ -168,7 +168,6 @@ while [ $# -gt 0 ]; do @@ -168,7 +168,6 @@ while [ $# -gt 0 ]; do
;; ;;
--dwz-single-file-mode) --dwz-single-file-mode)

4
specfilemacro.diff
View File

@ -1,5 +1,5 @@
--- ./build/parseSpec.c.orig 2013-06-10 15:55:10.000000000 +0000 --- build/parseSpec.c.orig 2013-06-10 15:55:10.000000000 +0000
+++ ./build/parseSpec.c 2013-07-12 12:04:11.000000000 +0000 +++ build/parseSpec.c 2013-07-12 12:04:11.000000000 +0000
@@ -561,6 +561,7 @@ static rpmSpec parseSpec(const char *spe @@ -561,6 +561,7 @@ static rpmSpec parseSpec(const char *spe
spec = newSpec(); spec = newSpec();

4
usr-lib-sysimage-rpm.patch
View File

@ -1,5 +1,5 @@
--- ./macros.in.orig 2021-08-20 08:44:56.264259007 +0000 --- macros.in.orig 2021-08-20 08:44:56.264259007 +0000
+++ ./macros.in 2021-09-23 18:57:26.654059458 +0000 +++ macros.in 2021-09-23 18:57:26.654059458 +0000
@@ -140,7 +140,7 @@ @@ -140,7 +140,7 @@
%_buildshell /bin/sh %_buildshell /bin/sh

4
verbosearg.diff
View File

@ -1,5 +1,5 @@
--- ./rpmio/macro.c.orig --- rpmio/macro.c.orig
+++ ./rpmio/macro.c +++ rpmio/macro.c
@@ -1141,7 +1141,10 @@ static size_t doExpand(MacroBuf mb, rpmMacroEntry me, ARGV_t argv) @@ -1141,7 +1141,10 @@ static size_t doExpand(MacroBuf mb, rpmMacroEntry me, ARGV_t argv)
static size_t doVerbose(MacroBuf mb, rpmMacroEntry me, ARGV_t argv) static size_t doVerbose(MacroBuf mb, rpmMacroEntry me, ARGV_t argv)

4
weakdepscompat.diff
View File

@ -1,5 +1,5 @@
--- ./build/parsePreamble.c.orig 2014-08-04 13:10:07.530953406 +0000 --- build/parsePreamble.c.orig 2014-08-04 13:10:07.530953406 +0000
+++ ./build/parsePreamble.c 2014-08-04 13:10:12.852929355 +0000 +++ build/parsePreamble.c 2014-08-04 13:10:12.852929355 +0000
@@ -343,6 +343,7 @@ static struct tokenBits_s const installS @@ -343,6 +343,7 @@ static struct tokenBits_s const installS
{ "verify", RPMSENSE_SCRIPT_VERIFY }, { "verify", RPMSENSE_SCRIPT_VERIFY },
{ "pretrans", RPMSENSE_PRETRANS }, { "pretrans", RPMSENSE_PRETRANS },

4
whatrequires-doc.diff
View File

@ -1,5 +1,5 @@
--- ./docs/man/rpm.8.orig 2021-09-23 19:20:46.991203867 +0000 --- docs/man/rpm.8.orig 2021-09-23 19:20:46.991203867 +0000
+++ ./docs/man/rpm.8 2021-09-23 19:22:45.918961340 +0000 +++ docs/man/rpm.8 2021-09-23 19:22:45.918961340 +0000
@@ -601,6 +601,11 @@ Query all packages that provide the \f[I @@ -601,6 +601,11 @@ Query all packages that provide the \f[I
\f[B]--whatrequires \f[R]\f[I]CAPABILITY\f[R] \f[B]--whatrequires \f[R]\f[I]CAPABILITY\f[R]
Query all packages that require \f[I]CAPABILITY\f[R] for proper Query all packages that require \f[I]CAPABILITY\f[R] for proper

4
zstdpool.diff
View File

@ -1,5 +1,5 @@
--- ./rpmio/rpmio.c.orig 2021-06-21 12:00:44.648612706 +0000 --- rpmio/rpmio.c.orig 2021-06-21 12:00:44.648612706 +0000
+++ ./rpmio/rpmio.c 2022-04-13 13:48:55.224954032 +0000 +++ rpmio/rpmio.c 2022-04-13 13:48:55.224954032 +0000
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
#include <ctype.h> #include <ctype.h>
#include <dirent.h> #include <dirent.h>