From patchwork Wed May 22 07:02:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3121 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 8C8693F9F8 for ; Wed, 22 May 2024 09:03:07 +0200 (CEST) Received: by mail-ed1-f69.google.com with SMTP id 4fb4d7f45d1cf-574ebea4810sf721323a12.0 for ; Wed, 22 May 2024 00:03:07 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1716361387; cv=pass; d=google.com; s=arc-20160816; b=pAmHQEpu/+rgMRcLcjxSW2eiD8m3M4Jqw0dUADt0YlDy/PMNZXpI50WrcBQqvmhkNw nef1HxpWTSEIP8St+OC0XwGMbnpbj/EPoNvY2a8muoOrom+zbdveDSkIBFcuEM0Y5C2O gF3flDc/DG0/8YF+Dbq3EKeZNNnOxMd6rxI2V1g1UZfhnkAgJOpZ2Fj3QK44XIBOMfgO 9i+jNq2hWAKSf0QftEp1G7+nYADkaDvGEXV5IR9DhjfnbOTb80agyPU+9LPsLRJXv6gR BQyGhYzJAXR2DpO44u8gxwRsW6MUWl/FPSk29KKVWPR/e277kG5cjBUTAm+GjmZTdLC4 7KRA== 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=yXEOK6uLfLZ6Xk7IcvFx3NL5ccBvYD4kLcnjqoFkh0Q=; fh=C5uVPTSb4KXGbcfgDGCezeen5apvleb0eYUaRmwSMJ0=; b=wfp6K+sXCjvNz6BViMN4jcdPpceY66rfnvYqeEBTltPIH+Sc2U9hXlZMorY5iaV14l d+rRWCaDoNyBXZfH4/yy/hQy3zFJsQ2pP46fgUQJQNCWLQj0MqG9XQt6ADPfNGs2PdfU V8SLWGzmpz2UFmhTpvzqaq/+Kjxx7XRc0m17bXDiOoFyjjME8XbIjO0VvSLdS+cSxxfd ohoTg0reoFkXRkHs5cwIOhh6TRiEzJc6klCayY4zb37TcPpPHRfO/MyCQa4bmSm4WK5c 7Rwsk27e9yDolqqe1exRtUvniX6dvYhoNwvlyaxdD9cBIhexGPp6AlHRiLWs/yuuBeTn +vcg==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=FUX3oFS7; 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=1716361387; x=1716966187; 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=yXEOK6uLfLZ6Xk7IcvFx3NL5ccBvYD4kLcnjqoFkh0Q=; b=CYcauwDVbc/Vw0tA2EG/OkhE0eEaBbzW7nhwl0TPDDXUWQfb3yfr0XKoBN7Q2fAwAX 5XQs6ppDKekrhOVCtNlEMV1IJGPvJ5kHkdvv5IiXlmRXQu3lDrJs12e6UzTEBK5YSBm0 dDo0touvsTlMmTusV8491TK5VO2MGQyUOLocU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716361387; x=1716966187; 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=yXEOK6uLfLZ6Xk7IcvFx3NL5ccBvYD4kLcnjqoFkh0Q=; b=QmE/pfVgbtJyats5fS94tiLgfepGekrW6yFMRGFcO9I9kvnNUrvIRhY/cuEvG5fkxS 4SrvQs2z6eOc4V+yc7qohFpQ+KFpmA98JDUceLsI37u1OEd1aRbBOu9lzj4BHOlaewEQ 3QeaGsZtXjgX3CV+UNMCAVyNMsEGPTzZjlxQt1grBkK5d89oX16xcy8nvXHmjCpMXNmI Qj45w+d2fgYwpzXfCsukPtEWlemFuWsc/yClJ++0E37/vxItLYUjm47w62YStTrQr7kJ TyIbgvBwPDppoBvR3IubFwK8fYDqXfNknPfEUFGzczVq/Qs0CG4vc5DETYOh5oJ9137f pC8g== X-Forwarded-Encrypted: i=2; AJvYcCVCV3Zs8qgAg9r89sFjZ5bDaiMWD2mKVOpOwHkHEVGwrAiS60yIEXSlt98cuQVqu/aVEmKfbhauPn4EPsRyeAsUA69qRqppaPNP37sJwO3ROXIGKck4r2TUx5emdQ== X-Gm-Message-State: AOJu0YxtCc+eDbJ6+MtU54KgFrAn600Y+9abpLeSlDXlXIT3yL357X6Y wu7PHItQv8DR0Oxmdx4h+nUuDD94ei/qjuVcWWvrREwgF2mCWApzcAqMEIlSfDlNtg== X-Google-Smtp-Source: AGHT+IEZwjg1uLHsIxouQzimrCIIu32fdtZXKBbcxQFQdVF2gjv5VhaQdo+tvjJyCkpCHsr2gN8acw== X-Received: by 2002:a50:b403:0:b0:572:3eaa:a637 with SMTP id 4fb4d7f45d1cf-57830ff935bmr1008589a12.2.1716361387300; Wed, 22 May 2024 00:03:07 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6402:401b:b0:572:3ac4:56ed with SMTP id 4fb4d7f45d1cf-5783170aeafls399661a12.0.-pod-prod-00-eu; Wed, 22 May 2024 00:03:04 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWjdXxQyhKDgN1vH/yjJzOoIhVyMbeTz/beJdWAbhNp2KS+bE0GOZfSRYQIUyR8scRhb1HUj4DvTQb9iWpVgFYquLQF4NeI7oP3bNh7sqCXNyP0 X-Received: by 2002:a50:f688:0:b0:572:b83e:e062 with SMTP id 4fb4d7f45d1cf-5752b3f8af6mr10240297a12.3.1716361384274; Wed, 22 May 2024 00:03:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716361384; cv=none; d=google.com; s=arc-20160816; b=J9CmLPECmpYc3nIQgIyGN+FTlXGM24T4cD0FrjZe1pGPPHFGXfPNe3tKLkZ2amMU41 Co3VPoS3n7eG8iPjldMdWCYYHGkGxOEjObZWaj3p6+FfCBTliXGJP3cEUIwGJXEbCLNZ P84++eRgrfKkF65c3LCSQJjv3QJwWevWzaMTxrIWaEyMhFC1xYDC0MWmE5w7CE7inn2H rwt+dbZmfV7wyUq3Y4xnTkfe70yloabuSDywHlE86WU37ILO16al8MxVMNsGTrYzwIXy L55Q57ZRpeKZM0L0eKaIzvM4UnI5szfS4TYwnoDMq80QrOHUr5guCHeLVmmiAZJGS5cd zQTg== 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=rhiNHItkijNRPeVxpSDRlbAOxb5bR9vieWyhJ5y9ntw=; fh=0HzXXd9ikwqzrwpDW5QeKP7ZwAWycbCHzfbccnOo2Iw=; b=Du8YVPjjj0u1gSAy3sLjPTWe7pWU0qo96Vc6GnJZAbrCHczy+6OSOYfryACmJknbX9 tDjCCGWKoNKqdpaQNY1PRggDLvYrZ3htr027+sd3nsaqf8QrTbiEs/kpgFlBIrcbIu2g 0zs6BZcrUB9ZVnN+X2ZKDK/U077SqHzGZkSWgI4oYc13wxy0j8/ltBNmkK2j5bhWm252 waPfQNLOriS44SgVXnHx2NU39JWckhkROMS0gWQ9RD3ufnCuxT1JMhKycffdcxIgy2bK g2FwAaKEWWlmt9zLcYIsSEzweuaIB4iOF1AZEqS8bYtyqDHcNUbickU5P72ClZvl116D TNUg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=FUX3oFS7; 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-5733baba2efsor11241452a12.2.2024.05.22.00.03.04 for (Google Transport Security); Wed, 22 May 2024 00:03:04 -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; AJvYcCUGBChW4aMfbpXTwDQZdHVrQ066M61ia0fNNjgwyJbf4eqWTNeve7AD4rF/Fq9HdmyE4pzczbWuKu05sbc+Hn4F8YcPMv/WfNDTJXxbXONpLnjJ X-Received: by 2002:a50:c18a:0:b0:572:7d77:179d with SMTP id 4fb4d7f45d1cf-5752b43230fmr9196600a12.5.1716361383901; Wed, 22 May 2024 00:03:03 -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.03.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 May 2024 00:03:03 -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 12/18] package/libopenssl: update the patches to be applied with fuzz 0 Date: Wed, 22 May 2024 09:02:31 +0200 Message-ID: <20240522070238.3282121-13-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=FUX3oFS7; 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 --- .../0003-Revert-Fix-static-builds.patch | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/package/libopenssl/0003-Revert-Fix-static-builds.patch b/package/libopenssl/0003-Revert-Fix-static-builds.patch index 149ad54fc53f..b4b78c97fc49 100644 --- a/package/libopenssl/0003-Revert-Fix-static-builds.patch +++ b/package/libopenssl/0003-Revert-Fix-static-builds.patch @@ -1,4 +1,4 @@ -From 847a7b744e31b9f57d2a3de495187db1dc0ee6d7 Mon Sep 17 00:00:00 2001 +From a048522f64dbbe90cf77aea0c3f47cccdad50742 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 21 Jul 2023 19:30:40 +0200 Subject: [PATCH] Revert "Fix -static builds" @@ -8,17 +8,19 @@ This reverts commit cfd7225fbb9507b2e443a494459bdaab5236d29d. Upstream: https://github.com/openssl/openssl/issues/14574#issuecomment-817209126 Signed-off-by: Bernd Kuhls +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- Configure | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Configure b/Configure -index 2c17f4186b..94cab4c3c4 100755 +index 2a5e58805c3b..0e8c1ce5cc74 100755 --- a/Configure +++ b/Configure -@@ -1377,10 +1377,6 @@ foreach (keys %useradd) { - # At this point, we can forget everything about %user and %useradd, - # because it's now all been merged into the corresponding $config entry +@@ -1466,10 +1466,6 @@ if ($config{prefix} && !$config{CROSS_COMPILE}) { + unless file_name_is_absolute($config{prefix}); + } -if (grep { $_ =~ /(?:^|\s)-static(?:\s|$)/ } @{$config{LDFLAGS}}) { - disable('static', 'pic', 'threads'); @@ -27,7 +29,7 @@ index 2c17f4186b..94cab4c3c4 100755 # Allow overriding the build file name $config{build_file} = env('BUILDFILE') || $target{build_file} || "Makefile"; -@@ -1671,6 +1667,10 @@ if ($strict_warnings) +@@ -1764,6 +1760,10 @@ if ($strict_warnings) } } @@ -39,5 +41,5 @@ index 2c17f4186b..94cab4c3c4 100755 ? @strict_warnings_collection : ( $_ ) } -- -2.39.2 +2.43.0