<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/f040e6a4f50716f2dfdb652b58d461a29f622d7c">https://github.com/macports/macports-ports/commit/f040e6a4f50716f2dfdb652b58d461a29f622d7c</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 f040e6a4f50 openvpn2: Fix sample conf files
</span>f040e6a4f50 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit f040e6a4f50716f2dfdb652b58d461a29f622d7c
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sun Sep 6 00:02:27 2020 -0500

<span style='display:block; white-space:pre;color:#404040;'>    openvpn2: Fix sample conf files
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Also fix livecheck and add a patch to fix build with libressl.
</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/61131
</span>---
 net/openvpn2/Portfile                  | 16 ++++++++++------
 net/openvpn2/files/patch-libressl.diff | 11 +++++++++++
 2 files changed, 21 insertions(+), 6 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/openvpn2/Portfile b/net/openvpn2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 95d2f9923f3..c5098af9af5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/openvpn2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/openvpn2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem          1.0
</span> 
 name                openvpn2
 version             2.4.9
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            1
</span> distname            openvpn-${version}
 categories          net security
 platforms           darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,6 +30,8 @@ depends_build       port:pkgconfig
</span> depends_lib         port:lzo2 \
                     path:lib/libssl.dylib:openssl
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles          patch-libressl.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args      --program-suffix=2 \
                     --docdir=${prefix}/share/doc/${name}
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,7 +48,7 @@ post-destroot {
</span>     }
     file copy ${worksrcpath}/contrib ${docdir}/
     xinstall -m 644 -W ${worksrcpath} AUTHORS ${docdir}/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    reinplace "s|;user nobody|user nobody|;s|;group nobody|group nobody|;" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    reinplace -E {s/^;[[:space:]]*((user|group) nobody)/\1/g} \
</span>         ${destroot}${prefix}/share/examples/${name}/sample-config-files/server.conf \
         ${destroot}${prefix}/share/examples/${name}/sample-config-files/client.conf \
         ${destroot}${prefix}/share/examples/${name}/sample-config-files/static-home.conf \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -99,9 +101,11 @@ Openvpn uses a tun device to create its network interface. It could either be:
</span> - tun device from port tuntaposx
 "
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} == "darwin" && ${os.major} <= 9} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} <= 9} {
</span>     post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        reinplace "s|security/pam_appl.h|pam/pam_appl.h|g" ${worksrcpath}/src/plugins/auth-pam/auth-pam.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace {s|security/pam_appl\.h|pam/pam_appl.h|g} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ${worksrcpath}/src/plugins/auth-pam/auth-pam.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ${worksrcpath}/src/plugins/auth-pam/pamdl.c
</span>     }
 }
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -109,5 +113,5 @@ startupitem.create      yes
</span> startupitem.executable  ${prefix}/sbin/openvpn2 --config ${prefix}/etc/${name}/server.conf
 
 livecheck.type      regex
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url       ${homepage}/index.php/open-source/downloads.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex     "/openvpn-(\\d+(?:\\.\\d+)*).tar.gz\">"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.url       ${homepage}/community-downloads/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex     {/openvpn-(\d+(?:\.\d+)*)\.tar}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/openvpn2/files/patch-libressl.diff b/net/openvpn2/files/patch-libressl.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d8c4936751e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/openvpn2/files/patch-libressl.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/openvpn/ssl_openssl.c.orig 2020-04-16 06:26:45.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/openvpn/ssl_openssl.c      2020-09-05 19:24:25.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1904,7 +1904,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         crypto_msg(M_FATAL, "Cannot create SSL object");
</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;'>+-#if (OPENSSL_VERSION_NUMBER < 0x1010000fL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (OPENSSL_VERSION_NUMBER < 0x1010000fL || LIBRESSL_VERSION_NUMBER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     STACK_OF(SSL_CIPHER) *sk = SSL_get_ciphers(ssl);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     STACK_OF(SSL_CIPHER) *sk = SSL_get1_supported_ciphers(ssl);
</span></pre><pre style='margin:0'>

</pre>