From patchwork Tue Nov 12 17:45:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 52368 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 5C0EDD42BBA for ; Tue, 12 Nov 2024 17:46:09 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.93119.1731433561959301341 for ; Tue, 12 Nov 2024 09:46:02 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 603EF1650 for ; Tue, 12 Nov 2024 09:46:31 -0800 (PST) Received: from cesw-amp-gbt-1s-m12830-04.oss.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 16B6C3F59E for ; Tue, 12 Nov 2024 09:46:00 -0800 (PST) From: Ross Burton To: openembedded-devel@lists.openembedded.org Subject: [PATCH 1/2] iksemel: remove Date: Tue, 12 Nov 2024 17:45:54 +0000 Message-Id: <20241112174555.1525173-1-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 12 Nov 2024 17:46:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/113797 Iksemel is a XML parser library that was designed for Jabber applications, but it has no users and hasn't been maintained for 13 years. Signed-off-by: Ross Burton --- .../packagegroups/packagegroup-meta-oe.bb | 1 - .../iksemel/avoid-obsolete-gnutls-apis.patch | 55 ---------------- .../fix-configure-option-parsing.patch | 62 ------------------- .../recipes-support/iksemel/iksemel_1.5.bb | 27 -------- 4 files changed, 145 deletions(-) delete mode 100644 meta-oe/recipes-support/iksemel/iksemel/avoid-obsolete-gnutls-apis.patch delete mode 100644 meta-oe/recipes-support/iksemel/iksemel/fix-configure-option-parsing.patch delete mode 100644 meta-oe/recipes-support/iksemel/iksemel_1.5.bb diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index 178256c83f..7071fa814e 100644 --- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -765,7 +765,6 @@ RDEPENDS:packagegroup-meta-oe-support = "\ hunspell-dictionaries \ hwdata \ icyque \ - iksemel \ imagemagick \ imapfilter \ iniparser \ diff --git a/meta-oe/recipes-support/iksemel/iksemel/avoid-obsolete-gnutls-apis.patch b/meta-oe/recipes-support/iksemel/iksemel/avoid-obsolete-gnutls-apis.patch deleted file mode 100644 index 41fccc3ab0..0000000000 --- a/meta-oe/recipes-support/iksemel/iksemel/avoid-obsolete-gnutls-apis.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 7136a908a056d0e36c89b6e1c39adff8ce2bb1d4 Mon Sep 17 00:00:00 2001 -From: Andre McCurdy -Date: Wed, 1 Nov 2017 13:17:34 -0700 -Subject: [PATCH] avoid obsolete gnutls apis - -The gnutls_*_set_priority() family of functions was marked deprecated -in gnutls 2.12.x and removed completely in 3.5.x. These functions -have been superceded by gnutls_priority_set_direct(), which was added -in gnutls 2.2.0 (released 2007-12-14). - -Rather than simply update the custom gnutls_*_set_priority() calls to -use gnutls_priority_set_direct(), drop the custom priority selection -completely and use the recommended approach of letting gnutls pick a -reasonable set of defaults. - -Upstream-Status: Pending - -Signed-off-by: Andre McCurdy ---- - src/tls-gnutls.c | 12 ++---------- - 1 file changed, 2 insertions(+), 10 deletions(-) - -diff --git a/src/tls-gnutls.c b/src/tls-gnutls.c -index d7b7c91..749e9ef 100644 ---- a/src/tls-gnutls.c -+++ b/src/tls-gnutls.c -@@ -48,11 +48,6 @@ tls_pull (struct ikstls_data *data, char *buffer, size_t len) - static int - tls_handshake (struct ikstls_data **datap, ikstransport *trans, void *sock) - { -- const int protocol_priority[] = { GNUTLS_TLS1, GNUTLS_SSL3, 0 }; -- const int kx_priority[] = { GNUTLS_KX_RSA, 0 }; -- const int cipher_priority[] = { GNUTLS_CIPHER_3DES_CBC, GNUTLS_CIPHER_ARCFOUR, 0}; -- const int comp_priority[] = { GNUTLS_COMP_ZLIB, GNUTLS_COMP_NULL, 0 }; -- const int mac_priority[] = { GNUTLS_MAC_SHA, GNUTLS_MAC_MD5, 0 }; - struct ikstls_data *data; - int ret; - -@@ -81,11 +76,8 @@ tls_handshake (struct ikstls_data **datap, ikstransport *trans, void *sock) - return IKS_NOMEM; - } - -- gnutls_protocol_set_priority (data->sess, protocol_priority); -- gnutls_cipher_set_priority(data->sess, cipher_priority); -- gnutls_compression_set_priority(data->sess, comp_priority); -- gnutls_kx_set_priority(data->sess, kx_priority); -- gnutls_mac_set_priority(data->sess, mac_priority); -+ gnutls_set_default_priority (data->sess); -+ - gnutls_credentials_set (data->sess, GNUTLS_CRD_CERTIFICATE, data->cred); - - gnutls_transport_set_push_function (data->sess, (gnutls_push_func) tls_push); --- -1.9.1 - diff --git a/meta-oe/recipes-support/iksemel/iksemel/fix-configure-option-parsing.patch b/meta-oe/recipes-support/iksemel/iksemel/fix-configure-option-parsing.patch deleted file mode 100644 index 05accdd9c8..0000000000 --- a/meta-oe/recipes-support/iksemel/iksemel/fix-configure-option-parsing.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 17a5cf8f70b86d8a2195562e2d9dcccb4fa35c83 Mon Sep 17 00:00:00 2001 -From: Andre McCurdy -Date: Tue, 31 Oct 2017 20:05:58 -0700 -Subject: [PATCH] fix configure option parsing - -Don't over-write with_openssl etc by trying to set to $enablevar - -Upstream-Status: Pending - -Signed-off-by: Andre McCurdy ---- - configure.ac | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 82e6d2d..823e6c1 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -56,17 +56,17 @@ fi - dnl Options for overriding TLS checks - AC_ARG_WITH([openssl], - AS_HELP_STRING([--without-openssl],[disable checking for openssl]), -- [with_openssl=$enableval], -- [with_openssl=yes] -+ [], -+ [with_openssl=auto] - ) - AC_ARG_WITH([gnutls], - AS_HELP_STRING([--without-gnutls],[disable checking for GNU TLS]), -- [with_gnutls=$enableval], -- [with_gnutls=yes] -+ [], -+ [with_gnutls=auto] - ) - - dnl Check OpenSSL --if test "x$with_openssl" = "xyes"; then -+if test "x$with_openssl" != "xno"; then - PKG_CHECK_MODULES([OPENSSL], openssl >= 0.9.8, have_openssl=yes, have_openssl=no) - if test "x$have_openssl" = "xyes"; then - LIBOPENSSL_CFLAGS="$OPENSSL_CFLAGS" -@@ -78,7 +78,7 @@ if test "x$with_openssl" = "xyes"; then - fi - - dnl Check GNU TLS --if test "x$with_gnutls" = "xyes"; then -+if test "x$with_gnutls" != "xno"; then - if test "x$have_openssl" != "xyes"; then - PKG_CHECK_MODULES([GNUTLS], gnutls >= 2.0.0, have_gnutls=yes, have_gnutls=no) - if test "x$have_gnutls" = "xyes"; then -@@ -94,7 +94,7 @@ fi - dnl Option for overriding Python check - AC_ARG_ENABLE([python], - AS_HELP_STRING([--disable-python],[disable checking for Python bindings]), -- [with_python=$enableval], -+ [], - [with_python=yes] - ) - --- -1.9.1 - diff --git a/meta-oe/recipes-support/iksemel/iksemel_1.5.bb b/meta-oe/recipes-support/iksemel/iksemel_1.5.bb deleted file mode 100644 index b27c2b2e8a..0000000000 --- a/meta-oe/recipes-support/iksemel/iksemel_1.5.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "Fast and portable XML parser and Jabber protocol library" -HOMEPAGE = "https://github.com/meduketto/iksemel" -SECTION = "libs" -LICENSE = "LGPL-2.1-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499" - -SRCREV = "978b733462e41efd5db72bc9974cb3b0d1d5f6fa" -PV = "1.5+git" - -SRC_URI = "git://github.com/meduketto/iksemel.git;protocol=https;branch=master \ - file://fix-configure-option-parsing.patch \ - file://avoid-obsolete-gnutls-apis.patch" - -# The current PV is not a git tag but a README content -UPSTREAM_CHECK_COMMITS = "1" - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig lib_package texinfo - -# TLS support requires either openssl or gnutls (if both are enabled openssl will be used). -PACKAGECONFIG ?= "gnutls" - -PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls" -PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl" - -EXTRA_OECONF = "--disable-python" From patchwork Tue Nov 12 17:45:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 52367 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 5E6EED42BBB for ; Tue, 12 Nov 2024 17:46:09 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.92617.1731433562533975621 for ; Tue, 12 Nov 2024 09:46:02 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 0DB9725E0 for ; Tue, 12 Nov 2024 09:46:32 -0800 (PST) Received: from cesw-amp-gbt-1s-m12830-04.oss.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id B35B33F59E for ; Tue, 12 Nov 2024 09:46:01 -0800 (PST) From: Ross Burton To: openembedded-devel@lists.openembedded.org Subject: [PATCH 2/2] tk: tk 8 needs tcl 8 Date: Tue, 12 Nov 2024 17:45:55 +0000 Message-Id: <20241112174555.1525173-2-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241112174555.1525173-1-ross.burton@arm.com> References: <20241112174555.1525173-1-ross.burton@arm.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 ; Tue, 12 Nov 2024 17:46:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/113798 oe-core now has Tcl 9, so Tk 8 needs to depend on tcl8 until we've upgraded tk to v9. Signed-off-by: Ross Burton --- meta-oe/recipes-devtools/tcltk/tk_8.6.15.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-devtools/tcltk/tk_8.6.15.bb b/meta-oe/recipes-devtools/tcltk/tk_8.6.15.bb index 1438a05625..ddd7043c0a 100644 --- a/meta-oe/recipes-devtools/tcltk/tk_8.6.15.bb +++ b/meta-oe/recipes-devtools/tcltk/tk_8.6.15.bb @@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://license.terms;md5=c88f99decec11afa967ad33d314f87fe \ file://xlib/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ " -DEPENDS = "tcl virtual/libx11 libxt" +DEPENDS = "tcl8 virtual/libx11 libxt" SRC_URI = "\ ${SOURCEFORGE_MIRROR}/tcl/${BPN}${PV}-src.tar.gz \