<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/fc5d56b76f4566dfe66f289d4b9b65637aae7be1">https://github.com/macports/macports-ports/commit/fc5d56b76f4566dfe66f289d4b9b65637aae7be1</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit fc5d56b76f4566dfe66f289d4b9b65637aae7be1
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Mar 4 08:07:41 2022 -0600
<span style='display:block; white-space:pre;color:#404040;'> fakeroot: Update to 1.27
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/64624
</span>---
sysutils/fakeroot/Portfile | 24 ++++++----
sysutils/fakeroot/files/implicit.patch | 13 ++++++
sysutils/fakeroot/files/patch-libfakeroot.c.diff | 56 ------------------------
sysutils/fakeroot/files/patch-wrapfunc.inp.diff | 20 ---------
4 files changed, 28 insertions(+), 85 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/fakeroot/Portfile b/sysutils/fakeroot/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f8250c6aca9..b42f75aa0c0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/fakeroot/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/fakeroot/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,14 +3,13 @@
</span> PortSystem 1.0
name fakeroot
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.24
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.27
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 4a1098a2bfa2ed6eccaf61879b6c0f035354ca82 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 2e045b3160370b8ab4d44d1f8d267e5d1d555f1bb522d650e7167b09477266ed \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 522497
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 80c5fb33905f20dffb95d6a72e4189a320752639 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 3c45eb2d1802a2762069e2e9d21bdd6fb533592bc0cda74c9aff066ab01caddc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 544301
</span>
categories sysutils
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> license GPL-3+
maintainers {ryandesign @ryandesign} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,9 +25,8 @@ master_sites debian:f/${name}
</span> distname ${name}_${version}.orig
worksrcdir ${name}-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-libfakeroot.c.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-message.h.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-wrapfunc.inp.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles implicit.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-message.h.diff
</span>
# Build settings adapted from instructions at
# https://github.com/mackyle/fakeroot/blob/787d757/README_MACOSX.txt
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,11 +35,19 @@ use_autoreconf yes
</span> autoreconf.cmd ./bootstrap
autoreconf.pre_args
autoreconf.args
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.checks.implicit_function_declaration.whitelist-append strchr
</span> depends_build port:autoconf port:automake port:libtool
depends_skip_archcheck-append libtool
configure.args --disable-static
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# The configure script is unable to detect macOS on its own because it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# uses the C preprocessor to do so but the CPP variable is empty because
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# for some reason the "how to run the C preprocessor" step doesn't get
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# run. I suspect this is due to a mistake in configure.ac but I don't
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# have sufficient autoconf knowledge to identify it.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append "CPP=${configure.cc} -E"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> platform darwin {
if {${os.major} == 18 || ${os.major} == 19} {
universal_variant no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -89,5 +95,5 @@ test.run yes
</span> test.target check
livecheck.type regex
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url http://packages.debian.org/unstable/fakeroot
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.url https://packages.debian.org/unstable/fakeroot
</span> livecheck.regex {fakeroot \(([\d.]+)}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/fakeroot/files/implicit.patch b/sysutils/fakeroot/files/implicit.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a8b83fdef38
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/fakeroot/files/implicit.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conftest.c:41:1: error: implicit declaration of function 'puts' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://salsa.debian.org/clint/fakeroot/-/merge_requests/15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac.orig 2022-01-17 14:40:08.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac 2022-03-04 07:22:45.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -129,6 +129,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for second in void char; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for third in size_t int; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $zeroth readlink(const char *path, $second *buf, $third bufsiz);]], [[puts("hello, world");]])],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [readlink_retval=$zeroth
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ readlink_buf_arg=$second
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/fakeroot/files/patch-libfakeroot.c.diff b/sysutils/fakeroot/files/patch-libfakeroot.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b9d3b4a8d0a..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/fakeroot/files/patch-libfakeroot.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,56 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libfakeroot.c.orig 2014-10-05 17:16:00.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libfakeroot.c 2015-12-21 18:13:37.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -110,8 +110,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define INT_NEXT_FSTATAT(a,b,c,d) NEXT_FSTATAT(_STAT_VER,a,b,c,d)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define INT_SEND_STAT(a,b) SEND_STAT(a,b,_STAT_VER)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define INT_SEND_GET_XATTR(a,b) SEND_GET_XATTR(a,b,_STAT_VER)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* 10.10 uses id_t in getpriority/setpriority calls, so pretend
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ id_t is used everywhere, just happens to be int on some OSes */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef _ID_T
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define _ID_T
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+typedef int id_t;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <sys/types.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/ipc.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/msg.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -123,7 +131,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <unistd.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <dirent.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <errno.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <sys/types.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef HAVE_SYS_ACL_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/acl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* HAVE_SYS_ACL_H */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1894,7 +1901,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* HAVE_FREMOVEXATTR */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--int setpriority(int which, int who, int prio){
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+int setpriority(int which, id_t who, int prio){
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (fakeroot_disabled)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return next_setpriority(which, who, prio);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- next_setpriority(which, who, prio);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2426,3 +2433,19 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef HAVE_OPENAT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+int openat(int dir_fd, const char *pathname, int flags, ...)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (flags & O_CREAT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ va_list args;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mode_t mode;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ va_start(args, flags);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mode = va_arg(args, int);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ va_end(args);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return next_openat(dir_fd, pathname, flags, mode);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return next_openat(dir_fd, pathname, flags, NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/fakeroot/files/patch-wrapfunc.inp.diff b/sysutils/fakeroot/files/patch-wrapfunc.inp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7e3a44b18e0..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/fakeroot/files/patch-wrapfunc.inp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- wrapfunc.inp.orig 2015-11-30 16:40:10.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ wrapfunc.inp 2015-11-30 16:39:19.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -145,7 +145,7 @@ setfsgid;gid_t;(gid_t fsgid);(fsgid)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* HAVE_SETFSGID */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- initgroups;int;(const char *user, INITGROUPS_SECOND_ARG group);(user, group)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- setgroups;int;(SETGROUPS_SIZE_TYPE size, const gid_t *list);(size, list)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--setpriority;int;(int which, int who, int prio);(which, who, prio)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+setpriority;int;(int which, id_t who, int prio);(which, who, prio)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef HAVE_CAPSET
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- capset;int;(cap_user_header_t hdrp, const cap_user_data_t datap);(hdrp, datap)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* HAVE_CAPSET */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -197,7 +197,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mkdirat;int;(int dir_fd, const char *pathname, mode_t mode);(dir_fd, pathname, mode)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* HAVE_MKDIRAT */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef HAVE_OPENAT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--openat;int;(int dir_fd, const char *pathname, int flags);(dir_fd, pathname, flags)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+openat;int;(int dir_fd, const char *pathname, int flags, ...);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* HAVE_OPENAT */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef HAVE_RENAMEAT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- renameat;int;(int olddir_fd, const char *oldpath, int newdir_fd, const char *newpath);(olddir_fd, oldpath, newdir_fd, newpath)
</span></pre><pre style='margin:0'>
</pre>