From patchwork Wed Jul 3 12:52:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3160 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 62C013F0E0 for ; Wed, 3 Jul 2024 14:52:17 +0200 (CEST) Received: by mail-ed1-f69.google.com with SMTP id 4fb4d7f45d1cf-58d7b8f1e1bsf276596a12.0 for ; Wed, 03 Jul 2024 05:52:17 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1720011137; cv=pass; d=google.com; s=arc-20160816; b=ePHZYfq/5S7qBx/3kd+7nCnvrY2pXuyx5JR+CX2fZpRNGux962TeFhs8acLwmct5c1 y6TZDpJqMU0yCffobIJ7FGVPqM+AMN6eJjMQTUfbN9WyJ4PV2RX9MfSbCqvDO2cwBtiR +U16On10qV+UQmAOjAA7QsD7M3GKvM4piHkSvYVw5CzV5Ymiqs7vptl3/y3TK/C695Ni afpCfnxt6dH4dp+JANwWZnyL/NsTbg8/LNhfT19k2soV8AVLDjHN3yM668LSymYM6D2+ vQfkJL/aR6szCdsW/6Bm7AkNlnREdjhR+evqbDPQdUZmzZr+FFi9HBk4J84CDGDP36XY xj8A== 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=iZwy3i4uHk9LahxI/jeTy01x8AoxRsaqvg3mlFatRRg=; fh=cpziZ9LhVqkmGGsqfVPImqI21+W9kwWM2oHVG9fKPxE=; b=PgFEv15cCJyWdYI3vcDveth1xMF2xq0D+G7+QDDHT2A0p2KAXGYakYaNfDx21AgECk ssNae7Q1zS4xY2XnCPCR1QvZAn4Vk6txA78Pp4ZzP7Hs67RM9awOcUeBwy8LIFz+P1ly qyO3F0GZET1GU2yKqGRvFlNzKPRyx0LZvPNRmSYe6py+FKEp3Uo5ECRgahTm/cIPVIaq uyUH8q+wo6ZY+YgOmjzp8ySuJEzyKPE7iKDjSUPh3MH1UjGJGz3U4ytL21743iE+Y+rq k8zDngYjFgBA3MpqFHQ7CM6/ROeg+YaiaDiMyRDX/oaFIji5hPUQHF2DCqb2cmFxmwKE fhcQ==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=glcH71g+; 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=1720011137; x=1720615937; 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=iZwy3i4uHk9LahxI/jeTy01x8AoxRsaqvg3mlFatRRg=; b=QrEnNgQ/nD4RBAHxznmaEYSJuK00vW4NoElCse7YN5xrhtUKu9nFIvjNDyGGzj5byf ZDbpk3wYheGjlJA87vt4A/AmL0PKNfINM9a1uIi3sevuwZOhMxdCuZ9ZBqWYkY3zW7TH gDsnk/4XwRGsUNpRZghhrsW4w+0rPTJshzE0E= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720011137; x=1720615937; 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=iZwy3i4uHk9LahxI/jeTy01x8AoxRsaqvg3mlFatRRg=; b=fcAAUsom2OWl/goa/QPC49j4CSt+l3Yf89mEE8sGYbaWOVYd8suXkDywuV4V6w6pFQ /GQrsSD6v6onja24RA2YA5XadUVxYeQNIAdPkXTpiyLdvs/6GWXZ+zC8P1F1eWAYx1Vt c60DZx7C9TXz1l9mSoyOM+AMh9gGppuDOhW11HkuAMoRJrfg+2NIIOPjQm+F3aTN69jx ZRozG441kJQUX2USWtcK6TH8EnahloEXJdEv39wckRFZ/zqKWHToMA6RDYPqgxtxSWRk cT6yFw0WiicVrIU/XHqMj2C1gs0cZbmaLj+z3NrnbMo6kk0wpFzG5WJFRhg8CN8oCnlf HvQg== X-Forwarded-Encrypted: i=2; AJvYcCUwa+H4sNK647HWn68oGYEPaFv58YhOZK1cBYW0yQE9+BJoXoT8vG48dMdB3tbYZZAgzqqgdfP451Ui2minO2ZKR2oymtJ9DZq5HMmT5duqZ4+1Z2mwSewBBHi+aQ== X-Gm-Message-State: AOJu0Yz6EEbRYHF/FxpQq+/Z42EMMk4mOpoMDupCSg2Co/9LZLjKz4Tn VxfmGZDHeo5XzRxhQ3Xx3rTxywY7N3Gyvok5GALECf4ZSGaTC6UbaNYcOl1Kb6KvPg== X-Google-Smtp-Source: AGHT+IEhzPXW43PvjazetJwTNo/M9GujLgZ/3zUs5TnHRuCIBi1bIb7TqKIaJw3xMSIROQZemGHIng== X-Received: by 2002:a05:6402:354e:b0:57c:603a:6b2b with SMTP id 4fb4d7f45d1cf-58ce64c4c0bmr1123804a12.21.1720011136619; Wed, 03 Jul 2024 05:52:16 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6402:10c6:b0:57d:1766:62e9 with SMTP id 4fb4d7f45d1cf-58628ffd4eals3845655a12.2.-pod-prod-00-eu; Wed, 03 Jul 2024 05:52:15 -0700 (PDT) X-Received: by 2002:a17:906:68ca:b0:a6f:996f:23ea with SMTP id a640c23a62f3a-a77a242b847mr110372766b.15.1720011134992; Wed, 03 Jul 2024 05:52:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720011134; cv=none; d=google.com; s=arc-20160816; b=t/mvEuZLTBAsaVn80pLeKlJHffXXFHAPguunOWMAZdcI0Dvd7TCPMhTsE6liX3N4SD iHNxS/Nsx1vMsHxI4aFfsPh7KAQvOYQYChLkZH6jFug2adBSc50P2q3od0Ffoh42G3UN P1PKdys2/okG1/tgkSLaPuoevnR9GTfjXs2TCh8mSh3LGt4u22CQEBsBIXKQAn0mrko1 2MkNf8xE/AGRuFdMZl+B2ViD1wa7qs7J/iJvR9CokplyYNcRK6vBhUMb+XTAxCexf7qC /FAcAL3TcdlI77SlS5o+UjsRNgWSjfH++NzC1mO4m5yhP7q2eDoGKGjGIytiKUbACB+I qxLQ== 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=RnxpwKc5ypWdjKfqxMNN1RbDU8PmpknfaZWcFc6NVmI=; fh=4aH47D1o6z03SLGX3S5iBqzHxVYI/WCfhxxmm+dgjk8=; b=CT2Ig+GlsRDcybpeeKY0/dyhmIMu2ryvnGIiybsqndFGCpOfOJcceZO0NexounXQMw H8h+JRtggjw3sqzQ0l+B0t7yJ1dsn1YlVbGySKvpbU08yj+nlIfRgXrbjK/TsnotkN5g pONiLJu8K7pyEPiXh+E6DGXsVjQulmJ3dW8aKHJ6T8LCHXBs0SMu6AMNKpQJDtSUqFvp AjwoKmvpNJcWA10tTNPWQYJBJk4iRkdI5xWpjpByfqV3iHHOYNIgPeWjBcsjzhxaIGdc y4J8rJl1UGJbNcC8cl4ahFLfrOoYDFXCHQC2VnTpY00ccNTgBoqXeHTzcNc3keV9vHzI rUxA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=glcH71g+; 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-a728844aa04sor40417966b.9.2024.07.03.05.52.14 for (Google Transport Security); Wed, 03 Jul 2024 05:52:14 -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:a17:906:2a91:b0:a75:3c1d:f9d1 with SMTP id a640c23a62f3a-a77a242b8c6mr113808966b.16.1720011134418; Wed, 03 Jul 2024 05:52:14 -0700 (PDT) Received: from localhost.localdomain ([2001:b07:6474:ebbf:1a37:2bf3:7cf8:1941]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a72ab0b341fsm507035766b.196.2024.07.03.05.52.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jul 2024 05:52:14 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: linux-amarula@amarulasolutions.com, Dario Binacchi Subject: [PATCH 1/1] package/libfcgi: update the patches to be applied with fuzz 0 Date: Wed, 3 Jul 2024 14:52:11 +0200 Message-ID: <20240703125211.2711735-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=glcH71g+; 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, libfcgi fails to build with output: Applying 0001-link-against-math.patch using patch: patching file libfcgi/Makefile.am Hunk #1 FAILED at 18. 1 out of 1 hunk FAILED -- saving rejects to file libfcgi/Makefile.am.rej Applying 0002-disable-examples.patch using patch: patching file Makefile.am Hunk #1 FAILED at 4. 1 out of 1 hunk FAILED -- saving rejects to file Makefile.am.rej This commit refreshes the package patches on the current package version. Signed-off-by: Dario Binacchi --- .checkpackageignore | 2 +- package/libfcgi/0001-link-against-math.patch | 4 +++- package/libfcgi/0002-disable-examples.patch | 8 +++++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index dca725345353..ca94fb56b092 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -809,7 +809,7 @@ package/libeXosip2/0001-src-eXtl_dtls.c-fix-build-with-libressl-3.4.1.patch lib_ package/libedit/0001-check-bsd-functions-in-libbsd.patch lib_patch.Upstream package/libevent/0001-Don-t-define-BIO_get_init-for-LibreSSL-3-5.patch lib_patch.Upstream package/libfcgi/0001-link-against-math.patch lib_patch.Upstream -package/libfcgi/0002-disable-examples.patch lib_patch.Sob lib_patch.Upstream +package/libfcgi/0002-disable-examples.patch lib_patch.Upstream package/libffi/0001-Fix-use-of-compact-eh-frames-on-MIPS.patch lib_patch.Upstream package/libfm/0001-modules-fix-cross-compilation.patch lib_patch.Upstream package/libfreeimage/0001-no-root-install.patch lib_patch.Upstream diff --git a/package/libfcgi/0001-link-against-math.patch b/package/libfcgi/0001-link-against-math.patch index efba67123e21..909a295bd617 100644 --- a/package/libfcgi/0001-link-against-math.patch +++ b/package/libfcgi/0001-link-against-math.patch @@ -3,12 +3,14 @@ Link libfcgi against the math library. Signed-off-by: Thomas Claveirole [Louis: rebase on top of 2.4.2] Signed-off-by: Louis Rannou +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi Index: b/libfcgi/Makefile.am =================================================================== --- a/libfcgi/Makefile.am +++ b/libfcgi/Makefile.am -@@ -18,4 +18,5 @@ +@@ -19,6 +19,7 @@ os_@SYSTEM@.c libfcgi_la_CC = @PTHREAD_CC@ libfcgi_la_CFLAGS = @PTHREAD_CFLAGS@ diff --git a/package/libfcgi/0002-disable-examples.patch b/package/libfcgi/0002-disable-examples.patch index 4a9916f02af8..ccd01c0ce03c 100644 --- a/package/libfcgi/0002-disable-examples.patch +++ b/package/libfcgi/0002-disable-examples.patch @@ -1,3 +1,5 @@ +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi Common subdirectories: libfcgi-2.4.0.orig/cgi-fcgi and libfcgi-2.4.0/cgi-fcgi Common subdirectories: libfcgi-2.4.0.orig/doc and libfcgi-2.4.0/doc Common subdirectories: libfcgi-2.4.0.orig/examples and libfcgi-2.4.0/examples @@ -8,9 +10,9 @@ Common subdirectories: libfcgi-2.4.0.orig/libfcgi and libfcgi-2.4.0/libfcgi diff -du libfcgi-2.4.0.orig/Makefile.am libfcgi-2.4.0/Makefile.am --- libfcgi-2.4.0.orig/Makefile.am 2001-12-22 14:05:39.000000000 +0100 +++ libfcgi-2.4.0/Makefile.am 2014-07-19 16:56:21.935216540 +0200 -@@ -4,7 +4,7 @@ - # $Id: Makefile.am,v 1.7 2001/12/22 13:05:39 robs Exp $ - # +@@ -10,7 +10,7 @@ + aclocal.m4 m4/libtool.m4 m4/lt*.m4 Makefile.in install-sh missing ltmain.sh \ + COPYING INSTALL -SUBDIRS = libfcgi cgi-fcgi examples include +SUBDIRS = libfcgi cgi-fcgi include