GNU bug report logs -
#67169
[PATCH] gnu: glib-networking: Update to 2.76.1.
Previous Next
Reported by: Vivien Kraus <vivien <at> planete-kraus.eu>
Date: Tue, 14 Nov 2023 11:44:03 UTC
Severity: normal
Tags: patch
Merged with 67166,
67222,
67408,
67410,
67411,
67420,
67423,
67424,
67437,
67473
Done: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Bug is archived. No further changes may be made.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 67169 in the body.
You can then email your comments to 67169 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
Report forwarded
to
guix-patches <at> gnu.org:
bug#67169; Package
guix-patches.
(Tue, 14 Nov 2023 11:44:03 GMT)
Full text and
rfc822 format available.
Acknowledgement sent
to
Vivien Kraus <vivien <at> planete-kraus.eu>:
New bug report received and forwarded. Copy sent to
guix-patches <at> gnu.org.
(Tue, 14 Nov 2023 11:44:03 GMT)
Full text and
rfc822 format available.
Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/gnome.scm (glib-networking): Update to 2.76.1.
[patches]: Remove.
[native-inputs]: Add glib-bin.
* gnu/packages/patches/glib-networking-gnutls-binding.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Unregister it.
Change-Id: I1c7249995d07d975ac3d3df8ce1e07ffa4dc240f
---
gnu/local.mk | 1 -
gnu/packages/gnome.scm | 9 ++++----
.../glib-networking-gnutls-binding.patch | 21 -------------------
3 files changed, 4 insertions(+), 27 deletions(-)
delete mode 100644 gnu/packages/patches/glib-networking-gnutls-binding.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 254804d055..4200ec843d 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1284,7 +1284,6 @@ dist_patch_DATA = \
%D%/packages/patches/ghostscript-no-header-creationdate.patch \
%D%/packages/patches/gklib-suitesparse.patch \
%D%/packages/patches/glib-appinfo-watch.patch \
- %D%/packages/patches/glib-networking-gnutls-binding.patch \
%D%/packages/patches/glib-skip-failing-test.patch \
%D%/packages/patches/glibc-2.33-riscv64-miscompilation.patch \
%D%/packages/patches/glibc-CVE-2019-7309.patch \
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 2958da2cd9..bad6b23a90 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4790,7 +4790,7 @@ (define-public libxklavier
(define-public glib-networking
(package
(name "glib-networking")
- (version "2.72.2")
+ (version "2.76.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/glib-networking/"
@@ -4798,12 +4798,11 @@ (define-public glib-networking
"glib-networking-" version ".tar.xz"))
(sha256
(base32
- "0s42l6dkajciqc99zp6dc9l8yv9g8w7d8mgv97l7h7drgd60hand"))
- (patches
- (search-patches "glib-networking-gnutls-binding.patch"))))
+ "0ax4h0abi9yxrpmm1p491qjxc8d2k1kaa9hhzgyixrfxjjcqlsaw"))))
(build-system meson-build-system)
(native-inputs
- (list pkg-config gettext-minimal))
+ (list `(,glib "bin") ; for gio-querymodules
+ pkg-config gettext-minimal))
(inputs
(list glib gnutls gsettings-desktop-schemas libproxy))
(home-page "https://wiki.gnome.org/Projects/GLib")
diff --git a/gnu/packages/patches/glib-networking-gnutls-binding.patch b/gnu/packages/patches/glib-networking-gnutls-binding.patch
deleted file mode 100644
index 91d0743056..0000000000
--- a/gnu/packages/patches/glib-networking-gnutls-binding.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Skip failing test in 'test_connection_binding_match_tls_unique'
-in 'tls/tests/connection.c' when building glib-networking against
-GnuTLS 3.7.2. The failure stems from the fact that
-'gnutls_session_channel_binding' returns GNUTLS_E_INVALID_REQUEST
-is known upstream:
-
- https://gitlab.gnome.org/GNOME/glib-networking/-/issues/164
-
-diff --git a/tls/tests/connection.c b/tls/tests/connection.c
-index 036df04..347c7a4 100644
---- a/tls/tests/connection.c
-+++ b/tls/tests/connection.c
-@@ -3037,8 +3037,6 @@ main (int argc,
- setup_connection, test_connection_missing_server_identity, teardown_connection);
- g_test_add ("/tls/" BACKEND "/connection/peer-certificate-notify", TestConnection, NULL,
- setup_connection, test_peer_certificate_notify, teardown_connection);
-- g_test_add ("/tls/" BACKEND "/connection/binding/match-tls-unique", TestConnection, NULL,
-- setup_connection, test_connection_binding_match_tls_unique, teardown_connection);
- g_test_add ("/tls/" BACKEND "/connection/binding/match-tls-server-end-point", TestConnection, NULL,
- setup_connection, test_connection_binding_match_tls_server_end_point, teardown_connection);
- g_test_add ("/tls/" BACKEND "/connection/binding/match-tls-exporter", TestConnection, NULL,
base-commit: 72e886328c14c832b2ed71c400069b63852ee18d
--
2.41.0
Information forwarded
to
liliana.prikler <at> gmail.com, maxim.cournoyer <at> gmail.com, rg <at> raghavgururajan.name, guix-patches <at> gnu.org:
bug#67169; Package
guix-patches.
(Tue, 14 Nov 2023 12:39:05 GMT)
Full text and
rfc822 format available.
Information forwarded
to
liliana.prikler <at> gmail.com, maxim.cournoyer <at> gmail.com, rg <at> raghavgururajan.name, guix-patches <at> gnu.org:
bug#67169; Package
guix-patches.
(Tue, 14 Nov 2023 13:21:05 GMT)
Full text and
rfc822 format available.
Message #11 received at 67169 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/gnome.scm (glib-networking): Update to 2.76.1.
[patches]: Remove.
[native-inputs]: Add glib-bin.
* gnu/packages/patches/glib-networking-gnutls-binding.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Unregister it.
Change-Id: I1c7249995d07d975ac3d3df8ce1e07ffa4dc240f
---
gnu/local.mk | 1 -
gnu/packages/gnome.scm | 9 ++++----
.../glib-networking-gnutls-binding.patch | 21 -------------------
3 files changed, 4 insertions(+), 27 deletions(-)
delete mode 100644 gnu/packages/patches/glib-networking-gnutls-binding.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 254804d055..4200ec843d 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1284,7 +1284,6 @@ dist_patch_DATA = \
%D%/packages/patches/ghostscript-no-header-creationdate.patch \
%D%/packages/patches/gklib-suitesparse.patch \
%D%/packages/patches/glib-appinfo-watch.patch \
- %D%/packages/patches/glib-networking-gnutls-binding.patch \
%D%/packages/patches/glib-skip-failing-test.patch \
%D%/packages/patches/glibc-2.33-riscv64-miscompilation.patch \
%D%/packages/patches/glibc-CVE-2019-7309.patch \
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 2958da2cd9..bad6b23a90 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4790,7 +4790,7 @@ (define-public libxklavier
(define-public glib-networking
(package
(name "glib-networking")
- (version "2.72.2")
+ (version "2.76.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/glib-networking/"
@@ -4798,12 +4798,11 @@ (define-public glib-networking
"glib-networking-" version ".tar.xz"))
(sha256
(base32
- "0s42l6dkajciqc99zp6dc9l8yv9g8w7d8mgv97l7h7drgd60hand"))
- (patches
- (search-patches "glib-networking-gnutls-binding.patch"))))
+ "0ax4h0abi9yxrpmm1p491qjxc8d2k1kaa9hhzgyixrfxjjcqlsaw"))))
(build-system meson-build-system)
(native-inputs
- (list pkg-config gettext-minimal))
+ (list `(,glib "bin") ; for gio-querymodules
+ pkg-config gettext-minimal))
(inputs
(list glib gnutls gsettings-desktop-schemas libproxy))
(home-page "https://wiki.gnome.org/Projects/GLib")
diff --git a/gnu/packages/patches/glib-networking-gnutls-binding.patch b/gnu/packages/patches/glib-networking-gnutls-binding.patch
deleted file mode 100644
index 91d0743056..0000000000
--- a/gnu/packages/patches/glib-networking-gnutls-binding.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Skip failing test in 'test_connection_binding_match_tls_unique'
-in 'tls/tests/connection.c' when building glib-networking against
-GnuTLS 3.7.2. The failure stems from the fact that
-'gnutls_session_channel_binding' returns GNUTLS_E_INVALID_REQUEST
-is known upstream:
-
- https://gitlab.gnome.org/GNOME/glib-networking/-/issues/164
-
-diff --git a/tls/tests/connection.c b/tls/tests/connection.c
-index 036df04..347c7a4 100644
---- a/tls/tests/connection.c
-+++ b/tls/tests/connection.c
-@@ -3037,8 +3037,6 @@ main (int argc,
- setup_connection, test_connection_missing_server_identity, teardown_connection);
- g_test_add ("/tls/" BACKEND "/connection/peer-certificate-notify", TestConnection, NULL,
- setup_connection, test_peer_certificate_notify, teardown_connection);
-- g_test_add ("/tls/" BACKEND "/connection/binding/match-tls-unique", TestConnection, NULL,
-- setup_connection, test_connection_binding_match_tls_unique, teardown_connection);
- g_test_add ("/tls/" BACKEND "/connection/binding/match-tls-server-end-point", TestConnection, NULL,
- setup_connection, test_connection_binding_match_tls_server_end_point, teardown_connection);
- g_test_add ("/tls/" BACKEND "/connection/binding/match-tls-exporter", TestConnection, NULL,
base-commit: 72e886328c14c832b2ed71c400069b63852ee18d
--
2.41.0
bug archived.
Request was from
Debbugs Internal Request <help-debbugs <at> gnu.org>
to
internal_control <at> debbugs.gnu.org.
(Mon, 29 Jan 2024 12:24:06 GMT)
Full text and
rfc822 format available.
This bug report was last modified 1 year and 101 days ago.
Previous Next
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.