From dc6def224a30c45f3b00afb46ae13e1183299d77 Mon Sep 17 00:00:00 2001 From: Evgeny Ermakov Date: Mon, 12 Oct 2020 00:52:08 +1100 Subject: [PATCH] fakeroot: update to 1.25.3 --- common/shlibs | 1 + .../busybox_compat_force_abslibpath.patch | 2 +- .../patches/fakeroot-hide-dlsym-errors.patch | 20 ------------------- srcpkgs/fakeroot/template | 8 ++++++-- 4 files changed, 8 insertions(+), 23 deletions(-) delete mode 100644 srcpkgs/fakeroot/patches/fakeroot-hide-dlsym-errors.patch diff --git a/common/shlibs b/common/shlibs index 9c7da029640..11566f45d5a 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1821,6 +1821,7 @@ libgeis.so.1 geis-2.2.16_1 libndp.so.0 libndp-1.3_1 libepoxy.so.0 libepoxy-1.2_1 libfakekey.so.0 libfakekey-0.1_1 +libfakeroot-0.so fakeroot-1.25.3_1 libsmartcols.so.1 libsmartcols-2.25_1 libfdisk.so.1 libfdisk-2.26_1 libspiro.so.1 libspiro-20190731_1 diff --git a/srcpkgs/fakeroot/patches/busybox_compat_force_abslibpath.patch b/srcpkgs/fakeroot/patches/busybox_compat_force_abslibpath.patch index 2bd1b4129bd..4e7c6ddb0a0 100644 --- a/srcpkgs/fakeroot/patches/busybox_compat_force_abslibpath.patch +++ b/srcpkgs/fakeroot/patches/busybox_compat_force_abslibpath.patch @@ -9,6 +9,6 @@ -USEABSLIBPATH=@LDPRELOADABS@ +USEABSLIBPATH=1 - LIB=lib@fakeroot_transformed@@DLSUFFIX@ + FAKEROOT_LIB=lib@fakeroot_transformed@@DLSUFFIX@ PATHS=@libdir@:${FAKEROOT_PREFIX}/lib64/libfakeroot:${FAKEROOT_PREFIX}/lib32/libfakeroot FAKED=${FAKEROOT_BINDIR}/@faked_transformed@ diff --git a/srcpkgs/fakeroot/patches/fakeroot-hide-dlsym-errors.patch b/srcpkgs/fakeroot/patches/fakeroot-hide-dlsym-errors.patch deleted file mode 100644 index 71c2d214e68..00000000000 --- a/srcpkgs/fakeroot/patches/fakeroot-hide-dlsym-errors.patch +++ /dev/null @@ -1,20 +0,0 @@ -it's normal that the acl_* symbols are not found if the application -is not linked against -lacl. these errors harmless, but mighty -annoying. - ---- libfakeroot.c.orig 2014-03-07 11:20:26.120532847 +0200 -+++ libfakeroot.c 2014-03-07 11:21:26.486872482 +0200 -@@ -258,10 +258,12 @@ - /* 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){ -+#ifdef LIBFAKEROOT_DEBUGGING -+ if ( fakeroot_debug && (msg = dlerror()) != NULL) { - fprintf (stderr, "dlsym(%s): %s\n", next_wrap[i].name, msg); - /* abort ();*/ - } -+#endif - } - } - diff --git a/srcpkgs/fakeroot/template b/srcpkgs/fakeroot/template index 053cbc1babf..063cafd1300 100644 --- a/srcpkgs/fakeroot/template +++ b/srcpkgs/fakeroot/template @@ -1,6 +1,6 @@ # Template file for 'fakeroot' pkgname=fakeroot -version=1.24 +version=1.25.3 revision=1 build_style=gnu-configure configure_args="--disable-static" @@ -11,10 +11,14 @@ maintainer="Orphaned " license="GPL-3.0-or-later" homepage="http://packages.debian.org/fakeroot" distfiles="${DEBIAN_SITE}/main/f/fakeroot/${pkgname}_${version}.orig.tar.gz" -checksum=2e045b3160370b8ab4d44d1f8d267e5d1d555f1bb522d650e7167b09477266ed +checksum=8e903683357f7f5bcc31b879fd743391ad47691d4be33d24a76be3b6c21e956c lib32disabled=yes +if [ "$CROSS_BUILD" ]; then + configure_args="--with-ipc=tcp" +fi + case "$XBPS_TARGET_MACHINE" in *-musl) CFLAGS="-D_STAT_VER=0" ;; esac