From patchwork Wed May 22 07:02:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3117 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 8BDFE40F8A for ; Wed, 22 May 2024 09:02:59 +0200 (CEST) Received: by mail-ed1-f72.google.com with SMTP id 4fb4d7f45d1cf-572baf39435sf560824a12.1 for ; Wed, 22 May 2024 00:02:59 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1716361379; cv=pass; d=google.com; s=arc-20160816; b=wOTUtaJhL9ZN9F/YuMaLKLEmBJPrbYZ/jnTCDqkxQDddCxhiPgzIQXfU3j0pOff8rK opPukHc9yUOssTNyFHq/XkIFTPL6slV6t8he5N8sbxItwbg5v6PSspqq7gHoM+HQrumo W7HLJz0xcn+q78udnPPUUZY0+2DH/h0Fda5zfVC+SvW9eQnjsdsllL232mug8wocJRqd pzz/XttqOhOtunzyqTTGUWJkou2+QMJ9V9apZ+T+PQEd0/Je5rCOfsT4F0KjGcQlSxkw ve1/Swpv7kFrdmnVsG3vQ950cV0oNe3gahuN4MTqUTlj99bqBSAV/A2bgQLbHIQ496wH /hxQ== 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:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=dYPoSHAJMO253aiOEH7J/Fn/O/pcRc1qRYLJpCZJ4UY=; fh=xX0dL/qwAFtsXKOD4amIr8Z98pesZAdBetMs23TBH6k=; b=bSkj8oBoiC9+ymrDmWmJjun+3o1/GtIcgVny0X0pTsLbQpOzF5rMs4krtQOjLP/ai9 s7wG8doG/90v0VI2MZsYDLePAZdRsmWkH/8VvTdpyFc9OB0tXZXkHfn59LZyphN+NSEY EKaBL5Dd3r4l0YZ/UOd1TG8kF87DHYYKaYQJQ0IdCCiSC7cPt/Ykk9gB3jBsQwJHfeGC FbCkHUJ1rWjMRvbHUdZ1TvO2RTeAWwt0Fpu/X4AwVBw3I/hES1PY4H6bMunNt36i5iOd QlN4ZzihFciBArL+yGCTni6XPT/D0E6118qFkwqNTsgqyCrtMCTu/wumg5eCk62jxwEb lL7g==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=AiQAM6I5; 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=1716361379; x=1716966179; 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:references:in-reply-to:message-id :date:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=dYPoSHAJMO253aiOEH7J/Fn/O/pcRc1qRYLJpCZJ4UY=; b=AeJEmZoyBFU7nkOmzHWYMxZ2FcQ9aPIonRnAoo2RsgSrDmN5pXvbNuMzuzcqhtiTXn +0GKzyFOb65YSEnHsA2pmNMPUb7d14uKOd+EuzncC1GievFaUPl+szXD1dmJ8uQ0g6uK 5W8rQcmnCTgstWkLLKDu/ckbo9pzgZixACMHw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716361379; x=1716966179; 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 :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=dYPoSHAJMO253aiOEH7J/Fn/O/pcRc1qRYLJpCZJ4UY=; b=XNjyAPn0dmWz9REii2l4HW6u0N1uXml+07bxPW4u+qP9YrZoRC0erkSOZVkVtOoLI5 dA9nxpVxeJWxb4KbSVgFph3a9GtexiI8eaQaWPPwiu2JbeVPT4Vaceb3FJp/AolLkWZF 4lHir98dZ3wYR3x7+d8ZoKNrvVKWjUBP6gZb1caqW4rn2lnAXy2YJNa6lEW0JuwXcrU4 lpTb9UouWBVk0Sb6pNAc2zC9tNLcCbLO6vKZk3m9SzFb1ksXbVwZNjXi8lxoYl+gNpGx 4tZcGl6wDMELP/hfUiYwzXPGVi76GSQRFQ4PKjVpTh7ipujxm5JYKUR7dIso/2UCLZ6C 0Zdw== X-Forwarded-Encrypted: i=2; AJvYcCUqzOvgNfbffjfnC+NoXHA/gVgScfBAQZNouPh+9aa60sBo2dvALWwHbFYZepIZk3h1q3++DnuPyF6IMQYzDilqz+B5BHZQqVtf2RDnA4Y+27vMrkcfJ2gwSeaZ3Q== X-Gm-Message-State: AOJu0YxsEusjn6xFwQIkP0LFN5kMf8KKs+p7W56WrZH2MYq+GIqF2P/O QFW8uB3w70HXhQKm8Xv1gSHJmcbaVzB8LMzlal6bh71dM6q6/uzg8ozTAbEuwgo15avQMAjXiQ= = X-Google-Smtp-Source: AGHT+IHHPI45KsLCAfdSdx6n8H7kmWtoxmf2S0zmkwRdc6O4kx17GaRWCIc0xT8ThxcOeTuNczGVTw== X-Received: by 2002:a50:8d11:0:b0:574:ebf6:e37b with SMTP id 4fb4d7f45d1cf-5752b4748e1mr9576552a12.12.1716361379196; Wed, 22 May 2024 00:02:59 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6402:401b:b0:572:3ac4:56ed with SMTP id 4fb4d7f45d1cf-5783170aeafls399505a12.0.-pod-prod-00-eu; Wed, 22 May 2024 00:02:57 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXpHvn9ebm5IhKIDJWJq3+bUmlSd+Qn9wNdz0XxpZSL9LaL0/tMDC2il872yrNZQTN/OnUM8zZvqfYRItUjy5+ub4Ayz3dUmzVtrW4if9CL3SdV X-Received: by 2002:a50:8d5e:0:b0:572:2fdf:b965 with SMTP id 4fb4d7f45d1cf-5752b432b79mr10831486a12.7.1716361377498; Wed, 22 May 2024 00:02:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716361377; cv=none; d=google.com; s=arc-20160816; b=XiB7uG2vLeZMaVOTzbNHSh4IdTi1RA3tqBt6ezqDXsHj4nSBjRkODklQPP9saxVOfy 1YyKdvE/GEmhAbW9GrYandfsbExArUgEbWa+sY1v0wGRb7LGIbfpAXBUdwmTDk1PFXel Cmc2qirS37Nod2jgHaNLgUEeX7iP2CK3K3MjFOvMZbTn6x6neOTHD10TeEfn6lAnumVu ROgo5sByFFIjJk5aks/jhrNwWZj2fnIUwe1vQWH8OxqnvDyrKTIgTxzlcrI+ck1ynTmm RSDfPM9JHtvm/doPLtZDrD0AN23sw5KqDMcpy3uYIoQbagBGkFyPbFnftZMh+CQbTK+F cn3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=OHcUaBiXvjNpQjCcFcxDYSeACdn61ui6MlAbPKkbqrE=; fh=7gJjabwGg/GarOZdfA9jN0xxUCC6mAI6m3IdjgrNkHs=; b=gms6KUYY/J6/DLKrZEU7VhcWu6GahgczmlGWnF8ycRV8UPkaJAHcOMMLDlVb9aTXJZ /wGdTPS/YdlF6rAKXLzfpQ6QBt86/TfVcD+k50gPCV7o3LeZNy4WD+mtQ8fBX6goQZ9T m7i8W5KxO0pFsuSOI0Hh09ReGbGUDmV8tqbxeg79BUC1kEs8xn5qaqUptGMhTpavI/uf xS+F/bo3rhpbJGfdXVFFi6zQjaIaH9em+9qcwulCxbu42PA5OmQX04RdXvilOw61xRIx M6+sKbP2qcCiVUDwX8m7yQvwL9NdqlX+eZxNTf0mgorBTaqpQ4fG7pnidCLZ49iN35Cr iYTg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=AiQAM6I5; 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 4fb4d7f45d1cf-574ebfeaf6fsor6200414a12.5.2024.05.22.00.02.57 for (Google Transport Security); Wed, 22 May 2024 00:02:57 -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; AJvYcCWK0YPHXO83vHgOFWEGbwjybdTMUNDBOAxarsswIJmAXCXCTXIl8ipA8mBPytuZG9FyiMziOUO1MMbfcUT31HiPJ076lTmt1eYOKObnf0+yIAM3 X-Received: by 2002:a05:6402:22b9:b0:578:23a4:3c2a with SMTP id 4fb4d7f45d1cf-57823a43c5dmr3297217a12.0.1716361377180; Wed, 22 May 2024 00:02:57 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.amarulasolutions.com ([2.196.40.196]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-574d738c80csm12028365a12.81.2024.05.22.00.02.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 May 2024 00:02:56 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: "Yann E . MORIN" , Jagan Teki , Romain Naour , Fabrice Fontaine , Mahyar Koshkouei , Giulio Benetti , Michael Nosthoff , Alex Suykov , =?utf-8?b?TWljaGHFgiDFgXlzemN6?= =?utf-8?q?ek?= , Bernd Kuhls , Peter Korsgaard , Julien Corjon , Sergey Matyukevich , linux-amarula@amarulasolutions.com, michael@amarulasolutions.com, Dario Binacchi Subject: [PATCH v2 08/18] package/giflib: update the patches to be applied with fuzz 0 Date: Wed, 22 May 2024 09:02:27 +0200 Message-ID: <20240522070238.3282121-9-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240522070238.3282121-1-dario.binacchi@amarulasolutions.com> References: <20240522070238.3282121-1-dario.binacchi@amarulasolutions.com> 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=AiQAM6I5; 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: , This commit allows the package patches to be applied with fuzz factor 0. The fuzz factor specifies how many lines of the patch can be inexactly matched, so the value 0 requires all lines to be exactly matched. Signed-off-by: Dario Binacchi --- ...dd-targets-to-manage-static-building.patch | 18 +++++++++-------- ...veral-defects-found-by-Coverity-scan.patch | 20 ++++++++++--------- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/package/giflib/0001-Makefile-add-targets-to-manage-static-building.patch b/package/giflib/0001-Makefile-add-targets-to-manage-static-building.patch index ba8d426bea11..31d7542e60c9 100644 --- a/package/giflib/0001-Makefile-add-targets-to-manage-static-building.patch +++ b/package/giflib/0001-Makefile-add-targets-to-manage-static-building.patch @@ -1,4 +1,4 @@ -From 487407d722714f13e8a06d1a9d89f48a5738191e Mon Sep 17 00:00:00 2001 +From 409af8210f2256eed4d2c73083aa75975f03424b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 12 Jul 2019 12:20:38 +0200 Subject: [PATCH] Makefile: add targets to manage static building @@ -8,16 +8,18 @@ targets to allow the user to build giflib when dynamic library support is not available or enable on the toolchain Signed-off-by: Fabrice Fontaine +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi Upstream: https://sourceforge.net/p/giflib/code/merge-requests/7 --- Makefile | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile -index b2bf6de..111f52f 100644 +index 87966a96cd4f..4a93aace54b8 100644 --- a/Makefile +++ b/Makefile -@@ -91,13 +91,20 @@ LIBUTILSO = libutil.$(SOEXTENSION) +@@ -87,13 +87,20 @@ LIBUTILSO = libutil.$(SOEXTENSION) LIBUTILSOMAJOR = libutil.$(LIBMAJOR).$(SOEXTENSION) endif @@ -40,7 +42,7 @@ index b2bf6de..111f52f 100644 $(LIBGIFSO): $(OBJECTS) $(HEADERS) ifeq ($(UNAME), Darwin) -@@ -120,7 +127,7 @@ libutil.a: $(UOBJECTS) $(UHEADERS) +@@ -116,7 +123,7 @@ libutil.a: $(UOBJECTS) $(UHEADERS) $(AR) rcs libutil.a $(UOBJECTS) clean: @@ -48,8 +50,8 @@ index b2bf6de..111f52f 100644 + rm -f $(UTILS) $(TARGET) libgetarg.a $(SHARED_LIBS) $(STATIC_LIBS) *.o rm -f $(LIBGIFSOVER) rm -f $(LIBGIFSOMAJOR) - rm -fr doc/*.[17] *.html doc/staging -@@ -145,12 +152,15 @@ install-bin: $(INSTALLABLE) + rm -fr doc/*.1 *.html doc/staging +@@ -141,12 +148,15 @@ install-bin: $(INSTALLABLE) install-include: $(INSTALL) -d "$(DESTDIR)$(INCDIR)" $(INSTALL) -m 644 gif_lib.h "$(DESTDIR)$(INCDIR)" @@ -64,8 +66,8 @@ index b2bf6de..111f52f 100644 ln -sf $(LIBGIFSOMAJOR) "$(DESTDIR)$(LIBDIR)/$(LIBGIFSO)" +install-lib: install-static-lib install-shared-lib install-man: - $(INSTALL) -d "$(DESTDIR)$(MANDIR)/man1" "$(DESTDIR)$(MANDIR)/man7" - $(INSTALL) -m 644 $(MANUAL_PAGES_1:xml=1) "$(DESTDIR)$(MANDIR)/man1" + $(INSTALL) -d "$(DESTDIR)$(MANDIR)/man1" + $(INSTALL) -m 644 $(MANUAL_PAGES) "$(DESTDIR)$(MANDIR)/man1" -- 2.43.0 diff --git a/package/giflib/0002-Fix-several-defects-found-by-Coverity-scan.patch b/package/giflib/0002-Fix-several-defects-found-by-Coverity-scan.patch index f6816d07530a..77f21b402e95 100644 --- a/package/giflib/0002-Fix-several-defects-found-by-Coverity-scan.patch +++ b/package/giflib/0002-Fix-several-defects-found-by-Coverity-scan.patch @@ -1,4 +1,4 @@ -From a1c48b91cd1cf1e9bf7077709b69f4bfd4c4abc7 Mon Sep 17 00:00:00 2001 +From 7c3bce4add77944e5b479ef5da81ae7fd71a7e95 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 5 Dec 2023 16:38:48 -0700 Subject: [PATCH] Fix several defects found by Coverity scan @@ -10,15 +10,17 @@ Signed-off-by: Sandro Mani Signed-off-by: Adam Duskett [Fabrice: updated for 5.2.2] Signed-off-by: Fabrice Fontaine +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- - gif2rgb.c | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) + gif2rgb.c | 8 ++++++++ + 1 file changed, 8 insertions(+) diff --git a/gif2rgb.c b/gif2rgb.c -index d9a469f..02cea41 100644 +index d51226d65d3d..50c43ae44ee2 100644 --- a/gif2rgb.c +++ b/gif2rgb.c -@@ -170,6 +170,8 @@ static void SaveGif(GifByteType *OutputBuffer, +@@ -165,6 +165,8 @@ static void SaveGif(GifByteType *OutputBuffer, int Width, int Height, /* Open stdout for the output file: */ if ((GifFile = EGifOpenFileHandle(1, &Error)) == NULL) { PrintGifError(Error); @@ -27,8 +29,8 @@ index d9a469f..02cea41 100644 exit(EXIT_FAILURE); } -@@ -179,6 +181,8 @@ static void SaveGif(GifByteType *OutputBuffer, - EGifPutImageDesc(GifFile, 0, 0, Width, Height, false, NULL) == +@@ -173,6 +175,8 @@ static void SaveGif(GifByteType *OutputBuffer, int Width, int Height, + EGifPutImageDesc(GifFile, 0, 0, Width, Height, false, NULL) == GIF_ERROR) { PrintGifError(Error); + free(OutputBuffer); @@ -36,7 +38,7 @@ index d9a469f..02cea41 100644 exit(EXIT_FAILURE); } -@@ -187,6 +191,8 @@ static void SaveGif(GifByteType *OutputBuffer, +@@ -182,6 +186,8 @@ static void SaveGif(GifByteType *OutputBuffer, int Width, int Height, for (i = 0; i < Height; i++) { if (EGifPutLine(GifFile, Ptr, Width) == GIF_ERROR) { @@ -45,7 +47,7 @@ index d9a469f..02cea41 100644 exit(EXIT_FAILURE); } GifQprintf("\b\b\b\b%-4d", Height - i - 1); -@@ -196,6 +203,8 @@ static void SaveGif(GifByteType *OutputBuffer, +@@ -191,6 +197,8 @@ static void SaveGif(GifByteType *OutputBuffer, int Width, int Height, if (EGifCloseFile(GifFile, &Error) == GIF_ERROR) { PrintGifError(Error);