Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2022-03-17 17:01:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new.25692 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rpm"
Thu Mar 17 17:01:13 2022 rev:295 rq:961665 version:4.17.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2022-02-22 21:17:36.410279786
+0100
+++ /work/SRC/openSUSE:Factory/.rpm.new.25692/rpm.changes 2022-03-17
17:01:20.149677894 +0100
@@ -1,0 +2,18 @@
+Mon Mar 14 10:50:39 UTC 2022 - Dirk M??ller <dmuel...@suse.com>
+
+- 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 <dmuel...@suse.com>
+
+- use fileprovide /usr/bin/gzip for "rpm-build" to make alternative
+ providers possible
+
+-------------------------------------------------------------------
+Wed Feb 23 22:44:33 UTC 2022 - Dirk M??ller <dmuel...@suse.com>
+
+- add leave-malloc-check-set.diff to actually use MALLOC_CHECK_ during
+ build
+
+-------------------------------------------------------------------
Old:
----
rpm-deptracking.patch
New:
----
leave-malloc-check-set.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rpm.spec ++++++
--- /var/tmp/diff_new_pack.VmnXXh/_old 2022-03-17 17:01:21.517678940 +0100
+++ /var/tmp/diff_new_pack.VmnXXh/_new 2022-03-17 17:01:21.521678944 +0100
@@ -100,9 +100,9 @@
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: 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 @@
%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
++++++ leave-malloc-check-set.diff ++++++
>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 <dvlas...@redhat.com>
---
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)
