From patchwork Mon May 15 13:29:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 23954 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 9D03CC7EE2C for ; Mon, 15 May 2023 13:30:02 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.88211.1684157398181623813 for ; Mon, 15 May 2023 06:29:58 -0700 Authentication-Results: mx.groups.io; dkim=missing; 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 687C32F4; Mon, 15 May 2023 06:30:42 -0700 (PDT) Received: from oss-tx204.lab.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 45C223F67D; Mon, 15 May 2023 06:29:57 -0700 (PDT) From: ross.burton@arm.com To: openembedded-core@lists.openembedded.org Cc: nd@arm.com Subject: [PATCH 1/8] gnutls: add PACKAGECONFIG for DANE Date: Mon, 15 May 2023 14:29:48 +0100 Message-Id: <20230515132955.2231164-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 ; Mon, 15 May 2023 13:30:02 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181251 From: Ross Burton DANE (DNS-based Authentication of Named Entities) allows certificates to be bound to DNS entries. This requires unbound which is not part of oe-core. Add a PACKAGECONFIG but disable by default. Signed-off-by: Ross Burton --- meta/recipes-support/gnutls/gnutls_3.8.0.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/gnutls/gnutls_3.8.0.bb b/meta/recipes-support/gnutls/gnutls_3.8.0.bb index 7ddd2420bd5..e6b9a527a6d 100644 --- a/meta/recipes-support/gnutls/gnutls_3.8.0.bb +++ b/meta/recipes-support/gnutls/gnutls_3.8.0.bb @@ -40,10 +40,10 @@ PACKAGECONFIG[libtasn1] = "--with-included-libtasn1=no,--with-included-libtasn1, PACKAGECONFIG[p11-kit] = "--with-p11-kit,--without-p11-kit,p11-kit" PACKAGECONFIG[tpm] = "--with-tpm,--without-tpm,trousers" PACKAGECONFIG[fips] = "--enable-fips140-mode --with-libdl-prefix=${STAGING_BASELIBDIR}" +PACKAGECONFIG[dane] = "--enable-libdane,--disable-libdane,unbound" EXTRA_OECONF = " \ --enable-doc \ - --disable-libdane \ --disable-rpath \ --enable-openssl-compatibility \ --with-libpthread-prefix=${STAGING_DIR_HOST}${prefix} \ @@ -73,9 +73,11 @@ do_compile:append() { oe_runmake ${PARALLEL_MAKE} -C tests buildtest-TESTS } -PACKAGES =+ "${PN}-openssl ${PN}-xx ${PN}-fips" +PACKAGES =+ "${PN}-dane ${PN}-openssl ${PN}-xx ${PN}-fips" FILES:${PN}-dev += "${bindir}/gnutls-cli-debug" + +FILES:${PN}-dane = "${libdir}/libgnutls-dane.so.*" FILES:${PN}-openssl = "${libdir}/libgnutls-openssl.so.*" FILES:${PN}-xx = "${libdir}/libgnutlsxx.so.*" FILES:${PN}-fips = "${bindir}/fipshmac" From patchwork Mon May 15 13:29:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 23955 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 9CFFFC77B75 for ; Mon, 15 May 2023 13:30:02 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.88629.1684157398773477325 for ; Mon, 15 May 2023 06:29:59 -0700 Authentication-Results: mx.groups.io; dkim=missing; 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 1E3144B3; Mon, 15 May 2023 06:30:43 -0700 (PDT) Received: from oss-tx204.lab.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 E73B93F67D; Mon, 15 May 2023 06:29:57 -0700 (PDT) From: ross.burton@arm.com To: openembedded-core@lists.openembedded.org Cc: nd@arm.com Subject: [PATCH 2/8] gnutls: add PACKAGECONFIG options for certification compression Date: Mon, 15 May 2023 14:29:49 +0100 Message-Id: <20230515132955.2231164-2-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230515132955.2231164-1-ross.burton@arm.com> References: <20230515132955.2231164-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 ; Mon, 15 May 2023 13:30:02 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181252 From: Ross Burton GnuTLS has optional support for certificate compression. These are not widely enabled in other distributions and were previously disabled in standard builds, so don't enable them by default. Signed-off-by: Ross Burton --- meta/recipes-support/gnutls/gnutls_3.8.0.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/recipes-support/gnutls/gnutls_3.8.0.bb b/meta/recipes-support/gnutls/gnutls_3.8.0.bb index e6b9a527a6d..1e0f1f6912b 100644 --- a/meta/recipes-support/gnutls/gnutls_3.8.0.bb +++ b/meta/recipes-support/gnutls/gnutls_3.8.0.bb @@ -41,6 +41,10 @@ PACKAGECONFIG[p11-kit] = "--with-p11-kit,--without-p11-kit,p11-kit" PACKAGECONFIG[tpm] = "--with-tpm,--without-tpm,trousers" PACKAGECONFIG[fips] = "--enable-fips140-mode --with-libdl-prefix=${STAGING_BASELIBDIR}" PACKAGECONFIG[dane] = "--enable-libdane,--disable-libdane,unbound" +# Certificate compression +PACKAGECONFIG[brotli] = "--with-brotli,--without-brotli,brotli" +PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib" +PACKAGECONFIG[zstd] = "--with-zstd,--without-zstd,zstd" EXTRA_OECONF = " \ --enable-doc \ From patchwork Mon May 15 13:29:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 23960 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 D81AFC7EE30 for ; Mon, 15 May 2023 13:30:02 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.88212.1684157399371808871 for ; Mon, 15 May 2023 06:29:59 -0700 Authentication-Results: mx.groups.io; dkim=missing; 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 BEB322F4; Mon, 15 May 2023 06:30:43 -0700 (PDT) Received: from oss-tx204.lab.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 9D6023F67D; Mon, 15 May 2023 06:29:58 -0700 (PDT) From: ross.burton@arm.com To: openembedded-core@lists.openembedded.org Cc: nd@arm.com Subject: [PATCH 3/8] gnutls: use system libtasn1 Date: Mon, 15 May 2023 14:29:50 +0100 Message-Id: <20230515132955.2231164-3-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230515132955.2231164-1-ross.burton@arm.com> References: <20230515132955.2231164-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 ; Mon, 15 May 2023 13:30:02 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181253 From: Ross Burton Instead of using an internal ASN.1 parser, re-use libtasn1 from the system by default. Signed-off-by: Ross Burton --- meta/recipes-support/gnutls/gnutls_3.8.0.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/gnutls/gnutls_3.8.0.bb b/meta/recipes-support/gnutls/gnutls_3.8.0.bb index 1e0f1f6912b..0758eb15a93 100644 --- a/meta/recipes-support/gnutls/gnutls_3.8.0.bb +++ b/meta/recipes-support/gnutls/gnutls_3.8.0.bb @@ -30,13 +30,13 @@ SRC_URI[sha256sum] = "0ea0d11a1660a1e63f960f157b197abe6d0c8cb3255be24e1fb3815930 inherit autotools texinfo pkgconfig gettext lib_package gtk-doc ptest -PACKAGECONFIG ??= "libidn ${@bb.utils.filter('DISTRO_FEATURES', 'seccomp', d)}" +PACKAGECONFIG ??= "libidn libtasn1 ${@bb.utils.filter('DISTRO_FEATURES', 'seccomp', d)}" # You must also have CONFIG_SECCOMP enabled in the kernel for # seccomp to work. PACKAGECONFIG[seccomp] = "--with-libseccomp-prefix=${STAGING_EXECPREFIXDIR},ac_cv_libseccomp=no,libseccomp" PACKAGECONFIG[libidn] = "--with-idn,--without-idn,libidn2" -PACKAGECONFIG[libtasn1] = "--with-included-libtasn1=no,--with-included-libtasn1,libtasn1" +PACKAGECONFIG[libtasn1] = "--without-included-libtasn1,--with-included-libtasn1,libtasn1" PACKAGECONFIG[p11-kit] = "--with-p11-kit,--without-p11-kit,p11-kit" PACKAGECONFIG[tpm] = "--with-tpm,--without-tpm,trousers" PACKAGECONFIG[fips] = "--enable-fips140-mode --with-libdl-prefix=${STAGING_BASELIBDIR}" From patchwork Mon May 15 13:29:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 23957 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 B4683C7EE2F for ; Mon, 15 May 2023 13:30:02 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.88213.1684157400611989634 for ; Mon, 15 May 2023 06:30:00 -0700 Authentication-Results: mx.groups.io; dkim=missing; 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 7423A4B3; Mon, 15 May 2023 06:30:44 -0700 (PDT) Received: from oss-tx204.lab.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 49BAA3F67D; Mon, 15 May 2023 06:29:59 -0700 (PDT) From: ross.burton@arm.com To: openembedded-core@lists.openembedded.org Cc: nd@arm.com Subject: [PATCH 4/8] gnutls: clean up ptest compilation Date: Mon, 15 May 2023 14:29:51 +0100 Message-Id: <20230515132955.2231164-4-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230515132955.2231164-1-ross.burton@arm.com> References: <20230515132955.2231164-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 ; Mon, 15 May 2023 13:30:02 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181254 From: Ross Burton Don't always build the tests in do_compile, use do_compile_ptest so they are only built when needed. Signed-off-by: Ross Burton --- meta/recipes-support/gnutls/gnutls_3.8.0.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-support/gnutls/gnutls_3.8.0.bb b/meta/recipes-support/gnutls/gnutls_3.8.0.bb index 0758eb15a93..eef004efa5b 100644 --- a/meta/recipes-support/gnutls/gnutls_3.8.0.bb +++ b/meta/recipes-support/gnutls/gnutls_3.8.0.bb @@ -66,6 +66,10 @@ do_configure:prepend() { done } +do_compile_ptest() { + oe_runmake -C tests buildtest-TESTS +} + do_install:append:class-target() { if ${@bb.utils.contains('PACKAGECONFIG', 'fips', 'true', 'false', d)}; then install -d ${D}${bindir}/bin @@ -73,10 +77,6 @@ do_install:append:class-target() { fi } -do_compile:append() { - oe_runmake ${PARALLEL_MAKE} -C tests buildtest-TESTS -} - PACKAGES =+ "${PN}-dane ${PN}-openssl ${PN}-xx ${PN}-fips" FILES:${PN}-dev += "${bindir}/gnutls-cli-debug" From patchwork Mon May 15 13:29:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 23956 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 9F123C7EE26 for ; Mon, 15 May 2023 13:30:02 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.88214.1684157400831997322 for ; Mon, 15 May 2023 06:30:00 -0700 Authentication-Results: mx.groups.io; dkim=missing; 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 2BC7D2F4; Mon, 15 May 2023 06:30:45 -0700 (PDT) Received: from oss-tx204.lab.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 F34A43F67D; Mon, 15 May 2023 06:29:59 -0700 (PDT) From: ross.burton@arm.com To: openembedded-core@lists.openembedded.org Cc: nd@arm.com Subject: [PATCH 5/8] gnutls: remove use of argp-standalone for musl Date: Mon, 15 May 2023 14:29:52 +0100 Message-Id: <20230515132955.2231164-5-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230515132955.2231164-1-ross.burton@arm.com> References: <20230515132955.2231164-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 ; Mon, 15 May 2023 13:30:02 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181255 From: Ross Burton This was made obsoleten in 3.5.0 when crywrap was removed from the GnuTLS source tree. Signed-off-by: Ross Burton --- meta/recipes-support/gnutls/gnutls_3.8.0.bb | 3 --- 1 file changed, 3 deletions(-) diff --git a/meta/recipes-support/gnutls/gnutls_3.8.0.bb b/meta/recipes-support/gnutls/gnutls_3.8.0.bb index eef004efa5b..1e3f34b6c53 100644 --- a/meta/recipes-support/gnutls/gnutls_3.8.0.bb +++ b/meta/recipes-support/gnutls/gnutls_3.8.0.bb @@ -15,7 +15,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=71391c8e0c1cfe68077e7fce3b586283 \ file://doc/COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c" DEPENDS = "nettle gmp virtual/libiconv libunistring" -DEPENDS:append:libc-musl = " argp-standalone" SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" @@ -58,8 +57,6 @@ EXTRA_OECONF = " \ # Otherwise the tools try and use HOSTTOOLS_DIR/bash as a shell. export POSIX_SHELL="${base_bindir}/sh" -LDFLAGS:append:libc-musl = " -largp" - do_configure:prepend() { for dir in . lib; do rm -f ${dir}/aclocal.m4 ${dir}/m4/libtool.m4 ${dir}/m4/lt*.m4 From patchwork Mon May 15 13:29:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 23959 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 B4DF0C7EE2E for ; Mon, 15 May 2023 13:30:02 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.88630.1684157401472590806 for ; Mon, 15 May 2023 06:30:01 -0700 Authentication-Results: mx.groups.io; dkim=missing; 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 CA8B44B3; Mon, 15 May 2023 06:30:45 -0700 (PDT) Received: from oss-tx204.lab.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 A91633F67D; Mon, 15 May 2023 06:30:00 -0700 (PDT) From: ross.burton@arm.com To: openembedded-core@lists.openembedded.org Cc: nd@arm.com Subject: [PATCH 6/8] glib-networking: fix LICENSE statement Date: Mon, 15 May 2023 14:29:53 +0100 Message-Id: <20230515132955.2231164-6-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230515132955.2231164-1-ross.burton@arm.com> References: <20230515132955.2231164-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 ; Mon, 15 May 2023 13:30:02 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181256 From: Ross Burton The glib-networking license is LGPLv2.1 _or later_ and also has an additional exception if OpenSSL is being used. Add source comments to the checksum, and extend LICENSE if the openssl PACKAGECONFIG has been enabled. Signed-off-by: Ross Burton --- .../glib-networking/glib-networking_2.74.0.bb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/glib-networking/glib-networking_2.74.0.bb b/meta/recipes-core/glib-networking/glib-networking_2.74.0.bb index b3a88aca8db..ebf9e260508 100644 --- a/meta/recipes-core/glib-networking/glib-networking_2.74.0.bb +++ b/meta/recipes-core/glib-networking/glib-networking_2.74.0.bb @@ -3,8 +3,13 @@ DESCRIPTION = "glib-networking contains the implementations of certain GLib netw HOMEPAGE = "https://gitlab.gnome.org/GNOME/glib-networking/" BUGTRACKER = "http://bugzilla.gnome.org" -LICENSE = "LGPL-2.1-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" +LICENSE = "LGPL-2.1-or-later" +LICENSE:append = "${@bb.utils.contains('PACKAGECONFIG', 'openssl', ' & Glib-Networking-OpenSSL-Exception', '', d)}" +NO_GENERIC_LICENSE[Glib-Networking-OpenSSL-Exception] = "LICENSE_EXCEPTION" + +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ + file://LICENSE_EXCEPTION;md5=0f5be697951b5e71aff00f4a4ce66be8 \ + file://tls/base/gtlsconnection-base.c;beginline=7;endline=22;md5=ab641ac307f3337811008ea9afe7059f" SECTION = "libs" DEPENDS = "glib-2.0-native glib-2.0" From patchwork Mon May 15 13:29:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 23958 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 B40EDC7EE2D for ; Mon, 15 May 2023 13:30:02 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.88215.1684157402095117359 for ; Mon, 15 May 2023 06:30:02 -0700 Authentication-Results: mx.groups.io; dkim=missing; 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 8012C2F4; Mon, 15 May 2023 06:30:46 -0700 (PDT) Received: from oss-tx204.lab.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 556973F67D; Mon, 15 May 2023 06:30:01 -0700 (PDT) From: ross.burton@arm.com To: openembedded-core@lists.openembedded.org Cc: nd@arm.com Subject: [PATCH 7/8] glib-networking: add gnomeproxy PACKAGECONFIG Date: Mon, 15 May 2023 14:29:54 +0100 Message-Id: <20230515132955.2231164-7-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230515132955.2231164-1-ross.burton@arm.com> References: <20230515132955.2231164-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 ; Mon, 15 May 2023 13:30:02 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181257 From: Ross Burton Add a PACKAGECONFIG for the Gnome proxy configuration. Signed-off-by: Ross Burton --- meta/recipes-core/glib-networking/glib-networking_2.74.0.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta/recipes-core/glib-networking/glib-networking_2.74.0.bb b/meta/recipes-core/glib-networking/glib-networking_2.74.0.bb index ebf9e260508..4bd0d8cc425 100644 --- a/meta/recipes-core/glib-networking/glib-networking_2.74.0.bb +++ b/meta/recipes-core/glib-networking/glib-networking_2.74.0.bb @@ -22,8 +22,7 @@ PACKAGECONFIG[gnutls] = "-Dgnutls=enabled,-Dgnutls=disabled,gnutls" PACKAGECONFIG[openssl] = "-Dopenssl=enabled,-Dopenssl=disabled,openssl" PACKAGECONFIG[libproxy] = "-Dlibproxy=enabled,-Dlibproxy=disabled,libproxy" PACKAGECONFIG[tests] = "-Dinstalled_tests=true,-Dinstalled_tests=false" - -EXTRA_OEMESON = "-Dgnome_proxy=disabled" +PACKAGECONFIG[gnomeproxy] = "-Dgnome_proxy=enabled,-Dgnome_proxy=disabled,gsettings-desktop-schemas" GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gettext upstream-version-is-even gio-module-cache ptest-gnome From patchwork Mon May 15 13:29:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 23961 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 ADF23C77B7D for ; Mon, 15 May 2023 13:30:12 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.88217.1684157402839672385 for ; Mon, 15 May 2023 06:30:02 -0700 Authentication-Results: mx.groups.io; dkim=missing; 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 2C7FD4B3; Mon, 15 May 2023 06:30:47 -0700 (PDT) Received: from oss-tx204.lab.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 0B07B3F67D; Mon, 15 May 2023 06:30:01 -0700 (PDT) From: ross.burton@arm.com To: openembedded-core@lists.openembedded.org Cc: nd@arm.com Subject: [PATCH 8/8] glib-networking add environment variable proxy PACKAGECONFIG Date: Mon, 15 May 2023 14:29:55 +0100 Message-Id: <20230515132955.2231164-8-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230515132955.2231164-1-ross.burton@arm.com> References: <20230515132955.2231164-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 ; Mon, 15 May 2023 13:30:12 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181258 From: Ross Burton Add a PACKAGECONFIG for the environment variable proxy configuration (http_proxy, etc), and enable by default as this is the fallback provider if you're not using libproxy or gnomeproxy. Signed-off-by: Ross Burton --- meta/recipes-core/glib-networking/glib-networking_2.74.0.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/glib-networking/glib-networking_2.74.0.bb b/meta/recipes-core/glib-networking/glib-networking_2.74.0.bb index 4bd0d8cc425..fe6900b0363 100644 --- a/meta/recipes-core/glib-networking/glib-networking_2.74.0.bb +++ b/meta/recipes-core/glib-networking/glib-networking_2.74.0.bb @@ -16,10 +16,11 @@ DEPENDS = "glib-2.0-native glib-2.0" SRC_URI[archive.sha256sum] = "1f185aaef094123f8e25d8fa55661b3fd71020163a0174adb35a37685cda613b" -PACKAGECONFIG ??= "openssl ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" +PACKAGECONFIG ??= "openssl environment ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" PACKAGECONFIG[gnutls] = "-Dgnutls=enabled,-Dgnutls=disabled,gnutls" PACKAGECONFIG[openssl] = "-Dopenssl=enabled,-Dopenssl=disabled,openssl" +PACKAGECONFIG[environment] = "-Denvironment_proxy=enabled,-Denvironment_proxy=disabled" PACKAGECONFIG[libproxy] = "-Dlibproxy=enabled,-Dlibproxy=disabled,libproxy" PACKAGECONFIG[tests] = "-Dinstalled_tests=true,-Dinstalled_tests=false" PACKAGECONFIG[gnomeproxy] = "-Dgnome_proxy=enabled,-Dgnome_proxy=disabled,gsettings-desktop-schemas"