[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
129/135: gnu: glib-networking: Update to 2.58.0.
From: |
guix-commits |
Subject: |
129/135: gnu: glib-networking: Update to 2.58.0. |
Date: |
Fri, 21 Dec 2018 14:37:51 -0500 (EST) |
rekado pushed a commit to branch wip-gnome3.30
in repository guix.
commit 8e653d85816f6d955e8300f404c8c01748021b3e
Author: Ricardo Wurmus <address@hidden>
Date: Thu Dec 6 21:07:58 2018 +0100
gnu: glib-networking: Update to 2.58.0.
* gnu/packages/gnome.scm (glib-networking): Update to 2.58.0.
[source]: Remove patch.
[arguments]: Remove configure flags; remove phase
"trust-that-the-certs-will-be-there"
* gnu/local.mk (dist_patch_DATA): Remove patch.
* gnu/packages/patches/glib-networking-ssl-cert-file.patch: Remove file.
---
gnu/local.mk | 1 -
gnu/packages/gnome.scm | 18 +++-----------
.../patches/glib-networking-ssl-cert-file.patch | 29 ----------------------
3 files changed, 3 insertions(+), 45 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 428a7ee..a140f32 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -742,7 +742,6 @@ dist_patch_DATA =
\
%D%/packages/patches/ghostscript-no-header-uuid.patch \
%D%/packages/patches/ghostscript-no-header-creationdate.patch \
%D%/packages/patches/giflib-make-reallocarray-private.patch \
- %D%/packages/patches/glib-networking-ssl-cert-file.patch \
%D%/packages/patches/glib-tests-timer.patch \
%D%/packages/patches/glibc-CVE-2015-5180.patch \
%D%/packages/patches/glibc-CVE-2015-7547.patch \
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 885a1fc..cdf3e04 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -2417,7 +2417,7 @@ library.")
(define-public glib-networking
(package
(name "glib-networking")
- (version "2.56.1")
+ (version "2.58.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/glib-networking/"
@@ -2425,23 +2425,11 @@ library.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1j1myqlrzwam986b8sq2bq2wrcylipvbsv44n7vdrlipl3hb0iyz"))
- (patches
- (search-patches "glib-networking-ssl-cert-file.patch"))))
+ "0s006gs9nsq6mg31spqha1jffzmp6qjh10y27h0fxf1iw1ah5ymx"))))
(build-system meson-build-system)
(arguments
- `(#:configure-flags
- '("-Dca_certificates_path=/etc/ssl/certs/ca-certificates.crt")
- #:phases
+ `(#:phases
(modify-phases %standard-phases
- ;; The configured location of ca-certificates.crt is unavailable in
- ;; the build environment.
- (add-after 'unpack 'trust-that-the-certs-will-be-there
- (lambda _
- (substitute* "meson.build"
- (("assert\\(res\\.returncode\\(\\) == 0" m)
- (string-append "#" m)))
- #t))
(add-before 'check 'use-empty-ssl-cert-file
(lambda _
;; The ca-certificates.crt is not available in the build
diff --git a/gnu/packages/patches/glib-networking-ssl-cert-file.patch
b/gnu/packages/patches/glib-networking-ssl-cert-file.patch
deleted file mode 100644
index 32bdd07..0000000
--- a/gnu/packages/patches/glib-networking-ssl-cert-file.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From b010e41346d418220582c20ab8d7f3971e4fb78a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <address@hidden>
-Date: Fri, 14 Aug 2015 17:28:36 +0800
-Subject: [PATCH] gnutls: Allow overriding the anchor file location by
- 'SSL_CERT_FILE'
-
----
- tls/gnutls/gtlsbackend-gnutls.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/tls/gnutls/gtlsbackend-gnutls.c b/tls/gnutls/gtlsbackend-gnutls.c
-index 55ec1a5..217d3c8 100644
---- a/tls/gnutls/gtlsbackend-gnutls.c
-+++ b/tls/gnutls/gtlsbackend-gnutls.c
-@@ -101,8 +101,10 @@ g_tls_backend_gnutls_real_create_database
(GTlsBackendGnutls *self,
- GError **error)
- {
- const gchar *anchor_file = NULL;
-+ anchor_file = g_getenv ("SSL_CERT_FILE");
- #ifdef GTLS_SYSTEM_CA_FILE
-- anchor_file = GTLS_SYSTEM_CA_FILE;
-+ if (!anchor_file)
-+ anchor_file = GTLS_SYSTEM_CA_FILE;
- #endif
- return g_tls_file_database_new (anchor_file, error);
- }
---
-2.4.3
-
- 99/135: gnu: gnome-sudoku: Update to 3.30.0., (continued)
- 99/135: gnu: gnome-sudoku: Update to 3.30.0., guix-commits, 2018/12/21
- 123/135: gnu: colord: Update to 1.4.3., guix-commits, 2018/12/21
- 109/135: gnu: gnome-system-monitor: Update to 3.30.0., guix-commits, 2018/12/21
- 82/135: gnu: glibmm: Update to 2.58.0., guix-commits, 2018/12/21
- 81/135: gnu: libsigc++: Update to 2.10.1., guix-commits, 2018/12/21
- 56/135: gnu: gnome-clocks: Update to 3.28.0., guix-commits, 2018/12/21
- 108/135: gnu: at-spi2-core: Update to 2.30.0., guix-commits, 2018/12/21
- 135/135: gnu: gtksourceview: Update to 4.0.3., guix-commits, 2018/12/21
- 115/135: gnu: network-manager: Update to 1.14.4., guix-commits, 2018/12/21
- 45/135: gnu: zenity: Update to 3.28.1., guix-commits, 2018/12/21
- 129/135: gnu: glib-networking: Update to 2.58.0.,
guix-commits <=
- 14/135: gnu: Add libusbmuxd., guix-commits, 2018/12/21
- 40/135: gnu: gjs: Update to 1.52.3., guix-commits, 2018/12/21
- 93/135: gnu: seahorse: Update to 3.30., guix-commits, 2018/12/21
- 120/135: gnu: gvfs: Update to 1.38.1., guix-commits, 2018/12/21
- 35/135: gnu: gnome-keyring: Update to 3.28.2., guix-commits, 2018/12/21
- 09/135: gnu: yelp-tools: Update to 3.28.0., guix-commits, 2018/12/21
- 112/135: gnu: gdm: Update to 3.30.2., guix-commits, 2018/12/21
- 90/135: gnu: libwnck: Update to 3.30.0., guix-commits, 2018/12/21
- 24/135: gnu: goffice: Update to 0.10.41., guix-commits, 2018/12/21
- 68/135: gnu: cups-filters: Fix build with newer version of poppler., guix-commits, 2018/12/21