From 0667ecdee6c2ce9f5f37e07fe92b91c1cc21cff4 Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Thu, 12 Nov 2020 17:58:49 -0600 Subject: [PATCH] fakeroot: update to 1.25.3 Update and adopt [ci skip] --- common/shlibs | 1 + .../busybox_compat_force_abslibpath.patch | 12 ++--- .../patches/fakeroot-hide-dlsym-errors.patch | 21 ++++----- srcpkgs/fakeroot/patches/fakeroot-sysv.patch | 45 +++++++++++++++++++ srcpkgs/fakeroot/template | 16 +++---- 5 files changed, 68 insertions(+), 27 deletions(-) create mode 100644 srcpkgs/fakeroot/patches/fakeroot-sysv.patch diff --git a/common/shlibs b/common/shlibs index a741df76173..c6a4a20142a 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3995,3 +3995,4 @@ libSeExpr2.so.3 seexpr-krita-3.4.4.0_1 liburing.so.1 liburing-0.7_1 libbson-1.0.so.0 libbson-1.17.0_1 libsonic.so.0 libsonic-0.2.0_1 +libfakeroot-0.so fakeroot-1.25.3_1 diff --git a/srcpkgs/fakeroot/patches/busybox_compat_force_abslibpath.patch b/srcpkgs/fakeroot/patches/busybox_compat_force_abslibpath.patch index 2bd1b4129bd..75e560ca96c 100644 --- a/srcpkgs/fakeroot/patches/busybox_compat_force_abslibpath.patch +++ b/srcpkgs/fakeroot/patches/busybox_compat_force_abslibpath.patch @@ -1,14 +1,16 @@ -- Always force absolute path for LD_PRELOAD. + Always force absolute path for LD_PRELOAD. - Make getopt test work with busybox implementation. - ---- scripts/fakeroot.in.orig 2011-12-01 05:00:36.000000000 +0100 -+++ scripts/fakeroot.in 2012-02-01 16:04:04.707499043 +0100 +--- +diff --git scripts/fakeroot.in scripts/fakeroot.in +index 0d6f435..148b9c7 100755 +--- scripts/fakeroot.in ++++ scripts/fakeroot.in @@ -33,7 +33,7 @@ fatal () FAKEROOT_PREFIX=@prefix@ FAKEROOT_BINDIR=@bindir@ -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 index 71c2d214e68..86f8cd9eb91 100644 --- a/srcpkgs/fakeroot/patches/fakeroot-hide-dlsym-errors.patch +++ b/srcpkgs/fakeroot/patches/fakeroot-hide-dlsym-errors.patch @@ -1,20 +1,17 @@ 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(); +--- +diff --git libfakeroot.c libfakeroot.c +index 3e80e38..d3b9232 100644 +--- libfakeroot.c ++++ libfakeroot.c +@@ -263,7 +263,7 @@ void load_library_symbols(void){ *(next_wrap[i].doit)=dlsym(get_libc(), next_wrap[i].name); + #ifdef LIBFAKEROOT_DEBUGGING + /* illumos libc creates noise if symbols is not found (e. g. acl_get())*/ - 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 - } - } - + #endif /* LIBFAKEROOT_DEBUGGING */ diff --git a/srcpkgs/fakeroot/patches/fakeroot-sysv.patch b/srcpkgs/fakeroot/patches/fakeroot-sysv.patch new file mode 100644 index 00000000000..5e1a8e3df14 --- /dev/null +++ b/srcpkgs/fakeroot/patches/fakeroot-sysv.patch @@ -0,0 +1,45 @@ +--- configure.ac.orig ++++ configure.ac +@@ -25,42 +25,6 @@ + [ac_cv_use_ipc], + [ac_cv_use_ipc=sysv]) + +-if test $ac_cv_use_ipc = "sysv"; then +- AC_MSG_CHECKING([whether SysV IPC message queues are actually working on the host]) +- +- AC_LANG_PUSH(C) +- AC_TRY_RUN([ +-#include +-#include +-#include +-#include +-#include +-#include +- +-int main() { +- +- srandom(time(NULL)+getpid()*33151); +- key_t msg_key = random(); +- int msg_get = msgget(msg_key, IPC_CREAT|0600); +- +- if (msg_get==-1) { +- return 1; +- } else { +- msgctl(msg_get, IPC_RMID, NULL); +- return 0; +- } +- +-}], [ac_cv_use_ipc=sysv], [ac_cv_use_ipc=tcp]) +- +- if test $ac_cv_use_ipc = "tcp"; then +- AC_MSG_RESULT([No, using TCP]) +- else +- AC_MSG_RESULT([Yes]) +- fi +- +- AC_LANG_POP(C) +-fi +- + AC_ARG_WITH([dbformat], + AS_HELP_STRING([--with-dbformat@<:@=DBFORMAT@:>@], + [database format to use: either inode (default) or path]), diff --git a/srcpkgs/fakeroot/template b/srcpkgs/fakeroot/template index 053cbc1babf..9d066688bf0 100644 --- a/srcpkgs/fakeroot/template +++ b/srcpkgs/fakeroot/template @@ -1,18 +1,17 @@ # Template file for 'fakeroot' pkgname=fakeroot -version=1.24 +version=1.25.3 revision=1 build_style=gnu-configure configure_args="--disable-static" hostmakedepends="automake libtool" makedepends="acl-devel libcap-devel" short_desc="Gives a fake root environment" -maintainer="Orphaned " +maintainer="Nathan " 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 case "$XBPS_TARGET_MACHINE" in @@ -20,11 +19,8 @@ case "$XBPS_TARGET_MACHINE" in esac pre_configure() { - sed -i /SUBDIRS/d doc/Makefile.am + vsed -i '/SUBDIRS/d' doc/Makefile.am + # Disable test since we need chroot + vsed -i '/SUBDIRS/s,test,,' Makefile.am sh ./bootstrap } - -post_install() { - # Use /bin/sh shebang. - sed -i -e "s|^#!/bin/bash$|#!/bin/sh|" ${DESTDIR}/usr/bin/fakeroot -}