summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--network/vde2/README4
-rw-r--r--network/vde2/doinst.sh2
-rw-r--r--network/vde2/vde2.SlackBuild28
-rw-r--r--network/vde2/vde2.info8
4 files changed, 34 insertions, 8 deletions
diff --git a/network/vde2/README b/network/vde2/README
index c5595558df..35490f47f5 100644
--- a/network/vde2/README
+++ b/network/vde2/README
@@ -11,6 +11,10 @@ TUN/TAP support manually, you must set the following entry in your
kernel's '.config' file and recompile:
CONFIG_TUN=m
+## Experimental features
+If you know/want vde2's experimental features, execute the script as:
+EXPERIMENTAL=true sh vde2.SlackBuild
+
## Configuration
An init script has been provided in /etc/rc.d/rc.vde2 to use with
vde_switch. Edit this script and provide the TAP inteface name as
diff --git a/network/vde2/doinst.sh b/network/vde2/doinst.sh
index 9c1d24ce7f..1ea1b4a705 100644
--- a/network/vde2/doinst.sh
+++ b/network/vde2/doinst.sh
@@ -19,5 +19,3 @@ if [ -e etc/rc.d/rc.vde2 ]; then
mv etc/rc.d/rc.vde2.new.incoming etc/rc.d/rc.vde2.new
fi
-config etc/rc.d/rc.vde2.new
-
diff --git a/network/vde2/vde2.SlackBuild b/network/vde2/vde2.SlackBuild
index 874729f52e..25cc9dfc38 100644
--- a/network/vde2/vde2.SlackBuild
+++ b/network/vde2/vde2.SlackBuild
@@ -25,7 +25,7 @@
# Modified by Antonio Hernández Blas <hba.nihilismus@gmail.com>
PRGNAM=vde2
-VERSION=2.2.3
+VERSION=2.3.1
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -69,6 +69,17 @@ cd $PRGNAM-$VERSION
chown -R root:root .
chmod -R u+w,go+r-w,a-s .
+EXPERIMENTAL=${EXPERIMENTAL:-false}
+OPTIONS=""
+
+if [ "$EXPERIMENTAL" = "true" ]; then
+ OPTIONS+="--enable-experimental"
+fi
+
+# This seems like a not yet implemented feature so this is just
+# a reminder:
+# --enable-kernel-switch
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
@@ -80,6 +91,7 @@ CXXFLAGS="$SLKCFLAGS" \
--datadir=/usr/share \
--enable-shared=yes \
--disable-static \
+ $OPTIONS \
--build=$ARCH-slackware-linux
make all
@@ -97,11 +109,23 @@ rm -f $PKG/usr/doc/$PRGNAM-$VERSION/doc/Makefile*
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/etc/rc.d
-install -m 0755 $CWD/rc.vde2 $PKG/etc/rc.d/rc.vde2.new
+install -m 0755 $CWD/rc.vde2 $PKG/etc/rc.d/rc.vde2
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
cat $CWD/doinst.sh > $PKG/install/doinst.sh
+# Add .new extension to all configuration files.
+for file in $(find $PKG/etc -type f)
+do
+ mv $file $file.new
+done
+
+# Add *.new files into doinst.sh
+for file in $(find $PKG/etc -type f -name "*.new")
+do
+ echo config $(echo $file | sed "s:$PKG/::") >> $PKG/install/doinst.sh
+done
+
cd $PKG
/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/vde2/vde2.info b/network/vde2/vde2.info
index 0b0ded97f7..1bdeafcd3a 100644
--- a/network/vde2/vde2.info
+++ b/network/vde2/vde2.info
@@ -1,10 +1,10 @@
PRGNAM="vde2"
-VERSION="2.2.3"
+VERSION="2.3.1"
HOMEPAGE="http://vde.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/project/vde/vde2/2.2.3/vde2-2.2.3.tar.bz2"
-MD5SUM="6f59e47fe2c8872afd85d130d2193794"
+DOWNLOAD="http://downloads.sourceforge.net/project/vde/vde2/2.3.1/vde2-2.3.1.tar.bz2"
+MD5SUM="22a7913beb50d6706155fc502ff3cbbe"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="Antonio Hernández Blas"
EMAIL="hba.nihilismus@gmail.com"
-APPROVED="pprkut"
+APPROVED="dsomero"