diff --git a/.gitignore b/.gitignore index 406ec10..3fa0c0f 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /fakeroot_1.22.orig.tar.bz2 /fakeroot_1.23.orig.tar.xz /fakeroot_1.24.orig.tar.gz +/fakeroot_1.25.2.orig.tar.gz diff --git a/debian_hide-dlsym-error.patch b/debian_hide-dlsym-error.patch deleted file mode 100644 index 3fd34c8..0000000 --- a/debian_hide-dlsym-error.patch +++ /dev/null @@ -1,32 +0,0 @@ -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 -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/fakeroot-multilib.patch b/fakeroot-multilib.patch index ba793a3..82dcc79 100644 --- a/fakeroot-multilib.patch +++ b/fakeroot-multilib.patch @@ -1,10 +1,10 @@ -diff -up fakeroot-1.20.2/scripts/fakeroot.in.multilib fakeroot-1.20.2/scripts/fakeroot.in ---- fakeroot-1.20.2/scripts/fakeroot.in.multilib 2014-10-05 17:16:00.000000000 +0200 -+++ fakeroot-1.20.2/scripts/fakeroot.in 2015-09-28 09:56:43.891990046 +0200 +diff -up fakeroot-1.25.2/scripts/fakeroot.in.multilib fakeroot-1.25.2/scripts/fakeroot.in +--- fakeroot-1.25.2/scripts/fakeroot.in.multilib 2020-10-05 21:34:34.584490563 +0200 ++++ fakeroot-1.25.2/scripts/fakeroot.in 2020-10-05 21:35:33.264201406 +0200 @@ -35,7 +35,7 @@ FAKEROOT_BINDIR=@bindir@ USEABSLIBPATH=@LDPRELOADABS@ - LIB=lib@fakeroot_transformed@@DLSUFFIX@ + FAKEROOT_LIB=lib@fakeroot_transformed@@DLSUFFIX@ -PATHS=@libdir@:${FAKEROOT_PREFIX}/lib64/libfakeroot:${FAKEROOT_PREFIX}/lib32/libfakeroot +PATHS=@libdir@:${FAKEROOT_PREFIX}/lib64/libfakeroot:${FAKEROOT_PREFIX}/lib/libfakeroot FAKED=${FAKEROOT_BINDIR}/@faked_transformed@ diff --git a/fakeroot.spec b/fakeroot.spec index b014c41..d43d988 100644 --- a/fakeroot.spec +++ b/fakeroot.spec @@ -1,9 +1,9 @@ -%bcond_with autoconf +%bcond_without autoconf Summary: Gives a fake root environment Name: fakeroot -Version: 1.24 -Release: 3%{?dist} +Version: 1.25.2 +Release: 1%{?dist} # setenv.c: LGPLv2+ # contrib/Fakeroot-Stat-1.8.8: Perl (GPL+ or Artistic) # the rest: GPLv3+ @@ -14,7 +14,6 @@ Source0: https://cdn-aws.deb.debian.org/debian/pool/main/f/fakeroot/%{name}_%{ve # Debian package patches, from debian.tar.xz Patch0: debian_eglibc-fts-without-LFS.patch Patch2: debian_fix-shell-in-fakeroot.patch -Patch3: debian_hide-dlsym-error.patch # Address some POSIX-types related problems. Patch4: fakeroot-inttypes.patch # Fix LD_LIBRARY_PATH for multilib: https://bugzilla.redhat.com/show_bug.cgi?id=1241527 @@ -58,7 +57,7 @@ This package contains the libraries required by %{name}. %build %if %{with autoconf} -autoreconf -i +./bootstrap pushd doc po4a -k 0 --rm-backups --variable "srcdir=../doc/" po4a/po4a.cfg popd @@ -154,6 +153,10 @@ fi %ghost %{_libdir}/libfakeroot/libfakeroot-0.so %changelog +* Mon Oct 05 2020 Dominik Mierzejewski - 1.25.2-1 +- update to 1.25.2 (#1881277) +- drop obsolete patch + * Tue Jan 28 2020 Fedora Release Engineering - 1.24-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 3df2f4a..67a5abd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fakeroot_1.24.orig.tar.gz) = b15db7bbfb03264f294fb3b42813e17758b43ef7f121e55a24af9ec30ff3f4ec8eb0392db88133e56f9728b3828f6c1432d1e5d2e881a69d083ad444b9177487 +SHA512 (fakeroot_1.25.2.orig.tar.gz) = 3afc0d6c82bef4968f1eac293174d12f957788f173fa8b69753c422f0f3bb54e012d350eaa8e535501dd62185479c1d4cb1c6e3f605930ae5987a7f622c450c2