2b36d80c63
Against all odds, vtun had a new release sometime last year.
Still, the code needs patching:
- the existing patch to fix installation has been refreshed
- the existing patch to fix blowfish header location has been
replaced (see below)
- configure looks in hard-coded, host paths (eg. /usr/include)
without any consideration for scross-compilation
--> new patch
- configure.in does not even pass an autoreconf without a
bit of love first (it's written in an ancient dialect that
autoreconf does no longer recognise)
--> new patch
Remove obsolete, unused, bit-rotting scripts and warning.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
48 lines
1.8 KiB
Diff
48 lines
1.8 KiB
Diff
configure.in: do not hard-code search patch for SSL headers
|
|
|
|
Do. Not. Do. That. It breaks cross-compilation.
|
|
|
|
Also use the SSL headers dir to look for blowfish headers.
|
|
|
|
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
|
|
|
diff -durN vtun-3.0.3.orig/configure.in vtun-3.0.3/configure.in
|
|
--- vtun-3.0.3.orig/configure.in 2009-03-29 12:08:51.000000000 +0200
|
|
+++ vtun-3.0.3/configure.in 2013-02-16 23:44:44.004339680 +0100
|
|
@@ -166,7 +166,7 @@
|
|
AC_MSG_RESULT()
|
|
AC_CHECKING( for md5 Library and Header files ... )
|
|
AC_SEARCH_HEADERS(md5.h,
|
|
- $SSL_HDR_DIR /usr/include/openssl "" /usr/include /usr/include/ssl /usr/local/include /usr/local/ssl/include /usr/include/sys,
|
|
+ $SSL_HDR_DIR "" ,
|
|
,
|
|
AC_MSG_ERROR( SSL headers not found. )
|
|
)
|
|
@@ -176,7 +176,7 @@
|
|
AC_MSG_RESULT()
|
|
AC_CHECKING( for blowfish Library and Header files ... )
|
|
AC_SEARCH_HEADERS(blowfish.h,
|
|
- $BLOWFISH_HDR_DIR /usr/include/ssl /usr/include/openssl /usr/include /usr/local/include /usr/local/ssl/include /usr/include/crypto,
|
|
+ $BLOWFISH_HDR_DIR $SSL_HDR_DIR,
|
|
AC_CHECK_LIB(crypto, BF_set_key,
|
|
[
|
|
LIBS="$LIBS -lcrypto"
|
|
@@ -193,7 +193,7 @@
|
|
AC_MSG_RESULT()
|
|
AC_CHECKING( for AES Library and Header files ... )
|
|
AC_SEARCH_HEADERS(aes.h,
|
|
- $SSL_HDR_DIR /usr/include/ssl /usr/include/openssl /usr/include /usr/local/include /usr/local/ssl/include /usr/include/crypto,
|
|
+ $SSL_HDR_DIR ,
|
|
AC_CHECK_LIB(crypto, AES_set_encrypt_key,
|
|
[
|
|
AC_DEFINE(HAVE_SSL_AES)
|
|
@@ -208,7 +208,7 @@
|
|
AC_MSG_RESULT()
|
|
AC_CHECKING( for EVP Library and Header files ... )
|
|
AC_SEARCH_HEADERS(evp.h,
|
|
- $SSL_HDR_DIR /usr/include/ssl /usr/include/openssl /usr/include /usr/local/include /usr/local/ssl/include /usr/include/crypto,
|
|
+ $SSL_HDR_DIR ,
|
|
AC_CHECK_LIB(crypto, EVP_EncryptInit,
|
|
[
|
|
AC_DEFINE(HAVE_SSL_EVP)
|