tools/fakeroot/patches/600-macOS.patch

   1 --- a/communicate.c
   2 +++ b/communicate.c
   3 @@ -441,6 +441,10 @@ void semaphore_down(){
   4
   5  #else /* FAKEROOT_FAKENET */
   6
   7 +#ifndef SOL_TCP
   8 +# define SOL_TCP 6 /* this should probably be done with getprotoent */
   9 +#endif
  10 +
  11  static struct sockaddr *get_addr(void)
  12  {
  13    static struct sockaddr_in addr = { 0, 0, { 0 } };
  14 --- a/libfakeroot_inode64.c
  15 +++ b/libfakeroot_inode64.c
  16 @@ -25,7 +25,7 @@
  17  #include "config.h"
  18  #include "communicate.h"
  19
  20 -#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
  21 +#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 && !__DARWIN_ONLY_64_BIT_INO_T
  22
  23  #include <stdio.h>
  24  #include <spawn.h>
  25 --- a/wrapfunc.inp
  26 +++ b/wrapfunc.inp
  27 @@ -48,9 +48,11 @@ getattrlist$UNIX2003;int;(const char *pa
  28  #endif
  29  #endif
  30  #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
  31 +#if !__DARWIN_ONLY_64_BIT_INO_T
  32  lstat$INODE64;int;(const char *file_name, struct stat *buf);(file_name, buf)
  33  stat$INODE64;int;(const char *file_name, struct stat *buf);(file_name, buf)
  34  fstat$INODE64;int;(int fd, struct stat *buf);(fd, buf)
  35 +#endif
  36  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)
  37  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)
  38  #endif
  39 @@ -229,7 +231,7 @@ facl;int;(int fd, int cmd, int cnt, void
  40  #ifdef HAVE_FTS_READ
  41  fts_read;FTSENT *;(FTS *ftsp);(ftsp)
  42  #ifdef __APPLE__
  43 -#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
  44 +#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 && !__DARWIN_ONLY_64_BIT_INO_T
  45  fts_read$INODE64;FTSENT *;(FTS *ftsp);(ftsp)
  46  #endif
  47  #endif /* ifdef __APPLE__ */
  48 @@ -237,7 +239,7 @@ fts_read$INODE64;FTSENT *;(FTS *ftsp);(f
  49  #ifdef HAVE_FTS_CHILDREN
  50  fts_children;FTSENT *;(FTS *ftsp, int options);(ftsp, options)
  51  #ifdef __APPLE__
  52 -#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
  53 +#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 && !__DARWIN_ONLY_64_BIT_INO_T
  54  fts_children$INODE64;FTSENT *;(FTS *ftsp, int options);(ftsp, options)
  55  #endif
  56  #endif /* ifdef __APPLE__ */