upgrade to 2.62.3

Signed-off-by: yeah_wang <1485652911@qq.com>
This commit is contained in:
yeah_wang 2020-07-25 10:17:53 +08:00
parent 55577c1c4c
commit 0bf5f818b2
4 changed files with 15 additions and 37 deletions

Binary file not shown.

Binary file not shown.

View File

@ -1,19 +1,17 @@
Name: glib-networking Name: glib-networking
Version: 2.58.0 Version: 2.62.3
Release: 7 Release: 1
Summary: Network-related modules for glib Summary: Network-related modules for glib
License: LGPLv2+ License: LGPLv2+
URL: http://www.gnome.org URL: http://www.gnome.org
Source0: http://download.gnome.org/sources/glib-networking/2.58/glib-networking-%{version}.tar.xz Source0: http://download.gnome.org/sources/glib-networking/2.62/glib-networking-%{version}.tar.xz
Patch0001: handle-new-gnutls-e-certificate-required.patch
BuildRequires: meson gcc ca-certificates gettext systemd gdb BuildRequires: meson gcc ca-certificates gettext systemd gdb
BuildRequires: pkgconfig(glib-2.0) >= 2.55.1 pkgconfig(gnutls) >= 3.3.5 BuildRequires: pkgconfig(glib-2.0) >= 2.60.0 pkgconfig(gnutls)
BuildRequires: pkgconfig(gio-2.0) pkgconfig(gsettings-desktop-schemas) BuildRequires: pkgconfig(gio-2.0) pkgconfig(gsettings-desktop-schemas)
BuildRequires: pkgconfig(libproxy-1.0) >= 0.3.1 pkgconfig(p11-kit-1) >= 0.20 BuildRequires: pkgconfig(libproxy-1.0) pkgconfig(p11-kit-1)
Requires: ca-certificates gsettings-desktop-schemas glib2 >= 2.55.1 Requires: ca-certificates gsettings-desktop-schemas glib2 >= 2.60.0
%description %description
glib-networking contains the implementations of certain GLib networking features glib-networking contains the implementations of certain GLib networking features
@ -36,6 +34,9 @@ verify the Usability of the glib-networking package.
%install %install
%meson_install %meson_install
%check
%meson_test
%find_lang %{name} %find_lang %{name}
%files -f %{name}.lang %files -f %{name}.lang
@ -53,6 +54,12 @@ verify the Usability of the glib-networking package.
%{_datadir}/installed-tests %{_datadir}/installed-tests
%changelog %changelog
* Fri Jul 24 2020 openEuler Buildteam <buildteam@openeuler.org> - 2.62.3-1
- Type:enhancement
- ID:NA
- SUG:NA
- DESC:upgrade to 2.62.3
* Fri Mar 20 2020 openEuler Buildteam <buildteam@openeuler.org> - 2.58.0-7 * Fri Mar 20 2020 openEuler Buildteam <buildteam@openeuler.org> - 2.58.0-7
- add gdb in buildrequires - add gdb in buildrequires

View File

@ -1,29 +0,0 @@
From 5f79d76fbc7f52eb677ac9b0353563043deaef71 Mon Sep 17 00:00:00 2001
From: wangxp006 <wangxp006@163.com>
Date: Mon, 16 Mar 2020 16:33:25 +0800
Subject: [PATCH] handle new gnutls e certificate required
---
tls/gnutls/gtlsconnection-gnutls.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/tls/gnutls/gtlsconnection-gnutls.c b/tls/gnutls/gtlsconnection-gnutls.c
index 959fa68..f9d43bc 100644
--- a/tls/gnutls/gtlsconnection-gnutls.c
+++ b/tls/gnutls/gtlsconnection-gnutls.c
@@ -1016,7 +1016,11 @@ end_gnutls_io (GTlsConnectionGnutls *gnutls,
else
return 0;
}
- else if (status == GNUTLS_E_NO_CERTIFICATE_FOUND)
+ else if (status == GNUTLS_E_NO_CERTIFICATE_FOUND
+#ifdef GNUTLS_E_CERTIFICATE_REQUIRED
+ || status == GNUTLS_E_CERTIFICATE_REQUIRED /* Added in GnuTLS 3.6.7 */
+#endif
+ )
{
g_set_error_literal (error, G_TLS_ERROR, G_TLS_ERROR_CERTIFICATE_REQUIRED,
_("TLS connection peer did not send a certificate"));
--
1.8.3.1