From ef651ca2ad5e12f1d79871433ceec041f20cb3cf Mon Sep 17 00:00:00 2001 From: lnussel_factory <> Date: Jun 29 2022 14:05:29 +0000 Subject: Update rpm to version 4.17.0 / rev 299 via SR 985299 https://build.opensuse.org/request/show/985299 by user lnussel_factory + dimstar_suse - make patches git quiltimport friendlier (forwarded request 985294 from lnussel) --- diff --git a/.files b/.files index 668e35f..f9321a1 100644 Binary files a/.files and b/.files differ diff --git a/.rev b/.rev index 0775fc8..00156c1 100644 --- a/.rev +++ b/.rev @@ -2353,4 +2353,12 @@ See bugzilla 1167537 for the gory details. Automatic submission by obs-autosubmit 984473 + + bb1c7a1511a1d6c0273c58e14855871e + 4.17.0 + + dimstar_suse + - make patches git quiltimport friendlier (forwarded request 985294 from lnussel) + 985299 + diff --git a/assumeexec.diff b/assumeexec.diff index 73af1a7..a02e816 100644 --- a/assumeexec.diff +++ b/assumeexec.diff @@ -1,5 +1,5 @@ ---- ./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.orig 2014-06-26 06:51:55.768815677 +0000 ++++ tools/elfdeps.c 2014-08-04 13:02:16.981081591 +0000 @@ -17,6 +17,7 @@ int soname_only = 0; int fake_soname = 1; int filter_soname = 1; diff --git a/brp-compress-no-img.patch b/brp-compress-no-img.patch index 9c53af8..861afc8 100644 --- a/brp-compress-no-img.patch +++ b/brp-compress-no-img.patch @@ -1,5 +1,5 @@ ---- ./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.orig 2020-09-30 13:09:28.846434576 +0000 ++++ scripts/brp-compress 2020-09-30 13:09:34.514422459 +0000 @@ -51,6 +51,7 @@ do find $d -type f ! -name dir | while read f do diff --git a/brp.diff b/brp.diff index 1f8e642..905b845 100644 --- a/brp.diff +++ b/brp.diff @@ -1,5 +1,5 @@ ---- ./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.orig 2021-06-21 12:00:44.650612737 +0000 ++++ scripts/brp-strip-comment-note 2021-09-23 19:04:31.249193665 +0000 @@ -16,6 +16,8 @@ esac # 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 {} \; | \ @@ -9,8 +9,8 @@ sed -n -e 's/^\(.*\):[ ]*ELF.*, stripped.*/\1/p'`; do note="-R .note" 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 2021-09-23 19:07:10.624868675 +0000 +--- scripts/brp-strip.orig 2021-09-23 19:04:31.249193665 +0000 ++++ scripts/brp-strip 2021-09-23 19:07:10.624868675 +0000 @@ -14,4 +14,4 @@ esac # Strip ELF binaries diff --git a/brpcompress.diff b/brpcompress.diff index ccb3736..0eadb4a 100644 --- a/brpcompress.diff +++ b/brpcompress.diff @@ -1,5 +1,5 @@ ---- ./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.orig 2020-05-28 10:04:25.075136894 +0000 ++++ scripts/brp-compress 2020-10-27 15:23:57.970737863 +0000 @@ -5,6 +5,9 @@ if [ -z "$RPM_BUILD_ROOT" ] || [ "$RPM_B exit 0 fi diff --git a/checkfilesnoinfodir.diff b/checkfilesnoinfodir.diff index 2565e0d..33d82a4 100644 --- a/checkfilesnoinfodir.diff +++ b/checkfilesnoinfodir.diff @@ -1,8 +1,8 @@ Exclude /usr/share/info/dir from check-files. Probably only interesting for SUSE. ---- ./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.orig 2020-09-30 12:36:56.398762048 +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 # Find non-directory files in the build root and compare to the manifest. # TODO: regex chars in last sed(1) expression should be escaped diff --git a/checksepwarn.diff b/checksepwarn.diff index f2edd4d..66c5896 100644 --- a/checksepwarn.diff +++ b/checksepwarn.diff @@ -1,5 +1,5 @@ ---- ./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.orig 2019-06-26 14:17:31.396985719 +0000 ++++ build/parseReqs.c 2019-10-02 12:10:51.879570016 +0000 @@ -42,7 +42,7 @@ static rpmRC checkEpoch(const char *s, c return RPMRC_OK; } @@ -55,8 +55,8 @@ goto exit; if (nametag == RPMTAG_OBSOLETENAME) { ---- ./macros.in.orig 2019-10-02 12:10:45.431583601 +0000 -+++ ./macros.in 2019-10-02 12:10:51.879570016 +0000 +--- macros.in.orig 2019-10-02 12:10:45.431583601 +0000 ++++ macros.in 2019-10-02 12:10:51.879570016 +0000 @@ -452,7 +452,7 @@ package or when debugging this package.\ %_invalid_encoding_terminates_build 1 diff --git a/db_conversion.diff b/db_conversion.diff index 7d2986c..d1afc41 100644 --- a/db_conversion.diff +++ b/db_conversion.diff @@ -1,5 +1,5 @@ ---- ./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.orig 2020-05-28 10:04:25.027136631 +0000 ++++ lib/backend/bdb_ro.c 2021-01-07 15:24:08.866776792 +0000 @@ -790,6 +790,7 @@ static unsigned int bdbro_pkgdbKey(dbiIn struct rpmdbOps_s bdbro_dbops = { .name = "bdb_ro", @@ -8,8 +8,8 @@ .open = bdbro_Open, .close = bdbro_Close, ---- ./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.orig 2020-08-31 09:14:07.991087349 +0000 ++++ lib/backend/dbi.c 2021-01-07 15:24:08.866776792 +0000 @@ -119,11 +119,20 @@ exit: } @@ -31,8 +31,8 @@ const char * dbiName(dbiIndex dbi) { return dbi->dbi_file; ---- ./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.orig 2021-01-07 15:23:56.122812108 +0000 ++++ lib/backend/dbi.h 2021-01-07 15:24:08.866776792 +0000 @@ -11,6 +11,7 @@ enum rpmdbFlags { RPMDB_FLAG_REBUILD = (1 << 1), RPMDB_FLAG_VERIFYONLY = (1 << 2), @@ -72,8 +72,8 @@ int (*open)(rpmdb rdb, rpmDbiTagVal rpmtag, dbiIndex * dbip, 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 2021-01-07 15:27:46.678173133 +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 @@ -1116,11 +1116,12 @@ static int rpmpkgPutInternal(rpmpkgdb pk if (rpmpkgWriteBlob(pkgdb, pkgidx, blkoff, blkcnt, blob, blobl, pkgdb->generation)) { return RPMRC_FAIL; @@ -90,8 +90,8 @@ if (rpmpkgWriteslot(pkgdb, slotno, pkgidx, blkoff, blkcnt)) { free(pkgdb->slots); pkgdb->slots = 0; ---- ./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.orig 2021-01-07 15:23:56.122812108 +0000 ++++ lib/rpmdb.c 2021-01-07 15:24:08.866776792 +0000 @@ -516,7 +516,13 @@ static int openDatabase(const char * pre rpmsqActivate(1); } @@ -158,8 +158,8 @@ rc = 1; goto exit; } ---- ./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.orig 2020-05-28 10:04:25.037136686 +0000 ++++ lib/rpmdb_internal.h 2021-01-07 15:24:08.866776792 +0000 @@ -25,6 +25,7 @@ extern "C" { enum rpmdbRebuildFlags_e { diff --git a/dbrointerruptable.diff b/dbrointerruptable.diff index 6288ff6..181527d 100644 --- a/dbrointerruptable.diff +++ b/dbrointerruptable.diff @@ -1,5 +1,5 @@ ---- ./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.orig 2020-05-28 10:04:25.037136686 +0000 ++++ lib/rpmdb.c 2020-09-30 12:23:50.708547165 +0000 @@ -387,9 +387,11 @@ int rpmdbClose(rpmdb db) { rpmdb * prev, next; diff --git a/debuginfo-mono.patch b/debuginfo-mono.patch index 73f02e2..00df67c 100644 --- a/debuginfo-mono.patch +++ b/debuginfo-mono.patch @@ -1,5 +1,5 @@ ---- ./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.orig 2021-09-23 20:28:21.646855995 +0000 ++++ scripts/find-debuginfo.in 2021-09-23 20:28:53.530790698 +0000 @@ -434,6 +434,16 @@ while read nlinks inum f; do ;; *) continue ;; diff --git a/debuglink.diff b/debuglink.diff index 8dfafad..79a308d 100644 --- a/debuglink.diff +++ b/debuglink.diff @@ -1,5 +1,5 @@ ---- ./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.orig 2021-09-23 20:27:13.686995174 +0000 ++++ scripts/find-debuginfo.in 2021-09-23 20:27:40.826939593 +0000 @@ -407,7 +407,7 @@ debug_link() get_debugfn() { diff --git a/debugsubpkg.diff b/debugsubpkg.diff index 4527812..6a7753a 100644 --- a/debugsubpkg.diff +++ b/debugsubpkg.diff @@ -1,5 +1,5 @@ ---- ./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.orig 2021-09-23 20:25:41.059184871 +0000 ++++ scripts/find-debuginfo.in 2021-09-23 20:26:40.363063418 +0000 @@ -643,19 +643,25 @@ if $run_dwz \ fi fi diff --git a/emptymanifest.diff b/emptymanifest.diff index 9eba180..80fd65b 100644 --- a/emptymanifest.diff +++ b/emptymanifest.diff @@ -1,5 +1,5 @@ ---- ./macros.in.orig 2017-01-20 10:15:12.677868723 +0000 -+++ ./macros.in 2017-01-20 10:15:30.385819715 +0000 +--- macros.in.orig 2017-01-20 10:15:12.677868723 +0000 ++++ macros.in 2017-01-20 10:15:30.385819715 +0000 @@ -403,7 +403,7 @@ package or when debugging this package.\ # Should empty %files manifest file terminate a build? # diff --git a/enable-postin-scripts-error.diff b/enable-postin-scripts-error.diff index de22a68..443c871 100644 --- a/enable-postin-scripts-error.diff +++ b/enable-postin-scripts-error.diff @@ -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 if (script == NULL) return RPMRC_OK; @@ -19,8 +19,8 @@ + flags |= RPMSCRIPT_FLAG_CRITICAL; + return flags; } ---- ./macros.in -+++ ./macros.in +--- macros.in ++++ macros.in @@ -1293,5 +1293,10 @@ end %{expand:%__scm_setup_%{__scm} %{!-v:-q}}\ %{!-N:%autopatch %{-v} %{-p:-p%{-p*}}} diff --git a/fileattrs.diff b/fileattrs.diff index 7de7f61..c62e237 100644 --- a/fileattrs.diff +++ b/fileattrs.diff @@ -1,20 +1,20 @@ ---- ./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.orig 2021-09-23 19:29:51.474079693 +0000 ++++ fileattrs/elf.attr 2021-09-23 19:35:43.413332593 +0000 @@ -1,3 +1,4 @@ %__elf_provides %{_rpmconfigdir}/elfdeps --provides %__elf_requires %{_rpmconfigdir}/elfdeps --requires %__elf_magic ^(setuid,? )?(setgid,? )?(sticky )?ELF (32|64)-bit.*$ +%__elf_exclude_path ^/usr/lib/debug/ ---- ./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.orig 2021-06-21 12:00:44.587611741 +0000 ++++ fileattrs/perl.attr 2021-09-23 19:29:51.474079693 +0000 @@ -1,3 +1,4 @@ -%__perl_requires %{_rpmconfigdir}/perl.req +# disabled for now +#%__perl_requires %{_rpmconfigdir}/perl.req %__perl_magic ^.*[Pp]erl .*$ %__perl_flags exeonly ---- ./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.orig 2021-06-21 12:00:44.587611741 +0000 ++++ fileattrs/perllib.attr 2021-09-23 19:29:51.478079685 +0000 @@ -1,5 +1,6 @@ %__perllib_provides %{_rpmconfigdir}/perl.prov -%__perllib_requires %{_rpmconfigdir}/perl.req diff --git a/find-lang-qt-qm.patch b/find-lang-qt-qm.patch index 43de887..f6c44fe 100644 --- a/find-lang-qt-qm.patch +++ b/find-lang-qt-qm.patch @@ -1,5 +1,5 @@ ---- ./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.orig 2021-09-23 19:57:49.046595975 +0000 ++++ scripts/find-lang.sh 2021-09-23 19:59:36.182374732 +0000 @@ -305,7 +305,9 @@ s:%lang(C) :: find "$TOP_DIR" -type f -o -type l|sed ' diff --git a/finddebuginfo-absolute-links.diff b/finddebuginfo-absolute-links.diff index 1eb6478..c53bb72 100644 --- a/finddebuginfo-absolute-links.diff +++ b/finddebuginfo-absolute-links.diff @@ -1,5 +1,5 @@ ---- ./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.orig 2021-09-23 20:23:21.967469723 +0000 ++++ scripts/find-debuginfo.in 2021-09-23 20:24:51.623286108 +0000 @@ -391,7 +391,17 @@ debug_link() local l="/usr/lib/debug$2" local t="$1" diff --git a/finddebuginfo.diff b/finddebuginfo.diff index a1b3993..e927f5c 100644 --- a/finddebuginfo.diff +++ b/finddebuginfo.diff @@ -1,5 +1,5 @@ ---- ./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.orig 2021-07-26 23:05:31.867817624 +0000 ++++ scripts/find-debuginfo.in 2021-09-23 20:20:03.763875636 +0000 @@ -412,12 +412,18 @@ trap 'rm -rf "$temp"' EXIT # Build a list of unstripped ELF files and their hardlinks diff --git a/findlang.diff b/findlang.diff index 89b444d..9ced3b4 100644 --- a/findlang.diff +++ b/findlang.diff @@ -1,5 +1,5 @@ ---- ./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.orig 2021-06-21 12:00:44.650612737 +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 PACKAGE_NAME is the %{name} of the package. This should also be the basename of the .mo files. the output is written to diff --git a/findsupplements.diff b/findsupplements.diff index a0b7c52..469c3b3 100644 --- a/findsupplements.diff +++ b/findsupplements.diff @@ -1,5 +1,5 @@ ---- ./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.orig 2021-09-23 20:01:42.554113780 +0000 ++++ scripts/Makefile.am 2021-09-23 20:02:13.466049945 +0000 @@ -17,7 +17,7 @@ EXTRA_DIST = \ rpmdb_dump rpmdb_load \ rpm.daily rpm.log rpm.supp rpm2cpio.sh \ @@ -18,8 +18,8 @@ perl.prov perl.req \ pkgconfigdeps.sh \ ocamldeps.sh \ ---- ./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.orig 2021-09-23 20:01:42.554113780 +0000 ++++ scripts/find-supplements 2021-09-23 20:01:42.554113780 +0000 @@ -0,0 +1,3 @@ +#!/bin/sh + diff --git a/headerchk2.diff b/headerchk2.diff index 7920743..1144b93 100644 --- a/headerchk2.diff +++ b/headerchk2.diff @@ -1,5 +1,5 @@ ---- ./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.orig 2017-12-01 15:54:04.254399473 +0000 ++++ lib/header.c 2017-12-01 15:55:36.389131237 +0000 @@ -929,7 +929,8 @@ rpmRC hdrblobImport(hdrblob blob, int fa rdlen += REGION_TAG_COUNT; diff --git a/ignore-auxv.diff b/ignore-auxv.diff index 209df32..9e7e0a6 100644 --- a/ignore-auxv.diff +++ b/ignore-auxv.diff @@ -1,5 +1,5 @@ ---- ./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.orig 2020-09-30 07:48:01.215567727 +0000 ++++ lib/rpmrc.c 2020-09-30 12:22:46.612692258 +0000 @@ -78,10 +78,12 @@ struct rpmOption { int localize; }; diff --git a/langnoc.diff b/langnoc.diff index 8a70548..44a14f9 100644 --- a/langnoc.diff +++ b/langnoc.diff @@ -1,5 +1,5 @@ ---- ./macros.in.orig 2021-09-23 19:54:19.515028659 +0000 -+++ ./macros.in 2021-09-23 19:54:25.495016311 +0000 +--- macros.in.orig 2021-09-23 19:54:19.515028659 +0000 ++++ macros.in 2021-09-23 19:54:25.495016311 +0000 @@ -1150,6 +1150,7 @@ package or when debugging this package.\ # %files -f %{name}.lang # @@ -8,8 +8,8 @@ # Commands + opts to use for retrieving remote files # 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 2021-09-23 19:54:25.495016311 +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 @@ -75,6 +75,8 @@ MO= MO_NAME=${NAMES[0]}.lang ALL_NAME=# diff --git a/leave-malloc-check-set.diff b/leave-malloc-check-set.diff index 292fd69..053ae41 100644 --- a/leave-malloc-check-set.diff +++ b/leave-malloc-check-set.diff @@ -12,8 +12,8 @@ Signed-off-by: Denys Vlasenko sign/rpmgensig.c | 1 - 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, if (buildRoot) setenv("RPM_BUILD_ROOT", buildRoot, 1); @@ -22,8 +22,8 @@ Signed-off-by: Denys Vlasenko execvp(argv[0], (char *const *)argv); rpmlog(RPMLOG_ERR, _("Couldn't exec %s: %s\n"), 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, } @@ -34,8 +34,8 @@ Signed-off-by: Denys Vlasenko xx = execv(argv[0], argv); if (xx) { 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) dup2(pipefd[0], STDIN_FILENO); close(pipefd[1]); diff --git a/localetag.diff b/localetag.diff index 3f66163..e6d88bf 100644 --- a/localetag.diff +++ b/localetag.diff @@ -1,8 +1,8 @@ Convert output to the current locale. Assumes utf8 input if the decoding works, otherwise iso-8859-1. ---- ./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.orig 2021-06-21 12:00:44.615612184 +0000 ++++ lib/tagexts.c 2021-09-23 18:58:58.461872258 +0000 @@ -2,6 +2,7 @@ * \file lib/formats.c */ diff --git a/macrosin.diff b/macrosin.diff index 627e3ef..197c8e1 100644 --- a/macrosin.diff +++ b/macrosin.diff @@ -1,5 +1,5 @@ ---- ./macros.in.orig 2021-09-23 19:13:54.532045005 +0000 -+++ ./macros.in 2021-09-23 19:13:59.592034687 +0000 +--- macros.in.orig 2021-09-23 19:13:54.532045005 +0000 ++++ macros.in 2021-09-23 19:13:59.592034687 +0000 @@ -170,6 +170,7 @@ %{?_unique_debug_names:--unique-debug-suffix "-%{VERSION}-%{RELEASE}.%{_arch}"} \\\ %{?_unique_debug_srcs:--unique-debug-src-base "%{name}-%{VERSION}-%{RELEASE}.%{_arch}"} \\\ diff --git a/nextiteratorheaderblob.diff b/nextiteratorheaderblob.diff index f35ec18..36b5f85 100644 --- a/nextiteratorheaderblob.diff +++ b/nextiteratorheaderblob.diff @@ -1,5 +1,5 @@ ---- ./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.orig 2020-11-27 13:09:17.968992873 +0000 ++++ lib/rpmdb.c 2020-11-27 13:14:21.524165780 +0000 @@ -2679,6 +2679,48 @@ int rpmdbCtrl(rpmdb db, rpmdbCtrlOp ctrl return dbctrl ? dbCtrl(db, dbctrl) : 1; } @@ -49,8 +49,8 @@ char *rpmdbCookie(rpmdb db) { void *cookie = NULL; ---- ./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.orig 2020-11-27 13:09:17.968992873 +0000 ++++ lib/rpmdb.h 2020-11-27 13:09:36.352942782 +0000 @@ -253,6 +253,14 @@ int rpmdbStat(const char *prefix, struct */ int rpmdbFStat(rpmdb db, struct stat *statbuf); diff --git a/nobuildcolor.diff b/nobuildcolor.diff index c57834c..251d7c0 100644 --- a/nobuildcolor.diff +++ b/nobuildcolor.diff @@ -1,7 +1,7 @@ Disable file coloring for SUSE systems ---- ./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.orig 2020-09-30 13:06:07.502865543 +0000 ++++ build/rpmfc.c 2020-09-30 13:07:08.530734545 +0000 @@ -1607,7 +1607,8 @@ rpmRC rpmfcGenerateDepends(const rpmSpec goto exit; diff --git a/nomagiccheck.diff b/nomagiccheck.diff index 2e54c89..9159738 100644 --- a/nomagiccheck.diff +++ b/nomagiccheck.diff @@ -1,7 +1,7 @@ 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 2020-09-30 13:08:54.306508417 +0000 +--- build/rpmfc.c.orig 2020-09-30 13:08:18.770584384 +0000 ++++ build/rpmfc.c 2020-09-30 13:08:54.306508417 +0000 @@ -1159,7 +1159,7 @@ static uint32_t getElfColor(const char * rpmRC rpmfcClassify(rpmfc fc, ARGV_t argv, rpm_mode_t * fmode) diff --git a/noprereqdeprec.diff b/noprereqdeprec.diff index 21ab5fe..8586725 100644 --- a/noprereqdeprec.diff +++ b/noprereqdeprec.diff @@ -1,5 +1,5 @@ ---- ./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.orig 2019-10-02 11:38:15.807736662 +0000 ++++ build/parsePreamble.c 2019-10-02 11:39:12.495617575 +0000 @@ -1032,7 +1032,7 @@ static struct PreambleRec_s const preamb {RPMTAG_SUGGESTNAME, 0, 0, 0, LEN_AND_STR("suggests")}, {RPMTAG_SUPPLEMENTNAME, 0, 0, 0, LEN_AND_STR("supplements")}, diff --git a/ocaml-cmxs.diff b/ocaml-cmxs.diff index 117ccd7..ab089c4 100644 --- a/ocaml-cmxs.diff +++ b/ocaml-cmxs.diff @@ -12,8 +12,8 @@ Fixes: a6fe37c39b39acbcbd014dd1e6d5653ff84254a1 Signed-off-by: Olaf Hering ---- ./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.orig 2021-06-21 12:00:44.587611741 +0000 ++++ fileattrs/ocaml.attr 2021-12-22 13:54:20.384959876 +0000 @@ -1,5 +1,5 @@ %__ocaml_provides %{_rpmconfigdir}/ocamldeps.sh --provides %__ocaml_requires %{_rpmconfigdir}/ocamldeps.sh --requires @@ -22,8 +22,8 @@ Signed-off-by: Olaf Hering +%__ocaml_magic ^(Objective caml|OCaml) .*$ +%__ocaml_path .(cma|cmi|cmo|cmx|cmxa)$ %__ocaml_flags magic_and_path ---- ./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.orig 2021-06-21 12:00:44.650612737 +0000 ++++ scripts/ocamldeps.sh 2021-12-22 13:54:20.384959876 +0000 @@ -32,6 +32,10 @@ # Implementations imported: # HASH NAME_FROM_OTHER_MODULE diff --git a/platformin.diff b/platformin.diff index 0d7a384..9617bb1 100644 --- a/platformin.diff +++ b/platformin.diff @@ -1,5 +1,5 @@ ---- ./platform.in.orig 2014-06-26 06:51:54.822818260 +0000 -+++ ./platform.in 2014-08-04 12:38:55.389245494 +0000 +--- platform.in.orig 2014-06-26 06:51:54.822818260 +0000 ++++ platform.in 2014-08-04 12:38:55.389245494 +0000 @@ -41,7 +41,7 @@ %_oldincludedir @oldincludedir@ %_infodir @infodir@ diff --git a/posttrans.diff b/posttrans.diff index 356d357..5d11343 100644 --- a/posttrans.diff +++ b/posttrans.diff @@ -1,5 +1,5 @@ ---- ./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.orig 2021-04-09 11:28:12.359647290 +0000 ++++ lib/poptI.c 2021-04-09 11:28:15.523640983 +0000 @@ -265,6 +265,10 @@ struct poptOption rpmInstallPoptTable[] &rpmIArgs.installInterfaceFlags, (INSTALL_REINSTALL|INSTALL_INSTALL), N_("reinstall package(s)"), @@ -11,8 +11,8 @@ POPT_TABLEEND }; ---- ./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.orig 2021-04-09 11:28:12.359647290 +0000 ++++ lib/psm.c 2021-04-09 11:28:15.527640975 +0000 @@ -810,7 +810,7 @@ static rpmRC rpmPackageErase(rpmts ts, r } if (rc) break; @@ -22,8 +22,8 @@ /* Prepare post transaction uninstall triggers */ rpmtriggersPrepPostUnTransFileTrigs(psm->ts, psm->te); } ---- ./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.orig 2021-04-09 11:28:12.359647290 +0000 ++++ lib/rpmcli.h 2021-04-09 11:28:15.527640975 +0000 @@ -304,6 +304,7 @@ enum rpmInstallFlags_e { INSTALL_ERASE = (1 << 8), /*!< from --erase */ INSTALL_ALLMATCHES = (1 << 9), /*!< from --allmatches */ @@ -48,8 +48,8 @@ */ extern struct rpmInstallArguments_s rpmIArgs; ---- ./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.orig 2021-04-09 11:28:12.363647282 +0000 ++++ lib/rpminstall.c 2021-04-09 11:28:15.527640975 +0000 @@ -4,6 +4,8 @@ #include "system.h" @@ -92,8 +92,8 @@ + argvFree(manifest); + return rc; +} ---- ./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.orig 2021-04-09 11:28:12.363647282 +0000 ++++ lib/rpmtriggers.c 2021-04-09 11:31:46.999219563 +0000 @@ -1,5 +1,6 @@ #include "system.h" @@ -142,8 +142,8 @@ if (tm == RPMSCRIPT_FILETRIGGER) { priorityTag = RPMTAG_FILETRIGGERPRIORITIES; } else { ---- ./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.orig 2021-04-09 11:28:12.363647282 +0000 ++++ lib/rpmtriggers.h 2021-04-09 11:28:15.527640975 +0000 @@ -27,6 +27,10 @@ rpmtriggers rpmtriggersCreate(unsigned i RPM_GNUC_INTERNAL rpmtriggers rpmtriggersFree(rpmtriggers triggers); @@ -155,8 +155,8 @@ /* * Prepare post trans uninstall file triggers. After transcation uninstalled * 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 2021-04-09 11:28:15.527640975 +0000 +--- lib/rpmts.h.orig 2021-04-09 11:28:12.363647282 +0000 ++++ lib/rpmts.h 2021-04-09 11:28:15.527640975 +0000 @@ -229,6 +229,15 @@ int rpmtsOrder(rpmts ts); int rpmtsRun(rpmts ts, rpmps okProbs, rpmprobFilterFlags ignoreSet); @@ -173,8 +173,8 @@ * Reference a transaction set instance. * @param ts transaction set * @return new transaction set reference ---- ./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.orig 2021-04-09 11:28:12.363647282 +0000 ++++ lib/rpmts_internal.h 2021-04-09 11:28:15.527640975 +0000 @@ -87,6 +87,7 @@ struct rpmts_s { rpmtriggers trigs2run; /*!< Transaction file triggers */ @@ -183,8 +183,8 @@ }; #ifdef __cplusplus ---- ./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.orig 2021-04-09 11:28:12.363647282 +0000 ++++ lib/transaction.c 2021-04-09 11:33:22.247029757 +0000 @@ -1468,6 +1468,8 @@ static int rpmtsSetup(rpmts ts, rpmprobF /* Get available space on mounted file systems. */ (void) rpmtsInitDSI(ts); @@ -336,8 +336,8 @@ + rpmtsEmpty(ts); + return rc; +} ---- ./rpm.c.orig 2021-04-09 11:28:12.363647282 +0000 -+++ ./rpm.c 2021-04-09 11:28:15.527640975 +0000 +--- rpm.c.orig 2021-04-09 11:28:12.363647282 +0000 ++++ rpm.c 2021-04-09 11:28:15.527640975 +0000 @@ -19,6 +19,7 @@ enum modes { MODE_INSTALL = (1 << 1), MODE_ERASE = (1 << 2), diff --git a/python-rpm-packaging.diff b/python-rpm-packaging.diff index b5ebe1f..db63700 100644 --- a/python-rpm-packaging.diff +++ b/python-rpm-packaging.diff @@ -1,13 +1,13 @@ ---- ./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.orig 2021-09-23 20:14:04.880605674 +0000 ++++ fileattrs/pythondist.attr 2021-09-23 20:15:23.392446317 +0000 @@ -1,3 +1,4 @@ %__pythondist_provides %{_rpmconfigdir}/pythondistdeps.py --provides --majorver-provides -%__pythondist_requires %{_rpmconfigdir}/pythondistdeps.py --requires +#disabled for now +#%__pythondist_requires %{_rpmconfigdir}/pythondistdeps.py --requires %__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 2021-09-23 20:14:30.748553177 +0000 +--- scripts/pythondistdeps.py.orig 2021-09-23 20:14:26.496561795 +0000 ++++ scripts/pythondistdeps.py 2021-09-23 20:14:30.748553177 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 diff --git a/refreshtestarch.diff b/refreshtestarch.diff index 8612d9b..af35f88 100644 --- a/refreshtestarch.diff +++ b/refreshtestarch.diff @@ -1,8 +1,8 @@ Also test architecture in "refresh" test when not colored. This allows updates to different architectures. ---- ./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.orig 2019-10-02 09:54:56.180565818 +0000 ++++ lib/psm.c 2019-10-02 09:55:02.700552941 +0000 @@ -518,9 +518,9 @@ static void markReplacedInstance(rpmts t rpmdbSetIteratorRE(mi, RPMTAG_EPOCH, RPMMIRE_STRCMP, rpmteE(te)); rpmdbSetIteratorRE(mi, RPMTAG_VERSION, RPMMIRE_STRCMP, rpmteV(te)); diff --git a/remove-brp-strips.diff b/remove-brp-strips.diff index 6c80857..396b920 100644 --- a/remove-brp-strips.diff +++ b/remove-brp-strips.diff @@ -3,8 +3,8 @@ Subject: remove references to removed brp scripts Some brp-scripts are not used in openSUSE, remove references to it ---- ./platform.in.orig 2021-09-23 19:23:57.822814696 +0000 -+++ ./platform.in 2021-09-23 19:24:31.534745951 +0000 +--- platform.in.orig 2021-09-23 19:23:57.822814696 +0000 ++++ platform.in 2021-09-23 19:24:31.534745951 +0000 @@ -96,8 +96,6 @@ %{?__brp_compress} \ %{?__brp_elfperms} \ diff --git a/remove-translations.diff b/remove-translations.diff index 7a0d6ec..6289abc 100644 --- a/remove-translations.diff +++ b/remove-translations.diff @@ -1,5 +1,5 @@ ---- ./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.orig 2018-01-31 13:25:25.229266078 +0000 ++++ scripts/find-lang.sh 2018-01-31 13:26:15.128133281 +0000 @@ -119,6 +119,23 @@ fi MO_NAME_NEW=$MO_NAME.tmp.$$ rm -f $MO_NAME_NEW diff --git a/rpm-findlang-inject-metainfo.patch b/rpm-findlang-inject-metainfo.patch index 8481099..cf21af7 100644 --- a/rpm-findlang-inject-metainfo.patch +++ b/rpm-findlang-inject-metainfo.patch @@ -1,5 +1,5 @@ ---- ./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.orig 2018-01-31 13:37:22.810352621 +0000 ++++ scripts/find-lang.sh 2018-01-31 13:39:38.117990971 +0000 @@ -32,6 +32,7 @@ Additional options: --with-man find localized man pages --all-name match all package/domain names diff --git a/rpm-shorten-changelog.diff b/rpm-shorten-changelog.diff index ed140ae..40e81e5 100644 --- a/rpm-shorten-changelog.diff +++ b/rpm-shorten-changelog.diff @@ -1,5 +1,5 @@ ---- ./build/pack.c -+++ ./build/pack.c +--- build/pack.c.orig ++++ build/pack.c @@ -683,6 +683,71 @@ return rc; } @@ -84,8 +84,8 @@ headerPutString(pkg->header, RPMTAG_RPMVERSION, VERSION); headerPutString(pkg->header, RPMTAG_BUILDHOST, spec->buildHost); ---- ./build/parseChangelog.c -+++ ./build/parseChangelog.c +--- build/parseChangelog.c.orig ++++ build/parseChangelog.c @@ -267,6 +267,11 @@ goto exit; } diff --git a/rpm.changes b/rpm.changes index 85ec17e..14db933 100644 --- a/rpm.changes +++ b/rpm.changes @@ -53,6 +53,11 @@ Fri Jan 28 14:19:02 UTC 2022 - Dirk Müller by ~220MB (bsc#1195390) ------------------------------------------------------------------- +Thu Jan 27 13:26:07 UTC 2022 - Ludwig Nussel + +- make patches git quiltimport friendlier + +------------------------------------------------------------------- Wed Dec 22 14:57:27 CET 2021 - olaf@aepfle.de - Update OCaml requires/provides generators to ignore cmxs diff --git a/rpm.spec b/rpm.spec index be10353..f7c1c87 100644 --- a/rpm.spec +++ b/rpm.spec @@ -88,7 +88,6 @@ Patch34: rpmrc.diff Patch36: rpmqpack.diff Patch38: build.diff Patch43: rpm-shorten-changelog.diff -Patch45: whatrequires-doc.diff Patch46: remove-brp-strips.diff Patch51: specfilemacro.diff Patch60: safeugid.diff @@ -118,6 +117,8 @@ Patch133: zstdpool.diff Patch134: zstdthreaded.diff Patch135: ocaml-cmxs.diff Patch136: 0001-fix-minimize_writes.patch +# touches a generated file +Patch180: whatrequires-doc.diff Patch200: finddebuginfo.diff Patch201: finddebuginfo-absolute-links.diff Patch202: debugsubpkg.diff @@ -237,7 +238,7 @@ rm -rf sqlite %patch -P 5 -P 12 -P 13 -P 16 -P 18 %patch -P 24 -P 25 -P 26 -P 29 %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 60 -P 61 -P 66 -P 67 -P 69 %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 122 -P 123 -P 131 -P 132 -P 133 -P 134 %patch -P 135 -P 136 +%patch -P 180 # debugedit patches pushd debugedit-5.0 diff --git a/rpmpopt.diff b/rpmpopt.diff index fcff9e4..c043fd5 100644 --- a/rpmpopt.diff +++ b/rpmpopt.diff @@ -1,5 +1,5 @@ ---- ./rpmpopt.in.orig 2017-12-01 14:58:11.404041985 +0000 -+++ ./rpmpopt.in 2017-12-01 14:59:06.275882759 +0000 +--- rpmpopt.in.orig 2017-12-01 14:58:11.404041985 +0000 ++++ rpmpopt.in 2017-12-01 14:59:06.275882759 +0000 @@ -101,7 +101,8 @@ Relocations : %|PREFIXES?{[%{PREFIXES} ] %|URL?{URL : %{URL}\n}|\ %|BUGURL?{Bug URL : %{BUGURL}\n}|\ diff --git a/rpmqpack.diff b/rpmqpack.diff index be2cef3..e09b0e1 100644 --- a/rpmqpack.diff +++ b/rpmqpack.diff @@ -1,5 +1,5 @@ ---- ./Makefile.am.orig 2021-06-21 12:00:44.552611187 +0000 -+++ ./Makefile.am 2021-09-23 19:17:54.619555392 +0000 +--- Makefile.am.orig 2021-06-21 12:00:44.552611187 +0000 ++++ Makefile.am 2021-09-23 19:17:54.619555392 +0000 @@ -175,6 +175,10 @@ rpmgraph_LDADD = lib/librpm.la rpmio/lib dist_bin_SCRIPTS = scripts/gendiff @@ -11,8 +11,8 @@ rpmconfig_DATA = rpmrc rpmrc: $(top_srcdir)/rpmrc.in @$(SED) \ ---- ./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.orig 2021-08-20 08:44:56.263259000 +0000 ++++ docs/man/Makefile.am 2021-09-23 19:17:54.619555392 +0000 @@ -9,7 +9,7 @@ EXTRA_DIST += gendiff.1.md 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 += 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 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 @@ -0,0 +1,25 @@ +.TH RPMQPACK 8 "Mar 2002" +.SH NAME @@ -50,8 +50,8 @@ + +.SH AUTHOR +Michael Schroeder ---- ./rpmqpack.c.orig 2021-09-23 19:17:54.619555392 +0000 -+++ ./rpmqpack.c 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 @@ -0,0 +1,60 @@ +#include +#include diff --git a/rpmrc.diff b/rpmrc.diff index 21db092..18fbc07 100644 --- a/rpmrc.diff +++ b/rpmrc.diff @@ -1,5 +1,5 @@ ---- ./rpmrc.in.orig 2019-06-26 14:17:31.451985635 +0000 -+++ ./rpmrc.in 2019-10-02 11:24:49.601403844 +0000 +--- rpmrc.in.orig 2019-06-26 14:17:31.451985635 +0000 ++++ rpmrc.in 2019-10-02 11:24:49.601403844 +0000 @@ -12,16 +12,16 @@ # "fat" binary with both archs, for Darwin optflags: fat -O2 -g -arch i386 -arch ppc diff --git a/safeugid.diff b/safeugid.diff index 0ce2e16..4367b40 100644 --- a/safeugid.diff +++ b/safeugid.diff @@ -1,8 +1,8 @@ --- ../safeugid.diff 2019-10-02 13:37:13.191868203 +0200 +++ P 2019-10-02 13:36:09.036002978 +0200 @@ -0,0 +1,211 @@ -+--- ./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.orig 2019-06-26 14:17:31.411985696 +0000 +++++ lib/rpmchroot.c 2019-10-02 11:35:58.788024507 +0000 +@@ -126,6 +126,7 @@ int rpmChrootIn(void) + + if (chdir("/") == 0 && chroot(rootState.rootDir) == 0) { @@ -19,8 +19,8 @@ + } else { + rpmlog(RPMLOG_ERR, _("Unable to restore root directory: %m\n")); + rc = -1; -+--- ./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.orig 2019-06-26 14:17:31.418985685 +0000 +++++ lib/rpmug.c 2019-10-02 11:35:58.788024507 +0000 +@@ -11,6 +11,47 @@ + #include "lib/rpmug.h" + #include "debug.h" @@ -203,8 +203,8 @@ ++ inchroot = in; ++#endif ++} -+--- ./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.orig 2019-06-26 14:17:31.418985685 +0000 +++++ lib/rpmug.h 2019-10-02 11:35:58.788024507 +0000 +@@ -15,4 +15,6 @@ int rpmugInit(void); + + void rpmugFree(void); diff --git a/singlefilemode.diff b/singlefilemode.diff index 2ef098a..be674eb 100644 --- a/singlefilemode.diff +++ b/singlefilemode.diff @@ -1,5 +1,5 @@ ---- ./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.orig 2021-09-24 09:10:06.477724685 +0000 ++++ scripts/find-debuginfo.in 2021-09-24 09:10:26.557680705 +0000 @@ -168,7 +168,6 @@ while [ $# -gt 0 ]; do ;; --dwz-single-file-mode) diff --git a/specfilemacro.diff b/specfilemacro.diff index 2a5f5eb..18f2acd 100644 --- a/specfilemacro.diff +++ b/specfilemacro.diff @@ -1,5 +1,5 @@ ---- ./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.orig 2013-06-10 15:55:10.000000000 +0000 ++++ build/parseSpec.c 2013-07-12 12:04:11.000000000 +0000 @@ -561,6 +561,7 @@ static rpmSpec parseSpec(const char *spe spec = newSpec(); diff --git a/usr-lib-sysimage-rpm.patch b/usr-lib-sysimage-rpm.patch index bc6a2b8..87b00da 100644 --- a/usr-lib-sysimage-rpm.patch +++ b/usr-lib-sysimage-rpm.patch @@ -1,5 +1,5 @@ ---- ./macros.in.orig 2021-08-20 08:44:56.264259007 +0000 -+++ ./macros.in 2021-09-23 18:57:26.654059458 +0000 +--- macros.in.orig 2021-08-20 08:44:56.264259007 +0000 ++++ macros.in 2021-09-23 18:57:26.654059458 +0000 @@ -140,7 +140,7 @@ %_buildshell /bin/sh diff --git a/verbosearg.diff b/verbosearg.diff index 87c3711..c7fb27d 100644 --- a/verbosearg.diff +++ b/verbosearg.diff @@ -1,5 +1,5 @@ ---- ./rpmio/macro.c.orig -+++ ./rpmio/macro.c +--- rpmio/macro.c.orig ++++ rpmio/macro.c @@ -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) diff --git a/weakdepscompat.diff b/weakdepscompat.diff index 679b4bc..c026b93 100644 --- a/weakdepscompat.diff +++ b/weakdepscompat.diff @@ -1,5 +1,5 @@ ---- ./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.orig 2014-08-04 13:10:07.530953406 +0000 ++++ build/parsePreamble.c 2014-08-04 13:10:12.852929355 +0000 @@ -343,6 +343,7 @@ static struct tokenBits_s const installS { "verify", RPMSENSE_SCRIPT_VERIFY }, { "pretrans", RPMSENSE_PRETRANS }, diff --git a/whatrequires-doc.diff b/whatrequires-doc.diff index 95fa8c2..a1a4daf 100644 --- a/whatrequires-doc.diff +++ b/whatrequires-doc.diff @@ -1,5 +1,5 @@ ---- ./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.orig 2021-09-23 19:20:46.991203867 +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 \f[B]--whatrequires \f[R]\f[I]CAPABILITY\f[R] Query all packages that require \f[I]CAPABILITY\f[R] for proper diff --git a/zstdpool.diff b/zstdpool.diff index 3640438..9d1b4d4 100644 --- a/zstdpool.diff +++ b/zstdpool.diff @@ -1,5 +1,5 @@ ---- ./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.orig 2021-06-21 12:00:44.648612706 +0000 ++++ rpmio/rpmio.c 2022-04-13 13:48:55.224954032 +0000 @@ -8,6 +8,7 @@ #include #include