| diff -ru rpm-4.15.1.orig/lib/rpmchroot.c rpm-4.15.1/lib/rpmchroot.c |
| |
| |
| @@ -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 |
| |
| |
| @@ -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 |
| |
| |
| @@ -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> |