From e7c45583a5ded0cc97980fc022b39d67722071db Mon Sep 17 00:00:00 2001
From: mlschroe <>
Date: Mar 17 2022 16:06:49 +0000
Subject: Update rpm to version 4.17.0 / rev 295 via SR 961665
https://build.opensuse.org/request/show/961665
by user mlschroe + dimstar_suse
->
---
diff --git a/.files b/.files
index 4644079..02cfbfa 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index 72502d9..24b37a8 100644
--- a/.rev
+++ b/.rev
@@ -2318,4 +2318,12 @@ See bugzilla 1167537 for the gory details.
- Fix minimize_writes not minimizing writes since 4.15 regression
955873
+
+ fd3f691c73c3e190a69ef43bcde0c97a
+ 4.17.0
+
+ dimstar_suse
+ ->
+ 961665
+
diff --git a/leave-malloc-check-set.diff b/leave-malloc-check-set.diff
new file mode 100644
index 0000000..292fd69
--- /dev/null
+++ b/leave-malloc-check-set.diff
@@ -0,0 +1,46 @@
+From 8763969a4a5f19231c0d851e5d50eff614cf5940 Mon Sep 17 00:00:00 2001
+Date: Thu, 23 Jan 2020 13:43:36 +0100
+Subject: [PATCH] Do not unset $MALLOC_CHECK_
+
+How do we even _know_ user wants to debug malloc in rpmbuild,
+maybe user wants to debug it in _the child_?
+
+Signed-off-by: Denys Vlasenko
+---
+ build/rpmfc.c | 1 -
+ lib/rpmscript.c | 3 ---
+ sign/rpmgensig.c | 1 -
+ 3 files changed, 5 deletions(-)
+
+--- ./build/rpmfc.c
++++ ./build/rpmfc.c
+@@ -319,7 +319,6 @@ static int getOutputFrom(ARGV_t argv,
+ if (buildRoot)
+ setenv("RPM_BUILD_ROOT", buildRoot, 1);
+
+- unsetenv("MALLOC_CHECK_");
+ 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
+@@ -245,9 +245,6 @@ static void doScriptExec(ARGV_const_t argv, ARGV_const_t prefixes,
+ }
+
+ if (chdir("/") == 0) {
+- /* XXX Don't mtrace into children. */
+- unsetenv("MALLOC_CHECK_");
+-
+ xx = execv(argv[0], argv);
+ if (xx) {
+ rpmlog(RPMLOG_ERR,
+--- ./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]);
+
+- unsetenv("MALLOC_CHECK_");
+ cmd = rpmExpand("%{?__gpg_sign_cmd}", NULL);
+ rc = poptParseArgvString(cmd, NULL, (const char ***)&av);
+ if (!rc)
diff --git a/rpm-deptracking.patch b/rpm-deptracking.patch
deleted file mode 100644
index 4c97af2..0000000
--- a/rpm-deptracking.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./macros.in.orig 2017-12-01 15:50:47.587969729 +0000
-+++ ./macros.in 2017-12-01 15:50:53.813951691 +0000
-@@ -1039,7 +1039,8 @@ package or when debugging this package.\
- --localstatedir=%{_localstatedir} \\\
- --sharedstatedir=%{_sharedstatedir} \\\
- --mandir=%{_mandir} \\\
-- --infodir=%{_infodir}
-+ --infodir=%{_infodir} \\\
-+ --disable-dependency-tracking
-
- #------------------------------------------------------------------------------
- # Tested features of make
diff --git a/rpm.changes b/rpm.changes
index f82ea46..f929954 100644
--- a/rpm.changes
+++ b/rpm.changes
@@ -1,4 +1,22 @@
-------------------------------------------------------------------
+Mon Mar 14 10:50:39 UTC 2022 - Dirk Müller
+
+- drop rpm-deptracking.patch, this is already upstream and
+ we were just adding it twice
+
+-------------------------------------------------------------------
+Tue Mar 8 19:31:27 UTC 2022 - Dirk Müller
+
+- use fileprovide /usr/bin/gzip for "rpm-build" to make alternative
+ providers possible
+
+-------------------------------------------------------------------
+Wed Feb 23 22:44:33 UTC 2022 - Dirk Müller
+
+- add leave-malloc-check-set.diff to actually use MALLOC_CHECK_ during
+ build
+
+-------------------------------------------------------------------
Tue Feb 1 12:47:02 UTC 2022 - Dirk Müller
- invoke find-lang.sh with bash, it is a bash script (bsc#1195391)
diff --git a/rpm.spec b/rpm.spec
index f7ee867..e34a1f2 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -100,9 +100,9 @@ Patch69: nobuildcolor.diff
Patch70: fileattrs.diff
Patch71: nomagiccheck.diff
Patch73: assumeexec.diff
-Patch75: rpm-deptracking.patch
Patch77: langnoc.diff
Patch78: headerchk2.diff
+Patch79: leave-malloc-check-set.diff
Patch85: brp-compress-no-img.patch
Patch93: weakdepscompat.diff
Patch94: checksepwarn.diff
@@ -184,10 +184,10 @@ Requires: gawk
Requires: gcc
#Requires: gcc-PIE
Requires: gettext-tools
+Requires: /usr/bin/gzip
Requires: glibc-devel
Requires: glibc-locale-base
Requires: grep
-Requires: gzip
Requires: make
Requires: patch
Requires: sed
@@ -241,7 +241,7 @@ rm -rf sqlite
%patch -P 43 -P 45 -P 46 -P 47
%patch -P 51
%patch -P 60 -P 61 -P 66 -P 67 -P 69
-%patch -P 70 -P 71 -P 73 -P 75 -P 77 -P 78
+%patch -P 70 -P 71 -P 73 -P 77 -P 78 -P 79
%patch -P 85
%patch -P 93 -P 94 -P 99
%patch -P 100 -P 102 -P 103