From c38bf1dfe5264abbace84efa858a92f42d87297c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Thu, 26 Dec 2019 00:25:01 +0900 Subject: [PATCH] - next batch of patch updates --- openmp.patch | 22 -- rpm-URPM-build-fix.patch | 13 - rpm-builddir-readlink.patch | 28 +- rpm-changelog_order_check_nonfatal.patch | 8 +- rpm-cleanbody.patch | 11 - rpm-db_buffer_small.patch | 84 ----- rpm-dirdeps-macro.patch | 38 -- rpm-fix--p-interpreter-and-empty-script.patch | 12 - rpm-fix-missing-types-in-headers.patch | 330 ------------------ rpm-gendiff.patch | 8 - rpm-helperEVR-noassert.patch | 14 - rpm-installbeforeerase.patch | 35 -- rpm-libmagic-locale.patch | 40 --- rpm-libtool-deps.patch | 2 +- rpm-mimetype.patch | 73 ---- rpm-old-fileconflicts-behaviour.patch | 11 - rpm-perl-macros.patch | 2 +- rpm-popt-coreutils.patch | 13 - rpm-postun-nofail.patch | 18 +- rpm-semanage.patch | 29 -- rpm-silence-RPM_CHAR_TYPE.patch | 10 - rpm-sparc64.patch | 59 ---- rpm-truncate-cvslog.patch | 64 ---- rpm-unglobal.patch | 74 ---- rpm.spec | 61 +--- 25 files changed, 35 insertions(+), 1024 deletions(-) delete mode 100644 openmp.patch delete mode 100644 rpm-URPM-build-fix.patch delete mode 100644 rpm-cleanbody.patch delete mode 100644 rpm-db_buffer_small.patch delete mode 100644 rpm-dirdeps-macro.patch delete mode 100644 rpm-fix--p-interpreter-and-empty-script.patch delete mode 100644 rpm-fix-missing-types-in-headers.patch delete mode 100644 rpm-gendiff.patch delete mode 100644 rpm-helperEVR-noassert.patch delete mode 100644 rpm-installbeforeerase.patch delete mode 100644 rpm-libmagic-locale.patch delete mode 100644 rpm-mimetype.patch delete mode 100644 rpm-old-fileconflicts-behaviour.patch delete mode 100644 rpm-popt-coreutils.patch delete mode 100644 rpm-semanage.patch delete mode 100644 rpm-silence-RPM_CHAR_TYPE.patch delete mode 100644 rpm-sparc64.patch delete mode 100644 rpm-truncate-cvslog.patch delete mode 100644 rpm-unglobal.patch diff --git a/openmp.patch b/openmp.patch deleted file mode 100644 index 78b02ea..0000000 --- a/openmp.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- rpm-5.3.1/rpmio/Makefile.am.wiget 2010-05-24 17:23:09.000000000 +0200 -+++ rpm-5.3.1/rpmio/Makefile.am 2010-06-01 21:29:20.521227268 +0200 -@@ -102,7 +102,7 @@ librpmio_la_SOURCES = \ - xzdio.c \ - yarn.c - --librpmio_la_LDFLAGS = -release $(LT_CURRENT).$(LT_REVISION) -+librpmio_la_LDFLAGS = -release $(LT_CURRENT).$(LT_REVISION) $(OPENMP_CFLAGS) - if HAVE_LD_VERSION_SCRIPT - librpmio_la_LDFLAGS += -Wl,@LD_VERSION_SCRIPT_FLAG@,@top_srcdir@/rpmio/librpmio.vers - endif ---- rpm-5.3.1/tools/Makefile.am.wiget 2010-06-01 21:49:05.274449585 +0200 -+++ rpm-5.3.1/tools/Makefile.am 2010-06-01 21:49:56.576943304 +0200 -@@ -281,7 +281,7 @@ if WITH_DBSQL - if WITH_DBSQL - pkgbin_PROGRAMS += dbsql - dbsql_SOURCES = dbsql.c --dbsql_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS) -+dbsql_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS) $(OPENMP_CFLAGS) - dbsql_LDADD = \ - $(RPMIO_LDADD_COMMON) - endif diff --git a/rpm-URPM-build-fix.patch b/rpm-URPM-build-fix.patch deleted file mode 100644 index b0e029d..0000000 --- a/rpm-URPM-build-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- rpm-5.4.8/configure.ac.urpm~ 2012-04-25 19:27:07.929167065 +0200 -+++ rpm-5.4.8/configure.ac 2012-04-25 19:29:04.996867674 +0200 -@@ -1198,8 +1198,8 @@ AC_ARG_WITH(perl-urpm, AS_HELP_STRING([- - AC_SUBST(PERL_URPM_INSTALLDIRS) - WITH_PERL_URPM_SUBDIR=perl-URPM - WITH_PERL_URPM_SUBPACKAGE=1 -- AC_CONFIG_FILES([perl-URPM/Makefile.PL]) -- AC_CONFIG_FILES([perl-URPM/Makefile]) -+ AC_CONFIG_FILES([scripts/URPM-Makefile.PL]) -+ AC_CONFIG_FILES([scripts/URPM-Makefile]) - fi - ]) - AC_SUBST(WITH_PERL_URPM_SUBDIR) diff --git a/rpm-builddir-readlink.patch b/rpm-builddir-readlink.patch index 0453045..069650f 100644 --- a/rpm-builddir-readlink.patch +++ b/rpm-builddir-readlink.patch @@ -1,18 +1,16 @@ --- rpm-4.5/scripts/find-debuginfo.sh~ 2010-01-27 19:25:48.000000000 +0200 +++ rpm-4.5/scripts/find-debuginfo.sh 2010-01-27 20:23:37.279516094 +0200 -@@ -24,6 +24,11 @@ - strict=false - - RPM_BUILD_DIR="`pwd`" -+# canon RPM_BUILD_DIR, the DW_AT_comp_dir in ELF objects is real a real path +@@ -385,6 +385,9 @@ + debug_base_name="$BUILDDIR" + debug_dest_name="/usr/src/debug/${unique_debug_src_base}" + fi ++# canon debug_base_name, the DW_AT_comp_dir in ELF objects is real a real path +# and debugedit will ignore them as they are out of build dir. -+RPM_BUILD_DIR=$(readlink -f "$RPM_BUILD_DIR") -+echo "RPM_BUILD_DIR=$RPM_BUILD_DIR" -+ - BUILDDIR=. - out=debugfiles.list - nout=0 -@@ -201,6 +203,11 @@ ++ debug_base_name=$(readlink -f "$debug_base_name") + no_recompute= + if [ "$no_recompute_build_id" = "true" ]; then + no_recompute="-n" +@@ -398,6 +400,11 @@ $strict && exit 2 fi @@ -21,6 +19,6 @@ + $strict && exit 2 + fi + - [ -x /usr/bin/gdb-add-index ] && /usr/bin/gdb-add-index "$f" > /dev/null 2>&1 - - # A binary already copied into /usr/lib/debug doesn't get stripped, + # Add .gdb_index if requested. + if $include_gdb_index; then + if type gdb-add-index >/dev/null 2>&1; then diff --git a/rpm-changelog_order_check_nonfatal.patch b/rpm-changelog_order_check_nonfatal.patch index 9211b91..4fca83f 100644 --- a/rpm-changelog_order_check_nonfatal.patch +++ b/rpm-changelog_order_check_nonfatal.patch @@ -1,13 +1,13 @@ --- rpm-4.5/build/parseChangelog.c.orig 2012-07-24 14:46:12.856158625 +0200 +++ rpm-4.5/build/parseChangelog.c 2012-07-24 14:47:55.293158624 +0200 @@ -181,9 +181,8 @@ - return RPMRC_FAIL; + goto exit; } if (lastTime && lastTime < time) { - rpmlog(RPMLOG_ERR, + rpmlog(RPMLOG_WARNING, _("%%changelog not in descending chronological order\n")); -- return RPMRC_FAIL; +- goto exit; } - lastTime = time; - + for (i = 0; i < date_words; i++) { + SKIPSPACE(s); diff --git a/rpm-cleanbody.patch b/rpm-cleanbody.patch deleted file mode 100644 index 4c25d33..0000000 --- a/rpm-cleanbody.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- rpm-4.4.9/build/parseBuildInstallClean.c 2008-01-30 23:16:55.347346942 +0200 -+++ rpm-4.4.9/build/parseBuildInstallClean.c 2008-01-30 23:22:24.241459876 +0200 -@@ -51,7 +51,7 @@ - if (s && *s) - *iobp = rpmiobAppend(*iobp, s, 0); - s = _free(s); --#if !defined(RPM_VENDOR_OPENPKG) /* still-support-section-clean */ -+#if !defined(RPM_VENDOR_OPENPKG) && !defined(RPM_VENDOR_PLD) /* still-support-section-clean */ - /* OpenPKG still wishes to use "%clean" script/section */ - iobp = NULL; /* XXX skip %clean from spec file. */ - #endif diff --git a/rpm-db_buffer_small.patch b/rpm-db_buffer_small.patch deleted file mode 100644 index 1c45d3a..0000000 --- a/rpm-db_buffer_small.patch +++ /dev/null @@ -1,84 +0,0 @@ -In certain cases with BerkleyDB 5.3.x we are getting the error: - -db3.c:1443: dbcursor->pget(-30999): BDB0063 DB_BUFFER_SMALL: User memory too small for return value - -See https://bugs.launchpad.net/rpm/+bug/934420 for more information. - -It appears to be some type of a bug in the BerkleyDB 5.3.x. In an attempt -to workaround the problem, when we encounter this situation we attempt -to adjust the size of the mmap buffer until the call works, or we -end up trying 25 times. The new size is either the updated vp->size -from the failed pget call, or the previous size + 4096. - -If DBI debugging is enabled, additional diagnostics are printed, otherwise -a basic retry and success message is added to show that the failure was -resolved. - -Signed-off-by: Mark Hatle - -Index: rpm-5.4.9/rpmdb/rpmdb.c -=================================================================== ---- rpm-5.4.9.orig/rpmdb/rpmdb.c -+++ rpm-5.4.9/rpmdb/rpmdb.c -@@ -2212,8 +2212,12 @@ static int rpmmiGet(dbiIndex dbi, DBC * - vp->flags |= DB_DBT_USERMEM; - rc = dbiGet(dbi, dbcursor, kp, vp, flags); - if (rc == DB_BUFFER_SMALL) { -+ int retry = 0; -+ size_t origlen = vp->size; - size_t uhlen = vp->size; -- void * uh = mmap(NULL, uhlen, _prot, _flags, _fdno, _off); -+ void * uh; -+retry_get: -+ uh = mmap(NULL, uhlen, _prot, _flags, _fdno, _off); - if (uh == NULL || uh == (void *)-1) - fprintf(stderr, - "==> mmap(%p[%u], 0x%x, 0x%x, %d, 0x%x) error(%d): %s\n", -@@ -2235,6 +2239,25 @@ static int rpmmiGet(dbiIndex dbi, DBC * - if (munmap(uh, uhlen) != 0) - fprintf(stderr, "==> munmap(%p[%u]) error(%d): %s\n", - uh, (unsigned)uhlen, errno, strerror(errno)); -+ /* We want to be sure to limit the number of retry attempts to avoid a loop! */ -+ if (rc == DB_BUFFER_SMALL && retry < 25) { -+ /* If we got a largr vp-size back, use that, otherwise increment the size by 1k */ -+ uhlen = vp->size > uhlen ? vp->size : uhlen + 4096; -+ retry++; -+ if (_rpmmi_debug || (dbi)->dbi_debug) -+ fprintf(stderr, "==> DB_BUFFER_SMALL orig requested (%d), configured (%d), forcing larger buffer (%d), new size (%d)\n", -+ origlen, vp->ulen, uhlen, vp->size); -+ else -+ fprintf(stderr, "==> retry (%d) db3cpget (%d)\n", retry, uhlen); -+ goto retry_get; -+ } -+ } -+ if (retry) { -+ if (_rpmmi_debug || (dbi)->dbi_debug) -+ fprintf(stderr, "==> success orig requested (%d), configured buffer (%d), buffer (%d), size after dbiGet (%d)\n", -+ origlen, vp->ulen, uhlen, vp->size); -+ else -+ fprintf(stderr, "==> success\n"); - } - } - } else -Index: rpm-5.4.9/rpmdb/db3.c -=================================================================== ---- rpm-5.4.9.orig/rpmdb/db3.c -+++ rpm-5.4.9/rpmdb/db3.c -@@ -1442,6 +1442,8 @@ - rc = dbcursor->pget(dbcursor, key, pkey, data, flags); - /* XXX DB_NOTFOUND can be returned */ - _printit = (rc == DB_NOTFOUND ? 0 : _debug); -+// /* XXX Permit DB_BUFFER_SMALL to be returned (more restrictive?) */ -+// _printit = (rc == DB_BUFFER_SMALL ? 0 : _printit); - rc = cvtdberr(dbi, "dbcursor->pget", rc, _printit); - #else - /* XXX db3 does DB_FIRST on uninitialized cursor */ -@@ -1452,7 +1452,7 @@ assert(db != NULL); - #endif - } - --DBIDEBUG(dbi, (stderr, "<-- %s(%p,%p,%p,%p,%p,0x%x) rc %d %s%s\n", __FUNCTION__, dbi, dbcursor, key, pkey, data, flags, rc, _DBCFLAGS(flags), _KEYDATA(key, pkey, data, NULL))); -+DBIDEBUG(dbi, (stderr, "<-- %s(%p,%p,%p,%p,%p,0x%x) rc %d %s%s\n", __FUNCTION__, dbi, dbcursor, key, pkey, data, flags, rc, _DBCFLAGS(flags), _KEYDATA(key, pkey, rc == DB_BUFFER_SMALL ? NULL : data, NULL))); - return rc; - } - /*@=mustmod@*/ diff --git a/rpm-dirdeps-macro.patch b/rpm-dirdeps-macro.patch deleted file mode 100644 index 8c8c882..0000000 --- a/rpm-dirdeps-macro.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- rpm-5.4.10/lib/depends.c~ 2012-04-15 23:20:56.000000000 +0200 -+++ rpm-5.4.10/lib/depends.c 2012-09-03 23:00:59.363079731 +0200 -@@ -1569,7 +1569,7 @@ - int terminate = 2; /* XXX terminate if rc >= terminate */ - int rc; - int ourrc = 0; --#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) || defined(RPM_OPTIONAL_DIRNAME_AND_SYMLINK_DEPS) /* optional-dirname-and-symlink-deps */ -+#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) || defined(RPM_VENDOR_PLD) || defined(RPM_OPTIONAL_DIRNAME_AND_SYMLINK_DEPS) /* optional-dirname-and-symlink-deps */ - int dirname_deps; - int symlink_deps; - #endif -@@ -1648,7 +1648,7 @@ - } - } - --#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) || defined(RPM_OPTIONAL_DIRNAME_AND_SYMLINK_DEPS) /* optional-dirname-and-symlink-deps */ -+#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) || defined(RPM_VENDOR_PLD) || defined(RPM_OPTIONAL_DIRNAME_AND_SYMLINK_DEPS) /* optional-dirname-and-symlink-deps */ - dirname_deps = rpmExpandNumeric("%{?_check_dirname_deps}%{?!_check_dirname_deps:1}"); - if (dirname_deps) { - #endif -@@ -1692,7 +1692,7 @@ - /*@switchbreak@*/ break; - } - } --#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) || defined(RPM_OPTIONAL_DIRNAME_AND_SYMLINK_DEPS) /* optional-dirname-and-symlink-deps */ -+#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) || defined(RPM_VENDOR_PLD) || defined(RPM_OPTIONAL_DIRNAME_AND_SYMLINK_DEPS) /* optional-dirname-and-symlink-deps */ - } - - symlink_deps = rpmExpandNumeric("%{?_check_symlink_deps}%{?!_check_symlink_deps:1}"); -@@ -1740,7 +1740,7 @@ - /*@switchbreak@*/ break; - } - } --#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) || defined(RPM_OPTIONAL_DIRNAME_AND_SYMLINK_DEPS) /* optional-dirname-and-symlink-deps */ -+#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) || defined(RPM_VENDOR_PLD) || defined(RPM_OPTIONAL_DIRNAME_AND_SYMLINK_DEPS) /* optional-dirname-and-symlink-deps */ - } - #endif - diff --git a/rpm-fix--p-interpreter-and-empty-script.patch b/rpm-fix--p-interpreter-and-empty-script.patch deleted file mode 100644 index 709b464..0000000 --- a/rpm-fix--p-interpreter-and-empty-script.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- rpm-5.4.10/lib/psm.c~ 2012-09-10 07:58:10.220193941 +0200 -+++ rpm-5.4.10/lib/psm.c 2012-09-10 08:00:38.723522037 +0200 -@@ -1172,8 +1172,7 @@ - - assert(fi->h != NULL); - She->tag = psm->scriptTag; -- if (!headerGet(fi->h, She, 0)) -- goto exit; -+ headerGet(fi->h, She, 0); - - Phe->tag = psm->progTag; - if (!headerGet(fi->h, Phe, 0)) diff --git a/rpm-fix-missing-types-in-headers.patch b/rpm-fix-missing-types-in-headers.patch deleted file mode 100644 index 3c9b399..0000000 --- a/rpm-fix-missing-types-in-headers.patch +++ /dev/null @@ -1,330 +0,0 @@ -diff -ur rpm-5.4.10.orig/rpmio/argv.h rpm-5.4.10/rpmio/argv.h ---- rpm-5.4.10.orig/rpmio/argv.h 2012-09-09 13:54:22.000000000 +0200 -+++ rpm-5.4.10/rpmio/argv.h 2012-09-09 14:43:55.765933246 +0200 -@@ -1,6 +1,8 @@ - #ifndef _H_ARGV_ - #define _H_ARGV_ - -+#include /* XXX FILE * typedef */ -+ - /** \ingroup rpmio - * \file rpmio/argv.h - */ -diff -ur rpm-5.4.10.orig/rpmdb/pkgio.h rpm-5.4.10/rpmdb/pkgio.h ---- rpm-5.4.10.orig/rpmdb/pkgio.h 2012-09-09 13:54:22.000000000 +0200 -+++ rpm-5.4.10/rpmdb/pkgio.h 2012-09-09 14:49:38.112587836 +0200 -@@ -6,6 +6,8 @@ - * Methods to handle package elements. - */ - -+#include /* XXX unint32_t typedef */ -+#include - #include /* XXX FD_t typedef */ - #include /* XXX pgpDig typedef */ - #include /* XXX Header typedef */ -diff -ur rpm-5.4.10.orig/lib/rpm46compat.h rpm-5.4.10/lib/rpm46compat.h ---- rpm-5.4.10.orig/lib/rpm46compat.h 2012-09-09 13:54:23.000000000 +0200 -+++ rpm-5.4.10/lib/rpm46compat.h 2012-09-09 14:25:02.645973220 +0200 -@@ -7,6 +7,7 @@ - #ifndef H_RPM46COMPAT - #define H_RPM46COMPAT 1 - -+#include /* XXX unint32_t typedef */ - #include - #include - -diff -ur rpm-5.4.10.orig/lib/rpm4compat.h rpm-5.4.10/lib/rpm4compat.h ---- rpm-5.4.10.orig/lib/rpm4compat.h 2012-09-09 13:54:23.000000000 +0200 -+++ rpm-5.4.10/lib/rpm4compat.h 2012-09-09 14:25:12.069306220 +0200 -@@ -42,6 +42,7 @@ - #include - #include - #include -+#include /* XXX unint32_t typedef */ - - #define WITH_DB - #define _RPMDB_INTERNAL -diff -ur rpm-5.4.10.orig/rpmio/rpmbf.h rpm-5.4.10/rpmio/rpmbf.h ---- rpm-5.4.10.orig/rpmio/rpmbf.h 2012-09-09 13:54:22.000000000 +0200 -+++ rpm-5.4.10/rpmio/rpmbf.h 2012-09-09 14:27:36.982634442 +0200 -@@ -1,6 +1,8 @@ - #ifndef H_RPMBF - #define H_RPMBF - -+#include /* XXX size_t typedef */ -+ - /** \ingroup rpmio - * \file rpmio/rpmbf.h - */ -diff -ur rpm-5.4.10.orig/build/rpmbuild.h rpm-5.4.10/build/rpmbuild.h ---- rpm-5.4.10.orig/build/rpmbuild.h 2012-09-09 13:54:23.000000000 +0200 -+++ rpm-5.4.10/build/rpmbuild.h 2012-09-09 14:38:45.262610867 +0200 -@@ -7,6 +7,7 @@ - */ - - #include -+#include /* XXX FD_t typedef */ - #include - #include - #include -diff -ur rpm-5.4.10.orig/lib/rpmcli.h rpm-5.4.10/lib/rpmcli.h ---- rpm-5.4.10.orig/lib/rpmcli.h 2012-09-09 13:54:23.000000000 +0200 -+++ rpm-5.4.10/lib/rpmcli.h 2012-09-09 14:25:48.149304946 +0200 -@@ -5,6 +5,7 @@ - * \file lib/rpmcli.h - */ - -+#include /* XXX unint32_t typedef */ - #include - #include - #include -diff -ur rpm-5.4.10.orig/rpmconstant/rpmconstant.h rpm-5.4.10/rpmconstant/rpmconstant.h ---- rpm-5.4.10.orig/rpmconstant/rpmconstant.h 2012-09-09 13:54:24.000000000 +0200 -+++ rpm-5.4.10/rpmconstant/rpmconstant.h 2012-09-09 14:25:56.589304650 +0200 -@@ -18,6 +18,8 @@ - * - */ - -+#include /* XXX unint32_t typedef */ -+ - #include - #include /* XXX fnpyKey */ - #include -diff -ur rpm-5.4.10.orig/rpmdb/rpmdb.h rpm-5.4.10/rpmdb/rpmdb.h ---- rpm-5.4.10.orig/rpmdb/rpmdb.h 2012-09-09 13:54:22.000000000 +0200 -+++ rpm-5.4.10/rpmdb/rpmdb.h 2012-09-09 14:26:05.802637657 +0200 -@@ -7,6 +7,7 @@ - * Access RPM indices using Berkeley DB interface(s). - */ - -+#include /* XXX unint32_t typedef */ - #include - #include - -diff -ur rpm-5.4.10.orig/lib/rpmds.h rpm-5.4.10/lib/rpmds.h ---- rpm-5.4.10.orig/lib/rpmds.h 2012-09-09 13:54:23.000000000 +0200 -+++ rpm-5.4.10/lib/rpmds.h 2012-09-09 15:30:02.718364975 +0200 -@@ -6,7 +6,12 @@ - * Structure(s) used for dependency tag sets. - */ - -+#include /* XXX FILE * typedef */ -+#include /* XXX size_t typedef */ -+#include -+#include - #include -+#include - #define _RPMNS_INTERNAL - #include - #include -diff -ur rpm-5.4.10.orig/rpmdb/rpmevr.h rpm-5.4.10/rpmdb/rpmevr.h ---- rpm-5.4.10.orig/rpmdb/rpmevr.h 2012-09-09 13:54:22.000000000 +0200 -+++ rpm-5.4.10/rpmdb/rpmevr.h 2012-09-09 14:39:25.295942787 +0200 -@@ -1,6 +1,8 @@ - #ifndef H_RPMEVR - #define H_RPMEVR - -+#include /* XXX unint32_t typedef */ -+ - /** \ingroup rpmds - * \file lib/rpmevr.h - * Structure(s) and routine(s) used for EVR parsing and comparison. -diff -ur rpm-5.4.10.orig/lib/rpmfi.h rpm-5.4.10/lib/rpmfi.h ---- rpm-5.4.10.orig/lib/rpmfi.h 2012-09-09 13:54:23.000000000 +0200 -+++ rpm-5.4.10/lib/rpmfi.h 2012-09-09 15:32:47.761692486 +0200 -@@ -1,6 +1,11 @@ - #ifndef H_RPMFI - #define H_RPMFI - -+#include /* XXX size_t typedef */ -+#include -+#include -+#include -+ - /** \ingroup rpmfi - * \file lib/rpmfi.h - * Structure(s) used for file info tag sets. -diff -ur rpm-5.4.10.orig/lib/rpmgi.h rpm-5.4.10/lib/rpmgi.h ---- rpm-5.4.10.orig/lib/rpmgi.h 2012-09-09 13:54:23.000000000 +0200 -+++ rpm-5.4.10/lib/rpmgi.h 2012-09-09 15:31:45.738361341 +0200 -@@ -8,9 +8,12 @@ - #include - #include - #include -+#include - #include - #include - #include -+#include -+#include /* XXX FD_t typedef */ - - /** - */ -diff -ur rpm-5.4.10.orig/rpmio/rpmiotypes.h rpm-5.4.10/rpmio/rpmiotypes.h ---- rpm-5.4.10.orig/rpmio/rpmiotypes.h 2012-09-09 13:54:22.000000000 +0200 -+++ rpm-5.4.10/rpmio/rpmiotypes.h 2012-09-09 14:27:26.585968142 +0200 -@@ -1,6 +1,9 @@ - #ifndef _H_RPMIOTYPES_ - #define _H_RPMIOTYPES_ - -+#include /* XXX NULL typedef */ -+#include /* XXX size_t typedef */ -+ - /** \ingroup rpmio - * \file rpmio/rpmiotypes.h - */ -diff -ur rpm-5.4.10.orig/rpmio/rpmmacro.h rpm-5.4.10/rpmio/rpmmacro.h ---- rpm-5.4.10.orig/rpmio/rpmmacro.h 2012-09-09 13:54:22.000000000 +0200 -+++ rpm-5.4.10/rpmio/rpmmacro.h 2012-09-09 14:29:08.622631207 +0200 -@@ -1,6 +1,9 @@ - #ifndef _H_MACRO_ - #define _H_MACRO_ - -+#include /* XXX FILE * typedef */ -+#include /* XXX size_t typedef */ -+ - /** \ingroup rpmio - * \file rpmio/rpmmacro.h - */ -diff -ur rpm-5.4.10.orig/rpmdb/rpmns.h rpm-5.4.10/rpmdb/rpmns.h ---- rpm-5.4.10.orig/rpmdb/rpmns.h 2012-09-09 13:54:22.000000000 +0200 -+++ rpm-5.4.10/rpmdb/rpmns.h 2012-09-09 15:33:08.021691772 +0200 -@@ -1,6 +1,9 @@ - #ifndef H_RPMNS - #define H_RPMNS - -+#include /* XXX size_t typedef */ -+#include -+ - /** \ingroup rpmds - * \file lib/rpmns.h - * Structure(s) and routine(s) used for classifying and parsing names. -diff -ur rpm-5.4.10.orig/lib/rpmps.h rpm-5.4.10/lib/rpmps.h ---- rpm-5.4.10.orig/lib/rpmps.h 2012-09-09 13:54:23.000000000 +0200 -+++ rpm-5.4.10/lib/rpmps.h 2012-09-09 14:47:02.782593316 +0200 -@@ -1,6 +1,9 @@ - #ifndef H_RPMPS - #define H_RPMPS - -+#include /* XXX FILE * typedef */ -+#include -+ - /** \ingroup rpmps - * \file lib/rpmps.h - * Structures and prototypes used for an "rpmps" problem set. -diff -ur rpm-5.4.10.orig/lib/rpmrc.h rpm-5.4.10/lib/rpmrc.h ---- rpm-5.4.10.orig/lib/rpmrc.h 2012-09-09 13:54:23.000000000 +0200 -+++ rpm-5.4.10/lib/rpmrc.h 2012-09-09 14:28:54.559298370 +0200 -@@ -1,6 +1,8 @@ - #ifndef H_RPMRC - #define H_RPMRC - -+#include /* XXX FILE * typedef */ -+ - /** - * \file lib/rpmrc.h - */ -diff -ur rpm-5.4.10.orig/build/rpmspec.h rpm-5.4.10/build/rpmspec.h ---- rpm-5.4.10.orig/build/rpmspec.h 2012-09-09 13:54:23.000000000 +0200 -+++ rpm-5.4.10/build/rpmspec.h 2012-09-09 15:33:14.861691530 +0200 -@@ -6,9 +6,14 @@ - * The Spec and Package data structures used during build. - */ - -+#include /* XXX size_t typedef */ -+#include -+#include - #include - #include /* XXX rpmfi typedef */ - #include /* XXX QVA_t typedef */ -+#include -+#include /* XXX FD_t typedef */ - - /** \ingroup rpmbuild - */ -diff -ur rpm-5.4.10.orig/rpmio/rpmsw.h rpm-5.4.10/rpmio/rpmsw.h ---- rpm-5.4.10.orig/rpmio/rpmsw.h 2012-09-09 13:54:22.000000000 +0200 -+++ rpm-5.4.10/rpmio/rpmsw.h 2012-09-09 15:35:35.208353246 +0200 -@@ -1,6 +1,9 @@ - #ifndef H_RPMSW - #define H_RPMSW - -+#include /* XXX FILE * typedef */ -+#include /* XXX struct timeval typedef */ -+ - /** \ingroup rpmio - * \file rpmio/rpmsw.h - */ -diff -ur rpm-5.4.10.orig/rpmdb/rpmtag.h rpm-5.4.10/rpmdb/rpmtag.h ---- rpm-5.4.10.orig/rpmdb/rpmtag.h 2012-09-09 13:54:22.000000000 +0200 -+++ rpm-5.4.10/rpmdb/rpmtag.h 2012-09-09 14:26:15.429303984 +0200 -@@ -5,6 +5,7 @@ - * \file rpmdb/rpmtag.h - */ - -+#include /* XXX unint32_t typedef */ - #include - #include - -diff -ur rpm-5.4.10.orig/lib/rpmte.h rpm-5.4.10/lib/rpmte.h ---- rpm-5.4.10.orig/lib/rpmte.h 2012-09-09 13:54:23.000000000 +0200 -+++ rpm-5.4.10/lib/rpmte.h 2012-09-09 15:32:00.408360824 +0200 -@@ -5,7 +5,13 @@ - * \file lib/rpmte.h - * Structures used for an "rpmte" transaction element. - */ -+#include /* XXX unint32_t typedef */ -+#include /* XXX size_t typedef */ -+#include -+#include - #include -+#include -+#include /* XXX FD_t typedef */ - - /** - */ -diff -ur rpm-5.4.10.orig/lib/rpmts.h rpm-5.4.10/lib/rpmts.h ---- rpm-5.4.10.orig/lib/rpmts.h 2012-09-09 13:54:23.000000000 +0200 -+++ rpm-5.4.10/lib/rpmts.h 2012-09-09 15:30:53.381696521 +0200 -@@ -6,9 +6,14 @@ - * Structures and prototypes used for an "rpmts" transaction set. - */ - --#include "rpmps.h" --#include "rpmsw.h" -+#include /* XXX FILE * typedef */ -+#include /* XXX unint32_t typedef */ -+#include -+#include -+#include -+#include - #include /* XXX pgpVSFlags */ -+#include - #if defined(_RPMTS_INTERNAL) - #include - #endif -diff -ur rpm-5.4.10.orig/lib/rpmversion.h rpm-5.4.10/lib/rpmversion.h ---- rpm-5.4.10.orig/lib/rpmversion.h 2012-09-09 13:54:23.000000000 +0200 -+++ rpm-5.4.10/lib/rpmversion.h 2012-09-09 14:29:18.352630865 +0200 -@@ -1,6 +1,8 @@ - #ifndef __RPMVERSION_H__ - #define __RPMVERSION_H__ - -+#include /* XXX unint32_t typedef */ -+ - #ifdef __cplusplus - extern "C" { - #endif -diff -ur rpm-5.4.10.orig/rpmio/yarn.h rpm-5.4.10/rpmio/yarn.h ---- rpm-5.4.10.orig/rpmio/yarn.h 2012-09-09 13:54:22.000000000 +0200 -+++ rpm-5.4.10/rpmio/yarn.h 2012-09-09 15:37:09.928349906 +0200 -@@ -111,6 +111,9 @@ - handler will exit (set to NULL by default for no action) - */ - -+#include /* XXX size_t typedef */ -+#include /* XXX yarnLock typedef */ -+ - #ifdef __cplusplus - extern "C" { - #endif diff --git a/rpm-gendiff.patch b/rpm-gendiff.patch deleted file mode 100644 index 6eec5b1..0000000 --- a/rpm-gendiff.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- ./scripts/gendiff.org 2008-04-06 10:48:23.000000000 +0200 -+++ ./scripts/gendiff 2009-02-11 15:44:23.070120721 +0100 -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!/bin/bash - - function usage () { - echo "usage: $0 " 1>&2 diff --git a/rpm-helperEVR-noassert.patch b/rpm-helperEVR-noassert.patch deleted file mode 100644 index 17a5146..0000000 --- a/rpm-helperEVR-noassert.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- rpm-4.5/lib/rpmfc.c.orig 2012-02-13 20:28:52.564758176 +0100 -+++ rpm-4.5/lib/rpmfc.c 2012-02-14 19:01:50.810809655 +0100 -@@ -472,7 +472,10 @@ - } - i++; - EVR = pav[i]; --assert(EVR != NULL); -+ if(EVR == NULL) { -+ rpmlog(RPMLOG_ERR, _("%s helper returned empty version info for %s, omitting\n"), nsdep, N); -+ continue; -+ } - } - /*@=branchstate@*/ - diff --git a/rpm-installbeforeerase.patch b/rpm-installbeforeerase.patch deleted file mode 100644 index 8939bfa..0000000 --- a/rpm-installbeforeerase.patch +++ /dev/null @@ -1,35 +0,0 @@ - 4.4.9 -> 4.5: -+ - jbj: add a relation to to force install-before-erase. -+ - jbj: display dependency loops as an error for now. - - glen: do not skip %clean from spec file - - robert: install rpmdeps and debugedit to pkglibdir as on HEAD - - jbj: fix: python ts.hdrFromFdno(fdno) segfault. ---- rpm-5.4.10/lib/order.c~ 2012-07-06 17:39:16.000000000 +0200 -+++ rpm-5.4.10/lib/order.c 2012-09-03 23:09:03.706487979 +0200 -@@ -1631,7 +1631,7 @@ - (void) orgrpmAddRelation(ts, al, p, requires); - } - --#ifdef NOTYET -+#if defined(RPM_VENDOR_PLD) - /* Ensure that erasures follow installs during upgrades. */ - if (rpmteType(p) == TR_REMOVED && p->flink.Pkgid && p->flink.Pkgid[0]) { - rpmtsi qi; -@@ -1652,7 +1652,7 @@ - } - qi = rpmtsiFree(qi); - } --#endif /* NOTYET */ -+#endif - - #ifdef NOTYET - /* Order by requiring parent directories as prerequisites. */ -@@ -2175,7 +2175,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_PLD) /* 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 diff --git a/rpm-libmagic-locale.patch b/rpm-libmagic-locale.patch deleted file mode 100644 index d83f577..0000000 --- a/rpm-libmagic-locale.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- rpm-4.5/rpmio/rpmmg.c.org 2012-02-29 16:32:05.655058968 +0100 -+++ rpm-4.5/rpmio/rpmmg.c 2012-02-29 16:36:22.430972834 +0100 -@@ -118,7 +118,29 @@ - /*@fallthrough@*/ - case URL_IS_UNKNOWN: - default: -+ { -+ char *old_ctype = setlocale(LC_CTYPE, NULL); -+ char *old_collate = setlocale(LC_COLLATE, NULL); -+ -+ if (old_ctype) { -+ old_ctype = xstrdup(old_ctype); -+ setlocale(LC_CTYPE, "C"); -+ } -+ if (old_collate) { -+ old_collate = xstrdup(old_collate); -+ setlocale(LC_COLLATE, "C"); -+ } -+ - t = magic_file(mg->ms, fn); -+ -+ if (old_ctype) { -+ setlocale(LC_CTYPE, old_ctype); -+ _free(old_ctype); -+ } -+ if (old_collate) { -+ setlocale(LC_COLLATE, old_collate); -+ _free(old_collate); -+ } - /* XXX HACK: libmagic compiled without spews here. */ - if (t == NULL) { - const char * msg = magic_error(mg->ms); -@@ -147,6 +176,7 @@ - rpmlog(RPMLOG_ERR, _("magic_file(ms, %s) failed: %s\n"), - (fn ? fn : "(nil)"), msg); - } -+ } - break; - } - } diff --git a/rpm-libtool-deps.patch b/rpm-libtool-deps.patch index 4dc62f4..443d1fd 100644 --- a/rpm-libtool-deps.patch +++ b/rpm-libtool-deps.patch @@ -15,7 +15,7 @@ do case "$possible" in *.la) -- if grep -iq '^# Generated by ltmain.sh' "$possible" 2> /dev/null ; then +- if grep -Eiq '^# Generated by (libtool|ltmain.sh)' "$possible" 2> /dev/null ; then + if file -L "$possible" | grep -iq 'libtool library file' 2> /dev/null ; then possible="`echo ${possible} | sed -e s,${RPM_BUILD_ROOT}/,/,`" echo "libtool($possible)" diff --git a/rpm-mimetype.patch b/rpm-mimetype.patch deleted file mode 100644 index ed51d83..0000000 --- a/rpm-mimetype.patch +++ /dev/null @@ -1,73 +0,0 @@ -diff -urN rpm-5.1.4/lib/rpmfc.c rpm-5.1.4.new/lib/rpmfc.c ---- rpm-5.1.4/lib/rpmfc.c 2008-07-29 19:36:38.000000000 +0200 -+++ rpm-5.1.4.new/lib/rpmfc.c 2008-07-29 19:43:42.000000000 +0200 -@@ -527,6 +527,8 @@ - { "troff or preprocessor input", RPMFC_MANPAGE|RPMFC_INCLUDE }, - { "GNU Info", RPMFC_MANPAGE|RPMFC_INCLUDE }, - -+ { "Desktop Entry", RPMFC_DESKTOP_FILE|RPMFC_INCLUDE }, -+ - { "perl script text", RPMFC_PERL|RPMFC_INCLUDE }, - { "Perl5 module source text", RPMFC_PERL|RPMFC_MODULE|RPMFC_INCLUDE }, - -@@ -875,6 +877,9 @@ - if (fc->fcolor->vals[fc->ix] & RPMFC_JAVA) { - xx = rpmfcHelper(fc, 'P', "java"); - xx = rpmfcHelper(fc, 'R', "java"); -+ } else -+ if (fc->fcolor->vals[fc->ix] & RPMFC_DESKTOP_FILE) { -+ xx = rpmfcHelper(fc, 'P', "mimetype"); - } - - /*@-observertrans@*/ -@@ -957,7 +963,7 @@ - /*@unchecked@*/ - static struct rpmfcApplyTbl_s rpmfcApplyTable[] = { - { rpmfcELF, RPMFC_ELF }, -- { rpmfcSCRIPT, (RPMFC_SCRIPT|RPMFC_FONT|RPMFC_HASKELL|RPMFC_PERL|RPMFC_PYTHON|RPMFC_LIBTOOL|RPMFC_PKGCONFIG|RPMFC_BOURNE|RPMFC_JAVA|RPMFC_PHP|RPMFC_MONO|RPMFC_TYPELIB) }, -+ { rpmfcSCRIPT, (RPMFC_SCRIPT|RPMFC_FONT|RPMFC_HASKELL|RPMFC_PERL|RPMFC_PYTHON|RPMFC_LIBTOOL|RPMFC_PKGCONFIG|RPMFC_BOURNE|RPMFC_JAVA|RPMFC_PHP|RPMFC_MONO|RPMFC_TYPELIB|RPMFC_DESKTOP_FILE) }, - #if defined(RPM_VENDOR_MANDRIVA) - { rpmfcSYMLINK, RPMFC_SYMLINK }, - #endif -@@ -1311,6 +1317,9 @@ - else if (_suffix(s, ".php")) - ftype = "PHP script text"; - -+ else if (_suffix(s, ".desktop")) -+ ftype = "Desktop Entry"; -+ - /* XXX files with extension ".typelib" are GNOME typelib for now. */ - else if (_suffix(s, ".typelib")) - ftype = "G-IR binary database"; -diff -urN rpm-5.1.4/lib/rpmfc.h rpm-5.1.4.new/lib/rpmfc.h ---- rpm-5.1.4/lib/rpmfc.h 2008-07-29 19:36:38.000000000 +0200 -+++ rpm-5.1.4.new/lib/rpmfc.h 2008-07-29 19:44:27.000000000 +0200 -@@ -28,7 +28,7 @@ - #define RPMFC_ELF (RPMFC_ELF32|RPMFC_ELF64|RPMFC_ELFMIPSN32) - /* (1 << 3) leaks into package headers, reserved */ - -- /* bit 4 unused */ -+ RPMFC_DESKTOP_FILE = (1 << 4), - RPMFC_TYPELIB = (1 << 5), - RPMFC_HASKELL = (1 << 6), - RPMFC_RUBY = (1 << 7), -diff -urN rpm-5.1.4/macros/macros.in rpm-5.1.4.new/macros/macros.in ---- rpm-5.1.4/macros/macros.in 2008-07-29 19:36:38.000000000 +0200 -+++ rpm-5.1.4.new/macros/macros.in 2008-07-29 19:45:45.000000000 +0200 -@@ -1617,6 +1617,16 @@ - #}1}%{rpm_license_check} - - #------------------------------------------------------------------------ -+# mimetype(...) configuration. -+# -+# Path to script to autogenerate mimetype(foo) provides, based on MimeType -+# key from desktop files. -+# -+# Note: Used if _use_internal_dependency_generator is non-zero. The -+# helper is also used by %{_uselibrpm}/rpmdeps --provides -+%__mimetype_provides %{_usrlibrpm}/mimetypedeps.sh --provides -+ -+#------------------------------------------------------------------------ - # executable(...) configuration. - # - # Path to scripts to autogenerate executable(foo) script dependencies, diff --git a/rpm-old-fileconflicts-behaviour.patch b/rpm-old-fileconflicts-behaviour.patch deleted file mode 100644 index 1e59501..0000000 --- a/rpm-old-fileconflicts-behaviour.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- rpm-5.3.11/lib/poptI.c~ 2011-05-08 01:58:28.000000000 +0300 -+++ rpm-5.3.11/lib/poptI.c 2011-10-06 18:36:39.099587792 +0300 -@@ -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_PLD) /* dont-filter-install-file-conflicts */ - .probFilter = RPMPROB_FILTER_NONE, - #else - .probFilter = (RPMPROB_FILTER_REPLACEOLDFILES | RPMPROB_FILTER_REPLACENEWFILES), diff --git a/rpm-perl-macros.patch b/rpm-perl-macros.patch index dd1adf4..d5c6c5f 100644 --- a/rpm-perl-macros.patch +++ b/rpm-perl-macros.patch @@ -14,7 +14,7 @@ @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!@__PERL@ - + # RPM (and its source code) is covered under two separate licenses. @@ -41,7 +41,11 @@ diff --git a/rpm-popt-coreutils.patch b/rpm-popt-coreutils.patch deleted file mode 100644 index 250ae97..0000000 --- a/rpm-popt-coreutils.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- rpm-4.5/rpmpopt.in~ 2008-06-10 14:24:49.000000000 +0300 -+++ rpm-4.5/rpmpopt.in 2008-06-10 14:26:04.428174732 +0300 -@@ -55,8 +55,8 @@ - --POPTdesc=$"set permissions of files in a package" - - rpm alias --setugids -q --qf \ -- '[ch %{FILEUSERNAME:shescape} %{FILEGROUPNAME:shescape} %{FILENAMES:shescape}\n]' \ -- --pipe "(echo 'ch() { chown -h -- \"$1\" \"$3\";chgrp -h -- \"$2\" \"$3\"; }';grep -v \(none\))|sh" \ -+ '[chown -h -- %{FILEUSERNAME:shescape}:%{FILEGROUPNAME:shescape} %{FILENAMES:shescape}\n]' \ -+ --pipe "grep -v '(none)' | sh" \ - --POPTdesc=$"set user/group ownership of files in a package" - - rpm alias --conflicts --qf \ diff --git a/rpm-postun-nofail.patch b/rpm-postun-nofail.patch index 2c9b8c0..2ab8817 100644 --- a/rpm-postun-nofail.patch +++ b/rpm-postun-nofail.patch @@ -1,13 +1,13 @@ --- rpm-4.5/lib/psm.c.org 2008-11-21 17:20:34.293584455 +0100 +++ rpm-4.5/lib/psm.c 2008-11-21 17:21:41.482728047 +0100 -@@ -2114,8 +2114,8 @@ - psm->countCorrection = -1; +@@ -789,8 +789,8 @@ + } - if (!(rpmtsFlags(ts) & RPMTRANS_FLAG_NOPOSTUN)) { -- rc = (rpmRC) rpmpsmNext(psm, PSM_SCRIPT); -- if (rc) break; -+ if (rpmpsmNext(psm, PSM_SCRIPT)) -+ rpmlog(RPMLOG_INFO, _("Ignoring failed %%postun scriptlet\n")); - } + if (!(rpmtsFlags(ts) & RPMTRANS_FLAG_NOPOSTUN)) { +- rc = runInstScript(psm, RPMTAG_POSTUN); +- if (rc) break; ++ if (runInstScript(psm, RPMTAG_POSTUN)) ++ rpmlog(RPMLOG_INFO, _("Ignoring failed %%postun scriptlet\n")); + } - if (!(rpmtsFlags(ts) & RPMTRANS_FLAG_NOTRIGGERPOSTUN)) { + if (!(rpmtsFlags(ts) & RPMTRANS_FLAG_NOTRIGGERPOSTUN)) { diff --git a/rpm-semanage.patch b/rpm-semanage.patch deleted file mode 100644 index 06672d2..0000000 --- a/rpm-semanage.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- rpm-5.4.15/rpmio/macro.c.orig 2017-02-20 18:33:02.615449768 +0100 -+++ rpm-5.4.15/rpmio/macro.c 2017-02-20 19:38:27.348738287 +0100 -@@ -102,7 +102,7 @@ - #include "debug.h" - - /*@unchecked@*/ --#if defined(WITH_AUGEAS) || defined(WITH_FICL) || defined(WITH_GPSEE) || defined(WITH_NIX) || defined(WITH_PERLEMBED) || defined(WITH_PYTHONEMBED) || defined(WITH_RUBYEMBED) || defined(WITH_SQLITE) || defined(WITH_SQUIRREL) || defined(WITH_TCL) -+#if defined(WITH_AUGEAS) || defined(WITH_FICL) || defined(WITH_GPSEE) || defined(WITH_NIX) || defined(WITH_PERLEMBED) || defined(WITH_PYTHONEMBED) || defined(WITH_RUBYEMBED) || defined(WITH_SQLITE) || defined(WITH_SQUIRREL) || defined(WITH_TCL) || defined(WITH_SEMANAGE) - static int _globalI = 0x80000000; - #endif - -@@ -866,6 +866,8 @@ - return se; - } - -+void delMacroAll(MacroContext mc, const char * n); -+ - /** - * Parse (and execute) macro undefinition. - * @param mc macro context -@@ -1643,7 +1645,7 @@ - * @retval *avp invocation args - * @return script string - */ --#if defined(WITH_AUGEAS) || defined(WITH_FICL) || defined(WITH_GPSEE) || defined(WITH_JNIEMBED) || defined(WITH_PERLEMBED) || defined(WITH_PYTHONEMBED) || defined(WITH_RUBYEMBED) || defined(WITH_MRUBY_EMBED) || defined(WITH_SQLITE) || defined(WITH_SQUIRREL) || defined(WITH_TCL) -+#if defined(WITH_AUGEAS) || defined(WITH_FICL) || defined(WITH_GPSEE) || defined(WITH_JNIEMBED) || defined(WITH_PERLEMBED) || defined(WITH_PYTHONEMBED) || defined(WITH_RUBYEMBED) || defined(WITH_MRUBY_EMBED) || defined(WITH_SQLITE) || defined(WITH_SQUIRREL) || defined(WITH_TCL) || defined(WITH_SEMANAGE) - static char _FIXME_embedded_interpreter_eval_returned_null[] = - "FIXME: embedded interpreter eval returned null."; - static char * parseEmbedded(const char * s, size_t nb, char *** avp) diff --git a/rpm-silence-RPM_CHAR_TYPE.patch b/rpm-silence-RPM_CHAR_TYPE.patch deleted file mode 100644 index f7213ce..0000000 --- a/rpm-silence-RPM_CHAR_TYPE.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- rpm-5.4.10/rpmdb/tagname.c~ 2012-04-25 22:34:49.000000000 +0200 -+++ rpm-5.4.10/rpmdb/tagname.c 2012-09-07 23:10:04.768327450 +0200 -@@ -508,6 +508,7 @@ - if (!(he->tag == 62)) - if (!(he->tag == 261 || he->tag == 269)) - if (!(he->tag == 1000 || he->tag == 1004 || he->tag == 1007)) -+if (!(he->tag == 1029)) - if (!(he->tag == 1086 || he->tag == 1087)) - if (he->t != (tagType(he->tag) & 0xffff)) - fprintf(stderr, "==> warning: tag %u type(0x%x) != implicit type(0x%x)\n", (unsigned) he->tag, he->t, tagType(he->tag)); diff --git a/rpm-sparc64.patch b/rpm-sparc64.patch deleted file mode 100644 index f8e2a01..0000000 --- a/rpm-sparc64.patch +++ /dev/null @@ -1,59 +0,0 @@ ---- rpm-4.4.9/Makefile.am.orig 2007-06-18 17:10:56.000000000 +0200 -+++ rpm-4.4.9/Makefile.am 2007-06-18 17:12:16.000000000 +0200 -@@ -62,19 +62,19 @@ - #rpm_LDFLAGS = $(myLDFLAGS) - #rpm_LDADD = rpm.o $(top_builddir)/build/.libs/librpmbuild.a $(myLDADD) - rpm.o: $(top_srcdir)/rpmqv.c -- $(COMPILE) -fpie -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV -o $@ -c $< -+ $(COMPILE) -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV -o $@ -c $< - - rpmb_SOURCES = $(top_srcdir)/build.c - rpmb_LDFLAGS = $(myLDFLAGS) $(staticLDFLAGS) - rpmb_LDADD = rpmb.o $(top_builddir)/build/librpmbuild.la $(myLDADD) - rpmb.o: $(top_srcdir)/rpmqv.c -- $(COMPILE) -fpie -DIAM_RPMBT -o $@ -c $< -+ $(COMPILE) -DIAM_RPMBT -o $@ -c $< - - rpmd_SOURCES = - rpmd_LDFLAGS = $(myLDFLAGS) $(staticLDFLAGS) - rpmd_LDADD = rpmd.o $(myLDADD) - rpmd.o: $(top_srcdir)/rpmqv.c -- $(COMPILE) -fpie -DIAM_RPMDB -o $@ -c $< -+ $(COMPILE) -DIAM_RPMDB -o $@ -c $< - - rpmi_SOURCES = - rpmi_LDFLAGS = $(myLDFLAGS) # $(staticLDFLAGS) -@@ -82,19 +82,19 @@ - #rpmi_LDFLAGS = $(myLDFLAGS) - #rpmi_LDADD = rpmi.o $(myLDADD) - rpmi.o: $(top_srcdir)/rpmqv.c -- $(COMPILE) -fpie -DIAM_RPMEIU -o $@ -c $< -+ $(COMPILE) -DIAM_RPMEIU -o $@ -c $< - - rpmk_SOURCES = - rpmk_LDFLAGS = $(myLDFLAGS) $(staticLDFLAGS) - rpmk_LDADD = rpmk.o $(myLDADD) - rpmk.o: $(top_srcdir)/rpmqv.c -- $(COMPILE) -fpie -DIAM_RPMK -o $@ -c $< -+ $(COMPILE) -DIAM_RPMK -o $@ -c $< - - rpmq_SOURCES = - rpmq_LDFLAGS = $(myLDFLAGS) # $(staticLDFLAGS) - rpmq_LDADD = rpmq.o $(top_builddir)/build/librpmbuild.la $(myLDADD) - rpmq.o: $(top_srcdir)/rpmqv.c -- $(COMPILE) -fpie -DIAM_RPMQV -o $@ -c $< -+ $(COMPILE) -DIAM_RPMQV -o $@ -c $< - - $(PROGRAMS): @WITH_APIDOCS_TARGET@ - ---- rpm-4.4.9/configure.ac.orig 2007-06-18 17:11:08.000000000 +0200 -+++ rpm-4.4.9/configure.ac 2007-06-18 17:11:37.000000000 +0200 -@@ -35,7 +35,7 @@ - AC_SUBST(AS) - if test "$ac_cv_c_compiler_gnu" = yes; then - CFLAGS="$CFLAGS -fPIC -DPIC -D_GNU_SOURCE -D_REENTRANT -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wno-char-subscripts" -- LDFLAGS="-pie" -+ LDFLAGS="" - fi - export CFLAGS LDFLAGS - diff --git a/rpm-truncate-cvslog.patch b/rpm-truncate-cvslog.patch deleted file mode 100644 index 5d9e977..0000000 --- a/rpm-truncate-cvslog.patch +++ /dev/null @@ -1,64 +0,0 @@ -# vim:ts=8:sw=4 ---- rpm-4.4.6/build/parseChangelog.c~ 2006-04-30 17:34:40.334393487 +0300 -+++ rpm-4.4.6/build/parseChangelog.c 2006-05-02 19:46:06.357193264 +0300 -@@ -8,6 +8,9 @@ - #include "rpmbuild.h" - #include "debug.h" - -+#define CVS_RCSID "$""Log: " -+#define CVS_REVISION "Revision " -+ - void addChangelogEntry(Header h, time_t time, const char *name, const char *text) - { - int_32 mytime = time; /* XXX convert to header representation */ -@@ -123,6 +123,7 @@ - int nentries = 0; - static time_t last = 0; - static int oneshot = 0; -+ int numchangelog = rpmExpandNumeric("%{?_buildchangelogtruncate}"); - - /* Determine changelog truncation criteria. */ - if (!oneshot++) { -@@ -222,6 +223,42 @@ - /* backup to end of description */ - while ((s > text) && xisspace(*s)) - *s-- = '\0'; -+ -+ if (numchangelog && (s = strstr(text, CVS_RCSID))) { -+ /* find end of line */ -+ while(*s && *s != '\n') s++; -+ if (!*s) { -+ goto out; -+ } -+ s++; -+ if (!*s) { -+ goto out; -+ } -+ -+ /* we reached place where first Revisions should be */ -+ i = 0; -+ while (1) { -+ if (strncmp(s, CVS_REVISION, sizeof(CVS_REVISION) - 1) == 0) { -+ if (i++ == numchangelog) { -+ break; -+ } -+ } -+ while(*s && *s != '\n') s++; -+ if (!*s) { -+ break; -+ } -+ s++; -+ } -+ -+ if (*s) { -+ s--; -+ /* backup to the beginning of line */ -+ while ((s > text) && (*s == '\n' || xisspace(*s))) { -+ *s-- = '\0'; -+ } -+ } -+ } -+out: - - /* Add entry if not truncated. */ - nentries++; diff --git a/rpm-unglobal.patch b/rpm-unglobal.patch deleted file mode 100644 index 2e0d9dd..0000000 --- a/rpm-unglobal.patch +++ /dev/null @@ -1,74 +0,0 @@ ---- rpm-4.5/rpmio/macro.c.org 2009-08-08 15:42:25.574860247 +0200 -+++ rpm-4.5/rpmio/macro.c 2009-08-08 15:47:20.495455961 +0200 -@@ -807,6 +807,41 @@ - return se; - } - -+/** -+ * Parse (and execute) macro undefinition. -+ * @param mc macro context -+ * @param se macro name to undefine -+ * @return address to continue parsing -+ */ -+/*@dependent@*/ static const char * -+doUnglobal(MacroContext mc, /*@returned@*/ const char * se) -+ /*@globals rpmGlobalMacroContext @*/ -+ /*@modifies mc, rpmGlobalMacroContext @*/ -+{ -+ const char *s = se; -+ char *buf = alloca(_macro_BUFSIZ); -+ char *n = buf, *ne = n; -+ int c; -+ -+ COPYNAME(ne, s, c); -+ -+ /* Move scan over body */ -+ while (iseol(*s)) -+ s++; -+ se = s; -+ -+ /* Names must start with alphabetic or _ and be at least 3 chars */ -+ if (!((c = *n) && (xisalpha(c) || c == '_') && (ne - n) > 2)) { -+ rpmlog(RPMLOG_ERR, -+ _("Macro %%%s has illegal name (%%unglobal)\n"), n); -+ return se; -+ } -+ -+ delMacroAll(mc, n); -+ -+ return se; -+} -+ - #ifdef DYING - static void - dumpME(const char * msg, MacroEntry me) -@@ -1430,6 +1465,10 @@ - s = doUndefine(mb->mc, se); - continue; - } -+ if (STREQ("unglobal", f, fn)) { -+ s = doUnglobal(mb->mc, se); -+ continue; -+ } - - if (STREQ("echo", f, fn) || - STREQ("warn", f, fn) || -@@ -1984,6 +2023,18 @@ - } - } - -+void -+delMacroAll(MacroContext mc, const char * n) -+{ -+ MacroEntry * mep; -+ -+ if (mc == NULL) mc = rpmGlobalMacroContext; -+ /* If name exists, pop entry */ -+ while ((mep = findEntry(mc, n, 0)) != NULL) { -+ delMacro(mc, n); -+ } -+} -+ - /*@-mustmod@*/ /* LCL: mc is modified through mb->mc, mb is abstract */ - int - rpmDefineMacro(MacroContext mc, const char * macro, int level) diff --git a/rpm.spec b/rpm.spec index 062432b..1b95ba8 100644 --- a/rpm.spec +++ b/rpm.spec @@ -15,7 +15,6 @@ %bcond_with db61 # use DB 6.1 instead of 5.2 %bcond_with neon # build with HTTP/WebDAV support (neon library) %bcond_with sqlite # build with SQLite support -%bcond_with system_lua # use system lua %bcond_without system_pcre # use system pcre %bcond_with keyutils # build with keyutils support @@ -98,31 +97,12 @@ Patch9: %{name}-lua.patch Patch14: %{name}-perl_req-INC_dirs.patch Patch15: %{name}-debuginfo.patch Patch16: vendor-pld.patch -Patch17: %{name}-old-fileconflicts-behaviour.patch Patch18: %{name}-javadeps.patch -Patch19: %{name}-truncate-cvslog.patch Patch20: %{name}-libtool-deps.patch -Patch21: %{name}-mimetype.patch -Patch22: %{name}-sparc64.patch -Patch23: %{name}-gendiff.patch -Patch24: openmp.patch -Patch25: %{name}-URPM-build-fix.patch -Patch26: %{name}-semanage.patch -Patch27: %{name}-helperEVR-noassert.patch -Patch28: %{name}-unglobal.patch Patch29: %{name}-builddir-readlink.patch Patch30: %{name}-changelog_order_check_nonfatal.patch -Patch31: %{name}-cleanbody.patch -Patch32: %{name}-dirdeps-macro.patch -Patch33: %{name}-installbeforeerase.patch -Patch34: %{name}-libmagic-locale.patch Patch35: %{name}-namespace-compare.patch -Patch36: %{name}-popt-coreutils.patch Patch37: %{name}-postun-nofail.patch -Patch38: %{name}-silence-RPM_CHAR_TYPE.patch -Patch39: %{name}-fix-missing-types-in-headers.patch -Patch40: %{name}-fix--p-interpreter-and-empty-script.patch -Patch41: %{name}-db_buffer_small.patch Patch42: %{name}-pattern_Release.patch Patch43: %{name}-fix-___build_pre-macro.patch Patch44: %{name}-missing-patch-file-fails-build.patch @@ -207,7 +187,7 @@ BuildRequires: libtool >= 1:1.4.2-9 BuildRequires: libxml2-devel BuildRequires: neon-devel >= 0.25.5 %endif -%{?with_system_lua:BuildRequires: lua52-devel >= 5.2.2} +BuildRequires: lua52-devel >= 5.2.2 BuildRequires: ossp-uuid-devel BuildRequires: patch >= 2.2 BuildRequires: popt-devel >= %{reqpopt_ver} @@ -751,37 +731,16 @@ cd - %patch5 -p1 %patch6 -p1 #%patch7 -p1 -%{?with_system_lua:%patch9 -p1} +%patch9 -p1 %patch14 -p0 %patch15 -p1 -%patch16 -p1 -%patch17 -p1 -%patch18 -p1 -%patch19 -p1 +#%patch16 -p1 +#%patch18 -p1 %patch20 -p1 -%patch21 -p1 -%ifarch sparc64 -%patch22 -p1 -%endif -%patch23 -p1 -%patch24 -p1 -%patch25 -p1 -%patch26 -p1 -%patch27 -p1 -%patch28 -p1 %patch29 -p1 %patch30 -p1 -%patch31 -p1 -%patch32 -p1 -%patch33 -p1 -%patch34 -p1 -%patch35 -p1 -%patch36 -p1 +#%patch35 -p1 %patch37 -p1 -%patch38 -p1 -%patch39 -p1 -%patch40 -p1 -%{?with_db61:%patch41 -p1} %patch42 -p1 %patch43 -p1 %patch44 -p1 @@ -877,7 +836,7 @@ sed -i \ -e 's|@host_os@|%{_target_os}|' \ macros/macros.in -%{?with_system_lua:CPPFLAGS="-I/usr/include/lua51 %{rpmcppflags}"} +CPPFLAGS="-I/usr/include/lua51 %{rpmcppflags}" %configure \ WITH_PERL_VERSION=no \ __GST_INSPECT=%{_bindir}/gst-inspect-1.0 \ @@ -894,7 +853,7 @@ sed -i \ --with-file=external \ --with-keyutils=%{?with_keyutils:external}%{!?with_keyutils:no} \ --with-libelf \ - --with-lua=%{!?with_system_lua:internal}%{?with_system_lua:external} \ + --with-lua \ --with-lzma=external \ --with-neon=%{?with_neon:external}%{!?with_neon:no} \ --with-path-macros='%{_rpmlibdir}/macros:%{_rpmlibdir}/macros.d/pld:%{_rpmlibdir}/%%{_target}/macros:%{_rpmlibdir}/macros.build:%{_sysconfdir}/rpm/macros.*:%{_sysconfdir}/rpm/macros:%{_sysconfdir}/rpm/%%{_target}/macros:%{_sysconfdir}/rpm/macros.d/*.macros:~/etc/.rpmmacros:~/.rpmmacros' \ @@ -1338,12 +1297,6 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %attr(755,root,root) %{_rpmlibdir}/bin/semodule %attr(755,root,root) %{_rpmlibdir}/bin/spooktool %endif -%if %{without system_lua} -%attr(755,root,root) %{_rpmlibdir}/bin/lua -%attr(755,root,root) %{_rpmlibdir}/bin/luac -%attr(755,root,root) %{_rpmlibdir}/bin/rpmlua -%attr(755,root,root) %{_rpmlibdir}/bin/rpmluac -%endif %{?with_keyutils:%attr(755,root,root) %{_rpmlibdir}/bin/rpmkey} %attr(755,root,root) %{_rpmlibdir}/bin/rpmrepo %{_mandir}/man8/rpm2cpio.8* -- 2.43.0