diff options
| -rw-r--r-- | net/openconnect/Makefile | 4 | ||||
| -rwxr-xr-x | net/openconnect/files/openconnect.sh | 5 | ||||
| -rw-r--r-- | net/openconnect/files/openconnect.upgrade | 3 |
3 files changed, 11 insertions, 1 deletions
diff --git a/net/openconnect/Makefile b/net/openconnect/Makefile index 1cbeca7e3..1235f490f 100644 --- a/net/openconnect/Makefile +++ b/net/openconnect/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openconnect PKG_VERSION:=7.03 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=ftp://ftp.infradead.org/pub/openconnect/ @@ -69,6 +69,8 @@ define Package/openconnect/install $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_BUILD_DIR)/openconnect $(1)/usr/sbin/ $(INSTALL_BIN) ./files/openconnect-wrapper $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/lib/upgrade/keep.d + $(INSTALL_DATA) ./files/openconnect.upgrade $(1)/lib/upgrade/keep.d/openconnect endef $(eval $(call BuildPackage,openconnect)) diff --git a/net/openconnect/files/openconnect.sh b/net/openconnect/files/openconnect.sh index 553a4ed51..cd97c2cb2 100755 --- a/net/openconnect/files/openconnect.sh +++ b/net/openconnect/files/openconnect.sh @@ -38,6 +38,11 @@ proto_openconnect_setup() { cmdline="$server$port -i vpn-$config --non-inter --syslog --script /lib/netifd/vpnc-script" + # migrate to standard config files + [ -f "/etc/config/openconnect-user-cert-vpn-$config.pem" ] && mv "/etc/config/openconnect-user-cert-vpn-$config.pem" "/etc/openconnect/user-cert-vpn-$config.pem" + [ -f "/etc/config/openconnect-user-key-vpn-$config.pem" ] && mv "/etc/config/openconnect-user-key-vpn-$config.pem" "/etc/openconnect/user-key-vpn-$config.pem" + [ -f "/etc/config/openconnect-ca-vpn-$config.pem" ] && mv "/etc/config/openconnect-ca-vpn-$config.pem" "/etc/openconnect/ca-vpn-$config.pem" + [ -f /etc/openconnect/user-cert-vpn-$config.pem ] && append cmdline "-c /etc/openconnect/user-cert-vpn-$config.pem" [ -f /etc/openconnect/user-key-vpn-$config.pem ] && append cmdline "--sslkey /etc/openconnect/user-key-vpn-$config.pem" [ -f /etc/openconnect/ca-vpn-$config.pem ] && { diff --git a/net/openconnect/files/openconnect.upgrade b/net/openconnect/files/openconnect.upgrade new file mode 100644 index 000000000..0e9192d57 --- /dev/null +++ b/net/openconnect/files/openconnect.upgrade @@ -0,0 +1,3 @@ +/etc/openconnect/user-cert-vpn-*.pem +/etc/openconnect/user-key-vpn-*.pem +/etc/openconnect/ca-vpn-*.pem |