vpnc: update to maintained github fork

The SVN-based version has not changed in years. Many distros use this
fork as evident here: https://github.com/streambinder/vpnc/issues/14

Compile tested against GnuTLS and OpenSSL on ramips target.

Fixes #14119.

Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
This commit is contained in:
Ilya Lipnitskiy
2021-02-08 18:42:04 -08:00
parent f8e15596fc
commit 9cbd369aa9
4 changed files with 30 additions and 119 deletions
+28 -33
View File
@@ -8,19 +8,17 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=vpnc
PKG_REV:=550
PKG_VERSION:=0.5.3.r$(PKG_REV)
PKG_RELEASE:=9
PKG_SOURCE_DATE:=2021-01-31
PKG_SOURCE_VERSION:=43780cecd7a61668002f73b6f8b9f9ba61af74ad
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://svn.unix-ag.uni-kl.de/vpnc/trunk/
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE_VERSION:=$(PKG_REV)
PKG_SOURCE_PROTO:=svn
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/streambinder/vpnc
PKG_MIRROR_HASH:=df833bbe369bb96cb915da9b63e4dded0f676f06bcdada4ef94e56b8d87b187e
PKG_MAINTAINER:=Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
PKG_LICENSE:=VARIOUS
PKG_LICENSE_FILES:=COPYING
PKG_LICENSE:=GPL-3.0-or-later
PKG_LICENSE_FILES:=LICENSE
PKG_CONFIG_DEPENDS:= \
CONFIG_VPNC_GNUTLS \
@@ -36,9 +34,17 @@ endef
define Package/vpnc
SECTION:=net
CATEGORY:=Network
DEPENDS:=+libgpg-error +libgcrypt +kmod-tun +VPNC_OPENSSL:libopenssl +VPNC_GNUTLS:libgnutls +vpnc-scripts +resolveip
DEPENDS:=\
+libgpg-error \
+libgcrypt \
+kmod-tun \
+VPNC_OPENSSL:libopenssl \
+VPNC_GNUTLS:libgnutls \
+vpnc-scripts \
+resolveip \
TITLE:=VPN client for Cisco EasyVPN
URL:=http://www.unix-ag.uni-kl.de/~massar/vpnc/
URL:=https://davidepucci.it/doc/vpnc/
SUBMENU:=VPN
endef
@@ -54,39 +60,28 @@ define Package/vpnc/conffiles
/etc/vpnc/default.conf
endef
ifeq ($(CONFIG_VPNC_OPENSSL),y)
OPENSSL-y:=OPENSSL_GPL_VIOLATION=yes
define Build/Compile
mkdir $(PKG_BUILD_DIR)/bin
$(call Build/Compile/Default, \
OFLAGS="$(TARGET_CFLAGS)" \
OS="Linux" VERSION="$(PKG_VERSION)" \
STAGING_DIR="$(STAGING_DIR)" \
DESTDIR="$(PKG_INSTALL_DIR)" \
OPENSSL_GPL_VIOLATION=yes PREFIX=/usr \
all install \
OS="Linux" \
VERSION="$(PKG_VERSION)" \
$(OPENSSL-$(CONFIG_VPNC_OPENSSL)) \
vpnc \
)
endef
else
define Build/Compile
$(call Build/Compile/Default, \
OFLAGS="$(TARGET_CFLAGS)" \
OS="Linux" VERSION="$(PKG_VERSION)" \
STAGING_DIR="$(STAGING_DIR)" \
DESTDIR="$(PKG_INSTALL_DIR)" \
PREFIX=/usr \
all install \
)
endef
endif
define Package/vpnc/install
$(INSTALL_DIR) $(1)/lib/netifd/proto
$(INSTALL_BIN) ./files/vpnc.sh $(1)/lib/netifd/proto/
$(INSTALL_DIR) $(1)/usr/sbin
$(CP) $(PKG_INSTALL_DIR)/usr/sbin/vpnc \
$(PKG_INSTALL_DIR)/usr/sbin/vpnc-disconnect \
$(CP) $(PKG_BUILD_DIR)/bin/vpnc \
$(PKG_BUILD_DIR)/src/vpnc-disconnect \
$(1)/usr/sbin/
$(INSTALL_DIR) $(1)/etc/vpnc
$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/vpnc/default.conf $(1)/etc/vpnc/
$(INSTALL_CONF) $(PKG_BUILD_DIR)/src/vpnc.conf $(1)/etc/vpnc/default.conf
$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
$(INSTALL_DATA) ./files/vpnc.upgrade $(1)/lib/upgrade/keep.d/vpnc
endef