diff options
| author | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2020-01-05 10:51:39 +0000 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2020-01-05 10:51:39 +0000 |
| commit | e86515c127e6c09974639e7b3ad799bbbd4ccc5c (patch) | |
| tree | b833c7f7c85633e6354b2a9c965db006cc6dde66 /patches/rpm-4.15.1.local.patch | |
| parent | 6d137e4e0dfab9d1f4aacd27301e2e3ed4113ca5 (diff) | |
| download | midipix_build-e86515c127e6c09974639e7b3ad799bbbd4ccc5c.tar.bz2 midipix_build-e86515c127e6c09974639e7b3ad799bbbd4ccc5c.tar.xz | |
vars/build.vars:rpm{,_host}: updated to v4.15.1 (via Redfoxmoon.)
vars/build.vars:rpm:${PKG_CONFIGURE_ARGS_EXTRA}: configure w/ --with-lua --enable-ndb --enable-lmdb --disable-bdb --with-crypto=libgcrypt --with-vendor=midipix (via Redfoxmoon.)
vars/build.vars:rpm:${PKG_ENV_VARS_EXTRA}: build w/ LIBGCRYPT_CONFIG=${PREFIX_NATIVE}/bin/libgcrypt-config (via Redfoxmoon.)
patches/rpm{,_host}-4.15.1_pre.local.patch: updated (via Redfoxmoon.)
patches/rpm-4.15.1.local.patch: updated (via Redfoxmoon.)
Diffstat (limited to 'patches/rpm-4.15.1.local.patch')
| -rw-r--r-- | patches/rpm-4.15.1.local.patch | 37 |
1 files changed, 37 insertions, 0 deletions
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; + } + |