|
Lucio Andrés Illanes Albornoz |
e86515 |
diff -ru rpm-4.15.1.orig/lib/rpmchroot.c rpm-4.15.1/lib/rpmchroot.c
|
|
Lucio Andrés Illanes Albornoz |
e86515 |
--- rpm-4.15.1.orig/lib/rpmchroot.c 2019-11-13 10:19:29.309710594 +0100
|
|
Lucio Andrés Illanes Albornoz |
e86515 |
+++ rpm-4.15.1/lib/rpmchroot.c 2020-01-04 18:36:56.323408444 +0100
|
|
Lucio Andrés Illanes Albornoz |
e86515 |
@@ -66,7 +66,7 @@
|
|
Lucio Andrés Illanes Albornoz |
e86515 |
setup_map("/proc/self/gid_map", 0, gid);
|
|
Lucio Andrés Illanes Albornoz |
e86515 |
unshared = 1;
|
|
Lucio Andrés Illanes Albornoz |
e86515 |
}
|
|
Lucio Andrés Illanes Albornoz |
e86515 |
- rpmlog(RPMLOG_DEBUG, "user ns: %d original user %d:%d current %d:%d\n",
|
|
Lucio Andrés Illanes Albornoz |
e86515 |
+ rpmlog(RPMLOG_DEBUG, "user ns: %d original user %ld:%ld current %ld:%ld\n",
|
|
Lucio Andrés Illanes Albornoz |
e86515 |
unshared, uid, gid, getuid(), getgid());
|
|
Lucio Andrés Illanes Albornoz |
e86515 |
}
|
|
Lucio Andrés Illanes Albornoz |
e86515 |
#else
|
|
Lucio Andrés Illanes Albornoz |
e86515 |
diff -ru rpm-4.15.1.orig/macros.in rpm-4.15.1/macros.in
|
|
Lucio Andrés Illanes Albornoz |
e86515 |
--- rpm-4.15.1.orig/macros.in 2019-11-13 10:19:29.311710606 +0100
|
|
Lucio Andrés Illanes Albornoz |
e86515 |
+++ rpm-4.15.1/macros.in 2020-01-04 18:41:36.981113433 +0100
|
|
Lucio Andrés Illanes Albornoz |
e86515 |
@@ -619,7 +619,7 @@
|
|
Lucio Andrés Illanes Albornoz |
e86515 |
# lmdb Lightning Memory-mapped Database
|
|
Lucio Andrés Illanes Albornoz |
e86515 |
# ndb new data base format
|
|
Lucio Andrés Illanes Albornoz |
e86515 |
#
|
|
Lucio Andrés Illanes Albornoz |
e86515 |
-%_db_backend bdb
|
|
Lucio Andrés Illanes Albornoz |
e86515 |
+%_db_backend ndb
|
|
Lucio Andrés Illanes Albornoz |
e86515 |
|
|
Lucio Andrés Illanes Albornoz |
e86515 |
#
|
|
Lucio Andrés Illanes Albornoz |
e86515 |
# Macros used to configure Berkley db parameters.
|
|
Lucio Andrés Illanes Albornoz |
e86515 |
diff --git a/rpmio/digest_libgcrypt.c b/rpmio/digest_libgcrypt.c
|
|
Lucio Andrés Illanes Albornoz |
e86515 |
index b31fda569..291187f60 100644
|
|
Lucio Andrés Illanes Albornoz |
e86515 |
--- a/rpmio/digest_libgcrypt.c
|
|
Lucio Andrés Illanes Albornoz |
e86515 |
+++ b/rpmio/digest_libgcrypt.c
|
|
Lucio Andrés Illanes Albornoz |
e86515 |
@@ -20,6 +20,8 @@ struct DIGEST_CTX_s {
|
|
Lucio Andrés Illanes Albornoz |
e86515 |
/**************************** init ************************************/
|
|
Lucio Andrés Illanes Albornoz |
e86515 |
|
|
Lucio Andrés Illanes Albornoz |
e86515 |
int rpmInitCrypto(void) {
|
|
Lucio Andrés Illanes Albornoz |
e86515 |
+ gcry_check_version (NULL);
|
|
Lucio Andrés Illanes Albornoz |
e86515 |
+ gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0);
|
|
Lucio Andrés Illanes Albornoz |
e86515 |
return 0;
|
|
Lucio Andrés Illanes Albornoz |
e86515 |
}
|
|
Lucio Andrés Illanes Albornoz |
e86515 |
|