diff options
| -rw-r--r-- | groups/231.native_packages_etc.group | 8 | ||||
| -rw-r--r-- | patches/rpm-4.16.0.local.patch | 35 | ||||
| -rw-r--r-- | patches/rpm-4.17.0.local.patch | 12 |
3 files changed, 16 insertions, 39 deletions
diff --git a/groups/231.native_packages_etc.group b/groups/231.native_packages_etc.group index 49c00804..c18ba6ab 100644 --- a/groups/231.native_packages_etc.group +++ b/groups/231.native_packages_etc.group @@ -422,11 +422,11 @@ ac_cv_write_stdout=yes"}; : ${PKG_QRENCODE_URL:=https://fukuchi.org/works/qrencode/qrencode-${PKG_QRENCODE_VERSION}.tar.gz}; : ${PKG_QRENCODE_CONFIGURE_ARGS_EXTRA:=--disable-sdltest}; : ${PKG_RPM_DEPENDS:="curl file libarchive libgcrypt libz lua popt xz zstd"}; -: ${PKG_RPM_SHA256SUM:=ca5974e9da2939afb422598818ef187385061889ba766166c4a3829c5ef8d411}; -: ${PKG_RPM_VERSION:=4.16.0}; +: ${PKG_RPM_SHA256SUM:=2e0d220b24749b17810ed181ac1ed005a56bbb6bc8ac429c21f314068dc65e6a}; +: ${PKG_RPM_VERSION:=4.17.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-vendor=midipix --disable-openmp"}; -: ${PKG_RPM_ENV_VARS_EXTRA:="LIBGCRYPT_CONFIG=${PREFIX_NATIVE}/bin/libgcrypt-config"}; +: ${PKG_RPM_CONFIGURE_ARGS:="-C --disable-nls --host=${DEFAULT_TARGET} --prefix=/usr --target=${DEFAULT_TARGET} --disable-inhibit-plugin --enable-ndb --with-vendor=midipix --disable-openmp"}; +: ${PKG_RPM_ENV_VARS_EXTRA:="LIBGCRYPT_LIBS=-lgcrypt:LUA_LIBS=-llua:SQLITE_LIBS=-lsqlite3"}; : ${PKG_RW_SHA256SUM:=50009730e36991dfe579716f91f4f616f5ba05ffb7bf69c03d41bf305ed93b6d}; : ${PKG_RW_VERSION:=1.0}; : ${PKG_RW_URL:=https://sortix.org/rw/release/rw-portable-${PKG_RW_VERSION}.tar.gz} diff --git a/patches/rpm-4.16.0.local.patch b/patches/rpm-4.16.0.local.patch deleted file mode 100644 index 9a3382e5..00000000 --- a/patches/rpm-4.16.0.local.patch +++ /dev/null @@ -1,35 +0,0 @@ -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 -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> diff --git a/patches/rpm-4.17.0.local.patch b/patches/rpm-4.17.0.local.patch new file mode 100644 index 00000000..c76bf77c --- /dev/null +++ b/patches/rpm-4.17.0.local.patch @@ -0,0 +1,12 @@ +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 |