From patchwork Sun Jul 7 05:50:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3181 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-lf1-f72.google.com (mail-lf1-f72.google.com [209.85.167.72]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id E43F13F1F3 for ; Sun, 7 Jul 2024 07:50:14 +0200 (CEST) Received: by mail-lf1-f72.google.com with SMTP id 2adb3069b0e04-52ea1a947aesf3067200e87.1 for ; Sat, 06 Jul 2024 22:50:14 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1720331414; cv=pass; d=google.com; s=arc-20160816; b=tjtqt5MGKIQ5DE4j0JLriQTLKuv4Z/PXQdxqAS6qrdxJ5X7KrD3yKVEEwrrhZFQjLZ HZoRAXuBKr87HVzrIkvhv/gYa/r3/Tw1G6H8FYMhBarjeiyYDeInUDDcG8+dmOFM6wMw MOYlQFpX5PWTkUhNEtNYxeRrS/lW8jQrycsxiZJ4bfsh5ifCoLnyC9Lod8Am0EoC5YTi sGgjumkXnJ74AJJKDU7kiQTpfH7H1raUVycgOFSTxxjGBVpPKK3bDu3riwff+Hpe8Ahq vfe6RBLmj0jZQdtvtrmoal9UoXbcQx8FSVz0YResGOasZ2VbwvsyKAVBc9LMgWtbcYWv ESaQ== 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:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=c3v40bAZHw7PoCu3Rd3Achn4cjdYEy8R2aVkzQiPh30=; fh=ny6bt0/io4BPxCLdxulV4c4Q/XowykrjdHaIQHwDGcY=; b=QjkFy5a+OCnKMeOtQQK2UO93e6Lh32Ov/3oBlNRs6RGyx8U27vC4SdkDOt2VYHJhzT UqheHYXFDeLmF1O29fuxktXP252QnO741JCKzV8PgkVKeyT85q8RJMn7/hDgAHX/Zi8F yDdy1WRPdyfHG7vtF4fBFMHP9MujAxlN+cuGCoa3hZEtWcyan0hmk3EVyJb1lTOd+wFP p1QwZA4S0kIYDxej/MQcw2Iq3OfrjkPz3cznNDUFBw+rw+aWhC6z13oj8TYGT8H9lltM jvBq5AH7rCa+zwC+TZOvaigYnLSFXHhRiyAJUPuEqbb77Dn0dRrtMPOsWtRQmkuzyjbR kB7w==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=n7QuL7u5; 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=1720331414; x=1720936214; 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:content-transfer-encoding:mime-version:message-id :date:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=c3v40bAZHw7PoCu3Rd3Achn4cjdYEy8R2aVkzQiPh30=; b=FbrFiKmR4ttfsxzbf8m60tobRsrN136klmPjKZC/7naVpPPa5HIJn/aLdt/C+65IDt B5YiOaJ59OdHpA7CuTRnpO9FaROjRaohw2Kezba/nIxaxZ7RdkujwWK28M2f6aP90hl4 pB5a9h+k1lh+EPxg098ceW7G+ZSlCJMlWmnH4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720331414; x=1720936214; 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 :content-transfer-encoding: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=c3v40bAZHw7PoCu3Rd3Achn4cjdYEy8R2aVkzQiPh30=; b=rYPy1/mkDFDkQhG5j84+9H6siR5N0Az1Ow2wvdWRjd7RE9d77AA7ATN+lFT08GkqUr NzZxUHaVO0WAgvj7c3gOu8bt3TMi6yFOxudbtGnQX1FyekRvkY+m0alO4FJLxWRQ59zU EI8vEywqQZCEs9pAeVYj4ZxgXYFl+ZBcduFH3CJU2Yg9xXukEKNpETMX/FTJdOL+kPMr nh0UACS1KOoDDHeVbesjida3WCrRNtYMdAWIfOlvNgQ5HblVAiNz+OLRmUj8YU6kGgZp 04BaYZvKZUOQ8U/Tv9EJyD+Q88iaMxFoGhkMAJ12PGjmkchSGNrTpbuu4rUWcoKbJvtO 5Yeg== X-Forwarded-Encrypted: i=2; AJvYcCXiG+nYqa3W9V7c+bGZWFYGR6r/PdbSeuIIgd4aXDHfcw7fTFzh/q6xI5oFNZY0hF/ecKF9rUm7/QFL/NRE10tmRRkL8jJAFXoBvzuKm13ZzzgbJ9zTws4FZAkEsw== X-Gm-Message-State: AOJu0Yz8JZjOlMEQtjCBWwxOLDDqq0iAb6jVeSgP3433j7KRgX7PI7CL slfjX21GhqGJsNnxlZL+bdxKHcry/gnPD+P3Oow/5WtfLfLJQ4p6nzi1q5sRSZNygQ== X-Google-Smtp-Source: AGHT+IETQI+/42dgE4hqggKcv++n6CXkECLY5L4KiFLuAteI8i6fTUMXTPyBTpHnt0sOGg3CKKyk+A== X-Received: by 2002:ac2:57c1:0:b0:52e:7125:c70a with SMTP id 2adb3069b0e04-52ea06bc9f4mr5664920e87.47.1720331414142; Sat, 06 Jul 2024 22:50:14 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:ac2:5ded:0:b0:52e:9d2f:233 with SMTP id 2adb3069b0e04-52e9f16bcb7ls1459887e87.0.-pod-prod-02-eu; Sat, 06 Jul 2024 22:50:12 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVGAepZBF2XNj+rhgzHa5uOBu4YLlXvyF47HPfKSSIIEcr01Eca5uWELzM4fCeMPxVnYAZZkEy2nIAhPoNxWeLWRIrQsF5ZFz0ya/1PLVIsXbCX X-Received: by 2002:a05:6512:3da3:b0:52c:d967:79c6 with SMTP id 2adb3069b0e04-52ea062dceamr6799657e87.20.1720331412302; Sat, 06 Jul 2024 22:50:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720331412; cv=none; d=google.com; s=arc-20160816; b=yGC19ROuR9lgQ5SY12Wt7FYj/bYceM2VBeGaOsHQ9h6j9AHN78L0S+e6MIKJreJdM8 7zusyX/5DyiTAlZ1DwfGaEOv/h0tOLRPmc2tc9Sxzh95bSedcrxqmqlE13isCB9l2ZfP I6NY8r8zv7cnyr+CLThOEmhXo5fx+YikKziuEs8NcLKKIS8jpuqh7A1CD5qKgSonvvcF ehbySBK5QDLnsyaSiaKYQqKQ42xXa6zwdRyeDk6NtRe4or0S6kJKkjMvQ1V5m+8nVRGO Lki3mvst++Kz4j0ovVkXwO9dKDgqyeQ+KEqkAU7iTzZA/e9DJFISQtxHpyoA+rQv6xVk 4+sw== 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=shZqiYfrJdnlsK0bPe/WkYIprepNTnxefgX9sJHn3LM=; fh=yrNk9Hiz91Lcl1U1zy9KgE/wspsd+kBoSYQSt3bEz6A=; b=avcsLjjG4b2aE6G/bApkgP/HGv4MEWAaE1/xOqx6yBx4kAUXrWWZrPbzFKAXWbRzH5 wFO+DV7FHEOKYC+OUXMt+OHYJU4H6YD4yBGRbMPhXToEEh+VbdMhddiu3XJ4oJlGnule m3YgzLR+5om7XrM9KPhBcumbiqKN741OVpNB9fdt9VLuZviS6pFsAdXAx9MjP3qDeiiZ ZfVnxJHRtXUIPsjGpzujeIdVfI2limeucbwrb5aDns4oIKWb0x5m/mLzaxt7iLEbYIrT BehRzvzLiu+i+6CXI9yNdscC/IqGz9V+soRkW+FhfDeLC5huGsUrbGLCGiZG+Xb1Y1OP hOsw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=n7QuL7u5; 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 2adb3069b0e04-52eaaa28ec2sor773286e87.5.2024.07.06.22.50.12 for (Google Transport Security); Sat, 06 Jul 2024 22:50:12 -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; AJvYcCVI3cQg9inN0C1tElBDGQg5FzqYBA1lRaHHZ+TffA+2Rc5ETY4bfC5uIKeO1k5yMX3QNM8C5Cd0C7R7cErIavJDqqtWViDA+6X1d2Y3tUOOGbqz X-Received: by 2002:a05:6512:3687:b0:52c:dfa2:5ac1 with SMTP id 2adb3069b0e04-52ea062e4f6mr5359296e87.24.1720331411569; Sat, 06 Jul 2024 22:50:11 -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-a77cc73d48asm190178866b.21.2024.07.06.22.50.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Jul 2024 22:50:10 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: Thomas Petazzoni , linux-amarula@amarulasolutions.com, Dario Binacchi Subject: [PATCH 1/1] package/monit: update the patches to be applied with fuzz 0 Date: Sun, 7 Jul 2024 07:50:05 +0200 Message-ID: <20240707055007.3839165-1-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" 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=n7QuL7u5; 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 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, monit fails to build with output: Applying 0001-no-force-static.patch using patch: patching file Makefile.am Hunk #1 FAILED at 85. 1 out of 1 hunk FAILED -- saving rejects to file Makefile.am.rej Applying 0002-configure.ac-fixes-missing-config-macro-dir.patch using patch: patching file configure.ac Hunk #1 FAILED at 8. 1 out of 1 hunk FAILED -- saving rejects to file configure.ac.rej This commit refreshes the package patches on the current package version. Signed-off-by: Dario Binacchi --- package/monit/0001-no-force-static.patch | 8 +++++--- ...0002-configure.ac-fixes-missing-config-macro-dir.patch | 6 ++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/package/monit/0001-no-force-static.patch b/package/monit/0001-no-force-static.patch index edb619b54152..4634a951f3c7 100644 --- a/package/monit/0001-no-force-static.patch +++ b/package/monit/0001-no-force-static.patch @@ -5,13 +5,15 @@ still dlopen()s the NSS libraries. Reported-by: Peter Kümmel Signed-off-by: "Yann E. MORIN" +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi diff -durN monit-5.7.orig/Makefile.am monit-5.7/Makefile.am --- monit-5.7.orig/Makefile.am 2014-02-20 09:00:42.000000000 +0100 +++ monit-5.7/Makefile.am 2014-09-05 12:49:43.711104001 +0200 -@@ -85,7 +85,7 @@ - src/process/sysdep_@ARCH@.c - +@@ -97,7 +97,7 @@ + src/statistics/Statistics.c + monit_LDADD = libmonit/libmonit.la -monit_LDFLAGS = -static $(EXTLDFLAGS) +monit_LDFLAGS = $(EXTLDFLAGS) diff --git a/package/monit/0002-configure.ac-fixes-missing-config-macro-dir.patch b/package/monit/0002-configure.ac-fixes-missing-config-macro-dir.patch index 325dcc17e136..31b20b3cbc9b 100644 --- a/package/monit/0002-configure.ac-fixes-missing-config-macro-dir.patch +++ b/package/monit/0002-configure.ac-fixes-missing-config-macro-dir.patch @@ -8,6 +8,8 @@ so that m4 macros are properly loaded upon autoreconf use. Upstream: N/A (specific to buildroot) Signed-off-by: Jens Maus +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- configure.ac | 2 +- libmonit/configure.ac | 2 +- @@ -17,9 +19,9 @@ diff --git a/configure.ac b/configure.ac index 3c3d30a2..f4c5ea07 100644 --- a/configure.ac +++ b/configure.ac -@@ -8,7 +8,7 @@ AC_PREREQ([2.53]) +@@ -8,7 +8,7 @@ # Example: 5.0_beta2 - AC_INIT([monit], [5.34.0], [monit-general@nongnu.org]) + AC_INIT([monit], [5.33.0], [monit-general@nongnu.org]) AC_CONFIG_AUX_DIR(config) -AC_CONFIG_MACRO_DIR([m4]) +AC_CONFIG_MACRO_DIRS([m4 config])