From 4c69df05fb84af8dea6908a1ca27b168918dcc14 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 1 Oct 2006 13:11:02 +0000
Subject: [PATCH] add missing vtun lzo2 changes to whiterussian

SVN-Revision: 4883
---
 openwrt/package/vtun/Makefile               |  4 +-
 openwrt/package/vtun/patches/100-lzo2.patch | 41 +++++++++++++++++++++
 2 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 openwrt/package/vtun/patches/100-lzo2.patch

diff --git a/openwrt/package/vtun/Makefile b/openwrt/package/vtun/Makefile
index 306c25d3fe..2e95cfa11f 100644
--- a/openwrt/package/vtun/Makefile
+++ b/openwrt/package/vtun/Makefile
@@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=vtun
 PKG_VERSION:=2.6
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_MD5SUM:=309534fd03c5d13a19c43916f61f4bbf
 
 PKG_SOURCE_URL:=@SF/vtun
@@ -24,7 +24,7 @@ $(PKG_BUILD_DIR)/.configured:
 		CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
 		LIBS="-L$(STAGING_DIR)/usr/lib" \
 		BLOWFISH_HDR_DIR="$(STAGING_DIR)/usr/include/openssl" \
-		LZO_HDR_DIR="$(STAGING_DIR)/usr/include" \
+		LZO_HDR_DIR="$(STAGING_DIR)/usr/include/lzo" \
 		SSL_HDR_DIR="$(STAGING_DIR)/usr/include/openssl" \
 		./configure \
 		--target=$(GNU_TARGET_NAME) \
diff --git a/openwrt/package/vtun/patches/100-lzo2.patch b/openwrt/package/vtun/patches/100-lzo2.patch
new file mode 100644
index 0000000000..63d4e4ea5d
--- /dev/null
+++ b/openwrt/package/vtun/patches/100-lzo2.patch
@@ -0,0 +1,41 @@
+diff -ur vtun.old/configure vtun.dev/configure
+--- vtun.old/configure	2002-12-20 18:22:15.000000000 +0100
++++ vtun.dev/configure	2006-09-29 21:06:09.000000000 +0200
+@@ -2001,14 +2001,14 @@
+ 	  CPPFLAGS="$CPPFLAGS -I$p"
+ 	fi
+         echo "$ac_t""($dir) yes " 1>&6 
+-	echo $ac_n "checking for lzo1x_decompress in -llzo""... $ac_c" 1>&6
+-echo "configure:2006: checking for lzo1x_decompress in -llzo" >&5
++	echo $ac_n "checking for lzo1x_decompress in -llzo2""... $ac_c" 1>&6
++echo "configure:2006: checking for lzo1x_decompress in -llzo2" >&5
+ ac_lib_var=`echo lzo'_'lzo1x_decompress | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-llzo  $LIBS"
++LIBS="-llzo2  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 2014 "configure"
+ #include "confdefs.h"
+@@ -2037,7 +2037,7 @@
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+   
+-	       LIBS="$LIBS -llzo"
++	       LIBS="$LIBS -llzo2"
+ 	       cat >> confdefs.h <<\EOF
+ #define HAVE_LZO 1
+ EOF
+diff -ur vtun.old/lfd_lzo.c vtun.dev/lfd_lzo.c
+--- vtun.old/lfd_lzo.c	2002-04-25 11:19:50.000000000 +0200
++++ vtun.dev/lfd_lzo.c	2006-09-29 21:09:14.000000000 +0200
+@@ -36,6 +36,7 @@
+ #ifdef HAVE_LZO
+ 
+ #include "lzo1x.h"
++#include "lzoutil.h"
+ 
+ static lzo_byte *zbuf;
+ static lzo_voidp wmem;
-- 
2.30.2