From patchwork Sun Jul 7 09:44:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3188 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id E909D3F1F3 for ; Sun, 7 Jul 2024 11:44:34 +0200 (CEST) Received: by mail-ed1-f72.google.com with SMTP id 4fb4d7f45d1cf-58cdd86c091sf2467994a12.3 for ; Sun, 07 Jul 2024 02:44:34 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1720345474; cv=pass; d=google.com; s=arc-20160816; b=msuP+6B0i4YojzhJRP5wT87ySv5x996lHPfJ55kF48tZUUf/F7E3sZcxRY16AWaWwf ga94uCsPb8ZkFfeABTLYOd59eCI1QQfYTkiAT4Ho/gUM1VJSjgXOv5nAqbqk0ofhHnkH h2w9kQY0Mo8dBWvmHC0HbPIAAZGXLKKmBJyeumowGZKZIjwwG+jksFJ3ZevIKM8A22qC uYWpNtzNYieuODYen4oYW5KGyQcki1mgGiXN5J+IDZTDvBJwaC0MnXpLTdCCyU0zWbLW ZHJLJcFoCj6qUtscpll5QGbOP+Ff5WtrfovZVHT5XiLkKyqyGY5816ju0pqYNfSSZaeZ oWpQ== 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=cNIjHZHyObqFyTHmLQgDMjds9Dv+gzv8w/XeZY1Yqec=; fh=yWbNc5oZAhW9jue0c6EPCD8DizIDvriOqQbGXOnjKio=; b=aLjLbcn1HPK1ebeR7uKYBH9Ls2gK0l4fHMbDntbMyNGw2eK8akdb5+DJLtdMhG3Va5 MYfspAKV7GJgFi9Yk5vlUfhskbdTmP+Xlsj0Jdsa/RhznooWpIwbH+i+Mwts5b1mmVT6 xiMJN2YcU2S8GITvOucD2T8jSUY0JSH7oWkvslTZlKhYwtwZ+ovS5rdyhELYpS4c6DYK l+DJAEw1QrjkI/p83GRaiYRuk4h0t98R1TreJ/5ixma2OBdWhHI4HrXcxKnyKjJ2/Z72 2fCP53XQT2zPqUrMUpeMKet/eElPuPGe33dlE8lvo2fJ63HCKsJ0iwZxBZoT1L6ciDS7 ZSNw==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=atdlfBV2; 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=1720345474; x=1720950274; 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=cNIjHZHyObqFyTHmLQgDMjds9Dv+gzv8w/XeZY1Yqec=; b=Vd1VNWW49/3H8wXFybdHCLYBxqn88XCWxOoNmYovI8O27LZiLrqc3n2XNfHwE2fPJ8 ItsY8Bv1GR0FcS+dFgt49AUSz6k/0yDbXkA8rojLHiIMLFSuNwWTkSrY0iGy+xGmvcKB 3qIavj+4nsWQy3RSXvRA26yroVap7KA/S2vU8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720345474; x=1720950274; 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=cNIjHZHyObqFyTHmLQgDMjds9Dv+gzv8w/XeZY1Yqec=; b=GDS4oXM5PKhOnjYs1Af59ttMxl84cbskc3MsZ0+wxJKUhahTiKoXmLKP7ysRLHRlmy 3iI9ueFNR1iQNa+706fIjdBJtPlWy3KHvthWi8aaLPK/fek4sq3CJsXlaLIUGutlMJo0 w2sE2z0Kz4yC95vj6wYjZ7BAxeNUZiWqn8M5F8MfpsznIY9t4ZjFB18Qv10DmFIpEEyV xfoiZXXfu/OmGcVegOnSHjfVm9s0QD+oNZ2l+Md/JftOanLNEZRdWoNRBD0TzqmXaetU Baa2CWjrgGyigEHtvY9WKC8YiCzB2T8Gxc6465ShbIJ47Nvh9TygSgxTYTKswprNALMT Qciw== X-Forwarded-Encrypted: i=2; AJvYcCUYEPfog/RGjjD0E5z20GQ6lWKdDcPXxNUt9eDVbotKwxlFiAl66QlKIG5tJMxGOqKsiASmkoEDQc/lRS0uo3kBFJjK0nrmaUy+6tAP4JLO7kAfupKhNXQHnolaVg== X-Gm-Message-State: AOJu0YxPJQNeKRsqlwv3HyGWog4cMuZKn09E4eG4vsEnqVvP1hNdcKBl vQf1OZDd2eWcXFIFDnWR+G93I5O6LhKEJQ2rSunmp7/7B34tolko5rsmOn9Uxo7Lcw== X-Google-Smtp-Source: AGHT+IFGTAQWKvEVzPbgFasHvMFYXrzi5HiPw6vFgbRsaAMoqSfr7mWr43UIAVxkXEeqVDkT3DKjEQ== X-Received: by 2002:a05:6402:2792:b0:57d:10c:6c40 with SMTP id 4fb4d7f45d1cf-58e59265efdmr6682729a12.7.1720345474504; Sun, 07 Jul 2024 02:44:34 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6402:1c0b:b0:58b:ea63:24e8 with SMTP id 4fb4d7f45d1cf-58e249e3c07ls1431688a12.2.-pod-prod-04-eu; Sun, 07 Jul 2024 02:44:33 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVJQhFswKkXRBNAvUQKKQod0td8FSKV5jxwfuQ+tz5f7oeNCl5XL4dQ7dAWFlHI9tqzslVjSM8BteAMCZSAXPpdcg6kuajDldosYkZ9MTKhKFPW X-Received: by 2002:a17:906:7704:b0:a77:c96b:a113 with SMTP id a640c23a62f3a-a77c96ba1b5mr403477466b.60.1720345472996; Sun, 07 Jul 2024 02:44:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720345472; cv=none; d=google.com; s=arc-20160816; b=qkvuJgBIVpZqQ/m1scVJbADdeG3JlsPx9PGnbuEXw4ukACPw7LkVyK4uP8m8LznNFJ 4ljmpmwkyHDvlDTLCQb/xHNvqvIAets+iXZueYG3y6r42mYaVMSyQavmsIsfjxRnim+d cVR9DagnGe6HQ9JoImJSQGxwb7z/8Iv6Ec3MJIerM0OaXWnSN+jGwY3xNV5DaV8w8Dy+ JwFo1Ko1KgmRK9SFHJceQL9ZhE6Rz8m/Zd8WF2ZOmpL2s8Br8cDExzVyQkw4EbmG9Oad eVtyrVFuWXrta8S3tgdSGRAOOc3SDxhRR649eEVmmayQlwerpZ0cfHTStNVc+1Ak+ZFJ i08g== 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=ZrQJDVTuPxid+8voWrGcuSnq6KL+5Zri3uUcQBoAvQw=; fh=bUGfE1BFGQFZSYLxyGvAgsu4Asll/a0+JjffJk2VoNw=; b=u33H94zjtAQU0XVzpOHdYz41XFwuFfL9NbWhOtyjld/OeBdzTheHswkGalZqZJc5dU 5ALjSA0568HLBoBHEniQxRfZD6aucyuiVGaO4Pljc7yNZ8h38zFVoWnhw9Lw3ZFvaDen sk8mF//n6SHFVRH8SlQQDJLo9Sndx8YagvGBDLzrhDvjkFjtdcycGnbpIhbY78/c2g6m jh80P/OGMdJ4j5fXfW7mo01spl6RyNALAJ+dFaOMYhI6wThMF4yJqapx/Dy9GMsthQkK wmoTtKrAamCAXZhO90g0Q/gcVZttsBj9Rr8AGoXsFQ3o2C+DFHUxK1OiZfAy3XLYTH8U ytZg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=atdlfBV2; 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-a77e64b79f8sor45914566b.12.2024.07.07.02.44.32 for (Google Transport Security); Sun, 07 Jul 2024 02:44:32 -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; AJvYcCUM7VoPnez6C66a1Y+jXYzM9WHdf8tDRW4IwiBlekbQYzgdPyhjXYQ/OQJf6obxwBkF2OFdm9W8fRk2CLeS+i6PySeqHqyJ4xrM6xfOAaowFk1b X-Received: by 2002:a17:907:684:b0:a77:c3b5:9e5d with SMTP id a640c23a62f3a-a77c3b59f8cmr554826466b.47.1720345472469; Sun, 07 Jul 2024 02:44:32 -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-a77d2d1ff2bsm190230066b.155.2024.07.07.02.44.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Jul 2024 02:44:32 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: Lionel Orry , linux-amarula@amarulasolutions.com, Dario Binacchi Subject: [PATCH 1/1] package/mongrel2: update the patches to be applied with fuzz 0 Date: Sun, 7 Jul 2024 11:44:28 +0200 Message-ID: <20240707094428.3947165-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=atdlfBV2; 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, mongrel2 fails to build with output: Applying 0001-Do-not-run-tests.patch using patch: patching file Makefile Hunk #1 FAILED at 16. 1 out of 1 hunk FAILED -- saving rejects to file Makefile.rej patching file tools/m2sh/Makefile Hunk #1 FAILED at 9. 1 out of 1 hunk FAILED -- saving rejects to file tools/m2sh/Makefile.rej Applying 0003-fix-build-with-gcc-4.8.patch using patch: patching file Makefile patching file tools/m2sh/Makefile Hunk #1 FAILED at 10. 1 out of 2 hunks FAILED -- saving rejects to file tools/m2sh/Makefile.rej This commit refreshes the package patches on the current package version. Signed-off-by: Dario Binacchi --- .checkpackageignore | 1 - package/mongrel2/0001-Do-not-run-tests.patch | 16 +++++++++------- .../mongrel2/0003-fix-build-with-gcc-4.8.patch | 10 ++++++---- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 0a1d2627455e..b0cbe4032487 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1027,7 +1027,6 @@ package/mongodb/0001-ssl_manager.cpp-fix-build-with-gcc-7-and-fpermissive.patch package/mongodb/0002-src-mongo-db-exec-plan_stats.h-fix-build-with-gcc-11.patch lib_patch.Upstream package/mongrel2/0001-Do-not-run-tests.patch lib_patch.Upstream package/mongrel2/0002-Fix-Makefiles-for-cross-compilation.patch lib_patch.Upstream -package/mongrel2/0003-fix-build-with-gcc-4.8.patch lib_patch.Upstream package/monit/0001-no-force-static.patch lib_patch.Upstream package/mono-gtksharp3/0001-Fixes-MONO_PROFILE_ENTER_LEAVE-undeclared.patch lib_patch.Upstream package/mono-gtksharp3/0002-Mono-compilation-error-branch.patch lib_patch.Upstream diff --git a/package/mongrel2/0001-Do-not-run-tests.patch b/package/mongrel2/0001-Do-not-run-tests.patch index 4a75a470b458..3b72aef3c584 100644 --- a/package/mongrel2/0001-Do-not-run-tests.patch +++ b/package/mongrel2/0001-Do-not-run-tests.patch @@ -7,6 +7,8 @@ This patch is specific to cross-compiled environments and avoids running the tests on the host. It is not meant to be applied upstream. Signed-off-by: Lionel Orry +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- Makefile | 2 +- tools/m2sh/Makefile | 2 +- @@ -16,22 +18,22 @@ diff --git a/Makefile b/Makefile index 7dc4089..ca72630 100644 --- a/Makefile +++ b/Makefile -@@ -16,7 +16,7 @@ TEST_SRC=$(wildcard tests/*_tests.c) +@@ -18,7 +18,7 @@ TESTS=$(patsubst %.c,%,${TEST_SRC}) - MAKEOPTS=OPTFLAGS="${NOEXTCFLAGS} ${OPTFLAGS}" OPTLIBS="${OPTLIBS}" LIBS="${LIBS}" DESTDIR="${DESTDIR}" PREFIX="${PREFIX}" + MAKEOPTS=OPTFLAGS="${CFLAGS} ${NOEXTCFLAGS} ${OPTFLAGS}" LDFLAGS="${LDFLAGS}" LIBS="${LIBS}" DESTDIR="${DESTDIR}" PREFIX="${PREFIX}" -all: bin/mongrel2 tests m2sh procer +all: bin/mongrel2 m2sh procer filters config_modules - dev: CFLAGS=-g -Wall -Isrc -Wall -Wextra $(OPTFLAGS) -D_FILE_OFFSET_BITS=64 - dev: all + ${OBJECTS_NOEXT}: CFLAGS += ${NOEXTCFLAGS} + ${OBJECTS}: | builddirs diff --git a/tools/m2sh/Makefile b/tools/m2sh/Makefile index b50d8a0..334e4da 100644 --- a/tools/m2sh/Makefile +++ b/tools/m2sh/Makefile -@@ -9,7 +9,7 @@ TESTS=$(patsubst %.c,%,${TEST_SRC}) - LIB_SRC=$(filter-out src/m2sh.c,${SOURCES}) - LIB_OBJ=$(filter-out src/m2sh.o,${OBJECTS}) +@@ -12,7 +12,7 @@ + + $(RAGEL_OBJECTS): CFLAGS += -Wno-unused-const-variable -Wimplicit-fallthrough=0 -Wno-unused-parameter -all: ../lemon/lemon tests build/m2sh +all: ../lemon/lemon build/m2sh diff --git a/package/mongrel2/0003-fix-build-with-gcc-4.8.patch b/package/mongrel2/0003-fix-build-with-gcc-4.8.patch index eebfce048780..996cd3246b78 100644 --- a/package/mongrel2/0003-fix-build-with-gcc-4.8.patch +++ b/package/mongrel2/0003-fix-build-with-gcc-4.8.patch @@ -15,7 +15,9 @@ Fixes: - http://autobuild.buildroot.org/results/de324b733e09057c87352220069fe65f6e535eb8 Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/mongrel2/mongrel2/pull/354] +Upstream: https://github.com/mongrel2/mongrel2/pull/354 +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- Makefile | 1 - tools/m2sh/Makefile | 4 ++-- @@ -37,16 +39,16 @@ diff --git a/tools/m2sh/Makefile b/tools/m2sh/Makefile index 83e7ae4..86364af 100644 --- a/tools/m2sh/Makefile +++ b/tools/m2sh/Makefile -@@ -10,7 +10,7 @@ LIB_SRC=$(filter-out src/m2sh.c,${SOURCES}) +@@ -10,7 +10,7 @@ LIB_OBJ=$(filter-out src/m2sh.o,${OBJECTS}) RAGEL_OBJECTS=src/lexer.o src/cli.o -$(RAGEL_OBJECTS): CFLAGS += -Wno-unused-const-variable -Wimplicit-fallthrough=0 -Wno-unused-parameter +$(RAGEL_OBJECTS): CFLAGS += -Wno-unused-parameter - all: ../lemon/lemon tests build/m2sh + all: ../lemon/lemon build/m2sh -@@ -20,7 +20,7 @@ dev: all +@@ -20,7 +20,7 @@ install: build/m2sh install build/m2sh ${DESTDIR}${PREFIX}/bin