From patchwork Tue Jul 5 02:03:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 9839 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 00BEACCA47C for ; Tue, 5 Jul 2022 02:03:45 +0000 (UTC) Received: from mail-qk1-f180.google.com (mail-qk1-f180.google.com [209.85.222.180]) by mx.groups.io with SMTP id smtpd.web12.79646.1656986615273343720 for ; Mon, 04 Jul 2022 19:03:35 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=FfVHGAng; spf=pass (domain: gmail.com, ip: 209.85.222.180, mailfrom: akuster808@gmail.com) Received: by mail-qk1-f180.google.com with SMTP id o26so684942qkl.6 for ; Mon, 04 Jul 2022 19:03:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Gnq5bz9FgOafB2b+C5MT7qg1V+EFjsXK4K9QR7t3I8k=; b=FfVHGAngyICFsdXw3N+TlvYma6uSLuCPboXDokuE2YYBpWUbwgHuE5AZUVd6y0jCAC kxaBFthtSg5ZB7FjkBA/R3Rc88qhZLiaOLRLuZYq4HnxNqSPxa6ATIoaouYVTDTm1WKb 6O765iK5VgmyNH2+EdJY2V7IByEH9/UtZAdsovRUfU/j9Aj3Qh177gKKqWvi9HfTWbwX C1QTHlMAWj4LaSj6l38Aob239pANieG+178BGeOfgzutgAX95sljAOcrbfEHZGzgcXX7 5bA51eOfXZhaq+WMqG9ETyaVOAQB3z8WQCAZ8GPH1JFq9t2FEOoFMBeF3FDCPBQGI6qr RAzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Gnq5bz9FgOafB2b+C5MT7qg1V+EFjsXK4K9QR7t3I8k=; b=XdbUeUiOs7FipTL2qFgDPT6axwFR5bt9w7l/kiEcldZttz+k6CdF8cP52JfsMvEGP4 x2+Q0Jv6hhQZNIm+RKz6RzgeFzSdLKE4IWvi2FZZ9SA1CD9MVprrAixaeMkOY2Aw6kbk gxfjmFaRhngpHNgQzS/KxuSZEEIuAhNox8uR9R6a3bw2VYn4znihA2DxOVCAkZ+xUyvX xUZbEhWie+PhYJ72eLVYxsFUfuEPZu9c9y74/Hv8S1sbaa9vfY8m6fZH9IYhCrLDFnkZ 8Z9fhLCCyzzQU91mbCv6cWi1rJteTnHPvBNPATqbAAkHIWVFGOt+kYIEPLgumWQZ7SFo zu9A== X-Gm-Message-State: AJIora9GY9Wc4e6KMV9dQuj0BhwkX+CQDpoizVZM24d9D7wrZS5rF4V3 gXgr+drioJ2IyQlyI0TZNCGnTFNhA8k= X-Google-Smtp-Source: AGRyM1sgx4XrprQPmrd1+YzoeJC5OSBaEahSDmhSoAKXESEdspTSI44Eil/N7Ez1Fv68tACQDCboEg== X-Received: by 2002:a05:620a:4306:b0:6a9:7122:edb2 with SMTP id u6-20020a05620a430600b006a97122edb2mr22027345qko.502.1656986614079; Mon, 04 Jul 2022 19:03:34 -0700 (PDT) Received: from keaua.attlocal.net ([2600:1700:14b1:7390:8d3d:13ec:9f3e:a504]) by smtp.gmail.com with ESMTPSA id br14-20020a05620a460e00b006a6ce613c7csm21725220qkb.89.2022.07.04.19.03.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Jul 2022 19:03:33 -0700 (PDT) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Subject: [kirkstone 1/5] networkmanager: fix build with enabled ppp Date: Mon, 4 Jul 2022 22:03:25 -0400 Message-Id: <7040cffbb06b2ae0a03b5353b2698a5c5ead9172.1656986538.git.akuster808@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 05 Jul 2022 02:03:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/97696 From: Javier Viguera If 'ppp' packageconfig option is enabled, but the build system does NOT have pppd binary installed, the build fails with: | Has header "pppd/pppd.h" : YES | Program pppd /sbin/pppd /usr/sbin/pppd found: NO | | ../NetworkManager-1.36.2/meson.build:570:4: ERROR: Assert failed: pppd required but not found, please provide a valid pppd path or use -Dppp=false to disable it This is due to meson trying to look for the 'pppd' binary in the build system when it should not. If the build system does not contain pppd, the build fails. Signed-off-by: Javier Viguera Signed-off-by: Armin Kuster --- .../networkmanager/networkmanager_1.36.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.36.2.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.36.2.bb index 6c665d53bb..e3b1296a6b 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.36.2.bb +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.36.2.bb @@ -83,7 +83,7 @@ PACKAGECONFIG[bluez5] = "-Dbluez5_dun=true,-Dbluez5_dun=false,bluez5" # consolekit is not picked by shlibs, so add it to RDEPENDS too PACKAGECONFIG[consolekit] = "-Dsession_tracking_consolekit=true,-Dsession_tracking_consolekit=false,consolekit,consolekit" PACKAGECONFIG[modemmanager] = "-Dmodem_manager=true,-Dmodem_manager=false,modemmanager mobile-broadband-provider-info" -PACKAGECONFIG[ppp] = "-Dppp=true,-Dppp=false,ppp,ppp" +PACKAGECONFIG[ppp] = "-Dppp=true -Dpppd=/usr/sbin/pppd,-Dppp=false,ppp,ppp" PACKAGECONFIG[dnsmasq] = "-Ddnsmasq=${bindir}/dnsmasq" PACKAGECONFIG[nss] = "-Dcrypto=nss,,nss" PACKAGECONFIG[resolvconf] = "-Dresolvconf=${base_sbindir}/resolvconf,-Dresolvconf=no,,resolvconf" From patchwork Tue Jul 5 02:03:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 9838 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 01B00CCA479 for ; Tue, 5 Jul 2022 02:03:45 +0000 (UTC) Received: from mail-qt1-f180.google.com (mail-qt1-f180.google.com [209.85.160.180]) by mx.groups.io with SMTP id smtpd.web11.79425.1656986616459016227 for ; Mon, 04 Jul 2022 19:03:36 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=aiTiQTP+; spf=pass (domain: gmail.com, ip: 209.85.160.180, mailfrom: akuster808@gmail.com) Received: by mail-qt1-f180.google.com with SMTP id ay10so11874353qtb.1 for ; Mon, 04 Jul 2022 19:03:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=xLHWIkuJbuLWPHScYrmZF8OikxJtfuytSlsBuq0wCow=; b=aiTiQTP+qKV8QToZZp+K9WuX3cYrojh5hgGRZbRJlDv1Q4WS1vL/ad9mzy2SiYxBpM 5/gHrmFoViPvCoS1lbp6UNfwvuU1u4K50SAprpjqU8t9QSSlr7RjUpqHLlxCdO2kLYPi PomEseWxwEcJNtJBu/i122LUSfTPzOzrAvXtGZgtg67Ce7CuoYDpkNjdTKVOaS4BI7sR Meme/+gBXUiVZ2l4ZivsHTIajKwDYz2g82YQS0abnDDYkxUUk716zxlTvhbysWtOHBHi UmkqbfBuEBwjnve7H58Q9fNdABdxj/OehonPqgV0E9RdAT91GgGESVSjpxyInAqc6lQX 9eJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xLHWIkuJbuLWPHScYrmZF8OikxJtfuytSlsBuq0wCow=; b=rqACVwbMoIDG+aUTt4lLTFM72TpwyYG/oWlptHJGnK32AMW50wZiTEo2V1yYAi8ZxF 26Y0cOdtDp3/1iyCnnYST+aUEQhaI6KI9Qev5NQoz7i4FCic2EIjdbceyhePM9JK9PWb KARwhc+HHiyoPdsEc6kLdwvXuzl0X9g5psbbNT9fWPJ80NrD8+JtEgjRMHqbukGOybbF ncVJxeEFNyVrrKvjJCpOD+cXxOvrCPkvXDWYVKmi99oFRasm+xHlx5KJs8YlO47YjyBq NET5NoFsPlhZOZ/GaaNmjZWG6BsLW89Bce+VueWf3av9XH78LY1dQGyU8EtpcVYocK7J TqQw== X-Gm-Message-State: AJIora+6vQmTRRfxPdfb56G4lXhAXXuCwuSSThTxV2oQFrifdkCy4LOu YkOizHRYTzYWpVC9IS0a7eYJNQQ+auk= X-Google-Smtp-Source: AGRyM1smWlLPGrJCoPlDZXCwGX8Z9Yl6PiIh1BB9Dxfx9ltsDlPNwsFBSMRnWxgKHihPTZNXkifv0Q== X-Received: by 2002:ad4:4d88:0:b0:470:46d2:5653 with SMTP id cv8-20020ad44d88000000b0047046d25653mr29756291qvb.115.1656986615101; Mon, 04 Jul 2022 19:03:35 -0700 (PDT) Received: from keaua.attlocal.net ([2600:1700:14b1:7390:8d3d:13ec:9f3e:a504]) by smtp.gmail.com with ESMTPSA id br14-20020a05620a460e00b006a6ce613c7csm21725220qkb.89.2022.07.04.19.03.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Jul 2022 19:03:34 -0700 (PDT) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Subject: [kirkstone 2/5] exo: upgrade 4.16.3 -> 4.16.4 Date: Mon, 4 Jul 2022 22:03:26 -0400 Message-Id: <6ff027e8d33414fe03fa41ae80c065a54c0cb1ad.1656986538.git.akuster808@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 05 Jul 2022 02:03:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/97697 From: Yue Tao To fix CVE-2022-32278 Upstream fix is: https://gitlab.xfce.org/xfce/exo/-/commit/c71c04ff5882b2866a0d8506fb460d4ef796de9f Signed-off-by: Yue Tao Signed-off-by: Armin Kuster --- meta-xfce/recipes-xfce/exo/{exo_4.16.3.bb => exo_4.16.4.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-xfce/recipes-xfce/exo/{exo_4.16.3.bb => exo_4.16.4.bb} (88%) diff --git a/meta-xfce/recipes-xfce/exo/exo_4.16.3.bb b/meta-xfce/recipes-xfce/exo/exo_4.16.4.bb similarity index 88% rename from meta-xfce/recipes-xfce/exo/exo_4.16.3.bb rename to meta-xfce/recipes-xfce/exo/exo_4.16.4.bb index 2b164442f8..b97d9943f4 100644 --- a/meta-xfce/recipes-xfce/exo/exo_4.16.3.bb +++ b/meta-xfce/recipes-xfce/exo/exo_4.16.4.bb @@ -14,7 +14,7 @@ SRC_URI += " \ file://configure.patch \ " -SRC_URI[sha256sum] = "722dff3c3fe23f0a65405e63889cf247c99d092d3f9fb16dec78d062cfb8fae6" +SRC_URI[sha256sum] = "82a50c67e78f1e5c420b7615515bcca759b86eeab99224ab8eca4306b89d2eca" # Note: python bindings did not work in oe-dev and are about to be moved to # pyxfce see http://comments.gmane.org/gmane.comp.desktop.xfce.devel.version4/19560 From patchwork Tue Jul 5 02:03:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 9837 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id F3F42C433EF for ; Tue, 5 Jul 2022 02:03:44 +0000 (UTC) Received: from mail-qt1-f174.google.com (mail-qt1-f174.google.com [209.85.160.174]) by mx.groups.io with SMTP id smtpd.web12.79647.1656986617834701547 for ; Mon, 04 Jul 2022 19:03:38 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=LFkf9HR/; spf=pass (domain: gmail.com, ip: 209.85.160.174, mailfrom: akuster808@gmail.com) Received: by mail-qt1-f174.google.com with SMTP id g14so11884589qto.9 for ; Mon, 04 Jul 2022 19:03:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=LAcu89e211xndPkhWxFXhziRuZrxBGRRkQwWgwTnjDc=; b=LFkf9HR/ZrNsHJ4Q1pxDApWJLLc37njS2hnLHILS87vh0gpg5VVUclNa6oqdaP+laS D9kPAe0ALAlMI1Nf2xRfWJb2uC1KXzEsbyBMM5LNmbjIvqcyAcLxXzkgovAfsV6Rq7fR VrcKRhGvAUA2SEcXewzMgfjoG8xP5BwJdWbSMFzZ7r8MRZFhgPxYwiQGGsmOdBxsRxjq Ar1v6eJ3afxeTX90fTjDw9RAkn0gQNf2vnffRkhrzlcubIsw2hQJRod6pHQB19/s6BL4 jh/HypXbxcPv/x21XdGuuZTQXJT9gz9NpHnYbk4vWJ+ztpTHfoU6LtmhgL7VNR8/oOXr 2+fw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LAcu89e211xndPkhWxFXhziRuZrxBGRRkQwWgwTnjDc=; b=EoXstHu8EgmOwjEsZR4NWceUYFl6q4TTQZhOyOIGJxViDa9C8AmmyQ4t+kITiD7hbr IN7EZyEAxhT6o3BENFRQSLPO+HYRFe8ElCDK4I7F/JC/VnpiZHQMgl+kDRZpVM9P0M58 yQeZIyWzHUugZ4BTE1h6EaL3SwYSiC2mQDq3B2o6Tc+hx4ePDQtMspfTc3NMrFuKjc6/ 8mGgly4TR+1CooyfLI7IGAny1+4c3auL4hXZxb5fdPDJejmtid/gtcItwqtQFoxH4sC1 IXhFAihy8+lnrYbZmLpbgh/oSlQQGc+VJWUjCHeBpNDiz6BCK7OwZeB1lZyCkBpE0PO6 s/Yg== X-Gm-Message-State: AJIora/w/Nq3aZGc6Z/LlgzYJvEN4cKz3tvu5liZdYp5NABEh67Kfpcp +6vz3j126anuaXYE1zXNh4okbeGWukM= X-Google-Smtp-Source: AGRyM1uTR6gkE3b3gQxyKBxO8yOnt09dzw6uYcyyrK7CZqpFfT9u0Ip8dNHv6ImmnqvOia5dBZrcog== X-Received: by 2002:a05:6214:19cd:b0:472:fdc3:9226 with SMTP id j13-20020a05621419cd00b00472fdc39226mr3921689qvc.81.1656986616548; Mon, 04 Jul 2022 19:03:36 -0700 (PDT) Received: from keaua.attlocal.net ([2600:1700:14b1:7390:8d3d:13ec:9f3e:a504]) by smtp.gmail.com with ESMTPSA id br14-20020a05620a460e00b006a6ce613c7csm21725220qkb.89.2022.07.04.19.03.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Jul 2022 19:03:36 -0700 (PDT) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Subject: [kirkstone 3/5] postgresql: upgrade 14.3 -> 14.4 Date: Mon, 4 Jul 2022 22:03:27 -0400 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 05 Jul 2022 02:03:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/97698 From: wangmy 0001-configure.ac-bypass-autoconf-2.69-version-check.patch refreshed for new version. Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj (cherry picked from commit a9db38fa9a1fc50eca653816a7bfeda0251f0b6b) Signed-off-by: Armin Kuster --- ...01-configure.ac-bypass-autoconf-2.69-version-check.patch | 6 +++--- .../postgresql/{postgresql_14.3.bb => postgresql_14.4.bb} | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) rename meta-oe/recipes-dbs/postgresql/{postgresql_14.3.bb => postgresql_14.4.bb} (80%) diff --git a/meta-oe/recipes-dbs/postgresql/files/0001-configure.ac-bypass-autoconf-2.69-version-check.patch b/meta-oe/recipes-dbs/postgresql/files/0001-configure.ac-bypass-autoconf-2.69-version-check.patch index 78f24585e8..2256bccece 100644 --- a/meta-oe/recipes-dbs/postgresql/files/0001-configure.ac-bypass-autoconf-2.69-version-check.patch +++ b/meta-oe/recipes-dbs/postgresql/files/0001-configure.ac-bypass-autoconf-2.69-version-check.patch @@ -1,4 +1,4 @@ -From f7084ba49758a6b8db46b917b7c0f831bd65a08f Mon Sep 17 00:00:00 2001 +From 07e605015fad0621c3e67133ff9330a5c6318daa Mon Sep 17 00:00:00 2001 From: Yi Fan Yu Date: Fri, 5 Feb 2021 17:15:42 -0500 Subject: [PATCH] configure.ac: bypass autoconf 2.69 version check @@ -14,12 +14,12 @@ Signed-off-by: Yi Fan Yu 1 file changed, 4 deletions(-) diff --git a/configure.ac b/configure.ac -index d3c55f2..9120184 100644 +index 04ef7be..0eb595b 100644 --- a/configure.ac +++ b/configure.ac @@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros - AC_INIT([PostgreSQL], [14.3], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/]) + AC_INIT([PostgreSQL], [14.4], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/]) -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required. -Untested combinations of 'autoconf' and PostgreSQL versions are not diff --git a/meta-oe/recipes-dbs/postgresql/postgresql_14.3.bb b/meta-oe/recipes-dbs/postgresql/postgresql_14.4.bb similarity index 80% rename from meta-oe/recipes-dbs/postgresql/postgresql_14.3.bb rename to meta-oe/recipes-dbs/postgresql/postgresql_14.4.bb index c686c9b358..01a6ee635e 100644 --- a/meta-oe/recipes-dbs/postgresql/postgresql_14.3.bb +++ b/meta-oe/recipes-dbs/postgresql/postgresql_14.4.bb @@ -10,4 +10,4 @@ SRC_URI += "\ file://remove_duplicate.patch \ " -SRC_URI[sha256sum] = "279057368bf59a919c05ada8f95c5e04abb43e74b9a2a69c3d46a20e07a9af38" +SRC_URI[sha256sum] = "c23b6237c5231c791511bdc79098617d6852e9e3bdf360efd8b5d15a1a3d8f6a" From patchwork Tue Jul 5 02:03:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 9836 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id E94E8C43334 for ; Tue, 5 Jul 2022 02:03:44 +0000 (UTC) Received: from mail-qt1-f182.google.com (mail-qt1-f182.google.com [209.85.160.182]) by mx.groups.io with SMTP id smtpd.web09.80057.1656986619801874003 for ; Mon, 04 Jul 2022 19:03:40 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=VU/LF1Lw; spf=pass (domain: gmail.com, ip: 209.85.160.182, mailfrom: akuster808@gmail.com) Received: by mail-qt1-f182.google.com with SMTP id r2so11877476qta.0 for ; Mon, 04 Jul 2022 19:03:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=LR+Mnl9iaVSmyVpux8SDn6/nU12ZZ1pDzkHB4xWhmFA=; b=VU/LF1LwbJigbJBXlDT+QqAsAGDHpaS3GJtokEegT8dtQpFI2N2SFOlw34pc+SuVZM 2Fkn6Yw5mVIovKS+XyboFpcAKNibFAq5VOWPbmd2p10mlnJaDlEdLRwRpolrfeJwOvJ8 wiLsMhpWz4xcPNc49uip87Qx9saKrbMPbxR5oxgkGvx2H+pnvbTvdXhQR6QkghwlCojR yj+27YM5BA4Olyglf6jLgBAf+McBKzkXCcvEW0Zu4aoB7tpTxE0RIpdDjCrzDGLUyzdQ 56cjzVbOli8TcwxF9oox4qaJLlxR1rj11lAtfeS1rqVYIp/1xaHU/C1Ln2gk1JG8llsk 1naw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LR+Mnl9iaVSmyVpux8SDn6/nU12ZZ1pDzkHB4xWhmFA=; b=YaokRUk0bVajMGqkWxtW67ZMZRL2xli3gV2Spp7uc6ybt+ysWQeoNBdlocWKSlUGor o1HOVFkkjWWKAWXZpTcsm9fdQb/eKUE2ss6BK5Fyl1vSWz3dazS6xKUIdqN2PVK9BOos E8nHEf1TYnaxI2iHTI/RD3jpH/K6NSNg2nPGBMwej15wpBEg5V7HeAZ8BatNVryFYbnQ Tm3qtKgc5349LH6jcnl14OrmG6aw5GsLogWo42fBMclqShtBpVFUEVqSRgnZT/zX1Obg dim0OCCp8ZYFLGrMVn/OjPWR6izm6s7/7xg9T0BsSL8zbQ6aR/jig82GRp0vt/Vko/2X yiDQ== X-Gm-Message-State: AJIora/sT5321S3fC7dZpetMMSoaUdWrc8yj6Hr2iT09M10tdvxxKGSm Z0YGmLATyjoXf88jIopaM78iRhznw88= X-Google-Smtp-Source: AGRyM1tI7IBYV6EN9FyP79vrItgSAWj6TeSnN//NAB55rySXeh6xzT8QlI6WWMNgevfO2ugMOLNAfw== X-Received: by 2002:ad4:5ba7:0:b0:472:dea2:ee84 with SMTP id 7-20020ad45ba7000000b00472dea2ee84mr11818153qvq.58.1656986618457; Mon, 04 Jul 2022 19:03:38 -0700 (PDT) Received: from keaua.attlocal.net ([2600:1700:14b1:7390:8d3d:13ec:9f3e:a504]) by smtp.gmail.com with ESMTPSA id br14-20020a05620a460e00b006a6ce613c7csm21725220qkb.89.2022.07.04.19.03.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Jul 2022 19:03:38 -0700 (PDT) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Subject: [kirkstone 4/5] strongswan: upgrade 5.9.5 -> 5.9.6 Date: Mon, 4 Jul 2022 22:03:28 -0400 Message-Id: <1cd38eed74a1e1700f83b65193e421e67bbf9aaa.1656986538.git.akuster808@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 05 Jul 2022 02:03:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/97699 From: Yi Zhao * Drop backport patch 0001-openssl-Don-t-unload-providers.patch * Backport a patch to fix the build error: src/libstrongswan/utils/enum.c: In function 'enum_flags_to_string': src/libstrongswan/utils/enum.c:100:9: error: format not a string literal and no format arguments [-Werror=format-security] 100 | if (snprintf(buf, len, e->names[0]) >= len) | ^~ Signed-off-by: Yi Zhao Signed-off-by: Khem Raj (cherry picked from commit 689e8422b836d804d9ab102cb3de0a4f6e1f24c8) Signed-off-by: Armin Kuster --- .../0001-enum-Fix-compiler-warning.patch | 31 +++++++ .../0001-openssl-Don-t-unload-providers.patch | 92 ------------------- ...trongswan_5.9.5.bb => strongswan_5.9.6.bb} | 4 +- 3 files changed, 33 insertions(+), 94 deletions(-) create mode 100644 meta-networking/recipes-support/strongswan/files/0001-enum-Fix-compiler-warning.patch delete mode 100644 meta-networking/recipes-support/strongswan/files/0001-openssl-Don-t-unload-providers.patch rename meta-networking/recipes-support/strongswan/{strongswan_5.9.5.bb => strongswan_5.9.6.bb} (98%) diff --git a/meta-networking/recipes-support/strongswan/files/0001-enum-Fix-compiler-warning.patch b/meta-networking/recipes-support/strongswan/files/0001-enum-Fix-compiler-warning.patch new file mode 100644 index 0000000000..e730fe1cd0 --- /dev/null +++ b/meta-networking/recipes-support/strongswan/files/0001-enum-Fix-compiler-warning.patch @@ -0,0 +1,31 @@ +From d23c0ea81e630af3cfda89aeeb52146c0c84c960 Mon Sep 17 00:00:00 2001 +From: Tobias Brunner +Date: Mon, 2 May 2022 09:31:49 +0200 +Subject: [PATCH] enum: Fix compiler warning + +Closes strongswan/strongswan#1025 + +Upstream-Status: Backport +[https://github.com/strongswan/strongswan/commit/d23c0ea81e630af3cfda89aeeb52146c0c84c960] + +Signed-off-by: Yi Zhao +--- + src/libstrongswan/utils/enum.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libstrongswan/utils/enum.c b/src/libstrongswan/utils/enum.c +index 79da450f0c..1e77489f6f 100644 +--- a/src/libstrongswan/utils/enum.c ++++ b/src/libstrongswan/utils/enum.c +@@ -97,7 +97,7 @@ char *enum_flags_to_string(enum_name_t *e, u_int val, char *buf, size_t len) + return buf; + } + +- if (snprintf(buf, len, e->names[0]) >= len) ++ if (snprintf(buf, len, "%s", e->names[0]) >= len) + { + return NULL; + } +-- +2.25.1 + diff --git a/meta-networking/recipes-support/strongswan/files/0001-openssl-Don-t-unload-providers.patch b/meta-networking/recipes-support/strongswan/files/0001-openssl-Don-t-unload-providers.patch deleted file mode 100644 index 7da48cd2cf..0000000000 --- a/meta-networking/recipes-support/strongswan/files/0001-openssl-Don-t-unload-providers.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 3eecd40cec6415fc033f8d9141ab652047e71524 Mon Sep 17 00:00:00 2001 -From: Tobias Brunner -Date: Wed, 23 Feb 2022 17:29:02 +0100 -Subject: [PATCH] openssl: Don't unload providers - -There is a conflict between atexit() handlers registered by OpenSSL and -some executables (e.g. swanctl or pki) to deinitialize libstrongswan. -Because plugins are usually loaded after atexit() has been called, the -handler registered by OpenSSL will run before our handler. So when the -latter destroys the plugins it's a bad idea to try to access any OpenSSL -objects as they might already be invalid. - -Fixes: f556fce16b60 ("openssl: Load "legacy" provider in OpenSSL 3 for algorithms like MD4, DES etc.") -Closes strongswan/strongswan#921 - -Upstream-Status: Backport -[https://github.com/strongswan/strongswan/commit/3eecd40cec6415fc033f8d9141ab652047e71524] - -Signed-off-by: Yi Zhao ---- - .../plugins/openssl/openssl_plugin.c | 27 +++---------------- - 1 file changed, 3 insertions(+), 24 deletions(-) - -diff --git a/src/libstrongswan/plugins/openssl/openssl_plugin.c b/src/libstrongswan/plugins/openssl/openssl_plugin.c -index 6b4923649..1491d5cf8 100644 ---- a/src/libstrongswan/plugins/openssl/openssl_plugin.c -+++ b/src/libstrongswan/plugins/openssl/openssl_plugin.c -@@ -16,7 +16,6 @@ - - #include - #include --#include - #include - #include - #include -@@ -74,13 +73,6 @@ struct private_openssl_plugin_t { - * public functions - */ - openssl_plugin_t public; -- --#if OPENSSL_VERSION_NUMBER >= 0x30000000L -- /** -- * Loaded providers -- */ -- array_t *providers; --#endif - }; - - /** -@@ -887,15 +879,6 @@ METHOD(plugin_t, get_features, int, - METHOD(plugin_t, destroy, void, - private_openssl_plugin_t *this) - { --#if OPENSSL_VERSION_NUMBER >= 0x30000000L -- OSSL_PROVIDER *provider; -- while (array_remove(this->providers, ARRAY_TAIL, &provider)) -- { -- OSSL_PROVIDER_unload(provider); -- } -- array_destroy(this->providers); --#endif /* OPENSSL_VERSION_NUMBER */ -- - /* OpenSSL 1.1.0 cleans up itself at exit and while OPENSSL_cleanup() exists we - * can't call it as we couldn't re-initialize the library (as required by the - * unit tests and the Android app) */ -@@ -1009,20 +992,16 @@ plugin_t *openssl_plugin_create() - DBG1(DBG_LIB, "unable to load OpenSSL FIPS provider"); - return NULL; - } -- array_insert_create(&this->providers, ARRAY_TAIL, fips); - /* explicitly load the base provider containing encoding functions */ -- array_insert_create(&this->providers, ARRAY_TAIL, -- OSSL_PROVIDER_load(NULL, "base")); -+ OSSL_PROVIDER_load(NULL, "base"); - } - else if (lib->settings->get_bool(lib->settings, "%s.plugins.openssl.load_legacy", - TRUE, lib->ns)) - { - /* load the legacy provider for algorithms like MD4, DES, BF etc. */ -- array_insert_create(&this->providers, ARRAY_TAIL, -- OSSL_PROVIDER_load(NULL, "legacy")); -+ OSSL_PROVIDER_load(NULL, "legacy"); - /* explicitly load the default provider, as mentioned by crypto(7) */ -- array_insert_create(&this->providers, ARRAY_TAIL, -- OSSL_PROVIDER_load(NULL, "default")); -+ OSSL_PROVIDER_load(NULL, "default"); - } - ossl_provider_names_t data = {}; - OSSL_PROVIDER_do_all(NULL, concat_ossl_providers, &data); --- -2.25.1 - diff --git a/meta-networking/recipes-support/strongswan/strongswan_5.9.5.bb b/meta-networking/recipes-support/strongswan/strongswan_5.9.6.bb similarity index 98% rename from meta-networking/recipes-support/strongswan/strongswan_5.9.5.bb rename to meta-networking/recipes-support/strongswan/strongswan_5.9.6.bb index cfb7b41fa4..1b82dceac2 100644 --- a/meta-networking/recipes-support/strongswan/strongswan_5.9.5.bb +++ b/meta-networking/recipes-support/strongswan/strongswan_5.9.6.bb @@ -9,10 +9,10 @@ DEPENDS = "flex-native flex bison-native" DEPENDS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'tpm2', ' tpm2-tss', '', d)}" SRC_URI = "http://download.strongswan.org/strongswan-${PV}.tar.bz2 \ - file://0001-openssl-Don-t-unload-providers.patch \ + file://0001-enum-Fix-compiler-warning.patch \ " -SRC_URI[sha256sum] = "983e4ef4a4c6c9d69f5fe6707c7fe0b2b9a9291943bbf4e008faab6bf91c0bdd" +SRC_URI[sha256sum] = "91d0978ac448912759b85452d8ff0d578aafd4507aaf4f1c1719f9d0c7318ab7" UPSTREAM_CHECK_REGEX = "strongswan-(?P\d+(\.\d+)+)\.tar"