<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/157805476f3319a4bde675e2cb2fa4a6c26e8940">https://github.com/macports/macports-ports/commit/157805476f3319a4bde675e2cb2fa4a6c26e8940</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 157805476f3 easy-rsa: Update to version 3.1.1
</span>157805476f3 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 157805476f3319a4bde675e2cb2fa4a6c26e8940
</span>Author: Steven Thomas Smith <s.t.smith@ieee.org>
AuthorDate: Sun Oct 30 21:58:30 2022 -0400

<span style='display:block; white-space:pre;color:#404040;'>    easy-rsa: Update to version 3.1.1
</span>---
 security/easy-rsa/Portfile                         | 23 +++---
 .../easy-rsa/files/patch-set-macports-paths.diff   | 96 ++++++++++++++--------
 2 files changed, 75 insertions(+), 44 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/easy-rsa/Portfile b/security/easy-rsa/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a1bf9efcf82..dc5ed9208f0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/easy-rsa/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/easy-rsa/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> PortSystem          1.0
 PortGroup           github 1.0
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup        OpenVPN easy-rsa 3.0.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup        OpenVPN easy-rsa 3.1.1 v
</span> categories          security
 platforms           darwin
 supported_archs     noarch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,33 +16,36 @@ distname            EasyRSA-${version}
</span> extract.suffix      .tgz
 github.tarball_from releases
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  529ca599f2463a2e7228743e476a84f5f4d628a1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  dbdaf5b9444b99e0c5221fd4bcf15384c62380c1b63cea23d42239414d7b2d4e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    40960
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  6563ea9f21eb4c109147871f99a7e35bc4f6e4e6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  779d425cacf1de56262b7a7ed6b90b36e614ce9273f08ad7b86992740cb3b2a5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    68434
</span> 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# diff -NaurdwB ./easy-rsa-orig ./easy-rsa-new | sed -E -e 's/\.\/.+-(orig|new)/\./' | sed -E -e 's|/opt/local|@PREFIX@|g' > ~/Downloads/patch-set-macports-paths.diff
</span> patchfiles          patch-set-macports-paths.diff
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_run-append  path:bin/openssl:openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> use_configure       no
 
 build {}
 
 post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    reinplace "s|PREFIX|${prefix}|g" ${worksrcpath}/easyrsa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    reinplace "s|PREFIX|${prefix}|g" ${worksrcpath}/vars.example
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/easyrsa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/vars.example
</span> }
 
 destroot {
     xinstall -m 0755 ${worksrcpath}/easyrsa ${destroot}${prefix}/bin
 
     xinstall -d ${destroot}${prefix}/share/${name}/x509-types
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    xinstall -m 0640 -W ${worksrcpath} openssl-1.0.cnf vars.example \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    xinstall -m 0664 -W ${worksrcpath} openssl-easyrsa.cnf vars.example \
</span>         ${destroot}${prefix}/share/${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    xinstall -m 0640 {*}[glob ${worksrcpath}/x509-types/*] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    xinstall -m 0664 {*}[glob ${worksrcpath}/x509-types/*] \
</span>         ${destroot}${prefix}/share/${name}/x509-types
 
     xinstall -d ${destroot}${prefix}/share/doc/${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    xinstall -m 0640 -W ${worksrcpath} COPYING ChangeLog gpl-2.0.txt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    xinstall -m 0664 -W ${worksrcpath} COPYING.md ChangeLog gpl-2.0.txt \
</span>         README.quickstart.md ${destroot}${prefix}/share/doc/${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    xinstall -m 0640 {*}[glob ${worksrcpath}/doc/*] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    xinstall -m 0664 {*}[glob ${worksrcpath}/doc/*] \
</span>         ${destroot}${prefix}/share/doc/${name}
 }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/easy-rsa/files/patch-set-macports-paths.diff b/security/easy-rsa/files/patch-set-macports-paths.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 7b80d3dbd17..64ec1f6bbe1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/easy-rsa/files/patch-set-macports-paths.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/easy-rsa/files/patch-set-macports-paths.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,43 +1,71 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- easyrsa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ easyrsa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -885,7 +885,7 @@ vars_setup() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   local vars=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -NaurdwB ./easyrsa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./easyrsa      2022-10-30 20:54:09.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./easyrsa      2022-10-30 21:39:00.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1094,8 +1094,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   # Find x509-types dir, in specific order
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   for area in \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           "$PWD" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-          '/usr/local/share/easy-rsa' \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-          '/usr/share/easy-rsa' \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++          '@PREFIX@/share/easy-rsa' \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           "${0%/*}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           '/etc/easy-rsa' \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           # EOL - # Add more distros here
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1159,13 +1158,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   # PWD - Covers EasyRSA-Windows installed by OpenVPN, and git forks
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   # "prog_dir" - Old way (Who installs data files in /usr/bin ?)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   # /etc/easy-rsa - possible default
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  # /usr/share/easy-rsa - usr
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  # /usr/local/share/easy-rsa - usr/local
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  # @PREFIX@/share/easy-rsa - @PREFIX@
</span>  
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        # set up program path
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--  local prog_vars="${0%/*}/vars"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  local prog_vars="PREFIX/share/easy-rsa"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   # Find and copy data-files, in specific order
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   for area in \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-          '/usr/local/share/easy-rsa' \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-          '/usr/share/easy-rsa' \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++          '@PREFIX@/share/easy-rsa' \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           "$PWD" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           "${0%/*}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           '/etc/easy-rsa' \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3938,7 +3935,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   easyrsa_shell="$SHELL (Git)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   easyrsa_win_git_bash="${EXEPATH}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   # If found then set openssl NOW!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                  [ -e /usr/bin/openssl ] && set_var EASYRSA_OPENSSL /usr/bin/openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                  [ -e @PREFIX@/bin/openssl ] && set_var EASYRSA_OPENSSL @PREFIX@/bin/openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           easyrsa_host_os=nix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4020,7 +4017,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   # Program dir vars - This location is least wanted.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  prog_vars="${prog_dir}/vars"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  prog_vars="@PREFIX@/share/easy-rsa/vars"
</span>  
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        # command-line path:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   if [ -f "$EASYRSA_VARS_FILE" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -910,9 +910,9 @@ Note: using Easy-RSA configuration from: $vars"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   # set up PKI path vars - Top preference
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   pki_vars="${EASYRSA_PKI:-$PWD/pki}/vars"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4161,9 +4158,9 @@
</span>   fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span>   # Set defaults, preferring existing env-vars if present
<span style='display:block; white-space:pre;background:#ffe0e0;'>--       set_var EASYRSA         "$PWD"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  set_var EASYRSA         "PREFIX/share/easy-rsa"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   set_var EASYRSA_OPENSSL openssl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--  set_var EASYRSA_PKI     "$EASYRSA/pki"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  set_var EASYRSA_PKI     "$PWD/pki"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   set_var EASYRSA_DN      cn_only
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   set_var EASYRSA_REQ_COUNTRY     "US"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  set_var EASYRSA                                 "$PWD"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  set_var EASYRSA                         "@PREFIX@/share/easy-rsa"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   set_var EASYRSA_OPENSSL                 openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  set_var EASYRSA_PKI                             "$EASYRSA/pki"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  set_var EASYRSA_PKI                     "$PWD/pki"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   set_var EASYRSA_DN                              cn_only
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   set_var EASYRSA_REQ_COUNTRY             "US"
</span>   set_var EASYRSA_REQ_PROVINCE    "California"
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- vars.example
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ vars.example
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -42,7 +42,7 @@ fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This variable should point to the top level of the easy-rsa tree. By default,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # this is taken to be the directory you are currently in.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -NaurdwB ./vars.example
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./vars.example 2022-10-30 21:08:38.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./vars.example 2022-10-30 21:12:49.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -47,7 +47,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # itself, which is also where the configuration files are located in the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # easy-rsa tree.
</span>  
<span style='display:block; white-space:pre;background:#ffe0e0;'>--#set_var EASYRSA       "$PWD"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#set_var EASYRSA  "PREFIX/share/easy-rsa"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#set_var EASYRSA  "${0%/*}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#set_var EASYRSA  "@PREFIX@/share/easy-rsa"
</span>  
  # If your OpenSSL command is not in the system PATH, you will need to define the
  # path to it here. Normally this means a full path to the executable, otherwise
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -62,7 +62,7 @@ fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # WARNING: init-pki will do a rm -rf on this directory so make sure you define
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # it correctly! (Interactive mode will prompt before acting.)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#set_var EASYRSA_PKI              "$EASYRSA/pki"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#set_var EASYRSA_PKI              "$PWD/pki"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Define X509 DN mode.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This is used to adjust what elements are included in the Subject field as the DN
</span></pre><pre style='margin:0'>

</pre>