From: "Matt Turner" <mattst88@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/glib-networking/files/, net-libs/glib-networking/
Date: Wed, 17 May 2023 21:55:09 +0000 (UTC) [thread overview]
Message-ID: <1684360496.8f2b1b1fd4a0f646fb400b6b73405309d6a779c1.mattst88@gentoo> (raw)
commit: 8f2b1b1fd4a0f646fb400b6b73405309d6a779c1
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed May 17 21:13:46 2023 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed May 17 21:54:56 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f2b1b1f
net-libs/glib-networking: Drop old versions
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
net-libs/glib-networking/Manifest | 1 -
...lib-networking-2.74.0-gnutls-tls-1.3-test.patch | 85 ---------------------
.../glib-networking/glib-networking-2.74.0.ebuild | 86 ----------------------
3 files changed, 172 deletions(-)
diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index 955de7a6d71c..748365ad41cd 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -1,2 +1 @@
-DIST glib-networking-2.74.0.tar.xz 277232 BLAKE2B d0027a3beff276b2d0b008d1ed0bdeef231d8fb03c26c2e301a3eaef76ad4b704a5db36f6265c5516d73c5dbdb98c7c0919b6924038506dad0123f5ec77577b2 SHA512 f266c106f2c9379b95773a852c1b5c62ae1d6a758d25c436c3558f620d8e0a211201b3c4dfd89cdbe28b88430bba0cca621e62c01ea23d473983e203919bb1e6
DIST glib-networking-2.76.0.tar.xz 280852 BLAKE2B 418d747473054d00c0eb0258538f919ac077728157523a157a6e6c43a4cdd4554411a486dcdc6af05b1ece8b35884e4954a056d5a01c5118a37721c151b77b8b SHA512 dae704ad70312239379e1e66a4171e9315ee44e1785c9cb2563adc3f0bbab43d08a75873bfd2be12e3ed4210d4a7e177c9540815c8eb4bda89032c5354c4be30
diff --git a/net-libs/glib-networking/files/glib-networking-2.74.0-gnutls-tls-1.3-test.patch b/net-libs/glib-networking/files/glib-networking-2.74.0-gnutls-tls-1.3-test.patch
deleted file mode 100644
index b93cb8ab9828..000000000000
--- a/net-libs/glib-networking/files/glib-networking-2.74.0-gnutls-tls-1.3-test.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-https://bugs.gentoo.org/877077
-https://gitlab.gnome.org/GNOME/glib-networking/-/issues/201
-https://gitlab.gnome.org/GNOME/glib-networking/-/commit/205b578c6de0a6b42dd24d97f08ab47d0347431a
-
-From 205b578c6de0a6b42dd24d97f08ab47d0347431a Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Wed, 2 Nov 2022 13:26:53 +0100
-Subject: [PATCH] tests: skip tls-exporter test for TLS 1.2
-
-TLS exporter does not exist before TLS 1.3 so skip the tls-exporter test
-for TLS 1.2.
-
-Fixes https://gitlab.gnome.org/GNOME/glib-networking/-/issues/201
-
-Part-of: <https://gitlab.gnome.org/GNOME/glib-networking/-/merge_requests/227>
---- a/tls/tests/connection.c
-+++ b/tls/tests/connection.c
-@@ -2988,6 +2988,8 @@ test_connection_binding_match_tls_exporter (TestConnection *test,
- GByteArray *client_cb, *server_cb;
- gchar *client_b64, *server_b64;
- GError *error = NULL;
-+ gboolean client_supports_tls_exporter;
-+ gboolean server_supports_tls_exporter;
-
- test->database = g_tls_file_database_new (tls_test_file_path ("ca-roots.pem"), &error);
- g_assert_no_error (error);
-@@ -3016,27 +3018,38 @@ test_connection_binding_match_tls_exporter (TestConnection *test,
- g_main_loop_run (test->loop);
-
- /* Smoke test: ensure both sides support tls-exporter */
-- g_assert_true (g_tls_connection_get_channel_binding_data (G_TLS_CONNECTION (test->client_connection),
-- G_TLS_CHANNEL_BINDING_TLS_EXPORTER, NULL, NULL));
-- g_assert_true (g_tls_connection_get_channel_binding_data (G_TLS_CONNECTION (test->server_connection),
-- G_TLS_CHANNEL_BINDING_TLS_EXPORTER, NULL, NULL));
-+ client_supports_tls_exporter = g_tls_connection_get_channel_binding_data (G_TLS_CONNECTION (test->client_connection),
-+ G_TLS_CHANNEL_BINDING_TLS_EXPORTER, NULL, NULL);
-+ server_supports_tls_exporter = g_tls_connection_get_channel_binding_data (G_TLS_CONNECTION (test->server_connection),
-+ G_TLS_CHANNEL_BINDING_TLS_EXPORTER, NULL, NULL);
-
-- /* Real test: retrieve bindings and compare */
-- client_cb = g_byte_array_new ();
-- server_cb = g_byte_array_new ();
-- g_assert_true (g_tls_connection_get_channel_binding_data (G_TLS_CONNECTION (test->client_connection),
-- G_TLS_CHANNEL_BINDING_TLS_EXPORTER, client_cb, NULL));
-- g_assert_true (g_tls_connection_get_channel_binding_data (G_TLS_CONNECTION (test->server_connection),
-- G_TLS_CHANNEL_BINDING_TLS_EXPORTER, server_cb, NULL));
-+ g_assert_true (client_supports_tls_exporter == server_supports_tls_exporter);
-
-- client_b64 = g_base64_encode (client_cb->data, client_cb->len);
-- server_b64 = g_base64_encode (server_cb->data, server_cb->len);
-- g_assert_cmpstr (client_b64, ==, server_b64);
-+ if (client_supports_tls_exporter)
-+ {
-+ /* Real test: retrieve bindings and compare */
-+ client_cb = g_byte_array_new ();
-+ server_cb = g_byte_array_new ();
-+ g_assert_true (g_tls_connection_get_channel_binding_data (G_TLS_CONNECTION (test->client_connection),
-+ G_TLS_CHANNEL_BINDING_TLS_EXPORTER, client_cb, NULL));
-+ g_assert_true (g_tls_connection_get_channel_binding_data (G_TLS_CONNECTION (test->server_connection),
-+ G_TLS_CHANNEL_BINDING_TLS_EXPORTER, server_cb, NULL));
-
-- g_free (client_b64);
-- g_free (server_b64);
-- g_byte_array_unref (client_cb);
-- g_byte_array_unref (server_cb);
-+ client_b64 = g_base64_encode (client_cb->data, client_cb->len);
-+ server_b64 = g_base64_encode (server_cb->data, server_cb->len);
-+ g_assert_cmpstr (client_b64, ==, server_b64);
-+
-+ g_free (client_b64);
-+ g_free (server_b64);
-+ g_byte_array_unref (client_cb);
-+ g_byte_array_unref (server_cb);
-+ }
-+ else
-+ {
-+ g_assert_true (g_tls_connection_get_protocol_version (
-+ G_TLS_CONNECTION (test->client_connection)) == G_TLS_PROTOCOL_VERSION_TLS_1_2);
-+ g_test_skip ("tls-exporter is not supported before TLS 1.3");
-+ }
-
- /* drop the mic */
- close_server_connection (test);
---
-GitLab
diff --git a/net-libs/glib-networking/glib-networking-2.74.0.ebuild b/net-libs/glib-networking/glib-networking-2.74.0.ebuild
deleted file mode 100644
index df3083026204..000000000000
--- a/net-libs/glib-networking/glib-networking-2.74.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson-multilib xdg
-
-DESCRIPTION="Network-related giomodules for glib"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/glib-networking"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="+gnome +libproxy +ssl test"
-RESTRICT="!test? ( test )"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
- >=dev-libs/glib-2.73.3:2[${MULTILIB_USEDEP}]
- libproxy? ( >=net-libs/libproxy-0.4.16:=[${MULTILIB_USEDEP}] )
- >=net-libs/gnutls-3.7.4:=[${MULTILIB_USEDEP}]
- ssl? ( app-misc/ca-certificates )
- gnome? ( gnome-base/gsettings-desktop-schemas )
-"
-DEPEND="${RDEPEND}
- test? ( net-libs/gnutls[pkcs11] )
-"
-BDEPEND="
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
- test? ( sys-apps/dbus )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.74.0-gnutls-tls-1.3-test.patch
-)
-
-src_prepare() {
- default
- xdg_environment_reset
-
- if ! use test ; then
- # Don't build tests unconditionally
- # This is a hack to avoid needing gnutls[pkcs11] when USE=-test
- # It may become a real runtime dependency in future
- # Please check!
- # bug #777462
- sed -i "/^subdir('tests')/d" tls/meson.build || die
- fi
-}
-
-multilib_src_configure() {
- local emesonargs=(
- -Dgnutls=enabled
- -Dopenssl=disabled
- $(meson_feature !libproxy environment_proxy)
- $(meson_feature libproxy)
- $(meson_feature gnome gnome_proxy)
- -Dinstalled_tests=false
- -Ddebug_logs=false
- )
- meson_src_configure
-}
-
-multilib_src_test() {
- dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- multilib_pkg_postinst() {
- gnome2_giomodule_cache_update \
- || die "Update GIO modules cache failed (for ${ABI})"
- }
- multilib_foreach_abi multilib_pkg_postinst
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
-
- multilib_pkg_postrm() {
- gnome2_giomodule_cache_update \
- || die "Update GIO modules cache failed (for ${ABI})"
- }
- multilib_foreach_abi multilib_pkg_postrm
-}
next reply other threads:[~2023-05-17 21:55 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-17 21:55 Matt Turner [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-09-05 20:28 [gentoo-commits] repo/gentoo:master commit in: net-libs/glib-networking/files/, net-libs/glib-networking/ Matt Turner
2023-06-16 0:04 Sam James
2020-01-11 19:24 Mart Raudsepp
2019-01-17 19:36 Mart Raudsepp
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1684360496.8f2b1b1fd4a0f646fb400b6b73405309d6a779c1.mattst88@gentoo \
--to=mattst88@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox