Revision: 145153 https://trac.macports.org/changeset/145153 Author: khindenburg@macports.org Date: 2016-01-26 18:33:16 -0800 (Tue, 26 Jan 2016) Log Message: ----------- fakeroot: update to 1.20.2; move back to Debian port; add patches to fix build #49858 maintainer Modified Paths: -------------- trunk/dports/sysutils/fakeroot/Portfile Added Paths: ----------- trunk/dports/sysutils/fakeroot/files/ trunk/dports/sysutils/fakeroot/files/patch-libfakeroot.c.diff trunk/dports/sysutils/fakeroot/files/patch-message.h.diff trunk/dports/sysutils/fakeroot/files/patch-wrapfunc.inp.diff Modified: trunk/dports/sysutils/fakeroot/Portfile =================================================================== --- trunk/dports/sysutils/fakeroot/Portfile 2016-01-27 01:50:07 UTC (rev 145152) +++ trunk/dports/sysutils/fakeroot/Portfile 2016-01-27 02:33:16 UTC (rev 145153) @@ -2,27 +2,35 @@ # $Id$ PortSystem 1.0 -PortGroup github 1.0 -github.setup mackyle fakeroot 787d7578282afa0bbd0adcebdb1ee64801749bad -version 1.19-2 +name fakeroot +version 1.20.2 categories sysutils platforms darwin license GPL-3+ maintainers eprofs.de:florian openmaintainer description Tool for simulating superuser privileges -long_description A fork/clone of the main debian fakeroot \ - repository that includes enhanced Mac OS X \ - fakeroot support which has since been merged back \ - into that repository as of release 1.19-2. \ - fakeroot provides a fake root environment by means \ +long_description fakeroot runs a command in an environment where it \ + appears to have root privileges for file manipulation. \ + It does this by means \ of LD_PRELOAD and SYSV IPC (or TCP) trickery. -homepage http://mackyle.github.io/fakeroot/ -checksums rmd160 c0e8df61958f838369173891d3fd808d7d39f3ef \ - sha256 a7e29ce3a37ce01db0eace818bba32d6ecef55d63bb7365ce9700861427c32b9 +homepage http://wiki.debian.org/FakeRoot/ +master_sites debian:f/${name} +distname ${name}_${version}.orig +worksrcdir ${name}-${version} + +use_bzip2 yes + +checksums rmd160 9f193b56314b797d5c03447e86e7c63299f3c0aa \ + sha256 7c0a164d19db3efa9e802e0fc7cdfeff70ec6d26cdbdc4338c9c2823c5ea230c + +patchfiles patch-libfakeroot.c.diff \ + patch-message.h.diff \ + patch-wrapfunc.inp.diff + # Build settings adapted from instructions at # https://github.com/mackyle/fakeroot/blob/787d757/README_MACOSX.txt @@ -51,7 +59,7 @@ } default { configure.universal_archs x86_64 i386 - configure.cflags-append -Wno-deprecated-declarations + configure.cflags-append -Wno-deprecated-declarations -Wno-extra-tokens } } @@ -60,6 +68,6 @@ test.run yes test.target check -livecheck.version ${version} -livecheck.url ${github.raw}/macosx/debian/changelog -livecheck.regex {fakeroot \(([\d.-]+)\)} +livecheck.type regex +livecheck.url http://packages.debian.org/unstable/fakeroot +livecheck.regex {fakeroot \(([\d.]+)} Added: trunk/dports/sysutils/fakeroot/files/patch-libfakeroot.c.diff =================================================================== --- trunk/dports/sysutils/fakeroot/files/patch-libfakeroot.c.diff (rev 0) +++ trunk/dports/sysutils/fakeroot/files/patch-libfakeroot.c.diff 2016-01-27 02:33:16 UTC (rev 145153) @@ -0,0 +1,56 @@ +--- libfakeroot.c.orig 2014-10-05 17:16:00.000000000 +0200 ++++ libfakeroot.c 2015-12-21 18:13:37.000000000 +0100 +@@ -110,8 +110,16 @@ + #define INT_NEXT_FSTATAT(a,b,c,d) NEXT_FSTATAT(_STAT_VER,a,b,c,d) + #define INT_SEND_STAT(a,b) SEND_STAT(a,b,_STAT_VER) + #define INT_SEND_GET_XATTR(a,b) SEND_GET_XATTR(a,b,_STAT_VER) ++ ++/* 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 ++#define _ID_T ++typedef int id_t; ++#endif + #endif + ++#include <sys/types.h> + #include <stdlib.h> + #include <sys/ipc.h> + #include <sys/msg.h> +@@ -123,7 +131,6 @@ + #include <unistd.h> + #include <dirent.h> + #include <errno.h> +-#include <sys/types.h> + #ifdef HAVE_SYS_ACL_H + #include <sys/acl.h> + #endif /* HAVE_SYS_ACL_H */ +@@ -1894,7 +1901,7 @@ + } + #endif /* HAVE_FREMOVEXATTR */ + +-int setpriority(int which, int who, int prio){ ++int setpriority(int which, id_t who, int prio){ + if (fakeroot_disabled) + return next_setpriority(which, who, prio); + next_setpriority(which, who, prio); +@@ -2426,3 +2433,19 @@ + } + } + #endif ++ ++#ifdef HAVE_OPENAT ++int openat(int dir_fd, const char *pathname, int flags, ...) ++{ ++ if (flags & O_CREAT) ++ { ++ va_list args; ++ mode_t mode; ++ va_start(args, flags); ++ mode = va_arg(args, int); ++ va_end(args); ++ return next_openat(dir_fd, pathname, flags, mode); ++ } ++ return next_openat(dir_fd, pathname, flags, NULL); ++} ++#endif Added: trunk/dports/sysutils/fakeroot/files/patch-message.h.diff =================================================================== --- trunk/dports/sysutils/fakeroot/files/patch-message.h.diff (rev 0) +++ trunk/dports/sysutils/fakeroot/files/patch-message.h.diff 2016-01-27 02:33:16 UTC (rev 145153) @@ -0,0 +1,11 @@ +--- message.h.orig 2015-12-15 17:26:28.000000000 +0100 ++++ message.h 2015-12-15 17:27:01.000000000 +0100 +@@ -27,7 +27,7 @@ + #endif + + /* On Solaris, use the native htonll(n)/ntohll(n) */ +-#if !defined(sun) && !defined(_NETINET_IN_H) ++#if !defined(htonll) && !defined(sun) && !defined(_NETINET_IN_H) + #if __BYTE_ORDER == __BIG_ENDIAN + # define htonll(n) (n) + # define ntohll(n) (n) Added: trunk/dports/sysutils/fakeroot/files/patch-wrapfunc.inp.diff =================================================================== --- trunk/dports/sysutils/fakeroot/files/patch-wrapfunc.inp.diff (rev 0) +++ trunk/dports/sysutils/fakeroot/files/patch-wrapfunc.inp.diff 2016-01-27 02:33:16 UTC (rev 145153) @@ -0,0 +1,20 @@ +--- wrapfunc.inp.orig 2015-11-30 16:40:10.000000000 +0100 ++++ wrapfunc.inp 2015-11-30 16:39:19.000000000 +0100 +@@ -145,7 +145,7 @@ setfsgid;gid_t;(gid_t fsgid);(fsgid) + #endif /* HAVE_SETFSGID */ + initgroups;int;(const char *user, INITGROUPS_SECOND_ARG group);(user, group) + setgroups;int;(SETGROUPS_SIZE_TYPE size, const gid_t *list);(size, list) +-setpriority;int;(int which, int who, int prio);(which, who, prio) ++setpriority;int;(int which, id_t who, int prio);(which, who, prio) + #ifdef HAVE_CAPSET + capset;int;(cap_user_header_t hdrp, const cap_user_data_t datap);(hdrp, datap) + #endif /* HAVE_CAPSET */ +@@ -197,7 +197,7 @@ + mkdirat;int;(int dir_fd, const char *pathname, mode_t mode);(dir_fd, pathname, mode) + #endif /* HAVE_MKDIRAT */ + #ifdef HAVE_OPENAT +-openat;int;(int dir_fd, const char *pathname, int flags);(dir_fd, pathname, flags) ++openat;int;(int dir_fd, const char *pathname, int flags, ...); + #endif /* HAVE_OPENAT */ + #ifdef HAVE_RENAMEAT + renameat;int;(int olddir_fd, const char *oldpath, int newdir_fd, const char *newpath);(olddir_fd, oldpath, newdir_fd, newpath)