bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade vtun to 3.0.1 (#3265)

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@10673 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
florian 2008-03-27 18:11:37 +00:00
parent 848447328e
commit 437629eb09
2 changed files with 40 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
net/vtun/Makefile
View File

@ -9,14 +9,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=vtun PKG_NAME:=vtun
PKG_VERSION:=2.6 PKG_VERSION:=3.0.1
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/vtun PKG_SOURCE_URL:=@SF/vtun
PKG_MD5SUM:=309534fd03c5d13a19c43916f61f4bbf PKG_MD5SUM:=c342ffe77055d4248a38f0b380f28c1b
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -35,6 +33,9 @@ endef
define Build/Configure define Build/Configure
$(call Build/Configure/Default, \ $(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="-L$(STAGING_DIR)/usr/lib" \ LIBS="-L$(STAGING_DIR)/usr/lib" \
BLOWFISH_HDR_DIR="$(STAGING_DIR)/usr/include/openssl" \ BLOWFISH_HDR_DIR="$(STAGING_DIR)/usr/include/openssl" \

73
net/vtun/patches/100-lzo2.patch
View File

@ -1,41 +1,38 @@
diff -ur vtun.old/configure vtun.dev/configure diff -urN vtun-3.0.1/configure vtun-3.0.1.new/configure
--- vtun.old/configure 2002-12-20 18:22:15.000000000 +0100 --- vtun-3.0.1/configure 2006-12-11 08:55:06.000000000 +0100
+++ vtun.dev/configure 2006-09-29 21:06:09.000000000 +0200 +++ vtun-3.0.1.new/configure 2008-03-27 19:10:22.000000000 +0100
@@ -2001,14 +2001,14 @@ @@ -5459,7 +5459,7 @@
CPPFLAGS="$CPPFLAGS -I$p"
fi fi
echo "$ac_t""($dir) yes " 1>&6 echo "$as_me:$LINENO: result: ($dir) yes " >&5
- echo $ac_n "checking for lzo1x_decompress in -llzo""... $ac_c" 1>&6 echo "${ECHO_T}($dir) yes " >&6
-echo "configure:2006: checking for lzo1x_decompress in -llzo" >&5 - LZOCHK="lzo2 lzo"
+ echo $ac_n "checking for lzo1x_decompress in -llzo2""... $ac_c" 1>&6 + LZOCHK="lzo2"
+echo "configure:2006: checking for lzo1x_decompress in -llzo2" >&5 else
ac_lib_var=`echo lzo'_'lzo1x_decompress | sed 'y%./+-%__p_%'` echo "$as_me:$LINENO: result: \"no\"" >&5
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo "${ECHO_T}\"no\"" >&6
echo $ac_n "(cached) $ac_c" 1>&6 @@ -5504,8 +5504,7 @@
else echo "$as_me:$LINENO: result: \"no\"" >&5
ac_save_LIBS="$LIBS" echo "${ECHO_T}\"no\"" >&6
-LIBS="-llzo $LIBS" { { echo "$as_me:$LINENO: error: LZO library not found. " >&5
+LIBS="-llzo2 $LIBS" -echo "$as_me: error: LZO library not found. " >&2;}
cat > conftest.$ac_ext <<EOF - { (exit 1); exit 1; }; }
#line 2014 "configure" +echo "$as_me: error: LZO library not found. " >&2;} }
#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" fi
+#include "lzoutil.h"
@@ -5598,13 +5597,11 @@
done
if test $havelzo = 0; then
{ { echo "$as_me:$LINENO: error: LZO library not found. " >&5
-echo "$as_me: error: LZO library not found. " >&2;}
- { (exit 1); exit 1; }; }
+echo "$as_me: error: LZO library not found. " >&2;} }
fi
else
{ { echo "$as_me:$LINENO: error: LZO headers not found. " >&5
-echo "$as_me: error: LZO headers not found. " >&2;}
- { (exit 1); exit 1; }; }
+echo "$as_me: error: LZO headers not found. " >&2;} }
fi
fi
static lzo_byte *zbuf;
static lzo_voidp wmem;