vpnc: Update to version 0.3.3 with patches, add to slugos

- Update to current version 0.3.3
- Fix vpnc-script so busybox-sh can run it
- Add a useful default config file
- Add vpnc, libgcrypt and libgpg-error to slugos-packages

diff --git a/conf/distro/slugos-packages.conf b/conf/distro/slugos-packages.conf
index 467b472..28b85cd 100644 (file)
--- a/conf/distro/slugos-packages.conf
+++ b/conf/distro/slugos-packages.conf
@@ -91,6 +91,8 @@ ${PKGDIR}/packages/libaal/*.bb \
 ${PKGDIR}/packages/libao/*.bb \
 ${PKGDIR}/packages/libdvb/*.bb \
 ${PKGDIR}/packages/libexif/*.bb \
+${PKGDIR}/packages/libgcrypt/*.bb \
+${PKGDIR}/packages/libgpg-error/*.bb \
 ${PKGDIR}/packages/libgphoto2/*.bb \
 ${PKGDIR}/packages/libgsm/*.bb \
 ${PKGDIR}/packages/libiconv/*.bb \
@@ -218,6 +220,7 @@ ${PKGDIR}/packages/usbutils/*.bb \
 ${PKGDIR}/packages/util-linux/*.bb \
 ${PKGDIR}/packages/vim/*.bb \
 ${PKGDIR}/packages/vlan/*.bb \
+${PKGDIR}/packages/vpnc/*.bb \
 ${PKGDIR}/packages/vsftpd/*.bb \
 ${PKGDIR}/packages/wakelan/*.bb \
 ${PKGDIR}/packages/wget/*.bb \

diff --git a/packages/vpnc/files/default.conf b/packages/vpnc/files/default.conf
new file mode 100644 (file)
index 0000000..48b15ec
--- /dev/null
+++ b/packages/vpnc/files/default.conf
@@ -0,0 +1,19 @@
+# Comment out the options you need.
+# Verify your config with "vpnc --print-config".
+# You might also try "vpnc --long-help" or look into the documentation.
+
+# Needed (you will be prompted if this is missing):
+#IPSec gateway 10.1.2.3
+#IPSec ID YOURPEERSID
+#IPSec secret YOURPEERSSECRET
+#Xauth username YOURUSERNAME
+#Xauth password YOURPASSWORD
+
+# Optional:
+#UDP Encapsulate
+#UDP Encapsulation Port 10000
+#Noninteractive
+#No Detach
+#Debug 99
+#Interface name tun0
+#Script /etc/vpnc/vpnc-script

diff --git a/packages/vpnc/files/vpnc-script.patch b/packages/vpnc/files/vpnc-script.patch
new file mode 100644 (file)
index 0000000..f50e41d
--- /dev/null
+++ b/packages/vpnc/files/vpnc-script.patch
@@ -0,0 +1,30 @@
+--- vpnc-0.3.3.orig/vpnc-script        2005-05-05 19:05:18.000000000 +0200
++++ vpnc-0.3.3/vpnc-script     2006-02-07 23:31:50.000000000 +0100
+@@ -19,6 +19,7 @@
+ #set -x
+ 
+ OS="`uname -s`"
++mkdir -p /var/run/vpnc
+ DEFAULT_ROUTE_FILE=/var/run/vpnc/defaultroute
+ RESOLV_CONF_BACKUP=/var/run/vpnc/resolv.conf-backup
+ 
+@@ -219,7 +220,8 @@
+       do_ifconfig
+       set_vpngateway_route
+       if [ -n "$CISCO_SPLIT_INC" ]; then
+-              for ((i = 0 ; i < CISCO_SPLIT_INC ; i++ )) ; do
++              CISCO_SPLIT_INC0=`expr "$CISCO_SPLIT_INC"  - 1`
++              for i in `seq 0 "$CISCO_SPLIT_INC0"` ; do
+                       eval NETWORK="\${CISCO_SPLIT_INC_${i}_ADDR}"
+                       eval NETMASK="\${CISCO_SPLIT_INC_${i}_MASK}"
+                       eval NETMASKLEN="\${CISCO_SPLIT_INC_${i}_MASKLEN}"
+@@ -239,7 +241,8 @@
+ 
+ do_disconnect() {
+       if [ -n "$CISCO_SPLIT_INC" ]; then
+-              for ((i = 0 ; i < CISCO_SPLIT_INC ; i++ )) ; do
++              CISCO_SPLIT_INC0=`expr "$CISCO_SPLIT_INC"  - 1`
++              for i in `seq 0 "$CISCO_SPLIT_INC0"` ; do
+                       eval NETWORK="\${CISCO_SPLIT_INC_${i}_ADDR}"
+                       eval NETMASK="\${CISCO_SPLIT_INC_${i}_MASK}"
+                       eval NETMASKLEN="\${CISCO_SPLIT_INC_${i}_MASKLEN}"

diff --git a/packages/vpnc/vpnc_0.3.3.bb b/packages/vpnc/vpnc_0.3.3.bb
new file mode 100644 (file)
index 0000000..5bcca98
--- /dev/null
+++ b/packages/vpnc/vpnc_0.3.3.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "A client for the Cisco3000 VPN Concentrator"
+SECTION = "console/network"
+PRIORITY = "optional"
+HOMEPAGE = "http://www.unix-ag.uni-kl.de/~massar/vpnc/"
+MAINTAINER = "Matthias Goebl <matthias.goebl@goebl.net>"
+LICENSE = "GPL"
+DEPENDS = "libgcrypt"
+RDEPENDS = "kernel-module-tun"
+PR = "r1"
+
+SRC_URI = "http://www.unix-ag.uni-kl.de/~massar/vpnc/vpnc-${PV}.tar.gz \
+           file://vpnc-script.patch;patch=1 \
+           file://default.conf"
+
+CFLAGS_append = ' -DVERSION=\\"${PV}\\"'
+LDFLAGS_append = " -lgcrypt -lgpg-error"
+
+do_install () {
+       oe_runmake 'DESTDIR=${D}' 'PREFIX=/usr' install
+       rm -f ${D}${sysconfdir}/vpnc/vpnc.conf #This file is useless
+       install ${WORKDIR}/default.conf ${D}${sysconfdir}/vpnc/default.conf
+}
+
+CONFFILES_${PN} = "${sysconfdir}/vpnc/default.conf"