From patchwork Fri Dec 20 15:36:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Marko, Peter" X-Patchwork-Id: 54497 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 7CC3FE7718D for ; Fri, 20 Dec 2024 15:37:33 +0000 (UTC) Received: from mta-64-226.siemens.flowmailer.net (mta-64-226.siemens.flowmailer.net [185.136.64.226]) by mx.groups.io with SMTP id smtpd.web11.154107.1734709045262892714 for ; Fri, 20 Dec 2024 07:37:28 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=peter.marko@siemens.com header.s=fm1 header.b=aQ6aRCjy; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.64.226, mailfrom: fm-256628-2024122015372897b546c9dd89bcdf2a-q6ymho@rts-flowmailer.siemens.com) Received: by mta-64-226.siemens.flowmailer.net with ESMTPSA id 2024122015372897b546c9dd89bcdf2a for ; Fri, 20 Dec 2024 16:37:28 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=peter.marko@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=AQFbAADHZI4BaSaQrAePU0Rpq5EPKOEn6ny5AMPpCyk=; b=aQ6aRCjyKpo/+EUsqQvTyiycwnZFZcvClmCAeE0fH+2haMkBm/E5wwPPlhpiMgV9ob3Azd rKLVeTlLTQj/IHKV5BO5LTsvk0hR8I+0TEV2UMSMUBQ5UKIX/CJSJ5IsFSCdENGBSfkMVgEv v5be1iy7ywRftSnNBUf31o05ci/wBd8xGEObPIIjEax2H2UiTCQXIMtWQktaz954NQWYsvCO D6geg3GiY0TC9KK7zUmN0DHAjjIWvohB9QQa6O93Vxs5pvWTPtQZ4mxFa7SBYsbMYulr8PVQ N9BXSfohQMYg+D3we8duvLDeB8Hf44BNtzICiUi1+v9vkm0ojQpPeiXw==; From: Peter Marko To: openembedded-devel@lists.openembedded.org Cc: Peter Marko Subject: [meta-oe][PATCH 01/11] opensc: upgrade 0.25.1 -> 0.26.0 Date: Fri, 20 Dec 2024 16:36:19 +0100 Message-Id: <20241220153629.2499631-2-peter.marko@siemens.com> In-Reply-To: <20241220153629.2499631-1-peter.marko@siemens.com> References: <20241220153629.2499631-1-peter.marko@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-256628:519-21489:flowmailer 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, 20 Dec 2024 15:37:33 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/114437 From: Peter Marko Solves CVE-2024-45615, CVE-2024-45616, CVE-2024-45617, CVE-2024-45618, CVE-2024-45619 and CVE-2024-45620. Signed-off-by: Peter Marko --- .../opensc/{opensc_0.25.1.bb => opensc_0.26.0.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta-oe/recipes-support/opensc/{opensc_0.25.1.bb => opensc_0.26.0.bb} (91%) diff --git a/meta-oe/recipes-support/opensc/opensc_0.25.1.bb b/meta-oe/recipes-support/opensc/opensc_0.26.0.bb similarity index 91% rename from meta-oe/recipes-support/opensc/opensc_0.25.1.bb rename to meta-oe/recipes-support/opensc/opensc_0.26.0.bb index 636bfa0366..3e4d476ff4 100644 --- a/meta-oe/recipes-support/opensc/opensc_0.25.1.bb +++ b/meta-oe/recipes-support/opensc/opensc_0.26.0.bb @@ -11,8 +11,8 @@ LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=cb8aedd3bced19bd8026d96a8b6876d7" DEPENDS = "openssl" -SRCREV = "0a4b772d6fdab9bfaaa3123775a48a7cb6c5e7c6" -SRC_URI = "git://github.com/OpenSC/OpenSC;branch=stable-0.25;protocol=https" +SRCREV = "fe857cc4c68da4873071f168c9aaf9860040ff4e" +SRC_URI = "git://github.com/OpenSC/OpenSC;branch=master;protocol=https" S = "${WORKDIR}/git" From patchwork Fri Dec 20 15:36:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Marko, Peter" X-Patchwork-Id: 54498 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 56DA0E77188 for ; Fri, 20 Dec 2024 15:37:43 +0000 (UTC) Received: from mta-65-226.siemens.flowmailer.net (mta-65-226.siemens.flowmailer.net [185.136.65.226]) by mx.groups.io with SMTP id smtpd.web10.154471.1734709053953222383 for ; Fri, 20 Dec 2024 07:37:34 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=peter.marko@siemens.com header.s=fm1 header.b=Xrca0Hn3; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.65.226, mailfrom: fm-256628-20241220153731b33e22069866c12544-gdnutd@rts-flowmailer.siemens.com) Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 20241220153731b33e22069866c12544 for ; Fri, 20 Dec 2024 16:37:31 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=peter.marko@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=DaYr260gBpH1W5npnM6ggGtJZz4gCmnmctvqxHhS/KY=; b=Xrca0Hn3i4PH457xYOvs9aDnhNjSXEYm2FUNA4v3cJQAyyWCusDj8CjnWbJnKrR2OwyA7H gEtmqnXqy1FHo8u/Eq5dL/Sd1t0B67Ouyx7RpPuB18YHgz3so4cR3iHdhIWYSdm7vKyw2CHX JFPg/YTrYDKzafdSRDY4lTlG/qKKrkHwDLm8VfoV/SSfTQMe+es8fEGqwWExRpEzIIX2zEGK x+6N3Tp8ll97TOEP+Db4WIdYvzOGOG72yJwEFvTTC7NkxOUawhAduvyREimKSVToJUuSxTgu e1oDszFsimYOdiO9JsoloBu70qvJH37q5SkD4gu2Kwzc9+on+r6MOTiQ==; From: Peter Marko To: openembedded-devel@lists.openembedded.org Cc: Peter Marko Subject: [meta-oe][PATCH 02/11] opensc: mark CVE-2024-8443 as fixed Date: Fri, 20 Dec 2024 16:36:20 +0100 Message-Id: <20241220153629.2499631-3-peter.marko@siemens.com> In-Reply-To: <20241220153629.2499631-1-peter.marko@siemens.com> References: <20241220153629.2499631-1-peter.marko@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-256628:519-21489:flowmailer 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, 20 Dec 2024 15:37:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/114438 From: Peter Marko NVD tracks this CVE as version-less. Per [1] this is fixed by following commits: $ git tag --contains b28a3cef416fcfb92fbb9ea7fd3c71df52c6c9fc 0.26.0 0.26.0-rc1 $ git tag --contains 02e847458369c08421fd2d5e9a16a5f272c2de9e 0.26.0 0.26.0-rc1 [1] https://github.com/OpenSC/OpenSC/wiki/CVE-2024-8443 Signed-off-by: Peter Marko --- meta-oe/recipes-support/opensc/opensc_0.26.0.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/recipes-support/opensc/opensc_0.26.0.bb b/meta-oe/recipes-support/opensc/opensc_0.26.0.bb index 3e4d476ff4..bd44e24aeb 100644 --- a/meta-oe/recipes-support/opensc/opensc_0.26.0.bb +++ b/meta-oe/recipes-support/opensc/opensc_0.26.0.bb @@ -14,6 +14,8 @@ DEPENDS = "openssl" SRCREV = "fe857cc4c68da4873071f168c9aaf9860040ff4e" SRC_URI = "git://github.com/OpenSC/OpenSC;branch=master;protocol=https" +CVE_STATUS[CVE-2024-8443] = "fixed-version: this is fixed since 0.26.0" + S = "${WORKDIR}/git" inherit autotools pkgconfig bash-completion From patchwork Fri Dec 20 15:36:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Marko, Peter" X-Patchwork-Id: 54500 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 6DCCFE7718E for ; Fri, 20 Dec 2024 15:37:43 +0000 (UTC) Received: from mta-64-225.siemens.flowmailer.net (mta-64-225.siemens.flowmailer.net [185.136.64.225]) by mx.groups.io with SMTP id smtpd.web10.154472.1734709056312646187 for ; Fri, 20 Dec 2024 07:37:36 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=peter.marko@siemens.com header.s=fm1 header.b=fQqpI95K; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.64.225, mailfrom: fm-256628-2024122015373484fdca0d0883c888a2-detfd3@rts-flowmailer.siemens.com) Received: by mta-64-225.siemens.flowmailer.net with ESMTPSA id 2024122015373484fdca0d0883c888a2 for ; Fri, 20 Dec 2024 16:37:34 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=peter.marko@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=FDnBc+VWOkeADMni/5ASBLJi6EwoD838wbB5sjpQXSQ=; b=fQqpI95KEKgN2jVpG9hUBpiveTIprG07PRShIfeR36hO6RA/pSTGyQuEwUDZyVv0pfbN+b BnoKSc0XRO5X2noIlSSz2tCP55dWevQyVSw3ibqqrSKX3E/5S3gjzbZW38cbTVxXcEGh6C/E xU2UvO88bC2NskJ1SA2G62gF5JTv3QOSLSRqfSOits1ei5tutM6OXCgDEmL9Nh8uMuGPR7HY EsN0e3I2FiK03fYoRMhCG4wj63unnDzHEx8kS1zL5tf98XZJ8Z2OEewOL37HGa8uGLojCmTq VQLwpzXsglBbcxpkAx0kQB7UTQAKq/LXxCKw7i2j3CGEkckcY7YoKtdg==; From: Peter Marko To: openembedded-devel@lists.openembedded.org Cc: Peter Marko Subject: [meta-oe][PATCH 03/11] memcached: add UPSTREAM_CHECK_URI Date: Fri, 20 Dec 2024 16:36:21 +0100 Message-Id: <20241220153629.2499631-4-peter.marko@siemens.com> In-Reply-To: <20241220153629.2499631-1-peter.marko@siemens.com> References: <20241220153629.2499631-1-peter.marko@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-256628:519-21489:flowmailer 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, 20 Dec 2024 15:37:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/114439 From: Peter Marko Download URL is not listable so devtool upgrade fails. Using homepage works as it contains link to latest release, Signed-off-by: Peter Marko --- meta-networking/recipes-support/memcached/memcached_1.6.17.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-networking/recipes-support/memcached/memcached_1.6.17.bb b/meta-networking/recipes-support/memcached/memcached_1.6.17.bb index 7234f02a13..dabe393573 100644 --- a/meta-networking/recipes-support/memcached/memcached_1.6.17.bb +++ b/meta-networking/recipes-support/memcached/memcached_1.6.17.bb @@ -27,6 +27,8 @@ SRC_URI[sha256sum] = "2055e373613d8fc21529aff9f0adce3e23b9ce01ba0478d30e7941d9f2 CVE_STATUS[CVE-2022-26635] = "disputed: this is a problem of applications using php-memcached inproperly" +UPSTREAM_CHECK_URI = "${HOMEPAGE}" + # set the same COMPATIBLE_HOST as libhugetlbfs COMPATIBLE_HOST = "(i.86|x86_64|powerpc|powerpc64|aarch64|arm).*-linux*" From patchwork Fri Dec 20 15:36:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Marko, Peter" X-Patchwork-Id: 54499 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 5D21EE7718C for ; Fri, 20 Dec 2024 15:37:43 +0000 (UTC) Received: from mta-64-225.siemens.flowmailer.net (mta-64-225.siemens.flowmailer.net [185.136.64.225]) by mx.groups.io with SMTP id smtpd.web10.154472.1734709056312646187 for ; Fri, 20 Dec 2024 07:37:38 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=peter.marko@siemens.com header.s=fm1 header.b=qrAyFTMT; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.64.225, mailfrom: fm-256628-20241220153737e2e82f1ff5566e1469-_noouy@rts-flowmailer.siemens.com) Received: by mta-64-225.siemens.flowmailer.net with ESMTPSA id 20241220153737e2e82f1ff5566e1469 for ; Fri, 20 Dec 2024 16:37:37 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=peter.marko@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=uIGM4eAR5TulLDTBjquXe+jkEdGCGnycbxJVY0K77V4=; b=qrAyFTMTEjX5e8nK4AVovjLdmCPbiPrIVRuOztqtzY/AQQqpRbFLCUMGUxvHNNYZa+WQuI HsgmGUKfuV+gf3VAWdeebsTWVLisdkjIuHy6qjSxZH9W0L2NB47ZME7syX8sl2izq+SgGkDp M1Nf1NcspLxIgCTL3FGCWZpid5iNinlIe66ZfmRp0e9edSjbWA88m0S1UjFRd1Vi0zjdo+Bb OFA39Z6nEWCsv4j+D8TAty6IzfbPIYXswzpeqWpuPcg7wESiPjP6tq8sFjaMZx3E2w9ChXE6 v8+mNbVU1DlmpAS1aXT6u75uAJh4Vy9LWSB66JHyOfC1dzmRK/9NpZng==; From: Peter Marko To: openembedded-devel@lists.openembedded.org Cc: Peter Marko Subject: [meta-oe][PATCH 04/11] memcached: upgrade 1.6.17 -> 1.6.33 Date: Fri, 20 Dec 2024 16:36:22 +0100 Message-Id: <20241220153629.2499631-5-peter.marko@siemens.com> In-Reply-To: <20241220153629.2499631-1-peter.marko@siemens.com> References: <20241220153629.2499631-1-peter.marko@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-256628:519-21489:flowmailer 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, 20 Dec 2024 15:37:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/114440 From: Peter Marko Solves CVE-2023-46852 and CVE-2023-46853. Upgrade done via "devtool upgrade". Signed-off-by: Peter Marko --- .../0001-Fix-function-protypes.patch | 110 ------------------ .../memcached-add-hugetlbfs-check.patch | 13 ++- ...emcached_1.6.17.bb => memcached_1.6.33.bb} | 3 +- 3 files changed, 10 insertions(+), 116 deletions(-) delete mode 100644 meta-networking/recipes-support/memcached/memcached/0001-Fix-function-protypes.patch rename meta-networking/recipes-support/memcached/{memcached_1.6.17.bb => memcached_1.6.33.bb} (93%) diff --git a/meta-networking/recipes-support/memcached/memcached/0001-Fix-function-protypes.patch b/meta-networking/recipes-support/memcached/memcached/0001-Fix-function-protypes.patch deleted file mode 100644 index 15ef54f80e..0000000000 --- a/meta-networking/recipes-support/memcached/memcached/0001-Fix-function-protypes.patch +++ /dev/null @@ -1,110 +0,0 @@ -From 6021d3d60e64d9174f41515d2d962df9b5d7645e Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 29 Aug 2022 17:15:28 -0700 -Subject: [PATCH] Fix function protypes - -clang-15+ has started diagnosing them as errors - -thread.c:925:18: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes] -| void STATS_UNLOCK() { -| ^ -| void - -Upstream-Status: Submitted [https://github.com/memcached/memcached/pull/928] -Signed-off-by: Khem Raj ---- - assoc.c | 4 ++-- - memcached.c | 4 ++-- - slabs.c | 2 +- - testapp.c | 2 +- - thread.c | 4 ++-- - 5 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/assoc.c b/assoc.c -index bc68695..01063a9 100644 ---- a/assoc.c -+++ b/assoc.c -@@ -261,7 +261,7 @@ static void *assoc_maintenance_thread(void *arg) { - - static pthread_t maintenance_tid; - --int start_assoc_maintenance_thread() { -+int start_assoc_maintenance_thread(void) { - int ret; - char *env = getenv("MEMCACHED_HASH_BULK_MOVE"); - if (env != NULL) { -@@ -279,7 +279,7 @@ int start_assoc_maintenance_thread() { - return 0; - } - --void stop_assoc_maintenance_thread() { -+void stop_assoc_maintenance_thread(void) { - mutex_lock(&maintenance_lock); - do_run_maintenance_thread = 0; - pthread_cond_signal(&maintenance_cond); -diff --git a/memcached.c b/memcached.c -index 7871fe8..4d3b54a 100644 ---- a/memcached.c -+++ b/memcached.c -@@ -84,7 +84,7 @@ static int try_read_command_udp(conn *c); - static enum try_read_result try_read_network(conn *c); - static enum try_read_result try_read_udp(conn *c); - --static int start_conn_timeout_thread(); -+static int start_conn_timeout_thread(void); - - /* stats */ - static void stats_init(void); -@@ -374,7 +374,7 @@ static void *conn_timeout_thread(void *arg) { - return NULL; - } - --static int start_conn_timeout_thread() { -+static int start_conn_timeout_thread(void) { - int ret; - - if (settings.idle_timeout == 0) -diff --git a/slabs.c b/slabs.c -index 3c78d8a..0dadd35 100644 ---- a/slabs.c -+++ b/slabs.c -@@ -638,7 +638,7 @@ static void *memory_allocate(size_t size) { - } - - /* Must only be used if all pages are item_size_max */ --static void memory_release() { -+static void memory_release(void) { - void *p = NULL; - if (mem_base != NULL) - return; -diff --git a/testapp.c b/testapp.c -index 5face54..387a847 100644 ---- a/testapp.c -+++ b/testapp.c -@@ -80,7 +80,7 @@ static struct conn *con = NULL; - static bool allow_closed_read = false; - static bool enable_ssl = false; - --static void close_conn() { -+static void close_conn(void) { - if (con == NULL) return; - #ifdef TLS - if (con->ssl) { -diff --git a/thread.c b/thread.c -index d5ed052..f5efdc3 100644 ---- a/thread.c -+++ b/thread.c -@@ -918,11 +918,11 @@ enum store_item_type store_item(item *item, int comm, conn* c) { - - /******************************* GLOBAL STATS ******************************/ - --void STATS_LOCK() { -+void STATS_LOCK(void) { - pthread_mutex_lock(&stats_lock); - } - --void STATS_UNLOCK() { -+void STATS_UNLOCK(void) { - pthread_mutex_unlock(&stats_lock); - } - diff --git a/meta-networking/recipes-support/memcached/memcached/memcached-add-hugetlbfs-check.patch b/meta-networking/recipes-support/memcached/memcached/memcached-add-hugetlbfs-check.patch index 45428ed234..26281e73ef 100644 --- a/meta-networking/recipes-support/memcached/memcached/memcached-add-hugetlbfs-check.patch +++ b/meta-networking/recipes-support/memcached/memcached/memcached-add-hugetlbfs-check.patch @@ -1,4 +1,7 @@ -memcached: add knob to detect whether hugetlbfs are checked +From dfa90817a08f206f7e2dbba44d913968ae7f7d94 Mon Sep 17 00:00:00 2001 +From: Chong Lu +Date: Tue, 19 Aug 2014 17:38:32 +0800 +Subject: [PATCH] memcached: add knob to detect whether hugetlbfs are checked Add knob to detect whether hugetlbfs are checked or not. @@ -6,12 +9,14 @@ Upstream-Status: Pending Signed-off-by: Chong Lu --- - configure.ac | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) + configure.ac | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) +diff --git a/configure.ac b/configure.ac +index 6f2ef97..bd7dd96 100644 --- a/configure.ac +++ b/configure.ac -@@ -488,8 +488,12 @@ if test "x$enable_static" = "xyes"; then +@@ -559,8 +559,12 @@ if test "x$enable_static" = "xyes"; then fi dnl ---------------------------------------------------------------------------- diff --git a/meta-networking/recipes-support/memcached/memcached_1.6.17.bb b/meta-networking/recipes-support/memcached/memcached_1.6.33.bb similarity index 93% rename from meta-networking/recipes-support/memcached/memcached_1.6.17.bb rename to meta-networking/recipes-support/memcached/memcached_1.6.33.bb index dabe393573..346754c6ad 100644 --- a/meta-networking/recipes-support/memcached/memcached_1.6.17.bb +++ b/meta-networking/recipes-support/memcached/memcached_1.6.33.bb @@ -21,9 +21,8 @@ RDEPENDS:${PN} += "perl perl-module-posix perl-module-autoloader \ SRC_URI = "http://www.memcached.org/files/${BP}.tar.gz \ file://memcached-add-hugetlbfs-check.patch \ - file://0001-Fix-function-protypes.patch \ " -SRC_URI[sha256sum] = "2055e373613d8fc21529aff9f0adce3e23b9ce01ba0478d30e7941d9f2bd1224" +SRC_URI[sha256sum] = "707f74c4c6876b61532b998ca8f118b0b82a0d96365d7a1d70ebfc40dfe83dad" CVE_STATUS[CVE-2022-26635] = "disputed: this is a problem of applications using php-memcached inproperly" From patchwork Fri Dec 20 15:36:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Marko, Peter" X-Patchwork-Id: 54501 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 6415DE7718B for ; Fri, 20 Dec 2024 15:37:43 +0000 (UTC) Received: from mta-64-227.siemens.flowmailer.net (mta-64-227.siemens.flowmailer.net [185.136.64.227]) by mx.groups.io with SMTP id smtpd.web11.154112.1734709061962836002 for ; Fri, 20 Dec 2024 07:37:42 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=peter.marko@siemens.com header.s=fm1 header.b=BqI6H94U; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.64.227, mailfrom: fm-256628-20241220153739cefcdc19b7e1ee6bb8-c8zfha@rts-flowmailer.siemens.com) Received: by mta-64-227.siemens.flowmailer.net with ESMTPSA id 20241220153739cefcdc19b7e1ee6bb8 for ; Fri, 20 Dec 2024 16:37:40 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=peter.marko@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=sBYE5nPZ//apLP2+RNawD7lOQfw8Xic5YDTj5i/Q1qw=; b=BqI6H94U9L1DldvvYWSB8DGyBPFHTB7lvwW2oVbsP2DqOoXgITn7cDaEZKnrBPfVx5Q3yP tXbSe7FiciYLkQvVI/1PRPUaZJbOj2m4iSJd2stRLD5OhvY9+j+izHDb7YgWHyBm2u1vUv2d 8Pyr9Me7NNgkZ1jXLiWrrWYe2EotvrBZ3IwsQHO5yQFBu921bVyclGEPmePDSWpBTvvoRBU0 iOy+sRFTeq0ASqQCjd9D8GRW/2aLFWcci3wJ6FcDm1mOuLggFrUE7v9YEYxe5H9kdusqJre4 9sTg2rUwfI24MJE/xWOLhgN7gBfnxi+i0Xx5+vtnDbe4EQ+45ztU5fKw==; From: Peter Marko To: openembedded-devel@lists.openembedded.org Cc: Peter Marko Subject: [meta-oe][PATCH 05/11] php: upgrade 8.2.20 -> 8.2.26 Date: Fri, 20 Dec 2024 16:36:23 +0100 Message-Id: <20241220153629.2499631-6-peter.marko@siemens.com> In-Reply-To: <20241220153629.2499631-1-peter.marko@siemens.com> References: <20241220153629.2499631-1-peter.marko@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-256628:519-21489:flowmailer 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, 20 Dec 2024 15:37:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/114441 From: Peter Marko Solves dozens of vulnerabilities. See https://php.watch/versions/8.2/releases/8.2.21 https://php.watch/versions/8.2/releases/8.2.22 https://php.watch/versions/8.2/releases/8.2.23 https://php.watch/versions/8.2/releases/8.2.24 https://php.watch/versions/8.2/releases/8.2.25 https://php.watch/versions/8.2/releases/8.2.26 Removes CVE-2024-11233, CVE-2024-11234 and CVE-2024-11236 from current cve metrics. Signed-off-by: Peter Marko --- .../php/php/0001-ext-opcache-config.m4-enable-opcache.patch | 4 ++-- .../php/0002-build-php.m4-don-t-unset-cache-variables.patch | 2 +- .../0003-php-remove-host-specific-info-from-header-file.patch | 2 +- .../php/0006-ext-phar-Makefile.frag-Fix-phar-packaging.patch | 4 +++- .../php/php/0008-ext-imap-config.m4-fix-include-paths.patch | 4 ++-- .../php/php/0009-php-don-t-use-broken-wrapper-for-mkdir.patch | 3 +-- .../recipes-devtools/php/php/0010-iconv-fix-detection.patch | 2 +- meta-oe/recipes-devtools/php/{php_8.2.20.bb => php_8.2.26.bb} | 2 +- 8 files changed, 12 insertions(+), 11 deletions(-) rename meta-oe/recipes-devtools/php/{php_8.2.20.bb => php_8.2.26.bb} (99%) diff --git a/meta-oe/recipes-devtools/php/php/0001-ext-opcache-config.m4-enable-opcache.patch b/meta-oe/recipes-devtools/php/php/0001-ext-opcache-config.m4-enable-opcache.patch index c743697469..009d4d650f 100644 --- a/meta-oe/recipes-devtools/php/php/0001-ext-opcache-config.m4-enable-opcache.patch +++ b/meta-oe/recipes-devtools/php/php/0001-ext-opcache-config.m4-enable-opcache.patch @@ -247,8 +247,8 @@ index 6bf07ad3..5d645b86 100644 + have_shm_mmap_posix=yes + PHP_CHECK_LIBRARY(rt, shm_unlink, [PHP_ADD_LIBRARY(rt,1,OPCACHE_SHARED_LIBADD)]) - PHP_NEW_EXTENSION(opcache, - ZendAccelerator.c \ + AX_CHECK_COMPILE_FLAG([-Wno-implicit-fallthrough], + [PHP_OPCACHE_CFLAGS="$PHP_OPCACHE_CFLAGS -Wno-implicit-fallthrough"],, -- 2.40.0 diff --git a/meta-oe/recipes-devtools/php/php/0002-build-php.m4-don-t-unset-cache-variables.patch b/meta-oe/recipes-devtools/php/php/0002-build-php.m4-don-t-unset-cache-variables.patch index 6183f49c28..2e1e752d61 100644 --- a/meta-oe/recipes-devtools/php/php/0002-build-php.m4-don-t-unset-cache-variables.patch +++ b/meta-oe/recipes-devtools/php/php/0002-build-php.m4-don-t-unset-cache-variables.patch @@ -31,7 +31,7 @@ index 9746ba28f3..93551d9ca7 100644 unset found AC_CHECK_LIB($2, $1, [found=yes], [ AC_CHECK_LIB($2, __$1, [found=yes], [found=no]) -@@ -1601,8 +1599,6 @@ dnl and as a fall back in the specified library. Defines HAVE_func and +@@ -1604,8 +1602,6 @@ dnl and as a fall back in the specified library. Defines HAVE_func and dnl HAVE_library if found and adds the library to LIBS. dnl AC_DEFUN([PHP_CHECK_FUNC],[ diff --git a/meta-oe/recipes-devtools/php/php/0003-php-remove-host-specific-info-from-header-file.patch b/meta-oe/recipes-devtools/php/php/0003-php-remove-host-specific-info-from-header-file.patch index 9637ed9516..1aa28e2add 100644 --- a/meta-oe/recipes-devtools/php/php/0003-php-remove-host-specific-info-from-header-file.patch +++ b/meta-oe/recipes-devtools/php/php/0003-php-remove-host-specific-info-from-header-file.patch @@ -22,7 +22,7 @@ diff --git a/configure.ac b/configure.ac index 1eafd62a44..90c94323aa 100644 --- a/configure.ac +++ b/configure.ac -@@ -1289,7 +1289,7 @@ PHP_REMOVE_USR_LIB(LDFLAGS) +@@ -1462,7 +1462,7 @@ PHP_REMOVE_USR_LIB(LDFLAGS) EXTRA_LDFLAGS="$EXTRA_LDFLAGS $PHP_LDFLAGS" EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM $PHP_LDFLAGS" diff --git a/meta-oe/recipes-devtools/php/php/0006-ext-phar-Makefile.frag-Fix-phar-packaging.patch b/meta-oe/recipes-devtools/php/php/0006-ext-phar-Makefile.frag-Fix-phar-packaging.patch index acf2940839..04bd40f4ff 100644 --- a/meta-oe/recipes-devtools/php/php/0006-ext-phar-Makefile.frag-Fix-phar-packaging.patch +++ b/meta-oe/recipes-devtools/php/php/0006-ext-phar-Makefile.frag-Fix-phar-packaging.patch @@ -18,9 +18,11 @@ Signed-off-by: Claude Bing ext/phar/Makefile.frag | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) +diff --git a/ext/phar/Makefile.frag b/ext/phar/Makefile.frag +index 7a867dd7..4dbcafd4 100644 --- a/ext/phar/Makefile.frag +++ b/ext/phar/Makefile.frag -@@ -10,20 +10,9 @@ pharcmd: $(builddir)/phar.php $(builddir +@@ -10,20 +10,9 @@ pharcmd: $(builddir)/phar.php $(builddir)/phar.phar PHP_PHARCMD_SETTINGS = -n -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d phar.readonly=0 PHP_PHARCMD_EXECUTABLE = ` \ diff --git a/meta-oe/recipes-devtools/php/php/0008-ext-imap-config.m4-fix-include-paths.patch b/meta-oe/recipes-devtools/php/php/0008-ext-imap-config.m4-fix-include-paths.patch index 78bae58e00..a1b93a2369 100644 --- a/meta-oe/recipes-devtools/php/php/0008-ext-imap-config.m4-fix-include-paths.patch +++ b/meta-oe/recipes-devtools/php/php/0008-ext-imap-config.m4-fix-include-paths.patch @@ -16,7 +16,7 @@ diff --git a/ext/imap/config.m4 b/ext/imap/config.m4 index 5086a312d0..0e938bd544 100644 --- a/ext/imap/config.m4 +++ b/ext/imap/config.m4 -@@ -110,7 +110,7 @@ if test "$PHP_IMAP" != "no"; then +@@ -122,7 +122,7 @@ if test "$PHP_IMAP" != "no"; then PHP_NEW_EXTENSION(imap, php_imap.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) AC_DEFINE(HAVE_IMAP,1,[ ]) @@ -25,7 +25,7 @@ index 5086a312d0..0e938bd544 100644 IMAP_INC_CHK() el[]IMAP_INC_CHK(/include/c-client) el[]IMAP_INC_CHK(/include/imap) -@@ -199,13 +199,7 @@ if test "$PHP_IMAP" != "no"; then +@@ -211,13 +211,7 @@ if test "$PHP_IMAP" != "no"; then AC_MSG_ERROR(Cannot find rfc822.h. Please check your c-client installation.) fi diff --git a/meta-oe/recipes-devtools/php/php/0009-php-don-t-use-broken-wrapper-for-mkdir.patch b/meta-oe/recipes-devtools/php/php/0009-php-don-t-use-broken-wrapper-for-mkdir.patch index b5a33cca7f..d329387e6c 100644 --- a/meta-oe/recipes-devtools/php/php/0009-php-don-t-use-broken-wrapper-for-mkdir.patch +++ b/meta-oe/recipes-devtools/php/php/0009-php-don-t-use-broken-wrapper-for-mkdir.patch @@ -10,9 +10,8 @@ Signed-off-by: Changqing Li update patch to version 8.0.12 Signed-off-by: Claude Bing ---- Upstream-Status: Pending - +--- build/Makefile.global | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-devtools/php/php/0010-iconv-fix-detection.patch b/meta-oe/recipes-devtools/php/php/0010-iconv-fix-detection.patch index e3b8cd4707..49fb3a5886 100644 --- a/meta-oe/recipes-devtools/php/php/0010-iconv-fix-detection.patch +++ b/meta-oe/recipes-devtools/php/php/0010-iconv-fix-detection.patch @@ -20,7 +20,7 @@ diff --git a/build/php.m4 b/build/php.m4 index 93551d9ca7..dba50825fb 100644 --- a/build/php.m4 +++ b/build/php.m4 -@@ -1919,7 +1919,8 @@ AC_DEFUN([PHP_SETUP_ICONV], [ +@@ -1945,7 +1945,8 @@ AC_DEFUN([PHP_SETUP_ICONV], [ unset ICONV_DIR dnl Check libc first if no path is provided in --with-iconv. diff --git a/meta-oe/recipes-devtools/php/php_8.2.20.bb b/meta-oe/recipes-devtools/php/php_8.2.26.bb similarity index 99% rename from meta-oe/recipes-devtools/php/php_8.2.20.bb rename to meta-oe/recipes-devtools/php/php_8.2.26.bb index f306b16931..f5e57ab36a 100644 --- a/meta-oe/recipes-devtools/php/php_8.2.20.bb +++ b/meta-oe/recipes-devtools/php/php_8.2.26.bb @@ -34,7 +34,7 @@ SRC_URI:append:class-target = " \ " S = "${WORKDIR}/php-${PV}" -SRC_URI[sha256sum] = "5dec6fa61c7b9c47aa1d76666be651f2642ed2bcf6cd8638c57e3571ce2aac61" +SRC_URI[sha256sum] = "be57c347d451c905bcb4336832a864d9928dd0e20989b872705fea0ba6476c6b" CVE_STATUS_GROUPS += "CVE_STATUS_PHP" CVE_STATUS_PHP[status] = "fixed-version: The name of this product is exactly the same as github.com/emlog/emlog. CVE can be safely ignored." From patchwork Fri Dec 20 15:36:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Marko, Peter" X-Patchwork-Id: 54502 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 605E2E7718B for ; Fri, 20 Dec 2024 15:37:53 +0000 (UTC) Received: from mta-64-227.siemens.flowmailer.net (mta-64-227.siemens.flowmailer.net [185.136.64.227]) by mx.groups.io with SMTP id smtpd.web11.154112.1734709061962836002 for ; Fri, 20 Dec 2024 07:37:44 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=peter.marko@siemens.com header.s=fm1 header.b=bgAUZTmt; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.64.227, mailfrom: fm-256628-20241220153744fccabe2dd538fbb315-qeacns@rts-flowmailer.siemens.com) Received: by mta-64-227.siemens.flowmailer.net with ESMTPSA id 20241220153744fccabe2dd538fbb315 for ; Fri, 20 Dec 2024 16:37:44 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=peter.marko@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=WVzImTBQZDpwLxHYAdhjNd96iFumGfvlOEk5mZ2qFb0=; b=bgAUZTmtpAhv8Qos6LgFYl7X7fkynYVlKtUOl7OE7UFxJT3PRaKfcusaOutxfwLOP0Gkd6 yV3sbTD3QPuJgAmpuRwKGecuubhLCFVp7v0L7GMtEK50ohCIAmPuuSrcelUvimm89E5/Khv5 BTZugkgvjcTW/1PK3qCSnfNNyJNlBXyswNRZmw8+WfAgZLDJ+DVdJIy9+zxZDyuPBAmhel9X rAajt7lexlGZ8Baz+Gx/LqKdSTDn9Up6GAx8nmmCFQuWJz9HP6ApbrtfdIA9yJS7kOg8qYzG M0aEohpee0OvDmXHwmBwJi7zdi0IoiF1P7gqXB2hEAl3aAWoZf3nj81w==; From: Peter Marko To: openembedded-devel@lists.openembedded.org Cc: Peter Marko Subject: [meta-oe][PATCH 06/11] libmemcached: remove recipe for version 1.0.7 Date: Fri, 20 Dec 2024 16:36:24 +0100 Message-Id: <20241220153629.2499631-7-peter.marko@siemens.com> In-Reply-To: <20241220153629.2499631-1-peter.marko@siemens.com> References: <20241220153629.2499631-1-peter.marko@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-256628:519-21489:flowmailer 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, 20 Dec 2024 15:37:53 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/114442 From: Peter Marko This no longer compiles with latest toolchains. Signed-off-by: Peter Marko --- .../recipes-support/libmemcached/libmemcached_1.0.7.bb | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 meta-networking/recipes-support/libmemcached/libmemcached_1.0.7.bb diff --git a/meta-networking/recipes-support/libmemcached/libmemcached_1.0.7.bb b/meta-networking/recipes-support/libmemcached/libmemcached_1.0.7.bb deleted file mode 100644 index cdf8415ff7..0000000000 --- a/meta-networking/recipes-support/libmemcached/libmemcached_1.0.7.bb +++ /dev/null @@ -1,4 +0,0 @@ -require libmemcached.inc - -SRC_URI[md5sum] = "d59a462a92d296f76bff2d9bc72b2516" -SRC_URI[sha256sum] = "3efa86c9733eaad55d7119cb16769424e2aa6c22b3392e8f973946fce6678d81" From patchwork Fri Dec 20 15:36:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Marko, Peter" X-Patchwork-Id: 54504 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 73D60E7718D for ; Fri, 20 Dec 2024 15:37:53 +0000 (UTC) Received: from mta-65-226.siemens.flowmailer.net (mta-65-226.siemens.flowmailer.net [185.136.65.226]) by mx.groups.io with SMTP id smtpd.web11.154127.1734709069390603271 for ; Fri, 20 Dec 2024 07:37:49 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=peter.marko@siemens.com header.s=fm1 header.b=XUGim9GB; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.65.226, mailfrom: fm-256628-2024122015374780db5ac4a63d306adf-d3dvno@rts-flowmailer.siemens.com) Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 2024122015374780db5ac4a63d306adf for ; Fri, 20 Dec 2024 16:37:47 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=peter.marko@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=7WxTsMMXTnf1ueSinhKlN5bc/X/5cgMl/1kYesSo/q0=; b=XUGim9GB7TU1v99JgSepZDAbr/TZTJzSTJ9ck2S0xn3VsKCpA36Zvd0XDzcS/glvg9xo8i YkWM22HqwTtSoMYnh3LKN1A0acS01M9DE218GumyKj6JgTQICoMW0QE7MMSwH0NXark3JPBT 9fGgA7NEyX4GMu2+7GMXn3IFO/MGtZ0mFzSEPIwyk+6H9aqD8MJzT9/16ryNeog0TQpCp/1c GS5gqVn5HwxGiZBOCR7yrHNM0mciaIRM8v7rsMCJexaG5laMqT7NkIW1ZZ2ghqmfiw72u1yA IwbT/L+0l3SGS3mXLxzpIweJ4KYIQ9PlDAR5JvgyzZLjKY3zUwoNZBbw==; From: Peter Marko To: openembedded-devel@lists.openembedded.org Cc: Peter Marko Subject: [meta-oe][PATCH 07/11] libmemcached: merge inc into bb Date: Fri, 20 Dec 2024 16:36:25 +0100 Message-Id: <20241220153629.2499631-8-peter.marko@siemens.com> In-Reply-To: <20241220153629.2499631-1-peter.marko@siemens.com> References: <20241220153629.2499631-1-peter.marko@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-256628:519-21489:flowmailer 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, 20 Dec 2024 15:37:53 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/114443 From: Peter Marko After removing old libmemcached recipe version, these is no reasons anymore to have this split. The memcached resurrected project uses cmake and different urls. Signed-off-by: Peter Marko --- .../libmemcached/libmemcached.inc | 17 ----------------- .../libmemcached/libmemcached_1.0.18.bb | 19 +++++++++++++++++-- 2 files changed, 17 insertions(+), 19 deletions(-) delete mode 100644 meta-networking/recipes-support/libmemcached/libmemcached.inc diff --git a/meta-networking/recipes-support/libmemcached/libmemcached.inc b/meta-networking/recipes-support/libmemcached/libmemcached.inc deleted file mode 100644 index 319ab29ce7..0000000000 --- a/meta-networking/recipes-support/libmemcached/libmemcached.inc +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "open source C/C++ client library and tools for the memcached server" -DEPENDS = "libevent util-linux" -SECTION = "libdevel" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=865490941c91ba790f0ea78dec93bd60" - -SRC_URI = "http://launchpad.net/libmemcached/1.0/${PV}/+download/libmemcached-${PV}.tar.gz" - -UPSTREAM_CHECK_URI = "https://launchpad.net/libmemcached" - -TARGET_LDFLAGS += "-luuid" -TARGET_CFLAGS += "-D__USE_GNU -D_GNU_SOURCE" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[sasl] = "--enable-sasl,--disable-sasl,cyrus-sasl" - -inherit autotools gettext pkgconfig diff --git a/meta-networking/recipes-support/libmemcached/libmemcached_1.0.18.bb b/meta-networking/recipes-support/libmemcached/libmemcached_1.0.18.bb index 56778c0483..7d18d0217d 100644 --- a/meta-networking/recipes-support/libmemcached/libmemcached_1.0.18.bb +++ b/meta-networking/recipes-support/libmemcached/libmemcached_1.0.18.bb @@ -1,6 +1,11 @@ -require libmemcached.inc +DESCRIPTION = "open source C/C++ client library and tools for the memcached server" +DEPENDS = "libevent util-linux" +SECTION = "libdevel" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=865490941c91ba790f0ea78dec93bd60" -SRC_URI += "\ +SRC_URI = "\ + http://launchpad.net/libmemcached/1.0/${PV}/+download/libmemcached-${PV}.tar.gz \ file://crosscompile.patch \ file://0001-configure.ac-Do-not-configure-build-aux.patch \ file://0001-Fix-comparison-types.patch \ @@ -8,3 +13,13 @@ SRC_URI += "\ " SRC_URI[md5sum] = "b3958716b4e53ddc5992e6c49d97e819" SRC_URI[sha256sum] = "e22c0bb032fde08f53de9ffbc5a128233041d9f33b5de022c0978a2149885f82" + +UPSTREAM_CHECK_URI = "https://launchpad.net/libmemcached" + +TARGET_LDFLAGS += "-luuid" +TARGET_CFLAGS += "-D__USE_GNU -D_GNU_SOURCE" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[sasl] = "--enable-sasl,--disable-sasl,cyrus-sasl" + +inherit autotools gettext pkgconfig From patchwork Fri Dec 20 15:36:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Marko, Peter" X-Patchwork-Id: 54503 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 5B6B3E77188 for ; Fri, 20 Dec 2024 15:37:53 +0000 (UTC) Received: from mta-65-226.siemens.flowmailer.net (mta-65-226.siemens.flowmailer.net [185.136.65.226]) by mx.groups.io with SMTP id smtpd.web11.154127.1734709069390603271 for ; Fri, 20 Dec 2024 07:37:52 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=peter.marko@siemens.com header.s=fm1 header.b=AXENGxE2; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.65.226, mailfrom: fm-256628-20241220153751bdf9ce040f128f57e7-z2axns@rts-flowmailer.siemens.com) Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 20241220153751bdf9ce040f128f57e7 for ; Fri, 20 Dec 2024 16:37:51 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=peter.marko@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=By7VYj2I6cL5NQ7ZTIBImt+d+tVlPlQDPDc3BbX2ozk=; b=AXENGxE2jtrDjd/4r8B3e+a/HoqRdZhtrsS1r4EIoyADikddwBbX/WmiHgxwJoWkmICBxw gmVOLwm0aZJ4N2W0qL0NJU4PeZUgx8W7vNRiV2tt7AIYMm15dqio3yKubbvBgS+CcuML36nf b5Hf7niwTPeig7fid1xXhdkWYXVRfBUYPnNDV6Qps3CLULDUIueupMbq76nBOXdDXB125qAs 3FDREXqp0/hW19cnTkeYaWcTLFl0Tl5l7oK80JOkIXIDarvCyr8hWneKtLBpQWwd+qQAmAin /jlh/vrcw8P6IPxGGfpqVcNufioV8ZeGAAzBGyEA8awEh/Lc4Guw+FUQ==; From: Peter Marko To: openembedded-devel@lists.openembedded.org Cc: Peter Marko Subject: [meta-oe][PATCH 08/11] libmemcached: ignore CVE-2023-27478 Date: Fri, 20 Dec 2024 16:36:26 +0100 Message-Id: <20241220153629.2499631-9-peter.marko@siemens.com> In-Reply-To: <20241220153629.2499631-1-peter.marko@siemens.com> References: <20241220153629.2499631-1-peter.marko@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-256628:519-21489:flowmailer 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, 20 Dec 2024 15:37:53 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/114444 From: Peter Marko Per [1] this is fixed by [2]. The commit message says that it is reverting feature added in: $ git tag --no-contains d7a0084 | grep 1.0.18 1.0.18 This recipe is for the original memcached which is unmaintained now. Hence the ignore instead of upgrade. [1] https://nvd.nist.gov/vuln/detail/CVE-2023-27478 [2] https://github.com/awesomized/libmemcached/commit/48dcc61a Signed-off-by: Peter Marko --- .../recipes-support/libmemcached/libmemcached_1.0.18.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-networking/recipes-support/libmemcached/libmemcached_1.0.18.bb b/meta-networking/recipes-support/libmemcached/libmemcached_1.0.18.bb index 7d18d0217d..561308b33d 100644 --- a/meta-networking/recipes-support/libmemcached/libmemcached_1.0.18.bb +++ b/meta-networking/recipes-support/libmemcached/libmemcached_1.0.18.bb @@ -16,6 +16,8 @@ SRC_URI[sha256sum] = "e22c0bb032fde08f53de9ffbc5a128233041d9f33b5de022c0978a2149 UPSTREAM_CHECK_URI = "https://launchpad.net/libmemcached" +CVE_STATUS[CVE-2023-27478] = "fixed-version: this problem was not yet introduced in 1.0.18" + TARGET_LDFLAGS += "-luuid" TARGET_CFLAGS += "-D__USE_GNU -D_GNU_SOURCE" From patchwork Fri Dec 20 15:36:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Marko, Peter" X-Patchwork-Id: 54506 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 5AB00E77188 for ; Fri, 20 Dec 2024 15:38:03 +0000 (UTC) Received: from mta-65-226.siemens.flowmailer.net (mta-65-226.siemens.flowmailer.net [185.136.65.226]) by mx.groups.io with SMTP id smtpd.web11.154135.1734709076512902505 for ; Fri, 20 Dec 2024 07:37:56 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=peter.marko@siemens.com header.s=fm1 header.b=YVBc0zIq; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.65.226, mailfrom: fm-256628-2024122015375437482cc290493d17e6-70ewom@rts-flowmailer.siemens.com) Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 2024122015375437482cc290493d17e6 for ; Fri, 20 Dec 2024 16:37:54 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=peter.marko@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=7m/rUMcV/IUwyLRMY5BkycRKdRQrL5QN5MlrottYjtI=; b=YVBc0zIqxQXBfA1UKkRmQYVFguu6Wr1bdGN5ZB9wzo8UnqLEfuUSMI/uO0qsjJ46vHHFBe kVjm1VKOU8lAMx+Syee0f2GoH+qQOxnY+ErVjAKm0a8SPq4hdA/DQ1PAmetdeudy2o4fctfp lMAR4i6/vfPjq6xEEpR6z3ojgdVj0jZ0MpWblQdD6gXXQXIUa2ZNp1XrMcI1KXMw/tfO0I5P I/MVfnXLDHaigLSyk/DL9dN17u0y8LDLgcTL8xd3c+yFZJkzzt4j1i12NJQck1q9hekrI981 hK+fdpoTGkd7mfISNREfz8gtL8iVGbcqa+HjagHeqKpzUcky0sdLgHaQ==; From: Peter Marko To: openembedded-devel@lists.openembedded.org Cc: Peter Marko Subject: [meta-oe][PATCH 09/11] sassc: ignore CVE-2022-43357 Date: Fri, 20 Dec 2024 16:36:27 +0100 Message-Id: <20241220153629.2499631-10-peter.marko@siemens.com> In-Reply-To: <20241220153629.2499631-1-peter.marko@siemens.com> References: <20241220153629.2499631-1-peter.marko@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-256628:519-21489:flowmailer 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, 20 Dec 2024 15:38:03 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/114445 From: Peter Marko This CVE is fixed in current libsass recipe version. So wrapper around it will also not show this problem. It's usual usecase is to be statically linked with libsass which is probably the reason why this is listed as vulnerable component. [1] links [2] as issue tracker which points to [3] as fix. [4] as base repository for the recipe is not involved and files from [3] are not present in this repository. [1] https://nvd.nist.gov/vuln/detail/CVE-2022-43357 [2] https://github.com/sass/libsass/issues/3177 [3] https://github.com/sass/libsass/pull/3184 [4] https://github.com/sass/sassc/ Signed-off-by: Peter Marko --- meta-oe/recipes-support/sass/sassc_git.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/recipes-support/sass/sassc_git.bb b/meta-oe/recipes-support/sass/sassc_git.bb index 9bb8c76e87..94d69642a7 100644 --- a/meta-oe/recipes-support/sass/sassc_git.bb +++ b/meta-oe/recipes-support/sass/sassc_git.bb @@ -11,4 +11,6 @@ SRCREV = "66f0ef37e7f0ad3a65d2f481eff09d09408f42d0" S = "${WORKDIR}/git" PV = "3.6.2" +CVE_STATUS[CVE-2022-43357] = "cpe-incorrect: this is CVE for libsass, not sassc wrapper" + BBCLASSEXTEND = "native" From patchwork Fri Dec 20 15:36:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Marko, Peter" X-Patchwork-Id: 54505 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 61A4BE7718C for ; Fri, 20 Dec 2024 15:38:03 +0000 (UTC) Received: from mta-65-227.siemens.flowmailer.net (mta-65-227.siemens.flowmailer.net [185.136.65.227]) by mx.groups.io with SMTP id smtpd.web10.154488.1734709081625973718 for ; Fri, 20 Dec 2024 07:38:01 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=peter.marko@siemens.com header.s=fm1 header.b=Gs2VUUVV; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.65.227, mailfrom: fm-256628-202412201537593671b7836008badad3-jxnjma@rts-flowmailer.siemens.com) Received: by mta-65-227.siemens.flowmailer.net with ESMTPSA id 202412201537593671b7836008badad3 for ; Fri, 20 Dec 2024 16:37:59 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=peter.marko@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=B8MfPY5x4uV1i9ksGCgB0c/29N0IzSwOjxhcmxRbIE0=; b=Gs2VUUVVxcff057WTpLIBHR3M9B2ovgaMeJMIOGtTyFFu7t/2I7W+52XPwFffR0z8GUafX r5EJuw14CGenKupc4lCsxGn8GjTGQ75L6qm/wi18pOdXFkqdVc6NHhacZgbtLylWWfm+55hE jCg6kjIZdSkGYWK1mr1lNV3FvZTxGpIYZMJsUxOx8xpUSlgp2NA+6kvUiDKs3mWjK15pYHUs txhm3NCVDUu9CY+E3UwWxSyZIwajPPcBQdnEX8n1PUJQQ48yte/OrdraLUBkZnJmCy9Sxu39 e1myyik6LwomiAIEkBv/YfNO2yKFzCzmXCPsvGgnSuYV0kkTasLGIx7w==; From: Peter Marko To: openembedded-devel@lists.openembedded.org Cc: Peter Marko Subject: [meta-oe][PATCH 10/11] wireshark: upgrade 4.2.8 -> 4.2.9 Date: Fri, 20 Dec 2024 16:36:28 +0100 Message-Id: <20241220153629.2499631-11-peter.marko@siemens.com> In-Reply-To: <20241220153629.2499631-1-peter.marko@siemens.com> References: <20241220153629.2499631-1-peter.marko@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-256628:519-21489:flowmailer 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, 20 Dec 2024 15:38:03 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/114446 From: Peter Marko Solves CVE-2024-9781 Release notes: https://www.wireshark.org/docs/relnotes/wireshark-4.2.7.html https://www.wireshark.org/docs/relnotes/wireshark-4.2.8.html Signed-off-by: Peter Marko --- .../wireshark/{wireshark_4.2.7.bb => wireshark_4.2.9.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-networking/recipes-support/wireshark/{wireshark_4.2.7.bb => wireshark_4.2.9.bb} (97%) diff --git a/meta-networking/recipes-support/wireshark/wireshark_4.2.7.bb b/meta-networking/recipes-support/wireshark/wireshark_4.2.9.bb similarity index 97% rename from meta-networking/recipes-support/wireshark/wireshark_4.2.7.bb rename to meta-networking/recipes-support/wireshark/wireshark_4.2.9.bb index 0109fe6d2e..535dd21bf6 100644 --- a/meta-networking/recipes-support/wireshark/wireshark_4.2.7.bb +++ b/meta-networking/recipes-support/wireshark/wireshark_4.2.9.bb @@ -17,7 +17,7 @@ SRC_URI = "https://1.eu.dl.wireshark.org/src/wireshark-${PV}.tar.xz \ UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src" -SRC_URI[sha256sum] = "2c5de08e19081bd666a2ce3f052c023274d06acaabc5d667a3c3051a9c618f86" +SRC_URI[sha256sum] = "62c2b6652d7f9a50668867bd57b21609c9a9b6950f26e7f30a24b2de0e72ded3" PE = "1" From patchwork Fri Dec 20 15:36:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Marko, Peter" X-Patchwork-Id: 54507 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 658D9E77188 for ; Fri, 20 Dec 2024 15:38:13 +0000 (UTC) Received: from mta-64-228.siemens.flowmailer.net (mta-64-228.siemens.flowmailer.net [185.136.64.228]) by mx.groups.io with SMTP id smtpd.web10.154490.1734709084847643954 for ; Fri, 20 Dec 2024 07:38:05 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=peter.marko@siemens.com header.s=fm1 header.b=WiWxJmv8; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.64.228, mailfrom: fm-256628-20241220153802133b7f20100c67d01e-vmylgq@rts-flowmailer.siemens.com) Received: by mta-64-228.siemens.flowmailer.net with ESMTPSA id 20241220153802133b7f20100c67d01e for ; Fri, 20 Dec 2024 16:38:03 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=peter.marko@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=V1/omB3xqFUkCon/JP5VnXNAE53cYTtXXtenoDBA+rI=; b=WiWxJmv8nqMcMsK51HtCsMqBUAm7U4L7tkHwVUQKY0UEWwukrvlXTzIazKJsNwapQUtWiK +zT3pDp6vES029j/cyGjsdFHBFxA32tpEWgf+cLJJyfmP0wkuO+W9fsLRZ8Ta6kbsGw/4HNN qpPTGLOeEV+nwkZF9VNY87TtbFpP6BbJxQeVmHLKyGHmkOjY/8WbW8BV3EChgF368vnkzCyg zbSgzf71imwW0vAaPkp9QV6w1zAkTqAWK+iG1PVafDGMiJrgSrRrlzogqzzJeoS/ouSGcXSJ QUTYnJZNinHiVAul3Og+2f85maj2BengIepKjcGlEwk16p2NcianSZAg==; From: Peter Marko To: openembedded-devel@lists.openembedded.org Cc: Peter Marko Subject: [meta-oe][PATCH 11/11] weechat: upgrade 4.0.4 -> 4.5.0 Date: Fri, 20 Dec 2024 16:36:29 +0100 Message-Id: <20241220153629.2499631-12-peter.marko@siemens.com> In-Reply-To: <20241220153629.2499631-1-peter.marko@siemens.com> References: <20241220153629.2499631-1-peter.marko@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-256628:519-21489:flowmailer 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, 20 Dec 2024 15:38:13 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/114447 From: Peter Marko Solves CVE-2024-46613 Update dependencies: - remove openssl and icu - add cjson and gettext-native Remove patch to find gcrypt which is no longer needed. Signed-off-by: Peter Marko --- ...01-use-pkg-config-for-gcrypt-instead.patch | 37 ------------------- .../{weechat_4.0.4.bb => weechat_4.5.0.bb} | 8 ++-- 2 files changed, 3 insertions(+), 42 deletions(-) delete mode 100644 meta-networking/recipes-irc/weechat/weechat/0001-use-pkg-config-for-gcrypt-instead.patch rename meta-networking/recipes-irc/weechat/{weechat_4.0.4.bb => weechat_4.5.0.bb} (79%) diff --git a/meta-networking/recipes-irc/weechat/weechat/0001-use-pkg-config-for-gcrypt-instead.patch b/meta-networking/recipes-irc/weechat/weechat/0001-use-pkg-config-for-gcrypt-instead.patch deleted file mode 100644 index 4a33dd7204..0000000000 --- a/meta-networking/recipes-irc/weechat/weechat/0001-use-pkg-config-for-gcrypt-instead.patch +++ /dev/null @@ -1,37 +0,0 @@ -From dc6b11f4cc6035b4701e1d7f7c91b2f45757e7a2 Mon Sep 17 00:00:00 2001 -From: Alejandro Enedino Hernandez Samaniego - -Date: Wed, 26 Feb 2020 13:55:16 -0800 -Subject: [PATCH] use pkg-config for gcrypt instead - -Signed-off-by: Alejandro Enedino Hernandez Samaniego - -Upstream-Status: Inappropriate [oe-specific] - ---- - cmake/FindGCRYPT.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: weechat-2.7.1/cmake/FindGCRYPT.cmake -=================================================================== ---- weechat-2.7.1.orig/cmake/FindGCRYPT.cmake -+++ weechat-2.7.1/cmake/FindGCRYPT.cmake -@@ -27,15 +27,15 @@ - # GCRYPT_LDFLAGS = ldflags to use to compile - # - --find_program(LIBGCRYPT_CONFIG_EXECUTABLE NAMES libgcrypt-config) -+find_program(LIBGCRYPT_CONFIG_EXECUTABLE NAMES pkg-config) - - set(GCRYPT_LDFLAGS) - set(GCRYPT_CFLAGS) - - if(LIBGCRYPT_CONFIG_EXECUTABLE) - -- execute_process(COMMAND ${LIBGCRYPT_CONFIG_EXECUTABLE} --libs RESULT_VARIABLE _return_VALUE OUTPUT_VARIABLE GCRYPT_LDFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET) -- execute_process(COMMAND ${LIBGCRYPT_CONFIG_EXECUTABLE} --cflags RESULT_VARIABLE _return_VALUE OUTPUT_VARIABLE GCRYPT_CFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET) -+ execute_process(COMMAND ${LIBGCRYPT_CONFIG_EXECUTABLE} libgcrypt --libs RESULT_VARIABLE _return_VALUE OUTPUT_VARIABLE GCRYPT_LDFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET) -+ execute_process(COMMAND ${LIBGCRYPT_CONFIG_EXECUTABLE} libgcrypt --cflags RESULT_VARIABLE _return_VALUE OUTPUT_VARIABLE GCRYPT_CFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET) - - if(NOT DEFINED ${GCRYPT_CFLAGS}) - set(GCRYPT_CFLAGS " ") diff --git a/meta-networking/recipes-irc/weechat/weechat_4.0.4.bb b/meta-networking/recipes-irc/weechat/weechat_4.5.0.bb similarity index 79% rename from meta-networking/recipes-irc/weechat/weechat_4.0.4.bb rename to meta-networking/recipes-irc/weechat/weechat_4.5.0.bb index d13764e4c7..cca2bf4ecc 100644 --- a/meta-networking/recipes-irc/weechat/weechat_4.0.4.bb +++ b/meta-networking/recipes-irc/weechat/weechat_4.5.0.bb @@ -4,13 +4,11 @@ SECTION = "net" LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" -DEPENDS = "openssl zlib icu libgcrypt gnutls curl aspell zstd" +DEPENDS = "zlib libgcrypt gnutls curl aspell zstd cjson gettext-native" -SRC_URI = "https://weechat.org/files/src/weechat-${PV}.tar.xz \ - file://0001-use-pkg-config-for-gcrypt-instead.patch \ - " +SRC_URI = "https://weechat.org/files/src/weechat-${PV}.tar.xz" -SRC_URI[sha256sum] = "ae5f4979b5ada0339b84e741d5f7e481ee91e3fecd40a09907b64751829eb6f6" +SRC_URI[sha256sum] = "b85e800af0f7c9f2d60d72c0f7e56abbaa60274a4d47be17407907292da30398" inherit cmake pkgconfig