diff options
| author | Matthias Andree <mandree@FreeBSD.org> | 2019-03-23 11:11:25 +0000 |
|---|---|---|
| committer | Matthias Andree <mandree@FreeBSD.org> | 2019-03-23 11:11:25 +0000 |
| commit | c4b1c1a6d00027762882498a4de01aa1dfb6c3a3 (patch) | |
| tree | 963c0ef6754d972000ba9d3f27bf99d88e994918 /security/easy-rsa/files/patch-easyrsa | |
| parent | security/easy-rsa2: deprecated and expire in 3 mo. (diff) | |
security/easy-rsa: update to 3.0.6
ChangeLog: <https://github.com/OpenVPN/easy-rsa/releases/tag/v3.0.6>
This also includes a cherry-pick for Issue #261 that happened
only after v3.0.6, <https://github.com/OpenVPN/easy-rsa/issues/261>
Notes
Notes:
svn path=/head/; revision=496638
Diffstat (limited to 'security/easy-rsa/files/patch-easyrsa')
| -rw-r--r-- | security/easy-rsa/files/patch-easyrsa | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/security/easy-rsa/files/patch-easyrsa b/security/easy-rsa/files/patch-easyrsa deleted file mode 100644 index 88970077412b..000000000000 --- a/security/easy-rsa/files/patch-easyrsa +++ /dev/null @@ -1,46 +0,0 @@ ---- easyrsa~ 2018-09-14 23:21:19.000000000 -0500 -+++ easyrsa 2018-09-15 10:21:49.241886000 -0500 -@@ -415,7 +415,6 @@ - - # init-pki backend: - init_pki() { -- vars_source_check - - # If EASYRSA_PKI exists, confirm before we rm -rf (skiped with EASYRSA_BATCH) - if [ -e "$EASYRSA_PKI" ]; then -@@ -432,6 +431,11 @@ - for i in private reqs; do - mkdir -p "$EASYRSA_PKI/$i" || die "Failed to create PKI file structure (permissions?)" - done -+ -+ if [ ! -f "$EASYRSA_PKI/openssl-easyrsa.cnf" -a -f "$EASYRSA/openssl-easyrsa.cnf" ]; -+ then -+ cp "$EASYRSA/openssl-easyrsa.cnf" "$EASYRSA_PKI/openssl-easyrsa.cnf" -+ fi - - notice "\ - init-pki complete; you may now create a CA or requests. -@@ -1180,18 +1184,15 @@ - set_var EASYRSA_REQ_CN ChangeMe - set_var EASYRSA_DIGEST sha256 - -- # Detect openssl config, preferring EASYRSA_PKI over EASYRSA -- if [ -f "$EASYRSA_PKI/openssl-easyrsa.cnf" ]; then -- set_var EASYRSA_SSL_CONF "$EASYRSA_PKI/openssl-easyrsa.cnf" -- set_var EASYRSA_SAFE_CONF "$EASYRSA_PKI/safessl-easyrsa.cnf" -- else set_var EASYRSA_SSL_CONF "$EASYRSA/openssl-easyrsa.cnf" -- set_var EASYRSA_SAFE_CONF "$EASYRSA/safessl-easyrsa.cnf" -- fi -+ set_var EASYRSA_SSL_CONF "$EASYRSA_PKI/openssl-easyrsa.cnf" -+ set_var EASYRSA_SAFE_CONF "$EASYRSA_PKI/safessl-easyrsa.cnf" - - # Same as above for the x509-types extensions dir - if [ -d "$EASYRSA_PKI/x509-types" ]; then - set_var EASYRSA_EXT_DIR "$EASYRSA_PKI/x509-types" -- else set_var EASYRSA_EXT_DIR "$EASYRSA/x509-types" -+ else -+ #TODO: This should be removed. Not really suitable for packaging. -+ set_var EASYRSA_EXT_DIR "$EASYRSA/x509-types" - fi - - # EASYRSA_ALGO_PARAMS must be set depending on selected algo |