From: Shiji Yang Date: Thu, 28 May 2026 23:26:25 +0000 (+0800) Subject: tools/fakeroot: update to 1.38.1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa96b3ad55f93e71db5f48ec227e455fc5723318;p=thirdparty%2Fopenwrt.git tools/fakeroot: update to 1.38.1 Changelog: https://salsa.debian.org/clint/fakeroot/-/blob/debian/1.38.1-1/debian/changelog?ref_type=tags Remove upstreamed patches: - 400-alpine-libc.musl-fix.patch[1] - 600-macOS.patch[2][3] [1] https://salsa.debian.org/clint/fakeroot/-/commit/0b79007b7dc7ac32bca81ec37f4f36fc47a48e16 [2] https://salsa.debian.org/clint/fakeroot/-/commit/6fc4f9d8b198df565712e3ea7af9660a8eeaa69a [3] https://salsa.debian.org/clint/fakeroot/-/commit/6bce2e78372e513f2795808e4fb8c712605a562f Signed-off-by: Shiji Yang Link: https://github.com/openwrt/openwrt/pull/23577 Signed-off-by: Jonas Jelonek --- diff --git a/tools/fakeroot/Makefile b/tools/fakeroot/Makefile index 1b8fba25a7e..0db9e0f778a 100644 --- a/tools/fakeroot/Makefile +++ b/tools/fakeroot/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fakeroot -PKG_VERSION:=1.37.1.2 +PKG_VERSION:=1.38.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz PKG_SOURCE_URL:=@DEBIAN/pool/main/f/fakeroot -PKG_HASH:=959496928c8a676ec8377f665ff6a19a707bfad693325f9cc4a4126642f53224 +PKG_HASH:=37c5063942efe2e2aeefd6e71ae2690bcb9b7d512c53bc6409b54d0730cbdac1 PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE_FILES:=COPYING PKG_FIXUP:=autoreconf diff --git a/tools/fakeroot/patches/400-alpine-libc.musl-fix.patch b/tools/fakeroot/patches/400-alpine-libc.musl-fix.patch deleted file mode 100644 index 59360349113..00000000000 --- a/tools/fakeroot/patches/400-alpine-libc.musl-fix.patch +++ /dev/null @@ -1,23 +0,0 @@ -Alpine linux libc.musl build error fix - -Prevent build error on Alpine Linux host: -libfakeroot.c error: conflicting types for 'id_t' -Error relocating openwrt/staging_dir/host/lib/libfakeroot.so: SEND_GET_XATTR: symbol not found - ---- a/libfakeroot.c -+++ b/libfakeroot.c -@@ -86,12 +86,14 @@ - #define SEND_STAT64(a,b,c) send_stat64(a,b,c) - #define SEND_GET_STAT(a,b) send_get_stat(a,b) - #define SEND_GET_STAT64(a,b) send_get_stat64(a,b) -+#define SEND_GET_XATTR(a,b,c) send_get_xattr(a,b,c) - #define SEND_GET_XATTR64(a,b,c) send_get_xattr64(a,b,c) - #else - #define SEND_STAT(a,b,c) send_stat(a,b) - #define SEND_STAT64(a,b,c) send_stat64(a,b) - #define SEND_GET_STAT(a,b) send_get_stat(a) - #define SEND_GET_STAT64(a,b) send_get_stat64(a) -+#define SEND_GET_XATTR(a,b,c) send_get_xattr(a,b) - #define SEND_GET_XATTR64(a,b,c) send_get_xattr64(a,b) - #endif - diff --git a/tools/fakeroot/patches/600-macOS.patch b/tools/fakeroot/patches/600-macOS.patch deleted file mode 100644 index df4eb2d6c1c..00000000000 --- a/tools/fakeroot/patches/600-macOS.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- a/communicate.c -+++ b/communicate.c -@@ -441,6 +441,10 @@ void semaphore_down(){ - - #else /* FAKEROOT_FAKENET */ - -+#ifndef SOL_TCP -+# define SOL_TCP 6 /* this should probably be done with getprotoent */ -+#endif -+ - static struct sockaddr *get_addr(void) - { - static struct sockaddr_in addr = { 0, 0, { 0 } }; ---- a/libfakeroot_inode64.c -+++ b/libfakeroot_inode64.c -@@ -25,7 +25,7 @@ - #include "config.h" - #include "communicate.h" - --#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 -+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 && !__DARWIN_ONLY_64_BIT_INO_T - - #include - #include ---- a/wrapfunc.inp -+++ b/wrapfunc.inp -@@ -51,9 +51,11 @@ getattrlist$UNIX2003;int;(const char *pa - #endif - #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 - #include -+#if !__DARWIN_ONLY_64_BIT_INO_T - lstat$INODE64;int;(const char *file_name, struct stat *buf);(file_name, buf) - stat$INODE64;int;(const char *file_name, struct stat *buf);(file_name, buf) - fstat$INODE64;int;(int fd, struct stat *buf);(fd, buf) -+#endif - posix_spawn;int;(pid_t * __restrict pid, const char * __restrict path, const posix_spawn_file_actions_t *file_actions, const posix_spawnattr_t * __restrict attrp, char *const argv[ __restrict], char *const envp[ __restrict]);(pid, path, file_actions, attrp, argv, envp) - posix_spawnp;int;(pid_t * __restrict pid, const char * __restrict path, const posix_spawn_file_actions_t *file_actions, const posix_spawnattr_t * __restrict attrp, char *const argv[ __restrict], char *const envp[ __restrict]);(pid, path, file_actions, attrp, argv, envp) - #endif -@@ -235,7 +237,7 @@ facl;int;(int fd, int cmd, int cnt, void - #ifdef HAVE_FTS_READ - fts_read;FTSENT *;(FTS *ftsp);(ftsp) - #ifdef __APPLE__ --#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 -+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 && !__DARWIN_ONLY_64_BIT_INO_T - fts_read$INODE64;FTSENT *;(FTS *ftsp);(ftsp) - #endif - #endif /* ifdef __APPLE__ */ -@@ -243,7 +245,7 @@ fts_read$INODE64;FTSENT *;(FTS *ftsp);(f - #ifdef HAVE_FTS_CHILDREN - fts_children;FTSENT *;(FTS *ftsp, int options);(ftsp, options) - #ifdef __APPLE__ --#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 -+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 && !__DARWIN_ONLY_64_BIT_INO_T - fts_children$INODE64;FTSENT *;(FTS *ftsp, int options);(ftsp, options) - #endif - #endif /* ifdef __APPLE__ */