<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/36e355ae4e2b5e9974a6b6550397f765ccd451a3">https://github.com/macports/macports-ports/commit/36e355ae4e2b5e9974a6b6550397f765ccd451a3</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 36e355ae4e2 easy-rsa: update to 3.1.5
</span>36e355ae4e2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 36e355ae4e2b5e9974a6b6550397f765ccd451a3
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Mon Jul 17 01:54:11 2023 +0800
<span style='display:block; white-space:pre;color:#404040;'> easy-rsa: update to 3.1.5
</span>---
security/easy-rsa/Portfile | 8 +--
.../easy-rsa/files/patch-set-macports-paths.diff | 79 ++++++++++------------
2 files changed, 41 insertions(+), 46 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 5eaf993906f..f58252b2000 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.1.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup OpenVPN easy-rsa 3.1.5 v
</span> categories security
platforms any
supported_archs noarch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,9 +16,9 @@ distname EasyRSA-${version}
</span> extract.suffix .tgz
github.tarball_from releases
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 6563ea9f21eb4c109147871f99a7e35bc4f6e4e6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 779d425cacf1de56262b7a7ed6b90b36e614ce9273f08ad7b86992740cb3b2a5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 68434
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a54fe20cb1ecdf57fb888e01fe9e7340e5fae1db \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9fc6081d4927e68e9baef350e6b3010c7fb4f4a5c3e645ddac901081eb6adbb2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 75808
</span>
# 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
patchfiles patch-set-macports-paths.diff
<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 64ec1f6bbe1..65d2807491d 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,71 +1,66 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -NaurdwB ./easyrsa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./easyrsa 2022-10-30 20:54:09.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./easyrsa 2022-10-30 21:39:00.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1094,8 +1094,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Find x509-types dir, in specific order
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for area in \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- easyrsa 2023-06-10 21:58:12.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ easyrsa 2023-07-17 01:43:06.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1309,8 +1309,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # "$EASYRSA" - Old default and Windows
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # "$PWD" - Usually the same as above, avoid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # "${0%/*}" - Usually the same as above, avoid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # '/usr/local/share/easy-rsa' - Default user installed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # '/usr/share/easy-rsa' - Default system installed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # '@PREFIX@/share/easy-rsa' - @PREFIX@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Room for more..
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # '/etc/easy-rsa' - Last resort
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1320,8 +1319,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "$EASYRSA" \
</span> "$PWD" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- '/usr/local/share/easy-rsa' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- '/usr/share/easy-rsa' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ '@PREFIX@/share/easy-rsa' \
</span> "${0%/*}" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- '/etc/easy-rsa' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # EOL - # Add more distros here
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1159,13 +1158,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # PWD - Covers EasyRSA-Windows installed by OpenVPN, and git forks
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # "prog_dir" - Old way (Who installs data files in /usr/bin ?)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # /etc/easy-rsa - possible default
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # /usr/share/easy-rsa - usr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # /usr/local/share/easy-rsa - usr/local
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # @PREFIX@/share/easy-rsa - @PREFIX@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Find and copy data-files, in specific order
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for area in \
</span> - '/usr/local/share/easy-rsa' \
- '/usr/share/easy-rsa' \
+ '@PREFIX@/share/easy-rsa' \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "$PWD" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${0%/*}" \
</span> '/etc/easy-rsa' \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3938,7 +3935,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # EOL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5226,8 +5224,8 @@
</span> easyrsa_shell="$SHELL (Git)"
easyrsa_win_git_bash="${EXEPATH}"
# If found then set openssl NOW!
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- [ -e /usr/bin/openssl ] && set_var EASYRSA_OPENSSL /usr/bin/openssl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [ -e @PREFIX@/bin/openssl ] && set_var EASYRSA_OPENSSL @PREFIX@/bin/openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #[ -e /usr/bin/openssl ] && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # set_var EASYRSA_OPENSSL /usr/bin/openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #[ -e @PREFIX@/bin/openssl ] && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # set_var EASYRSA_OPENSSL @PREFIX@/bin/openssl
</span> fi
else
easyrsa_host_os=nix
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4020,7 +4017,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5402,7 +5400,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Program dir vars - This location is least wanted.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- prog_vars="${prog_dir}/vars"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ prog_vars="@PREFIX@/share/easy-rsa/vars"
</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;'>- # set up PKI path vars - Top preference
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pki_vars="${EASYRSA_PKI:-$PWD/pki}/vars"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4161,9 +4158,9 @@
</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;'>+@@ -5563,9 +5561,9 @@
</span> fi
# Set defaults, preferring existing env-vars if present
- set_var EASYRSA "$PWD"
<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 "@PREFIX@/share/easy-rsa"
</span> set_var EASYRSA_OPENSSL openssl
- set_var EASYRSA_PKI "$EASYRSA/pki"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set_var EASYRSA_PKI "$PWD/pki"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set_var EASYRSA_PKI "$PWD/pki"
</span> set_var EASYRSA_DN cn_only
set_var EASYRSA_REQ_COUNTRY "US"
set_var EASYRSA_REQ_PROVINCE "California"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -NaurdwB ./vars.example
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./vars.example 2022-10-30 21:08:38.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./vars.example 2022-10-30 21:12:49.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- vars.example 2023-06-10 21:58:12.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ vars.example 2023-07-17 01:30:50.000000000 +0800
</span> @@ -47,7 +47,7 @@
# itself, which is also where the configuration files are located in the
# easy-rsa tree.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span> -#set_var EASYRSA "${0%/*}"
+#set_var EASYRSA "@PREFIX@/share/easy-rsa"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # If your OpenSSL command is not in the system PATH, you will need to define the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # path to it here. Normally this means a full path to the executable, otherwise
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # If your OpenSSL command is not in the system PATH, you will need to define
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the path here. Normally this means a full path to the executable, otherwise
</span></pre><pre style='margin:0'>
</pre>