Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] fakeroot: update to 1.25.3.
@ 2021-02-22 16:42 Piraty
  0 siblings, 0 replies; 2+ messages in thread
From: Piraty @ 2021-02-22 16:42 UTC (permalink / raw)
  To: ml

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

There is a new pull request by Piraty against master on the void-packages repository

https://github.com/Piraty/void-packages fakeroot-1.25.3
https://github.com/void-linux/void-packages/pull/28977

fakeroot: update to 1.25.3.
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

supersedes #26336

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

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

From 741b0601de60fdd53dd1bb97d5d6c96f79d306ce Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Wed, 10 Feb 2021 08:39:31 +0100
Subject: [PATCH] fakeroot: update to 1.25.3.

---
 .../busybox_compat_force_abslibpath.patch     | 14 ----
 .../cross-dont-run-sysv-ipc-test.patch        | 72 +++++++++++++++++++
 .../patches/fakeroot-hide-dlsym-errors.patch  | 20 ------
 srcpkgs/fakeroot/template                     | 41 ++++++++---
 4 files changed, 103 insertions(+), 44 deletions(-)
 delete mode 100644 srcpkgs/fakeroot/patches/busybox_compat_force_abslibpath.patch
 create mode 100644 srcpkgs/fakeroot/patches/cross-dont-run-sysv-ipc-test.patch
 delete mode 100644 srcpkgs/fakeroot/patches/fakeroot-hide-dlsym-errors.patch

diff --git a/srcpkgs/fakeroot/patches/busybox_compat_force_abslibpath.patch b/srcpkgs/fakeroot/patches/busybox_compat_force_abslibpath.patch
deleted file mode 100644
index 2bd1b4129bd..00000000000
--- a/srcpkgs/fakeroot/patches/busybox_compat_force_abslibpath.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-- 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
-@@ -33,7 +33,7 @@ fatal ()
- FAKEROOT_PREFIX=@prefix@
- FAKEROOT_BINDIR=@bindir@
- 
--USEABSLIBPATH=@LDPRELOADABS@
-+USEABSLIBPATH=1
- 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/cross-dont-run-sysv-ipc-test.patch b/srcpkgs/fakeroot/patches/cross-dont-run-sysv-ipc-test.patch
new file mode 100644
index 00000000000..d878145e5fd
--- /dev/null
+++ b/srcpkgs/fakeroot/patches/cross-dont-run-sysv-ipc-test.patch
@@ -0,0 +1,72 @@
+Revert "Select TCP when lack of SYSV IPC"
+
+This reverts commit 19d204548d4f141fcc8a5e494eea84282b17f4a2.
+
+From 19d204548d4f141fcc8a5e494eea84282b17f4a2 Mon Sep 17 00:00:00 2001
+From: Matt Weber <matthew.weber@rockwellcollins.com>
+Date: Mon, 16 Sep 2019 22:00:29 -0500
+Subject: [PATCH] Select TCP when lack of SYSV IPC
+
+Update to add a configure test to build and install the TCP IPC version
+when detecting SYSV IPC MsgQ support isn't available.
+
+The issue was initially discovered on Windows Services for Linux
+(WSL1.0). WSL does have some SysV IPC, but no message Q's, which is
+required by fakeroot/faked by default.
+
+Fixes:
+https://github.com/Microsoft/WSL/issues/2465
+
+Additional bug reports:
+https://bugs.busybox.net/show_bug.cgi?id=11366
+
+Signed-off-by: Jean-Francois Doyon <jfdoyon@gmail.com>
+Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com>
+
+diff --git a/configure.ac b/configure.ac
+index 73415d2..ddde5c9 100644
+--- configure.ac
++++ configure.ac
+@@ -25,42 +25,6 @@ AC_CACHE_CHECK([which IPC method to use],
+ 	       [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/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..b1ea59cac18 100644
--- a/srcpkgs/fakeroot/template
+++ b/srcpkgs/fakeroot/template
@@ -1,30 +1,51 @@
 # 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"
+#checkdepends="sharutils"
 short_desc="Gives a fake root environment"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Piraty <piraty1@inbox.ru>"
 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
-	*-musl) CFLAGS="-D_STAT_VER=0" ;;
-esac
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	CFLAGS="-D_STAT_VER=0"
+fi
+
+post_patch() {
+	# always force absolute path for LD_PRELOAD
+	vsed -i scripts/fakeroot.in -e 's/@LDPRELOADABS@/1/'
+
+	# don't build translated manpages
+	vsed -i doc/Makefile.am -e '/SUBDIRS/d'
+
+	# disable failing tests
+	#
+	# depends on chown which dosn't work in chroot
+	vsed -i test/Makefile.am -e '/  t\.tar/d'
+	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+		#mknod: Operation not permitted
+		vsed -i test/Makefile.am \
+			-e '/  t\.chmod_dev/d' \
+			-e '/  t\.mknod/d'
+		#ls doesn't report owner as root
+		vsed -i test/Makefile.am \
+			-e '/  t\.touchinstall/d'
+	fi
+}
 
 pre_configure() {
-	sed -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
+pre_check() {
+	export VERBOSE=x
 }

^ permalink raw reply	[flat|nested] 2+ messages in thread

* [PR PATCH] fakeroot: update to 1.25.3
@ 2020-11-12 23:59 ndowens
  0 siblings, 0 replies; 2+ messages in thread
From: ndowens @ 2020-11-12 23:59 UTC (permalink / raw)
  To: ml

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

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-02-22 16:42 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-22 16:42 [PR PATCH] fakeroot: update to 1.25.3 Piraty
  -- strict thread matches above, loose matches on Subject: below --
2020-11-12 23:59 ndowens

Github messages for voidlinux

This inbox may be cloned and mirrored by anyone:

	git clone --mirror http://inbox.vuxu.org/voidlinux-github

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V1 voidlinux-github voidlinux-github/ http://inbox.vuxu.org/voidlinux-github \
		voidlinux-github@inbox.vuxu.org
	public-inbox-index voidlinux-github

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.vuxu.org/vuxu.github.voidlinux


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git