openwrt/tools/fakeroot/patches/600-macOS.patch

57 lines
2.4 KiB
Diff
Raw Normal View History

--- 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 <stdio.h>
#include <spawn.h>
--- a/wrapfunc.inp
+++ b/wrapfunc.inp
tools/fakeroot: update to 1.33 fakeroot (1.33-1) unstable; urgency=medium * New upstream version. - Patch from Samuel Thibault to add renameat2 support. closes: #1061257. -- Clint Adams <clint@debian.org> Sun, 21 Jan 2024 11:56:06 -0500 fakeroot (1.32.2-1) unstable; urgency=medium * New upstream version. - Romanian man page translation from Remus-Gabriel Chelu. closes: #1055386. - patch from Rudi Heitbaum to add missing wrapped.h dependency. closes: #1041674. -- Clint Adams <clint@debian.org> Mon, 06 Nov 2023 07:15:47 -0500 fakeroot (1.32.1-1) unstable; urgency=medium * New upstream version. * Updated German translation from Chris Leick. closes: #1032206. * Patch from John Paul Adrian Glaubitz to add build profile to allow bootstrapping. closes: #1040828. -- Clint Adams <clint@debian.org> Wed, 12 Jul 2023 09:59:17 -0400 fakeroot (1.32-1) unstable; urgency=medium * New upstream version. -- Clint Adams <clint@debian.org> Mon, 10 Jul 2023 09:14:43 -0400 fakeroot (1.31-1) unstable; urgency=medium * New upstream version. - patch from Johannes Schauer Marin Rodrigues to not use temporary file in chown test. closes: #1026132. -- Clint Adams <clint@debian.org> Mon, 06 Feb 2023 10:12:11 -0500 fakeroot (1.30.1-1) unstable; urgency=medium * New upstream version. - fixes and extends time64 support to fstatat64. closes: #1023286. -- Clint Adams <clint@debian.org> Thu, 03 Nov 2022 15:04:55 -0400 fakeroot (1.30-1) unstable; urgency=medium * New upstream version. - tries to cope with time64 on 32-bit architectures. closes: #1023286. * Drop kludge for glibc 2.33. -- Clint Adams <clint@debian.org> Wed, 02 Nov 2022 20:17:56 -0400 Link: https://github.com/openwrt/openwrt/pull/15746 Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
2024-06-18 15:02:54 +00:00
@@ -51,9 +51,11 @@ getattrlist$UNIX2003;int;(const char *pa
#endif
#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
tools/fakeroot: update to 1.33 fakeroot (1.33-1) unstable; urgency=medium * New upstream version. - Patch from Samuel Thibault to add renameat2 support. closes: #1061257. -- Clint Adams <clint@debian.org> Sun, 21 Jan 2024 11:56:06 -0500 fakeroot (1.32.2-1) unstable; urgency=medium * New upstream version. - Romanian man page translation from Remus-Gabriel Chelu. closes: #1055386. - patch from Rudi Heitbaum to add missing wrapped.h dependency. closes: #1041674. -- Clint Adams <clint@debian.org> Mon, 06 Nov 2023 07:15:47 -0500 fakeroot (1.32.1-1) unstable; urgency=medium * New upstream version. * Updated German translation from Chris Leick. closes: #1032206. * Patch from John Paul Adrian Glaubitz to add build profile to allow bootstrapping. closes: #1040828. -- Clint Adams <clint@debian.org> Wed, 12 Jul 2023 09:59:17 -0400 fakeroot (1.32-1) unstable; urgency=medium * New upstream version. -- Clint Adams <clint@debian.org> Mon, 10 Jul 2023 09:14:43 -0400 fakeroot (1.31-1) unstable; urgency=medium * New upstream version. - patch from Johannes Schauer Marin Rodrigues to not use temporary file in chown test. closes: #1026132. -- Clint Adams <clint@debian.org> Mon, 06 Feb 2023 10:12:11 -0500 fakeroot (1.30.1-1) unstable; urgency=medium * New upstream version. - fixes and extends time64 support to fstatat64. closes: #1023286. -- Clint Adams <clint@debian.org> Thu, 03 Nov 2022 15:04:55 -0400 fakeroot (1.30-1) unstable; urgency=medium * New upstream version. - tries to cope with time64 on 32-bit architectures. closes: #1023286. * Drop kludge for glibc 2.33. -- Clint Adams <clint@debian.org> Wed, 02 Nov 2022 20:17:56 -0400 Link: https://github.com/openwrt/openwrt/pull/15746 Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
2024-06-18 15:02:54 +00:00
#include <spawn.h>
+#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
tools/fakeroot: update to 1.33 fakeroot (1.33-1) unstable; urgency=medium * New upstream version. - Patch from Samuel Thibault to add renameat2 support. closes: #1061257. -- Clint Adams <clint@debian.org> Sun, 21 Jan 2024 11:56:06 -0500 fakeroot (1.32.2-1) unstable; urgency=medium * New upstream version. - Romanian man page translation from Remus-Gabriel Chelu. closes: #1055386. - patch from Rudi Heitbaum to add missing wrapped.h dependency. closes: #1041674. -- Clint Adams <clint@debian.org> Mon, 06 Nov 2023 07:15:47 -0500 fakeroot (1.32.1-1) unstable; urgency=medium * New upstream version. * Updated German translation from Chris Leick. closes: #1032206. * Patch from John Paul Adrian Glaubitz to add build profile to allow bootstrapping. closes: #1040828. -- Clint Adams <clint@debian.org> Wed, 12 Jul 2023 09:59:17 -0400 fakeroot (1.32-1) unstable; urgency=medium * New upstream version. -- Clint Adams <clint@debian.org> Mon, 10 Jul 2023 09:14:43 -0400 fakeroot (1.31-1) unstable; urgency=medium * New upstream version. - patch from Johannes Schauer Marin Rodrigues to not use temporary file in chown test. closes: #1026132. -- Clint Adams <clint@debian.org> Mon, 06 Feb 2023 10:12:11 -0500 fakeroot (1.30.1-1) unstable; urgency=medium * New upstream version. - fixes and extends time64 support to fstatat64. closes: #1023286. -- Clint Adams <clint@debian.org> Thu, 03 Nov 2022 15:04:55 -0400 fakeroot (1.30-1) unstable; urgency=medium * New upstream version. - tries to cope with time64 on 32-bit architectures. closes: #1023286. * Drop kludge for glibc 2.33. -- Clint Adams <clint@debian.org> Wed, 02 Nov 2022 20:17:56 -0400 Link: https://github.com/openwrt/openwrt/pull/15746 Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
2024-06-18 15:02:54 +00:00
@@ -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__ */
tools/fakeroot: update to 1.33 fakeroot (1.33-1) unstable; urgency=medium * New upstream version. - Patch from Samuel Thibault to add renameat2 support. closes: #1061257. -- Clint Adams <clint@debian.org> Sun, 21 Jan 2024 11:56:06 -0500 fakeroot (1.32.2-1) unstable; urgency=medium * New upstream version. - Romanian man page translation from Remus-Gabriel Chelu. closes: #1055386. - patch from Rudi Heitbaum to add missing wrapped.h dependency. closes: #1041674. -- Clint Adams <clint@debian.org> Mon, 06 Nov 2023 07:15:47 -0500 fakeroot (1.32.1-1) unstable; urgency=medium * New upstream version. * Updated German translation from Chris Leick. closes: #1032206. * Patch from John Paul Adrian Glaubitz to add build profile to allow bootstrapping. closes: #1040828. -- Clint Adams <clint@debian.org> Wed, 12 Jul 2023 09:59:17 -0400 fakeroot (1.32-1) unstable; urgency=medium * New upstream version. -- Clint Adams <clint@debian.org> Mon, 10 Jul 2023 09:14:43 -0400 fakeroot (1.31-1) unstable; urgency=medium * New upstream version. - patch from Johannes Schauer Marin Rodrigues to not use temporary file in chown test. closes: #1026132. -- Clint Adams <clint@debian.org> Mon, 06 Feb 2023 10:12:11 -0500 fakeroot (1.30.1-1) unstable; urgency=medium * New upstream version. - fixes and extends time64 support to fstatat64. closes: #1023286. -- Clint Adams <clint@debian.org> Thu, 03 Nov 2022 15:04:55 -0400 fakeroot (1.30-1) unstable; urgency=medium * New upstream version. - tries to cope with time64 on 32-bit architectures. closes: #1023286. * Drop kludge for glibc 2.33. -- Clint Adams <clint@debian.org> Wed, 02 Nov 2022 20:17:56 -0400 Link: https://github.com/openwrt/openwrt/pull/15746 Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
2024-06-18 15:02:54 +00:00
@@ -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__ */