From: Florian Fainelli <florian@openwrt.org>
Date: Tue, 29 Dec 2009 18:59:56 +0000 (+0000)
Subject: [package] update vtun to 3.0.2 (#6412)
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=6f4cef65781f95258ef966e87645063efd0d35b6;p=openwrt%2Fsvn-archive%2Farchive.git

[package] update vtun to 3.0.2 (#6412)

SVN-Revision: 18965
---

diff --git a/net/vtun/Makefile b/net/vtun/Makefile
index 6fb7a5ee2f..730e6f4b86 100644
--- a/net/vtun/Makefile
+++ b/net/vtun/Makefile
@@ -8,19 +8,19 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=vtun
-PKG_VERSION:=3.0.1
+PKG_VERSION:=3.0.2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/vtun
-PKG_MD5SUM:=c342ffe77055d4248a38f0b380f28c1b
+PKG_MD5SUM:=d3d8bc4d58886498a1c338670eab9315
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/vtun
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+kmod-tun +liblzo +libopenssl +zlib
+  DEPENDS:=+kmod-tun +liblzo +libopenssl
   TITLE:=VPN tunneling daemon
   URL:=http://vtun.sourceforge.net
   SUBMENU:=VPN
@@ -30,24 +30,22 @@ define Package/vtun/conffiles
 /etc/vtund.conf
 endef
 
-define Build/Configure
-	$(call Build/Configure/Default, \
-		--with-lzo-headers="$(STAGING_DIR)/usr/include/lzo" \
-		--with-lzo-lib="$(STAGING_DIR)/usr/lib/" \
-		--with-ssl-headers="$(STAGING_DIR)/usr/include/openssl" \
-		, \
-		LIBS="$(TARGET_LDFLAGS)" \
-		BLOWFISH_HDR_DIR="$(STAGING_DIR)/usr/include/openssl" \
-		LZO_HDR_DIR="$(STAGING_DIR)/usr/include/lzo" \
-		SSL_HDR_DIR="$(STAGING_DIR)/usr/include/openssl" \
-	)
-endef
+CONFIGURE_ARGS += \
+	--with-lzo-headers="$(STAGING_DIR)/usr/include/lzo" \
+	--with-lzo-lib="$(STAGING_DIR)/usr/lib/" \
+	--with-ssl-headers="$(STAGING_DIR)/usr/include/openssl" \
+
+CONFIGURE_VARS += \
+	LIBS="$(TARGET_LDFLAGS)" \
+	BLOWFISH_HDR_DIR="$(STAGING_DIR)/usr/include/openssl" \
+	LZO_HDR_DIR="$(STAGING_DIR)/usr/include/lzo" \
+	SSL_HDR_DIR="$(STAGING_DIR)/usr/include/openssl" \
 
-define Build/Compile	
+define Build/Compile
 	$(call Build/Compile/Default,vtund)
 endef
 
-define Package/vtun/install	
+define Package/vtun/install
 	$(INSTALL_DIR) $(1)/etc
 	$(INSTALL_CONF) $(PKG_BUILD_DIR)/vtund.conf $(1)/etc/
 	$(INSTALL_DIR) $(1)/usr/sbin
diff --git a/net/vtun/patches/100-lzo2.patch b/net/vtun/patches/100-lzo2.patch
index 84586f8725..fa9ba8b00a 100644
--- a/net/vtun/patches/100-lzo2.patch
+++ b/net/vtun/patches/100-lzo2.patch
@@ -1,7 +1,6 @@
-diff -urN vtun-3.0.1/configure vtun-3.0.1.new/configure
---- vtun-3.0.1/configure	2006-12-11 08:55:06.000000000 +0100
-+++ vtun-3.0.1.new/configure	2008-03-27 19:10:22.000000000 +0100
-@@ -5459,7 +5459,7 @@
+--- a/configure
++++ b/configure
+@@ -5459,7 +5459,7 @@ echo $ECHO_N "checking \"for lzo_asm.h\"
  	fi
          echo "$as_me:$LINENO: result: ($dir) yes " >&5
  echo "${ECHO_T}($dir) yes " >&6
@@ -10,7 +9,7 @@ diff -urN vtun-3.0.1/configure vtun-3.0.1.new/configure
      else
          echo "$as_me:$LINENO: result: \"no\"" >&5
  echo "${ECHO_T}\"no\"" >&6
-@@ -5504,8 +5504,7 @@
+@@ -5504,8 +5504,7 @@ echo "${ECHO_T}($dir) yes " >&6
          echo "$as_me:$LINENO: result: \"no\"" >&5
  echo "${ECHO_T}\"no\"" >&6
  	{ { echo "$as_me:$LINENO: error: LZO library not found. " >&5
@@ -20,7 +19,7 @@ diff -urN vtun-3.0.1/configure vtun-3.0.1.new/configure
  
      fi
  
-@@ -5598,13 +5597,11 @@
+@@ -5598,13 +5597,11 @@ fi
        done
        if test $havelzo = 0; then
  	    { { echo "$as_me:$LINENO: error: LZO library not found. " >&5