Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/01/03 14:32:02+00:00 nexus.co.uk!pb
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into stealth.nexus.co.uk:/home/pb/oe/oe

2005/01/03 14:31:20+00:00 nexus.co.uk!pb
update gpe-login to 0.75

2005/01/03 15:21:41+01:00 (none)!br1
vtun init script: create /var/lock/vtun if necessary

BKrev: 41d95947VWqIVkBxinDEeY2EWN0j8g

diff --git a/packages/gpe-login/gpe-login_0.75.bb b/packages/gpe-login/gpe-login_0.75.bb
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/vtun/files/init b/packages/vtun/files/init
index e69de29..2f6ef2f 100644 (file)
--- a/packages/vtun/files/init
+++ b/packages/vtun/files/init
@@ -0,0 +1,46 @@
+#! /bin/sh
+
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+DAEMON=/usr/sbin/vtund
+CONFFILE=/etc/vtund-start.conf
+PIDPREFIX=/var/run/vtund
+  
+test -f $DAEMON || exit 0
+  
+case "$1" in 
+      start)
+      test -d /var/lock/vtund || mkdir -p /var/lock/vtund
+      # find all the defined tunnels
+      egrep -v '^[:space:]*(#.*)?$' $CONFFILE | while true;
+      do
+          read i
+          # no more lines available? done, then.
+          if [ $? != 0 ] ; then break; fi
+              SARGS=`echo $i|sed -ne 's/--server--\s*/-s -P /p'`;
+              if [ -n "$SARGS" ]; then
+                echo "Starting vtund server."
+                  start-stop-daemon -S -x $DAEMON -- $SARGS;
+              else
+                  # split args into host and rest
+                  HOST=`echo $i|cut -f 1 -d " "`;
+                  TARGET=`echo $i|cut -f 2 -d " "`;
+                  echo  "Starting vtund client $HOST to $TARGET.";
+                  start-stop-daemon -S -x $DAEMON -- $i;
+              fi
+      done
+      ;;
+    stop) 
+    echo "Stopping vtund.";
+    killall $(basename $DAEMON);
+    ;;
+    reload|force-reload|restart)
+    echo "Restarting vtund.";
+    $0 stop || true;
+    $0 start;
+    ;;
+    *)
+    echo "Usage: $0 {start|stop|restart|reload|force-reload}" >&2
+    exit 1
+    ;;
+esac
+exit 0
\ No newline at end of file

diff --git a/packages/vtun/vtun_2.6.bb b/packages/vtun/vtun_2.6.bb
index e69de29..b69e0b9 100644 (file)
--- a/packages/vtun/vtun_2.6.bb
+++ b/packages/vtun/vtun_2.6.bb
@@ -0,0 +1,30 @@
+DESCRIPTION = "Virtual Tunnels over TCP/IP networks with traffic shaping, compression and encryption."
+HOMEPAGE = "http://vtun.sourceforge.net/"
+MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
+SECTION = "console/network"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "zlib lzo"
+PR = "r1"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/vtun/vtun-${PV}.tar.gz \
+       file://init \
+       file://makefile.in-ldflags.patch;patch=1;pnum=0"
+
+S = "${WORKDIR}/vtun"
+
+inherit autotools
+
+do_configure() {
+       export BLOWFISH_HDR_DIR=${STAGING_INCDIR}/openssl
+       oe_runconf --with-lzo-headers=${STAGING_INCDIR} --with-ssl-headers=${STAGING_INCDIR}/openssl
+}
+
+do_install() {
+       oe_runmake INSTALL_OWNER="" DESTDIR=${D} install
+       install -d ${D}${sysconfdir}/init.d/
+       install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/vtund
+       install ${S}/scripts/vtund-start.conf ${D}${sysconfdir}
+}
+
+CONFFILES_${PN}_nylon = "${sysconfdir}/vtund-start.conf ${sysconfdir}/vtund.conf"