.cvsignore

@@ -0,0 +1 @@
+rpm-4.0.3.tar.gz

.gitignore

@@ -1,42 +0,0 @@
-/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

@@ -1,95 +0,0 @@
-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

@@ -1,30 +0,0 @@
-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

@@ -0,0 +1,6 @@
+# Makefile for source rpm: rpm
+# $Id$
+NAME := rpm
+SPECFILE = $(firstword $(wildcard *.spec))
+
+include ../common/Makefile.common

STAGE2-rpm

@@ -1,34 +0,0 @@
-#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

rpm-4.12.0-rpm2cpio-hack.patch

@@ -1,18 +0,0 @@
-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

@@ -1,15 +0,0 @@
-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

@@ -1,12 +0,0 @@
-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.7.1-geode-i686.patch

@@ -1,14 +0,0 @@
-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

@@ -1,12 +0,0 @@
-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

@@ -1,19 +0,0 @@
-[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 @@
-SHA512 (rpm-4.16.0-beta3.tar.bz2) = 20efa638a7fe85b1b4d3d42fb07172c20a1f3c62024a29e4184b67a2d52ff3f94a186f178e9a5bfee9bf6c826a1023995d970b5c0ddaffe8b61fd2c888b44032
+c72d28e0f27877998bd486a520a1d483  rpm-4.0.3.tar.gz