Added vpnc, a cicso3000 vpn concentrator client

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2647 3c298f89-4303-0410-b956-a3cf2f4a3e73

6 files changed, 75 insertions, 0 deletions

diff --git a/package/Config.in b/package/Config.in
index bd5bb67f88..b8f4d6b00c 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -130,6 +130,7 @@ source "package/ttcp/Config.in"
 source "package/ulogd/Config.in"
 source "package/updatedd/Config.in"
 source "package/vgp/Config.in"
+source "package/vpnc/Config.in"
 source "package/vrrpd/Config.in"
 source "package/vsftpd/Config.in"
 source "package/vtun/Config.in"
diff --git a/package/Makefile b/package/Makefile
index ea902e4aac..af04601fe2 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -206,6 +206,7 @@ package-$(BR2_PACKAGE_USTL) += ustl
 package-$(BR2_COMPILE_UTIL_LINUX) += util-linux
 package-$(BR2_PACKAGE_UDEV) += udev
 package-$(BR2_PACKAGE_VGP) += vgp
+package-$(BR2_PACKAGE_VPNC) += vpnc
 package-$(BR2_PACKGE_VRRPD) += vrrpd
 package-$(BR2_PACKAGE_VTUN) += vtun
 package-$(BR2_PACKAGE_VSFTPD) += vsftpd
@@ -314,6 +315,7 @@ tcpdump-compile: libpcap-compile
 tinc-compile: zlib-compile openssl-compile liblzo-compile
 tor-compile: libevent-compile openssl-compile zlib-compile
 usbutils-compile: libusb-compile
+vpnc-compile: libgcrypt-compile libgpg-error-compile
 vtun-compile: zlib-compile openssl-compile liblzo-compile
 wificonf-compile: wireless-tools-compile nvram-compile
 wknock-compile: libpcap-compile
diff --git a/package/vpnc/Config.in b/package/vpnc/Config.in
new file mode 100755
index 0000000000..2b3a42356e
--- /dev/null
+++ b/package/vpnc/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_VPNC
+	tristate "vpnc............................. client for cisco3000 VPN Concentrator."
+	default m if CONFIG_DEVEL
+	depends on BR2_PACKAGE_KMOD_TUN
+	depends on BR2_PACKAGE_LIBGPG_ERROR
+	depends on BR2_PACKAGE_LIBGCRYPT
+	help
+		Client for cisco3000 VPN Concentrator.
diff --git a/package/vpnc/Makefile b/package/vpnc/Makefile
new file mode 100755
index 0000000000..6aec933e71
--- /dev/null
+++ b/package/vpnc/Makefile
@@ -0,0 +1,31 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=vpnc
+PKG_VERSION:=0.3.3
+PKG_RELEASE:=1
+
+PKG_MD5SUM:=e7518cff21326fe7eb9795b60c25ae6a
+PKG_SOURCE_URL:=http://www.unix-ag.uni-kl.de/~massar/vpnc/
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_CAT:=zcat
+
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+
+include $(TOPDIR)/package/rules.mk
+
+$(eval $(call PKG_template,VPNC,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+
+$(PKG_BUILD_DIR)/.configured:
+	touch $@
+
+$(PKG_BUILD_DIR)/.built:
+	$(MAKE) STAGING_DIR=$(STAGING_DIR) CC=$(TARGET_CC) DESTDIR=$(PKG_INSTALL_DIR) -C $(PKG_BUILD_DIR) all install
+	touch $@
+
+$(IPKG_VPNC):
+	mkdir -p $(IDIR_VPNC)
+	cp -fpR $(PKG_INSTALL_DIR)/* $(IDIR_VPNC)/
+	$(RSTRIP) $(IDIR_VPNC)
+	$(IPKG_BUILD) $(IDIR_VPNC) $(PACKAGE_DIR)
diff --git a/package/vpnc/ipkg/vpnc.control b/package/vpnc/ipkg/vpnc.control
new file mode 100755
index 0000000000..5087af9b29
--- /dev/null
+++ b/package/vpnc/ipkg/vpnc.control
@@ -0,0 +1,6 @@
+Package: vpnc
+Section: net
+Architecture: mipsel
+Priority: optional
+Description: client for cisco3000 VPN Concentrator.
+Depends: libgpg-error libgcrypt kmod-tun
diff --git a/package/vpnc/patches/01-no_man.patch b/package/vpnc/patches/01-no_man.patch
new file mode 100644
index 0000000000..a5cc3952c4
--- /dev/null
+++ b/package/vpnc/patches/01-no_man.patch
@@ -0,0 +1,27 @@
+diff -urN orig/vpnc-0.3.3/Makefile vpnc-0.3.3/Makefile
+--- orig/vpnc-0.3.3/Makefile	2005-05-01 22:30:35.000000000 +0200
++++ vpnc-0.3.3/Makefile	2005-12-13 10:30:56.000000000 +0100
+@@ -22,9 +22,8 @@
+ SBINDIR=$(PREFIX)/sbin
+ MANDIR=$(PREFIX)/share/man
+ 
+-CC=gcc
+-CFLAGS=-W -Wall -O -g '-DVERSION="$(shell cat VERSION)"' $(shell libgcrypt-config --cflags)
+-LDFLAGS=-g $(shell libgcrypt-config --libs)
++CFLAGS=-W -Wall -O -I$(STAGING_DIR)/usr/include '-DVERSION="$(shell cat VERSION)"' $(shell libgcrypt-config --cflags)
++LDFLAGS=-L$(STAGING_DIR)/usr/lib $(shell libgcrypt-config --libs)
+ 
+ ifeq ($(shell uname -s), Linux)
+ SYSDEP=sysdep-linux.o
+@@ -83,10 +82,9 @@
+ all : vpnc
+ 
+ install :
+-	install -d $(DESTDIR)$(ETCDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(MANDIR)/man8
++	install -d $(DESTDIR)$(ETCDIR) $(DESTDIR)$(SBINDIR)
+ 	install vpnc.conf vpnc-script $(DESTDIR)$(ETCDIR)
+ 	install vpnc vpnc-disconnect $(DESTDIR)$(SBINDIR)
+-	install vpnc.8 $(DESTDIR)$(MANDIR)/man8
+ 
+ install-strip :
+ 	install -d $(DESTDIR)$(ETCDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(MANDIR)/man8