i586: patch rpmrc to set as default x86 arch; debuginfo: patch macros to rename suffix to debug [release 4.14.2.1-9mamba;Sun Jul 21 2019]

2024-01-05 17:29:06 +01:00 · 2024-01-05 17:29:06 +01:00 · 042b296690
commit 042b296690
parent efaf974e98
68 changed files with 395 additions and 2497 deletions
--- a/README.md
+++ b/README.md
@ -1,5 +1,4 @@
 # rpm

-RPM is a powerful command line driven package management system capable of installing, uninstalling, verifying, querying, and updating software packages.
-Each software package consists of an archive of files along with information about the package like its version, a description, etc.
+The RPM Package Manager (RPM) is a powerful package management system capable of building computer software from source into easily distributable packages installing, updating and uninstalling packaged software querying detailed information about the packaged software, whether installed or not verifying integrity of packaged software and resulting software installation.

--- a/rpm-4.14.2.1-add-usrlibrpm-macro.patch
+++ b/rpm-4.14.2.1-add-usrlibrpm-macro.patch
@ -0,0 +1,10 @@
+--- rpm-4.14.2.1/macros.in.orig	2019-07-21 12:35:35.108744544 +0200
+++ rpm-4.14.2.1/macros.in	2019-07-21 12:35:51.654818512 +0200
+@@ -17,6 +17,7 @@
+ #
+ %_usr			@prefix@
+ %_usrsrc		%{_usr}/src
+%_usrlibrpm		%{_usr}/lib/rpm
+ %_var			@localstatedir@
+ 
+ #==============================================================================
--- a/rpm-4.14.2.1-arm-openmamba-arch-support.patch
+++ b/rpm-4.14.2.1-arm-openmamba-arch-support.patch
@ -0,0 +1,47 @@
+--- rpm-4.14.2.1/rpmrc.in.orig	2019-07-14 20:06:54.441795887 +0200
+++ rpm-4.14.2.1/rpmrc.in	2019-07-14 20:24:51.384981318 +0200
+@@ -206,15 +206,16 @@
+ arch_canon:	mips64:		mips64		11
+ arch_canon:	mips64el:	mips64el	11
+ 
+-arch_canon:	armv3l: armv3l	12
+-arch_canon:     armv4b:	armv4b 	12
+-arch_canon:     armv4l:	armv4l 	12
+-arch_canon:     armv5tl: armv5tl 	12
+-arch_canon:     armv5tel: armv5tel 	12
+-arch_canon:     armv5tejl: armv5tejl 	12
+-arch_canon:     armv6l: armv6l 	12
+arch_canon:	arm: arm	12
+arch_canon:	armv3l: arm	12
+arch_canon:     armv4b:	arm 	12
+arch_canon:     armv4l:	arm 	12
+arch_canon:     armv5tl: arm 	12
+arch_canon:     armv5tel: arm 	12
+arch_canon:     armv5tejl: arm 	12
+arch_canon:     armv6l: arm 	12
+ arch_canon:     armv6hl: armv6hl 	12
+-arch_canon:     armv7l: armv7l 	12
+arch_canon:     armv7l: arm 	12
+ arch_canon:     armv7hl: armv7hl 	12
+ arch_canon:     armv7hnl: armv7hnl 	12
+ 
+@@ -456,7 +457,8 @@
+ arch_compat: armv5tl: armv4tl
+ arch_compat: armv4tl: armv4l
+ arch_compat: armv4l: armv3l
+-arch_compat: armv3l: noarch
+arch_compat: armv3l: arm
+arch_compat: arm: noarch
+ arch_compat: armv7hnl: armv7hl
+ arch_compat: armv7hl: armv6hl
+ arch_compat: armv6hl: noarch
+@@ -585,7 +587,8 @@
+ buildarch_compat: armv5tl: armv4tl
+ buildarch_compat: armv4tl: armv4l
+ buildarch_compat: armv4l: armv3l
+-buildarch_compat: armv3l: noarch
+buildarch_compat: armv3l: arm
+buildarch_compat: arm: noarch
+ 
+ buildarch_compat: armv7hnl: armv7hl
+ buildarch_compat: armv7hl: armv6hl
--- a/rpm-4.14.2.1-debuginfo-rename-to-debug.patch
+++ b/rpm-4.14.2.1-debuginfo-rename-to-debug.patch
@ -0,0 +1,22 @@
+--- rpm-4.14.2.1/macros.in.orig	2019-07-21 11:59:51.154162221 +0200
+++ rpm-4.14.2.1/macros.in	2019-07-21 12:00:20.427292643 +0200
+@@ -194,16 +194,16 @@
+ 
+ #	Template for debug information sub-package.
+ %_debuginfo_template \
+-%package debuginfo\
+%package debug\
+ Summary: Debug information for package %{name}\
+ Group: Development/Debug\
+ AutoReq: 0\
+ AutoProv: 1\
+-%description debuginfo\
+%description debug\
+ This package provides debug information for package %{name}.\
+ Debug information is useful when developing applications that use this\
+ package or when debugging this package.\
+-%files debuginfo -f debugfiles.list\
+%files debug -f debugfiles.list\
+ %{nil}
+ 
+ %_debugsource_template \
--- a/rpm-4.14.2.1-fix-missing-translations-from-rpm4-segfault.patch
+++ b/rpm-4.14.2.1-fix-missing-translations-from-rpm4-segfault.patch
@ -0,0 +1,12 @@
+--- rpm-4.14.2.1.patched/lib/transaction.c	2018-10-22 11:22:25.071540970 +0200
+++ rpm-4.14.2.1/lib/transaction.c	2019-06-29 11:46:44.911485941 +0200
+@@ -1152,7 +1152,8 @@
+ 		    break;
+ 		case TR_REMOVED:
+ 		    if (!beingRemoved) {
+-			if (*rpmtdGetChar(&ostates) == RPMFILE_STATE_NORMAL)
+		        char *state = rpmtdGetChar(&ostates);
+			if (state && *state == RPMFILE_STATE_NORMAL)
+ 			    rpmfsSetAction(fs, recs[j].fileno, FA_SKIP);
+ 		    }
+ 		    break;
--- a/rpm-4.14.2.1-fix-rebuilddb-from-rpm-5.2-better.patch
+++ b/rpm-4.14.2.1-fix-rebuilddb-from-rpm-5.2-better.patch
@ -0,0 +1,24 @@
+diff -ru rpm-4.14.2.1.orig/lib/header.c rpm-4.14.2.1/lib/header.c
+--- rpm-4.14.2.1.orig/lib/header.c	2018-09-13 14:52:36.935273631 +0200
+++ rpm-4.14.2.1/lib/header.c	2019-06-24 12:49:12.167065383 +0200
+@@ -279,6 +279,8 @@
+ 
+     for (i = 0; i < il; i++) {
+ 	ei2h(&pe[i], &info);
+	if (info.tag == RPMTAG_FILESTATES && info.type == RPM_INT8_TYPE)
+	    info.type = RPM_CHAR_TYPE;
+ 
+ 	/* Previous data must not overlap */
+ 	if (end > info.offset)
+diff -ru rpm-4.14.2.1.orig/lib/rpmtd.c rpm-4.14.2.1/lib/rpmtd.c
+--- rpm-4.14.2.1.orig/lib/rpmtd.c	2018-09-13 14:52:02.227221535 +0200
+++ rpm-4.14.2.1/lib/rpmtd.c	2019-06-22 17:24:56.186779146 +0200
+@@ -151,7 +151,7 @@
+ {
+     char *res = NULL;
+ 
+-    if (td != NULL && td->type == RPM_CHAR_TYPE) {
+    if (td != NULL && (td->type == RPM_CHAR_TYPE || td->type == RPM_INT8_TYPE)) {
+ 	int ix = (td->ix >= 0 ? td->ix : 0);
+ 	res = (char *) td->data + ix;
+     } 
--- a/rpm-4.14.2.1-fix-rebuilddb-from-rpm-5.2.patch
+++ b/rpm-4.14.2.1-fix-rebuilddb-from-rpm-5.2.patch
@ -0,0 +1,24 @@
+diff -Nru rpm-4.14.2.1.orig/lib/rpmtd.c rpm-4.14.2.1/lib/rpmtd.c
+--- rpm-4.14.2.1.orig/lib/rpmtd.c	2018-09-13 14:52:02.227221535 +0200
+++ rpm-4.14.2.1/lib/rpmtd.c	2019-06-22 15:00:23.436132478 +0200
+@@ -151,7 +151,7 @@
+ {
+     char *res = NULL;
+ 
+-    if (td != NULL && td->type == RPM_CHAR_TYPE) {
+    if (td != NULL && (td->type == RPM_CHAR_TYPE || td->type == RPM_INT8_TYPE)) {
+ 	int ix = (td->ix >= 0 ? td->ix : 0);
+ 	res = (char *) td->data + ix;
+     } 
+diff -Nru rpm-4.14.2.1.orig/lib/tagtbl.C rpm-4.14.2.1/lib/tagtbl.C
+--- rpm-4.14.2.1.orig/lib/tagtbl.C	2018-10-18 12:14:57.563260243 +0200
+++ rpm-4.14.2.1/lib/tagtbl.C	2019-06-22 14:59:38.773819098 +0200
+@@ -65,7 +65,7 @@
+     { "RPMTAG_FILESIGNATURELENGTH", "Filesignaturelength", RPMTAG_FILESIGNATURELENGTH, RPM_INT32_TYPE, RPM_SCALAR_RETURN_TYPE, 0 },
+     { "RPMTAG_FILESIGNATURES", "Filesignatures", RPMTAG_FILESIGNATURES, RPM_STRING_ARRAY_TYPE, RPM_ARRAY_RETURN_TYPE, 0 },
+     { "RPMTAG_FILESIZES", "Filesizes", RPMTAG_FILESIZES, RPM_INT32_TYPE, RPM_ARRAY_RETURN_TYPE, 0 },
+-    { "RPMTAG_FILESTATES", "Filestates", RPMTAG_FILESTATES, RPM_CHAR_TYPE, RPM_ARRAY_RETURN_TYPE, 0 },
+    { "RPMTAG_FILESTATES", "Filestates", RPMTAG_FILESTATES, RPM_INT8_TYPE, RPM_ARRAY_RETURN_TYPE, 0 },
+     { "RPMTAG_FILETRIGGERCONDS", "Filetriggerconds", RPMTAG_FILETRIGGERCONDS, RPM_STRING_ARRAY_TYPE, RPM_ARRAY_RETURN_TYPE, 1 },
+     { "RPMTAG_FILETRIGGERFLAGS", "Filetriggerflags", RPMTAG_FILETRIGGERFLAGS, RPM_INT32_TYPE, RPM_ARRAY_RETURN_TYPE, 0 },
+     { "RPMTAG_FILETRIGGERINDEX", "Filetriggerindex", RPMTAG_FILETRIGGERINDEX, RPM_INT32_TYPE, RPM_ARRAY_RETURN_TYPE, 0 },
--- a/rpm-4.14.2.1-i586-openmamba-arch-support.patch
+++ b/rpm-4.14.2.1-i586-openmamba-arch-support.patch
@ -0,0 +1,50 @@
+--- rpm-4.14.2.1/rpmrc.in.orig	2019-07-21 11:57:22.529500064 +0200
+++ rpm-4.14.2.1/rpmrc.in	2019-07-21 11:57:32.924546376 +0200
+@@ -1,4 +1,4 @@
+-#/*! \page config_rpmrc Default configuration: @RPMCONFIGDIR@/rpmrc
+#/*! \page config_rpmrc Default configuration: /usr/lib/rpm/rpmrc
+ # \verbatim
+ #
+ # This is a global RPM configuration file. All changes made here will
+@@ -106,7 +106,7 @@
+ # Architecture colors
+ 
+ archcolor: noarch 0
+-archcolor: i386 1
+archcolor: i586 1
+ archcolor: alpha 2
+ archcolor: sparc 1
+ archcolor: sparc64 2
+@@ -288,19 +288,19 @@
+ #############################################################
+ # For a given uname().machine, the default build arch
+ 
+-buildarchtranslate: osfmach3_i686: i386
+-buildarchtranslate: osfmach3_i586: i386
+-buildarchtranslate: osfmach3_i486: i386
+-buildarchtranslate: osfmach3_i386: i386
+-
+-buildarchtranslate: athlon: i386
+-buildarchtranslate: geode: i386
+-buildarchtranslate: pentium4: i386
+-buildarchtranslate: pentium3: i386
+-buildarchtranslate: i686: i386
+-buildarchtranslate: i586: i386
+-buildarchtranslate: i486: i386
+-buildarchtranslate: i386: i386
+buildarchtranslate: osfmach3_i686: i586
+buildarchtranslate: osfmach3_i586: i586
+buildarchtranslate: osfmach3_i486: i586
+buildarchtranslate: osfmach3_i386: i586
+
+buildarchtranslate: athlon: i586
+buildarchtranslate: geode: i586
+buildarchtranslate: pentium4: i586
+buildarchtranslate: pentium3: i586
+buildarchtranslate: i686: i586
+buildarchtranslate: i586: i586
+buildarchtranslate: i486: i586
+buildarchtranslate: i386: i586
+ 
+ buildarchtranslate: alphaev5: alpha
+ buildarchtranslate: alphaev56: alpha
--- a/rpm-4.4.4-bashort.patch
+++ b/rpm-4.4.4-bashort.patch
@ -1,11 +0,0 @@
-diff -ru rpm-4.4.4/rpmqv.c rpm-4.4.4-qilinux/rpmqv.c
--- rpm-4.4.4/rpmqv.c	2005-11-27 17:06:24.000000000 +0100
-+++ rpm-4.4.4-qilinux/rpmqv.c	2006-01-04 15:53:44.000000000 +0100
-@@ -693,6 +693,7 @@
- 	case 'b':
- 	    ba->buildAmount |= RPMBUILD_PACKAGEBINARY;
- 	    ba->buildAmount |= RPMBUILD_CLEAN;
-+	    if (ba->shortCircuit) break;
- 	    /*@fallthrough@*/
- 	case 'i':
- 	    ba->buildAmount |= RPMBUILD_INSTALL;
--- a/rpm-4.4.4-configsub_ppc.patch
+++ b/rpm-4.4.4-configsub_ppc.patch
@ -1,12 +0,0 @@
--- rpm-4.4.4/config.sub	2005-09-29 23:51:10.000000000 +0200
-+++ rpm-4.4.4-qilinux/config.sub	2006-01-17 11:01:54.000000000 +0100
-@@ -798,7 +798,8 @@
- 		;;
- 	ppc)	basic_machine=powerpc-unknown
- 		;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-+	ppc-* | powerpc-*)
-+		basic_machine=ppc-`echo $basic_machine | sed 's/^[^-]*-//'`
- 		;;
- 	ppcle | powerpclittle | ppc-le | powerpc-little)
- 		basic_machine=powerpcle-unknown
--- a/rpm-4.4.4-depsdb.patch
+++ b/rpm-4.4.4-depsdb.patch
@ -1,25 +0,0 @@
-Index: rpmdb/sqlite.c
-===================================================================
-RCS file: /cvs/devel/rpm/rpmdb/sqlite.c,v
-retrieving revision 1.3.2.33
-diff -u -b -B -w -p -r1.3.2.33 sqlite.c
--- rpmdb/sqlite.c	9 Nov 2005 18:08:31 -0000	1.3.2.33
-+++ rpmdb/sqlite.c	17 Jan 2006 17:53:18 -0000
-@@ -726,13 +726,15 @@ static int sql_initDB(dbiIndex dbi)
- 	}
- if (_debug)
- fprintf(stderr, "\t%s(%d) type(%d) keytype %s\n", tagName(dbi->dbi_rpmtag), dbi->dbi_rpmtag, tagType(dbi->dbi_rpmtag), keytype);
-	sprintf(cmd, "CREATE TABLE '%s' (key %s, value %s)",
-+	sprintf(cmd, "CREATE %sTABLE '%s' (key %s, value %s)",
-+            dbi->dbi_rpmtag == RPMDBI_DEPENDS ? "TEMPORARY " : " ",
- 			dbi->dbi_subfile, keytype, valtype);
- 	rc = sqlite3_exec(sqldb->db, cmd, NULL, NULL, (char **)&scp->pzErrmsg);
- 	if (rc)
- 	    goto exit;
- 
-	sprintf(cmd, "CREATE TABLE 'db_info' (endian TEXT)");
-+	sprintf(cmd, "CREATE %sTABLE 'db_info' (endian TEXT)",
-+            dbi->dbi_rpmtag == RPMDBI_DEPENDS ? "TEMPORARY " : " ");
- 	rc = sqlite3_exec(sqldb->db, cmd, NULL, NULL, (char **)&scp->pzErrmsg);
- 	if (rc)
- 	    goto exit;
--- a/rpm-4.4.4-kernel26-autoreq.patch
+++ b/rpm-4.4.4-kernel26-autoreq.patch
@ -1,21 +0,0 @@
-diff -ru rpm-4.4.4/autodeps/linux.req rpm-4.4.4-qilinux/autodeps/linux.req
--- rpm-4.4.4/autodeps/linux.req	2002-11-14 13:53:11.000000000 +0100
-+++ rpm-4.4.4-qilinux/autodeps/linux.req	2006-01-05 11:46:03.000000000 +0100
-@@ -47,7 +47,7 @@
-     lib64=`if file -L $f 2>/dev/null | \
- 	grep "ELF 64-bit" >/dev/null; then echo "$mark64"; fi`
-     ldd $f | awk '/=>/ {
-	if ($1 !~ /libNoVersion.so/ && $1 !~ /4[um]lib.so/ && $1 !~ /libredhat-kernel.so/) {
-+	if ($1 !~ /libNoVersion.so/ && $1 !~ /4[um]lib.so/ && $1 !~ /linux-gate.so/) {
- 	    gsub(/'\''"/,"\\&",$1);
- 	    printf "%s'$lib64'\n", $1
- 	}
-@@ -61,7 +61,7 @@
-     lib64=`if file -L $f 2>/dev/null | \
- 	grep "ELF 64-bit" >/dev/null; then echo "$mark64"; fi`
-     ldd $f | awk '/=>/ {
-	if ($1 !~ /libNoVersion.so/ && $1 !~ /4[um]lib.so/ && $1 !~ /libredhat-kernel.so/) {
-+	if ($1 !~ /libNoVersion.so/ && $1 !~ /4[um]lib.so/ && $1 !~ /linux-gate.so/) {
- 	    gsub(/'\''"/,"\\&",$1);
- 	    printf "%s'$lib64'\n", $1
- 	}
--- a/rpm-4.4.4-rpmvercmp.patch
+++ b/rpm-4.4.4-rpmvercmp.patch
@ -1,18 +0,0 @@
-diff -pur rpm-4.4.4/lib/rpmvercmp.c rpm-4.4.4-qilinux/lib/rpmvercmp.c
--- rpm-4.4.4/lib/rpmvercmp.c	2005-07-04 04:32:22.000000000 +0200
-+++ rpm-4.4.4-qilinux/lib/rpmvercmp.c	2006-01-04 16:04:28.000000000 +0100
-@@ -108,6 +108,14 @@ int rpmvercmp(const char * a, const char
- /*@-boundsread@*/
-     if ((!*one) && (!*two)) return 0;
- 
-+    /* take care of rc, alpha, and beta version numbers */
-+    while (*one && *one == '-') one++;
-+    if (!strncmp(one, "rc", 2) || !strncmp(one, "alpha", 5) || !strncmp(one, "beta", 4))
-+       return -1;
-+    while (*two && *two == '-') two++;
-+    if (!strncmp(two, "rc", 2) || !strncmp(two, "alpha", 5) || !strncmp(two, "beta", 4))
-+       return +1;
-+
-     /* whichever version still has characters left over wins */
-     if (!*one) return -1; else return 1;
- /*@=boundsread@*/
--- a/rpm-4.4.4-target_platform.patch
+++ b/rpm-4.4.4-target_platform.patch
@ -1,12 +0,0 @@
-diff -ru rpm-4.4.4/platform.in rpm-4.4.4-qilinux/platform.in
--- rpm-4.4.4/platform.in	2006-01-05 11:52:20.000000000 +0100
-+++ rpm-4.4.4-qilinux/platform.in	2006-01-05 11:54:35.000000000 +0100
-@@ -7,7 +7,7 @@
- %_vendor		@RPMCANONVENDOR@
- %_os			@RPMCANONOS@
- %_gnu			@RPMRC_GNU@
-%_target_platform	%{_target_cpu}-%{_vendor}-%{_target_os}
-+%_target_platform	%{_target_cpu}-%{_vendor}-%{_target_os}%{?_gnu}
- %optflags		@RPMRC_OPTFLAGS@
- 
- #==============================================================================
--- a/rpm-4.4.5-disable_repackaging.patch
+++ b/rpm-4.4.5-disable_repackaging.patch
@ -1,11 +0,0 @@
--- rpm-4.4.5/macros.in	2006-03-23 15:19:25.000000000 +0100
-+++ rpm-4.4.5/macros.in.norepackage	2006-04-05 11:59:43.000000000 +0200
-@@ -709,7 +709,7 @@
- %_repackage_root	%{nil}
- 
- #	If non-zero, all erasures will be automagically repackaged.
-%_repackage_all_erasures	1
-+%_repackage_all_erasures	0
- 
- #	Prevent pure erasure transactions with --rollback. Pure
- #	erasure rollback transactions will undo an anaconda install,
--- a/rpm-4.4.5-installplatform.patch
+++ b/rpm-4.4.5-installplatform.patch
@ -1,18 +0,0 @@
-diff -ur rpm-4.4.4/installplatform rpm-4.4.4-qilinux/installplatform
--- rpm-4.4.4/installplatform	2005-10-25 23:19:24.000000000 +0200
-+++ rpm-4.4.4-qilinux/installplatform	2006-01-04 16:11:55.000000000 +0100
-@@ -96,6 +96,14 @@
-   apple)
-     VENDORSED='-e s,^@apple@,,'
-     ;;
-+  qilinux)
-+    VENDORSED='-e s,^@qilinux@,,'
-+    RPMRC_OPTFLAGS="`echo $RPMRC_OPTFLAGS | sed -e "s/ -g/ /"`"
-+    ;;
-+  openmamba)
-+    VENDORSED='-e s,^@openmamba@,,'
-+    RPMRC_OPTFLAGS="`echo $RPMRC_OPTFLAGS | sed -e "s/ -g/ /"`"
-+    ;;
-   esac
- 
-   cat $PLATFORM \
--- a/rpm-4.4.5-nobuildrootpath_exitcode.patch
+++ b/rpm-4.4.5-nobuildrootpath_exitcode.patch
@ -1,8 +0,0 @@
--- rpm-4.4.5/scripts/brp-nobuildrootpath.orig	2006-04-13 08:48:45.000000000 +0200
-+++ rpm-4.4.5/scripts/brp-nobuildrootpath	2006-04-13 08:49:00.000000000 +0200
-@@ -15,3 +15,5 @@
- 	;;
-     esac
- done
-+
-+exit 0
--- a/rpm-4.4.5-py_requires_macro.patch
+++ b/rpm-4.4.5-py_requires_macro.patch
@ -1,11 +0,0 @@
--- rpm-4.4.5/macros.in.orig	2006-10-24 11:28:06.000000000 +0200
-+++ rpm-4.4.5/macros.in	2006-10-24 11:28:53.000000000 +0200
-@@ -1354,7 +1354,7 @@
- 
- %py_requires(d) \
- %define maxver %(%{__python} -c "import sys; a,b=sys.version_info[:2]; print '%%d.%%d'%%(a,b+1)" 2>/dev/null || echo PYTHON-NOT-FOUND) \
-BuildRequires: python %{-d:python-devel} \
-+BuildRequires: python, libpython-devel \
- PreReq: python >= %{python_version}, python < %{maxver}
- 
- #------------------------------------------------------------------------
--- a/rpm-4.4.6-no-dirnames-dep.patch
+++ b/rpm-4.4.6-no-dirnames-dep.patch
@ -1,49 +0,0 @@
--- ./lib/depends.c.no-dirname-dep	2007-02-28 23:19:55.821603774 +0100
-+++ ./lib/depends.c	2007-02-28 23:21:23.838251442 +0100
-@@ -53,6 +53,9 @@ const char *rpmEVR = VERSION;
- /*@unchecked@*/
- int rpmFLAGS = RPMSENSE_EQUAL;
- 
-+int no_dirname_deps = 1;
-+int no_symlink_deps = 1;
-+
- /**
-  * Compare removed package instances (qsort/bsearch).
-  * @param a		1st instance address
-@@ -951,6 +954,8 @@ static int checkPackageDeps(rpmts ts, co
- 	}
-     }
- 
-+    if (!no_dirname_deps) {
-+
-     dirnames = rpmdsInit(dirnames);
-     if (dirnames != NULL)
-     while (!ourrc && rpmdsNext(dirnames) >= 0) {
-@@ -992,7 +997,9 @@ static int checkPackageDeps(rpmts ts, co
- 	    /*@switchbreak@*/ break;
- 	}
-     }
-+    }
- 
-+    if (!no_symlink_deps) {
-     linktos = rpmdsInit(linktos);
-     if (linktos != NULL)
-     while (!ourrc && rpmdsNext(linktos) >= 0) {
-@@ -1010,6 +1017,7 @@ static int checkPackageDeps(rpmts ts, co
- 	dscolor = rpmdsColor(linktos);
- 	if (tscolor && dscolor && !(tscolor & dscolor))
- 	    continue;
-+    }
- 
- 	rc = unsatisfiedDepend(ts, linktos, adding);
- 
-@@ -2058,6 +2066,9 @@ int rpmtsCheck(rpmts ts)
-     int xx;
-     int rc;
- 
-+    no_dirname_deps = rpmExpandNumeric("%{?_check_dirnames_deps:0}%{?!_check_dirnames_deps:1}");
-+    no_symlink_deps = rpmExpandNumeric("%{?_check_symlink_deps:0}%{?!_check_symlink_deps:1}");
-+
-     (void) rpmswEnter(rpmtsOp(ts, RPMTS_OP_CHECK), 0);
- 
-     /* Do lazy, readonly, open of rpm database. */
--- a/rpm-4.4.7-makeoldinstall.patch
+++ b/rpm-4.4.7-makeoldinstall.patch
@ -1,11 +0,0 @@
--- rpm-4.4.7/macros.in	2007-12-25 11:44:50.000000000 +0100
-+++ rpm-4.4.7/macros.in.makeoldinstall	2007-12-25 11:45:36.000000000 +0100
-@@ -1148,7 +1148,7 @@
- 
- #------------------------------------------------------------------------------
- # The make install analogue of %configure:
-%makeinstall \
-+%makeoldinstall \
-   make \\\
- 	prefix=%{?buildroot:%{buildroot}}%{_prefix} \\\
- 	exec_prefix=%{?buildroot:%{buildroot}}%{_exec_prefix} \\\
--- a/rpm-4.4.7-neon-0.28.patch
+++ b/rpm-4.4.7-neon-0.28.patch
@ -1,61 +0,0 @@
-diff -Naur tmp-old/rpmio/rpmdav.c tmp-new/rpmio/rpmdav.c
--- rpmio/rpmdav.c	2008-03-28 04:40:52.000000000 +0000
-+++ rpmio/rpmdav.c	2008-03-28 05:19:50.000000000 +0000
-@@ -103,7 +103,7 @@
- }
- 
- static void davNotify(void * userdata,
-		ne_conn_status connstatus, const char * info)
-+		ne_session_status sessionstatus, const char * info)
- 	/*@*/
- {
-     urlinfo u = userdata;
-@@ -124,18 +124,20 @@
- 
- #ifdef	REFERENCE
- typedef enum {
-    ne_conn_namelookup, /* lookup up hostname (info = hostname) */
-    ne_conn_connecting, /* connecting to host (info = hostname) */
-    ne_conn_connected, /* connected to host (info = hostname) */
-    ne_conn_secure /* connection now secure (info = crypto level) */
-} ne_conn_status;
-+    ne_status_lookup = 0, /* looking up hostname */
-+    ne_status_connecting, /* connecting to host */
-+    ne_status_connected, /* connected to host */
-+    ne_status_sending, /* sending a request body */
-+    ne_status_recving, /* receiving a response body */
-+    ne_status_disconnected /* disconnected from host */
-+} ne_session_status;
- #endif
- 
-    u->connstatus = connstatus;
-+    u->sessionstatus = sessionstatus;
- 
- /*@-boundsread@*/
- if (_dav_debug < 0)
-fprintf(stderr, "*** davNotify(%p,%d,%p) sess %p u %p %s\n", userdata, connstatus, info, sess, u, connstates[ (connstatus < 4 ? connstatus : 4)]);
-+fprintf(stderr, "*** davNotify(%p,%d,%p) sess %p u %p %s\n", userdata, sessionstatus, info, sess, u, connstates[ (sessionstatus < 5 ? sessionstatus : 5)]);
- /*@=boundsread@*/
- 
- }
-@@ -350,7 +352,7 @@
- #endif
- 
- 	ne_set_progress(u->sess, davProgress, u);
-	ne_set_status(u->sess, davNotify, u);
-+	ne_set_notifier(u->sess, davNotify, u);
- 
- 	ne_set_persist(u->sess, 1);
- 	ne_set_read_timeout(u->sess, httpTimeoutSecs);
-diff -Naur tmp-old/rpmio/rpmurl.h tmp-new/rpmio/rpmurl.h
--- rpmio/rpmurl.h	2008-03-28 04:55:02.000000000 +0000
-+++ rpmio/rpmurl.h	2008-03-28 04:56:09.000000000 +0000
-@@ -60,7 +60,7 @@
-     void * sess;		/*!< neon: ne_session ptr */
-     off_t current;		/*!< neon: current body offset. */
-     off_t total;		/*!< neon: total body length. */
-    int connstatus;		/*!< neon: connection status. */
-+    int sessionstatus;		/*!< neon: session status. */
- #ifdef  REFERENCE
- typedef enum {
-     ne_conn_namelookup,	/* lookup up hostname (info = hostname) */
--- a/rpm-4.4.8-brp_generic.patch
+++ b/rpm-4.4.8-brp_generic.patch
@ -1,22 +0,0 @@
-Only in rpm-4.4.8/scripts: brp-infodir.brp_infodir
-diff -ru rpm-4.4.8.orig/scripts/brp-redhat.in rpm-4.4.8/scripts/brp-redhat.in
--- rpm-4.4.8.orig/scripts/brp-redhat.in	2007-02-03 19:43:28.000000000 +0100
-+++ rpm-4.4.8/scripts/brp-redhat.in	2008-01-16 12:46:12.000000000 +0100
-@@ -3,11 +3,17 @@
- # These are the build root policies that rpm invokes at the end
- # of the %install scriptlet.
- 
-+# Delete the /usr/share/info/dir files
-+@USRLIBRPM@/brp-infodir
-+
- # Compress man pages (usually with gzip)
- @USRLIBRPM@/brp-compress
- 
- # Strip ELF binaries (ussually with binutils).
- @USRLIBRPM@/brp-strip
- 
-+# Strip static libraries
-+@USRLIBRPM@/brp-strip-static-archive
-+
- # Strip even more sections (usually with binutils).
- @USRLIBRPM@/brp-strip-comment-note
--- a/rpm-4.4.8-disable_keyserver.patch
+++ b/rpm-4.4.8-disable_keyserver.patch
@ -1,14 +0,0 @@
-diff -Nru rpm-4.4.8.orig/macros.in rpm-4.4.8/macros.in
--- rpm-4.4.8.orig/macros.in	2008-01-16 12:53:55.000000000 +0100
-+++ rpm-4.4.8/macros.in	2008-01-16 12:55:59.000000000 +0100
-@@ -704,8 +704,8 @@
- 
- # Horowitz Key Protocol server configuration
- #
-%_hkp_keyserver         hkp://subkeys.pgp.net
-%_hkp_keyserver_query   %{_hkp_keyserver}/pks/lookup?op=get&search=0x
-+#%_hkp_keyserver         hkp://subkeys.pgp.net
-+#%_hkp_keyserver_query   %{_hkp_keyserver}/pks/lookup?op=get&search=0x
- 
- #==============================================================================
- # ---- Transaction macros.
--- a/rpm-4.4.8-disable_libtool_helper.patch
+++ b/rpm-4.4.8-disable_libtool_helper.patch
@ -1,14 +0,0 @@
-diff -Nru rpm-4.4.8.orig/macros.in rpm-4.4.8/macros.in
--- rpm-4.4.8.orig/macros.in	2008-01-16 12:51:29.000000000 +0100
-+++ rpm-4.4.8/macros.in	2008-01-16 12:53:00.000000000 +0100
-@@ -1398,8 +1398,8 @@
- #
- # Note: Used iff _use_internal_dependency_generator is non-zero. The
- # helpers are also used by %{_usrlibrpm}/rpmdeps {--provides|--requires}.
-%__libtool_provides	%{_usrlibrpm}/libtooldeps.sh --provides %{buildroot} %{name}
-%__libtool_requires	%{_usrlibrpm}/libtooldeps.sh --requires %{buildroot} %{name}
-+#%__libtool_provides	%{_usrlibrpm}/libtooldeps.sh --provides %{buildroot} %{name}
-+#%__libtool_requires	%{_usrlibrpm}/libtooldeps.sh --requires %{buildroot} %{name}
- 
- #------------------------------------------------------------------------
- # pkgconfig(...) configuration.
--- a/rpm-4.4.8-keep_default_rpmrc.patch
+++ b/rpm-4.4.8-keep_default_rpmrc.patch
@ -1,12 +0,0 @@
--- rpm-4.4.8.orig/lib/rpmrc.c  2008-01-16 13:01:11.000000000 +0100
-+++ rpm-4.4.8/lib/rpmrc.c       2008-01-16 13:09:31.000000000 +0100
-@@ -1891,6 +1891,9 @@
-        defaultsInitialized = 1;
-     }
-
-+    if (rcfiles == NULL)
-+       rcfiles = rpmRcfiles;
-+
-     /* Read each file in rcfiles. */
-     rc = 0;
-     if (rcfiles != NULL)
--- a/rpm-4.4.8-rpmtopdir.patch
+++ b/rpm-4.4.8-rpmtopdir.patch
@ -1,48 +0,0 @@
-diff -Nru rpm-4.4.8.orig/doc/manual/builddependencies rpm-4.4.8/doc/manual/builddependencies
--- rpm-4.4.8.orig/doc/manual/builddependencies	2005-10-25 23:03:33.000000000 +0200
-+++ rpm-4.4.8/doc/manual/builddependencies	2008-01-16 12:32:49.000000000 +0100
-@@ -29,7 +29,7 @@
- \verbatim
- 	rpm -U /mnt/rpm/comps/powertools/6.2/i386/InDependence-1.0-3.i386.rpm
- 	rpm -i /mnt/rpm/comps/dist/6.2/SRPMS/gnorpm-0.9-11.src.rpm
-	cd /usr/src/rpm/SPECS
-+	cd /usr/src/RPM/SPECS
- 	dep -detail rpmbuild -ba gnorpm.spec >& xxx
- 	...
- 	(the build will take longer since both dep and strace are pigs)
-diff -Nru rpm-4.4.8.orig/lib/rpmrc.c rpm-4.4.8/lib/rpmrc.c
--- rpm-4.4.8.orig/lib/rpmrc.c	2007-02-04 07:14:56.000000000 +0100
-+++ rpm-4.4.8/lib/rpmrc.c	2008-01-16 12:33:36.000000000 +0100
-@@ -585,7 +585,7 @@
-     addMacro(NULL, "___build_pre", NULL, ___build_pre, RMIL_DEFAULT);
- 
-     setVarDefault(-1,			"_topdir",
-		"/usr/src/rpm",		"%{_usr}/src/rpm");
-+		"/usr/src/RPM",		"%{_usr}/src/RPM");
-     setVarDefault(-1,			"_tmppath",
- 		"/var/tmp",		"%{_var}/tmp");
-     setVarDefault(-1,			"_dbpath",
-diff -Nru rpm-4.4.8.orig/macros.in rpm-4.4.8/macros.in
--- rpm-4.4.8.orig/macros.in	2007-02-13 15:39:55.000000000 +0100
-+++ rpm-4.4.8/macros.in	2008-01-16 12:34:18.000000000 +0100
-@@ -233,7 +233,7 @@
- %tmpdir			%{_tmppath}
- 
- #	Path to top of build area.
-%_topdir		%{_usrsrc}/rpm
-+%_topdir		%{_usrsrc}/RPM
- 
- #==============================================================================
- # ---- Optional rpmrc macros.
-diff -Nru rpm-4.4.8.orig/Makefile.in rpm-4.4.8/Makefile.in
--- rpm-4.4.8.orig/Makefile.in	2007-02-11 03:34:33.000000000 +0100
-+++ rpm-4.4.8/Makefile.in	2008-01-16 12:34:31.000000000 +0100
-@@ -501,7 +501,7 @@
- rpm2cpio_LDFLAGS = $(myLDFLAGS) $(staticLDFLAGS)
- rpm2cpio_LDADD = $(myLDADD) @LIBMISC@
- CVSTAG = r$(subst .,-,$(VERSION))
-pkgsrcdir = $(prefix)/src/rpm
-+pkgsrcdir = $(prefix)/src/RPM
- ACLOCAL_AMFLAGS = -I m4
- all: config.h
- 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
--- a/rpm-4.4.9-brp_strip_static_archive.patch
+++ b/rpm-4.4.9-brp_strip_static_archive.patch
@ -1,10 +0,0 @@
-Only in rpm-4.4.9/scripts: brp-infodir.brp_infodir
-Only in rpm-4.4.9/scripts: brp-strip-builddirs.brp_strip_builddirs
-diff -ru rpm-4.4.9.orig/scripts/brp-strip-static-archive rpm-4.4.9/scripts/brp-strip-static-archive
--- rpm-4.4.9.orig/scripts/brp-strip-static-archive	2005-05-30 08:42:19.000000000 +0200
-+++ rpm-4.4.9/scripts/brp-strip-static-archive	2009-11-19 13:20:21.000000000 +0100
-@@ -16,3 +16,4 @@
- 	sed -n -e 's/^\(.*\):[ 	]*current ar archive/\1/p'`; do
- 	strip -g "$f"
- done
-+exit 0
--- a/rpm-4.4.9-fix_glibc_autoreq.patch
+++ b/rpm-4.4.9-fix_glibc_autoreq.patch
@ -1,12 +0,0 @@
-diff -Nru rpm-4.4.9.orig//autodeps/linux.req rpm-4.4.9/autodeps/linux.req
--- rpm-4.4.9.orig//autodeps/linux.req	2010-03-24 21:31:02.094926887 +0100
-+++ rpm-4.4.9/autodeps/linux.req	2010-03-24 21:31:53.858177160 +0100
-@@ -113,7 +113,7 @@
- 	    sub(/:/, "", $3);
- 	    LIBNAME=$3;
- 	}
-	(START==2) && (LIBNAME!="") && ($4!="") {
-+	(START==2) && (LIBNAME!="") && ($4!="") && (($4~/^GLIBC_*/) || ($4~/^GCC_*/)) {
- 	    print LIBNAME "(" $4 ")'$lib64'";
- 	}
-     '
--- a/rpm-4.4.9-rpmevr.patch
+++ b/rpm-4.4.9-rpmevr.patch
@ -1,45 +0,0 @@
--- lib/rpmevr.h.orig	2007-05-16 12:55:05.000000000 +0200
-+++ lib/rpmevr.h	2007-08-09 18:36:13.000000000 +0200
-@@ -6,6 +6,10 @@
-  * Structure(s) and routine(s) used for EVR parsing and comparison.
-  */
- 
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
- /**
-  */
- /*@-exportlocal@*/
-@@ -117,10 +121,6 @@
- #define	isErasePreReq(_x)	((_x) & _ERASE_ONLY_MASK)
- #endif	/* _RPMEVR_INTERNAL */
- 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
- /** \ingroup rpmds
-  * Segmented string compare.
-  * @param a		1st string
--- ./lib/rpmevr.h.orig	2007-05-16 12:55:05.000000000 +0200
-+++ ./lib/rpmevr.h	2007-06-20 10:13:14.000000000 +0200
-@@ -18,8 +18,6 @@
- /**
-  * Dependency Attributes.
-  */
-typedef	enum evrFlags_e rpmsenseFlags;
-typedef	enum evrFlags_e evrFlags;
- 
- /*@-matchfields@*/
- enum evrFlags_e {
-@@ -67,6 +65,9 @@
- };
- /*@=matchfields@*/
- 
-+typedef	enum evrFlags_e rpmsenseFlags;
-+typedef	enum evrFlags_e evrFlags;
-+
- #define	RPMSENSE_SENSEMASK	0x0e	 /* Mask to get senses, ie serial, */
-                                          /* less, greater, equal.          */
- #define	RPMSENSE_NOTEQUAL	(RPMSENSE_EQUAL ^ RPMSENSE_SENSEMASK)
--- a/rpm-4.4.9-rpmrc.patch
+++ b/rpm-4.4.9-rpmrc.patch
@ -1,40 +0,0 @@
--- rpm-4.4.7.orig/rpmrc.in	2006-08-06 15:13:38.000000000 +0000
-+++ rpm-4.4.7/rpmrc.in	2007-12-14 02:59:17.000000000 +0000
-@@ -15,13 +15,13 @@
- # "fat" binary with both archs, for Darwin
- optflags: fat -O2 -g -arch i386 -arch ppc
- 
-optflags: i386 -O2 -g -m32 -march=i386 -mtune=generic -fasynchronous-unwind-tables
-optflags: i486 -O2 -g -m32 -march=i486 -fasynchronous-unwind-tables
-optflags: i586 -O2 -g -m32 -march=i586 -fasynchronous-unwind-tables
-optflags: i686 -O2 -g -m32 -march=i686 -mtune=generic -fasynchronous-unwind-tables
-optflags: pentium3 -O2 -g -m32 -march=pentium3 -fasynchronous-unwind-tables
-optflags: pentium4 -O2 -g -m32 -march=pentium4 -fasynchronous-unwind-tables
-optflags: athlon -O2 -g -m32 -march=athlon -fasynchronous-unwind-tables
-+optflags: i386 -O2 -g -fomit-frame-pointer -pipe -march=i386
-+optflags: i486 -O2 -g -fomit-frame-pointer -pipe -march=i486
-+optflags: i586 -O2 -g -fomit-frame-pointer -pipe -march=i586 -mtune=generic
-+optflags: i686 -O2 -g -fomit-frame-pointer -pipe -march=i686 -mtune=generic
-+optflags: pentium3 -O2 -g -fomit-frame-pointer -pipe -march=i686 -mtune=pentium3
-+optflags: pentium4 -O2 -g -fomit-frame-pointer -pipe -march=i686 -mtune=pentium4
-+optflags: athlon -O2 -g -fomit-frame-pointer -pipe -march=i686 -mtune=athlon
- optflags: ia64 -O2 -g
- optflags: x86_64 -O2 -g -m64 -mtune=generic
- optflags: amd64 -O2 -g -m64 -mtune=generic
-@@ -192,11 +192,11 @@
- buildarchtranslate: osfmach3_i486: i386
- buildarchtranslate: osfmach3_i386: i386
- 
-buildarchtranslate: athlon: i386
-buildarchtranslate: pentium4: i386
-buildarchtranslate: pentium3: i386
-buildarchtranslate: i686: i386
-buildarchtranslate: i586: i386
-+buildarchtranslate: athlon: i586
-+buildarchtranslate: pentium4: i586
-+buildarchtranslate: pentium3: i586
-+buildarchtranslate: i686: i586
-+buildarchtranslate: i586: i586
- buildarchtranslate: i486: i386
- buildarchtranslate: i386: i386
- 
--- a/rpm-5.1.6-macrodirs.patch
+++ b/rpm-5.1.6-macrodirs.patch
@ -1,32 +0,0 @@
-diff -Nru rpm-5.1.6.orig/macros.in rpm-5.1.6/macros.in
--- rpm-5.1.6.orig/macros.in	2008-10-16 13:43:54.000000000 +0200
-+++ rpm-5.1.6/macros.in	2009-01-01 18:02:46.000000000 +0100
-@@ -895,7 +895,7 @@
- 
- #	The "transactional rollback" directory in which erased packages will
- #	be saved when using the --repackage option.
-%_repackage_dir		%{_var}/spool/repackage
-+%_repackage_dir		%{_var}/tmp
- 
- #	A path (i.e. URL) prefix that is pre-pended to %{_repackage_dir}.
- %_repackage_root	%{nil}
-@@ -1296,15 +1296,15 @@
- %_sbindir		%{_exec_prefix}/sbin
- %_libexecdir		%{_exec_prefix}/libexec
- %_datadir		%{_prefix}/share
-%_sysconfdir		%{_prefix}/etc
-+%_sysconfdir		/etc
- %_sharedstatedir	%{_prefix}/com
-%_localstatedir		%{_prefix}/var
-+%_localstatedir		/var
- %_lib			lib
- %_libdir		%{_exec_prefix}/%{_lib}
- %_includedir		%{_prefix}/include
- %_oldincludedir		/usr/include
-%_infodir		%{_prefix}/info
-%_mandir		%{_prefix}/man
-+%_infodir		%{_datadir}/info
-+%_mandir		%{_datadir}/man
- %_localedir		%{_datadir}/locale
- 
- #==============================================================================
--- a/rpm-5.1.6-source_set_packager_owner.patch
+++ b/rpm-5.1.6-source_set_packager_owner.patch
@ -1,15 +0,0 @@
-diff -Nru rpm-5.1.6.orig/build/files.c rpm-5.1.6/build/files.c
--- rpm-5.1.6.orig/build/files.c	2009-01-01 18:19:43.000000000 +0100
-+++ rpm-5.1.6/build/files.c	2009-01-01 18:27:24.000000000 +0100
-@@ -2759,8 +2759,9 @@
-         flp->uname = fl.def_ar.ar_user  ? getUnameS(fl.def_ar.ar_user)  : getUname(flp->fl_uid);
- 	flp->gname = fl.def_ar.ar_group ? getGnameS(fl.def_ar.ar_group) : getGname(flp->fl_gid);
- #else
-	flp->uname = getUname(flp->fl_uid);
-	flp->gname = getGname(flp->fl_gid);
-+        /* set a standard owner and group */
-+	flp->uname = "packager";
-+	flp->gname = "packager";
- #endif
- 	flp->langs = xstrdup("");
- 	
--- a/rpm-5.2-update.upd
+++ b/rpm-5.2-update.upd
@ -1,5 +0,0 @@
-# make a backup of old rpm
-cp -a /var/lib/rpm /var/lib/rpm4backup.`date +%s`
-rpm --rebuilddb
-exit 0
-_EOF
--- a/rpm-5.2.1-brp_infodir.patch
+++ b/rpm-5.2.1-brp_infodir.patch
@ -1,38 +0,0 @@
-diff -Nru rpm-5.2.1.orig/scripts/brp-infodir rpm-5.2.1/scripts/brp-infodir
--- rpm-5.1.6.orig/scripts/brp-infodir	1970-01-01 01:00:00.000000000 +0100
-+++ rpm-5.1.6/scripts/brp-infodir	2009-01-01 18:09:52.000000000 +0100
-@@ -0,0 +1,12 @@
-+#!/bin/sh
-+
-+# If using normal root, avoid changing anything.
-+if [ -z "$RPM_BUILD_ROOT" -o "$RPM_BUILD_ROOT" = "/" ]; then
-+	exit 0
-+fi
-+
-+# Delete /usr/share/info/dir file
-+if [ -f $RPM_BUILD_ROOT/usr/share/info/dir ]; then
-+	rm -f $RPM_BUILD_ROOT/usr/share/info/dir
-+fi
-+
-diff -ru rpm-5.2.1.orig//scripts/Makefile.in rpm-5.2.1/scripts/Makefile.in
--- rpm-5.2.1.orig//scripts/Makefile.in	2010-05-01 18:57:12.000000000 +0200
-+++ rpm-5.2.1/scripts/Makefile.in	2010-07-28 19:37:45.796740786 +0200
-@@ -429,7 +429,7 @@
- 
- EXTRA_DIST = \
- 	brp-compress brp-python-bytecompile brp-java-gcjcompile \
-	brp-strip brp-strip-comment-note brp-nobuildrootpath \
-+	brp-infodir brp-strip brp-strip-comment-note brp-nobuildrootpath \
- 	brp-strip-shared brp-strip-static-archive brp-sparc64-linux \
- 	brp-implant-ident-static brp-java-repack-jars \
- 	check-files cross-build \
-@@ -460,7 +460,7 @@
- bin_SCRIPTS = gendiff
- pkglib_SCRIPTS = \
- 	brp-compress brp-python-bytecompile brp-java-gcjcompile \
-	brp-strip brp-strip-comment-note brp-nobuildrootpath \
-+	brp-infodir brp-strip brp-strip-comment-note brp-nobuildrootpath \
- 	brp-strip-shared brp-strip-static-archive brp-sparc64-linux \
- 	check-files cross-build executabledeps.sh \
- 	find-debuginfo.sh find-lang.sh find-prov.pl find-req.pl \
-Solo in rpm-5.2.1/scripts: Makefile.in.orig
--- a/rpm-5.2.1-brp_strip_builddirs.patch
+++ b/rpm-5.2.1-brp_strip_builddirs.patch
@ -1,41 +0,0 @@
-diff -Nru rpm-5.1.6.orig1/scripts/brp-strip-builddirs rpm-5.1.6/scripts/brp-strip-builddirs
--- rpm-5.1.6.orig1/scripts/brp-strip-builddirs	1970-01-01 01:00:00.000000000 +0100
-+++ rpm-5.1.6/scripts/brp-strip-builddirs	2009-01-01 18:15:45.000000000 +0100
-@@ -0,0 +1,12 @@
-+#!/bin/sh
-+
-+# If using normal root, avoid changing anything.
-+if [ -z "$RPM_BUILD_ROOT" -o "$RPM_BUILD_ROOT" = "/" ]; then
-+	exit 0
-+fi
-+
-+# Remove the rpm builddir paths in *.la files
-+find $RPM_BUILD_ROOT -type f -name *.la | \
-+   xargs -r sed -i '/dependency_libs=/{
-+      s,-L/usr/src/RPM/BUILD/[^ ]*,,g}'
-+
-diff -Nru rpm-5.1.6.orig1/scripts/Makefile.in rpm-5.1.6/scripts/Makefile.in
--- rpm-5.2.1.orig/scripts/Makefile.in	2010-05-01 18:57:12.000000000 +0200
-+++ rpm-5.2.1/scripts/Makefile.in	2010-07-28 20:01:05.795740791 +0200
-@@ -429,8 +429,8 @@
- 
- EXTRA_DIST = \
- 	brp-compress brp-python-bytecompile brp-java-gcjcompile \
-	brp-infodir brp-strip brp-strip-comment-note brp-nobuildrootpath \
-	brp-strip-shared brp-strip-static-archive brp-sparc64-linux \
-+	brp-infodir brp-strip brp-strip-comment-note brp-nobuildrootpath \
-+	brp-strip-builddirs brp-strip-shared brp-strip-static-archive brp-sparc64-linux \
- 	brp-implant-ident-static brp-java-repack-jars \
- 	check-files cross-build \
- 	deb_Packages deb_Sources \
-@@ -460,8 +460,8 @@
- bin_SCRIPTS = gendiff
- pkglib_SCRIPTS = \
- 	brp-compress brp-python-bytecompile brp-java-gcjcompile \
-	brp-infodir brp-strip brp-strip-comment-note brp-nobuildrootpath \
-	brp-strip-shared brp-strip-static-archive brp-sparc64-linux \
-+	brp-infodir brp-strip brp-strip-comment-note brp-nobuildrootpath \
-+	brp-strip-builddirs brp-strip-shared brp-strip-static-archive brp-sparc64-linux \
- 	check-files cross-build executabledeps.sh \
- 	find-debuginfo.sh find-lang.sh find-prov.pl find-req.pl \
- 	find-provides.perl \
--- a/rpm-5.2.1-brp_strip_shared.patch
+++ b/rpm-5.2.1-brp_strip_shared.patch
@ -1,18 +0,0 @@
-diff -Nru rpm-5.2.1.orig/scripts/brp-strip-shared rpm-5.2.1/scripts/brp-strip-shared
--- rpm-5.2.1.orig/scripts/brp-strip-shared	2007-06-20 18:56:47.000000000 +0200
-+++ rpm-5.2.1/scripts/brp-strip-shared	2010-07-26 15:40:38.510732998 +0200
-@@ -22,5 +22,5 @@
-         grep -v "^${RPM_BUILD_ROOT}/\?usr/lib/debug"  | \
- 	grep ' shared object,' | \
- 	sed -n -e 's/^\(.*\):[ 	]*ELF.*, not stripped/\1/p'`; do
-	$STRIP --strip-unneeded "$f"
-+	$STRIP -g "$f"
- done
-diff -Nru rpm-5.2.1.orig//scripts/brp-strip-shared rpm-5.2.1/scripts/brp-strip-shared
--- rpm-5.2.1.orig//scripts/brp-strip-shared	2010-08-23 14:14:37.334358282 +0200
-+++ rpm-5.2.1/scripts/brp-strip-shared	2010-08-23 14:17:14.416357981 +0200
-@@ -24,3 +24,4 @@
- 	sed -n -e 's/^\(.*\):[ 	]*ELF.*, not stripped/\1/p'`; do
- 	$STRIP -g "$f"
- done
-+exit 0
--- a/rpm-5.2.1-build-fix-arm.patch
+++ b/rpm-5.2.1-build-fix-arm.patch
@ -1,11 +0,0 @@
--- rpm-5.2.1/file/src/softmagic.c.orig	2014-12-29 02:13:38.125162588 +0100
-+++ rpm-5.2.1/file/src/softmagic.c	2014-12-29 02:11:59.901539763 +0100
-@@ -33,7 +33,7 @@
- #include "magic.h"
- #include <string.h>
- #if !(defined(HAVE_STRNDUP) && defined(__USE_GNU))
-char * strndup(const char *, size_t);
-+//char * strndup(const char *, size_t);
- #endif
- 
- #include <ctype.h>
--- a/rpm-5.2.1-build-from-tarball.patch
+++ b/rpm-5.2.1-build-from-tarball.patch
@ -1,11 +0,0 @@
--- rpm-5.2.1.orig/build.c	2008-08-01 14:33:30.000000000 +0200
-+++ rpm-5.2.1/build.c	2014-04-24 13:47:18.185073519 +0200
-@@ -128,7 +128,7 @@
- 
- 	for (i = 0; sfpats[i]; i++) {
- 	    se = rpmExpand("%{uncompress: %{u2p:", arg, "}}",
-		" | %{__tar} -xOvf - %{?__tar_wildcards} ", sfpats[i],
-+		" | LANG=C %{__tar} -xOvf - --wildcards ", sfpats[i],
- 		" 2>&1 > '", tmpSpecFile, "'", NULL);
- 	    fp = popen(se, "r");
- 	    se = _free(se);
--- a/rpm-5.2.1-buildrequires_external.patch
+++ b/rpm-5.2.1-buildrequires_external.patch
@ -1,11 +0,0 @@
--- rpm-5.2.1.orig/rpmdb/tagtbl.c	2010-05-01 19:13:04.000000000 +0200
-+++ rpm-5.2.1/rpmdb/tagtbl.c	2010-07-26 16:00:14.498483841 +0200
-@@ -26,6 +26,8 @@
- 	{ "RPMTAG_BUILDINSTALLPROG",	0x70d4ab6f,	RPM_STRING_ARRAY_TYPE + RPM_ARRAY_RETURN_TYPE },
- 	{ "RPMTAG_BUILDMACROS",	1111,	RPM_STRING_ARRAY_TYPE + RPM_ARRAY_RETURN_TYPE },
- 	{ "RPMTAG_BUILDPLATFORMS",	1183,	RPM_STRING_ARRAY_TYPE + RPM_ARRAY_RETURN_TYPE },
-+	{ "RPMTAG_BUILDPREREQ",	1108,	RPM_STRING_ARRAY_TYPE + RPM_ARRAY_RETURN_TYPE },
-+	{ "RPMTAG_BUILDREQUIRES",	1109,	RPM_STRING_ARRAY_TYPE + RPM_ARRAY_RETURN_TYPE },
- 	{ "RPMTAG_BUILDPREP",	0x799c0b4d,	RPM_STRING_ARRAY_TYPE + RPM_ARRAY_RETURN_TYPE },
- 	{ "RPMTAG_BUILDPREPPROG",	0x4ba37c9e,	RPM_STRING_ARRAY_TYPE + RPM_ARRAY_RETURN_TYPE },
- 	{ "RPMTAG_BUILDTIME",	1006,	RPM_UINT32_TYPE + RPM_SCALAR_RETURN_TYPE },
--- a/rpm-5.2.1-configure_fix_gnueabi_support.patch
+++ b/rpm-5.2.1-configure_fix_gnueabi_support.patch
@ -1,14 +0,0 @@
-diff -Nru rpm-5.2.1.orig//configure.ac rpm-5.2.1/configure.ac
--- rpm-5.2.1.orig//configure.ac	2010-08-08 15:33:22.395183431 +0200
-+++ rpm-5.2.1/configure.ac	2010-08-08 15:34:39.238308596 +0200
-@@ -1543,6 +1543,10 @@
- 	target_os=`echo "${target_os}" | sed 's/-gnu$//'`
- 	target_os_gnu="-gnu"
- fi
-+if echo "$target_os" | grep '.*-gnueabi' > /dev/null ; then
-+	target_os=`echo "${target_os}" | sed 's/-gnueabi$//'`
-+	target_os_gnu="-gnueabi"
-+fi
- changequote(<, >)
- target_os_exact="${target_os}"
- target_os_major=`echo "${target_os}" | sed 's/\..*$//'`
--- a/rpm-5.2.1-db_legacy_config.patch
+++ b/rpm-5.2.1-db_legacy_config.patch
@ -1,39 +0,0 @@
--- rpm-5.2.1/macros.in	2010-07-26 15:52:38.766483139 +0200
-+++ rpm-5.2.1.orig/macros.in	2010-07-26 15:42:00.998483655 +0200
-@@ -707,28 +707,28 @@
- 
- # database configuration: Berkeley-DB [dbapi 3 hooks]
- %_dbi_config_3                  %{_dbi_btconfig}
-%_dbi_config_3_Basenames        %{_dbi_btconfig}
-%_dbi_config_3_Conflictname     %{_dbi_btconfig}
-+%_dbi_config_3_Basenames        %{_dbi_htconfig}
-+%_dbi_config_3_Conflictname     %{_dbi_htconfig}
- %_dbi_config_3_Dirnames         %{_dbi_btconfig}
- %_dbi_config_3_Filedigests      %{_dbi_htconfig}
- %_dbi_config_3_Filepaths	%{_dbi_btconfig}
-%_dbi_config_3_Group            %{_dbi_btconfig}
-+%_dbi_config_3_Group            %{_dbi_htconfig}
- %_dbi_config_3_Installtid       %{_dbi_btconfig}
-%_dbi_config_3_Name             %{_dbi_btconfig}
-+%_dbi_config_3_Name             %{_dbi_htconfig}
- %_dbi_config_3_Nvra             %{_dbi_btconfig} noload
- %_dbi_config_3_Obsoletename     %{_dbi_btconfig}
- %_dbi_config_3_Packagecolor     %{_dbi_htconfig}
-%_dbi_config_3_Providename      %{_dbi_btconfig}
-+%_dbi_config_3_Providename      %{_dbi_htconfig}
- %_dbi_config_3_Provideversion   %{_dbi_btconfig}
- %_dbi_config_3_Pubkeys          %{_dbi_htconfig}
- %_dbi_config_3_Removetid        %{_dbi_btconfig}
-%_dbi_config_3_Requirename      %{_dbi_btconfig}
-+%_dbi_config_3_Requirename      %{_dbi_htconfig}
- %_dbi_config_3_Requireversion   %{_dbi_btconfig}
- %_dbi_config_3_Sha1header       %{_dbi_htconfig}
- %_dbi_config_3_Sigmd5           %{_dbi_htconfig}
- %_dbi_config_3_Sourcepkgid      %{_dbi_btconfig}
-%_dbi_config_3_Triggername      %{_dbi_btconfig}
-%_dbi_config_3_Packages         %{_dbi_btconfig} lockdbfd
-+%_dbi_config_3_Triggername      %{_dbi_htconfig}
-+%_dbi_config_3_Packages         %{_dbi_htconfig} lockdbfd
- %_dbi_config_3_Depends          %{_dbi_btconfig} temporary private
- 
- # database configuration: SQLite [dbapi 4 hooks]
--- a/rpm-5.2.1-debugedit-cvs-update.patch
+++ b/rpm-5.2.1-debugedit-cvs-update.patch
@ -1,158 +0,0 @@
-diff -Nru rpm-5.2.1.orig/tools/debugedit.c rpm-5.2.1/tools/debugedit.c
--- rpm-5.2.1.orig/tools/debugedit.c	2008-12-25 18:21:43.000000000 +0100
-+++ rpm-5.2.1/tools/debugedit.c	2012-04-13 17:59:32.854064354 +0200
-@@ -1,4 +1,4 @@
-/* Copyright (C) 2001, 2002, 2003, 2005, 2007 Red Hat, Inc.
-+/* Copyright (C) 2001, 2002, 2003, 2005, 2007, 2009 Red Hat, Inc.
-    Written by Alexander Larsson <alexl@redhat.com>, 2002
-    Based on code by Jakub Jelinek <jakub@redhat.com>, 2001.
- 
-@@ -114,6 +114,7 @@
- static void (*write_32) (unsigned char *ptr, GElf_Addr val);
- 
- static int ptr_size;
-+static int cu_version;
- 
- static inline rpmuint16_t
- buf_read_ule16 (unsigned char *data)
-@@ -239,16 +240,18 @@
- #define DEBUG_LINE	2
- #define DEBUG_ARANGES	3
- #define DEBUG_PUBNAMES	4
-#define DEBUG_MACINFO	5
-#define DEBUG_LOC	6
-#define DEBUG_STR	7
-#define DEBUG_FRAME	8
-#define DEBUG_RANGES	9
-+#define DEBUG_PUBTYPES	5
-+#define DEBUG_MACINFO	6
-+#define DEBUG_LOC	7
-+#define DEBUG_STR	8
-+#define DEBUG_FRAME	9
-+#define DEBUG_RANGES	10
-     { ".debug_info", NULL, NULL, 0, 0, 0 },
-     { ".debug_abbrev", NULL, NULL, 0, 0, 0 },
-     { ".debug_line", NULL, NULL, 0, 0, 0 },
-     { ".debug_aranges", NULL, NULL, 0, 0, 0 },
-     { ".debug_pubnames", NULL, NULL, 0, 0, 0 },
-+    { ".debug_pubtypes", NULL, NULL, 0, 0, 0 },
-     { ".debug_macinfo", NULL, NULL, 0, 0, 0 },
-     { ".debug_loc", NULL, NULL, 0, 0, 0 },
-     { ".debug_str", NULL, NULL, 0, 0, 0 },
-@@ -328,7 +331,7 @@
-         }
-       if (*slot != NULL)
- 	{
-	  error (0, 0, "%s: Duplicate DWARF-2 abbreviation %d", dso->filename,
-+	  error (0, 0, "%s: Duplicate DWARF abbreviation %d", dso->filename,
- 		 t->entry);
- 	  free (t);
- 	  htab_delete (h);
-@@ -348,7 +351,7 @@
- 	  form = read_uleb128 (ptr);
- 	  if (form == 2 || form > DW_FORM_indirect)
- 	    {
-	      error (0, 0, "%s: Unknown DWARF-2 DW_FORM_%d", dso->filename, form);
-+	      error (0, 0, "%s: Unknown DWARF DW_FORM_%d", dso->filename, form);
- 	      htab_delete (h);
- 	      return NULL;
- 	    }
-@@ -358,7 +361,7 @@
-         }
-       if (read_uleb128 (ptr) != 0)
-         {
-	  error (0, 0, "%s: DWARF-2 abbreviation does not end with 2 zeros",
-+	  error (0, 0, "%s: DWARF abbreviation does not end with 2 zeros",
- 		 dso->filename);
- 	  htab_delete (h);
- 	  return NULL;
-@@ -510,7 +513,7 @@
-     }
- 
-   value = read_16 (ptr);
-  if (value != 2)
-+  if (value != 2 && value != 3)
-     {
-       error (0, 0, "%s: DWARF version %d unhandled", dso->filename,
- 	     value);
-@@ -855,7 +858,12 @@
- 
- 	  switch (form)
- 	    {
-	    case DW_FORM_ref_addr: /* ptr_size in DWARF 2, offset in DWARF 3 */
-+	    case DW_FORM_ref_addr:
-+	      if (cu_version == 2)
-+		ptr += ptr_size;
-+	      else
-+		ptr += 4;
-+	      break;
- 	    case DW_FORM_addr:
- 	      ptr += ptr_size;
- 	      break;
-@@ -907,7 +915,7 @@
- 	      assert (len < UINT_MAX);
- 	      break;
- 	    default:
-	      error (0, 0, "%s: Unknown DWARF-2 DW_FORM_%d", dso->filename,
-+	      error (0, 0, "%s: Unknown DWARF DW_FORM_%d", dso->filename,
- 		     form);
- 	      return NULL;
- 	    }
-@@ -1204,11 +1212,11 @@
- 		  return 1;
- 		}
- 	      
-	      value = read_16 (ptr);
-	      if (value != 2)
-+	      cu_version = read_16 (ptr);
-+	      if (cu_version != 2 && cu_version != 3)
- 		{
- 		  error (0, 0, "%s: DWARF version %d unhandled", dso->filename,
-			 value);
-+			 cu_version);
- 		  return 1;
- 		}
- 	      
-@@ -1218,7 +1226,7 @@
- 		  if (debug_sections[DEBUG_ABBREV].data == NULL)
- 		    error (0, 0, "%s: .debug_abbrev not present", dso->filename);
- 		  else
-		    error (0, 0, "%s: DWARF-2 CU abbrev offset too large",
-+		    error (0, 0, "%s: DWARF CU abbrev offset too large",
- 			   dso->filename);
- 		  return 1;
- 		}
-@@ -1228,14 +1236,14 @@
- 		  ptr_size = read_1 (ptr);
- 		  if (ptr_size != 4 && ptr_size != 8)
- 		    {
-		      error (0, 0, "%s: Invalid DWARF-2 pointer size %d",
-+		      error (0, 0, "%s: Invalid DWARF pointer size %d",
- 			     dso->filename, ptr_size);
- 		      return 1;
- 		    }
- 		}
- 	      else if (read_1 (ptr) != ptr_size)
- 		{
-		  error (0, 0, "%s: DWARF-2 pointer size differs between CUs",
-+		  error (0, 0, "%s: DWARF pointer size differs between CUs",
- 			 dso->filename);
- 		  return 1;
- 		}
-@@ -1253,7 +1261,7 @@
- 		  t = htab_find_with_hash (abbrev, &tag, tag.entry);
- 		  if (t == NULL)
- 		    {
-		      error (0, 0, "%s: Could not find DWARF-2 abbreviation %d",
-+		      error (0, 0, "%s: Could not find DWARF abbreviation %d",
- 			     dso->filename, tag.entry);
- 		      htab_delete (abbrev);
- 		      return 1;
-@@ -1587,6 +1595,7 @@
-       switch (dso->shdr[i].sh_type)
- 	{
- 	case SHT_PROGBITS:
-+	case SHT_MIPS_DWARF:
- 	  name = strptr (dso, dso->ehdr.e_shstrndx, dso->shdr[i].sh_name);
- 	  /* TODO: Handle stabs */
- #if 0
--- a/rpm-5.2.1-disable_rpmmi_usermem.patch
+++ b/rpm-5.2.1-disable_rpmmi_usermem.patch
@ -1,12 +0,0 @@
-diff -Nru rpm-5.2.1.orig//rpmdb/rpmdb.c rpm-5.2.1/rpmdb/rpmdb.c
--- rpm-5.2.1.orig//rpmdb/rpmdb.c	2009-05-23 17:50:03.000000000 +0200
-+++ rpm-5.2.1/rpmdb/rpmdb.c	2010-12-27 16:20:57.740221701 +0100
-@@ -2449,7 +2449,7 @@
-     return rc;
- }
- 
-static int _rpmmi_usermem = 1;
-+static int _rpmmi_usermem = 0;
- 
- static int rpmmiGet(dbiIndex dbi, DBC * dbcursor, DBT * kp, DBT * vp,
-                 unsigned int flags)
--- a/rpm-5.2.1-disable_scriptlet_requires.patch
+++ b/rpm-5.2.1-disable_scriptlet_requires.patch
@ -1,12 +0,0 @@
-diff -Nru rpm-5.2.1.orig//macros.in rpm-5.2.1/macros.in
--- rpm-5.2.1.orig//macros.in	2010-07-26 16:02:40.330483089 +0200
-+++ rpm-5.2.1/macros.in	2010-07-26 16:07:14.845732684 +0200
-@@ -1746,7 +1746,7 @@
- # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
- #%__executable_provides	%{_rpmhome}/executabledeps.sh --provides
- #%__executable_requires	%{_rpmhome}/executabledeps.sh --requires
-%__scriptlet_requires	%{__bash} --rpm-requires
-+#%__scriptlet_requires	%{__bash} --rpm-requires
- 
- # \endverbatim
- #*/
--- a/rpm-5.2.1-dont-fail-on-postun.patch
+++ b/rpm-5.2.1-dont-fail-on-postun.patch
@ -1,10 +0,0 @@
--- rpm-5.2.1/lib/psm.c.orig	2015-05-11 00:17:27.762570935 +0200
-+++ rpm-5.2.1/lib/psm.c	2015-05-11 00:19:28.566779780 +0200
-@@ -2687,7 +2687,6 @@
- 
- 	    if (!(rpmtsFlags(ts) & RPMTRANS_FLAG_NOPOSTUN)) {
- 		rc = rpmpsmNext(psm, PSM_SCRIPT);
-		if (rc) break;
- 	    }
- 
- 	    if (!(rpmtsFlags(ts) & RPMTRANS_FLAG_NOTRIGGERPOSTUN)) {
--- a/rpm-5.2.1-file-5.30.patch
+++ b/rpm-5.2.1-file-5.30.patch
@ -1,24 +0,0 @@
-diff -Nru rpm-5.2.1.orig/scripts/brp-strip-comment-note rpm-5.2.1/scripts/brp-strip-comment-note
--- rpm-5.2.1.orig/scripts/brp-strip-comment-note	2007-06-20 18:56:47.000000000 +0200
-+++ rpm-5.2.1/scripts/brp-strip-comment-note	2017-03-03 11:40:53.960767333 +0100
-@@ -18,7 +18,7 @@
- # for already stripped elf files in the build root
- for f in `find $RPM_BUILD_ROOT -type f \( -perm -0100 -or -perm -0010 -or -perm -0001 \) -exec file {} \; | \
-         grep -v "^${RPM_BUILD_ROOT}/\?usr/lib/debug"  | \
-	sed -n -e 's/^\(.*\):[ 	]*ELF.*, stripped/\1/p'`; do
-+	sed -n -e 's/^\(.*\):[ 	]*ELF.*, stripped.*/\1/p'`; do
- 	note="-R .note"
- 	if $OBJDUMP -h $f | grep '^[ 	]*[0-9]*[ 	]*.note[ 	]' -A 1 | \
- 		grep ALLOC >/dev/null; then
-diff -Nru rpm-5.2.1.orig/scripts/find-debuginfo.sh rpm-5.2.1/scripts/find-debuginfo.sh
--- rpm-5.2.1.orig/scripts/find-debuginfo.sh	2009-05-12 18:02:39.000000000 +0200
-+++ rpm-5.2.1/scripts/find-debuginfo.sh	2017-03-03 11:40:35.698577512 +0100
-@@ -176,7 +176,7 @@
- find "$RPM_BUILD_ROOT" ! -path "${debugdir}/*.debug" -type f \
-      		     \( -perm -0100 -or -perm -0010 -or -perm -0001 \) \
- 		     -print |
-file -N -f - | sed -n -e 's/^\(.*\):[ 	]*.*ELF.*, not stripped/\1/p' |
-+file -N -f - | sed -n -e 's/^\(.*\):[ 	]*.*ELF.*, not stripped.*/\1/p' |
- xargs --no-run-if-empty stat -c '%h %D_%i %n' |
- while read nlinks inum f; do
-   get_debugfn "$f"
--- a/rpm-5.2.1-fileconflicts.patch
+++ b/rpm-5.2.1-fileconflicts.patch
@ -1,12 +0,0 @@
-diff -ru rpm-5.2.1.orig/lib//poptI.c rpm-5.2.1/lib/poptI.c
--- rpm-5.2.1.orig/lib//poptI.c	2009-04-11 16:47:13.000000000 +0200
-+++ rpm-5.2.1/lib/poptI.c	2010-07-26 15:35:13.285484268 +0200
-@@ -21,7 +21,7 @@
- /*@-fullinitblock@*/
- /*@unchecked@*/
- struct rpmQVKArguments_s rpmIArgs = {
-#if defined(RPM_VENDOR_MANDRIVA) /* dont-filter-install-file-conflicts */
-+#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_OPENMAMBA) /* dont-filter-install-file-conflicts */
-     .probFilter = RPMPROB_FILTER_NONE,
- #else
-     .probFilter = (RPMPROB_FILTER_REPLACEOLDFILES | RPMPROB_FILTER_REPLACENEWFILES),
--- a/rpm-5.2.1-find-provides-file-5.34.patch
+++ b/rpm-5.2.1-find-provides-file-5.34.patch
@ -1,11 +0,0 @@
--- rpm-5.2.1/autodeps/linux.prov.orig	2018-08-29 22:18:06.585306308 +0200
-+++ rpm-5.2.1/autodeps/linux.prov	2018-08-29 22:19:07.405583776 +0200
-@@ -9,7 +9,7 @@
- filelist=`sed "s/['\"]/\\\&/g"`
- 
- solist=$(echo $filelist | grep "\\.so" | grep -v "^/lib/ld.so" | \
-	xargs file -L 2>/dev/null | grep "ELF.*shared object" | cut -d: -f1)
-+	xargs file -L 2>/dev/null | grep "ELF.*shared object\|ELF.*LSB pie executable" | cut -d: -f1)
- pythonlist=
- tcllist=
- 
--- a/rpm-5.2.1-find_lang_support_localized_qt_and_man_files.patch
+++ b/rpm-5.2.1-find_lang_support_localized_qt_and_man_files.patch
@ -1,83 +0,0 @@
--- rpm-5.2.1/scripts/find-lang.sh.orig	2014-10-07 23:35:04.000000000 +0200
-+++ rpm-5.2.1/scripts/find-lang.sh	2015-03-31 21:37:57.890482158 +0200
-@@ -32,6 +32,8 @@
- Additional options:
-   --with-gnome		find GNOME help files
-   --with-kde		find KDE help files
-+  --with-qt             find Qt translation files
-+  --with-man            find localized man pages
-   --all-name		match all package/domain names
-   --without-mo		not find locales files
- EOF
-@@ -54,6 +56,8 @@
- 
- GNOME=#
- KDE=#
-+QT=#
-+MAN=#
- MO=
- MO_NAME=$NAME.lang
- ALL_NAME=#
-@@ -69,6 +73,14 @@
- 		KDE=
- 		shift
- 		;;
-+	--with-qt )
-+		QT=
-+		shift
-+		;;
-+	--with-man )
-+		MAN=
-+		shift
-+		;;
- 	--without-mo )
- 		MO=#
- 		shift
-@@ -93,6 +105,14 @@
- s:%lang(C) ::
- /^$/d' > $MO_NAME
- 
-+find "$TOP_DIR" -type d|sed '
-+s:'"$TOP_DIR"'::
-+'"$NO_ALL_NAME$GNOME"'s:\(.*/share/help/\)\([^/_]\+\)\([^/]*\)\(/'"$NAME"'\)$:%lang(\2) %doc \1\2\3\4/:
-+'"$ALL_NAME$GNOME"'s:\(.*/share/help/\)\([^/_]\+\)\([^/]*\)\(/[a-zA-Z0-9.\_\-]\+\)$:%lang(\2) %doc \1\2\3\4/:
-+s:^\([^%].*\)::
-+s:%lang(C) ::
-+/^$/d' >> $MO_NAME
-+
- find $TOP_DIR -type d|sed '
- s:'"$TOP_DIR"'::
- '"$NO_ALL_NAME$GNOME"'s:\(.*/gnome/help/'"$NAME"'$\):%dir \1:
-@@ -123,6 +143,32 @@
- s:^\([^%].*\)::
- s:%lang(C) ::
- /^$/d' >> $MO_NAME
-+
-+find "$TOP_DIR" -type f -o -type l|sed '
-+s:'"$TOP_DIR"'::
-+'"$NO_ALL_NAME$QT"'s:\(.*/'"$NAME"'_\([a-zA-Z]\{2\}\([_@].*\)\?\)\.qm$\):%lang(\2) \1:
-+'"$ALL_NAME$QT"'s:\(.*/[^/_]\+_\([a-zA-Z]\{2\}[_@].*\)\.qm$\):%lang(\2) \1:
-+'"$ALL_NAME$QT"'s:\(.*/[^/_]\+_\([a-zA-Z]\{2\}\)\.qm$\):%lang(\2) \1:
-+'"$ALL_NAME$QT"'s:^\([^%].*/[^/]\+_\([a-zA-Z]\{2\}[_@].*\)\.qm$\):%lang(\2) \1:
-+'"$ALL_NAME$QT"'s:^\([^%].*/[^/]\+_\([a-zA-Z]\{2\}\)\.qm$\):%lang(\2) \1:
-+s:^[^%].*::
-+s:%lang(C) ::
-+/^$/d' >> $MO_NAME
-+
-+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*:
-+s:^\([^%].*\)::
-+s:%lang(C) ::
-+/^$/d' >> $MO_NAME
-+ 
-+find "$TOP_DIR" -type f -o -type l|sed '
-+s:'"$TOP_DIR"'::
-+'"$NO_ALL_NAME$MAN"'s:\(.*/man/\([^/_]\+\).*/man[a-z0-9]\+/'"$NAME"'\.[a-z0-9].*\):%lang(\2) \1*:
-+s:^\([^%].*\)::
-+s:%lang(C) ::
-+/^$/d' >> $MO_NAME
- 
- if ! grep -q / $MO_NAME; then
- 	echo "No translations found for ${NAME} in ${TOP_DIR}"
--- a/rpm-5.2.1-fix_db_upgrade_from_449.patch
+++ b/rpm-5.2.1-fix_db_upgrade_from_449.patch
@ -1,37 +0,0 @@
-diff -ru rpm-5.2.1/rpmdb/header_internal.c rpm-5.2.1.orig/rpmdb/header_internal.c
--- rpm-5.2.1/rpmdb/header_internal.c	2010-07-27 19:27:58.316530178 +0200
-+++ rpm-5.2.1.orig/rpmdb/header_internal.c	2008-07-31 04:40:08.000000000 +0200
-@@ -44,11 +44,13 @@
-     for (i = 0; i < il; i++) {
- 	info->tag = (rpmuint32_t) ntohl(pe[i].tag);
- 	info->type = (rpmuint32_t) ntohl(pe[i].type);
-+#ifdef DYING
- 	/* XXX Convert RPMTAG_FILESTATE to RPM_UINT8_TYPE. */
- 	if (info->tag == 1029 && info->type == 1) {
- 	    info->type = RPM_UINT8_TYPE;
- 	    pe[i].type = (rpmuint32_t) htonl(info->type);
- 	}
-+#endif
- 	info->offset = (rpmint32_t) ntohl(pe[i].offset);
- assert(negate || info->offset >= 0);	/* XXX insurance */
- 	if (negate)
-diff -ru rpm-5.2.1/rpmdb/rpmtag.h rpm-5.2.1.orig/rpmdb/rpmtag.h
--- rpm-5.2.1/rpmdb/rpmtag.h	2010-07-27 19:28:33.943469247 +0200
-+++ rpm-5.2.1.orig/rpmdb/rpmtag.h	2009-07-25 02:56:51.000000000 +0200
-@@ -25,7 +25,7 @@
-  */
- enum rpmTagType_e {
-     	/* RPM_NULL_TYPE =  0	- never been used. */
-	/* RPM_CHAR_TYPE =  1	- never been used, same as RPM_UINT8_TYPE. */
-+    RPM_CHAR_TYPE		=  1,
-     RPM_UINT8_TYPE		=  2,
-     RPM_UINT16_TYPE		=  3,
-     RPM_UINT32_TYPE		=  4,
-@@ -37,7 +37,7 @@
- 	/* RPM_ASN1_TYPE = 10	- never been used. */
- 	/* RPM_OPENPGP_TYPE= 11	- never been used. */
- };
-#define	RPM_MIN_TYPE		2
-+#define	RPM_MIN_TYPE		1
- #define	RPM_MAX_TYPE		9
- #define	RPM_MASK_TYPE		0x0000ffff
--- a/rpm-5.2.1-glibc-2.28.patch
+++ b/rpm-5.2.1-glibc-2.28.patch
@ -1,45 +0,0 @@
-diff -ru rpm-5.2.1/rpmio/gzdio.c rpm-5.2.1.orig/rpmio/gzdio.c
--- rpm-5.2.1/rpmio/gzdio.c	2009-03-25 21:26:46.000000000 +0100
-+++ rpm-5.2.1.orig/rpmio/gzdio.c	2018-08-13 12:53:38.122742573 +0200
-@@ -375,7 +375,7 @@
-     int rc;
- #if defined(HAVE_GZSEEK)
- #ifdef USE_COOKIE_SEEK_POINTER
-    _IO_off64_t p = *pos;
-+    off64_t p = *pos;
- #else
-     off_t p = pos;
- #endif
-diff -ru rpm-5.2.1/rpmio/rpmio.c rpm-5.2.1.orig/rpmio/rpmio.c
--- rpm-5.2.1/rpmio/rpmio.c	2009-11-11 23:27:52.000000000 +0100
-+++ rpm-5.2.1.orig/rpmio/rpmio.c	2018-08-13 12:56:03.182473172 +0200
-@@ -451,7 +451,7 @@
- 	/*@modifies fileSystem, internalState @*/
- {
- #ifdef USE_COOKIE_SEEK_POINTER
-    _IO_off64_t p = *pos;
-+    off64_t p = *pos;
- #else
-     off_t p = pos;
- #endif
-@@ -2424,7 +2424,7 @@
- int Fseek(FD_t fd, _libio_off_t offset, int whence) {
-     fdio_seek_function_t _seek;
- #ifdef USE_COOKIE_SEEK_POINTER
-    _IO_off64_t o64 = offset;
-+    off64_t o64 = offset;
-     _libio_pos_t pos = &o64;
- #else
-     _libio_pos_t pos = offset;
-diff -ru rpm-5.2.1/rpmio/rpmio.h rpm-5.2.1.orig/rpmio/rpmio.h
--- rpm-5.2.1/rpmio/rpmio.h	2009-03-26 21:09:03.000000000 +0100
-+++ rpm-5.2.1.orig/rpmio/rpmio.h	2018-08-13 12:53:04.208571677 +0200
-@@ -26,7 +26,7 @@
- #if !defined(__LCLINT__) && !defined(__UCLIBC__) && defined(__GLIBC__) && \
- 	(__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2))
- #define USE_COOKIE_SEEK_POINTER 1
-typedef _IO_off64_t 	_libio_off_t;
-+typedef off64_t 	_libio_off_t;
- typedef _libio_off_t *	_libio_pos_t;
- #else
- typedef off_t 		_libio_off_t;
--- a/rpm-5.2.1-macros_cross_vars.patch
+++ b/rpm-5.2.1-macros_cross_vars.patch
@ -1,28 +0,0 @@
-diff -Nru rpm-4.4.9.orig//macros.in rpm-4.4.9/macros.in
--- rpm-4.4.9.orig//macros.in	2010-03-19 18:48:13.759362076 +0100
-+++ rpm-4.4.9/macros.in	2010-03-19 18:58:18.256361807 +0100
-@@ -1156,17 +1156,17 @@
- # ---- config.guess platform macros.
- #	Macro(s) similar to the tokens used by configure.
- #
-%_build			%{_host}
-%_build_alias		%{_host_alias}
-%_build_cpu		%{_host_cpu}
-%_build_vendor		%{_host_vendor}
-%_build_os		%{_host_os}
-%_host			@host@
-+%_build			%{_build_cpu}-%{_build_vendor}-%{_build_os}
-+%_build_alias		@host_alias@%{nil}
-+%_build_cpu		@host_cpu@
-+%_build_vendor		@host_vendor@
-+%_build_os		@host_os@
-+%_host			%{_host_cpu}-%{_host_vendor}-%{_host_os}
- %_host_alias		@host_alias@%{nil}
- %_host_cpu		@host_cpu@
- %_host_vendor		@host_vendor@
- %_host_os		@host_os@
-%_target		%{_host}
-+%_target		%{_target_cpu}-%{_target_vendor}-%{_target_os}
- %_target_alias		%{_host_alias}
- %_target_cpu		%{_host_cpu}
- %_target_vendor		%{_host_vendor}
--- a/rpm-5.2.1-mono-avoid-empty-requires.patch
+++ b/rpm-5.2.1-mono-avoid-empty-requires.patch
@ -1,9 +0,0 @@
-diff -Nru rpm-5.2.1.orig//scripts/mono-find-requires rpm-5.2.1/scripts/mono-find-requires
--- rpm-5.2.1.orig//scripts/mono-find-requires	2007-07-13 00:25:31.000000000 +0200
-+++ rpm-5.2.1/scripts/mono-find-requires	2011-01-11 17:52:40.320032775 +0100
-@@ -83,4 +83,4 @@
- # Of those, only chose the ones that are in REQUIRES
- #
- echo "$UNIQ
-$REQUIRES" | sort | uniq -d
-+$REQUIRES" | sort | uniq -d | grep -v "^$"
--- a/rpm-5.2.1-openmamba_no_deps_on_building_srpms.patch
+++ b/rpm-5.2.1-openmamba_no_deps_on_building_srpms.patch
@ -1,12 +0,0 @@
-diff -Nru rpm-5.2.1.orig//rpmqv.c rpm-5.2.1/rpmqv.c
--- rpm-5.2.1.orig//rpmqv.c	2010-04-26 10:50:03.000000000 +0200
-+++ rpm-5.2.1/rpmqv.c	2010-07-29 11:58:46.606751851 +0200
-@@ -869,7 +869,7 @@
- 	    /*@innerbreak@*/ break;
- 	case 's':
- 	    ba->buildAmount |= RPMBUILD_PACKAGESOURCE;
-#if defined(RPM_VENDOR_OPENPKG) || defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) /* no-deps-on-building-srpms */
-+#if defined(RPM_VENDOR_OPENPKG) || defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) || defined(RPM_VENDOR_OPENMAMBA) /* no-deps-on-building-srpms */
- 	    /* enforce no dependency checking when rolling a source RPM */
- 	    ba->noDeps = 1;
- #endif
--- a/rpm-5.2.1-openmamba_no_deps_on_installing_srpms.patch
+++ b/rpm-5.2.1-openmamba_no_deps_on_installing_srpms.patch
@ -1,12 +0,0 @@
--- rpm-5.2.1.orig/lib/depends.c	2010-07-29 14:34:07.426001897 +0200
-+++ rpm-5.2.1/lib/depends.c	2010-07-29 17:05:43.227002449 +0200
-@@ -2832,6 +2832,9 @@
- 	    ? rpmteDS(p, RPMTAG_CONFLICTNAME) : NULL);
- 	/* XXX srpm's don't have directory paths. */
- 	if (p->isSource) {
-+#if defined(RPM_VENDOR_OPENMAMBA) /* no-deps-check-on-installing-srpms */
-+	    break;
-+#endif
- 	    dirnames = NULL;
- 	    linktos = NULL;
- 	} else {
--- a/rpm-5.2.1-openmamba_no_owner_group_on_srpm_install.patch
+++ b/rpm-5.2.1-openmamba_no_owner_group_on_srpm_install.patch
@ -1,92 +0,0 @@
-diff -Nru rpm-5.2.1.orig//lib/fsm.c rpm-5.2.1/lib/fsm.c
--- rpm-5.2.1.orig//lib/fsm.c	2009-03-27 22:17:42.000000000 +0100
-+++ rpm-5.2.1/lib/fsm.c	2010-07-29 12:04:47.242751965 +0200
-@@ -901,7 +901,7 @@
- 	uid_t uid = fi->uid;
- 	gid_t gid = fi->gid;
- 
-#if defined(RPM_VENDOR_OPENPKG) || defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) /* no-owner-group-on-srpm-install */
-+#if defined(RPM_VENDOR_OPENPKG) || defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) || defined(RPM_VENDOR_OPENMAMBA) /* no-owner-group-on-srpm-install */
- 	/* Make sure OpenPKG/Mandriva RPM does not try to set file owner/group on files during
- 	   installation of _source_ RPMs. Instead, let it use the current
- 	   run-time owner/group, because most of the time the owner/group in
-@@ -910,7 +910,7 @@
- 	   course. */
- #endif
- 	if (fi->fuser && unameToUid(fi->fuser[i], &uid)) {
-#if defined(RPM_VENDOR_OPENPKG) ||defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) /* no-owner-group-on-srpm-install */
-+#if defined(RPM_VENDOR_OPENPKG) ||defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) || defined(RPM_VENDOR_OPENMAMBA) /* no-owner-group-on-srpm-install */
- 	  if (!fi->isSource) {
- #endif
- 	    if (fsm->goal == IOSM_PKGINSTALL)
-@@ -918,13 +918,13 @@
- 		    _("user %s does not exist - using root\n"), fi->fuser[i]);
- 	    uid = 0;
- 	    finalMode &= ~S_ISUID;      /* turn off suid bit */
-#if defined(RPM_VENDOR_OPENPKG) || defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) /* no-owner-group-on-srpm-install */
-+#if defined(RPM_VENDOR_OPENPKG) || defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) || defined(RPM_VENDOR_OPENMAMBA) /* no-owner-group-on-srpm-install */
- 	  }
- #endif
- 	}
- 
- 	if (fi->fgroup && gnameToGid(fi->fgroup[i], &gid)) {
-#if defined(RPM_VENDOR_OPENPKG) || defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) /* no-owner-group-on-srpm-install */
-+#if defined(RPM_VENDOR_OPENPKG) || defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) || defined(RPM_VENDOR_OPENMAMBA) /* no-owner-group-on-srpm-install */
- 	  if (!fi->isSource) {
- #endif
- 	    if (fsm->goal == IOSM_PKGINSTALL)
-@@ -932,7 +932,7 @@
- 		    _("group %s does not exist - using root\n"), fi->fgroup[i]);
- 	    gid = 0;
- 	    finalMode &= ~S_ISGID;	/* turn off sgid bit */
-#if defined(RPM_VENDOR_OPENPKG) ||  defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) /* no-owner-group-on-srpm-install */
-+#if defined(RPM_VENDOR_OPENPKG) ||  defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) || defined(RPM_VENDOR_OPENMAMBA) /* no-owner-group-on-srpm-install */
- 	  }
- #endif
- 	}
-diff -Nru rpm-5.2.1.orig//rpmio/iosm.c rpm-5.2.1/rpmio/iosm.c
--- rpm-5.2.1.orig//rpmio/iosm.c	2009-05-22 19:57:28.000000000 +0200
-+++ rpm-5.2.1/rpmio/iosm.c	2010-07-29 12:04:02.032752064 +0200
-@@ -957,7 +957,7 @@
- 	uid_t uid = fi->uid;
- 	gid_t gid = fi->gid;
- 
-#if defined(RPM_VENDOR_OPENPKG) || defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) /* no-owner-group-on-srpm-install */
-+#if defined(RPM_VENDOR_OPENPKG) || defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) || defined(RPM_VENDOR_OPENMAMBA) /* no-owner-group-on-srpm-install */
- 	/* Make sure OpenPKG/Mandriva RPM does not try to set file owner/group on files during
- 	   installation of _source_ RPMs. Instead, let it use the current
- 	   run-time owner/group, because most of the time the owner/group in
-@@ -966,7 +966,7 @@
- 	   course. */
- #endif
- 	if (fi->fuser && unameToUid(fi->fuser[i], &uid)) {
-#if defined(RPM_VENDOR_OPENPKG) || defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) /* no-owner-group-on-srpm-install */
-+#if defined(RPM_VENDOR_OPENPKG) || defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) || defined(RPM_VENDOR_OPENMAMBA)  /* no-owner-group-on-srpm-install */
- 	  if (!fi->isSource) {
- #endif
- 	    if (iosm->goal == IOSM_PKGINSTALL)
-@@ -974,13 +974,13 @@
- 		    _("user %s does not exist - using root\n"), fi->fuser[i]);
- 	    uid = 0;
- 	    finalMode &= ~S_ISUID;      /* turn off suid bit */
-#if defined(RPM_VENDOR_OPENPKG) || defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) /* no-owner-group-on-srpm-install */
-+#if defined(RPM_VENDOR_OPENPKG) || defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) || defined(RPM_VENDOR_OPENMAMBA)  /* no-owner-group-on-srpm-install */
- 	  }
- #endif
- 	}
- 
- 	if (fi->fgroup && gnameToGid(fi->fgroup[i], &gid)) {
-#if defined(RPM_VENDOR_OPENPKG) || defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) /* no-owner-group-on-srpm-install */
-+#if defined(RPM_VENDOR_OPENPKG) || defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) || defined(RPM_VENDOR_OPENMAMBA)  /* no-owner-group-on-srpm-install */
- 	  if (!fi->isSource) {
- #endif
- 	    if (iosm->goal == IOSM_PKGINSTALL)
-@@ -988,7 +988,7 @@
- 		    _("group %s does not exist - using root\n"), fi->fgroup[i]);
- 	    gid = 0;
- 	    finalMode &= ~S_ISGID;	/* turn off sgid bit */
-#if defined(RPM_VENDOR_OPENPKG) || defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) /* no-owner-group-on-srpm-install */
-+#if defined(RPM_VENDOR_OPENPKG) || defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) || defined(RPM_VENDOR_OPENMAMBA)  /* no-owner-group-on-srpm-install */
- 	  }
- #endif
- 	}
--- a/rpm-5.2.1-openmamba_optional_dirname_and_symlink_deps.patch
+++ b/rpm-5.2.1-openmamba_optional_dirname_and_symlink_deps.patch
@ -1,39 +0,0 @@
-diff -Nru rpm-5.2.1.orig//lib/depends.c rpm-5.2.1/lib/depends.c
--- rpm-5.2.1.orig//lib/depends.c	2009-05-22 17:09:18.000000000 +0200
-+++ rpm-5.2.1/lib/depends.c	2010-07-28 12:12:26.699740202 +0200
-@@ -1552,7 +1552,7 @@
-     int terminate = 2;		/* XXX terminate if rc >= terminate */
-     int rc;
-     int ourrc = 0;
-#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) /* optional-dirname-and-symlink-deps */
-+#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) || defined(RPM_VENDOR_OPENMAMBA) /* optional-dirname-and-symlink-deps */
-     int dirname_deps;
-     int symlink_deps;
- #endif
-@@ -1631,7 +1631,7 @@
- 	}
-     }
- 
-#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) /* optional-dirname-and-symlink-deps */
-+#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) || defined(RPM_VENDOR_OPENMAMBA) /* optional-dirname-and-symlink-deps */
-     dirname_deps = rpmExpandNumeric("%{?_check_dirname_deps}%{?!_check_dirname_deps:1}");
-     if (dirname_deps) {
- #endif
-@@ -1675,7 +1675,7 @@
- 	    /*@switchbreak@*/ break;
- 	}
-     }
-#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) /* optional-dirname-and-symlink-deps */
-+#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) || defined(RPM_VENDOR_OPENMAMBA) /* optional-dirname-and-symlink-deps */
-     }
- 
-     symlink_deps = rpmExpandNumeric("%{?_check_symlink_deps}%{?!_check_symlink_deps:1}");
-@@ -1723,7 +1723,7 @@
- 	    /*@switchbreak@*/ break;
- 	}
-     }
-#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) /* optional-dirname-and-symlink-deps */
-+#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) || defined(RPM_VENDOR_OPENMAMBA) /* optional-dirname-and-symlink-deps */
-     }
- #endif    
- 
--- a/rpm-5.2.1-pkgUnpackagedSubdirs_fix_slowness.patch
+++ b/rpm-5.2.1-pkgUnpackagedSubdirs_fix_slowness.patch
@ -1,12 +0,0 @@
-diff -Nru rpm-5.2.1/build/files.c rpm-5.2.1.patched//build/files.c
--- rpm-5.2.1/build/files.c	2011-03-03 23:22:38.911216245 +0100
-+++ rpm-5.2.1.patched//build/files.c	2011-03-03 23:22:01.034562736 +0100
-@@ -3024,6 +3024,8 @@
- 
-     fi = rpmfiInit(fi, 0);
-     while ((i = rpmfiNext(fi)) >= 0) {
-+	if (!S_ISDIR(rpmfiFMode(fi)))
-+	    continue;
- 	int found = 0;
- 	/* make local copy of file name */
- 	char *p = fn;
--- a/rpm-5.2.1-python-2.7.patch
+++ b/rpm-5.2.1-python-2.7.patch
@ -1,29 +0,0 @@
--- rpm-5.2.1.orig/configure.ac	2013-03-06 14:32:08.278105752 +0100
-+++ rpm-5.2.1/configure.ac	2013-03-06 14:40:34.757178027 +0100
-@@ -994,14 +994,14 @@
- AC_ARG_WITH(python, AS_HELP_STRING([--with-python], [build with RPM Python language bindings]), [
-     if test ".$withval" != .no; then
-         case "$withval" in
-             2.x|2.3|2.4|2.5|2.6)
-+             2.x|2.3|2.4|2.5|2.6|2.7)
-                   python_version=$withval
-                   ;;
-              yes)
-                  python_version="2.6 2.5 2.4 2.3 2.x"
-+                  python_version="2.7 2.6 2.5 2.4 2.3 2.x"
-                   ;;
-              *)
-                  AC_MSG_WARN([--with-python only supports values "2.x", "2.3", "2.4", "2.5", or "2.6" ignoring...])
-+                  AC_MSG_WARN([--with-python only supports values "2.x", "2.3", "2.4", "2.5", "2.6" or "2.7" ignoring...])
-                   python_version=""
-                   ;;
-         esac
-@@ -1289,7 +1289,7 @@
- dnl # Python embedding
- RPM_CHECK_LIB(
-     [Python embedding], [pythonembed],
-    [python2.6 python2.5], [Py_Initialize], [Python.h],
-+    [python2.7 python2.6 python2.5], [Py_Initialize], [Python.h],
-     [no,external:none], [],
-     [
-     ], [])
--- a/rpm-5.2.1-rpmdb-yum-disable-assert.patch
+++ b/rpm-5.2.1-rpmdb-yum-disable-assert.patch
@ -1,11 +0,0 @@
--- rpm-5.2.1/rpmdb/rpmdb.c.orig	2017-08-26 13:28:12.065070738 +0200
-+++ rpm-5.2.1/rpmdb/rpmdb.c	2017-08-26 13:17:01.920477505 +0200
-@@ -2554,7 +2554,7 @@
-     }
-     else {
- 	/* Iterating Packages database. */
-	assert(mi->mi_rpmtag == RPMDBI_PACKAGES);
-+//	assert(mi->mi_rpmtag == RPMDBI_PACKAGES);
- 
- 	/* Fetch header with DB_NEXT. */
- 	/* Instance 0 is the largest header instance in the database,
--- a/rpm-5.2.1-rpmlock_path.patch
+++ b/rpm-5.2.1-rpmlock_path.patch
@ -1,11 +0,0 @@
--- rpm-5.2.1.orig/macros.in	2010-07-26 15:05:23.067732938 +0200
-+++ rpm-5.2.1/macros.in	2010-07-26 15:22:34.289734825 +0200
-@@ -1007,7 +1007,7 @@
- # XXX Note: the suggested file name is __db.000 to expedite
- # support issues, because users typically do "rm -f /var/lib/rpm/__db*",
- # which will clean up the fcntl lock at the same time.
-#%_rpmlock_path	%{_dbpath}/__db.000
-+%_rpmlock_path	%{_dbpath}/__db.000
- 
- #==============================================================================
- # ---- Query macros.
--- a/rpm-5.2.1-set_openall_before_chroot.patch
+++ b/rpm-5.2.1-set_openall_before_chroot.patch
@ -1,12 +0,0 @@
-diff -Nru rpm-5.2.1.orig//macros.in rpm-5.2.1/macros.in
--- rpm-5.2.1.orig//macros.in	2010-08-06 11:52:35.420230019 +0200
-+++ rpm-5.2.1/macros.in	2010-08-06 11:54:16.136229205 +0200
-@@ -885,7 +885,7 @@
- 
- #	Open all indices before doing chroot(2).
- #
-#%_openall_before_chroot	0
-+%_openall_before_chroot	1
- 
- #	The path to the dependency universe database. The default value
- #	is the rpmdb-vendor location. The macro is usually defined in
--- a/rpm-5.2.1-silent-loop-detection_and_more_rescans.patch
+++ b/rpm-5.2.1-silent-loop-detection_and_more_rescans.patch
@ -1,20 +0,0 @@
--- rpm-5.2.1.orig/lib/depends.c	2011-03-03 14:35:01.926488612 +0100
-+++ rpm-5.2.1/lib/depends.c	2011-03-08 03:17:33.663032216 +0100
-@@ -2308,7 +2308,7 @@
-     int numOrderList;
-     int npeer = 128;	/* XXX more than deep enough for now. */
-     int * peer = memset(alloca(npeer*sizeof(*peer)), 0, (npeer*sizeof(*peer)));
-    int nrescans = 10;
-+    int nrescans = 50;
-     int _printed = 0;
-     char deptypechar;
-     size_t tsbytes;
-@@ -2667,7 +2667,7 @@
- 		const char * dp;
- 		rpmlogLvl msglvl = (anaconda || (rpmtsDFlags(ts) & RPMDEPS_FLAG_DEPLOOPS))
- 			? RPMLOG_WARNING : RPMLOG_ERR;
-#if defined(RPM_VENDOR_MANDRIVA) /* loop-detection-optional-loglevel */
-+#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_OPENMAMBA) /* loop-detection-optional-loglevel */
- 		// Report loops as debug-level message by default (7 = RPMLOG_DEBUG), overridable
- 		msglvl = rpmExpandNumeric("%{?_loop_detection_loglevel}%{?!_loop_detection_loglevel:7}");
- #endif
--- a/rpm-5.2.1-sourcepackage-rpm4.patch
+++ b/rpm-5.2.1-sourcepackage-rpm4.patch
@ -1,20 +0,0 @@
-diff -Nru rpm-5.2.1.orig/build/pack.c rpm-5.2.1/build/pack.c
--- rpm-5.2.1.orig/build/pack.c	2009-11-19 16:52:08.000000000 +0100
-+++ rpm-5.2.1/build/pack.c	2013-11-15 11:29:56.699947557 +0100
-@@ -1185,14 +1185,14 @@
-     CSA_t csa = &csabuf;
-     rpmRC rc;
-     int xx;
-#if defined(RPM_VENDOR_OPENPKG) || defined(RPM_VENDOR_FEDORA) || defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) /* backward-compat-rpmtag-sourcepackage */
-+#if defined(RPM_VENDOR_OPENPKG) || defined(RPM_VENDOR_FEDORA) || defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) || defined(RPM_VENDOR_OPENMAMBA) /* backward-compat-rpmtag-sourcepackage */
-     rpmuint32_t val;
- #endif
- 
-     /* Add rpmlib markers for tracking. */
-     (void) rpmlibMarkers(spec->sourceHeader);
- 
-#if defined(RPM_VENDOR_OPENPKG) || defined(RPM_VENDOR_FEDORA) || defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) /* backward-compat-rpmtag-sourcepackage */
-+#if defined(RPM_VENDOR_OPENPKG) || defined(RPM_VENDOR_FEDORA) || defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) || defined(RPM_VENDOR_OPENMAMBA)  /* backward-compat-rpmtag-sourcepackage */
-     /* Mark package as a SRPM for backward compatibility with RPM < 4.4.6 */
-     he->tag = RPMTAG_SOURCEPACKAGE;
-     he->t = RPM_UINT32_TYPE;
--- a/rpm-5.2.1-spec_preprocessed_output.patch
+++ b/rpm-5.2.1-spec_preprocessed_output.patch
@ -1,38 +0,0 @@
-diff -ru rpm-4.4.9.orig//build/parseSpec.c rpm-4.4.9/build/parseSpec.c
--- rpm-4.4.9.orig//build/parseSpec.c	2010-08-03 15:57:18.740342061 +0200
-+++ rpm-4.4.9/build/parseSpec.c	2010-08-03 15:58:02.071216551 +0200
-@@ -402,6 +402,12 @@
- 
-     if (! spec->readStack->reading) {
- 	spec->line[0] = '\0';
-+    } else {
-+        if (specedit) {
-+           printf("%s",spec->line);
-+           if (strchr(spec->line, '\n') == NULL && spec->line[strlen(spec->line)-1] != '\n')
-+	       printf("\n");
-+	}
-     }
- 
-     /*@-compmempass@*/ /* FIX: spec->readStack->next should be dependent */
--- rpm-4.4.9.orig//build/spec.c	2010-08-03 15:57:20.203092007 +0200
-+++ rpm-4.4.9/build/spec.c	2010-08-03 15:56:45.128341759 +0200
-@@ -724,7 +724,7 @@
- 
-     res = 0;
-     if (specedit) {
-	printNewSpecfile(spec);
-+//	printNewSpecfile(spec);
- 	goto exit;
-     }
- 
--- rpm-4.4.9.orig/build/parsePreamble.c	2007-05-15 02:39:25.000000000 +0200
-+++ rpm-4.4.9/build/parsePreamble.c	2010-08-03 18:24:43.614092066 +0200
-@@ -951,7 +951,7 @@
- 		}
- 		if (handlePreambleTag(spec, pkg, tag, macro, lang))
- 		    return RPMRC_FAIL;
-		if (spec->BANames && !spec->recursing && spec->toplevel)
-+		if (spec->BANames && !spec->recursing && spec->toplevel && !specedit)
- 		    return PART_BUILDARCHITECTURES;
- 	    }
- 	    if ((rc =
--- a/rpm-5.2.1-vendor_openmamba.patch
+++ b/rpm-5.2.1-vendor_openmamba.patch
@ -1,51 +0,0 @@
-diff -ru rpm-5.2.1.orig//configure.ac rpm-5.2.1/configure.ac
--- rpm-5.2.1.orig//configure.ac	2010-07-28 13:19:12.295008236 +0200
-+++ rpm-5.2.1/configure.ac	2010-07-28 13:18:25.877741081 +0200
-@@ -1606,7 +1606,7 @@
- esac
- RPMCANONVENDOR="$target_vendor"
- case "${target_vendor}" in
-unknown|pc|ibm|redhat|pld|mandriva|conectiva|lvr|yellowdog|caos|crux|ark)
-+unknown|pc|ibm|redhat|pld|mandriva|conectiva|lvr|yellowdog|caos|crux|ark|openmamba)
- 	test -f /etc/redhat-release &&		RPMCANONVENDOR=redhat
- 	test -f /etc/pld-release &&		RPMCANONVENDOR=pld
- 	test -f /etc/mandriva-release &&	RPMCANONVENDOR=mandriva
-@@ -1616,6 +1616,7 @@
- 	test -f /etc/caos-release &&		RPMCANONVENDOR=caos
- 	test -f /usr/bin/crux &&		RPMCANONVENDOR=crux
- 	test -f /etc/ark-release &&		RPMCANONVENDOR=ark
-+	test -f /etc/openmamba-release &&	RPMCANONVENDOR=openmamba
- 	;;
- esac
- RPMCANONOS="$target_os_noversion"
-@@ -1913,7 +1914,7 @@
- AC_MSG_CHECKING([if building for a specfic vendor])
- AC_ARG_WITH(
-     [vendor],
-    AS_HELP_STRING([--with-vendor=VENDOR], [build with a supported vendor's specific set of changes: mandriva, ark, fedora]),
-+    AS_HELP_STRING([--with-vendor=VENDOR], [build with a supported vendor's specific set of changes: mandriva, ark, fedora, openmamba]),
-     [if test ".$withval" != .no; then
- 	    case "$withval" in
- 	    "mandriva")
-@@ -1925,6 +1926,9 @@
- 	    "fedora")
- 		    AC_DEFINE([RPM_VENDOR_FEDORA], 1, Vendor is Fedora)
- 		    ;;
-+	    "openmamba")
-+		    AC_DEFINE([RPM_VENDOR_OPENMAMBA], 1, Vendor is openmamba)
-+		    ;;
- 	    esac
- 	    AC_MSG_RESULT([$withval])
-     else
--- rpm-5.2.1.orig/config.h.in	2010-05-01 19:03:00.000000000 +0200
-+++ rpm-5.2.1/config.h.in	2010-07-28 14:17:07.456750377 +0200
-@@ -798,6 +798,9 @@
- /* Vendor is Mandriva */
- #undef RPM_VENDOR_MANDRIVA
- 
-+/* Vendor is openmamba */
-+#undef RPM_VENDOR_OPENMAMBA
-+
- /* The size of `char', as computed by sizeof. */
- #undef SIZEOF_CHAR
- 
--- a/rpm.spec
+++ b/rpm.spec
--- a/48
+++ b/48
@ -1,9 +1,14 @@
 %_dist mamba
 %_docdir            %_defaultdocdir
+%_topdir            %{_usr}/src/RPM
+%_buildrootdir      %{_topdir}/BUILD
 %_check_dirname_deps 0
 %_check_symlink_deps 0

 %majorminor         %(echo %version | cut -d. -f 1-2)
+%MAJver             %(echo %version | cut -d. -f 1)
+%majver             %majorminor
+%maj3ver            %(echo %version | cut -d. -f 1-3)

 # obsoleted macro (for compatibility with QiLinux packages)
 # do not use it; use %python_version instead
@ -59,25 +64,6 @@ fi \
 #==============================================================================
 # ---- configure macros.
 #
-#%_prefix		/usr
-#%_exec_prefix		%{_prefix}
-#%_bindir		%{_exec_prefix}/bin
-#%_sbindir		%{_exec_prefix}/sbin
-#%_libexecdir		%{_exec_prefix}/libexec
-#%_datadir		%{_prefix}/share
-#%_sysconfdir		/etc
-#%_sharedstatedir	%{_prefix}/com
-#%_localstatedir		/var
-#%_lib			lib
-#%_libdir		%{_exec_prefix}/%{_lib}
-#%_includedir		%{_prefix}/include
-#%_oldincludedir		/usr/include
-#%_infodir		%{_prefix}/share/info
-#%_mandir		%{_prefix}/share/man
-#%_initrddir		%{_sysconfdir}/rc.d/init.d
-#
-#%_defaultdocdir		%{_usr}/share/doc
-
 %_smp_mflags %([ -z "$RPM_BUILD_NCPUS" ] \\\
 	&& RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"; \\\
 	[ "$RPM_BUILD_NCPUS" -gt 1 ] && echo "-j$RPM_BUILD_NCPUS")
@ -96,23 +82,19 @@ fi \

 %__arch_install_post   %{nil}

-%__os_install_post    \
-    /usr/lib/rpm/brp-infodir \
-    /usr/lib/rpm/brp-strip-builddirs \
-    /usr/lib/rpm/brp-compress \
-    /usr/lib/rpm/brp-strip \
-    /usr/lib/rpm/brp-strip-shared \
-    /usr/lib/rpm/brp-strip-static-archive \
-    /usr/lib/rpm/brp-strip-comment-note \
-    /usr/lib/rpm/brp-nobuildrootpath \
-%{nil}
+#%__os_install_post    \
+##    /usr/lib/rpm/brp-infodir \
+##    /usr/lib/rpm/brp-strip-builddirs \
+#    /usr/lib/rpm/brp-compress \
+#    /usr/lib/rpm/brp-strip \
+#    /usr/lib/rpm/brp-strip-shared \
+#    /usr/lib/rpm/brp-strip-static-archive \
+#    /usr/lib/rpm/brp-strip-comment-note \
+#    /usr/lib/rpm/brp-nobuildrootpath \
+#%{nil}

 %__spec_install_post\
    %{?__debug_package:%{__debug_install_post}}\
    %{__arch_install_post}\
    %{__os_install_post}\
 %{nil}
-
-# Executed after copying %doc to DOCDIR, with $DOCDIR set
-#%__compress_doc		/usr/lib/rpm/compress-doc%{?_noautocompressdoc: --noautocompressdoc='%{_noautocompressdoc}'}
-