View | Details | Raw Unified | Return to bug 193625 | Differences between
and this patch

Collapse All | Expand All

(-)net/glib-networking/Makefile (-4 / +9 lines)
Lines 3-10 Link Here
3
#   $MCom: ports/trunk/net/glib-networking/Makefile 18537 2013-06-16 20:08:30Z kwm $
3
#   $MCom: ports/trunk/net/glib-networking/Makefile 18537 2013-06-16 20:08:30Z kwm $
4
4
5
PORTNAME=	glib-networking
5
PORTNAME=	glib-networking
6
PORTVERSION=	2.36.2
6
PORTVERSION=	2.40.0
7
PORTREVISION=	4
8
CATEGORIES=	net
7
CATEGORIES=	net
9
MASTER_SITES=	GNOME
8
MASTER_SITES=	GNOME
10
DIST_SUBDIR=	gnome2
9
DIST_SUBDIR=	gnome2
Lines 12-33 Link Here
12
MAINTAINER=	gnome@FreeBSD.org
11
MAINTAINER=	gnome@FreeBSD.org
13
COMMENT=	Network-related giomodules for glib
12
COMMENT=	Network-related giomodules for glib
14
13
14
LICENSE=	LGPL20
15
15
BUILD_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
16
BUILD_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
16
RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
17
RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
17
LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt
18
LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt
18
19
19
GNU_CONFIGURE=	yes
20
GNU_CONFIGURE=	yes
20
USES=		gettext gmake libtool:keepla pathfix pkgconfig tar:xz
21
USES=		gmake libtool:keepla pathfix pkgconfig tar:xz
21
USE_GNOME=	glib20 intltool
22
USE_GNOME=	glib20 intltool
22
CONFIGURE_ARGS=	--with-ca-certificates=${LOCALBASE}/share/certs/ca-root-nss.crt
23
CONFIGURE_ARGS=	--with-ca-certificates=${LOCALBASE}/share/certs/ca-root-nss.crt
23
CPPFLAGS+=	-I${LOCALBASE}/include
24
CPPFLAGS+=	-I${LOCALBASE}/include
24
LDFLAGS+=	-L${LOCALBASE}/lib
25
LDFLAGS+=	-L${LOCALBASE}/lib
25
INSTALL_TARGET=	install-strip
26
INSTALL_TARGET=	install-strip
27
USE_LDCONFIG=	yes
26
28
27
OPTIONS_DEFINE=	GNUTLS PKCS11 PROXY GNOME_PROXY
29
OPTIONS_DEFINE=	GNUTLS PKCS11 PROXY GNOME_PROXY NLS
28
OPTIONS_DEFAULT=GNUTLS PKCS11 PROXY GNOME_PROXY
30
OPTIONS_DEFAULT=GNUTLS PKCS11 PROXY GNOME_PROXY
29
OPTIONS_SUB=	yes
31
OPTIONS_SUB=	yes
30
32
33
NLS_USES=	gettext
34
NLS_CONFIGURE_ENABLE=	nls
35
31
GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
36
GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
32
GNUTLS_CONFIGURE_WITH=	gnutls
37
GNUTLS_CONFIGURE_WITH=	gnutls
33
PKCS11_DESC=		Enable PKCS11 support (requires GNUTLS)
38
PKCS11_DESC=		Enable PKCS11 support (requires GNUTLS)
(-)net/glib-networking/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (gnome2/glib-networking-2.36.2.tar.xz) = 2108d55b0af3eea56ce256830bcaf1519d6337e0054ef2eff80f2c0ef0eb23f9
1
SHA256 (gnome2/glib-networking-2.40.0.tar.xz) = 54e9c2d81171353794d2d2113e1311dfafd889f10993099e447b431c4e800aa4
2
SIZE (gnome2/glib-networking-2.36.2.tar.xz) = 352284
2
SIZE (gnome2/glib-networking-2.40.0.tar.xz) = 368196
(-)net/glib-networking/files/patch-tls_gnutls_gtlsclientconnection-gnutls.c (-8 / +8 lines)
Lines 1-9 Link Here
1
--- tls/gnutls/gtlsclientconnection-gnutls.c.orig	2012-03-04 18:47:23.000000000 -0500
1
--- tls/gnutls/gtlsclientconnection-gnutls.c.orig	2014-02-01 20:46:53.000000000 +0600
2
+++ tls/gnutls/gtlsclientconnection-gnutls.c	2012-03-04 18:50:26.000000000 -0500
2
+++ tls/gnutls/gtlsclientconnection-gnutls.c
3
@@ -349,7 +349,8 @@ g_tls_client_connection_gnutls_finish_ha
3
@@ -309,7 +309,8 @@ g_tls_client_connection_gnutls_finish_ha
4
 {
5
   GTlsClientConnectionGnutls *gnutls = G_TLS_CLIENT_CONNECTION_GNUTLS (conn);
6
 
4
 
5
   g_assert (inout_error != NULL);
6
 
7
-  if (g_error_matches (*inout_error, G_TLS_ERROR, G_TLS_ERROR_NOT_TLS) &&
7
-  if (g_error_matches (*inout_error, G_TLS_ERROR, G_TLS_ERROR_NOT_TLS) &&
8
+  if (inout_error &&
8
+  if (inout_error &&
9
+      g_error_matches (*inout_error, G_TLS_ERROR, G_TLS_ERROR_NOT_TLS) &&
9
+      g_error_matches (*inout_error, G_TLS_ERROR, G_TLS_ERROR_NOT_TLS) &&
Lines 10-21 Link Here
10
       gnutls->priv->cert_requested)
10
       gnutls->priv->cert_requested)
11
     {
11
     {
12
       g_clear_error (inout_error);
12
       g_clear_error (inout_error);
13
@@ -361,7 +362,7 @@ g_tls_client_connection_gnutls_finish_ha
13
@@ -329,7 +330,7 @@ g_tls_client_connection_gnutls_finish_ha
14
     {
14
     {
15
       gnutls_datum session_data;
15
       gnutls_datum_t session_datum;
16
 
16
 
17
-      if (!*inout_error &&
17
-      if (!*inout_error &&
18
+      if (inout_error && !*inout_error &&
18
+      if (inout_error && !*inout_error &&
19
 	  gnutls_session_get_data2 (g_tls_connection_gnutls_get_session (conn),
19
 	  gnutls_session_get_data2 (g_tls_connection_gnutls_get_session (conn),
20
 				    &session_data) == 0)
20
 				    &session_datum) == 0)
21
 	{
21
 	{
(-)net/glib-networking/files/patch-tls_gnutls_gtlsconnection-gnutls.c (-11 lines)
Lines 1-11 Link Here
1
--- tls/gnutls/gtlsconnection-gnutls.c.orig	2012-12-09 01:05:02.000000000 +0000
2
+++ tls/gnutls/gtlsconnection-gnutls.c	2012-12-09 01:14:46.000000000 +0000
3
@@ -752,7 +752,7 @@
4
   if (error)
5
     {
6
       g_set_error (error, G_TLS_ERROR, G_TLS_ERROR_MISC,
7
-                   errmsg, gnutls_strerror (status));
8
+                   "%s, %s", errmsg, gnutls_strerror (status));
9
     }
10
   return status;
11
 }
(-)net/glib-networking/pkg-plist (-84 / +84 lines)
Lines 9-98 Link Here
9
%%PROXY%%lib/gio/modules/libgiolibproxy.so
9
%%PROXY%%lib/gio/modules/libgiolibproxy.so
10
%%PROXY%%libexec/glib-pacrunner
10
%%PROXY%%libexec/glib-pacrunner
11
%%PROXY%%share/dbus-1/services/org.gtk.GLib.PACRunner.service
11
%%PROXY%%share/dbus-1/services/org.gtk.GLib.PACRunner.service
12
share/locale/an/LC_MESSAGES/glib-networking.mo
12
%%NLS%%share/locale/an/LC_MESSAGES/glib-networking.mo
13
share/locale/ar/LC_MESSAGES/glib-networking.mo
13
%%NLS%%share/locale/ar/LC_MESSAGES/glib-networking.mo
14
share/locale/as/LC_MESSAGES/glib-networking.mo
14
%%NLS%%share/locale/as/LC_MESSAGES/glib-networking.mo
15
share/locale/be/LC_MESSAGES/glib-networking.mo
15
%%NLS%%share/locale/be/LC_MESSAGES/glib-networking.mo
16
share/locale/bg/LC_MESSAGES/glib-networking.mo
16
%%NLS%%share/locale/bg/LC_MESSAGES/glib-networking.mo
17
share/locale/bn_IN/LC_MESSAGES/glib-networking.mo
17
%%NLS%%share/locale/bn_IN/LC_MESSAGES/glib-networking.mo
18
share/locale/ca/LC_MESSAGES/glib-networking.mo
18
%%NLS%%share/locale/ca/LC_MESSAGES/glib-networking.mo
19
share/locale/ca@valencia/LC_MESSAGES/glib-networking.mo
19
%%NLS%%share/locale/ca@valencia/LC_MESSAGES/glib-networking.mo
20
share/locale/cs/LC_MESSAGES/glib-networking.mo
20
%%NLS%%share/locale/cs/LC_MESSAGES/glib-networking.mo
21
share/locale/da/LC_MESSAGES/glib-networking.mo
21
%%NLS%%share/locale/da/LC_MESSAGES/glib-networking.mo
22
share/locale/de/LC_MESSAGES/glib-networking.mo
22
%%NLS%%share/locale/de/LC_MESSAGES/glib-networking.mo
23
share/locale/el/LC_MESSAGES/glib-networking.mo
23
%%NLS%%share/locale/el/LC_MESSAGES/glib-networking.mo
24
share/locale/en_CA/LC_MESSAGES/glib-networking.mo
24
%%NLS%%share/locale/en_CA/LC_MESSAGES/glib-networking.mo
25
share/locale/en_GB/LC_MESSAGES/glib-networking.mo
25
%%NLS%%share/locale/en_GB/LC_MESSAGES/glib-networking.mo
26
share/locale/eo/LC_MESSAGES/glib-networking.mo
26
%%NLS%%share/locale/eo/LC_MESSAGES/glib-networking.mo
27
share/locale/es/LC_MESSAGES/glib-networking.mo
27
%%NLS%%share/locale/es/LC_MESSAGES/glib-networking.mo
28
share/locale/et/LC_MESSAGES/glib-networking.mo
28
%%NLS%%share/locale/et/LC_MESSAGES/glib-networking.mo
29
share/locale/eu/LC_MESSAGES/glib-networking.mo
29
%%NLS%%share/locale/eu/LC_MESSAGES/glib-networking.mo
30
share/locale/fa/LC_MESSAGES/glib-networking.mo
30
%%NLS%%share/locale/fa/LC_MESSAGES/glib-networking.mo
31
share/locale/fi/LC_MESSAGES/glib-networking.mo
31
%%NLS%%share/locale/fi/LC_MESSAGES/glib-networking.mo
32
share/locale/fr/LC_MESSAGES/glib-networking.mo
32
%%NLS%%share/locale/fr/LC_MESSAGES/glib-networking.mo
33
share/locale/fur/LC_MESSAGES/glib-networking.mo
33
%%NLS%%share/locale/fur/LC_MESSAGES/glib-networking.mo
34
share/locale/gl/LC_MESSAGES/glib-networking.mo
34
%%NLS%%share/locale/gl/LC_MESSAGES/glib-networking.mo
35
share/locale/gu/LC_MESSAGES/glib-networking.mo
35
%%NLS%%share/locale/gu/LC_MESSAGES/glib-networking.mo
36
share/locale/he/LC_MESSAGES/glib-networking.mo
36
%%NLS%%share/locale/he/LC_MESSAGES/glib-networking.mo
37
share/locale/hi/LC_MESSAGES/glib-networking.mo
37
%%NLS%%share/locale/hi/LC_MESSAGES/glib-networking.mo
38
share/locale/hu/LC_MESSAGES/glib-networking.mo
38
%%NLS%%share/locale/hu/LC_MESSAGES/glib-networking.mo
39
share/locale/id/LC_MESSAGES/glib-networking.mo
39
%%NLS%%share/locale/id/LC_MESSAGES/glib-networking.mo
40
share/locale/it/LC_MESSAGES/glib-networking.mo
40
%%NLS%%share/locale/it/LC_MESSAGES/glib-networking.mo
41
share/locale/ja/LC_MESSAGES/glib-networking.mo
41
%%NLS%%share/locale/ja/LC_MESSAGES/glib-networking.mo
42
share/locale/km/LC_MESSAGES/glib-networking.mo
42
%%NLS%%share/locale/km/LC_MESSAGES/glib-networking.mo
43
share/locale/kn/LC_MESSAGES/glib-networking.mo
43
%%NLS%%share/locale/kn/LC_MESSAGES/glib-networking.mo
44
share/locale/ko/LC_MESSAGES/glib-networking.mo
44
%%NLS%%share/locale/ko/LC_MESSAGES/glib-networking.mo
45
share/locale/lt/LC_MESSAGES/glib-networking.mo
45
%%NLS%%share/locale/lt/LC_MESSAGES/glib-networking.mo
46
share/locale/lv/LC_MESSAGES/glib-networking.mo
46
%%NLS%%share/locale/lv/LC_MESSAGES/glib-networking.mo
47
share/locale/ml/LC_MESSAGES/glib-networking.mo
47
%%NLS%%share/locale/ml/LC_MESSAGES/glib-networking.mo
48
share/locale/mr/LC_MESSAGES/glib-networking.mo
48
%%NLS%%share/locale/mr/LC_MESSAGES/glib-networking.mo
49
share/locale/nb/LC_MESSAGES/glib-networking.mo
49
%%NLS%%share/locale/nb/LC_MESSAGES/glib-networking.mo
50
share/locale/nl/LC_MESSAGES/glib-networking.mo
50
%%NLS%%share/locale/nl/LC_MESSAGES/glib-networking.mo
51
share/locale/or/LC_MESSAGES/glib-networking.mo
51
%%NLS%%share/locale/or/LC_MESSAGES/glib-networking.mo
52
share/locale/pa/LC_MESSAGES/glib-networking.mo
52
%%NLS%%share/locale/pa/LC_MESSAGES/glib-networking.mo
53
share/locale/pl/LC_MESSAGES/glib-networking.mo
53
%%NLS%%share/locale/pl/LC_MESSAGES/glib-networking.mo
54
share/locale/pt/LC_MESSAGES/glib-networking.mo
54
%%NLS%%share/locale/pt/LC_MESSAGES/glib-networking.mo
55
share/locale/pt_BR/LC_MESSAGES/glib-networking.mo
55
%%NLS%%share/locale/pt_BR/LC_MESSAGES/glib-networking.mo
56
share/locale/ro/LC_MESSAGES/glib-networking.mo
56
%%NLS%%share/locale/ro/LC_MESSAGES/glib-networking.mo
57
share/locale/ru/LC_MESSAGES/glib-networking.mo
57
%%NLS%%share/locale/ru/LC_MESSAGES/glib-networking.mo
58
share/locale/sk/LC_MESSAGES/glib-networking.mo
58
%%NLS%%share/locale/sk/LC_MESSAGES/glib-networking.mo
59
share/locale/sl/LC_MESSAGES/glib-networking.mo
59
%%NLS%%share/locale/sl/LC_MESSAGES/glib-networking.mo
60
share/locale/sr/LC_MESSAGES/glib-networking.mo
60
%%NLS%%share/locale/sr/LC_MESSAGES/glib-networking.mo
61
share/locale/sr@latin/LC_MESSAGES/glib-networking.mo
61
%%NLS%%share/locale/sr@latin/LC_MESSAGES/glib-networking.mo
62
share/locale/sv/LC_MESSAGES/glib-networking.mo
62
%%NLS%%share/locale/sv/LC_MESSAGES/glib-networking.mo
63
share/locale/ta/LC_MESSAGES/glib-networking.mo
63
%%NLS%%share/locale/ta/LC_MESSAGES/glib-networking.mo
64
share/locale/te/LC_MESSAGES/glib-networking.mo
64
%%NLS%%share/locale/te/LC_MESSAGES/glib-networking.mo
65
share/locale/tg/LC_MESSAGES/glib-networking.mo
65
%%NLS%%share/locale/tg/LC_MESSAGES/glib-networking.mo
66
share/locale/th/LC_MESSAGES/glib-networking.mo
66
%%NLS%%share/locale/th/LC_MESSAGES/glib-networking.mo
67
share/locale/tr/LC_MESSAGES/glib-networking.mo
67
%%NLS%%share/locale/tr/LC_MESSAGES/glib-networking.mo
68
share/locale/ug/LC_MESSAGES/glib-networking.mo
68
%%NLS%%share/locale/ug/LC_MESSAGES/glib-networking.mo
69
share/locale/uk/LC_MESSAGES/glib-networking.mo
69
%%NLS%%share/locale/uk/LC_MESSAGES/glib-networking.mo
70
share/locale/vi/LC_MESSAGES/glib-networking.mo
70
%%NLS%%share/locale/vi/LC_MESSAGES/glib-networking.mo
71
share/locale/zh_CN/LC_MESSAGES/glib-networking.mo
71
%%NLS%%share/locale/zh_CN/LC_MESSAGES/glib-networking.mo
72
share/locale/zh_HK/LC_MESSAGES/glib-networking.mo
72
%%NLS%%share/locale/zh_HK/LC_MESSAGES/glib-networking.mo
73
share/locale/zh_TW/LC_MESSAGES/glib-networking.mo
73
%%NLS%%share/locale/zh_TW/LC_MESSAGES/glib-networking.mo
74
@dirrmtry share/locale/zh_HK/LC_MESSAGES
74
%%NLS%%@dirrmtry share/locale/an/LC_MESSAGES
75
@dirrmtry share/locale/zh_HK
75
%%NLS%%@dirrmtry share/locale/an
76
@dirrmtry share/locale/ug/LC_MESSAGES
76
%%NLS%%@dirrmtry share/locale/as/LC_MESSAGES
77
@dirrmtry share/locale/ug
77
%%NLS%%@dirrmtry share/locale/as
78
@dirrmtry share/locale/te/LC_MESSAGES
78
%%NLS%%@dirrmtry share/locale/bn_IN/LC_MESSAGES
79
@dirrmtry share/locale/te
79
%%NLS%%@dirrmtry share/locale/bn_IN
80
@dirrmtry share/locale/sr@latin/LC_MESSAGES
80
%%NLS%%@dirrmtry share/locale/ca@valencia/LC_MESSAGES
81
@dirrmtry share/locale/sr@latin
81
%%NLS%%@dirrmtry share/locale/ca@valencia
82
@dirrmtry share/locale/mr/LC_MESSAGES
82
%%NLS%%@dirrmtry share/locale/fur/LC_MESSAGES
83
@dirrmtry share/locale/mr
83
%%NLS%%@dirrmtry share/locale/fur
84
@dirrmtry share/locale/km/LC_MESSAGES
84
%%NLS%%@dirrmtry share/locale/km/LC_MESSAGES
85
@dirrmtry share/locale/km
85
%%NLS%%@dirrmtry share/locale/km
86
@dirrmtry share/locale/fur/LC_MESSAGES
86
%%NLS%%@dirrmtry share/locale/mr/LC_MESSAGES
87
@dirrmtry share/locale/fur
87
%%NLS%%@dirrmtry share/locale/mr
88
@dirrmtry share/locale/ca@valencia/LC_MESSAGES
88
%%NLS%%@dirrmtry share/locale/sr@latin/LC_MESSAGES
89
@dirrmtry share/locale/ca@valencia
89
%%NLS%%@dirrmtry share/locale/sr@latin
90
@dirrmtry share/locale/bn_IN/LC_MESSAGES
90
%%NLS%%@dirrmtry share/locale/te/LC_MESSAGES
91
@dirrmtry share/locale/bn_IN
91
%%NLS%%@dirrmtry share/locale/te
92
@dirrmtry share/locale/as/LC_MESSAGES
92
%%NLS%%@dirrmtry share/locale/ug/LC_MESSAGES
93
@dirrmtry share/locale/as
93
%%NLS%%@dirrmtry share/locale/ug
94
@dirrmtry share/locale/an/LC_MESSAGES
94
%%NLS%%@dirrmtry share/locale/zh_HK/LC_MESSAGES
95
@dirrmtry share/locale/an
95
%%NLS%%@dirrmtry share/locale/zh_HK
96
%%PROXY%%@dirrmtry share/dbus-1/services
96
%%PROXY%%@dirrmtry share/dbus-1/services
97
%%PROXY%%@dirrmtry share/dbus-1
97
%%PROXY%%@dirrmtry share/dbus-1
98
@exec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true
98
@exec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true

Return to bug 193625