Update glib-networking to 2.48.0

2.48.0
======
  * New stable release. (No changes since 2.47.90)


2.47.90
=======
  * gnutls: The non-PKCS#11 TLS plugin now uses gnutls's certificate
    validation code directly, rather than attempting to build a
    certificate chain itself first. [#753260 and others, Dan Winship]

  * gnutls: Fixed a leak when closing a connection during an implicit
    handshake [#736809, Philip Withnall]

  * gnutls: Fixed "make check" without PKCS#11 support [#728977,
    Gilles Dartiguelongue]

  * gnutls: Various changes in preparation for DTLS support (but not
    the actual DTLS support itself) [#697908, #735754, Philip
    Withnall, Olivier Crête]

  * Updated translations: Occitan

2.47.1
======
  * Fixed a certificate chain validation problem that affected
    Facebook in Epiphany. [#750457, Carlos Garcia Campos]

  * Added a systemd service file for glib-pacrunner [#755740, Simon
    McVittie]

2.46.0
======
  * Various minor cleanups and small memory leak fixes

  * Added a new test case for client certificate chain handling
    [#754129, Michael Catanzaro]

  * New/updated translations:
    Japanese, Occitan, Portuguese

2.45.1
======
  * tls/gnutls: Implement g_tls_client_connection_copy_session_state(),
    to allow implementing FTP-over-TLS in gvfs. (#745255, Ross
    Lagerwall)

2.44.0
======
  * New stable release. (No changes since 2.43.92)

2.43.92
=======
  * Fix TLS session caching when using session tickets (#745099, Ross
    Lagerwall)

  * Updated translations:
	Bosnian

2.43.91
=======
  * tls/gnutls: Removed a workaround for connecting to servers with
    weak DH parameters, which was apparently only needed because
    gnutls was prioritizing DHE over RSA. (Michael Catanzaro)
    (https://bugzilla.redhat.com/show_bug.cgi?id=1177964#c8)

  * tls/gnutls: We now require gnutls 3.x again. (In fact, 2.42.1
    and 2.43.1 accidentally used a 3.x-only function, so we already
    required it, we were just failing to declare that fact.)

  * tls/tests: Skip certain tests when running against old gnutls or
    GLib releases. (glib-networking 2.43.91 itself does not require
    GLib 2.43, but one of the test cases does.)

  * Updated translations:
	Friulian

2.43.1
======

  * The GTlsClientConnection "use-ssl3" property now falls back to TLS
    1.0 if SSL 3.0 has been disabled, rather than just failing. Also,
    we now use the gnutls %LATEST_RECORD_VERSION option by default (to
    allow connecting to certain servers that were incorrectly patched
    for the POODLE attack), but also make sure to remove that option
    in the fallback ("use-ssl3") mode (to allow connecting to other
    servers that are differently broken). (#738633, #740087, Dan
    Winship)

  * tls/gnutls: Miscellaneous warning, debugging, and leak fixes
    (#736757, #736809, #737106, Philip Withnall)

  * New/updated translations:
	Kazakh

2.42.0
======
  * New stable release. (No changes since 2.41.92)

2.41.92
=======
  * tls/gnutls: Incorrectly-ordered certificate chains are now
    accepted (#683266, Michael Catanzaro)

  * tls/gnutls: Closing an already-closed GTlsConnection now correctly
    returns TRUE rather than G_IO_ERROR_CLOSED (#735754, Olivier
    Crête)

2.41.4
======
  * tls/gnutls: certificates with IP address subject altnames are now
    supported (#726596, Aleix Conchillo Flaqué)

  * tls/tests: added a script to re-generate the certificates, and
    regenerated them (since the key for the existing CA certificate
    had been lost, so it wasn't possible to add new test certificates,
    eg, for IP SAN). (#733365, Aleix Conchillo Flaqué)

  * Updated translations:
	Greek

2.41.3
======
  * tls/gnutls: g_tls_backend_get_default_database() should never
    return %NULL; if glib-networking was built without a
    ca-certificates file, then the default GTlsDatabase should just be
    empty. (#727282, Olivier Crête)

  * tls/gnutls: If a server's certificate includes an issuer chain, we
    now send the entire chain to the client. (#724708, Aleix Conchillo
    Flaqué)

  * Updated translations:
	Swedish

2.40.0
======
  * New stable release. (No changes since 2.39.90)

2.39.90
=======
  * tls/gnutls: Avoid trying to update a destroyed GSource (#723774,
    Philip Withnall)

  * tls/tests: Fix another flaky test (#722336)

  * tests: use the TAP driver

  * Updated translations:
	Chinese, Czech

2.39.3
======
  * tls/tests: Fix one sporadic bug in the connection test (#720081)
    and make it properly fail rather than hanging forever when another
    sporadic bug happens (which I don't actually know the cause of)
    (#719727)

  * tls/gnutls: Fix for -Werror=format-nonliteral (#720081, Ryan
    Lortie)

2.39.1
======
  * tls/gnutls: Use g_tls_interaction_invoke_request_certificate()
    when processing a certificate request. (#637257, Stef Walter)

  * tls/gnutls: Handle G_IO_ERROR_TIMED_OUT on a GTlsConnection
    correctly rather than reporting "The specified session has
    been invalidated for some reason". (#710700, Aleix Concillo
    Flaque)

  * tls/tests: Fix to previous installed-tests fix, which resulted
    in some files getting installed even when installed tests weren't
    enabled. (#710197)

  * tls/tests: add a test for a fix made in glib (#710691, Aleix
    Conchillo Flaque).

2.38.1
======
  * glibpacrunner: Don't crash if there is an internal libproxy error.
    (rhbz #866927)

  * tls/tests: Fix installed tests to not accidentally depend on
    having the source tree still exist. (#709628)

  * Updated translations:
	Tajik

2.38.0
======
  * New stable release. (No changes since 2.37.5)

2.37.5
======
  * gnutls: minimum version is now 2.12.8 (with 3.x preferred...)

  * glib-networking now supports the --enable-installed-tests flag, to
    install its test programs to run at other times (ie, after
    updating glib)

2.37.4
======
  * proxy/gnome: further improve GNOME session detection (#701377)

  * gnutls: don't crash if $G_TLS_GNUTS_PRIORITY is invalid (#701693)

2.37.2
======
  * proxy/gnome: Improve session-type detection to include
    gnome-classic and anything else starting with "gnome" (#700607,
    Giovanni Campagna)

  * proxy/libproxy: make SOCKS work when using the async API (#699359,
    Dan)

  * proxy/tests: make the libproxy test program use the just-built
    plugin rather than the installed one. Oops (#700286, Iain Lane)

  * proxy/tests: fix to not error out if neither proxy module is built
    (#700628, Dan)

  * tls/tests: fix a sporadic crash (Dan)

2.37.1
======
  * gnutls: Fixed a bug that could cause hangs and/or bursts of CPU
    usage in some cases. (#696881, Olivier Crête)

  * gnutls: Fixed CFLAGS when building with gnutls in a different
    prefix. (#696519, Emmanuel Pacaud)

  * gnutls: Fixed a hang while rehandshaking with gnutls 3.x (#695062,
    Dan)

  * gnutls: Fixed a handshaking crash in multithreaded use (#697754,
    Olivier Crête)

  * proxy/gnome: Fix "automatic" mode, which was mistakenly being
    treated as "none" (Dan)

  * proxy/gnome: Use this in Unity sessions as well as GNOME ones.
    (#698936, Iain Lane)

  * New/Updated translations:
	Friulian, Indonesian, Turkish

5 files changed, 45 insertions, 25 deletions

diff --git a/net/glib-networking/Makefile b/net/glib-networking/Makefile
index 1e059843e9f..54b8c6ff0cd 100644
--- a/net/glib-networking/Makefile
+++ b/net/glib-networking/Makefile
@@ -1,16 +1,15 @@
-# $NetBSD: Makefile,v 1.24 2015/08/23 14:30:39 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2016/04/21 21:24:56 prlw1 Exp $
 #
 
-DISTNAME=	glib-networking-2.36.2
-PKGREVISION=	2
-CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/glib-networking/2.36/}
+DISTNAME=	glib-networking-2.48.0
+CATEGORIES=	net gnome
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/glib-networking/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	Network-related giomodules for glib
-LICENSE=	gnu-gpl-v2
+LICENSE=	gnu-lgpl-v2
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+= --with-ca-certificates=/etc/ssl/certs/ca-certificates.crt
@@ -28,11 +27,11 @@ _WRAP_EXTRA_ARGS.CC+=	-Wno-error=format-nonliteral
 CWRAPPERS_APPEND.cc+=	-Wno-error=format-nonliteral
 .endif
 
-BUILDLINK_API_DEPENDS.glib2+= glib2>=2.32.1
-.include "../../devel/glib2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.glib2+=		glib2>=2.46.0
 .include "../../devel/glib2/modules.mk"
-BUILDLINK_API_DEPENDS.libproxy+= libproxy>=0.3.1
+BUILDLINK_API_DEPENDS.libproxy+=	libproxy>=0.3.1
 .include "../../www/libproxy/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gnutls+=		gnutls>=3.0
 .include "../../security/gnutls/buildlink3.mk"
 # XXX libcgrypt is not necessary if gnutls was built against nettle,
 # but the assumption is hardwired at multiple places
diff --git a/net/glib-networking/PLIST b/net/glib-networking/PLIST
index 7447ad2ccad..2c1636ecbc6 100644
--- a/net/glib-networking/PLIST
+++ b/net/glib-networking/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.9 2013/04/27 11:48:05 drochner Exp $
+@comment $NetBSD: PLIST,v 1.10 2016/04/21 21:24:56 prlw1 Exp $
 lib/gio/modules/libgiognutls.la
 lib/gio/modules/libgiolibproxy.la
+lib/systemd/user/glib-pacrunner.service
 libexec/glib-pacrunner
 share/dbus-1/services/org.gtk.GLib.PACRunner.service
 share/locale/an/LC_MESSAGES/glib-networking.mo
@@ -9,6 +10,7 @@ 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/bs/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
@@ -33,6 +35,7 @@ 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/kk/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
@@ -42,6 +45,7 @@ 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/oc/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
diff --git a/net/glib-networking/distinfo b/net/glib-networking/distinfo
index a537e545048..0229188d47b 100644
--- a/net/glib-networking/distinfo
+++ b/net/glib-networking/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.12 2015/11/04 00:35:02 agc Exp $
+$NetBSD: distinfo,v 1.13 2016/04/21 21:24:56 prlw1 Exp $
 
-SHA1 (glib-networking-2.36.2.tar.xz) = d4c2accd50ff4769f434cd552734fb2b0b2b3b81
-RMD160 (glib-networking-2.36.2.tar.xz) = 1feefe77ac31065185b61af393e224ad12e76aea
-SHA512 (glib-networking-2.36.2.tar.xz) = 077c8d821ff3942b7ddad51b4045a6a9aa05b50da58f5446ee2e536dbdffa81018141feea9e793da7b031a2991c6e4ccc66e524d288ab9e85603daa895283536
-Size (glib-networking-2.36.2.tar.xz) = 352284 bytes
-SHA1 (patch-aa) = c51ae010435556b19244415176050adcfc61395d
+SHA1 (glib-networking-2.48.0.tar.xz) = ac90e15f599b25d7d61b642afaefa5f9f06be8f3
+RMD160 (glib-networking-2.48.0.tar.xz) = 0c608f4001b75401ab2479e665eaf12c3e483607
+SHA512 (glib-networking-2.48.0.tar.xz) = ce57e9b6ae704b1fefd2e147dc51e5ac596b1765303e92b4e93cb9e9c971725291ee21c0fd2e6863da2d2bee4e19d7f3f4b8f95229a6a7f053e3867dd750563d
+Size (glib-networking-2.48.0.tar.xz) = 391468 bytes
+SHA1 (patch-aa) = 4171ec918a45c40b370baa6c7f67ed452a0f93f2
+SHA1 (patch-configure) = 8df68f2b259045522e9c95ee0996852777c40da0
diff --git a/net/glib-networking/patches/patch-aa b/net/glib-networking/patches/patch-aa
index d097d1bf0d3..c1e4d14a262 100644
--- a/net/glib-networking/patches/patch-aa
+++ b/net/glib-networking/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.3 2012/11/15 14:49:16 drochner Exp $
+$NetBSD: patch-aa,v 1.4 2016/04/21 21:24:56 prlw1 Exp $
 
---- Makefile.in.orig	2012-11-12 21:25:30.000000000 +0000
+--- Makefile.in.orig	2016-03-21 21:51:19.000000000 +0000
 +++ Makefile.in
-@@ -335,7 +335,7 @@ GTESTER_REPORT = gtester-report		# for t
- EXTRA_DIST = 
- TEST_PROGS = 
+@@ -692,7 +692,7 @@ all_test_ltlibs = $(test_ltlibraries) $(
+ 
+ @ENABLE_INSTALLED_TESTS_TRUE@installed_test_meta_DATA = $(installed_testcases:=.test)
  ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
--SUBDIRS = po $(am__append_1) $(am__append_2) proxy/tests \
-+SUBDIRS = po $(am__append_1) $(am__append_2) \
- 	$(am__append_3) $(am__append_4)
- all: config.h
+-SUBDIRS = po $(am__append_14) $(am__append_15) proxy/tests \
++SUBDIRS = po $(am__append_14) $(am__append_15) \
+ 	$(am__append_16) $(am__append_17)
+ all: $(BUILT_SOURCES) config.h
  	$(MAKE) $(AM_MAKEFLAGS) all-recursive
diff --git a/net/glib-networking/patches/patch-configure b/net/glib-networking/patches/patch-configure
new file mode 100644
index 00000000000..93824f25bd6
--- /dev/null
+++ b/net/glib-networking/patches/patch-configure
@@ -0,0 +1,16 @@
+$NetBSD: patch-configure,v 1.1 2016/04/21 21:24:56 prlw1 Exp $
+
+configure: test(1) uses = to test for string equality
+https://bugzilla.gnome.org/show_bug.cgi?id=765396
+
+--- configure.orig	2016-03-21 21:51:20.000000000 +0000
++++ configure
+@@ -14712,7 +14712,7 @@ else
+   ENABLE_ALWAYS_BUILD_TESTS_FALSE=
+ fi
+ 
+-  if test "$ENABLE_INSTALLED_TESTS" == "1"; then
++  if test "$ENABLE_INSTALLED_TESTS" = "1"; then
+     installed_test_metadir=${datadir}/installed-tests/glib-networking
+ 
+     installed_testdir=${libexecdir}/installed-tests/glib-networking