Re: [PR PATCH] [Updated] fakeroot: update to 1.25.3

[ev-ermakov <ev-ermakov@users.noreply.github.com>]

[-- 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