Up to 1.26; dlsym patch obsolete (according to debian changelog for fakeroot)

diff --git a/fakeroot.spec b/fakeroot.spec
index bffc55af90b5148c7b554b88bc721fb634ef7980..59dc1fbfbd68c63ac3f42fa0b59b15cbf750f245 100644 (file)
--- a/fakeroot.spec
+++ b/fakeroot.spec
@@ -2,13 +2,12 @@ Summary:      Gives a fake root environment
 Summary(pl.UTF-8):     "Podrobione" środowiska roota
 Summary(pt_BR.UTF-8):  Cria um falso ambiente de root
 Name:          fakeroot
-Version:       1.23
+Version:       1.26
 Release:       1
 License:       GPL v3+
 Group:         Development/Tools
-Source0:       http://ftp.debian.org/debian/pool/main/f/fakeroot/%{name}_%{version}.orig.tar.xz
-# Source0-md5: b82c5e99b6365a838e73d05718083f6a
-Patch0:                hide-dlsym-error.patch
+Source0:       http://ftp.debian.org/debian/pool/main/f/fakeroot/%{name}_%{version}.orig.tar.gz
+# Source0-md5: cb1c68f2597f0a064232a841050eb6f2
 BuildRequires: acl-devel
 BuildRequires: autoconf >= 2.61
 BuildRequires: automake
@@ -57,7 +56,6 @@ stat e outros, criando um falso ambiente de root.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %{__libtoolize}

diff --git a/hide-dlsym-error.patch b/hide-dlsym-error.patch
deleted file mode 100644 (file)
index 6668159..0000000
--- a/hide-dlsym-error.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=830912
-
-Package: fakeroot
-Version: 1.21-1
-Followup-For: Bug #830912
-User: ubuntu-devel@lists.ubuntu.com
-Usertags: origin-ubuntu yakkety ubuntu-patch
-
-In Ubuntu, the attached patch was applied to achieve the following:
-
-Hide the warnings, at least for now. This should bring us back to glibc 2.23
-state, AFAICT.
-
-  * Add hide-dlsym-error.patch to hide the errors from dlsym() unless
-    debugging was enabled. This makes builds less noisy and fixes failures
-    in APT test suite with glibc 2.24, which started reporting errors for
-    dlsym()
-
-
-Thanks for considering the patch.
-
-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: <a href="https://bugs.debian.org/830912">https://bugs.debian.org/830912</a>
-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
-     }
-+
-   }
- }
-