Skip to contentSkip to conversation

package/fakeroot: bump version to 1.25.3

PATCH Superseded Norbert Lange 2 participants 4 messages Oct 14, 2020

lore
Share & tools
lore

Norbert Lange

author
#0 lore raw

PATCH v4 1/1 package/fakeroot: bump version to 1.25.3

This version adds wrappers for getgroups and statx, the latter is used by coreutils 8.32.

Removed patches that are now in upstream.

Added a patch to fix failure when installing.

Signed-off-by Norbert Lange <[email protected]>

---
v1->v2
- rebased on master (instead of my private branch)
v2->v3
- use debian.snapshot as source URL
v3->v4
- bump version to 1.25.3 (aka desperation ping)

---
 package/fakeroot/0001-hide-dlsym-error.patch  | 34 --------
 package/fakeroot/0001-skip-doc-subdirs.patch  | 14 ++++
 ...nicate-check-return-status-of-msgrcv.patch | 46 -----------
 ...003-Select-TCP-when-lack-of-SYSV-IPC.patch | 77 -------------------
 ...Fix-forwarding-fchownat-fchmod-flags.patch | 28 -------
 package/fakeroot/fakeroot.hash                |  8 +-
 package/fakeroot/fakeroot.mk                  |  8 +-
 7 files changed, 21 insertions(+), 194 deletions(-)
 delete mode 100644 package/fakeroot/0001-hide-dlsym-error.patch
 create mode 100644 package/fakeroot/0001-skip-doc-subdirs.patch
 delete mode 100644 package/fakeroot/0002-communicate-check-return-status-of-msgrcv.patch
 delete mode 100644 package/fakeroot/0003-Select-TCP-when-lack-of-SYSV-IPC.patch
 delete mode 100644 package/fakeroot/0004-Fix-forwarding-fchownat-fchmod-flags.patch
package/fakeroot/0001-hide-dlsym-error.patch deleted +0 -34
deleted file mode 100644
index 2c61fab248..0000000000
@@ -1,34 +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 <[email protected]>
-Origin: vendor
-Bug-Debian: https://bugs.debian.org/830912
-Forwarded: no
-Last-Update: 2016-08-12
-
-Signed-off-by: Maxime Hadjinlian <[email protected]>
-
---- 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
-     }
-+
-   }
- }
-
package/fakeroot/0001-skip-doc-subdirs.patch new file +14 -0
new file mode 100644
index 0000000000..91663fb64d
@@ -0,0 +1,14 @@
+For some reason, version 1.25 and up is missing all localized doc,
+and thus fails on the install stage.
+
+Skip the directories.
+
+Signed-off-by: Norbert Lange <[email protected]>
+--- fakeroot-1.25.1.org/doc/Makefile.am	2020-09-22 23:52:20.000000000 +0200
++++ fakeroot-1.25.1/doc/Makefile.am	2020-09-24 11:05:27.611298673 +0200
+@@ -1,5 +1,4 @@
+ AUTOMAKE_OPTIONS=foreign
+-SUBDIRS = de es fr nl pt sv
+
+ man_MANS = faked.1 fakeroot.1
+
package/fakeroot/0002-communicate-check-return-status-of-msgrcv.patch deleted +0 -46

46 lines not on this page · raw message

package/fakeroot/0003-Select-TCP-when-lack-of-SYSV-IPC.patch deleted +0 -77

77 lines not on this page · raw message

package/fakeroot/0004-Fix-forwarding-fchownat-fchmod-flags.patch deleted +0 -28
deleted file mode 100644
index fc74543378..0000000000
@@ -1,28 +0,0 @@
-Forward supported flags to fstatat, this fixes issues like
-using an empty path
-
-Upstream BR: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=959876
-
-Signed-off-by: Norbert Lange <[email protected]>
-
-diff -burN fakeroot-1.20.2.org/libfakeroot.c fakeroot-1.20.2/libfakeroot.c
---- fakeroot-1.20.2.org/libfakeroot.c	2014-10-05 17:16:00.000000000 +0200
-+++ fakeroot-1.20.2/libfakeroot.c	2020-05-10 22:24:18.896625085 +0200
-@@ -880,7 +880,7 @@
-   /* 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 @@
-
-   /* 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);
package/fakeroot/fakeroot.hash +3 -5
index d1d959df6f..e92523109a 100644
@@ -1,6 +1,4 @@
-# From http://snapshot.debian.org/package/fakeroot/1.20.2-1/
-sha1	367040df07043edb630942b21939e493f3fad888	fakeroot_1.20.2.orig.tar.bz2
-# Calculated based on the hash above
-sha256	7c0a164d19db3efa9e802e0fc7cdfeff70ec6d26cdbdc4338c9c2823c5ea230c	fakeroot_1.20.2.orig.tar.bz2
+# From http://deb.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.25.1-1.dsc
+sha256  95cd11cf057c1ae38905c1c6be29a1d1e402f15cde4707b5009cc9cb995256c5  fakeroot_1.25.1.orig.tar.gz
 # License files, locally calculated
-sha256	fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7	COPYING
+sha256  fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7  COPYING
package/fakeroot/fakeroot.mk +4 -4
index 1be99071bf..957f0a53b7 100644
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-FAKEROOT_VERSION = 1.20.2
-FAKEROOT_SOURCE = fakeroot_$(FAKEROOT_VERSION).orig.tar.bz2
-FAKEROOT_SITE = http://snapshot.debian.org/archive/debian/20141005T221953Z/pool/main/f/fakeroot
+FAKEROOT_VERSION = 1.25.3
+FAKEROOT_SOURCE = fakeroot_$(FAKEROOT_VERSION).orig.tar.gz
+FAKEROOT_SITE = https://snapshot.debian.org/archive/debian/20201008T205817Z/pool/main/f/fakeroot
 
 HOST_FAKEROOT_DEPENDENCIES = host-acl
 # Force capabilities detection off

@@ -15,7 +15,7 @@ HOST_FAKEROOT_DEPENDENCIES = host-acl
 HOST_FAKEROOT_CONF_ENV = \
 	ac_cv_header_sys_capability_h=no \
 	ac_cv_func_capset=no
-# 0003-Select-TCP-when-lack-of-SYSV-IPC.patch touches configure.ac
+# upstream does not ship with configure script anymore
 HOST_FAKEROOT_AUTORECONF = YES
 FAKEROOT_LICENSE = GPL-3.0+
 FAKEROOT_LICENSE_FILES = COPYING
Signature · 1 line
2.28.0
#1 lore raw

PATCH v4 1/1 package/fakeroot: bump version to 1.25.3

Hello Norbert,

Quoted 7 lines · On Wed, 14 Oct 2020 16:58:09 +0200 Norbert Lange <[email protected]> wrote:

This version adds wrappers for getgroups and statx, the latter is used by coreutils 8.32.

Removed patches that are now in upstream.

Added a patch to fix failure when installing.

Quoted 8 lines
Signed-off-by Norbert Lange <[email protected]>

---
v1->v2
- rebased on master (instead of my private branch)
v2->v3
- use debian.snapshot as source URL
v3->v4
- bump version to 1.25.3 (aka desperation ping)

It seems like this v4, in a desperate ping, was not sufficiently tested, as the hash in the .hash file was not correct:

ERROR: No hash found for fakeroot_1.25.3.orig.tar.gz

Indeed, the hash file still contained the hash of 1.25.1 :-)

I fixed this up, and applied. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
author
#2 lore raw

PATCH v4 1/1 package/fakeroot: bump version to 1.25.3

Yeah, I sent the correct v5. Or rather I tried and failed at that as well. This day is a bit of a mess.

But I could conclude that adding some small mistakes is the best way to grab your attention and getting stuff committed ;)

Thanks, Norbert

Thomas Petazzoni <[email protected]> schrieb am Mi., 14. Okt. 2020, 19:22:

Quoted 28 lines

Hello Norbert,

Quoted 7 lines · On Wed, 14 Oct 2020 16:58:09 +0200 Norbert Lange <[email protected]> wrote:

This version adds wrappers for getgroups and statx, the latter is used by coreutils 8.32.

Removed patches that are now in upstream.

Added a patch to fix failure when installing.

Quoted 8 lines
Signed-off-by Norbert Lange <[email protected]>

---
v1->v2
- rebased on master (instead of my private branch)
v2->v3
- use debian.snapshot as source URL
v3->v4
- bump version to 1.25.3 (aka desperation ping)

It seems like this v4, in a desperate ping, was not sufficiently tested, as the hash in the .hash file was not correct:

ERROR: No hash found for fakeroot_1.25.3.orig.tar.gz

Indeed, the hash file still contained the hash of 1.25.1 :-)

Quoted 8 lines

I fixed this up, and applied. Thanks!

Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20201014/fd1112cc/attachment.html>

#3 lore raw

PATCH v4 1/1 package/fakeroot: bump version to 1.25.3

Quoted 5 lines · On Wed, 14 Oct 2020 19:41:45 +0200 Norbert Lange <[email protected]> wrote:

Yeah, I sent the correct v5. Or rather I tried and failed at that as well. This day is a bit of a mess.

But I could conclude that adding some small mistakes is the best way to grab your attention and getting stuff committed ;)

Damn, you found the trick! :-)

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com