From d584a2e0d593598e61db9ad435f4555c79c71743 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Sun, 7 Jul 2024 14:15:56 +0200 Subject: [PATCH] package/vtun: update the patches to be applied with fuzz 0 Commit 8f88a644ed7d6 ("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 #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 Signed-off-by: Thomas Petazzoni --- package/vtun/0002-fix-ssl-headers-checks.patch | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/package/vtun/0002-fix-ssl-headers-checks.patch b/package/vtun/0002-fix-ssl-headers-checks.patch index 765411af84..a095a1ba58 100644 --- a/package/vtun/0002-fix-ssl-headers-checks.patch +++ b/package/vtun/0002-fix-ssl-headers-checks.patch @@ -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" +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi 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, @@ -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, @@ -27,7 +29,7 @@ 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, @@ -35,8 +37,8 @@ diff -durN vtun-3.0.3.orig/configure.in vtun-3.0.3/configure.in + $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, @@ -44,4 +46,4 @@ diff -durN vtun-3.0.3.orig/configure.in vtun-3.0.3/configure.in + $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])