diff options
| author | Luiz Angelo Daros de Luca <luizluca@gmail.com> | 2018-03-27 02:42:06 -0300 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2018-12-18 10:27:37 +0100 |
| commit | eb9ac2590343a705bd4399d17196d907d511a0e0 (patch) | |
| tree | dad6224c7f2a06af1ecccc3486831aa003cecbf2 /package/network | |
| parent | 38d4ba4e191738965f133cb6faa423f189ed1b13 (diff) | |
| download | upstream-eb9ac2590343a705bd4399d17196d907d511a0e0.tar.gz upstream-eb9ac2590343a705bd4399d17196d907d511a0e0.tar.bz2 upstream-eb9ac2590343a705bd4399d17196d907d511a0e0.zip | |
openvpn-easy-rsa: update to 3.0.4
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 f1bef0596fd2a983386c778a94486782bd272e27)
(rebased patches)
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Diffstat (limited to 'package/network')
| -rw-r--r-- | package/network/services/openvpn-easy-rsa/Makefile | 15 | ||||
| -rw-r--r-- | package/network/services/openvpn-easy-rsa/patches/101-static_EASYRSA.patch | 20 |
2 files changed, 29 insertions, 6 deletions
diff --git a/package/network/services/openvpn-easy-rsa/Makefile b/package/network/services/openvpn-easy-rsa/Makefile index f4b479986f..0cf73950a6 100644 --- a/package/network/services/openvpn-easy-rsa/Makefile +++ b/package/network/services/openvpn-easy-rsa/Makefile @@ -9,13 +9,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openvpn-easy-rsa -PKG_VERSION:=3.0.1 +PKG_VERSION:=3.0.4 PKG_RELEASE:=1 -PKG_SOURCE_URL:=https://github.com/OpenVPN/easy-rsa/releases/download/$(PKG_VERSION)/ +PKG_SOURCE_URL:=https://github.com/OpenVPN/easy-rsa/releases/download/v$(PKG_VERSION)/ PKG_SOURCE:=EasyRSA-$(PKG_VERSION).tgz -PKG_HASH:=dbdaf5b9444b99e0c5221fd4bcf15384c62380c1b63cea23d42239414d7b2d4e +PKG_HASH:=472167f976c6cb7c860cec6150a5616e163ae20365c81f179811d6ee0779ec5a PKG_LICENSE:=GPL-2.0 PKG_BUILD_DIR:=$(BUILD_DIR)/EasyRSA-$(PKG_VERSION) +PKGARCH:=all include $(INCLUDE_DIR)/package.mk @@ -31,6 +32,7 @@ endef define Package/openvpn-easy-rsa/conffiles /etc/easy-rsa/vars /etc/easy-rsa/openssl-1.0.cnf +/etc/easy-rsa/openssl-easyrsa.cnf endef define Build/Configure @@ -42,11 +44,12 @@ define Build/Compile endef define Package/openvpn-easy-rsa/install - $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/easyrsa $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/easyrsa $(1)/usr/bin/ $(INSTALL_DIR) $(1)/etc/easy-rsa - $(INSTALL_DATA) $(PKG_BUILD_DIR)/openssl-1.0.cnf $(1)/etc/easy-rsa/openssl-1.0.cnf + $(INSTALL_DATA) $(PKG_BUILD_DIR)/openssl-easyrsa.cnf $(1)/etc/easy-rsa/openssl-1.0.cnf + $(LN) /etc/easy-rsa/openssl-1.0.cnf $(1)/etc/easy-rsa/openssl-easyrsa.cnf $(INSTALL_DATA) $(PKG_BUILD_DIR)/vars.example $(1)/etc/easy-rsa/vars $(INSTALL_DIR) $(1)/etc/easy-rsa/pki diff --git a/package/network/services/openvpn-easy-rsa/patches/101-static_EASYRSA.patch b/package/network/services/openvpn-easy-rsa/patches/101-static_EASYRSA.patch new file mode 100644 index 0000000000..9da4017801 --- /dev/null +++ b/package/network/services/openvpn-easy-rsa/patches/101-static_EASYRSA.patch @@ -0,0 +1,20 @@ +--- 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 |