Blame patches/rpm-4.14.1.local.patch

Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
diff -ru rpm-4.14.1.orig/config.h.in rpm-4.14.1/config.h.in
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
--- rpm-4.14.1.orig/config.h.in	2018-01-16 10:32:04.032937164 +0100
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+++ rpm-4.14.1/config.h.in	2018-04-01 01:52:38.186380003 +0200
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
@@ -6,6 +6,9 @@
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 /* Build with dmalloc support? */
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 #undef DMALLOC
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+/* Enable Berkeley DB rpmdb support */
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+#undef ENABLE_BDB
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 /* Enable new rpm database format? */
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 #undef ENABLE_NDB
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
diff -ru rpm-4.14.1.orig/configure rpm-4.14.1/configure
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
--- rpm-4.14.1.orig/configure	2018-04-01 01:53:02.034218083 +0200
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+++ rpm-4.14.1/configure	2018-04-01 01:52:38.074380764 +0200
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
@@ -715,6 +715,8 @@
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 LMDB_CFLAGS
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 NDB_FALSE
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 NDB_TRUE
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+BDB_FALSE
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+BDB_TRUE
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 WITH_DB_LIB
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 HAVE_LIBDW_STRTAB_FALSE
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 HAVE_LIBDW_STRTAB_TRUE
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
@@ -960,6 +962,7 @@
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 with_beecrypt
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 with_internal_beecrypt
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 with_archive
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+enable_bdb
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 with_external_db
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 enable_ndb
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 enable_lmdb
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
@@ -1652,6 +1655,8 @@
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
   --disable-largefile     omit support for large files
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
   --enable-zstd=[yes/no/auto]
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
                           build without zstd support (default=auto)
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+  --enable-bdb=[yes/no]   build with Berkeley DB rpm database format support
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+                          (default=yes)
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
   --enable-ndb (EXPERIMENTAL)
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
                           enable the new rpm database format
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
   --enable-lmdb=[yes/no/auto] (EXPERIMENTAL)
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
@@ -21980,6 +21985,23 @@
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 #=================
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+# Enable Berkeley DB rpmdb backend
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+# Check whether --enable-bdb was given.
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+if test "${enable_bdb+set}" = set; then :
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+  enableval=$enable_bdb; enable_bdb="$enableval"
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+else
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+  enable_bdb=yes
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+fi
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+if test "$enable_bdb" = "yes"; then :
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+$as_echo "#define ENABLE_BDB /**/" >>confdefs.h
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+#=================
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 # Process --with/without-external-db
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 # Check whether --with-external_db was given.
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
@@ -22087,6 +22109,16 @@
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+fi
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+ if test "$enable_bdb" = yes; then
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+  BDB_TRUE=
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+  BDB_FALSE='#'
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+else
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+  BDB_TRUE='#'
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+  BDB_FALSE=
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+fi
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 #=================
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 # Process --enable-ndb
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 # Check whether --enable-ndb was given.
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
@@ -26723,6 +26755,10 @@
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
   as_fn_error $? "conditional \"HAVE_LIBDW_STRTAB\" was never defined.
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 fi
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+if test -z "${BDB_TRUE}" && test -z "${BDB_FALSE}"; then
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+  as_fn_error $? "conditional \"BDB\" was never defined.
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+fi
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 if test -z "${NDB_TRUE}" && test -z "${NDB_FALSE}"; then
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
   as_fn_error $? "conditional \"NDB\" was never defined.
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
diff -ru rpm-4.14.1.orig/configure.ac rpm-4.14.1/configure.ac
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
--- rpm-4.14.1.orig/configure.ac	2018-01-16 10:30:14.074141024 +0100
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+++ rpm-4.14.1/configure.ac	2018-04-01 01:52:13.858545262 +0200
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
@@ -509,6 +509,18 @@
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 AM_CONDITIONAL(HAVE_LIBDW_STRTAB,[test "$HAVE_LIBDW_STRTAB" = yes])
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 #=================
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+# Enable Berkeley DB rpmdb backend
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+AC_ARG_ENABLE([bdb],
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+              [AS_HELP_STRING([--enable-bdb=@<:@yes/no@:>@],
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+                              [build with Berkeley DB rpm database format support (default=yes)])],
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+              [enable_bdb="$enableval"],
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+              [enable_bdb=yes])
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+AS_IF([test "$enable_bdb" = "yes"], [
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+  AC_DEFINE([ENABLE_BDB], [], [Enable Berkeley DB rpmdb support])
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+#=================
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 # Process --with/without-external-db
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 AC_ARG_WITH(external_db, [AS_HELP_STRING([--with-external-db],[build against an external Berkeley db])],
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 [case "$with_external_db" in
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
@@ -566,6 +578,8 @@
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 esac
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 AC_SUBST([WITH_DB_LIB])
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+])
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+AM_CONDITIONAL([BDB], [test "$enable_bdb" = yes])
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 #=================
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 # Process --enable-ndb
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
diff -ru rpm-4.14.1.orig/lib/backend/dbi.c rpm-4.14.1/lib/backend/dbi.c
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
--- rpm-4.14.1.orig/lib/backend/dbi.c	2017-10-05 12:04:56.946602155 +0200
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+++ rpm-4.14.1/lib/backend/dbi.c	2018-04-01 01:52:13.858545262 +0200
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
@@ -50,11 +50,13 @@
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
     } else
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 #endif
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
     {
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+#ifdef ENABLE_BDB
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 	rdb->db_ops = &db3_dbops;
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 	if (*db_backend == '\0') {
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 	    free(db_backend);
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 	    db_backend = xstrdup("bdb");
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 	}
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+#endif
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
     }
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 #if defined(WITH_LMDB)
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
@@ -75,12 +77,14 @@
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
     free(path);
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 #endif
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+#ifdef ENABLE_BDB
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
     path = rstrscat(NULL, dbhome, "/Packages", NULL);
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
     if (access(path, F_OK) == 0 && rdb->db_ops != &db3_dbops) {
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 	rdb->db_ops = &db3_dbops;
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 	rpmlog(RPMLOG_WARNING, _("Found BDB Packages database while attempting %s backend: using bdb backend.\n"), db_backend);
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
     }
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
     free(path);
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+#endif
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
     if (db_backend)
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 	free(db_backend);
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
diff -ru rpm-4.14.1.orig/lib/Makefile.am rpm-4.14.1/lib/Makefile.am
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
--- rpm-4.14.1.orig/lib/Makefile.am	2017-10-05 12:04:56.944602155 +0200
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+++ rpm-4.14.1/lib/Makefile.am	2018-04-01 01:52:13.858545262 +0200
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
@@ -24,7 +24,7 @@
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 usrlib_LTLIBRARIES = librpm.la
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 librpm_la_SOURCES = \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
-	backend/db3.c backend/dbi.c backend/dbi.h \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+	backend/dbi.c backend/dbi.h \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 	backend/dbiset.c backend/dbiset.h \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 	headerutil.c header.c headerfmt.c header_internal.h \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 	rpmdb.c rpmdb_internal.h \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
@@ -59,11 +59,15 @@
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 librpm_la_SOURCES += rpmliblua.c rpmliblua.h
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 endif
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+if BDB
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+librpm_la_SOURCES += \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+	backend/db3.c
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 if WITH_INTERNAL_DB
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 librpm_la_LIBADD += $(libdb_la)
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 else
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 librpm_la_LIBADD += @WITH_DB_LIB@
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 endif
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+endif
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 if NDB
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 librpm_la_SOURCES += \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
diff -ru rpm-4.14.1.orig/lib/Makefile.in rpm-4.14.1/lib/Makefile.in
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
--- rpm-4.14.1.orig/lib/Makefile.in	2018-04-01 01:53:02.858212489 +0200
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+++ rpm-4.14.1/lib/Makefile.in	2018-04-01 01:52:38.898375168 +0200
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
@@ -96,9 +96,12 @@
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 @WITH_LUA_TRUE@am__append_1 = @LUA_CFLAGS@
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 @WITH_LUA_TRUE@am__append_2 = @LUA_LIBS@
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 @WITH_LUA_TRUE@am__append_3 = rpmliblua.c rpmliblua.h
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
-@WITH_INTERNAL_DB_TRUE@am__append_4 = $(libdb_la)
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
-@WITH_INTERNAL_DB_FALSE@am__append_5 = @WITH_DB_LIB@
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
-@NDB_TRUE@am__append_6 = \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+@BDB_TRUE@am__append_4 = \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+@BDB_TRUE@	backend/db3.c
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+@BDB_TRUE@@WITH_INTERNAL_DB_TRUE@am__append_5 = $(libdb_la)
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+@BDB_TRUE@@WITH_INTERNAL_DB_FALSE@am__append_6 = @WITH_DB_LIB@
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+@NDB_TRUE@am__append_7 = \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 @NDB_TRUE@	backend/ndb/glue.c \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 @NDB_TRUE@	backend/ndb/rpmpkg.c \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 @NDB_TRUE@	backend/ndb/rpmpkg.h \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
@@ -107,12 +110,12 @@
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 @NDB_TRUE@	backend/ndb/rpmxdb.c \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 @NDB_TRUE@	backend/ndb/rpmxdb.h
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
-@LMDB_TRUE@am__append_7 = $(LMDB_CFLAGS)
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
-@LMDB_TRUE@am__append_8 = $(LMDB_LIBS)
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
-@LMDB_TRUE@am__append_9 = \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+@LMDB_TRUE@am__append_8 = $(LMDB_CFLAGS)
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+@LMDB_TRUE@am__append_9 = $(LMDB_LIBS)
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+@LMDB_TRUE@am__append_10 = \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 @LMDB_TRUE@	backend/lmdb.c
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
-@WITH_INTERNAL_DB_TRUE@am__append_10 = $(libdb_la)
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+@WITH_INTERNAL_DB_TRUE@am__append_11 = $(libdb_la)
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 @WITH_INTERNAL_DB_TRUE@rpmlibexec_PROGRAMS = rpmdb_dump$(EXEEXT) \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 @WITH_INTERNAL_DB_TRUE@	rpmdb_load$(EXEEXT) \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 @WITH_INTERNAL_DB_TRUE@	rpmdb_recover$(EXEEXT) \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
@@ -169,9 +172,9 @@
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 am__DEPENDENCIES_1 =
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 @LMDB_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 librpm_la_DEPENDENCIES = $(top_builddir)/rpmio/librpmio.la \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
-	$(am__DEPENDENCIES_1) $(am__append_4) $(am__DEPENDENCIES_1) \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+	$(am__DEPENDENCIES_1) $(am__append_5) $(am__DEPENDENCIES_1) \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 	$(am__DEPENDENCIES_2)
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
-am__librpm_la_SOURCES_DIST = backend/db3.c backend/dbi.c backend/dbi.h \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+am__librpm_la_SOURCES_DIST = backend/dbi.c backend/dbi.h \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 	backend/dbiset.c backend/dbiset.h headerutil.c header.c \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 	headerfmt.c header_internal.h rpmdb.c rpmdb_internal.h \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 	fprint.c fprint.h tagname.c rpmtd.c cpio.c cpio.h depends.c \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
@@ -185,25 +188,27 @@
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 	rpmlock.h misc.h relocation.c rpmscript.h rpmscript.c \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 	rpmchroot.c rpmchroot.h rpmplugins.c rpmplugins.h rpmplugin.h \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 	rpmug.c rpmug.h rpmtriggers.h rpmtriggers.c rpmvs.c rpmvs.h \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
-	rpmliblua.c rpmliblua.h backend/ndb/glue.c \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+	rpmliblua.c rpmliblua.h backend/db3.c backend/ndb/glue.c \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 	backend/ndb/rpmpkg.c backend/ndb/rpmpkg.h backend/ndb/rpmidx.c \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 	backend/ndb/rpmidx.h backend/ndb/rpmxdb.c backend/ndb/rpmxdb.h \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 	backend/lmdb.c
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 am__dirstamp = $(am__leading_dot)dirstamp
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 @WITH_LUA_TRUE@am__objects_1 = rpmliblua.lo
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
-@NDB_TRUE@am__objects_2 = backend/ndb/glue.lo backend/ndb/rpmpkg.lo \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+@BDB_TRUE@am__objects_2 = backend/db3.lo
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+@NDB_TRUE@am__objects_3 = backend/ndb/glue.lo backend/ndb/rpmpkg.lo \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 @NDB_TRUE@	backend/ndb/rpmidx.lo backend/ndb/rpmxdb.lo
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
-@LMDB_TRUE@am__objects_3 = backend/lmdb.lo
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
-am_librpm_la_OBJECTS = backend/db3.lo backend/dbi.lo backend/dbiset.lo \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
-	headerutil.lo header.lo headerfmt.lo rpmdb.lo fprint.lo \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
-	tagname.lo rpmtd.lo cpio.lo depends.lo order.lo formats.lo \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
-	tagexts.lo fsm.lo manifest.lo package.lo poptALL.lo poptI.lo \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
-	poptQV.lo psm.lo query.lo rpmal.lo rpmchecksig.lo rpmds.lo \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
-	rpmfi.lo rpmgi.lo rpminstall.lo rpmlead.lo rpmps.lo rpmprob.lo \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
-	rpmrc.lo rpmte.lo rpmts.lo rpmfs.lo rpmvercmp.lo signature.lo \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
-	transaction.lo verify.lo rpmlock.lo relocation.lo rpmscript.lo \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
-	rpmchroot.lo rpmplugins.lo rpmug.lo rpmtriggers.lo rpmvs.lo \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
-	$(am__objects_1) $(am__objects_2) $(am__objects_3)
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+@LMDB_TRUE@am__objects_4 = backend/lmdb.lo
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+am_librpm_la_OBJECTS = backend/dbi.lo backend/dbiset.lo headerutil.lo \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+	header.lo headerfmt.lo rpmdb.lo fprint.lo tagname.lo rpmtd.lo \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+	cpio.lo depends.lo order.lo formats.lo tagexts.lo fsm.lo \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+	manifest.lo package.lo poptALL.lo poptI.lo poptQV.lo psm.lo \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+	query.lo rpmal.lo rpmchecksig.lo rpmds.lo rpmfi.lo rpmgi.lo \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+	rpminstall.lo rpmlead.lo rpmps.lo rpmprob.lo rpmrc.lo rpmte.lo \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+	rpmts.lo rpmfs.lo rpmvercmp.lo signature.lo transaction.lo \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+	verify.lo rpmlock.lo relocation.lo rpmscript.lo rpmchroot.lo \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+	rpmplugins.lo rpmug.lo rpmtriggers.lo rpmvs.lo \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+	$(am__objects_1) $(am__objects_2) $(am__objects_3) \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+	$(am__objects_4)
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 librpm_la_OBJECTS = $(am_librpm_la_OBJECTS)
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 AM_V_lt = $(am__v_lt_@AM_V@)
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
@@ -597,18 +602,18 @@
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 	-DLOCALSTATEDIR="\"$(localstatedir)\"" \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 	-DLIBRPMALIAS_FILENAME="\"rpmpopt-${VERSION}\"" \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 	-DLIBRPMALIAS_EXECPATH="\"$(bindir)\"" $(am__append_1) \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
-	$(am__append_7)
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+	$(am__append_8)
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 usrlibdir = $(libdir)
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
-CLEANFILES = $(am__append_10) $(BUILT_SOURCES)
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+CLEANFILES = $(am__append_11) $(BUILT_SOURCES)
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 EXTRA_DIST = gentagtbl.sh tagtbl.C rpmhash.C rpmhash.H
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 usrlib_LTLIBRARIES = librpm.la
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
-librpm_la_SOURCES = backend/db3.c backend/dbi.c backend/dbi.h \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
-	backend/dbiset.c backend/dbiset.h headerutil.c header.c \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
-	headerfmt.c header_internal.h rpmdb.c rpmdb_internal.h \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
-	fprint.c fprint.h tagname.c rpmtd.c cpio.c cpio.h depends.c \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
-	order.c formats.c tagexts.c fsm.c fsm.h manifest.c manifest.h \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
-	package.c poptALL.c poptI.c poptQV.c psm.c query.c rpmal.c \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
-	rpmal.h rpmchecksig.c rpmds.c rpmds_internal.h rpmfi.c \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+librpm_la_SOURCES = backend/dbi.c backend/dbi.h backend/dbiset.c \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+	backend/dbiset.h headerutil.c header.c headerfmt.c \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+	header_internal.h rpmdb.c rpmdb_internal.h fprint.c fprint.h \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+	tagname.c rpmtd.c cpio.c cpio.h depends.c order.c formats.c \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+	tagexts.c fsm.c fsm.h manifest.c manifest.h package.c \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+	poptALL.c poptI.c poptQV.c psm.c query.c rpmal.c rpmal.h \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+	rpmchecksig.c rpmds.c rpmds_internal.h rpmfi.c \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 	rpmfi_internal.h rpmgi.h rpmgi.c rpminstall.c rpmts_internal.h \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 	rpmlead.c rpmlead.h rpmps.c rpmprob.c rpmrc.c rpmte.c \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 	rpmte_internal.h rpmts.c rpmfs.h rpmfs.c rpmvercmp.c \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
@@ -616,11 +621,12 @@
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 	rpmlock.h misc.h relocation.c rpmscript.h rpmscript.c \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 	rpmchroot.c rpmchroot.h rpmplugins.c rpmplugins.h rpmplugin.h \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 	rpmug.c rpmug.h rpmtriggers.h rpmtriggers.c rpmvs.c rpmvs.h \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
-	$(am__append_3) $(am__append_6) $(am__append_9)
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+	$(am__append_3) $(am__append_4) $(am__append_7) \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+	$(am__append_10)
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 librpm_la_LDFLAGS = -version-info $(rpm_version_info)
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 librpm_la_LIBADD = $(top_builddir)/rpmio/librpmio.la @WITH_POPT_LIB@ \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 	@WITH_CAP_LIB@ @WITH_ACL_LIB@ @LIBINTL@ $(am__append_2) \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
-	$(am__append_4) $(am__append_5) $(am__append_8)
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+	$(am__append_5) $(am__append_6) $(am__append_9)
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 BUILT_SOURCES = tagtbl.C
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 # XXX watchout, $(top_builddir)/db3/libdb.la created by this Makefile may surprise
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
@@ -748,12 +754,12 @@
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 backend/$(DEPDIR)/$(am__dirstamp):
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 	@$(MKDIR_P) backend/$(DEPDIR)
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 	@: > backend/$(DEPDIR)/$(am__dirstamp)
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
-backend/db3.lo: backend/$(am__dirstamp) \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
-	backend/$(DEPDIR)/$(am__dirstamp)
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 backend/dbi.lo: backend/$(am__dirstamp) \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 	backend/$(DEPDIR)/$(am__dirstamp)
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 backend/dbiset.lo: backend/$(am__dirstamp) \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 	backend/$(DEPDIR)/$(am__dirstamp)
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+backend/db3.lo: backend/$(am__dirstamp) \
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+	backend/$(DEPDIR)/$(am__dirstamp)
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 backend/ndb/$(am__dirstamp):
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 	@$(MKDIR_P) backend/ndb
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 	@: > backend/ndb/$(am__dirstamp)
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
diff -ru rpm-4.14.1.orig/macros.in rpm-4.14.1/macros.in
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
--- rpm-4.14.1.orig/macros.in	2018-01-16 10:02:32.740236142 +0100
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+++ rpm-4.14.1/macros.in	2018-04-01 01:51:55.766668212 +0200
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
@@ -613,7 +613,7 @@
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 # lmdb Lightning Memory-mapped Database
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 # ndb new data base format
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 #
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
-%_db_backend	      bdb
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+%_db_backend	      lmdb
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 #
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 #	Macros used to configure Berkley db parameters.
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
Only in rpm-4.14.1: macros.in.orig
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
diff -ru rpm-4.14.1.orig/rpmio/digest_openssl.c rpm-4.14.1/rpmio/digest_openssl.c
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
--- rpm-4.14.1.orig/rpmio/digest_openssl.c	2017-10-05 12:04:57.554602041 +0200
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+++ rpm-4.14.1/rpmio/digest_openssl.c	2018-04-01 02:39:06.081268659 +0200
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
@@ -175,8 +175,11 @@
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
     case PGPHASHALGO_RIPEMD160:
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
         return EVP_ripemd160();
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+/* This should be a ifndef libressl... */
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+#ifndef __midipix__
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
     case PGPHASHALGO_MD2:
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
         return EVP_md2();
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
+#endif
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
 
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
     case PGPHASHALGO_SHA256:
Lucio Andrés Illanes Albornoz (arab, vxp) 13930e
         return EVP_sha256();