<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/05e946bc2ef95b0391930ab0428a9f7c7d0424de">https://github.com/macports/macports-ports/commit/05e946bc2ef95b0391930ab0428a9f7c7d0424de</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 05e946bc2ef softether5: new port in net/security
</span>05e946bc2ef is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 05e946bc2ef95b0391930ab0428a9f7c7d0424de
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Mon Aug 14 17:28:37 2023 +0800
<span style='display:block; white-space:pre;color:#404040;'> softether5: new port in net/security
</span>---
net/softether5/Portfile | 60 ++++++++++++++++++++++
...include-forgotten-pthread.h-for-MacOS-too.patch | 27 ++++++++++
...fix-for-undefined-u_char-u_short-on-MacOS.patch | 30 +++++++++++
net/softether5/files/0003-enable-enterprise.patch | 27 ++++++++++
4 files changed, 144 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/softether5/Portfile b/net/softether5/Portfile
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e68571d0269
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/softether5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,60 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup openssl 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name softether5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup SoftEtherVPN SoftEtherVPN 5.02.5180
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories net security
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license Apache-2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description Cross-platform multi-protocol VPN software
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description {*}${description}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://softether.org
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+fetch.type git
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "git submodule update --init --recursive"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:libiconv \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libsodium \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ncurses \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:readline
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.c_standard 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/SoftEtherVPN/SoftEtherVPN/pull/1883
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append 0001-Network.h-include-forgotten-pthread.h-for-MacOS-too.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0002-TunTap.h-fix-for-undefined-u_char-u_short-on-MacOS.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/metalefty/SoftEtherVPN/commit/a461121b.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append 0003-enable-enterprise.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set dbdir ${prefix}/var/db/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set logdir ${prefix}/var/log/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set piddir ${prefix}/var/run/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set docdir ${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DSE_DBDIR=${dbdir} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DSE_LOGDIR=${logdir} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DSE_PIDDIR=${piddir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${destroot}${docdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 -W ${worksrcpath} AUTHORS.TXT DISCLAIMER.md LICENSE README.md ${destroot}${docdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-activate {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach dir [list ${dbdir} ${logdir} ${piddir}] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![file exists ${dir}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/softether5/files/0001-Network.h-include-forgotten-pthread.h-for-MacOS-too.patch b/net/softether5/files/0001-Network.h-include-forgotten-pthread.h-for-MacOS-too.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..0609c30a05e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/softether5/files/0001-Network.h-include-forgotten-pthread.h-for-MacOS-too.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 1cf2e7a8ea6052e78214cc55f0b22ce8e5473bcc Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: barracuda156 <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 14 Aug 2023 15:40:53 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1/2] Network.h: include forgotten pthread.h for MacOS too
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/Mayaqua/Network.h | 4 ++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 4 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/Mayaqua/Network.h src/Mayaqua/Network.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 202df410..861993c2 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Mayaqua/Network.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Mayaqua/Network.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,6 +23,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef UNIX_OPENBSD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <pthread.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef UNIX_MACOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <pthread.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.41.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/softether5/files/0002-TunTap.h-fix-for-undefined-u_char-u_short-on-MacOS.patch b/net/softether5/files/0002-TunTap.h-fix-for-undefined-u_char-u_short-on-MacOS.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..195bc36e99b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/softether5/files/0002-TunTap.h-fix-for-undefined-u_char-u_short-on-MacOS.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,30 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From a80d3f20321a9de15cd3c6a9baa1a39782c4b528 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: barracuda156 <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 14 Aug 2023 15:54:56 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 2/2] TunTap.h: fix for undefined u_char, u_short on MacOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/Mayaqua/TunTap.h | 7 +++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 7 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/Mayaqua/TunTap.h src/Mayaqua/TunTap.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 12f076c0..792ba0dd 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Mayaqua/TunTap.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Mayaqua/TunTap.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -162,6 +162,13 @@ struct tundladdr {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef _NET_IF_TUN_H_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define _NET_IF_TUN_H_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef UNIX_MACOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef _DARWIN_C_SOURCE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define _DARWIN_C_SOURCE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <sys/types.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Refer to if_tunvar.h for the softc stuff */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Maximum transmit packet size (default) */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.41.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/softether5/files/0003-enable-enterprise.patch b/net/softether5/files/0003-enable-enterprise.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..87b55c895ad
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/softether5/files/0003-enable-enterprise.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Cedar/Server.c.orig 2023-08-14 17:05:58.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Cedar/Server.c 2023-08-14 17:09:40.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10713,23 +10713,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool SiIsEnterpriseFunctionsRestrictedOnOpenSource(CEDAR *c)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char region[128];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- bool ret = false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // Validate arguments
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (c == NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SiGetCurrentRegion(c, region, sizeof(region));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (StrCmpi(region, "JP") == 0 || StrCmpi(region, "CN") == 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ret = true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return ret;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Update the current region
</span></pre><pre style='margin:0'>
</pre>