diff options
Diffstat (limited to 'debian/patches')
-rw-r--r-- | debian/patches/eglibc-fts-without-LFS | 26 | ||||
-rw-r--r-- | debian/patches/fix-shell-in-fakeroot | 13 | ||||
-rw-r--r-- | debian/patches/hide-dlsym-error.patch | 32 | ||||
-rw-r--r-- | debian/patches/series | 3 |
4 files changed, 74 insertions, 0 deletions
diff --git a/debian/patches/eglibc-fts-without-LFS b/debian/patches/eglibc-fts-without-LFS new file mode 100644 index 0000000..5ba45fd --- /dev/null +++ b/debian/patches/eglibc-fts-without-LFS @@ -0,0 +1,26 @@ +--- a/libfakeroot.c ++++ b/libfakeroot.c +@@ -1949,11 +1949,7 @@ + || r->fts_info == FTS_NS || r->fts_info == FTS_NSOK)) + r->fts_statp = NULL; /* Otherwise fts_statp may be a random pointer */ + if(r && r->fts_statp) { /* Should we bother checking fts_info here? */ +-# if defined(STAT64_SUPPORT) && !defined(__APPLE__) +- SEND_GET_STAT64(r->fts_statp, _STAT_VER); +-# else + SEND_GET_STAT(r->fts_statp, _STAT_VER); +-# endif + } + + return r; +@@ -1972,11 +1968,7 @@ + first=next_fts_children(ftsp, options); + for(r = first; r; r = r->fts_link) { + if(r && r->fts_statp) { /* Should we bother checking fts_info here? */ +-# if defined(STAT64_SUPPORT) && !defined(__APPLE__) +- SEND_GET_STAT64(r->fts_statp, _STAT_VER); +-# else + SEND_GET_STAT(r->fts_statp, _STAT_VER); +-# endif + } + } + diff --git a/debian/patches/fix-shell-in-fakeroot b/debian/patches/fix-shell-in-fakeroot new file mode 100644 index 0000000..ce5d23f --- /dev/null +++ b/debian/patches/fix-shell-in-fakeroot @@ -0,0 +1,13 @@ +Description: Fix shell in fakeroot.in + Use /bin/sh instead of @SHELL@ in fakeroot.in +Author: Juan Picca <jumapico@gmail.com> +Last-Update: 2016-06-27 +--- +--- a/scripts/fakeroot.in ++++ b/scripts/fakeroot.in +@@ -1,4 +1,4 @@ +-#!@SHELL@ ++#!/bin/sh + + # This script first starts faked (the daemon), and then it will run + # the requested program with fake root privileges. diff --git a/debian/patches/hide-dlsym-error.patch b/debian/patches/hide-dlsym-error.patch new file mode 100644 index 0000000..3fd34c8 --- /dev/null +++ b/debian/patches/hide-dlsym-error.patch @@ -0,0 +1,32 @@ +Description: Hide error from dlsym() + dlsym(), starting in glibc 2.24 actually reports errors. In our case, + we try to get ACL functions which are not in the glibc. This causes + failures in test suites, so hide those messages for non-debugging + purposes for now. It also makes the build logs annoying to read. +Author: Julian Andres Klode <juliank@ubuntu.com> +Origin: vendor +Bug-Debian: https://bugs.debian.org/830912 +Forwarded: no +Last-Update: 2016-08-12 + +--- a/libfakeroot.c ++++ b/libfakeroot.c +@@ -256,10 +256,16 @@ void load_library_symbols(void){ + /* clear dlerror() just in case dlsym() legitimately returns NULL */ + msg = dlerror(); + *(next_wrap[i].doit)=dlsym(get_libc(), next_wrap[i].name); ++ + if ( (msg = dlerror()) != NULL){ +- fprintf (stderr, "dlsym(%s): %s\n", next_wrap[i].name, msg); +-/* abort ();*/ ++#ifdef LIBFAKEROOT_DEBUGGING ++ if (fakeroot_debug) { ++ fprintf (stderr, "dlsym(%s): %s\n", next_wrap[i].name, msg); ++/* abort ();*/ ++ } ++#endif + } ++ + } + } + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..a95b0e3 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,3 @@ +eglibc-fts-without-LFS +fix-shell-in-fakeroot +hide-dlsym-error.patch |