Attachment 147618 Details for Bug 193625 – net/glib-networking

[patch] net/glib-networking

glib-networking.svndif (text/plain), 12.81 KB, created by Anonymized Account on 2014-09-23 19:47:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Anonymized Account

Created: 2014-09-23 19:47:00 UTC

Size: 12.81 KB

patch

obsolete

>Index: net/glib-networking/Makefile
>===================================================================
>--- net/glib-networking/Makefile	(revision 368159)
>+++ net/glib-networking/Makefile	(working copy)
>@@ -3,8 +3,7 @@
> #   $MCom: ports/trunk/net/glib-networking/Makefile 18537 2013-06-16 20:08:30Z kwm $
> 
> PORTNAME=	glib-networking
>-PORTVERSION=	2.36.2
>-PORTREVISION=	4
>+PORTVERSION=	2.40.0
> CATEGORIES=	net
> MASTER_SITES=	GNOME
> DIST_SUBDIR=	gnome2
>@@ -12,22 +11,28 @@
> MAINTAINER=	gnome@FreeBSD.org
> COMMENT=	Network-related giomodules for glib
> 
>+LICENSE=	LGPL20
>+
> BUILD_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
> RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
> LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt
> 
> GNU_CONFIGURE=	yes
>-USES=		gettext gmake libtool:keepla pathfix pkgconfig tar:xz
>+USES=		gmake libtool:keepla pathfix pkgconfig tar:xz
> USE_GNOME=	glib20 intltool
> CONFIGURE_ARGS=	--with-ca-certificates=${LOCALBASE}/share/certs/ca-root-nss.crt
> CPPFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib
> INSTALL_TARGET=	install-strip
>+USE_LDCONFIG=	yes
> 
>-OPTIONS_DEFINE=	GNUTLS PKCS11 PROXY GNOME_PROXY
>+OPTIONS_DEFINE=	GNUTLS PKCS11 PROXY GNOME_PROXY NLS
> OPTIONS_DEFAULT=GNUTLS PKCS11 PROXY GNOME_PROXY
> OPTIONS_SUB=	yes
> 
>+NLS_USES=	gettext
>+NLS_CONFIGURE_ENABLE=	nls
>+
> GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
> GNUTLS_CONFIGURE_WITH=	gnutls
> PKCS11_DESC=		Enable PKCS11 support (requires GNUTLS)
>Index: net/glib-networking/distinfo
>===================================================================
>--- net/glib-networking/distinfo	(revision 368159)
>+++ net/glib-networking/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (gnome2/glib-networking-2.36.2.tar.xz) = 2108d55b0af3eea56ce256830bcaf1519d6337e0054ef2eff80f2c0ef0eb23f9
>-SIZE (gnome2/glib-networking-2.36.2.tar.xz) = 352284
>+SHA256 (gnome2/glib-networking-2.40.0.tar.xz) = 54e9c2d81171353794d2d2113e1311dfafd889f10993099e447b431c4e800aa4
>+SIZE (gnome2/glib-networking-2.40.0.tar.xz) = 368196
>Index: net/glib-networking/files/patch-tls_gnutls_gtlsclientconnection-gnutls.c
>===================================================================
>--- net/glib-networking/files/patch-tls_gnutls_gtlsclientconnection-gnutls.c	(revision 368159)
>+++ net/glib-networking/files/patch-tls_gnutls_gtlsclientconnection-gnutls.c	(working copy)
>@@ -1,9 +1,9 @@
>---- tls/gnutls/gtlsclientconnection-gnutls.c.orig	2012-03-04 18:47:23.000000000 -0500
>-+++ tls/gnutls/gtlsclientconnection-gnutls.c	2012-03-04 18:50:26.000000000 -0500
>-@@ -349,7 +349,8 @@ g_tls_client_connection_gnutls_finish_ha
>- {
>-   GTlsClientConnectionGnutls *gnutls = G_TLS_CLIENT_CONNECTION_GNUTLS (conn);
>+--- tls/gnutls/gtlsclientconnection-gnutls.c.orig	2014-02-01 20:46:53.000000000 +0600
>++++ tls/gnutls/gtlsclientconnection-gnutls.c
>+@@ -309,7 +309,8 @@ g_tls_client_connection_gnutls_finish_ha
>  
>+   g_assert (inout_error != NULL);
>+ 
> -  if (g_error_matches (*inout_error, G_TLS_ERROR, G_TLS_ERROR_NOT_TLS) &&
> +  if (inout_error &&
> +      g_error_matches (*inout_error, G_TLS_ERROR, G_TLS_ERROR_NOT_TLS) &&
>@@ -10,12 +10,12 @@
>        gnutls->priv->cert_requested)
>      {
>        g_clear_error (inout_error);
>-@@ -361,7 +362,7 @@ g_tls_client_connection_gnutls_finish_ha
>+@@ -329,7 +330,7 @@ g_tls_client_connection_gnutls_finish_ha
>      {
>-       gnutls_datum session_data;
>+       gnutls_datum_t session_datum;
>  
> -      if (!*inout_error &&
> +      if (inout_error && !*inout_error &&
>  	  gnutls_session_get_data2 (g_tls_connection_gnutls_get_session (conn),
>- 				    &session_data) == 0)
>+ 				    &session_datum) == 0)
>  	{
>Index: net/glib-networking/files/patch-tls_gnutls_gtlsconnection-gnutls.c
>===================================================================
>--- net/glib-networking/files/patch-tls_gnutls_gtlsconnection-gnutls.c	(revision 368159)
>+++ net/glib-networking/files/patch-tls_gnutls_gtlsconnection-gnutls.c	(working copy)
>@@ -1,11 +0,0 @@
>---- tls/gnutls/gtlsconnection-gnutls.c.orig	2012-12-09 01:05:02.000000000 +0000
>-+++ tls/gnutls/gtlsconnection-gnutls.c	2012-12-09 01:14:46.000000000 +0000
>-@@ -752,7 +752,7 @@
>-   if (error)
>-     {
>-       g_set_error (error, G_TLS_ERROR, G_TLS_ERROR_MISC,
>--                   errmsg, gnutls_strerror (status));
>-+                   "%s, %s", errmsg, gnutls_strerror (status));
>-     }
>-   return status;
>- }
>Index: net/glib-networking/pkg-plist
>===================================================================
>--- net/glib-networking/pkg-plist	(revision 368159)
>+++ net/glib-networking/pkg-plist	(working copy)
>@@ -9,90 +9,90 @@
> %%PROXY%%lib/gio/modules/libgiolibproxy.so
> %%PROXY%%libexec/glib-pacrunner
> %%PROXY%%share/dbus-1/services/org.gtk.GLib.PACRunner.service
>-share/locale/an/LC_MESSAGES/glib-networking.mo
>-share/locale/ar/LC_MESSAGES/glib-networking.mo
>-share/locale/as/LC_MESSAGES/glib-networking.mo
>-share/locale/be/LC_MESSAGES/glib-networking.mo
>-share/locale/bg/LC_MESSAGES/glib-networking.mo
>-share/locale/bn_IN/LC_MESSAGES/glib-networking.mo
>-share/locale/ca/LC_MESSAGES/glib-networking.mo
>-share/locale/ca@valencia/LC_MESSAGES/glib-networking.mo
>-share/locale/cs/LC_MESSAGES/glib-networking.mo
>-share/locale/da/LC_MESSAGES/glib-networking.mo
>-share/locale/de/LC_MESSAGES/glib-networking.mo
>-share/locale/el/LC_MESSAGES/glib-networking.mo
>-share/locale/en_CA/LC_MESSAGES/glib-networking.mo
>-share/locale/en_GB/LC_MESSAGES/glib-networking.mo
>-share/locale/eo/LC_MESSAGES/glib-networking.mo
>-share/locale/es/LC_MESSAGES/glib-networking.mo
>-share/locale/et/LC_MESSAGES/glib-networking.mo
>-share/locale/eu/LC_MESSAGES/glib-networking.mo
>-share/locale/fa/LC_MESSAGES/glib-networking.mo
>-share/locale/fi/LC_MESSAGES/glib-networking.mo
>-share/locale/fr/LC_MESSAGES/glib-networking.mo
>-share/locale/fur/LC_MESSAGES/glib-networking.mo
>-share/locale/gl/LC_MESSAGES/glib-networking.mo
>-share/locale/gu/LC_MESSAGES/glib-networking.mo
>-share/locale/he/LC_MESSAGES/glib-networking.mo
>-share/locale/hi/LC_MESSAGES/glib-networking.mo
>-share/locale/hu/LC_MESSAGES/glib-networking.mo
>-share/locale/id/LC_MESSAGES/glib-networking.mo
>-share/locale/it/LC_MESSAGES/glib-networking.mo
>-share/locale/ja/LC_MESSAGES/glib-networking.mo
>-share/locale/km/LC_MESSAGES/glib-networking.mo
>-share/locale/kn/LC_MESSAGES/glib-networking.mo
>-share/locale/ko/LC_MESSAGES/glib-networking.mo
>-share/locale/lt/LC_MESSAGES/glib-networking.mo
>-share/locale/lv/LC_MESSAGES/glib-networking.mo
>-share/locale/ml/LC_MESSAGES/glib-networking.mo
>-share/locale/mr/LC_MESSAGES/glib-networking.mo
>-share/locale/nb/LC_MESSAGES/glib-networking.mo
>-share/locale/nl/LC_MESSAGES/glib-networking.mo
>-share/locale/or/LC_MESSAGES/glib-networking.mo
>-share/locale/pa/LC_MESSAGES/glib-networking.mo
>-share/locale/pl/LC_MESSAGES/glib-networking.mo
>-share/locale/pt/LC_MESSAGES/glib-networking.mo
>-share/locale/pt_BR/LC_MESSAGES/glib-networking.mo
>-share/locale/ro/LC_MESSAGES/glib-networking.mo
>-share/locale/ru/LC_MESSAGES/glib-networking.mo
>-share/locale/sk/LC_MESSAGES/glib-networking.mo
>-share/locale/sl/LC_MESSAGES/glib-networking.mo
>-share/locale/sr/LC_MESSAGES/glib-networking.mo
>-share/locale/sr@latin/LC_MESSAGES/glib-networking.mo
>-share/locale/sv/LC_MESSAGES/glib-networking.mo
>-share/locale/ta/LC_MESSAGES/glib-networking.mo
>-share/locale/te/LC_MESSAGES/glib-networking.mo
>-share/locale/tg/LC_MESSAGES/glib-networking.mo
>-share/locale/th/LC_MESSAGES/glib-networking.mo
>-share/locale/tr/LC_MESSAGES/glib-networking.mo
>-share/locale/ug/LC_MESSAGES/glib-networking.mo
>-share/locale/uk/LC_MESSAGES/glib-networking.mo
>-share/locale/vi/LC_MESSAGES/glib-networking.mo
>-share/locale/zh_CN/LC_MESSAGES/glib-networking.mo
>-share/locale/zh_HK/LC_MESSAGES/glib-networking.mo
>-share/locale/zh_TW/LC_MESSAGES/glib-networking.mo
>-@dirrmtry share/locale/zh_HK/LC_MESSAGES
>-@dirrmtry share/locale/zh_HK
>-@dirrmtry share/locale/ug/LC_MESSAGES
>-@dirrmtry share/locale/ug
>-@dirrmtry share/locale/te/LC_MESSAGES
>-@dirrmtry share/locale/te
>-@dirrmtry share/locale/sr@latin/LC_MESSAGES
>-@dirrmtry share/locale/sr@latin
>-@dirrmtry share/locale/mr/LC_MESSAGES
>-@dirrmtry share/locale/mr
>-@dirrmtry share/locale/km/LC_MESSAGES
>-@dirrmtry share/locale/km
>-@dirrmtry share/locale/fur/LC_MESSAGES
>-@dirrmtry share/locale/fur
>-@dirrmtry share/locale/ca@valencia/LC_MESSAGES
>-@dirrmtry share/locale/ca@valencia
>-@dirrmtry share/locale/bn_IN/LC_MESSAGES
>-@dirrmtry share/locale/bn_IN
>-@dirrmtry share/locale/as/LC_MESSAGES
>-@dirrmtry share/locale/as
>-@dirrmtry share/locale/an/LC_MESSAGES
>-@dirrmtry share/locale/an
>+%%NLS%%share/locale/an/LC_MESSAGES/glib-networking.mo
>+%%NLS%%share/locale/ar/LC_MESSAGES/glib-networking.mo
>+%%NLS%%share/locale/as/LC_MESSAGES/glib-networking.mo
>+%%NLS%%share/locale/be/LC_MESSAGES/glib-networking.mo
>+%%NLS%%share/locale/bg/LC_MESSAGES/glib-networking.mo
>+%%NLS%%share/locale/bn_IN/LC_MESSAGES/glib-networking.mo
>+%%NLS%%share/locale/ca/LC_MESSAGES/glib-networking.mo
>+%%NLS%%share/locale/ca@valencia/LC_MESSAGES/glib-networking.mo
>+%%NLS%%share/locale/cs/LC_MESSAGES/glib-networking.mo
>+%%NLS%%share/locale/da/LC_MESSAGES/glib-networking.mo
>+%%NLS%%share/locale/de/LC_MESSAGES/glib-networking.mo
>+%%NLS%%share/locale/el/LC_MESSAGES/glib-networking.mo
>+%%NLS%%share/locale/en_CA/LC_MESSAGES/glib-networking.mo
>+%%NLS%%share/locale/en_GB/LC_MESSAGES/glib-networking.mo
>+%%NLS%%share/locale/eo/LC_MESSAGES/glib-networking.mo
>+%%NLS%%share/locale/es/LC_MESSAGES/glib-networking.mo
>+%%NLS%%share/locale/et/LC_MESSAGES/glib-networking.mo
>+%%NLS%%share/locale/eu/LC_MESSAGES/glib-networking.mo
>+%%NLS%%share/locale/fa/LC_MESSAGES/glib-networking.mo
>+%%NLS%%share/locale/fi/LC_MESSAGES/glib-networking.mo
>+%%NLS%%share/locale/fr/LC_MESSAGES/glib-networking.mo
>+%%NLS%%share/locale/fur/LC_MESSAGES/glib-networking.mo
>+%%NLS%%share/locale/gl/LC_MESSAGES/glib-networking.mo
>+%%NLS%%share/locale/gu/LC_MESSAGES/glib-networking.mo
>+%%NLS%%share/locale/he/LC_MESSAGES/glib-networking.mo
>+%%NLS%%share/locale/hi/LC_MESSAGES/glib-networking.mo
>+%%NLS%%share/locale/hu/LC_MESSAGES/glib-networking.mo
>+%%NLS%%share/locale/id/LC_MESSAGES/glib-networking.mo
>+%%NLS%%share/locale/it/LC_MESSAGES/glib-networking.mo
>+%%NLS%%share/locale/ja/LC_MESSAGES/glib-networking.mo
>+%%NLS%%share/locale/km/LC_MESSAGES/glib-networking.mo
>+%%NLS%%share/locale/kn/LC_MESSAGES/glib-networking.mo
>+%%NLS%%share/locale/ko/LC_MESSAGES/glib-networking.mo
>+%%NLS%%share/locale/lt/LC_MESSAGES/glib-networking.mo
>+%%NLS%%share/locale/lv/LC_MESSAGES/glib-networking.mo
>+%%NLS%%share/locale/ml/LC_MESSAGES/glib-networking.mo
>+%%NLS%%share/locale/mr/LC_MESSAGES/glib-networking.mo
>+%%NLS%%share/locale/nb/LC_MESSAGES/glib-networking.mo
>+%%NLS%%share/locale/nl/LC_MESSAGES/glib-networking.mo
>+%%NLS%%share/locale/or/LC_MESSAGES/glib-networking.mo
>+%%NLS%%share/locale/pa/LC_MESSAGES/glib-networking.mo
>+%%NLS%%share/locale/pl/LC_MESSAGES/glib-networking.mo
>+%%NLS%%share/locale/pt/LC_MESSAGES/glib-networking.mo
>+%%NLS%%share/locale/pt_BR/LC_MESSAGES/glib-networking.mo
>+%%NLS%%share/locale/ro/LC_MESSAGES/glib-networking.mo
>+%%NLS%%share/locale/ru/LC_MESSAGES/glib-networking.mo
>+%%NLS%%share/locale/sk/LC_MESSAGES/glib-networking.mo
>+%%NLS%%share/locale/sl/LC_MESSAGES/glib-networking.mo
>+%%NLS%%share/locale/sr/LC_MESSAGES/glib-networking.mo
>+%%NLS%%share/locale/sr@latin/LC_MESSAGES/glib-networking.mo
>+%%NLS%%share/locale/sv/LC_MESSAGES/glib-networking.mo
>+%%NLS%%share/locale/ta/LC_MESSAGES/glib-networking.mo
>+%%NLS%%share/locale/te/LC_MESSAGES/glib-networking.mo
>+%%NLS%%share/locale/tg/LC_MESSAGES/glib-networking.mo
>+%%NLS%%share/locale/th/LC_MESSAGES/glib-networking.mo
>+%%NLS%%share/locale/tr/LC_MESSAGES/glib-networking.mo
>+%%NLS%%share/locale/ug/LC_MESSAGES/glib-networking.mo
>+%%NLS%%share/locale/uk/LC_MESSAGES/glib-networking.mo
>+%%NLS%%share/locale/vi/LC_MESSAGES/glib-networking.mo
>+%%NLS%%share/locale/zh_CN/LC_MESSAGES/glib-networking.mo
>+%%NLS%%share/locale/zh_HK/LC_MESSAGES/glib-networking.mo
>+%%NLS%%share/locale/zh_TW/LC_MESSAGES/glib-networking.mo
>+%%NLS%%@dirrmtry share/locale/an/LC_MESSAGES
>+%%NLS%%@dirrmtry share/locale/an
>+%%NLS%%@dirrmtry share/locale/as/LC_MESSAGES
>+%%NLS%%@dirrmtry share/locale/as
>+%%NLS%%@dirrmtry share/locale/bn_IN/LC_MESSAGES
>+%%NLS%%@dirrmtry share/locale/bn_IN
>+%%NLS%%@dirrmtry share/locale/ca@valencia/LC_MESSAGES
>+%%NLS%%@dirrmtry share/locale/ca@valencia
>+%%NLS%%@dirrmtry share/locale/fur/LC_MESSAGES
>+%%NLS%%@dirrmtry share/locale/fur
>+%%NLS%%@dirrmtry share/locale/km/LC_MESSAGES
>+%%NLS%%@dirrmtry share/locale/km
>+%%NLS%%@dirrmtry share/locale/mr/LC_MESSAGES
>+%%NLS%%@dirrmtry share/locale/mr
>+%%NLS%%@dirrmtry share/locale/sr@latin/LC_MESSAGES
>+%%NLS%%@dirrmtry share/locale/sr@latin
>+%%NLS%%@dirrmtry share/locale/te/LC_MESSAGES
>+%%NLS%%@dirrmtry share/locale/te
>+%%NLS%%@dirrmtry share/locale/ug/LC_MESSAGES
>+%%NLS%%@dirrmtry share/locale/ug
>+%%NLS%%@dirrmtry share/locale/zh_HK/LC_MESSAGES
>+%%NLS%%@dirrmtry share/locale/zh_HK
> %%PROXY%%@dirrmtry share/dbus-1/services
> %%PROXY%%@dirrmtry share/dbus-1
> @exec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true

Actions: View | Diff

Attachments on bug 193625: 147292 | 147299 | 147302 | 147615 | 147616 | 147617 | 147618 | 147620 | 147621 | 147622 | 147623 | 147726 | 147981 | 148304 | 148462 | 148852 | 148853 | 148854 | 148855 | 148856 | 148857 | 148858 | 148859 | 149838 | 149839 | 149840 | 149841