Github messages for voidlinux
 help / color / mirror / Atom feed
* Re: fakeroot: update to 1.25.3
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-25524@inbox.vuxu.org>
@ 2020-10-11 17:18 ` ev-ermakov
  2020-10-11 18:19 ` [PR PATCH] [Updated] " ev-ermakov
                   ` (7 subsequent siblings)
  8 siblings, 0 replies; 16+ messages in thread
From: ev-ermakov @ 2020-10-11 17:18 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 198 bytes --]

New comment by ev-ermakov on void-packages repository

https://github.com/void-linux/void-packages/pull/25524#issuecomment-706737258

Comment:
Cross builds failed, I can't figure out what is wrong.

^ permalink raw reply	[flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] fakeroot: update to 1.25.3
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-25524@inbox.vuxu.org>
  2020-10-11 17:18 ` fakeroot: update to 1.25.3 ev-ermakov
@ 2020-10-11 18:19 ` ev-ermakov
  2020-10-12 23:58 ` ev-ermakov
                   ` (6 subsequent siblings)
  8 siblings, 0 replies; 16+ messages in thread
From: ev-ermakov @ 2020-10-11 18:19 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 330 bytes --]

There is an updated pull request by ev-ermakov against master on the void-packages repository

https://github.com/ev-ermakov/void-packages fakeroot-1.25.3
https://github.com/void-linux/void-packages/pull/25524

fakeroot: update to 1.25.3


A patch file from https://github.com/void-linux/void-packages/pull/25524.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fakeroot-1.25.3-25524.patch --]
[-- Type: text/x-diff, Size: 3444 bytes --]

From dc6def224a30c45f3b00afb46ae13e1183299d77 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
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 <orphan@voidlinux.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
 
+if [ "$CROSS_BUILD" ]; then
+	configure_args="--with-ipc=tcp"
+fi
+
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) CFLAGS="-D_STAT_VER=0" ;;
 esac

^ permalink raw reply	[flat|nested] 16+ messages in thread
* Re: fakeroot: update to 1.25.3
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-25524@inbox.vuxu.org>
  2020-10-11 17:18 ` fakeroot: update to 1.25.3 ev-ermakov
  2020-10-11 18:19 ` [PR PATCH] [Updated] " ev-ermakov
@ 2020-10-12 23:58 ` ev-ermakov
  2020-10-21 18:43 ` Chocimier
                   ` (5 subsequent siblings)
  8 siblings, 0 replies; 16+ messages in thread
From: ev-ermakov @ 2020-10-12 23:58 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 216 bytes --]

New comment by ev-ermakov on void-packages repository

https://github.com/void-linux/void-packages/pull/25524#issuecomment-707404532

Comment:
Passing `--with-ipc=tcp` to `./configure` makes the cross build succeed.

^ permalink raw reply	[flat|nested] 16+ messages in thread
* Re: fakeroot: update to 1.25.3
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-25524@inbox.vuxu.org>
                   ` (2 preceding siblings ...)
  2020-10-12 23:58 ` ev-ermakov
@ 2020-10-21 18:43 ` Chocimier
  2020-10-21 18:53 ` ericonr
                   ` (4 subsequent siblings)
  8 siblings, 0 replies; 16+ messages in thread
From: Chocimier @ 2020-10-21 18:43 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 280 bytes --]

New comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/25524#issuecomment-713796972

Comment:
Cross build packages should be same as build natively on target platform. We have sysv ipc support, remove check at end of pre_configure.

^ permalink raw reply	[flat|nested] 16+ messages in thread
* Re: fakeroot: update to 1.25.3
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-25524@inbox.vuxu.org>
                   ` (3 preceding siblings ...)
  2020-10-21 18:43 ` Chocimier
@ 2020-10-21 18:53 ` ericonr
  2020-10-21 20:00 ` ev-ermakov
                   ` (3 subsequent siblings)
  8 siblings, 0 replies; 16+ messages in thread
From: ericonr @ 2020-10-21 18:53 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 241 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/25524#issuecomment-713801926

Comment:
I think the homepage should be moved to https://salsa.debian.org/clint/fakeroot , what do you think?

^ permalink raw reply	[flat|nested] 16+ messages in thread
* Re: fakeroot: update to 1.25.3
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-25524@inbox.vuxu.org>
                   ` (4 preceding siblings ...)
  2020-10-21 18:53 ` ericonr
@ 2020-10-21 20:00 ` ev-ermakov
  2020-10-21 20:00 ` [PR PATCH] [Updated] " ev-ermakov
                   ` (2 subsequent siblings)
  8 siblings, 0 replies; 16+ messages in thread
From: ev-ermakov @ 2020-10-21 20:00 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 270 bytes --]

New comment by ev-ermakov on void-packages repository

https://github.com/void-linux/void-packages/pull/25524#issuecomment-713840059

Comment:
@Chocimier
Hmm, what check do you mean? 

Anyway, I've created a patch that removes the check in the `configure.ac` script.

^ permalink raw reply	[flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] fakeroot: update to 1.25.3
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-25524@inbox.vuxu.org>
                   ` (5 preceding siblings ...)
  2020-10-21 20:00 ` ev-ermakov
@ 2020-10-21 20:00 ` ev-ermakov
  2020-12-30  7:00 ` the-maldridge
  2020-12-30  7:00 ` [PR PATCH] [Closed]: " the-maldridge
  8 siblings, 0 replies; 16+ messages in thread
From: ev-ermakov @ 2020-10-21 20:00 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 330 bytes --]

There is an updated pull request by ev-ermakov against master on the void-packages repository

https://github.com/ev-ermakov/void-packages fakeroot-1.25.3
https://github.com/void-linux/void-packages/pull/25524

fakeroot: update to 1.25.3


A patch file from https://github.com/void-linux/void-packages/pull/25524.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fakeroot-1.25.3-25524.patch --]
[-- Type: text/x-diff, Size: 4701 bytes --]

From c6a6427c2ecffa460ade235d1f65431ad12f6aad Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
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/patches/fakeroot-sysv.patch  | 45 +++++++++++++++++++
 srcpkgs/fakeroot/template                     |  4 +-
 5 files changed, 49 insertions(+), 23 deletions(-)
 delete mode 100644 srcpkgs/fakeroot/patches/fakeroot-hide-dlsym-errors.patch
 create mode 100644 srcpkgs/fakeroot/patches/fakeroot-sysv.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/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 <stdlib.h>
+-#include <sys/types.h>
+-#include <sys/ipc.h>
+-#include <sys/msg.h>
+-#include <time.h>
+-#include <unistd.h>
+-
+-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..7a8eb7287a3 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,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.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
 

^ permalink raw reply	[flat|nested] 16+ messages in thread
* Re: fakeroot: update to 1.25.3
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-25524@inbox.vuxu.org>
                   ` (6 preceding siblings ...)
  2020-10-21 20:00 ` [PR PATCH] [Updated] " ev-ermakov
@ 2020-12-30  7:00 ` the-maldridge
  2020-12-30  7:00 ` [PR PATCH] [Closed]: " the-maldridge
  8 siblings, 0 replies; 16+ messages in thread
From: the-maldridge @ 2020-12-30  7:00 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 208 bytes --]

New comment by the-maldridge on void-packages repository

https://github.com/void-linux/void-packages/pull/25524#issuecomment-752352049

Comment:
Superseded by #26336 which adopts and therefore has priority.

^ permalink raw reply	[flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Closed]: fakeroot: update to 1.25.3
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-25524@inbox.vuxu.org>
                   ` (7 preceding siblings ...)
  2020-12-30  7:00 ` the-maldridge
@ 2020-12-30  7:00 ` the-maldridge
  8 siblings, 0 replies; 16+ messages in thread
From: the-maldridge @ 2020-12-30  7:00 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 160 bytes --]

There's a closed pull request on the void-packages repository

fakeroot: update to 1.25.3
https://github.com/void-linux/void-packages/pull/25524

Description:


^ permalink raw reply	[flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] fakeroot: update to 1.25.3
  2020-11-12 23:59 [PR PATCH] " ndowens
                   ` (5 preceding siblings ...)
  2020-11-13 23:53 ` ndowens
@ 2020-11-14  1:17 ` ndowens
  6 siblings, 0 replies; 16+ messages in thread
From: ndowens @ 2020-11-14  1:17 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 333 bytes --]

There is an updated 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: 5961 bytes --]

From 0667ecdee6c2ce9f5f37e07fe92b91c1cc21cff4 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
[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 <stdlib.h>
+-#include <sys/types.h>
+-#include <sys/ipc.h>
+-#include <sys/msg.h>
+-#include <time.h>
+-#include <unistd.h>
+-
+-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 <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,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
-}

^ permalink raw reply	[flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] fakeroot: update to 1.25.3
  2020-11-12 23:59 [PR PATCH] " ndowens
                   ` (4 preceding siblings ...)
  2020-11-13 23:49 ` ndowens
@ 2020-11-13 23:53 ` ndowens
  2020-11-14  1:17 ` ndowens
  6 siblings, 0 replies; 16+ messages in thread
From: ndowens @ 2020-11-13 23:53 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 333 bytes --]

There is an updated 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: 5951 bytes --]

From d6d9693abb8b53fc2bc4601010c560290cc12945 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
---
 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 <stdlib.h>
+-#include <sys/types.h>
+-#include <sys/ipc.h>
+-#include <sys/msg.h>
+-#include <time.h>
+-#include <unistd.h>
+-
+-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 <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,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
-}

^ permalink raw reply	[flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] fakeroot: update to 1.25.3
  2020-11-12 23:59 [PR PATCH] " ndowens
                   ` (3 preceding siblings ...)
  2020-11-13 23:45 ` ndowens
@ 2020-11-13 23:49 ` ndowens
  2020-11-13 23:53 ` ndowens
  2020-11-14  1:17 ` ndowens
  6 siblings, 0 replies; 16+ messages in thread
From: ndowens @ 2020-11-13 23:49 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 333 bytes --]

There is an updated 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: 5152 bytes --]

From 284de43f63db3a995a7e861f564e4fdb21ac7860 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
---
 common/shlibs                                 |  1 +
 .../busybox_compat_force_abslibpath.patch     | 12 ++++++-----
 .../patches/fakeroot-hide-dlsym-errors.patch  | 21 ++++++++-----------
 srcpkgs/fakeroot/patches/fakeroot-sysv.patch  |  1 +
 srcpkgs/fakeroot/template                     | 16 ++++++--------
 5 files changed, 24 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..b4f8b6bf5a7
--- /dev/null
+++ b/srcpkgs/fakeroot/patches/fakeroot-sysv.patch
@@ -0,0 +1 @@
+<html><body>You are being <a href="https://raw.githubusercontent.com/void-linux/void-packages/c6a6427c2ecffa460ade235d1f65431ad12f6aad/srcpkgs/fakeroot/patches/fakeroot-sysv.patch">redirected</a>.</body></html>
\ No newline at end of file
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 <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,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
-}

^ permalink raw reply	[flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] fakeroot: update to 1.25.3
  2020-11-12 23:59 [PR PATCH] " ndowens
                   ` (2 preceding siblings ...)
  2020-11-13 23:45 ` ndowens
@ 2020-11-13 23:45 ` ndowens
  2020-11-13 23:49 ` ndowens
                   ` (2 subsequent siblings)
  6 siblings, 0 replies; 16+ messages in thread
From: ndowens @ 2020-11-13 23:45 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 333 bytes --]

There is an updated 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: 4557 bytes --]

From bbeacc5ea2ee7784ee8ab5154f01031e1262a2df 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
---
 common/shlibs                                 |  1 +
 .../busybox_compat_force_abslibpath.patch     | 12 ++++++-----
 .../patches/fakeroot-hide-dlsym-errors.patch  | 21 ++++++++-----------
 srcpkgs/fakeroot/template                     | 16 ++++++--------
 4 files changed, 23 insertions(+), 27 deletions(-)

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/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 <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,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
-}

^ permalink raw reply	[flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] fakeroot: update to 1.25.3
  2020-11-12 23:59 [PR PATCH] " ndowens
  2020-11-13 23:31 ` [PR PATCH] [Updated] " ndowens
  2020-11-13 23:43 ` ndowens
@ 2020-11-13 23:45 ` ndowens
  2020-11-13 23:45 ` ndowens
                   ` (3 subsequent siblings)
  6 siblings, 0 replies; 16+ messages in thread
From: ndowens @ 2020-11-13 23:45 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 333 bytes --]

There is an updated 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: 4784 bytes --]

From 8c1c83581894120af6965b09597d0e6e5b8196e7 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
---
 common/shlibs                                 |  1 +
 config.6675                                   |  1 +
 .../busybox_compat_force_abslibpath.patch     | 12 ++++++-----
 .../patches/fakeroot-hide-dlsym-errors.patch  | 21 ++++++++-----------
 srcpkgs/fakeroot/template                     | 16 ++++++--------
 5 files changed, 24 insertions(+), 27 deletions(-)
 create mode 100644 config.6675

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/config.6675 b/config.6675
new file mode 100644
index 00000000000..9766475a418
--- /dev/null
+++ b/config.6675
@@ -0,0 +1 @@
+ok
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/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 <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,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
-}

^ permalink raw reply	[flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] fakeroot: update to 1.25.3
  2020-11-12 23:59 [PR PATCH] " ndowens
  2020-11-13 23:31 ` [PR PATCH] [Updated] " ndowens
@ 2020-11-13 23:43 ` ndowens
  2020-11-13 23:45 ` ndowens
                   ` (4 subsequent siblings)
  6 siblings, 0 replies; 16+ messages in thread
From: ndowens @ 2020-11-13 23:43 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 333 bytes --]

There is an updated 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: 4785 bytes --]

From 6a4db2314f4f525daa7925c0fe1ebc45a5322a72 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
---
 common/shlibs                                 |  1 +
 config.6675                                   |  1 +
 .../busybox_compat_force_abslibpath.patch     | 12 ++++++-----
 .../patches/fakeroot-hide-dlsym-errors.patch  | 21 ++++++++-----------
 srcpkgs/fakeroot/template                     | 16 ++++++--------
 5 files changed, 24 insertions(+), 27 deletions(-)
 create mode 100644 config.6675

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/config.6675 b/config.6675
new file mode 100644
index 00000000000..9766475a418
--- /dev/null
+++ b/config.6675
@@ -0,0 +1 @@
+ok
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/template b/srcpkgs/fakeroot/template
index 053cbc1babf..c04ae727d3c 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,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
-}

^ permalink raw reply	[flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] fakeroot: update to 1.25.3
  2020-11-12 23:59 [PR PATCH] " ndowens
@ 2020-11-13 23:31 ` ndowens
  2020-11-13 23:43 ` ndowens
                   ` (5 subsequent siblings)
  6 siblings, 0 replies; 16+ messages in thread
From: ndowens @ 2020-11-13 23:31 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 333 bytes --]

There is an updated 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: 4786 bytes --]

From 5341bbe3b642504e390bd6e3fcb5e45848ad9f2e 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
---
 common/shlibs                                 |  1 +
 config.6675                                   |  1 +
 .../busybox_compat_force_abslibpath.patch     | 12 ++++++-----
 .../patches/fakeroot-hide-dlsym-errors.patch  | 21 ++++++++-----------
 srcpkgs/fakeroot/template                     | 16 ++++++--------
 5 files changed, 24 insertions(+), 27 deletions(-)
 create mode 100644 config.6675

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/config.6675 b/config.6675
new file mode 100644
index 00000000000..9766475a418
--- /dev/null
+++ b/config.6675
@@ -0,0 +1 @@
+ok
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/template b/srcpkgs/fakeroot/template
index 053cbc1babf..4f79c3d8567 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,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
-}

^ permalink raw reply	[flat|nested] 16+ messages in thread
end of thread, other threads:[~2020-12-30  7:00 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-25524@inbox.vuxu.org>
2020-10-11 17:18 ` fakeroot: update to 1.25.3 ev-ermakov
2020-10-11 18:19 ` [PR PATCH] [Updated] " ev-ermakov
2020-10-12 23:58 ` ev-ermakov
2020-10-21 18:43 ` Chocimier
2020-10-21 18:53 ` ericonr
2020-10-21 20:00 ` ev-ermakov
2020-10-21 20:00 ` [PR PATCH] [Updated] " ev-ermakov
2020-12-30  7:00 ` the-maldridge
2020-12-30  7:00 ` [PR PATCH] [Closed]: " the-maldridge
2020-11-12 23:59 [PR PATCH] " ndowens
2020-11-13 23:31 ` [PR PATCH] [Updated] " ndowens
2020-11-13 23:43 ` 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

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).