<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0b90952037403928ba9faf0903e74f6d70e9f68d">https://github.com/macports/macports-ports/commit/0b90952037403928ba9faf0903e74f6d70e9f68d</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 0b909520374 tuntaposx: don't build with -Werror
</span>0b909520374 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0b90952037403928ba9faf0903e74f6d70e9f68d
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Thu Dec 23 14:31:22 2021 +1100
<span style='display:block; white-space:pre;color:#404040;'> tuntaposx: don't build with -Werror
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/61968
</span>---
net/tuntaposx/files/patch-leopard.diff | 53 -------------------------
net/tuntaposx/files/patch-mojave.diff | 8 ++--
net/tuntaposx/files/patch-src-tap-Makefile.diff | 13 +++---
net/tuntaposx/files/patch-src-tun-Makefile.diff | 13 +++---
4 files changed, 20 insertions(+), 67 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/tuntaposx/files/patch-leopard.diff b/net/tuntaposx/files/patch-leopard.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2872db10ea8..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/tuntaposx/files/patch-leopard.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,53 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/tap/Makefile.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/tap/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -26,7 +26,7 @@ CFLAGS = -Wall -Werror -mkernel -force_cpusubtype_ALL \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DKERNEL -DAPPLE -DKERNEL_PRIVATE -DTUNTAP_VERSION=\"$(TUNTAP_VERSION)\" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DTAP_KEXT_VERSION=\"$(TAP_KEXT_VERSION)\"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CCFLAGS = $(CFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LDFLAGS = -Wall -Werror @ARCHFLAGS@ -Xlinker -kext -nostdlib -lkmodc++ -lkmod -lcc_kext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LDFLAGS = -Wall -Werror @ARCHFLAGS@ -nostdlib -lkmodc++ -lkmod -lcc_kext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CCP = @CXX@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CC = @CC@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/tun/Makefile.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/tun/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -27,7 +27,7 @@ CFLAGS = -Wall -Werror -mkernel -force_cpusubtype_ALL \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DKERNEL -DAPPLE -DKERNEL_PRIVATE -DTUNTAP_VERSION=\"$(TUNTAP_VERSION)\" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DTUN_KEXT_VERSION=\"$(TUN_KEXT_VERSION)\"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CCFLAGS = $(CFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LDFLAGS = -Wall -Werror @ARCHFLAGS@ -Xlinker -kext -nostdlib -lkmodc++ -lkmod -lcc_kext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LDFLAGS = -Wall -Werror @ARCHFLAGS@ -nostdlib -lkmodc++ -lkmod -lcc_kext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CCP = @CXX@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CC = @CC@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/tuntap.cc.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/tuntap.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -75,7 +75,7 @@ tuntap_if_output(ifnet_t ifp, mbuf_t m)
</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;'>- errno_t
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--tuntap_if_ioctl(ifnet_t ifp, long unsigned int cmd, void *arg)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+tuntap_if_ioctl(ifnet_t ifp, uint32_t cmd, void *arg)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (ifp != NULL) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tuntap_interface *ttif = (tuntap_interface *) ifnet_softc(ifp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/tuntap.h.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/tuntap.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -53,7 +53,7 @@ extern "C" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern "C" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- errno_t tuntap_if_output(ifnet_t ifp, mbuf_t m);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--errno_t tuntap_if_ioctl(ifnet_t ifp, long unsigned int cmd, void *arg);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+errno_t tuntap_if_ioctl(ifnet_t ifp, uint32_t cmd, void *arg);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- errno_t tuntap_if_set_bpf_tap(ifnet_t ifp, bpf_tap_mode mode, int (*cb)(ifnet_t, mbuf_t));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- errno_t tuntap_if_demux(ifnet_t ifp, mbuf_t m, char *header, protocol_family_t *proto);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- errno_t tuntap_if_framer(ifnet_t ifp, mbuf_t *m, const struct sockaddr *dest,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -268,7 +268,7 @@ class tuntap_interface {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* interface functions. friends and implementation methods */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- friend errno_t tuntap_if_output(ifnet_t ifp, mbuf_t m);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- friend errno_t tuntap_if_ioctl(ifnet_t ifp, long unsigned int cmd, void *arg);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ friend errno_t tuntap_if_ioctl(ifnet_t ifp, uint32_t cmd, void *arg);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- friend errno_t tuntap_if_set_bpf_tap(ifnet_t ifp, bpf_tap_mode mode,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int (*cb)(ifnet_t, mbuf_t));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- friend errno_t tuntap_if_demux(ifnet_t ifp, mbuf_t m, char *header,
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/tuntaposx/files/patch-mojave.diff b/net/tuntaposx/files/patch-mojave.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index b9654e48055..aaeffeedcd8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/tuntaposx/files/patch-mojave.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/tuntaposx/files/patch-mojave.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,9 +6,9 @@
</span>
-INCLUDE = -I.. -I/System/Library/Frameworks/Kernel.framework/Headers
+INCLUDE = -I.. -I@SDKROOT@/System/Library/Frameworks/Kernel.framework/Versions/A/Headers
<span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS = -Wall -Werror -mkernel -force_cpusubtype_ALL \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS = -Wall -Wextra -mkernel -force_cpusubtype_ALL \
</span> -nostdinc -fno-builtin -fno-stack-protector -msoft-float -fno-common \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -arch x86_64 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @ARCHFLAGS@ \
</span> --- src/tap/Makefile.orig 2014-10-20 20:59:30.000000000 +0200
+++ src/tap/Makefile 2019-02-20 20:25:52.000000000 +0100
@@ -19,7 +19,7 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,6 +17,6 @@
</span>
-INCLUDE = -I.. -I/System/Library/Frameworks/Kernel.framework/Headers
+INCLUDE = -I.. -I@SDKROOT@/System/Library/Frameworks/Kernel.framework/Versions/A/Headers
<span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS = -Wall -Werror -mkernel -force_cpusubtype_ALL \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS = -Wall -Wextra -mkernel -force_cpusubtype_ALL \
</span> -nostdinc -fno-builtin -fno-stack-protector -msoft-float -fno-common \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -arch x86_64 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @ARCHFLAGS@ \
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/tuntaposx/files/patch-src-tap-Makefile.diff b/net/tuntaposx/files/patch-src-tap-Makefile.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 6c8fb1dc93d..762c5344463 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/tuntaposx/files/patch-src-tap-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/tuntaposx/files/patch-src-tap-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/tap/Makefile.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/tap/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22,15 +22,15 @@ BUNDLE_VERSION = $(TAP_KEXT_VERSION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/tap/Makefile.orig 2014-10-21 05:59:30.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/tap/Makefile 2021-12-23 14:27:27.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20,17 +20,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BUNDLE_VERSION = $(TAP_KEXT_VERSION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> INCLUDE = -I.. -I/System/Library/Frameworks/Kernel.framework/Headers
<span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS = -Wall -Werror -mkernel -force_cpusubtype_ALL \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CFLAGS = -Wall -Werror -mkernel -force_cpusubtype_ALL \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CFLAGS = -Wall -Wextra -mkernel -force_cpusubtype_ALL \
</span> -nostdinc -fno-builtin -fno-stack-protector -msoft-float -fno-common \
- -arch x86_64 \
+ @ARCHFLAGS@ \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +13,7 @@
</span> -DTAP_KEXT_VERSION=\"$(TAP_KEXT_VERSION)\"
CCFLAGS = $(CFLAGS)
-LDFLAGS = -Wall -Werror -arch x86_64 -Xlinker -kext -nostdlib -lkmodc++ -lkmod -lcc_kext
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+LDFLAGS = -Wall -Werror @ARCHFLAGS@ -Xlinker -kext -nostdlib -lkmodc++ -lkmod -lcc_kext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LDFLAGS = -Wall -Wextra @ARCHFLAGS@ -Xlinker -kext -nostdlib -lkmodc++ -lkmod -lcc_kext
</span>
-CCP = clang -x c++
-CC = clang -x c
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/tuntaposx/files/patch-src-tun-Makefile.diff b/net/tuntaposx/files/patch-src-tun-Makefile.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index d2c89a224b7..a7cb760e0cb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/tuntaposx/files/patch-src-tun-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/tuntaposx/files/patch-src-tun-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/tun/Makefile.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/tun/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -23,15 +23,15 @@ BUNDLE_VERSION = $(TUN_KEXT_VERSION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/tun/Makefile.orig 2014-10-21 05:59:47.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/tun/Makefile 2021-12-23 14:27:12.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21,17 +21,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BUNDLE_VERSION = $(TUN_KEXT_VERSION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> INCLUDE = -I.. -I/System/Library/Frameworks/Kernel.framework/Headers
<span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS = -Wall -Werror -mkernel -force_cpusubtype_ALL \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CFLAGS = -Wall -Werror -mkernel -force_cpusubtype_ALL \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CFLAGS = -Wall -Wextra -mkernel -force_cpusubtype_ALL \
</span> -nostdinc -fno-builtin -fno-stack-protector -msoft-float -fno-common \
- -arch x86_64 \
+ @ARCHFLAGS@ \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +13,7 @@
</span> -DTUN_KEXT_VERSION=\"$(TUN_KEXT_VERSION)\"
CCFLAGS = $(CFLAGS)
-LDFLAGS = -Wall -Werror -arch x86_64 -Xlinker -kext -nostdlib -lkmodc++ -lkmod -lcc_kext
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+LDFLAGS = -Wall -Werror @ARCHFLAGS@ -Xlinker -kext -nostdlib -lkmodc++ -lkmod -lcc_kext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LDFLAGS = -Wall -Wextra @ARCHFLAGS@ -Xlinker -kext -nostdlib -lkmodc++ -lkmod -lcc_kext
</span>
-CCP = clang -x c++
-CC = clang -x c
</pre><pre style='margin:0'>
</pre>