Skip to content

Commit

Permalink
tools: fakeroot: update to 1.36
Browse files Browse the repository at this point in the history
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 <[email protected]>
Link: openwrt/openwrt#16530
Signed-off-by: Nick Hainke <[email protected]>
  • Loading branch information
DragonBluep authored and PolynomialDivision committed Sep 28, 2024
1 parent c4022e6 commit 603a3c6
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 14 deletions.
4 changes: 2 additions & 2 deletions tools/fakeroot/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tools/fakeroot/patches/300-time64-hack.patch
Original file line number Diff line number Diff line change
@@ -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])
Expand Down
11 changes: 0 additions & 11 deletions tools/fakeroot/patches/400-alpine-libc.musl-fix.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 603a3c6

Please sign in to comment.