* [gentoo-commits] repo/gentoo:master commit in: net-libs/glib-networking/files/, net-libs/glib-networking/
@ 2019-01-17 19:36 Mart Raudsepp
0 siblings, 0 replies; 5+ messages in thread
From: Mart Raudsepp @ 2019-01-17 19:36 UTC (permalink / raw
To: gentoo-commits
commit: d2e4db289aa5671d58a414a972faeafa5d507b0e
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 17 19:16:34 2019 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Thu Jan 17 19:35:37 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2e4db28
net-libs/glib-networking: bump to 2.58.0 - works better with gnutls-3.6
2.58.0 (and maybe 2.56.x) is enough to have a working TLS 1.3 when
gnutls is upgraded to 3.6. glib-networking-2.59.1 just makes test suite
work for that - we comment out those tests for 2.58.0 for now instead.
Closes: https://bugs.gentoo.org/675252
Closes: https://bugs.gentoo.org/673448
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
net-libs/glib-networking/Manifest | 1 +
.../files/2.58.0-disable-failing-tests.patch | 36 +++++++++++
.../glib-networking/glib-networking-2.58.0.ebuild | 75 ++++++++++++++++++++++
3 files changed, 112 insertions(+)
diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index 44c5644f139..a5993fb07b3 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -1,2 +1,3 @@
DIST glib-networking-2.50.0.tar.xz 435380 BLAKE2B 02eea0692cf20c9b1df8efc7e65eb144675fa307851450d461a73df6ccd55cb2ad4e8db5790ca8b0a38a14e30391e583dada30e858154e7c5b7fa0970658410a SHA512 a1e9d28a546f83d461057f088ca2467a32be110f444c8ede1cbfeb20244637d8d5fb5b5b0ee4485feb517beebc3536671442bbfdd3ba01663b52e6da138bd7fe
DIST glib-networking-2.54.1.tar.xz 441232 BLAKE2B 4697ac5fe248d12839d2a3c1340e2e699fa2ea65a9b5d741c50d069c904e82eb23feb89d648bc127959d9ac15e18d3a4cd2bd8b08202d48d33937affb9df13c9 SHA512 8356d835914e33df43f4f2bb6a915ddcd48dd0565e4d5bc1f1d692e9c3124ee4421b99f87f2586f74e9fed24ef7421159f3242fd1eb7bd74950bd25e860896ec
+DIST glib-networking-2.58.0.tar.xz 172632 BLAKE2B 2b1e478ecac7ffb25f0d4e319fc71f7a0c6d9bd4181a5e8abb310d11774491312b0ff1c81b9d8b383ae0b236ece89253d6bd222740199d816c94ea557b4e3511 SHA512 d9cfd97ef9905eceb1f807a7d18c648fcf148214bf3fc55c718c5bcd6fb0afc429ab5b7bf72e83cf959d5ce7f145ce17952c1288d4225cc99d3c6ad66e4494ff
diff --git a/net-libs/glib-networking/files/2.58.0-disable-failing-tests.patch b/net-libs/glib-networking/files/2.58.0-disable-failing-tests.patch
new file mode 100644
index 00000000000..c3802392e3b
--- /dev/null
+++ b/net-libs/glib-networking/files/2.58.0-disable-failing-tests.patch
@@ -0,0 +1,36 @@
+From 7fd8c24182ea054d6d890b6f6325e63458a10392 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Thu, 17 Jan 2019 21:03:06 +0200
+Subject: [PATCH] tests: Disable test that fails with gnutls-3.6 (or in
+ general)
+
+Tests for TLS 1.3 are still problematic on 2.58.x releases; should
+be better once 2.60 comes out, but the changes are still being worked
+on and would cause regressions for real world programs right now if
+backported.
+---
+ tls/tests/connection.c | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/tls/tests/connection.c b/tls/tests/connection.c
+index 6087efc..accca78 100644
+--- a/tls/tests/connection.c
++++ b/tls/tests/connection.c
+@@ -2017,14 +2017,10 @@ main (int argc,
+ setup_connection, test_client_auth_connection, teardown_connection);
+ g_test_add ("/tls/connection/client-auth-rehandshake", TestConnection, NULL,
+ setup_connection, test_client_auth_rehandshake, teardown_connection);
+- g_test_add ("/tls/connection/client-auth-failure", TestConnection, NULL,
+- setup_connection, test_client_auth_failure, teardown_connection);
+ g_test_add ("/tls/connection/client-auth-fail-missing-client-private-key", TestConnection, NULL,
+ setup_connection, test_client_auth_fail_missing_client_private_key, teardown_connection);
+ g_test_add ("/tls/connection/client-auth-request-cert", TestConnection, NULL,
+ setup_connection, test_client_auth_request_cert, teardown_connection);
+- g_test_add ("/tls/connection/client-auth-request-fail", TestConnection, NULL,
+- setup_connection, test_client_auth_request_fail, teardown_connection);
+ g_test_add ("/tls/connection/no-database", TestConnection, NULL,
+ setup_connection, test_connection_no_database, teardown_connection);
+ g_test_add ("/tls/connection/failed", TestConnection, NULL,
+--
+2.17.0
+
diff --git a/net-libs/glib-networking/glib-networking-2.58.0.ebuild b/net-libs/glib-networking/glib-networking-2.58.0.ebuild
new file mode 100644
index 00000000000..0bb5dd626f7
--- /dev/null
+++ b/net-libs/glib-networking/glib-networking-2.58.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome.org gnome2-utils meson multilib-minimal xdg
+
+DESCRIPTION="Network-related giomodules for glib"
+HOMEPAGE="https://git.gnome.org/browse/glib-networking/"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="+gnome +libproxy +ssl test"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+ >=dev-libs/glib-2.55.1:2[${MULTILIB_USEDEP}]
+ libproxy? ( >=net-libs/libproxy-0.4.11-r1:=[${MULTILIB_USEDEP}] )
+ >=net-libs/gnutls-3:=[${MULTILIB_USEDEP}]
+ ssl? ( app-misc/ca-certificates )
+ gnome? ( gnome-base/gsettings-desktop-schemas )
+"
+DEPEND="${RDEPEND}
+ >=dev-util/meson-0.46
+ >=sys-devel/gettext-0.19.8
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+ test? ( sys-apps/dbus )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PV}-disable-failing-tests.patch # shouldn't be needed with 2.60
+)
+
+multilib_src_configure() {
+ local emesonargs=(
+ $(meson_use libproxy libproxy_support)
+ $(meson_use gnome gnome_proxy_support)
+ -Dpkcs11_support=false # deprecated, functionality should be available without it; removed in next version
+ -Dinstalled_tests=false
+ -Dstatic_modules=false
+ )
+ meson_src_configure
+}
+
+multilib_src_compile() {
+ meson_src_compile
+}
+
+multilib_src_install() {
+ meson_src_install
+}
+
+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
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/glib-networking/files/, net-libs/glib-networking/
@ 2020-01-11 19:24 Mart Raudsepp
0 siblings, 0 replies; 5+ messages in thread
From: Mart Raudsepp @ 2020-01-11 19:24 UTC (permalink / raw
To: gentoo-commits
commit: 706d78ec10b1e9212e2296289be24bf9708f76ca
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 11 19:13:01 2020 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Jan 11 19:13:24 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=706d78ec
net-libs/glib-networking: remove old
Package-Manager: Portage-2.3.79, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
net-libs/glib-networking/Manifest | 1 -
.../files/2.58.0-disable-failing-tests.patch | 36 ----------
.../glib-networking/glib-networking-2.58.0.ebuild | 76 ----------------------
3 files changed, 113 deletions(-)
diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index 5abdabecc35..7e2283e2162 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -1,3 +1,2 @@
-DIST glib-networking-2.58.0.tar.xz 172632 BLAKE2B 2b1e478ecac7ffb25f0d4e319fc71f7a0c6d9bd4181a5e8abb310d11774491312b0ff1c81b9d8b383ae0b236ece89253d6bd222740199d816c94ea557b4e3511 SHA512 d9cfd97ef9905eceb1f807a7d18c648fcf148214bf3fc55c718c5bcd6fb0afc429ab5b7bf72e83cf959d5ce7f145ce17952c1288d4225cc99d3c6ad66e4494ff
DIST glib-networking-2.60.3.tar.xz 185132 BLAKE2B 8bbe2b8afb779bac99bd554c384bdbf9e197e9b71dc6fe213cdd4352d95ce19d1c9786747ba5c721fc35bdda3e1325e9620c1ef15ca1fa1e294aad9ab3f9a4bc SHA512 06a50aee1a563f5e992549e963d3980b02c9068976a244ce4a84eb0aca064b2ab7e8d50e3ef26dbd0d8d5edbddc82c5ce83d4a93bfaa0822b79465f0d3b8609f
DIST glib-networking-2.60.4.tar.xz 185628 BLAKE2B b10fecb88f09c4c33718a923f6ae5790baada485b4dd3637b0ae9bf5f831b74ac4b87fc398eed4c4a88b7069e4c5bc9a58c04ccbffc056648baa58b43d4489a3 SHA512 db1019c0fc712c0702679146bdd9490101cec63796792a33c7fc7fe26a85d343cfb11f718601a8d3bd91167505bbe60333cc01999a0496826c31681bb8dd4032
diff --git a/net-libs/glib-networking/files/2.58.0-disable-failing-tests.patch b/net-libs/glib-networking/files/2.58.0-disable-failing-tests.patch
deleted file mode 100644
index c3802392e3b..00000000000
--- a/net-libs/glib-networking/files/2.58.0-disable-failing-tests.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 7fd8c24182ea054d6d890b6f6325e63458a10392 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Thu, 17 Jan 2019 21:03:06 +0200
-Subject: [PATCH] tests: Disable test that fails with gnutls-3.6 (or in
- general)
-
-Tests for TLS 1.3 are still problematic on 2.58.x releases; should
-be better once 2.60 comes out, but the changes are still being worked
-on and would cause regressions for real world programs right now if
-backported.
----
- tls/tests/connection.c | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/tls/tests/connection.c b/tls/tests/connection.c
-index 6087efc..accca78 100644
---- a/tls/tests/connection.c
-+++ b/tls/tests/connection.c
-@@ -2017,14 +2017,10 @@ main (int argc,
- setup_connection, test_client_auth_connection, teardown_connection);
- g_test_add ("/tls/connection/client-auth-rehandshake", TestConnection, NULL,
- setup_connection, test_client_auth_rehandshake, teardown_connection);
-- g_test_add ("/tls/connection/client-auth-failure", TestConnection, NULL,
-- setup_connection, test_client_auth_failure, teardown_connection);
- g_test_add ("/tls/connection/client-auth-fail-missing-client-private-key", TestConnection, NULL,
- setup_connection, test_client_auth_fail_missing_client_private_key, teardown_connection);
- g_test_add ("/tls/connection/client-auth-request-cert", TestConnection, NULL,
- setup_connection, test_client_auth_request_cert, teardown_connection);
-- g_test_add ("/tls/connection/client-auth-request-fail", TestConnection, NULL,
-- setup_connection, test_client_auth_request_fail, teardown_connection);
- g_test_add ("/tls/connection/no-database", TestConnection, NULL,
- setup_connection, test_connection_no_database, teardown_connection);
- g_test_add ("/tls/connection/failed", TestConnection, NULL,
---
-2.17.0
-
diff --git a/net-libs/glib-networking/glib-networking-2.58.0.ebuild b/net-libs/glib-networking/glib-networking-2.58.0.ebuild
deleted file mode 100644
index 7111b4ab166..00000000000
--- a/net-libs/glib-networking/glib-networking-2.58.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome.org gnome2-utils meson multilib-minimal xdg
-
-DESCRIPTION="Network-related giomodules for glib"
-HOMEPAGE="https://git.gnome.org/browse/glib-networking/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="+gnome +libproxy +ssl test"
-RESTRICT="!test? ( test )"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
- >=dev-libs/glib-2.55.1:2[${MULTILIB_USEDEP}]
- libproxy? ( >=net-libs/libproxy-0.4.11-r1:=[${MULTILIB_USEDEP}] )
- >=net-libs/gnutls-3:=[${MULTILIB_USEDEP}]
- ssl? ( app-misc/ca-certificates )
- gnome? ( gnome-base/gsettings-desktop-schemas )
-"
-DEPEND="${RDEPEND}
- >=dev-util/meson-0.46
- >=sys-devel/gettext-0.19.8
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
- test? ( sys-apps/dbus )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PV}-disable-failing-tests.patch # shouldn't be needed with 2.60
-)
-
-multilib_src_configure() {
- local emesonargs=(
- $(meson_use libproxy libproxy_support)
- $(meson_use gnome gnome_proxy_support)
- -Dpkcs11_support=false # deprecated, functionality should be available without it; removed in next version
- -Dinstalled_tests=false
- -Dstatic_modules=false
- )
- meson_src_configure
-}
-
-multilib_src_compile() {
- meson_src_compile
-}
-
-multilib_src_install() {
- meson_src_install
-}
-
-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
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/glib-networking/files/, net-libs/glib-networking/
@ 2023-05-17 21:55 Matt Turner
0 siblings, 0 replies; 5+ messages in thread
From: Matt Turner @ 2023-05-17 21:55 UTC (permalink / raw
To: gentoo-commits
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
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/glib-networking/files/, net-libs/glib-networking/
@ 2023-06-16 0:04 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2023-06-16 0:04 UTC (permalink / raw
To: gentoo-commits
commit: 19b82f87d352cd13932ec5b4892e65baecb4abca
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 15 23:47:20 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 15 23:47:20 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19b82f87
net-libs/glib-networking: fix tests w/ >-libproxy-0.5.0
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../glib-networking-2.76.0-libproxy-0.5.patch | 65 ++++++++++++++++++++++
.../glib-networking/glib-networking-2.76.0.ebuild | 4 ++
2 files changed, 69 insertions(+)
diff --git a/net-libs/glib-networking/files/glib-networking-2.76.0-libproxy-0.5.patch b/net-libs/glib-networking/files/glib-networking-2.76.0-libproxy-0.5.patch
new file mode 100644
index 000000000000..e59fe9a07416
--- /dev/null
+++ b/net-libs/glib-networking/files/glib-networking-2.76.0-libproxy-0.5.patch
@@ -0,0 +1,65 @@
+https://bugs.gentoo.org/907303
+https://gitlab.gnome.org/GNOME/glib-networking/-/commit/a7db10e8862050f19af5c2eebcd1d590a04d5ced
+
+From a7db10e8862050f19af5c2eebcd1d590a04d5ced Mon Sep 17 00:00:00 2001
+From: Jan-Michael Brummer <jan.brummer@tabos.org>
+Date: Tue, 13 Jun 2023 17:10:11 +0200
+Subject: [PATCH] Fix tests using libproxy 0.5
+
+New libproxy 0.5 now behaves just like glib, additional checks aren't
+needed.
+
+Fixes: https://gitlab.gnome.org/GNOME/glib-networking/-/issues/212
+--- a/proxy/tests/common.c
++++ b/proxy/tests/common.c
+@@ -172,13 +172,15 @@ static void
+ test_proxy_ignore_common (void)
+ {
+ GProxyResolver *resolver;
+- gboolean is_libproxy;
+ GError *error = NULL;
+ char **proxies;
+ int i;
+
++#ifndef LIBPROXY_0_5
++ gboolean is_libproxy = g_strcmp0 (g_getenv ("GIO_PROXY_TEST_NAME"), "libproxy") == 0;
++#endif
++
+ resolver = g_proxy_resolver_get_default ();
+- is_libproxy = g_strcmp0 (g_getenv ("GIO_PROXY_TEST_NAME"), "libproxy") == 0;
+
+ for (i = 0; i < n_ignore_tests; i++)
+ {
+@@ -186,9 +188,11 @@ test_proxy_ignore_common (void)
+ NULL, &error);
+ g_assert_no_error (error);
+
++#ifndef LIBPROXY_0_5
+ if (is_libproxy && ignore_tests[i].libproxy_fails)
+ g_assert_cmpstr (proxies[0], ==, "http://localhost:8080");
+ else
++#endif
+ g_assert_cmpstr (proxies[0], ==, ignore_tests[i].proxy);
+
+ g_strfreev (proxies);
+--- a/proxy/tests/meson.build
++++ b/proxy/tests/meson.build
+@@ -18,9 +18,16 @@ foreach program: proxy_test_programs
+ )
+ endif
+
++ c_flags = []
++
++ if libproxy_dep.version() >= '0.5.0'
++ c_flags += '-DLIBPROXY_0_5'
++ endif
++
+ exe = executable(
+ test_name,
+ program[0] + '.c',
++ c_args : c_flags,
+ include_directories: top_inc,
+ dependencies: program[2],
+ install: enable_installed_tests,
+--
+GitLab
diff --git a/net-libs/glib-networking/glib-networking-2.76.0.ebuild b/net-libs/glib-networking/glib-networking-2.76.0.ebuild
index 63096b664380..349108fee1a8 100644
--- a/net-libs/glib-networking/glib-networking-2.76.0.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.76.0.ebuild
@@ -30,6 +30,10 @@ BDEPEND="
test? ( sys-apps/dbus )
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.76.0-libproxy-0.5.patch
+)
+
src_prepare() {
default
xdg_environment_reset
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/glib-networking/files/, net-libs/glib-networking/
@ 2023-09-05 20:28 Matt Turner
0 siblings, 0 replies; 5+ messages in thread
From: Matt Turner @ 2023-09-05 20:28 UTC (permalink / raw
To: gentoo-commits
commit: 15d180e881dd776f10cf2ce8222563970bdf57e0
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 5 19:06:09 2023 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Sep 5 20:28:32 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15d180e8
net-libs/glib-networking: Drop old versions
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
net-libs/glib-networking/Manifest | 1 -
.../glib-networking-2.76.0-libproxy-0.5.patch | 65 ----------------
.../glib-networking/glib-networking-2.76.0.ebuild | 86 ----------------------
3 files changed, 152 deletions(-)
diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index c740845b38ea..f09cf7ff9d53 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -1,2 +1 @@
-DIST glib-networking-2.76.0.tar.xz 280852 BLAKE2B 418d747473054d00c0eb0258538f919ac077728157523a157a6e6c43a4cdd4554411a486dcdc6af05b1ece8b35884e4954a056d5a01c5118a37721c151b77b8b SHA512 dae704ad70312239379e1e66a4171e9315ee44e1785c9cb2563adc3f0bbab43d08a75873bfd2be12e3ed4210d4a7e177c9540815c8eb4bda89032c5354c4be30
DIST glib-networking-2.76.1.tar.xz 280896 BLAKE2B d4fb8e30096e2e0bdca183795e5d6f86f13c887ad61a52a46dd2af90756ced41e540f286b2cdafb4655cf337758e3742508c0e62e0ea3850ab293cd04e12488e SHA512 9da7844dc767c8dc33953bf984aa9fcc12ac6f9945b55b9c0ec34ecf13592deefead37dc27b048f564dc423286224c041b9842034e197d90f93822128fab4f97
diff --git a/net-libs/glib-networking/files/glib-networking-2.76.0-libproxy-0.5.patch b/net-libs/glib-networking/files/glib-networking-2.76.0-libproxy-0.5.patch
deleted file mode 100644
index e59fe9a07416..000000000000
--- a/net-libs/glib-networking/files/glib-networking-2.76.0-libproxy-0.5.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-https://bugs.gentoo.org/907303
-https://gitlab.gnome.org/GNOME/glib-networking/-/commit/a7db10e8862050f19af5c2eebcd1d590a04d5ced
-
-From a7db10e8862050f19af5c2eebcd1d590a04d5ced Mon Sep 17 00:00:00 2001
-From: Jan-Michael Brummer <jan.brummer@tabos.org>
-Date: Tue, 13 Jun 2023 17:10:11 +0200
-Subject: [PATCH] Fix tests using libproxy 0.5
-
-New libproxy 0.5 now behaves just like glib, additional checks aren't
-needed.
-
-Fixes: https://gitlab.gnome.org/GNOME/glib-networking/-/issues/212
---- a/proxy/tests/common.c
-+++ b/proxy/tests/common.c
-@@ -172,13 +172,15 @@ static void
- test_proxy_ignore_common (void)
- {
- GProxyResolver *resolver;
-- gboolean is_libproxy;
- GError *error = NULL;
- char **proxies;
- int i;
-
-+#ifndef LIBPROXY_0_5
-+ gboolean is_libproxy = g_strcmp0 (g_getenv ("GIO_PROXY_TEST_NAME"), "libproxy") == 0;
-+#endif
-+
- resolver = g_proxy_resolver_get_default ();
-- is_libproxy = g_strcmp0 (g_getenv ("GIO_PROXY_TEST_NAME"), "libproxy") == 0;
-
- for (i = 0; i < n_ignore_tests; i++)
- {
-@@ -186,9 +188,11 @@ test_proxy_ignore_common (void)
- NULL, &error);
- g_assert_no_error (error);
-
-+#ifndef LIBPROXY_0_5
- if (is_libproxy && ignore_tests[i].libproxy_fails)
- g_assert_cmpstr (proxies[0], ==, "http://localhost:8080");
- else
-+#endif
- g_assert_cmpstr (proxies[0], ==, ignore_tests[i].proxy);
-
- g_strfreev (proxies);
---- a/proxy/tests/meson.build
-+++ b/proxy/tests/meson.build
-@@ -18,9 +18,16 @@ foreach program: proxy_test_programs
- )
- endif
-
-+ c_flags = []
-+
-+ if libproxy_dep.version() >= '0.5.0'
-+ c_flags += '-DLIBPROXY_0_5'
-+ endif
-+
- exe = executable(
- test_name,
- program[0] + '.c',
-+ c_args : c_flags,
- include_directories: top_inc,
- dependencies: program[2],
- install: enable_installed_tests,
---
-GitLab
diff --git a/net-libs/glib-networking/glib-networking-2.76.0.ebuild b/net-libs/glib-networking/glib-networking-2.76.0.ebuild
deleted file mode 100644
index 349108fee1a8..000000000000
--- a/net-libs/glib-networking/glib-networking-2.76.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2023 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 ~x64-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.76.0-libproxy-0.5.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
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-09-05 20:28 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-06-16 0:04 [gentoo-commits] repo/gentoo:master commit in: net-libs/glib-networking/files/, net-libs/glib-networking/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2023-09-05 20:28 Matt Turner
2023-05-17 21:55 Matt Turner
2020-01-11 19:24 Mart Raudsepp
2019-01-17 19:36 Mart Raudsepp
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox