From 5c168f7f324b7c8cc1304b957a59bd9961000dd8 Mon Sep 17 00:00:00 2001 From: Denis Silakov Date: Mon, 23 Sep 2013 10:48:07 +0400 Subject: [PATCH] Disable generation of buildid provides --- ...sable-generation-of-buildid-provides.patch | 11 +++++++++++ ...ont-repackage-if-justdb-is-specified.patch | 19 +++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 rpm-5.4.10-disable-generation-of-buildid-provides.patch create mode 100644 rpm-5.4.10-dont-repackage-if-justdb-is-specified.patch diff --git a/rpm-5.4.10-disable-generation-of-buildid-provides.patch b/rpm-5.4.10-disable-generation-of-buildid-provides.patch new file mode 100644 index 0000000..74d39ec --- /dev/null +++ b/rpm-5.4.10-disable-generation-of-buildid-provides.patch @@ -0,0 +1,11 @@ +--- rpm-5.4.10/lib/rpmds.c.buildid_deps~ 2013-01-23 03:39:17.232845754 +0100 ++++ rpm-5.4.10/lib/rpmds.c 2013-01-23 03:38:37.428673897 +0100 +@@ -3297,7 +3297,7 @@ fprintf(stderr, "*** rpmdsELF(%s, %d, %p + continue; + /*@notreached@*/ /*@switchbreak@*/ break; + case SHT_NOTE: +-#if defined(HAVE_GELF_GETNOTE) /* XXX OpenIndiana & older elfutils haven't. */ ++#if defined(HAVE_GELF_GETNOTE) && !defined(RPM_VENDOR_MANDRIVA) /* XXX OpenIndiana & older elfutils haven't. */ + if (!(shdr->sh_flags & SHF_ALLOC)) + continue; + data = NULL; diff --git a/rpm-5.4.10-dont-repackage-if-justdb-is-specified.patch b/rpm-5.4.10-dont-repackage-if-justdb-is-specified.patch new file mode 100644 index 0000000..a6940d4 --- /dev/null +++ b/rpm-5.4.10-dont-repackage-if-justdb-is-specified.patch @@ -0,0 +1,19 @@ +Index: rpm/lib/transaction.c +RCS File: /v/rpm/cvs/rpm/lib/transaction.c,v +rcsdiff -q -kk '-r1.429.2.12' '-r1.429.2.13' -u '/v/rpm/cvs/rpm/lib/transaction.c,v' 2>/dev/null +--- rpm/lib/transaction.c 2012/06/04 15:10:11 1.429.2.12 ++++ rpm/lib/transaction.c 2012/12/04 18:48:32 1.429.2.13 +@@ -2244,9 +2244,11 @@ + } + + /* =============================================== +- * Save removed files before erasing. ++ * Save removed files before erasing (w/o --justdb). + */ +- if (TSF_ISSET(tsflags, DIRSTASH) || TSF_ISSET(tsflags, REPACKAGE)) { ++ if ((TSF_ISSET(tsflags, DIRSTASH) || TSF_ISSET(tsflags, REPACKAGE)) ++ && !TSF_ISSET(tsflags, JUSTDB)) ++ { + xx = rpmtsRepackage(ts, numRemoved); + } +