diff options
| -rw-r--r-- | groups/231.native_packages_etc.group | 6 | ||||
| -rw-r--r-- | patches/rpm-4.15.1_pre.local.patch | 12 | ||||
| -rw-r--r-- | patches/rpm-4.16.0.local.patch (renamed from patches/rpm-4.15.1.local.patch) | 24 |
3 files changed, 14 insertions, 28 deletions
diff --git a/groups/231.native_packages_etc.group b/groups/231.native_packages_etc.group index 4bfa5930..cb139921 100644 --- a/groups/231.native_packages_etc.group +++ b/groups/231.native_packages_etc.group @@ -294,10 +294,10 @@ zstd")"; : ${PKG_QRENCODE_URL:=https://fukuchi.org/works/qrencode/qrencode-${PKG_QRENCODE_VERSION}.tar.bz2}; : ${PKG_QRENCODE_CONFIGURE_ARGS_EXTRA:=--disable-sdltest}; : ${PKG_RPM_DEPENDS:="curl dbus file libarchive libgcrypt libz lua popt xz zstd"}; -: ${PKG_RPM_SHA256SUM:=ddef45f9601cd12042edfc9b6e37efcca32814e1e0f4bb8682d08144a3e2d230}; -: ${PKG_RPM_VERSION:=4.15.1}; +: ${PKG_RPM_SHA256SUM:=ca5974e9da2939afb422598818ef187385061889ba766166c4a3829c5ef8d411}; +: ${PKG_RPM_VERSION:=4.16.0}; : ${PKG_RPM_URL:=http://ftp.rpm.org/releases/rpm-${PKG_RPM_VERSION%.*}.x/rpm-${PKG_RPM_VERSION}.tar.bz2}; -: ${PKG_RPM_CONFIGURE_ARGS:="-C --disable-nls --host=${DEFAULT_TARGET} --prefix=/usr --target=${DEFAULT_TARGET} --with-lua --enable-ndb --disable-bdb --enable-zstd --with-crypto=libgcrypt --with-vendor=midipix"}; +: ${PKG_RPM_CONFIGURE_ARGS:="-C --disable-nls --host=${DEFAULT_TARGET} --prefix=/usr --target=${DEFAULT_TARGET} --with-lua --enable-ndb --disable-bdb --enable-zstd --with-vendor=midipix --disable-openmp"}; : ${PKG_RPM_ENV_VARS_EXTRA:="LIBGCRYPT_CONFIG=${PREFIX_NATIVE}/bin/libgcrypt-config"}; : ${PKG_RW_SHA256SUM:=50009730e36991dfe579716f91f4f616f5ba05ffb7bf69c03d41bf305ed93b6d}; : ${PKG_RW_VERSION:=1.0}; diff --git a/patches/rpm-4.15.1_pre.local.patch b/patches/rpm-4.15.1_pre.local.patch deleted file mode 100644 index 95d8d4ce..00000000 --- a/patches/rpm-4.15.1_pre.local.patch +++ /dev/null @@ -1,12 +0,0 @@ -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-4.15.1.local.patch b/patches/rpm-4.16.0.local.patch index f1646034..9a3382e5 100644 --- a/patches/rpm-4.15.1.local.patch +++ b/patches/rpm-4.16.0.local.patch @@ -22,16 +22,14 @@ diff -ru rpm-4.15.1.orig/macros.in rpm-4.15.1/macros.in # # 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 -ru rpm-4.16.0.orig/lib/rpmdb.c rpm-4.16.0/lib/rpmdb.c +--- rpm-4.16.0.orig/lib/rpmdb.c 2020-05-28 12:04:25.037136686 +0200 ++++ rpm-4.16.0/lib/rpmdb.c 2020-10-01 19:31:18.944641154 +0200 +@@ -8,6 +8,7 @@ + #include <utime.h> + #include <errno.h> + #include <dirent.h> ++#include <fcntl.h> + + #ifndef DYING /* XXX already in "system.h" */ + #include <fnmatch.h> |