Previous vtun was version 2.6.

config BR2_PACKAGE_VTUN

	bool "vtun"

	bool "vtun - BEWARE: read package/vtun/README.txt before use"

	select BR2_PACKAGE_LZO

	select BR2_PACKAGE_OPENSSL

	help

Previous vtun was version 2.6.

This does not buld because its "configure" requires

that -llzo contains "lzolx_decompress".

"vtun" does not build, evenm if liblzo is available.

The LZO package currently used by buildroot

does not contain ANY reference to "lzolx_decompress"

"vtun" has been upgraded to 3.0.2 and now builds OK,

but is yet to be tested on a target.

The previous patch containing three diffs,

has been broken up into three files.

The second patch fails.

This patch tries to replace a perl script

($(VTUN_DIR)/scripts/vtund.rc.debian)

with a shell script with the same name.

In vtun-3.0.2, vtund.rc.debian is a shell script which is

fairly similar to the shell script provided by the patch.

For now, it has been decided not to replace this shell 

script with the script generated by the patch for 2.6

vtun will thus be built with the 3.0.2 vtund.rc.debian.

The start-stop-daemon parameters and other things

in this script may be inappropriate for something based on busybox.

I will leave the decision which script to use,

the 2-6 script or the 3.0.2 script to someone else.

Both files are kept in the directory, but should

be removed once it has been decided what to do

about this script.

Signed-Off by: Ulf Samuelsson <ulf.samuelsson@atmel.com>

diff -urN vtun/Makefile.in vtun-2.6/Makefile.in

--- vtun/Makefile.in	2002-12-20 09:55:47.000000000 -0700

+++ vtun-2.6/Makefile.in	2003-06-05 12:38:31.000000000 -0600

@@ -28,7 +28,7 @@

 LEXFLAGS = -t 

 INSTALL = @INSTALL@

-INSTALL_OWNER = -o root -g 0

+INSTALL_OWNER =

 prefix = @prefix@

 exec_prefix = @exec_prefix@

@@ -86,15 +86,15 @@

 install_config: 

 	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(ETC_DIR)

-	if [ ! -f $(ETC_DIR)/vtund.conf ]; then \

-	  $(INSTALL) -m 600 $(INSTALL_OWNER) vtund.conf $(DESTDIR)$(ETC_DIR); \

-	fi

+	$(INSTALL) -m 600 $(INSTALL_OWNER) vtund.conf $(DESTDIR)$(ETC_DIR);

+	$(INSTALL) -m 600 $(INSTALL_OWNER) scripts/vtund-start.conf $(DESTDIR)$(ETC_DIR);

 install: vtund install_config install_man

-	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(VAR_DIR)/run

 	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(STAT_DIR)

 	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(LOCK_DIR)

 	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(SBIN_DIR)

 	$(INSTALL) -m 755 $(INSTALL_OWNER) vtund $(DESTDIR)$(SBIN_DIR)

+	$(INSTALL) -m 755 $(INSTALL_OWNER) scripts/vtund.rc.debian \

+		$(DESTDIR)$(ETC_DIR)/init.d/S90vtun

 # DO NOT DELETE THIS LINE -- make depend depends on it.

--- vtun-2.6/configure.dist	2004-03-11 10:39:10.000000000 -0600

+++ vtun-2.6/configure	2004-03-11 10:45:52.000000000 -0600

@@ -2112,7 +2112,7 @@

     echo $ac_n "checking "for blowfish.h"""... $ac_c" 1>&6

 echo "configure:2114: checking "for blowfish.h"" >&5 

     ac_hdr_found=no

-    for p in $BLOWFISH_HDR_DIR /usr/include/ssl /usr/include/openssl /usr/include /usr/local/include /usr/local/ssl/include  /usr/include/crypto; do

+    for p in $BLOWFISH_HDR_DIR $SSL_HDR_DIR /usr/include/ssl /usr/include/openssl /usr/include /usr/local/include /usr/local/ssl/include  /usr/include/crypto; do

 	if test -n "$p"; then

 	  dir="$p"

 	else

# to enable that within busybox

#

#############################################################

VTUN_VERSION:=2.6

#Old version 2.6

VTUN_VERSION:=3.0.2

VTUN_SOURCE:=vtun-$(VTUN_VERSION).tar.gz

VTUN_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/vtun/

VTUN_DIR:=$(BUILD_DIR)/vtun-$(VTUN_VERSION)

$(VTUN_DIR)/.unpacked: $(DL_DIR)/$(VTUN_SOURCE)

	$(VTUN_CAT) $(DL_DIR)/$(VTUN_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -

	mv $(BUILD_DIR)/vtun $(VTUN_DIR)

	toolchain/patch-kernel.sh $(VTUN_DIR) package/vtun/ vtun\*.patch

	touch $(VTUN_DIR)/.unpacked

	touch $@

$(VTUN_DIR)/.configured: $(VTUN_DIR)/.unpacked

$(VTUN_DIR)/.patched: $(VTUN_DIR)/.unpacked

	toolchain/patch-kernel.sh $(VTUN_DIR) package/vtun/ vtun-$(VTUN_VERSION)\*.patch

	touch $@

$(VTUN_DIR)/.configured: $(VTUN_DIR)/.patched

	(cd $(VTUN_DIR); rm -rf config.cache; \

		$(TARGET_CONFIGURE_OPTS) \

		$(TARGET_CONFIGURE_ARGS) \

vtun: uclibc zlib lzo openssl $(TARGET_DIR)/$(VTUN_TARGET_BINARY)

vtun-unpacked: $(VTUN_DIR)/.unpacked

vtun-patched: $(VTUN_DIR)/.patched

vtun-clean:

	$(MAKE) DESTDIR=$(TARGET_DIR) -C $(VTUN_DIR) uninstall

	-$(MAKE) -C $(VTUN_DIR) clean