Accepting request 845009 from home:polslinux:branches:devel:tools

- Update to 1.25.3 (no changelog)
- Removed fakeroot-1.24-fix-chown.patch
- Removed fakeroot-1.21-hide-dlsym-error.patch
- Rebased fakeroot-1.20-lib32.patch

OBS-URL: https://build.opensuse.org/request/show/845009
OBS-URL: https://build.opensuse.org/package/show/devel:tools/fakeroot?expand=0&rev=25

fakeroot-1.20-lib32.patch

@@ -1,17 +1,9 @@
-From: Adam Mizerski <adam@mizerski.pl>
+--- fakeroot-1.25.3/scripts/fakeroot.in.orig	2020-10-30 11:40:54.365410673 +0100
-Date: 2013-10-26 16:57:11 +0200
++++ fakeroot-1.25.3/scripts/fakeroot.in	2020-10-30 11:40:59.913425822 +0100
-Subject: Fix lib32 path.
-Upstream: no
-
-Fix lib32 path to allow running 32bit fakeroot on 64bit system.
-
-diff -ru fakeroot-1.20/scripts/fakeroot.in fakeroot-1.20_mod/scripts/fakeroot.in
---- fakeroot-1.20/scripts/fakeroot.in	2013-09-20 15:54:24.000000000 +0200
-+++ fakeroot-1.20_mod/scripts/fakeroot.in	2013-10-26 16:54:22.935621993 +0200
 @@ -35,7 +35,7 @@
  
  USEABSLIBPATH=@LDPRELOADABS@
- LIB=lib@fakeroot_transformed@@DLSUFFIX@
+ FAKEROOT_LIB=lib@fakeroot_transformed@@DLSUFFIX@
 -PATHS=@libdir@:${FAKEROOT_PREFIX}/lib64/libfakeroot:${FAKEROOT_PREFIX}/lib32/libfakeroot
 +PATHS=@libdir@:${FAKEROOT_PREFIX}/lib64/libfakeroot:${FAKEROOT_PREFIX}/lib/libfakeroot
  FAKED=${FAKEROOT_BINDIR}/@faked_transformed@

fakeroot-1.21-hide-dlsym-error.patch

@@ -1,32 +0,0 @@
-Description: Hide error from dlsym()
- dlsym(), starting in glibc 2.24 actually reports errors. In our case,
- we try to get ACL functions which are not in the glibc. This causes
- failures in test suites, so hide those messages for non-debugging
- purposes for now. It also makes the build logs annoying to read.
-Author: Julian Andres Klode <juliank@ubuntu.com>
-Origin: vendor
-Bug-Debian: https://bugs.debian.org/830912
-Forwarded: no
-Last-Update: 2016-08-12
-
---- a/libfakeroot.c
-+++ b/libfakeroot.c
-@@ -256,10 +256,16 @@ void load_library_symbols(void){
-  /* 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){
--      fprintf (stderr, "dlsym(%s): %s\n", next_wrap[i].name, msg);
--/*    abort ();*/
-+#ifdef LIBFAKEROOT_DEBUGGING
-+      if (fakeroot_debug) {
-+        fprintf (stderr, "dlsym(%s): %s\n", next_wrap[i].name, msg);
-+/*      abort ();*/
-+      }
-+#endif
-     }
-+
-   }
- }
- 

fakeroot-1.24-fix-chown.patch

@@ -1,22 +0,0 @@
-diff --git a/libfakeroot.c b/libfakeroot.c
-index f867758febd679370e70b493f1003fd3c9450573..977a4d933fa590fc1faefbe63a25e4fad6ebfcf6 100644
---- a/libfakeroot.c
-+++ b/libfakeroot.c
-@@ -880,7 +880,7 @@ int fchownat(int dir_fd, const char *path, uid_t owner, gid_t group, int flags)
-   /* If AT_SYMLINK_NOFOLLOW is set in the fchownat call it should
-      be when we stat it. */
-   INT_STRUCT_STAT st;
--  r=INT_NEXT_FSTATAT(dir_fd, path, &st, (flags & AT_SYMLINK_NOFOLLOW));
-+  r=INT_NEXT_FSTATAT(dir_fd, path, &st, (flags & (AT_SYMLINK_NOFOLLOW | AT_EMPTY_PATH | AT_NO_AUTOMOUNT)));
- 
-   if(r)
-     return(r);
-@@ -1017,7 +1017,7 @@ int fchmodat(int dir_fd, const char *path, mode_t mode, int flags) {
- 
-   /* If AT_SYMLINK_NOFOLLOW is set in the fchownat call it should
-      be when we stat it. */
--  r=INT_NEXT_FSTATAT(dir_fd, path, &st, flags & AT_SYMLINK_NOFOLLOW);
-+  r=INT_NEXT_FSTATAT(dir_fd, path, &st, flags & (AT_SYMLINK_NOFOLLOW | AT_EMPTY_PATH | AT_NO_AUTOMOUNT));
- 
-   if(r)
-     return(r);

fakeroot-1.24.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2e045b3160370b8ab4d44d1f8d267e5d1d555f1bb522d650e7167b09477266ed
-size 522497

fakeroot-1.25.3.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8e903683357f7f5bcc31b879fd743391ad47691d4be33d24a76be3b6c21e956c
+size 126884

fakeroot.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Oct 30 10:47:10 UTC 2020 - Paolo Stivanin <info@paolostivanin.com>
+
+- Update to 1.25.3 (no changelog)
+- Removed fakeroot-1.24-fix-chown.patch
+- Removed fakeroot-1.21-hide-dlsym-error.patch
+- Rebased fakeroot-1.20-lib32.patch
+
 -------------------------------------------------------------------
 Tue Jun  9 11:54:31 UTC 2020 - Dirk Mueller <dmueller@suse.com>
 

fakeroot.spec

@@ -17,7 +17,7 @@
 
 
 Name:           fakeroot
-Version:        1.24
+Version:        1.25.3
 Release:        0
 Summary:        Wrapper that gives a fake root environment
 License:        GPL-3.0-or-later
@@ -27,13 +27,9 @@ Source0:        http://ftp.debian.org/debian/pool/main/f/fakeroot/%{name}_%{vers
 Source99:       baselibs.conf
 Patch0:         %{name}-1.20-lib32.patch
 Patch2:         %{name}-1.20-eglibc-fts-without-LFS.patch
-# PATCH-FIX-UPSTREAM fakeroot-1.21-hide-dlsym-error.patch (deb#830912)
-Patch3:         %{name}-1.21-hide-dlsym-error.patch
 # PATCH-FIX-UPSTREAM fakeroot-1.21-fix-shell-in-fakeroot.patch (deb#828810)
 Patch4:         %{name}-1.21-fix-shell-in-fakeroot
 Patch5:         fakeroot-drop-tartest.patch
-# PATCH-FIX-UPSTREAM https://salsa.debian.org/clint/fakeroot/-/commit/55e12cb8b02d65b9fc9c3e607794db5e01e2f94f.diff
-Patch6:         fakeroot-1.24-fix-chown.patch
 BuildRequires:  automake
 BuildRequires:  fdupes
 # user(daemon)/group(sys) is required for t.tar testsuite