From patchwork Sun Jul 7 11:57:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3189 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-lj1-f200.google.com (mail-lj1-f200.google.com [209.85.208.200]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 980AE43D73 for ; Sun, 7 Jul 2024 13:57:56 +0200 (CEST) Received: by mail-lj1-f200.google.com with SMTP id 38308e7fff4ca-2ee95497b77sf20520171fa.1 for ; Sun, 07 Jul 2024 04:57:56 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1720353476; cv=pass; d=google.com; s=arc-20160816; b=J0X/gmbq5R3JA4quUbYJXSCbq6pFHBS+m8u/d/LQGGC80ZRC8HlGL/wlYjZILdVkJd XJ1jVy1+h/3eWq/Na2/PN8Q6pivHCI0roSl4xmyTKaRS2mijEHKgGkYxrYZ3kzsWTygI +xt/YqIXpjQH49vqid+Nd6dIfunVmmOol+bWzGU9BuxqauojyxOxcO1mkY7Uvxo1P7CV 9QrgE+N25omc1UGJT9NXg8yjjwPWhmiNMxv5D7oLmSomwuW20r4h7dEUgu5NnuYlI6JD jxzGLykriQ9S3pp6Ko1BFwAUeSwfQ9DfV7uYcftHA8jzdtDrf8MsGQF/aQNhJZY8gGZy Cnqg== 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=WSDfKZe/Oe/tVXmY3jzijaJMnGmYsN2MBW7LbuHOjnc=; fh=+uSg4N4Rdw4x5aGpC/HZl4Xf8ZouLb8/URlPVFlMHsI=; b=d+DiA0eRyBISRpHbUd/dixZO4yqVTxJn7Eu7iYWiNWn53eWQyHhPOAQ+pGnxN33+eP 9Kf7/3B0SGSmi8bqJqaxIwj8pedCWWZtf+1fN2t5wEJxXHqJyNTRlE+SnevERtgJ0720 M7L3wY5iHeWs1u7c24QEQknTnssJNMBb/ghRQC3fIHbBfaXPCXwXIs6+8XwczjZAKiH4 Lxc4Yj4OcO9WSX2rgo+Dajo3aJP98nQPVm0TAFnH3QHgN1t3o7TyUBX8QXvfHs0xlLvC tXaVmaKv78rdKFVy/wcsJyGTQCgqW+GcyTuxirg9NO48uEFsyQjNvIhDn70dpvDyZBKh x5zQ==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=njfDAOCB; 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=1720353476; x=1720958276; 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=WSDfKZe/Oe/tVXmY3jzijaJMnGmYsN2MBW7LbuHOjnc=; b=GTb5BhLjWHlzUkC491CZX/lYyRft/+hpF0sfuHQx3gpqWOedLFmeJrk0j70V+oVRFd Vbj2F72SN4DLuTaRVKXcgV5ff8/R1HjVxjURKl9kNQdFL1rP+8QnwH/UgSBq7cSxTRIX JxoVvjQyj72EZZUkGWxH9n9LwEkb9OJWX/jQQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720353476; x=1720958276; 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=WSDfKZe/Oe/tVXmY3jzijaJMnGmYsN2MBW7LbuHOjnc=; b=w7VHJeFDtW/H7ATsz0qF4oib7h4WeceCAgLEidf1+ODPB8K/s3hHGya3XwPR3qQPnC mc72pMRVZRrR6Y6+uBVDyBVRs9VUYyQQBSgGi8R13SK+QGswyw6hORQnKCu9PQws2q6N D2D/3wXPDuW3iZlCwp4EgVW3sRzRITfVZs5W5lLOZau+sPRk97SKz5Fl3yVSixnSvFBU D9NmxPHktyf/RxQYdM33Vl1vJemxFllY1R22T5OdR98ghRF8Xz+mv3RGEE844tJqRcuH zR/8CeM0826awjjBCpxVHEnh35HW8ZPj0J7hshaOW3qAI/Lh7ScHauKMldmJLnYAojSt uTAA== X-Forwarded-Encrypted: i=2; AJvYcCVcONM1sNV2QM4cYWfMZrpyYSJebpUv1FDApxHR/VxSdpbO0D4NCwq/WxPT4V9e8AyNKzpprxhAaopVVy0sqgLymGT+h6sUMbMi/9lUozaJ2DIdWeIiFaMJG8qubw== X-Gm-Message-State: AOJu0YxJ47NLGZ44Adq0EfcCCYdFFdRvj2dVwWF5ip4CW/VRzxlEuOxP hn7rEoDkVvtJdxEu6vd5TP+inVBhxlV5OR3U86OBOZQlhO2aEG+3GmGugCfcOokafA== X-Google-Smtp-Source: AGHT+IFf/+iVskyfqTSmSlGAdTXyJmrdWrwaL6/NI7ODnPU6+6S3Z0Bz/EpPnc8YSYIc7iPl7vktzw== X-Received: by 2002:a2e:86d3:0:b0:2ee:493f:d751 with SMTP id 38308e7fff4ca-2ee8eda55abmr56442871fa.23.1720353475558; Sun, 07 Jul 2024 04:57:55 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6402:1d2e:b0:585:2014:4d24 with SMTP id 4fb4d7f45d1cf-58e20099a79ls1535204a12.0.-pod-prod-08-eu; Sun, 07 Jul 2024 04:57:54 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUTOlcsyV00oDTbkVpR1qAA1r1hLyXeA2id+iz8/X3RcRHRwkTrRqiw47aSI6CWwJjEe9465fbNsvuSGiPE6Jy9zOWuLIztFlhRuyzvPAWJynfq X-Received: by 2002:a17:907:97c8:b0:a72:44d8:3051 with SMTP id a640c23a62f3a-a77ba455679mr923583366b.16.1720353473935; Sun, 07 Jul 2024 04:57:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720353473; cv=none; d=google.com; s=arc-20160816; b=c3LuRtOh7qcqHXAHeB2o1/6f6zOswyMTI6r3NCUv0ETJgX5YecbWp+LL1WT1t8+8KF MAw9LozcqMakaRLHeq8KhTpbH4IdgyxvFyEliYR5txtvZX1U6HonumIbgmBFFnlskNOg nCxhxRsQfkMubTQQ1easi46t7UVCpVtMIiH+v4bUuE7WBJMOxie0aFCXXfI+xOU0JrhU 54Tm3cWCJYnk3VegPl29Mv3wLQlAYUA8kU55MAKJgnXaUk7yB0PXu6J0xjFBhGUhdqUV qnIYBuXKnhh7K8ie/noKfZW4rVpeJqKgBkYKMz9PbVyfeZhu2z/JZDIdN1YyZzDUq3uW TtSg== 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=UhUB5idIeHu9QfeAT6BV5hY1ubIg2Y94PSn1w/a1laM=; fh=P5YXXaHOdZYNOBzmB7cNT0XER5PaeCaCcYMOKERETrU=; b=HnpsgTKchj6hwNC+1VC4p8DB8jSmezjJ2Rhtx6xTxHVq8go/6TY/k/ck2UGRY+ThS5 7/gBLMheMZQ+7QXhJK5JHXF9i1gMdxVHseA3B+YSy8N5A2dTVpojDWg8JAepwW2wM1g+ LpN2NtBFrV+umvNxVh3L69Wa6tkzD4rqbeoyNENSla4737OrxtTMpEVqgrt10VeBZdx7 7wH/+/23gMGEB6NA/X1giOp9eYT1QrWi4ysto1vljaE4WH/H85PUnaYJwHYDuZUw/lm3 gPGWMYa2IYLhhoIFQun1h6Es23r5fiHGFQ1zkf7Hg1G2WGsjNaPE0CnDXpGLb9SdNQvU 2WIg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=njfDAOCB; 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 a640c23a62f3a-a77bf74963asor164976666b.3.2024.07.07.04.57.53 for (Google Transport Security); Sun, 07 Jul 2024 04:57:53 -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-Forwarded-Encrypted: i=1; AJvYcCUGOPfCRtCocqHohvoQ7QP0q7mXQOSMX8DJICEY/KnZF8qEhK5OGCByuWsDK9+QbMPJI92mtgGHs83fgcMyd6sKAGmNRjU3SADHv6bIQt/fxh5r X-Received: by 2002:a17:906:c407:b0:a77:e48d:bc2 with SMTP id a640c23a62f3a-a77e48d0ccamr245878366b.3.1720353473432; Sun, 07 Jul 2024 04:57:53 -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 a640c23a62f3a-a77ea919751sm90812866b.86.2024.07.07.04.57.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Jul 2024 04:57:53 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: Sergio Prado , linux-amarula@amarulasolutions.com, Dario Binacchi Subject: [PATCH 1/1] package/snort: update the patches to be applied with fuzz 0 Date: Sun, 7 Jul 2024 13:57:49 +0200 Message-ID: <20240707115749.3992393-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=njfDAOCB; 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, snort fails to build with output: Applying 0005-fix-sparc.patch using patch: patching file configure.in Hunk #1 FAILED at 942. Hunk #2 succeeded at 915 (offset -42 lines). 1 out of 2 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/snort/0005-fix-sparc.patch | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/package/snort/0005-fix-sparc.patch b/package/snort/0005-fix-sparc.patch index 14792d2c59df..56a294976c6b 100644 --- a/package/snort/0005-fix-sparc.patch +++ b/package/snort/0005-fix-sparc.patch @@ -4,20 +4,22 @@ like "let's see if this v9 instruction exists when I force the compiler to think I'm using v9", which is non-sensical. Signed-off-by: Fabrice Fontaine +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi diff -Naurp ./snort-2.9.11.1-orig/configure.in snort-2.9.11.1/configure.in --- ./snort-2.9.11.1-orig/configure.in 2018-05-10 12:20:19.253510678 +0200 +++ snort-2.9.11.1/configure.in 2018-05-10 12:40:18.547584998 +0200 -@@ -942,8 +942,6 @@ fi +@@ -900,8 +900,6 @@ # check for sparc %time register if eval "echo $host_cpu|grep -i sparc >/dev/null"; then - OLD_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -mcpu=v9 " AC_MSG_CHECKING([for sparc %time register]) - AC_RUN_IFELSE( + AC_COMPILE_IFELSE( [AC_LANG_PROGRAM( -@@ -957,8 +955,6 @@ if eval "echo $host_cpu|grep -i sparc >/ +@@ -915,8 +913,6 @@ AC_MSG_RESULT($sparcv9) if test "x$sparcv9" = "xyes"; then AC_DEFINE([SPARCV9],[1],[For sparc v9 with %time register])