Skip to content

Commit

Permalink
package/vtun: update the patches to be applied with fuzz 0
Browse files Browse the repository at this point in the history
Commit 8f88a64 ("support/scripts/apply-patches.sh: set the maximum
fuzz factor to 0") reduced the fuzz factor.

Due to this change, vtun fails to build with output:

    Applying 0002-fix-ssl-headers-checks.patch using patch:
    patching file configure.in
    Hunk #1 succeeded at 169 (offset 3 lines).
    Hunk #2 succeeded at 179 (offset 3 lines).
    Hunk buildroot#3 FAILED at 193.
    Hunk #4 FAILED at 208.
    2 out of 4 hunks FAILED -- saving rejects to file configure.in.rej

This commit refreshes the package patch on the current package version.

Signed-off-by: Dario Binacchi <[email protected]>
Signed-off-by: Thomas Petazzoni <[email protected]>
  • Loading branch information
passgat authored and tpetazzoni committed Jul 8, 2024
1 parent 39d124d commit d584a2e
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions package/vtun/0002-fix-ssl-headers-checks.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,13 @@ 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" <[email protected]>
[Dario: make the patch to be applied with fuzz factor 0]
Signed-off-by: Dario Binacchi <[email protected]>

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 @@
@@ -169,7 +169,7 @@
AC_MSG_RESULT()
AC_CHECKING( for md5 Library and Header files ... )
AC_SEARCH_HEADERS(md5.h,
Expand All @@ -18,7 +20,7 @@ diff -durN vtun-3.0.3.orig/configure.in vtun-3.0.3/configure.in
,
AC_MSG_ERROR( SSL headers not found. )
)
@@ -176,7 +176,7 @@
@@ -179,7 +179,7 @@
AC_MSG_RESULT()
AC_CHECKING( for blowfish Library and Header files ... )
AC_SEARCH_HEADERS(blowfish.h,
Expand All @@ -27,21 +29,21 @@ diff -durN vtun-3.0.3.orig/configure.in vtun-3.0.3/configure.in
AC_CHECK_LIB(crypto, BF_set_key,
[
LIBS="$LIBS -lcrypto"
@@ -193,7 +193,7 @@
@@ -196,7 +196,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_DEFINE(HAVE_SSL_AES, [1], [Define to 1 if you have AES in openssl])
@@ -211,7 +211,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)
AC_DEFINE(HAVE_SSL_EVP, [1], [Define to 1 if you have EVP in openssl])

0 comments on commit d584a2e

Please sign in to comment.