summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--patches/rpm-4.14.2.1.local.patch278
-rw-r--r--patches/rpm-4.15.1.local.patch37
-rw-r--r--patches/rpm-4.15.1_pre.local.patch12
l---------patches/rpm_host-4.14.2.1.local.patch1
l---------patches/rpm_host-4.15.1_pre.local.patch1
-rw-r--r--vars/build.vars13
6 files changed, 57 insertions, 285 deletions
diff --git a/patches/rpm-4.14.2.1.local.patch b/patches/rpm-4.14.2.1.local.patch
deleted file mode 100644
index febf7185..00000000
--- a/patches/rpm-4.14.2.1.local.patch
+++ /dev/null
@@ -1,278 +0,0 @@
---- rpm-4.14.2.1/config.h.in.orig 2018-10-22 09:23:50.537387460 +0000
-+++ rpm-4.14.2.1/config.h.in 2019-06-26 17:43:25.432000000 +0000
-@@ -9,6 +9,9 @@
- /* Build with systemd inhibit plugin? */
- #undef ENABLE_INHIBIT_PLUGIN
-
-+/* Enable Berkeley DB rpmdb support */
-+#undef ENABLE_BDB
-+
- /* Enable new rpm database format? */
- #undef ENABLE_NDB
-
---- rpm-4.14.2.1/configure.orig 2018-10-22 09:23:38.409409243 +0000
-+++ rpm-4.14.2.1/configure 2019-06-26 17:43:25.432000000 +0000
-@@ -717,6 +717,8 @@
- LMDB_CFLAGS
- NDB_FALSE
- NDB_TRUE
-+BDB_FALSE
-+BDB_TRUE
- WITH_DB_LIB
- HAVE_LIBDW_STRTAB_FALSE
- HAVE_LIBDW_STRTAB_TRUE
-@@ -961,6 +963,7 @@
- with_beecrypt
- with_internal_beecrypt
- with_archive
-+enable_bdb
- with_external_db
- enable_ndb
- enable_lmdb
-@@ -1643,6 +1646,8 @@
- --disable-largefile omit support for large files
- --enable-zstd=[yes/no/auto]
- build without zstd support (default=auto)
-+ --enable-bdb=[yes/no] build with Berkeley DB rpm database format support
-+ (default=yes)
- --enable-ndb (EXPERIMENTAL)
- enable the new rpm database format
- --enable-lmdb=[yes/no/auto] (EXPERIMENTAL)
-@@ -21973,6 +21978,23 @@
-
-
- #=================
-+# Enable Berkeley DB rpmdb backend
-+# Check whether --enable-bdb was given.
-+if test "${enable_bdb+set}" = set; then :
-+ enableval=$enable_bdb; enable_bdb="$enableval"
-+else
-+ enable_bdb=yes
-+fi
-+
-+
-+if test "$enable_bdb" = "yes"; then :
-+
-+
-+
-+$as_echo "#define ENABLE_BDB /**/" >>confdefs.h
-+
-+
-+#=================
- # Process --with/without-external-db
-
- # Check whether --with-external_db was given.
-@@ -22080,6 +22102,16 @@
-
-
-
-+fi
-+ if test "$enable_bdb" = yes; then
-+ BDB_TRUE=
-+ BDB_FALSE='#'
-+else
-+ BDB_TRUE='#'
-+ BDB_FALSE=
-+fi
-+
-+
- #=================
- # Process --enable-ndb
- # Check whether --enable-ndb was given.
-@@ -26743,6 +26775,10 @@
- as_fn_error $? "conditional \"HAVE_LIBDW_STRTAB\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
-+if test -z "${BDB_TRUE}" && test -z "${BDB_FALSE}"; then
-+ as_fn_error $? "conditional \"BDB\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
-+fi
- if test -z "${NDB_TRUE}" && test -z "${NDB_FALSE}"; then
- as_fn_error $? "conditional \"NDB\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
---- rpm-4.14.2.1/lib/backend/dbi.c.orig 2017-10-05 10:04:56.946602155 +0000
-+++ rpm-4.14.2.1/lib/backend/dbi.c 2019-06-26 17:43:25.432000000 +0000
-@@ -50,11 +50,13 @@
- } else
- #endif
- {
-+#ifdef ENABLE_BDB
- rdb->db_ops = &db3_dbops;
- if (*db_backend == '\0') {
- free(db_backend);
- db_backend = xstrdup("bdb");
- }
-+#endif
- }
-
- #if defined(WITH_LMDB)
-@@ -75,12 +77,14 @@
- free(path);
- #endif
-
-+#ifdef ENABLE_BDB
- path = rstrscat(NULL, dbhome, "/Packages", NULL);
- if (access(path, F_OK) == 0 && rdb->db_ops != &db3_dbops) {
- rdb->db_ops = &db3_dbops;
- rpmlog(RPMLOG_WARNING, _("Found BDB Packages database while attempting %s backend: using bdb backend.\n"), db_backend);
- }
- free(path);
-+#endif
-
- if (db_backend)
- free(db_backend);
---- rpm-4.14.2.1/lib/Makefile.in.orig 2018-10-22 09:23:38.884408390 +0000
-+++ rpm-4.14.2.1/lib/Makefile.in 2019-06-26 17:43:25.432000000 +0000
-@@ -96,9 +96,12 @@
- @WITH_LUA_TRUE@am__append_1 = @LUA_CFLAGS@
- @WITH_LUA_TRUE@am__append_2 = @LUA_LIBS@
- @WITH_LUA_TRUE@am__append_3 = rpmliblua.c rpmliblua.h
--@WITH_INTERNAL_DB_TRUE@am__append_4 = $(libdb_la)
--@WITH_INTERNAL_DB_FALSE@am__append_5 = @WITH_DB_LIB@
--@NDB_TRUE@am__append_6 = \
-+@BDB_TRUE@am__append_4 = \
-+@BDB_TRUE@ backend/db3.c
-+
-+@BDB_TRUE@@WITH_INTERNAL_DB_TRUE@am__append_5 = $(libdb_la)
-+@BDB_TRUE@@WITH_INTERNAL_DB_FALSE@am__append_6 = @WITH_DB_LIB@
-+@NDB_TRUE@am__append_7 = \
- @NDB_TRUE@ backend/ndb/glue.c \
- @NDB_TRUE@ backend/ndb/rpmpkg.c \
- @NDB_TRUE@ backend/ndb/rpmpkg.h \
-@@ -107,12 +110,12 @@
- @NDB_TRUE@ backend/ndb/rpmxdb.c \
- @NDB_TRUE@ backend/ndb/rpmxdb.h
-
--@LMDB_TRUE@am__append_7 = $(LMDB_CFLAGS)
--@LMDB_TRUE@am__append_8 = $(LMDB_LIBS)
--@LMDB_TRUE@am__append_9 = \
-+@LMDB_TRUE@am__append_8 = $(LMDB_CFLAGS)
-+@LMDB_TRUE@am__append_9 = $(LMDB_LIBS)
-+@LMDB_TRUE@am__append_10 = \
- @LMDB_TRUE@ backend/lmdb.c
-
--@WITH_INTERNAL_DB_TRUE@am__append_10 = $(libdb_la)
-+@WITH_INTERNAL_DB_TRUE@am__append_11 = $(libdb_la)
- @WITH_INTERNAL_DB_TRUE@rpmlibexec_PROGRAMS = rpmdb_dump$(EXEEXT) \
- @WITH_INTERNAL_DB_TRUE@ rpmdb_load$(EXEEXT) \
- @WITH_INTERNAL_DB_TRUE@ rpmdb_recover$(EXEEXT) \
-@@ -169,9 +172,9 @@
- am__DEPENDENCIES_1 =
- @LMDB_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
- librpm_la_DEPENDENCIES = $(top_builddir)/rpmio/librpmio.la \
-- $(am__DEPENDENCIES_1) $(am__append_4) $(am__DEPENDENCIES_1) \
-+ $(am__DEPENDENCIES_1) $(am__append_5) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_2)
--am__librpm_la_SOURCES_DIST = backend/db3.c backend/dbi.c backend/dbi.h \
-+am__librpm_la_SOURCES_DIST = backend/dbi.c backend/dbi.h \
- backend/dbiset.c backend/dbiset.h headerutil.c header.c \
- headerfmt.c header_internal.h rpmdb.c rpmdb_internal.h \
- fprint.c fprint.h tagname.c rpmtd.c cpio.c cpio.h depends.c \
-@@ -185,25 +188,27 @@
- rpmlock.h misc.h relocation.c rpmscript.h rpmscript.c \
- rpmchroot.c rpmchroot.h rpmplugins.c rpmplugins.h rpmplugin.h \
- rpmug.c rpmug.h rpmtriggers.h rpmtriggers.c rpmvs.c rpmvs.h \
-- rpmliblua.c rpmliblua.h backend/ndb/glue.c \
-+ rpmliblua.c rpmliblua.h backend/db3.c backend/ndb/glue.c \
- backend/ndb/rpmpkg.c backend/ndb/rpmpkg.h backend/ndb/rpmidx.c \
- backend/ndb/rpmidx.h backend/ndb/rpmxdb.c backend/ndb/rpmxdb.h \
- backend/lmdb.c
- am__dirstamp = $(am__leading_dot)dirstamp
- @WITH_LUA_TRUE@am__objects_1 = rpmliblua.lo
--@NDB_TRUE@am__objects_2 = backend/ndb/glue.lo backend/ndb/rpmpkg.lo \
-+@BDB_TRUE@am__objects_2 = backend/db3.lo
-+@NDB_TRUE@am__objects_3 = backend/ndb/glue.lo backend/ndb/rpmpkg.lo \
- @NDB_TRUE@ backend/ndb/rpmidx.lo backend/ndb/rpmxdb.lo
--@LMDB_TRUE@am__objects_3 = backend/lmdb.lo
--am_librpm_la_OBJECTS = backend/db3.lo backend/dbi.lo backend/dbiset.lo \
-- headerutil.lo header.lo headerfmt.lo rpmdb.lo fprint.lo \
-- tagname.lo rpmtd.lo cpio.lo depends.lo order.lo formats.lo \
-- tagexts.lo fsm.lo manifest.lo package.lo poptALL.lo poptI.lo \
-- poptQV.lo psm.lo query.lo rpmal.lo rpmchecksig.lo rpmds.lo \
-- rpmfi.lo rpmgi.lo rpminstall.lo rpmlead.lo rpmps.lo rpmprob.lo \
-- rpmrc.lo rpmte.lo rpmts.lo rpmfs.lo rpmvercmp.lo signature.lo \
-- transaction.lo verify.lo rpmlock.lo relocation.lo rpmscript.lo \
-- rpmchroot.lo rpmplugins.lo rpmug.lo rpmtriggers.lo rpmvs.lo \
-- $(am__objects_1) $(am__objects_2) $(am__objects_3)
-+@LMDB_TRUE@am__objects_4 = backend/lmdb.lo
-+am_librpm_la_OBJECTS = backend/dbi.lo backend/dbiset.lo headerutil.lo \
-+ header.lo headerfmt.lo rpmdb.lo fprint.lo tagname.lo rpmtd.lo \
-+ cpio.lo depends.lo order.lo formats.lo tagexts.lo fsm.lo \
-+ manifest.lo package.lo poptALL.lo poptI.lo poptQV.lo psm.lo \
-+ query.lo rpmal.lo rpmchecksig.lo rpmds.lo rpmfi.lo rpmgi.lo \
-+ rpminstall.lo rpmlead.lo rpmps.lo rpmprob.lo rpmrc.lo rpmte.lo \
-+ rpmts.lo rpmfs.lo rpmvercmp.lo signature.lo transaction.lo \
-+ verify.lo rpmlock.lo relocation.lo rpmscript.lo rpmchroot.lo \
-+ rpmplugins.lo rpmug.lo rpmtriggers.lo rpmvs.lo \
-+ $(am__objects_1) $(am__objects_2) $(am__objects_3) \
-+ $(am__objects_4)
- librpm_la_OBJECTS = $(am_librpm_la_OBJECTS)
- AM_V_lt = $(am__v_lt_@AM_V@)
- am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-@@ -596,18 +601,18 @@
- -DLOCALSTATEDIR="\"$(localstatedir)\"" \
- -DLIBRPMALIAS_FILENAME="\"rpmpopt-${VERSION}\"" \
- -DLIBRPMALIAS_EXECPATH="\"$(bindir)\"" $(am__append_1) \
-- $(am__append_7)
-+ $(am__append_8)
- usrlibdir = $(libdir)
--CLEANFILES = $(am__append_10) $(BUILT_SOURCES)
-+CLEANFILES = $(am__append_11) $(BUILT_SOURCES)
- EXTRA_DIST = gentagtbl.sh tagtbl.C rpmhash.C rpmhash.H
- usrlib_LTLIBRARIES = librpm.la
--librpm_la_SOURCES = backend/db3.c backend/dbi.c backend/dbi.h \
-- backend/dbiset.c backend/dbiset.h headerutil.c header.c \
-- headerfmt.c header_internal.h rpmdb.c rpmdb_internal.h \
-- fprint.c fprint.h tagname.c rpmtd.c cpio.c cpio.h depends.c \
-- order.c formats.c tagexts.c fsm.c fsm.h manifest.c manifest.h \
-- package.c poptALL.c poptI.c poptQV.c psm.c query.c rpmal.c \
-- rpmal.h rpmchecksig.c rpmds.c rpmds_internal.h rpmfi.c \
-+librpm_la_SOURCES = backend/dbi.c backend/dbi.h backend/dbiset.c \
-+ backend/dbiset.h headerutil.c header.c headerfmt.c \
-+ header_internal.h rpmdb.c rpmdb_internal.h fprint.c fprint.h \
-+ tagname.c rpmtd.c cpio.c cpio.h depends.c order.c formats.c \
-+ tagexts.c fsm.c fsm.h manifest.c manifest.h package.c \
-+ poptALL.c poptI.c poptQV.c psm.c query.c rpmal.c rpmal.h \
-+ rpmchecksig.c rpmds.c rpmds_internal.h rpmfi.c \
- rpmfi_internal.h rpmgi.h rpmgi.c rpminstall.c rpmts_internal.h \
- rpmlead.c rpmlead.h rpmps.c rpmprob.c rpmrc.c rpmte.c \
- rpmte_internal.h rpmts.c rpmfs.h rpmfs.c rpmvercmp.c \
-@@ -615,11 +620,12 @@
- rpmlock.h misc.h relocation.c rpmscript.h rpmscript.c \
- rpmchroot.c rpmchroot.h rpmplugins.c rpmplugins.h rpmplugin.h \
- rpmug.c rpmug.h rpmtriggers.h rpmtriggers.c rpmvs.c rpmvs.h \
-- $(am__append_3) $(am__append_6) $(am__append_9)
-+ $(am__append_3) $(am__append_4) $(am__append_7) \
-+ $(am__append_10)
- librpm_la_LDFLAGS = -version-info $(rpm_version_info)
- librpm_la_LIBADD = $(top_builddir)/rpmio/librpmio.la @WITH_POPT_LIB@ \
- @WITH_CAP_LIB@ @WITH_ACL_LIB@ @LIBINTL@ $(am__append_2) \
-- $(am__append_4) $(am__append_5) $(am__append_8)
-+ $(am__append_5) $(am__append_6) $(am__append_9)
- BUILT_SOURCES = tagtbl.C
-
- # XXX watchout, $(top_builddir)/db3/libdb.la created by this Makefile may surprise
---- rpm-4.14.2.1/macros.in.orig 2018-10-22 09:22:55.901485593 +0000
-+++ rpm-4.14.2.1/macros.in 2019-06-26 17:43:25.432000000 +0000
-@@ -621,7 +621,7 @@
- # lmdb Lightning Memory-mapped Database
- # ndb new data base format
- #
--%_db_backend bdb
-+%_db_backend lmdb
-
- #
- # Macros used to configure Berkley db parameters.
---- rpm-4.14.2.1/rpmio/digest_openssl.c.orig 2018-09-13 12:52:37.324274216 +0000
-+++ rpm-4.14.2.1/rpmio/digest_openssl.c 2019-06-26 17:43:25.432000000 +0000
-@@ -175,8 +175,10 @@
- case PGPHASHALGO_RIPEMD160:
- return EVP_ripemd160();
-
-+#ifndef LIBRESSL_VERSION_NUMBER
- case PGPHASHALGO_MD2:
- return EVP_md2();
-+#endif
-
- case PGPHASHALGO_SHA256:
- return EVP_sha256();
diff --git a/patches/rpm-4.15.1.local.patch b/patches/rpm-4.15.1.local.patch
new file mode 100644
index 00000000..f1646034
--- /dev/null
+++ b/patches/rpm-4.15.1.local.patch
@@ -0,0 +1,37 @@
+diff -ru rpm-4.15.1.orig/lib/rpmchroot.c rpm-4.15.1/lib/rpmchroot.c
+--- rpm-4.15.1.orig/lib/rpmchroot.c 2019-11-13 10:19:29.309710594 +0100
++++ rpm-4.15.1/lib/rpmchroot.c 2020-01-04 18:36:56.323408444 +0100
+@@ -66,7 +66,7 @@
+ setup_map("/proc/self/gid_map", 0, gid);
+ unshared = 1;
+ }
+- rpmlog(RPMLOG_DEBUG, "user ns: %d original user %d:%d current %d:%d\n",
++ rpmlog(RPMLOG_DEBUG, "user ns: %d original user %ld:%ld current %ld:%ld\n",
+ unshared, uid, gid, getuid(), getgid());
+ }
+ #else
+diff -ru rpm-4.15.1.orig/macros.in rpm-4.15.1/macros.in
+--- rpm-4.15.1.orig/macros.in 2019-11-13 10:19:29.311710606 +0100
++++ rpm-4.15.1/macros.in 2020-01-04 18:41:36.981113433 +0100
+@@ -619,7 +619,7 @@
+ # lmdb Lightning Memory-mapped Database
+ # ndb new data base format
+ #
+-%_db_backend bdb
++%_db_backend ndb
+
+ #
+ # Macros used to configure Berkley db parameters.
+diff --git a/rpmio/digest_libgcrypt.c b/rpmio/digest_libgcrypt.c
+index b31fda569..291187f60 100644
+--- a/rpmio/digest_libgcrypt.c
++++ b/rpmio/digest_libgcrypt.c
+@@ -20,6 +20,8 @@ struct DIGEST_CTX_s {
+ /**************************** init ************************************/
+
+ int rpmInitCrypto(void) {
++ gcry_check_version (NULL);
++ gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0);
+ return 0;
+ }
+
diff --git a/patches/rpm-4.15.1_pre.local.patch b/patches/rpm-4.15.1_pre.local.patch
new file mode 100644
index 00000000..95d8d4ce
--- /dev/null
+++ b/patches/rpm-4.15.1_pre.local.patch
@@ -0,0 +1,12 @@
+diff -ru rpm-4.15.1.orig/configure rpm-4.15.1/configure
+--- rpm-4.15.1.orig/configure 2019-11-13 10:29:18.226316044 +0100
++++ rpm-4.15.1/configure 2020-01-04 18:33:46.211414396 +0100
+@@ -22112,7 +22112,7 @@
+ enable_bdb=yes
+ fi
+
+-
++have_bdb="no"
+ if test "x$enable_bdb" != "xno"; then :
+
+ if test -x db/dist/configure ; then
diff --git a/patches/rpm_host-4.14.2.1.local.patch b/patches/rpm_host-4.14.2.1.local.patch
deleted file mode 120000
index 89f115c7..00000000
--- a/patches/rpm_host-4.14.2.1.local.patch
+++ /dev/null
@@ -1 +0,0 @@
-rpm-4.14.2.1.local.patch \ No newline at end of file
diff --git a/patches/rpm_host-4.15.1_pre.local.patch b/patches/rpm_host-4.15.1_pre.local.patch
new file mode 120000
index 00000000..3957435d
--- /dev/null
+++ b/patches/rpm_host-4.15.1_pre.local.patch
@@ -0,0 +1 @@
+rpm-4.15.1_pre.local.patch \ No newline at end of file
diff --git a/vars/build.vars b/vars/build.vars
index 7c199103..4a9e3589 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -212,8 +212,8 @@ HOST_TOOLS_RPM_PREFIX="${PREFIX}";
: ${PKG_POPT_HOST_SHA256SUM:=e728ed296fe9f069a0e005003c3d6b2dde3d9cad453422a10d6558616d304cc8};
: ${PKG_POPT_HOST_VERSION:=1.16};
: ${PKG_POPT_HOST_URL:=https://ftp.osuosl.org/pub/blfs/conglomeration/popt/popt-${PKG_POPT_HOST_VERSION}.tar.gz};
-: ${PKG_RPM_HOST_SHA256SUM:=1139c24b7372f89c0a697096bf9809be70ba55e006c23ff47305c1849d98acda};
-: ${PKG_RPM_HOST_VERSION:=4.14.2.1};
+: ${PKG_RPM_HOST_SHA256SUM:=ddef45f9601cd12042edfc9b6e37efcca32814e1e0f4bb8682d08144a3e2d230};
+: ${PKG_RPM_HOST_VERSION:=4.15.1};
: ${PKG_RPM_HOST_URL:=http://ftp.rpm.org/releases/rpm-${PKG_RPM_HOST_VERSION%.*.*}.x/rpm-${PKG_RPM_HOST_VERSION}.tar.bz2};
: ${PKG_RPM_HOST_CFLAGS_CONFIGURE:="-I${PREFIX}/include"};
: ${PKG_RPM_HOST_CONFIGURE_ARGS_EXTRA:="-without-lua --enable-ndb --enable-lmdb --enable-bdb=no --with-crypto=openssl --with-vendor=midipix"};
@@ -951,10 +951,11 @@ NATIVE_PACKAGES_DEPS_PYTHON="${PREFIX}/bin/python2";
: ${PKG_ZSTD_CFLAGS_BUILD_EXTRA:=${NATIVE_PACKAGES_DEPS_CFLAGS_CONFIGURE}};
: ${PKG_ZSTD_IN_TREE:=1};
: ${PKG_ZSTD_SUBDIR:=zstd-${PKG_ZSTD_VERSION}};
-: ${PKG_RPM_SHA256SUM:=1139c24b7372f89c0a697096bf9809be70ba55e006c23ff47305c1849d98acda};
-: ${PKG_RPM_VERSION:=4.14.2.1};
-: ${PKG_RPM_URL:=http://ftp.rpm.org/releases/rpm-${PKG_RPM_VERSION%.*.*}.x/rpm-${PKG_RPM_VERSION}.tar.bz2};
-: ${PKG_RPM_CONFIGURE_ARGS_EXTRA:="--with-lua --enable-ndb --enable-lmdb --enable-bdb=no --with-crypto=openssl --with-vendor=midipix"};
+: ${PKG_RPM_SHA256SUM:=ddef45f9601cd12042edfc9b6e37efcca32814e1e0f4bb8682d08144a3e2d230};
+: ${PKG_RPM_VERSION:=4.15.1};
+: ${PKG_RPM_URL:=http://ftp.rpm.org/releases/rpm-${PKG_RPM_VERSION%.*}.x/rpm-${PKG_RPM_VERSION}.tar.bz2};
+: ${PKG_RPM_CONFIGURE_ARGS_EXTRA:="--with-lua --enable-ndb --enable-lmdb --disable-bdb --with-crypto=libgcrypt --with-vendor=midipix"};
+: ${PKG_RPM_ENV_VARS_EXTRA:="LIBGCRYPT_CONFIG=${PREFIX_NATIVE}/bin/libgcrypt-config"};
: ${PKG_LIBSOLV_SHA256SUM:=153eb48814ffdbac396c98126037cf45c07e2b7087a61f86eb18a75ea1ab134b};
: ${PKG_LIBSOLV_VERSION:=0.6.34};
: ${PKG_LIBSOLV_URL:=https://github.com/openSUSE/libsolv/archive/${PKG_LIBSOLV_VERSION}.tar.gz};
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 21:18:25 +0000