Manuel Novoa III 22 лет назад
Родитель
Сommit
4c8e1eb4cc
2 измененных файлов с 14 добавлено и 2 удалено
  1. 3 2
      make/vtun.mk
  2. 11 0
      sources/vtun.patch

+ 3 - 2
make/vtun.mk

@@ -25,7 +25,7 @@ $(VTUN_DIR)/.unpacked: $(DL_DIR)/$(VTUN_SOURCE)
 	cat $(VTUN_PATCH) | patch -p1 -d $(VTUN_DIR)
 	touch $(VTUN_DIR)/.unpacked
 
-$(VTUN_DIR)/.configured: $(VTUN_DIR)/.unpacked
+$(VTUN_DIR)/.configured: $(VTUN_DIR)/.unpacked zlib lzo openssl
 	(cd $(VTUN_DIR); rm -rf config.cache; \
 		$(TARGET_CONFIGURE_OPTS) \
 		./configure \
@@ -42,7 +42,8 @@ $(VTUN_DIR)/.configured: $(VTUN_DIR)/.unpacked
 		--localstatedir=/var \
 		--mandir=/usr/man \
 		--infodir=/usr/info \
-		--disable-lzo \
+		--with-ssl-headers=$(STAGING_DIR)/include/openssl \
+		--with-lzo-headers=$(STAGING_DIR)/include \
 	);
 	touch  $(VTUN_DIR)/.configured
 

+ 11 - 0
sources/vtun.patch

@@ -173,3 +173,14 @@ diff -urN vtun/scripts/vtund.rc.debian vtun-2.6/scripts/vtund.rc.debian
 +               ;;
 +esac
 +exit 0
+--- 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