From: ndowens <ndowens@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] fakeroot: update to 1.25.3
Date: Fri, 13 Nov 2020 00:59:24 +0100 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26336@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 328 bytes --]
There is a new pull request by ndowens against master on the void-packages repository
https://github.com/ndowens/void-packages fakeroot
https://github.com/void-linux/void-packages/pull/26336
fakeroot: update to 1.25.3
Update and adopt
A patch file from https://github.com/void-linux/void-packages/pull/26336.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fakeroot-26336.patch --]
[-- Type: text/x-diff, Size: 4117 bytes --]
From b20e515ee50f89bfac15ac279f18158507708936 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Thu, 12 Nov 2020 17:58:49 -0600
Subject: [PATCH] fakeroot: update to 1.25.3
Update and adopt
---
.../busybox_compat_force_abslibpath.patch | 11 ++++-----
.../patches/fakeroot-hide-dlsym-errors.patch | 23 +++++++------------
srcpkgs/fakeroot/template | 11 ++++-----
3 files changed, 18 insertions(+), 27 deletions(-)
diff --git a/srcpkgs/fakeroot/patches/busybox_compat_force_abslibpath.patch b/srcpkgs/fakeroot/patches/busybox_compat_force_abslibpath.patch
index 2bd1b4129bd..8bf0199dd1e 100644
--- a/srcpkgs/fakeroot/patches/busybox_compat_force_abslibpath.patch
+++ b/srcpkgs/fakeroot/patches/busybox_compat_force_abslibpath.patch
@@ -1,14 +1,13 @@
-- 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..47eae7d27cb 100644
--- a/srcpkgs/fakeroot/patches/fakeroot-hide-dlsym-errors.patch
+++ b/srcpkgs/fakeroot/patches/fakeroot-hide-dlsym-errors.patch
@@ -1,20 +1,13 @@
-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/template b/srcpkgs/fakeroot/template
index 053cbc1babf..250ccdd7132 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 <orphan@voidlinux.org>"
+maintainer="Nathan <ndowens@artixlinux.org>"
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,11 @@ case "$XBPS_TARGET_MACHINE" in
esac
pre_configure() {
- sed -i /SUBDIRS/d doc/Makefile.am
+ vsed -i '/SUBDIRS/d' doc/Makefile.am
sh ./bootstrap
}
post_install() {
# Use /bin/sh shebang.
- sed -i -e "s|^#!/bin/bash$|#!/bin/sh|" ${DESTDIR}/usr/bin/fakeroot
+ vsed -i -e "s|^#!/bin/bash$|#!/bin/sh|" ${DESTDIR}/usr/bin/fakeroot
}
next reply other threads:[~2020-11-12 23:59 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-12 23:59 ndowens [this message]
2020-11-13 17:25 ` Chocimier
2020-11-13 23:31 ` [PR PATCH] [Updated] " ndowens
2020-11-13 23:42 ` [PR PATCH] [Closed]: " ndowens
2020-11-13 23:43 ` [PR PATCH] [Updated] " ndowens
2020-11-13 23:45 ` ndowens
2020-11-13 23:45 ` ndowens
2020-11-13 23:49 ` ndowens
2020-11-13 23:53 ` ndowens
2020-11-14 1:17 ` ndowens
2021-03-08 3:39 ` ericonr
2021-03-08 3:39 ` [PR PATCH] [Closed]: " ericonr
2021-02-22 16:42 [PR PATCH] " Piraty
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26336@inbox.vuxu.org \
--to=ndowens@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).