From patchwork Tue Jul 2 13:36:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3148 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-lf1-f69.google.com (mail-lf1-f69.google.com [209.85.167.69]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 632B63F102 for ; Tue, 2 Jul 2024 15:37:01 +0200 (CEST) Received: by mail-lf1-f69.google.com with SMTP id 2adb3069b0e04-52d174e26basf5782695e87.2 for ; Tue, 02 Jul 2024 06:37:01 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1719927420; cv=pass; d=google.com; s=arc-20160816; b=WKIHzG/e+BJKf7AyQSg/sJnXEhGCu1xb8IAzbUhR5JgLmvxulXshe4KHbXFg3AJG8b 4IIDPgn9CVaUCG/DN/ihX8aUBIy2/UC6AkZsdulXQENcL5Wfgtiqb/7PsTcbZ9toVwKK tl0h/zv704X1MoU6WcuVuD2NkhtJvR0lE3cEcFk8hTTgdT7813C+z9J8kU+/AW5Ch8ZZ rP4RJNWc27PxCSo+cbXH5mHDW3XHRvlw4a4GbNwfGr/BwWGzqEiWYzTptjXqyTh4XKAr I4V4zRa1sw+o0wLw1DM8ZSR8P8LJFwIKqWxOj++LiCGshxhWxfzHIAfoFOwxb8ehF3yK O0Cw== 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=ygOb2NEJvnCjsHsHsHnRWarXLA34X8QSdQ8XUqbJ0Tg=; fh=GBV74lKd2QgpECnAZlzNVLWYRsyEpFsoIYEJnJpECZs=; b=cX2vHswjNVuNa9AjW1m7kuToQRvXrGEjsz/9Q7mGrssHuuhQrvOK34XKnG/sqrAYLg ZLkGod4+LGXvnpbh+aMvGbiBddLxpb7aPuad6vw2VScaA5Gsm5g5JAjSUWOr+ShrOk6U 7T0RFwhxG5PowfK6zqxxsdkBsChF4d5C21A2kZ1Lz/93fPGPBDHu8bUx+vz1iRKzHOA7 UB8bDYI7krWEOmPUFAGDrbz4n0wU5ha7GRQfkcdWcwF3Njq1pwFNzMQFyVpoU8MIxC8d 2fjXUxSWtVRvZDciEemchkQEVhWl6/GpKOtyrrbhYG6WCsor7hd6vyvrnDnTosxsHDf2 Rgjg==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=jP8iipmg; 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=1719927420; x=1720532220; 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=ygOb2NEJvnCjsHsHsHnRWarXLA34X8QSdQ8XUqbJ0Tg=; b=jh+0orn2qAtC276o6dUMZIcKsOjFywr2xRnYK/EwB0aLYH47GojAd70YX7Welt4H9X KJ69EcUl4llKLCwyze+8hu2coVvTGMZX/o1Gp2z0k02jHJTEO+v5mTb4Ghipcdkev+T6 spw8gSZzNSuJ96BFnoJAADnJW4FJziG0s1R3g= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719927420; x=1720532220; 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=ygOb2NEJvnCjsHsHsHnRWarXLA34X8QSdQ8XUqbJ0Tg=; b=EZS/qVEvUP1xWDCMeTvMghfwqfe8/y7EfGrNJAempQr/pTLmvbfUf0CuaGQgdyyYjG u4W4glGthIPyBOfGIPU20YeSKVCoU8a1q7E8qBNXuj5r4yu0ICIJFYesQBHxp3Y41G7m 2qzJuqPB8kT1KNuLszT3cxfsY+MXfT13u++LTIxXKRep2FKZoUg2II0LzkIrqzEK1+Sd SSubwoSTgXtDO0cZxoRt6RN1tJp4RX2oLaD9MfswyVzw1Z2WZdSSdPlQv8uSIlIHs19t QEOGetX9aFxBFZaN7I1r5QkPiVh6VRRQsL6jGzciNTOLrx/cVoxUlyuawxydyXeIF0UK ADVw== X-Forwarded-Encrypted: i=2; AJvYcCUpz4H1a3mBvHaPPXcUB9Lk2VrwHrsKYVrvZ9eFfoEhdyCplXZsWeYWchVm6eNwtbRHA/P6eikraK37E74wkLtzOdqbSgtTuA/Jd5Ny3tVdyIbI8AyBm2XH5aR3MQ== X-Gm-Message-State: AOJu0YzGkCx/3scQKn5kEpTI5CXlx7mXm2Pqh7jCT9Zh/kmXmMbexjuD CB6j7TBy5dm3hqelfZplSxrNE3Jp80Kp2DRPDpsiGu0Xrfouhs+YDgfI2gBrdayLsw== X-Google-Smtp-Source: AGHT+IExDjqwEjHjyv3YiR9akeCVH6jzXwisNUaua3WjgePwJqoNCJR5qSZqGWPrFrOtYPqzEr5kkQ== X-Received: by 2002:a2e:a910:0:b0:2ee:7740:aa74 with SMTP id 38308e7fff4ca-2ee7740ac42mr13318141fa.3.1719927420621; Tue, 02 Jul 2024 06:37:00 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a50:fe98:0:b0:584:b54c:52ad with SMTP id 4fb4d7f45d1cf-586454a3629ls2349189a12.1.-pod-prod-07-eu; Tue, 02 Jul 2024 06:36:59 -0700 (PDT) X-Received: by 2002:a17:907:3d8f:b0:a72:4bf2:e16 with SMTP id a640c23a62f3a-a7514463114mr712502366b.16.1719927419136; Tue, 02 Jul 2024 06:36:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719927419; cv=none; d=google.com; s=arc-20160816; b=DUr8m4RjlfRqxYBMe2u8yaT9o29p7ovBJXWLrEu7valkdBE3dtjxw6pHK4Uh0VD74A 3h3OXWNe7Ppo2HK+BhDBZA4kihdOePDGb/KrhZU7CF9Ap6B/lNYK9WlIArHREFHg+hAm anCR5WVCgDm8CeL8Ataf2B409LS5fA2jk0D+X7QmFXvtt7Tt3dFH7X1OPfDmp4nyrVJ5 4McVgDJOlhqsFNokJ1zYHDG3dybSdEU1lJKCojy+pFhH301fv+is5waO8V7v7ImXGMHP TyFiR6vNVOdp5G/9dejFGcDDfMt0+JAd/OMBW8AoMVm4sZCR5/iKFrSOtlkckyhNno6b MpVg== 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=RbHbI1zNnqYcLnXh1sEPUzA1ZrKBZdzCCVBQ3z3nkkY=; fh=4aH47D1o6z03SLGX3S5iBqzHxVYI/WCfhxxmm+dgjk8=; b=uu9Fva4k9BeMOV5RPTdexAPsdn51uO+b2Bu++oumNI0F9NMYG/NjHppbg6nIK+MZO4 dILkgz8/3+2mfU16oa04HDwqtRDd7ZOXPe/yCHuF5ozlaLYhMlcWMTZDXZq01mLFPPSJ q8r7rsHAk0Br691c0sppQeFN4DPRbxn253gPVHp+KA+u/bddKUpaFaHqLHlrG+UDyRKf EbBBzccWDsMA/P2pk1p0RZmGDbh6N+fCDRID5yEqfnzs4qImv7B5cyMRcYffs0eWBMdc q6nkT+FfP21R9YCPaNuTwZa6qTX5ca5/TMjzfNh4cNDBDI2YHZpLjv32xP4ZjQFzOTk5 T39w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=jP8iipmg; 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-a729d82f2e3sor346309766b.10.2024.07.02.06.36.59 for (Google Transport Security); Tue, 02 Jul 2024 06:36:59 -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:13c1:b0:57d:4bd:7315 with SMTP id 4fb4d7f45d1cf-5879f4a5f03mr5549439a12.20.1719927418620; Tue, 02 Jul 2024 06:36:58 -0700 (PDT) Received: from localhost.localdomain ([2001:b07:6474:ebbf:c733:f73f:670d:ca47]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-58614f3d51asm5682813a12.81.2024.07.02.06.36.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jul 2024 06:36:58 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: linux-amarula@amarulasolutions.com, Dario Binacchi Subject: [PATCH 1/2] package/libmad: update the patches to be applied with fuzz 0 Date: Tue, 2 Jul 2024 15:36:54 +0200 Message-ID: <20240702133655.2425922-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=jP8iipmg; 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, libmad fails to build with output: Applying mips-gcc4.4.diff using series: patching file fixed.h Hunk #1 FAILED at 297. 1 out of 1 hunk FAILED -- saving rejects to file fixed.h.rej The package applied the patches in two steps, first the local ones and then the official ones downloaded from the repository. The commit fixes the issue by reversing the order of patch application steps. Signed-off-by: Dario Binacchi --- package/libmad/libmad.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libmad/libmad.mk b/package/libmad/libmad.mk index 084a533cc00c..9f3396b1a4e8 100644 --- a/package/libmad/libmad.mk +++ b/package/libmad/libmad.mk @@ -19,7 +19,7 @@ define LIBMAD_APPLY_DEBIAN_PATCHES fi endef -LIBMAD_POST_PATCH_HOOKS += LIBMAD_APPLY_DEBIAN_PATCHES +LIBMAD_PRE_PATCH_HOOKS += LIBMAD_APPLY_DEBIAN_PATCHES # debian/patches/md_size.diff LIBMAD_IGNORE_CVES += CVE-2017-8372 CVE-2017-8373