From patchwork Sun Jul 7 12:15:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3191 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-lj1-f197.google.com (mail-lj1-f197.google.com [209.85.208.197]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 560D043D73 for ; Sun, 7 Jul 2024 14:16:05 +0200 (CEST) Received: by mail-lj1-f197.google.com with SMTP id 38308e7fff4ca-2ee9f58c858sf7216951fa.3 for ; Sun, 07 Jul 2024 05:16:05 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1720354564; cv=pass; d=google.com; s=arc-20160816; b=ZKXICsOBgGZL91XlrTJDjTVhjJc8wc+Ada5vNdtoj8sPxO7e87zdhwhRYmgzOXQPLf DB1xMXykCiUnhtKsk2QhlgnwYFwjaj/9g+byQVzohN/ALfOKvjUaaVdGcjZL0LuRb1QJ 10R8M4vwdbQb2AKVVqsQNAHQIAjrA4sV3aSgcZnjDrWB9iz3c1gYiZbqKR2ogt6KdZh+ hZZTk65SSiAhHITSgtapBWCm+QHThDJAhjAgwdbQfm3I5cjai/tLMLTk2PRCiKcNS6AY SapIcqTCPJIMuOwiUho2eDHWEXKhzhDSyOLOSYxnxwNr6swZC7Ravl2UWAlhwKmuMjI4 +8AA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:message-id:date:subject:cc:to :from:dkim-signature; bh=PheeqjDs8w/HR39l+dMwiXWhDZXhuiJ/xwaqs3sKrew=; fh=HlDm9VdaIlWYYp31j76m5teX2EmCXEedSPkh5oS/9/I=; b=agmDk8X0oSvjHR3QXW9CqVwIMvvAYUOx/pM1UmFMHvJw1qkTrmqKWL+67CwTkS6Lfq 0yK1c/vpciIsxu6YFh6pOxfSxD0N+aEZqYojbri9jwxs18RB6SS04fSI5nVMmF9/Kbu/ hJlLTTLwMyYbv+rnZXKBWbP1/njwAZjUCZ8PuFVMtf3hZoD7s1782Rd5RddO699QYV2O 0VIHqEnsv5rX/qJVEI15GD06p6/OJ146FUC67Gc81oZjoGhYzmJ51Jcx0Zf5ORSkvAnW LXglm5VW6abLCrbtjEqbO3Lf9i6ZvQqUYN/GbvSv7M7VlP5xdC43jTYbWGzSrIs62dHR BKJQ==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=C67sOfCl; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1720354564; x=1720959364; darn=patchwork.amarulasolutions.com; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:message-id:date:subject:cc:to:from :from:to:cc:subject:date:message-id:reply-to; bh=PheeqjDs8w/HR39l+dMwiXWhDZXhuiJ/xwaqs3sKrew=; b=KRYPmVUbp5eEm6p37KJ4iFnWodW3ZI5oi81V4B1OJn/VEwuwNvrT537xToiPmSuxeK 02WjOQWAw/bfIjRp5a9hyBebVHMvbFI9OXa6B98IUKAOenyqwomSu0eB6uh+SPk3Sv40 3Jitc5KxE7Iu99RFchGFvrvR6KzDgoZfU1IlE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720354564; x=1720959364; h=list-unsubscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :message-id:date:subject:cc:to:from:x-beenthere:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=PheeqjDs8w/HR39l+dMwiXWhDZXhuiJ/xwaqs3sKrew=; b=XnmoQewrk7bbVHLaq+QRzHM+uvoBZ1FZJxDg0WbjPdXyQlwoiNxY1AbVI0zw6T5V5L bocr6m/LI267yo2BKLi62rveFrfwt07xpMfKfQZy82WMKM9b3K9dm/msmhW+7GTtnkAf qGkqzGLerDvK2TvTFMppFwx7XqjDdXrGsh3CopoHTt607k3N5Ij3d5TtFXyYwmyNwA9I nbZ8ODCcqCmd77wqck0+t5OFLeDhEB9k/MBr1lGlUXHAXEkTE4rwEBycoxm8+TCjOGFg HZ9DPd1BUAGPDgHfzFIeRl5/lnN+cdT8L5tE48VQdYBXWdFdm5Xw7K7ZeKKV/qEzSwvK 9ulg== X-Forwarded-Encrypted: i=2; AJvYcCU0iV7Omcts3VkjL6+pUAam1kNib1dl6/wVY4ifRyes7jcRbz2b5UcMgj7B7hVt97NRdm3WQHofCu3BFo/iIbn0O+3sfI4RG22VtTqYoTiSPDceo/W6lDG/M9pgSg== X-Gm-Message-State: AOJu0YxGWMh5/QtlDTTK+Nj6z7TFL6hGXJGjqbQ2HhGbRNYFcZdqAJIX fs+8YbMQamKzr0S9fk6KabVn4HryLQXY9hDw82rMcDwXgpQCxfJVVg+hXnN7d3UzsA== X-Google-Smtp-Source: AGHT+IFL6EW3QnlatbDhCy38BzHA3Eh0/4KIB6bRQnsJSrcxQjwHzkAh3EVHzPY0tSD0/KwgHaKFhg== X-Received: by 2002:a05:651c:2120:b0:2ec:419b:429e with SMTP id 38308e7fff4ca-2ee8ed3ceffmr74113321fa.2.1720354564299; Sun, 07 Jul 2024 05:16:04 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:651c:118c:b0:2ec:5d3e:a6d3 with SMTP id 38308e7fff4ca-2ee8cde0f51ls15838121fa.2.-pod-prod-07-eu; Sun, 07 Jul 2024 05:16:03 -0700 (PDT) X-Received: by 2002:a2e:be9f:0:b0:2ee:80e0:b9f5 with SMTP id 38308e7fff4ca-2ee8edd415cmr68907011fa.42.1720354562525; Sun, 07 Jul 2024 05:16:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720354562; cv=none; d=google.com; s=arc-20160816; b=yx/4xhi45zcRbUifBd0R1xcyOJSrDm5E7qB+56375VMhVBQKj9T8k5PX/3Mb2SLM/o Vbh6nORyAQruMbHOKgnVqldeHvx0DgvyJJw38diKodvIH83X5foBHB8fBAQ5bywzdM4D UqPmnFEp53bMD6MTjPG6NGOlIHPFKB90O4t4pCrCyHciCuvqUzlelo48QVbvE5VZfZij LTO2LYUTBeb91tKRV7aYU4zCOXjK7VHxyVju1ruMZNMIwN+0TPT/oZTB/T4e0KC42B8O pxNYv+VOqmw/IGcSFpXsBMhu0xDYcxz2MroF9C0ajDHkHL6GBnzGh6ArZTyNP9I/t/MP Mw2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=ZD0FVqYy/bvHbE3I14b0fIGmJLA4iwWSKvCpgRDPBCU=; fh=4aH47D1o6z03SLGX3S5iBqzHxVYI/WCfhxxmm+dgjk8=; b=n3+RvSq/XTtHLp5apKHSiz28j6PlVdX2f9dMSA6Ueb9TG3r1gi8ABXKEMqj0b2AJxM aGYRSSVWQFSHeSI4qph8l7ol9CgtSVWqf57ztKlY5MlGF+F7xyLyxPy4rADHtEmJwpc2 Z+nDxowy9RYz/MD80rGRdV62beZhYOQP6xXNJ5RblnLJikdfQqOWSZUOYDK3eh5Jools MPCJQ28gkiF2H/I+gF8jMUGmJcwzEYIHZqtMPItobgp3gRQodtsXI6991577XeB8ff/H ZB+VEueFgVz2vkH4d01wP4oVOEn7p1lZZg8oOnvzdh8/sTY0FquWzwIQP1qIkct6NfPz 11jQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=C67sOfCl; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id 4fb4d7f45d1cf-58afb0938d0sor3309566a12.9.2024.07.07.05.16.02 for (Google Transport Security); Sun, 07 Jul 2024 05:16:02 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Received: by 2002:a05:6402:4409:b0:57d:24ce:cbc8 with SMTP id 4fb4d7f45d1cf-58e5c72ffe2mr6504681a12.31.1720354561960; Sun, 07 Jul 2024 05:16:01 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.homenet.telecomitalia.it (host-79-30-97-245.retail.telecomitalia.it. [79.30.97.245]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-58fc77ce374sm2724157a12.30.2024.07.07.05.16.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Jul 2024 05:16:01 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: linux-amarula@amarulasolutions.com, Dario Binacchi Subject: [PATCH 1/1] package/vtun: update the patches to be applied with fuzz 0 Date: Sun, 7 Jul 2024 14:15:56 +0200 Message-ID: <20240707121556.4039945-1-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=C67sOfCl; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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 --- 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 765411af841f..a095a1ba58b0 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])