diff --git a/net/vpnc/Makefile b/net/vpnc/Makefile index 3fbbbc56d9664..344238b864fa4 100644 --- a/net/vpnc/Makefile +++ b/net/vpnc/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=vpnc -PKG_SOURCE_DATE:=2022-05-17 -PKG_SOURCE_VERSION:=5c0ea6a3ba77f889063abfc43ac3b688ad8d6f86 +PKG_SOURCE_DATE:=2024-12-20 +PKG_SOURCE_VERSION:=d58afaaafb6a43cb21bb08282b54480d7b2cc6ab PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/streambinder/vpnc -PKG_MIRROR_HASH:=228dae3ec92316e7f0870b137bb4dc659c3dbdbd566990d5ecdaa878e63571eb +PKG_MIRROR_HASH:=1058679c951db0f53de4cd22942bb6d2c80647bb13fb62a70d71316ce7544fc4 PKG_MAINTAINER:=Daniel Gimpelevich PKG_LICENSE:=GPL-3.0-or-later @@ -31,15 +31,13 @@ define Package/vpnc/config source "$(SOURCE)/Config.in" endef -define Package/vpnc +define Package/vpnc/default SECTION:=net CATEGORY:=Network DEPENDS:=\ +libgpg-error \ +libgcrypt \ +kmod-tun \ - +VPNC_OPENSSL:libopenssl \ - +VPNC_GNUTLS:libgnutls \ +vpnc-scripts \ +resolveip \ @@ -48,7 +46,21 @@ define Package/vpnc SUBMENU:=VPN endef -define Package/vpnc/description +define Package/vpnc-nossl + $(call Package/vpnc/default) + TITLE+= (without SSL) + VARIANT:=nossl +endef + +define Package/vpnc + $(call Package/vpnc/default) + TITLE+= (with SSL) + DEPENDS+= +VPNC_OPENSSL:libopenssl \ + +VPNC_GNUTLS:libgnutls + VARIANT:=ssl +endef + +define Package/vpnc/default/description A VPN client compatible with Cisco's EasyVPN equipment. Supports IPSec (ESP) with Mode Configuration and Xauth. Supports only @@ -56,11 +68,31 @@ define Package/vpnc/description 3DES, 1DES, MD5, SHA1, DH1/2/5/14/15/16/17/18 and IP tunneling. endef -define Package/vpnc/conffiles +define Package/vpnc/description + $(call Package/mosquitto/default/description) + This package is built with SSL support. + This is needed for VPN connections which rely on SSL certificates. + (It supports all types of connections vpnc handles.) +endef + +define Package/vpnc-nossl/description + $(call Package/mosquitto/default/description) + This package is built without SSL support. + It will only support connections with a pre-shared group key. + (For example it allows connectiong to an AVM FRITZ!Box.) +endef + +define Package/vpnc-default/conffiles /etc/vpnc/default.conf endef -OPENSSL-y:=OPENSSL_GPL_VIOLATION=yes +ifeq ($(BUILD_VARIANT),ssl) + OPENSSL-y:=OPENSSL_GPL_VIOLATION=yes +endif + +ifeq ($(BUILD_VARIANT),nossl) + CRYPTO_NONE_MAKEFLAG:=CRYPTO_NONE=yes +endif define Build/Compile mkdir $(PKG_BUILD_DIR)/bin @@ -69,7 +101,8 @@ define Build/Compile OS="Linux" \ VERSION="$(PKG_VERSION)" \ $(OPENSSL-$(CONFIG_VPNC_OPENSSL)) \ - vpnc \ + $(CRYPTO_NONE_MAKEFLAG) \ + $(PKG_BUILD_DIR)/bin/vpnc \ ) endef @@ -86,4 +119,7 @@ define Package/vpnc/install $(INSTALL_DATA) ./files/vpnc.upgrade $(1)/lib/upgrade/keep.d/vpnc endef +Package/vpnc-nossl/install=$(Package/vpnc/install) + $(eval $(call BuildPackage,vpnc)) +$(eval $(call BuildPackage,vpnc-nossl))