mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-28 01:28:59 +00:00
eb9ac25903
Upstream renamed openssl-1.0.cnf to openssl-easyrsa.cnf.
However, pkg kept using openssl-1.0.cnf.
Upstream easyrsa searchs for vars, openssl-*, x509-types in the
same directory as easyrsa script. This was patched to revert
back to static /etc/easy-rsa/ directory (as does OpenSUSE).
EASYRSA_PKI still depends on $PWD.
Move easyrsa from /usr/sbin to /usr/bin as root is not needed.
Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
(backported from f1bef0596f)
(rebased patches)
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
21 lines
513 B
Diff
21 lines
513 B
Diff
--- a/easyrsa
|
|
+++ b/easyrsa
|
|
@@ -1033,7 +1033,7 @@ vars_setup() {
|
|
vars=
|
|
|
|
# set up program path
|
|
- prog_vars="${0%/*}/vars"
|
|
+ prog_vars="/etc/easy-rsa/vars"
|
|
# set up PKI path
|
|
pki_vars="${EASYRSA_PKI:-$PWD/pki}/vars"
|
|
|
|
@@ -1060,7 +1060,7 @@ Note: using Easy-RSA configuration from:
|
|
fi
|
|
|
|
# Set defaults, preferring existing env-vars if present
|
|
- set_var EASYRSA "${0%/*}"
|
|
+ set_var EASYRSA "/etc/easy-rsa"
|
|
set_var EASYRSA_OPENSSL openssl
|
|
set_var EASYRSA_PKI "$PWD/pki"
|
|
set_var EASYRSA_DN cn_only
|