- Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.cvsignore

@@ -1 +0,0 @@
-rpm-4.7.0-rc1.tar.bz2

.gitignore

@@ -0,0 +1,42 @@
+/rpm-4.9.90.git11505.tar.bz2
+/rpm-4.9.90.git11519.tar.bz2
+/rpm-4.9.90.git11536.tar.bz2
+/rpm-4.10.0-beta1.tar.bz2
+/rpm-4.10.0.tar.bz2
+/rpm-4.10.1.tar.bz2
+/rpm-4.10.90.git11989.tar.bz2
+/rpm-4.11.0-beta1.tar.bz2
+/rpm-4.11.0.1.tar.bz2
+/rpm-4.11.1-rc1.tar.bz2
+/rpm-4.11.1-rc2.tar.bz2
+/rpm-4.11.1.tar.bz2
+/rpm-4.11.2-rc1.tar.bz2
+/rpm-4.11.2-rc2.tar.bz2
+/rpm-4.11.2.tar.bz2
+/rpm-4.11.90-git12844.tar.bz2
+/rpm-4.12.0-beta1.tar.bz2
+/rpm-4.12.0-rc1.tar.bz2
+/rpm-4.12.0.tar.bz2
+/rpm-4.12.0.1.tar.bz2
+/rpm-4.12.90.tar.bz2
+/rpm-4.13.0-rc1.tar.bz2
+/rpm-4.13.0-rc2.tar.bz2
+/rpm-4.13.0.tar.bz2
+/rpm-4.13.0.1.tar.bz2
+/rpm-4.13.90-git14002.tar.bz2
+/rpm-4.14.0-rc1.tar.bz2
+/rpm-4.14.0-rc2.tar.bz2
+/rpm-4.14.0.tar.bz2
+/rpm-4.14.1.tar.bz2
+/rpm-4.14.2-rc1.tar.bz2
+/rpm-4.14.2-rc2.tar.bz2
+/rpm-4.14.2.tar.bz2
+/rpm-4.14.2.1.tar.bz2
+/rpm-4.14.90-git14653.tar.bz2
+/rpm-4.15.0-beta.tar.bz2
+/rpm-4.15.0-rc1.tar.bz2
+/rpm-4.15.0.tar.bz2
+/rpm-4.15.1.tar.bz2
+/rpm-4.15.90-git14971.tar.bz2
+/rpm-4.16.0-beta1.tar.bz2
+/rpm-4.16.0-beta3.tar.bz2

0001-Revert-Improve-ARM-detection.patch

@@ -0,0 +1,95 @@
+From 2426c2a066e44f4d9a342585e76cdbdb0a8a2db1 Mon Sep 17 00:00:00 2001
+From: Peter Robinson <pbrobinson@gmail.com>
+Date: Wed, 23 Oct 2019 20:22:19 +0100
+Subject: [PATCH] Revert "Improve ARM detection"
+
+This reverts commit 8c3a7b8fa92b49a811fe36b60857b12f5d7db8a8.
+
+This is the final piece in fixing rhbz 1691430. It's a clean revert
+so let's do that for F-31 and we can discuss the details later.
+
+Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
+---
+ lib/rpmrc.c | 37 +++++++++----------------------------
+ 1 file changed, 9 insertions(+), 28 deletions(-)
+
+diff --git a/lib/rpmrc.c b/lib/rpmrc.c
+index 0806e1b07..cada3f788 100644
+--- a/lib/rpmrc.c
++++ b/lib/rpmrc.c
+@@ -82,7 +82,6 @@ struct rpmOption {
+ static struct rpmat_s {
+     const char *platform;
+     uint64_t hwcap;
+-    uint64_t hwcap2;
+ } rpmat;
+ 
+ typedef struct defaultEntry_s {
+@@ -951,9 +950,6 @@ static int is_geode(void)
+ 
+ 
+ #if defined(__linux__)
+-#ifndef AT_HWCAP2 /* glibc < 2.18 */
+-#define AT_HWCAP2 26
+-#endif
+ /**
+  * Populate rpmat structure with auxv values
+  */
+@@ -967,7 +963,6 @@ static void read_auxv(void)
+ 	if (!rpmat.platform)
+ 	    rpmat.platform = "";
+ 	rpmat.hwcap = getauxval(AT_HWCAP);
+-	rpmat.hwcap2 = getauxval(AT_HWCAP2);
+ #else
+ 	rpmat.platform = "";
+ 	int fd = open("/proc/self/auxv", O_RDONLY);
+@@ -989,9 +984,6 @@ static void read_auxv(void)
+                     case AT_HWCAP:
+                         rpmat.hwcap = auxv.a_un.a_val;
+                         break;
+-		    case AT_HWCAP2:
+-			rpmat.hwcap2 = auxv.a_un.a_val;
+-			break;
+                 }
+ 	    }
+ 	    close(fd);
+@@ -1225,27 +1217,16 @@ static void defaultMachine(rpmrcCtx ctx, const char ** arch, const char ** os)
+ #	if !defined(HWCAP_ARM_VFPv3)
+ #	    define HWCAP_ARM_VFPv3	(1 << 13)
+ #	endif
+-#	if !defined(HWCAP2_AES)
+-#	    define HWCAP2_AES		(1 << 0)
+-#	endif
+-	/*
+-	 * un.machine is armvXE, where X is version number and E is
+-	 * endianness (b or l)
+-	 */
+-	if (rstreqn(un.machine, "armv", 4)) {
+-		char endian = un.machine[strlen(un.machine)-1];
+-		char *modifier = un.machine + 5;
+-		/* keep armv7, armv8, armv9, armv10, ... */
+-		while(risdigit(*modifier)) 
+-			modifier++;
+-		if (rpmat.hwcap & HWCAP_ARM_VFPv3)
+-			*modifier++ = 'h';
+-		if (rpmat.hwcap2 & HWCAP2_AES)
+-			*modifier++ = 'c';
++	if (rstreq(un.machine, "armv7l")) {
++	    if (rpmat.hwcap & HWCAP_ARM_VFPv3) {
+ 		if (rpmat.hwcap & HWCAP_ARM_NEON)
+-			*modifier++ = 'n';
+-		*modifier++ = endian;
+-		*modifier++ = 0;
++		    strcpy(un.machine, "armv7hnl");
++		else
++		    strcpy(un.machine, "armv7hl");
++	    }
++	} else if (rstreq(un.machine, "armv6l")) {
++	    if (rpmat.hwcap & HWCAP_ARM_VFP)
++		strcpy(un.machine, "armv6hl");
+ 	}
+ #	endif	/* arm*-linux */
+ 
+-- 
+2.23.0
+

0001-find-debuginfo.sh-decompress-DWARF-compressed-ELF-se.patch

@@ -0,0 +1,30 @@
+From f2bc669cd0a080792522dd1bb7f50ef7025f16f0 Mon Sep 17 00:00:00 2001
+From: Mark Wielaard <mark@klomp.org>
+Date: Sat, 21 Jul 2018 10:13:04 +0200
+Subject: [PATCH] find-debuginfo.sh: decompress DWARF compressed ELF sections
+
+debugedit and dwz do not support DWARF compressed ELF sections, let's
+just decompress those before extracting debuginfo.
+
+Tested-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
+---
+ scripts/find-debuginfo.sh | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/scripts/find-debuginfo.sh b/scripts/find-debuginfo.sh
+index 90a44942d..7b01bc036 100755
+--- a/scripts/find-debuginfo.sh
++++ b/scripts/find-debuginfo.sh
+@@ -357,6 +357,9 @@ do_file()
+   get_debugfn "$f"
+   [ -f "${debugfn}" ] && return
+ 
++  echo "explicitly decompress any DWARF compressed ELF sections in $f"
++  eu-elfcompress -q -p -t none "$f"
++
+   echo "extracting debug info from $f"
+   # See also cpio SOURCEFILE copy. Directories must match up.
+   debug_base_name="$RPM_BUILD_DIR"
+-- 
+2.18.0
+

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: rpm
-# $Id: Makefile,v 1.1 2004/09/09 11:49:39 cvsdist Exp $
-NAME := rpm
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

STAGE2-rpm

@@ -0,0 +1,34 @@
+#requires popt
+#requires nss-softokn
+#requires nss
+#requires file
+#requires libarchive
+#requires libdb4
+#requires redhat-rpm-config
+#requires lua
+#requires autoconf
+#requires pkgconfig
+
+
+(cd $SRC/rpm-*/ && autoreconf -vif)
+
+mcd $BUILDDIR/rpm
+
+$SRC/rpm-*/configure $TCONFIGARGS \
+	--build=${TARGET} \
+	--host=${TARGET} \
+	--target=${TARGET} \
+	CPPFLAGS="-I/usr/include/nspr -I/usr/include/nss3 -DPACKAGE -DPACKAGE_VERSION" \
+	--libdir=/usr/lib${SUFFIX} \
+	--with-external-db \
+	--disable-static \
+	--with-lua \
+	--localstatedir=/var
+
+make $J
+make $J install
+
+mkdir -p /etc/rpm
+mkdir -p /var/lib/rpm
+
+rpm --initdb

desktop-file.prov

@@ -1,21 +0,0 @@
-#!/bin/sh
-#
-# Transform desktop mimetype info into RPM mimehandler(type) provides
-#
-# Author: Richard Hughes <richard@hughsie.com>
-# Based on other provides scripts from RPM
-
-OLD_IFS="$IFS"
-while read instfile ; do
-	case "$instfile" in
-	*.desktop)
-		mime=`cat $instfile | grep MimeType= | cut -d'=' -f2`
-                IFS=';'
-		for type in $mime ; do
-		        echo 'mimehandler('$type')'
-	        done
-		;;
-	esac
-done
-IFS=$OLD_IFS
-

fontconfig.prov

@@ -1,21 +0,0 @@
-#!/bin/bash
-#
-# Script to install in:
-# /usr/lib/rpm/redhat/find-provides.d
-#
-# Transform font files into RPM provides
-# Requires fontconfig >= 2.6.90
-#
-# Author: Behdad Esfahbod <behdad@redhat.com>
-# Based on other provides scripts from RPM
-#
-
-fcquery=/usr/bin/fc-query
-
-[ -x $fcquery ] || exit 0
-
-# filter out anything outside main fontconfig path
-grep /usr/share/fonts/ |
-while read fn; do
-    $fcquery --format '%{=pkgkit}' "${fn}" 2> /dev/null
-done

import.log

@@ -1 +0,0 @@
-rpm-4_5_90-0_git8444_1:HEAD:rpm-4.5.90-0.git8444.1.src.rpm:1217601763

rpm-4.12.0-rpm2cpio-hack.patch

@@ -0,0 +1,18 @@
+diff --git a/rpm2cpio.c b/rpm2cpio.c
+index 89ebdfa..ae999ff 100644
+--- a/rpm2cpio.c
++++ b/rpm2cpio.c
+@@ -84,7 +84,12 @@ int main(int argc, char *argv[])
+ 	exit(EXIT_FAILURE);
+     }
+ 
+-    rc = (ufdCopy(gzdi, fdo) == payload_size) ? EXIT_SUCCESS : EXIT_FAILURE;
++    /*
++     * XXX HACK for #1142949: should be equality test, but archive size
++     * short by cpio trailer size in packages built with rpm 4.12.0
++     * and its pre-releases.
++     */
++    rc = (ufdCopy(gzdi, fdo) >= payload_size) ? EXIT_SUCCESS : EXIT_FAILURE;
+ 
+     Fclose(fdo);
+ 

rpm-4.15.x-ldflags.patch

@@ -0,0 +1,15 @@
+diff -up rpm-4.9.1.1/macros.in.jx rpm-4.9.1.1/macros.in
+--- rpm-4.9.1.1/macros.in.jx	2011-08-03 16:19:05.000000000 -0400
++++ rpm-4.9.1.1/macros.in	2011-08-08 09:41:52.981064316 -0400
+@@ -674,9 +674,10 @@ print (t)\
+   RPM_BUILD_DIR=\"%{u2p:%{_builddir}}\"\
+   RPM_OPT_FLAGS=\"%{optflags}\"\
++  RPM_LD_FLAGS=\"%{?build_ldflags}\"\
+   RPM_ARCH=\"%{_arch}\"\
+   RPM_OS=\"%{_os}\"\
+   RPM_BUILD_NCPUS=\"%{_smp_build_ncpus}\"\
+-  export RPM_SOURCE_DIR RPM_BUILD_DIR RPM_OPT_FLAGS RPM_ARCH RPM_OS RPM_BUILD_NCPUS\
++  export RPM_SOURCE_DIR RPM_BUILD_DIR RPM_OPT_FLAGS RPM_LD_FLAGS RPM_ARCH RPM_OS RPM_BUILD_NCPUS RPM_LD_FLAGS\
+   RPM_DOC_DIR=\"%{_docdir}\"\
+   export RPM_DOC_DIR\
+   RPM_PACKAGE_NAME=\"%{NAME}\"\

rpm-4.15.x-siteconfig.patch

@@ -0,0 +1,12 @@
+diff -up rpm-4.11.1-rc1/macros.in.siteconfig rpm-4.11.1-rc1/macros.in
+--- rpm-4.11.1-rc1/macros.in.siteconfig	2013-06-07 13:19:21.000000000 +0300
++++ rpm-4.11.1-rc1/macros.in	2013-06-11 15:06:59.525747503 +0300
+@@ -647,6 +647,8 @@ package or when debugging this package.\
+   export CLASSPATH}\
+   PKG_CONFIG_PATH=\"${PKG_CONFIG_PATH}:%{_libdir}/pkgconfig:%{_datadir}/pkgconfig\"\
+   export PKG_CONFIG_PATH\
++  CONFIG_SITE=${CONFIG_SITE:-NONE}\
++  export CONFIG_SITE\
+   \
+   %{verbose:set -x}\
+   umask 022\

rpm-4.5.90-gstreamer-provides.patch

@@ -1,16 +0,0 @@
-diff --git a/build/rpmfc.c b/build/rpmfc.c
-index 94fb68e..525915b 100644
---- a/build/rpmfc.c
-+++ b/build/rpmfc.c
-@@ -1093,6 +1093,11 @@ assert(s != NULL);
- 	free(buf);
-     }
- 
-+    /* Add possible GStreamer provides */
-+    if (!fc->skipProv && isDSO) {
-+	xx = rpmfcHelper(fc, 'P', "gstreamer");
-+    }
-+
- exit:
-     soname = _free(soname);
-     if (elf) (void) elf_end(elf);

rpm-4.5.90-pkgconfig-path.patch

@@ -1,13 +0,0 @@
-diff --git a/macros.in b/macros.in
-index 830072a..bdce7f4 100644
---- a/macros.in
-+++ b/macros.in
-@@ -805,6 +805,8 @@ print (t)\
-   export RPM_BUILD_ROOT}\
-   %{?_javaclasspath:CLASSPATH=\"%{_javaclasspath}\"\
-   export CLASSPATH}\
-+  PKG_CONFIG_PATH=\"%{_libdir}/pkgconfig:%{_datadir}/pkgconfig\"\
-+  export PKG_CONFIG_PATH\
-   \
-   %{verbose:set -x}%{!verbose:exec > /dev/null}\
-   umask 022\

rpm-4.6.0-fedora-specspo.patch

@@ -1,96 +0,0 @@
-diff --git a/lib/tagexts.c b/lib/tagexts.c
-index 501d8ac..cf71639 100644
---- a/lib/tagexts.c
-+++ b/lib/tagexts.c
-@@ -460,12 +460,6 @@ static int filerequireTag(Header h, rpmtd td)
- }
- 
- /* I18N look aside diversions */
--
--#if defined(ENABLE_NLS)
--extern int _nl_msg_cat_cntr;	/* XXX GNU gettext voodoo */
--#endif
--static const char * const language = "LANGUAGE";
--
- static const char * const _macro_i18ndomains = "%{?_i18ndomains}";
- 
- /**
-@@ -477,63 +471,27 @@ static const char * const _macro_i18ndomains = "%{?_i18ndomains}";
-  */
- static int i18nTag(Header h, rpmTag tag, rpmtd td)
- {
--    char * dstring = rpmExpand(_macro_i18ndomains, NULL);
--    int rc;
-+    int rc = headerGet(h, tag, td, HEADERGET_ALLOC);
-+    if (rc) {
-+    	char *de, *dstring = rpmExpand(_macro_i18ndomains, NULL);
-+	const char *domain;
- 
--    td->type = RPM_STRING_TYPE;
--    td->data = NULL;
--    td->count = 0;
--
--    if (dstring && *dstring) {
--	char *domain, *de;
--	const char * langval;
--	char * msgkey;
--	const char * msgid;
--	const char * n;
--	int xx;
--
--	xx = headerNVR(h, &n, NULL, NULL);
--	rasprintf(&msgkey, "%s(%s)", n, rpmTagGetName(tag));
--
--	/* change to en_US for msgkey -> msgid resolution */
--	langval = getenv(language);
--	(void) setenv(language, "en_US", 1);
--#if defined(ENABLE_NLS)
--        ++_nl_msg_cat_cntr;
--#endif
--
--	msgid = NULL;
- 	for (domain = dstring; domain != NULL; domain = de) {
-+	    const char *msgid = td->data;
-+	    const char *msg = NULL;
-+
- 	    de = strchr(domain, ':');
- 	    if (de) *de++ = '\0';
--	    msgid = dgettext(domain, msgkey);
--	    if (msgid != msgkey) break;
--	}
--
--	/* restore previous environment for msgid -> msgstr resolution */
--	if (langval)
--	    (void) setenv(language, langval, 1);
--	else
--	    unsetenv(language);
--#if defined(ENABLE_NLS)
--        ++_nl_msg_cat_cntr;
--#endif
--
--	if (domain && msgid) {
--	    td->data = dgettext(domain, msgid);
--	    td->data = xstrdup(td->data); /* XXX xstrdup has side effects. */
--	    td->count = 1;
--	    td->flags = RPMTD_ALLOCED;
-+	    msg = dgettext(domain, td->data);
-+	    if (msg != msgid) {
-+		free(td->data);
-+		td->data = xstrdup(msg);
-+		break;
-+	    }
- 	}
--	dstring = _free(dstring);
--	free(msgkey);
--	if (td->data)
--	    return 1;
-+	free(dstring);
-     }
--
--    dstring = _free(dstring);
--
--    rc = headerGet(h, tag, td, HEADERGET_DEFAULT);
-+	
-     return rc;
- }
- 

rpm-4.6.0-niagara.patch

@@ -1,61 +0,0 @@
-diff -rNu rpm-4.6.0-orig/lib/rpmrc.c rpm-4.6.0/lib/rpmrc.c
---- rpm-4.6.0-orig/lib/rpmrc.c	2009-03-09 21:54:49.000000000 -0500
-+++ rpm-4.6.0/lib/rpmrc.c	2009-03-11 12:00:44.000000000 -0500
-@@ -763,6 +763,31 @@
-     return rc;
- }
- 
-+#if defined(__linux__) && defined(__sparc__)
-+static int is_sun4v()
-+{
-+	char buffer[4096], *p;
-+	int fd = open("/proc/cpuinfo", O_RDONLY);
-+	if (read(fd, &buffer, sizeof(buffer) - 1) == -1) {
-+		rpmlog(RPMLOG_WARNING, _("read(/proc/cpuinfo) failed\n"));
-+		close(fd);
-+		return 0;
-+	}
-+	close(fd);
-+
-+	p = strstr(buffer, "type");
-+	p = strtok(p, "\n");
-+	p = strstr(p, "sun");
-+	if (p == NULL) {
-+		rpmlog(RPMLOG_WARNING, _("/proc/cpuinfo has no 'type' line\n"));
-+		return 0;
-+	} else if (strcmp(p, "sun4v") == 0) {
-+		return 1;
-+	}
-+	return 0;
-+}
-+#endif
-+
- 
- #	if defined(__linux__) && defined(__i386__)
- #include <setjmp.h>
-@@ -1179,6 +1204,13 @@
- 		personality(oldpers);
- 	    }
- 	}
-+	if (is_sun4v()){
-+	    if (strcmp(un.machine, "sparcv9") == 0 || strcmp(un.machine, "sparc") == 0 ) {
-+	        strcpy(un.machine, "sparcv9v");
-+	    } else if (strcmp(un.machine, "sparc64") == 0 ) {
-+	        strcpy(un.machine, "sparc64v");
-+	    }
-+	}
- #	endif	/* sparc*-linux */
- 
- #	if defined(__GNUC__) && defined(__alpha__)
-diff -rNu rpm-4.6.0-orig/rpmrc.in rpm-4.6.0/rpmrc.in
---- rpm-4.6.0-orig/rpmrc.in	2009-03-09 21:54:49.000000000 -0500
-+++ rpm-4.6.0/rpmrc.in	2009-03-11 11:50:49.000000000 -0500
-@@ -312,7 +312,7 @@
- arch_compat: sun4d: sparc
- arch_compat: sun4m: sparc
- arch_compat: sun4u: sparc64
--arch_compat: sparc64v: sparc64
-+arch_compat: sparc64v: sparc64 sparcv9v
- arch_compat: sparc64: sparcv9
- arch_compat: sparcv9v: sparcv9
- arch_compat: sparcv9: sparcv8

rpm-4.7.0-devel-autodep.patch

@@ -1,157 +0,0 @@
-diff -up rpm-4.7.0.git9101/build/rpmfc.c.devel-autodep rpm-4.7.0.git9101/build/rpmfc.c
---- rpm-4.7.0.git9101/build/rpmfc.c.devel-autodep	2009-04-03 09:26:59.000000000 +0300
-+++ rpm-4.7.0.git9101/build/rpmfc.c	2009-04-03 11:34:44.000000000 +0300
-@@ -505,7 +505,7 @@ static const struct rpmfcTokens_s const 
-   { "ASCII text",		RPMFC_WHITE|RPMFC_INCLUDE },
-   { "ISO-8859 text",		RPMFC_WHITE|RPMFC_INCLUDE },
- 
--  { "symbolic link to",		RPMFC_SYMLINK },
-+  { "symbolic link to",		RPMFC_SYMLINK|RPMFC_INCLUDE },
-   { "socket",			RPMFC_DEVICE },
-   { "special",			RPMFC_DEVICE },
-   { " text",			RPMFC_TEXT },
-@@ -667,6 +667,105 @@ rpmds rpmfcRequires(rpmfc fc)
- 
- 
- /**
-+ * Ensure that symlinks for shared libs generate a dep on the shared lib
-+ * @param fc            file classifier
-+ * @return              0 on success
-+ */
-+static int rpmfcSYMLINK(rpmfc fc)
-+{
-+    const char * fn = fc->fn[fc->ix];
-+    struct stat sb;
-+    int fdno;
-+
-+    if (fc->skipReq) 
-+	return 0;
-+
-+    if (stat(fn, &sb) < 0)
-+	return -1;
-+    if (S_ISLNK(sb.st_mode))
-+        return -1;
-+    
-+    fdno = open(fn, O_RDONLY);
-+    if (fdno < 0) {
-+	return fdno;
-+    }
-+
-+#if HAVE_GELF_H && HAVE_LIBELF
-+    Elf * elf = NULL;
-+    GElf_Ehdr ehdr_mem, * ehdr;
-+    int isElf64 = 0;
-+    int i, cnt;
-+    char * soname = NULL;
-+    rpmds ds;
-+
-+    (void) elf_version(EV_CURRENT);
-+    elf = NULL;
-+    if ((elf = elf_begin (fdno, ELF_C_READ_MMAP, NULL)) == NULL
-+        || elf_kind(elf) != ELF_K_ELF
-+        || (ehdr = gelf_getehdr(elf, &ehdr_mem)) == NULL
-+        || ehdr->e_type != ET_DYN)
-+	goto exit;
-+
-+/* alpha uses /lib, not /lib64 so don't add (64bit) deps */
-+#if !defined(__alpha__)
-+    isElf64 = ehdr->e_ident[EI_CLASS] == ELFCLASS64;
-+#endif
-+
-+    for (i = 0; i < ehdr->e_phnum; ++i) {
-+	GElf_Phdr phdr_mem;
-+	GElf_Phdr *phdr = gelf_getphdr (elf, i, &phdr_mem);
-+	GElf_Shdr shdr_mem;
-+	Elf_Data * data = NULL;
-+	Elf_Scn * scn;
-+	GElf_Shdr *shdr;
-+
-+	if (phdr == NULL || phdr->p_type != PT_DYNAMIC)
-+	    continue;
-+
-+	scn = gelf_offscn(elf, phdr->p_offset);
-+	shdr = gelf_getshdr(scn, &shdr_mem);
-+
-+	if (shdr != NULL && shdr->sh_type == SHT_DYNAMIC)
-+	    data = elf_getdata (scn, NULL);
-+	if (data == NULL)
-+	    continue; 
-+	  
-+	for (cnt = 0; cnt < shdr->sh_size / shdr->sh_entsize; ++cnt) {
-+	    GElf_Dyn dynmem;
-+	    GElf_Dyn *dyn = gelf_getdyn (data, cnt, &dynmem);
-+	    char *depname = NULL;
-+
-+	    if (dyn == NULL)
-+		break;
-+	    if (dyn->d_tag != DT_SONAME)
-+		continue;
-+
-+	    /* add the soname to package deps */
-+	    soname = elf_strptr(elf, shdr->sh_link, dyn->d_un.d_val);
-+	    if (soname == NULL)
-+		break;
-+
-+	    rasprintf(&depname, "%s%s", soname, isElf64 ? "()(64bit)" : "");
-+	    /* Add to package dependencies. */
-+	    ds = rpmdsSingle(RPMTAG_REQUIRENAME, depname, "", 
-+			     RPMSENSE_FIND_REQUIRES);
-+	    free(depname);
-+
-+	    rpmdsMerge(&fc->requires, ds);
-+	    rpmfcAddFileDep(&fc->ddict, fc->ix, ds);
-+	    ds = rpmdsFree(ds);
-+	    break;
-+	}
-+    }
-+exit:
-+    if (elf) (void) elf_end(elf);
-+    close(fdno);
-+    return 0;
-+#endif
-+    return -1;
-+}
-+
-+/**
-  * Extract script dependencies.
-  * @param fc		file classifier
-  * @return		0 on success
-@@ -1097,6 +1196,7 @@ static const struct rpmfcApplyTbl_s cons
-     { rpmfcSCRIPT,	(RPMFC_SCRIPT|RPMFC_BOURNE|
- 			 RPMFC_PERL|RPMFC_PYTHON|RPMFC_MONO|
- 			 RPMFC_PKGCONFIG|RPMFC_LIBTOOL) },
-+    { rpmfcSYMLINK,	RPMFC_SYMLINK },
-     { NULL, 0 }
- };
- 
-@@ -1117,6 +1217,7 @@ rpmRC rpmfcApply(rpmfc fc)
-     int ix;
-     int i;
-     int xx;
-+    int skipping = 0;
- 
-     /* Generate package and per-file dependencies. */
-     for (fc->ix = 0; fc->fn[fc->ix] != NULL; fc->ix++) {
-@@ -1171,11 +1272,13 @@ rpmRC rpmfcApply(rpmfc fc)
- 	default:
- 	    break;
- 	case 'P':	
-+	    skipping = fc->skipProv;
- 	    ds = rpmdsSingle(RPMTAG_PROVIDENAME, N, EVR, Flags);
- 	    dix = rpmdsFind(fc->provides, ds);
- 	    ds = rpmdsFree(ds);
- 	    break;
- 	case 'R':
-+	    skipping = fc->skipReq;
- 	    ds = rpmdsSingle(RPMTAG_REQUIRENAME, N, EVR, Flags);
- 	    dix = rpmdsFind(fc->requires, ds);
- 	    ds = rpmdsFree(ds);
-@@ -1197,7 +1300,7 @@ assert(dix >= 0);
- 	    previx = ix;
- 	    xx = argiAdd(&fc->fddictx, ix, argiCount(fc->ddictx)-1);
- 	}
--	if (fc->fddictn && fc->fddictn->vals)
-+	if (fc->fddictn && fc->fddictn->vals && !skipping)
- 	    fc->fddictn->vals[ix]++;
-     }
- 

rpm-4.7.0-extra-provides.patch

@@ -1,73 +0,0 @@
-diff -up rpm-4.7.0-beta1/build/rpmfc.c.extra-prov rpm-4.7.0-beta1/build/rpmfc.c
---- rpm-4.7.0-beta1/build/rpmfc.c.extra-prov	2009-02-26 17:31:12.000000000 +0200
-+++ rpm-4.7.0-beta1/build/rpmfc.c	2009-02-26 17:31:55.000000000 +0200
-@@ -485,6 +485,7 @@ static const struct rpmfcTokens_s const 
-   { "RPM v4",			RPMFC_ARCHIVE|RPMFC_INCLUDE },
- 
-   { " image",			RPMFC_IMAGE|RPMFC_INCLUDE },
-+  { " font metrics",		RPMFC_WHITE|RPMFC_INCLUDE },
-   { " font",			RPMFC_FONT|RPMFC_INCLUDE },
-   { " Font",			RPMFC_FONT|RPMFC_INCLUDE },
- 
-@@ -1189,6 +1190,31 @@ exit:
- #endif
- }
- 
-+static int rpmfcMISC(rpmfc fc)
-+{
-+    struct stat st;
-+    int rc = -1;
-+    const char *what = NULL;
-+    const char * fn = fc->fn[fc->ix];
-+    /* this part is enumerated, compare equality not bit flags */
-+    int ftype = fc->fcolor->vals[fc->ix] & 0x000F0000;
-+
-+    if (ftype == RPMFC_FONT) {
-+	what = "fontconfig";
-+    } else if (ftype == RPMFC_TEXT && rpmFileHasSuffix(fn, ".desktop")) {
-+	what = "desktop";
-+    }
-+
-+    if (what == NULL || stat(fn, &st) < 0 || !S_ISREG(st.st_mode)) {
-+	goto exit;
-+    }
-+
-+    (void) rpmfcHelper(fc, 'P', what);
-+    rc = 0;
-+
-+exit:
-+    return rc;
-+}
- typedef const struct rpmfcApplyTbl_s {
-     int (*func) (rpmfc fc);
-     int colormask;
-@@ -1201,6 +1227,7 @@ static const struct rpmfcApplyTbl_s cons
-     { rpmfcSCRIPT,	(RPMFC_SCRIPT|RPMFC_BOURNE|
- 			 RPMFC_PERL|RPMFC_PYTHON|RPMFC_MONO|
- 			 RPMFC_PKGCONFIG|RPMFC_LIBTOOL) },
-+    { rpmfcMISC,	RPMFC_FONT|RPMFC_TEXT },
-     { rpmfcSYMLINK,	RPMFC_SYMLINK },
-     { NULL, 0 }
- };
-@@ -1320,7 +1347,7 @@ rpmRC rpmfcClassify(rpmfc fc, ARGV_t arg
-     size_t slen;
-     int fcolor;
-     int xx;
--    int msflags = MAGIC_CHECK;	/* XXX MAGIC_COMPRESS flag? */
-+    int msflags = MAGIC_CHECK | MAGIC_COMPRESS;
-     magic_t ms = NULL;
- 
-     if (fc == NULL || argv == NULL)
-diff -up rpm-4.7.0-beta1/macros.in.extra-prov rpm-4.7.0-beta1/macros.in
---- rpm-4.7.0-beta1/macros.in.extra-prov	2009-02-26 17:31:12.000000000 +0200
-+++ rpm-4.7.0-beta1/macros.in	2009-02-26 17:32:38.000000000 +0200
-@@ -494,6 +494,9 @@ print (t)\
- %__pkgconfig_provides   %{_rpmconfigdir}/pkgconfigdeps.sh --provides
- %__pkgconfig_requires   %{_rpmconfigdir}/pkgconfigdeps.sh --requires
- 
-+%__fontconfig_provides	%{_rpmconfigdir}/fontconfig.prov
-+%__desktop_provides     %{_rpmconfigdir}/desktop-file.prov
-+
- #==============================================================================
- # ---- Database configuration macros.
- #	Macros used to configure Berkley db parameters.

rpm-4.7.1-geode-i686.patch

@@ -0,0 +1,14 @@
+diff --git a/rpmrc.in b/rpmrc.in
+index 4a6cca9..d62ddaf 100644
+--- a/rpmrc.in
++++ b/rpmrc.in
+@@ -281,7 +281,7 @@ arch_compat: alphaev5: alpha
+ arch_compat: alpha: axp noarch
+ 
+ arch_compat: athlon: i686
+-arch_compat: geode: i586
++arch_compat: geode: i686
+ arch_compat: pentium4: pentium3
+ arch_compat: pentium3: i686
+ arch_compat: i686: i586
+

rpm-4.9.90-no-man-dirs.patch

@@ -0,0 +1,12 @@
+diff -up rpm-4.9.90.git11486/scripts/find-lang.sh.no-man-dirs rpm-4.9.90.git11486/scripts/find-lang.sh
+--- rpm-4.9.90.git11486/scripts/find-lang.sh.no-man-dirs	2012-03-07 11:31:10.000000000 +0200
++++ rpm-4.9.90.git11486/scripts/find-lang.sh	2012-03-07 15:11:57.465801075 +0200
+@@ -181,7 +181,7 @@ s:%lang(C) ::
+ find "$TOP_DIR" -type d|sed '
+ s:'"$TOP_DIR"'::
+ '"$ALL_NAME$MAN"'s:\(.*/man/\([^/_]\+\).*/man[a-z0-9]\+/\)::
+-'"$ALL_NAME$MAN"'s:\(.*/man/\([^/_]\+\).*/man[a-z0-9]\+$\):%lang(\2) \1*:
++'"$ALL_NAME$MAN"'s:\(.*/man/\([^/_]\+\).*/man[a-z0-9]\+$\):%lang(\2) \1/*:
+ s:^\([^%].*\)::
+ s:%lang(C) ::
+ /^$/d' >> $MO_NAME

rpmdb-rebuild.service

@@ -0,0 +1,19 @@
+[Unit]
+Description=RPM database rebuild
+ConditionPathExists=/var/lib/rpm/.rebuilddb
+
+# This should run before any daemons that may open the rpmdb
+DefaultDependencies=no
+After=sysinit.target
+Before=basic.target shutdown.target
+Conflicts=shutdown.target
+# In case /var is remote-mounted
+RequiresMountsFor=/var
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/rpmdb --rebuilddb
+ExecStartPost=rm -f /var/lib/rpm/.rebuilddb
+
+[Install]
+WantedBy=basic.target

sources

@@ -1 +1 @@
-321862428ef48d9d0bc36f7058b3b6c7  rpm-4.7.0-rc1.tar.bz2
+SHA512 (rpm-4.16.0-beta3.tar.bz2) = 20efa638a7fe85b1b4d3d42fb07172c20a1f3c62024a29e4184b67a2d52ff3f94a186f178e9a5bfee9bf6c826a1023995d970b5c0ddaffe8b61fd2c888b44032