diff options
| author | Shiji Yang | 2024-09-27 10:15:16 +0000 |
|---|---|---|
| committer | Nick Hainke | 2024-09-28 08:27:41 +0000 |
| commit | 603a3c6955314296bf08646e4e0d35b8f746cfb6 (patch) | |
| tree | 666cd4a2e5bcaebf22562da6ad89e6093d9748d8 | |
| parent | c4022e6199a3337d6e4d733106d5cf3879e0b35b (diff) | |
| download | openwrt-603a3c6955314296bf08646e4e0d35b8f746cfb6.tar.gz | |
tools: fakeroot: update to 1.36
The type 'id_t' check has been moved to configure.ac in upstream commit:
819063eb4d27 ("test for id_t with autoconf instead of blind typedef, fixes FTBFS on FreeBSD")
changelog:
https://salsa.debian.org/clint/fakeroot/-/blob/e4780b1aad6fae0be1868a76cc7ffa6149afa912/debian/changelog
Signed-off-by: Shiji Yang <yangshiji66@qq.com>
Link: https://github.com/openwrt/openwrt/pull/16530
Signed-off-by: Nick Hainke <vincent@systemli.org>
| -rw-r--r-- | tools/fakeroot/Makefile | 4 | ||||
| -rw-r--r-- | tools/fakeroot/patches/300-time64-hack.patch | 2 | ||||
| -rw-r--r-- | tools/fakeroot/patches/400-alpine-libc.musl-fix.patch | 11 |
3 files changed, 3 insertions, 14 deletions
diff --git a/tools/fakeroot/Makefile b/tools/fakeroot/Makefile index 699675bdc3..22b2c8f24f 100644 --- a/tools/fakeroot/Makefile +++ b/tools/fakeroot/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fakeroot -PKG_VERSION:=1.33 +PKG_VERSION:=1.36 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz PKG_SOURCE_URL:=@DEBIAN/pool/main/f/fakeroot -PKG_HASH:=e157d8e5c64d3a755707791e9be93296c6d249d5c4478bf941b675d49c47757d +PKG_HASH:=7fe3cf3daf95ee93b47e568e85f4d341a1f9ae91766b4f9a9cdc29737dea4988 PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE_FILES:=COPYING PKG_FIXUP:=autoreconf diff --git a/tools/fakeroot/patches/300-time64-hack.patch b/tools/fakeroot/patches/300-time64-hack.patch index 540724fb5a..46132cdd3d 100644 --- a/tools/fakeroot/patches/300-time64-hack.patch +++ b/tools/fakeroot/patches/300-time64-hack.patch @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -386,7 +386,7 @@ dnl Digital Unix: stat +@@ -390,7 +390,7 @@ dnl Digital Unix: stat time64_hack=no AH_TEMPLATE([TIME64_HACK], [time64 shuffle]) AC_MSG_CHECKING([if we need to cope with time64]) diff --git a/tools/fakeroot/patches/400-alpine-libc.musl-fix.patch b/tools/fakeroot/patches/400-alpine-libc.musl-fix.patch index f740b120a1..5936034911 100644 --- a/tools/fakeroot/patches/400-alpine-libc.musl-fix.patch +++ b/tools/fakeroot/patches/400-alpine-libc.musl-fix.patch @@ -21,14 +21,3 @@ Error relocating openwrt/staging_dir/host/lib/libfakeroot.so: SEND_GET_XATTR: sy #define SEND_GET_XATTR64(a,b,c) send_get_xattr64(a,b) #endif -@@ -142,8 +144,9 @@ - - /* 10.10 uses id_t in getpriority/setpriority calls, so pretend - id_t is used everywhere, just happens to be int on some OSes */ --#ifndef _ID_T -+#if !defined(_ID_T) && !defined(__DEFINED_id_t) - #define _ID_T -+#define __DEFINED_id_t - typedef int id_t; - #endif - #endif |