Wed Jun 12 22:04:40 2019 UTC ()
glib-networking: Update to 2.60.3

pkgsrc changes:
 - Add options.mk in order to be able to select between `gnutls' and
  `openssl'.  However, no defaults are changed: `openssl' is
   considered experimental by upstream at the moment.
 - Remove dependency to mozilla-rootcerts (default gnutls/openssl
   certificates are now honored instead, should be part of
   Makefile,-r1.41 commit, sorry!)

Changes:
2.60.3
======
 - Fix clobbering of the thread-default main context after certificate
   verification failure during async handshakes since 2.60.1 (#85)
 - Fix GTlsDatabase initialization failures in OpenSSL backend due to
   uninitialized memory use
 - Fix minor leak of ALPN protocols

2.60.2
======
 - OpenSSL backend now defaults to system trust store (#62)
 - Fix client auth failure error with GnuTLS 3.6.7 (#70)


(leot)
diff -r1.41 -r1.42 pkgsrc/net/glib-networking/Makefile
diff -r1.14 -r1.15 pkgsrc/net/glib-networking/PLIST
diff -r1.19 -r1.20 pkgsrc/net/glib-networking/distinfo
diff -r1.1 -r1.2 pkgsrc/net/glib-networking/hacks.mk
diff -r0 -r1.1 pkgsrc/net/glib-networking/options.mk
cvs diff -r1.41 -r1.42 pkgsrc/net/glib-networking/Makefile (expand / switch to unified diff)

--- pkgsrc/net/glib-networking/Makefile 2019/06/11 13:12:16 1.41
+++ pkgsrc/net/glib-networking/Makefile 2019/06/12 22:04:40 1.42
@@ -1,29 +1,27 @@ @@ -1,29 +1,27 @@
1# $NetBSD: Makefile,v 1.41 2019/06/11 13:12:16 leot Exp $ 1# $NetBSD: Makefile,v 1.42 2019/06/12 22:04:40 leot Exp $
2 2
3DISTNAME= glib-networking-2.60.1 3DISTNAME= glib-networking-2.60.3
4CATEGORIES= net gnome 4CATEGORIES= net gnome
5MASTER_SITES= ${MASTER_SITE_GNOME:=sources/glib-networking/${PKGVERSION_NOREV:R}/} 5MASTER_SITES= ${MASTER_SITE_GNOME:=sources/glib-networking/${PKGVERSION_NOREV:R}/}
6EXTRACT_SUFX= .tar.xz 6EXTRACT_SUFX= .tar.xz
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://www.gnome.org/ 9HOMEPAGE= https://www.gnome.org/
10COMMENT= Network-related giomodules for glib 10COMMENT= Network-related giomodules for glib
11LICENSE= gnu-lgpl-v2 11LICENSE= gnu-lgpl-v2
12 12
13DEPENDS= mozilla-rootcerts>=1.0.20150804nb1:../../security/mozilla-rootcerts 
14 
15USE_TOOLS+= pkg-config gmake gettext 13USE_TOOLS+= pkg-config gmake gettext
16 14
17REPLACE_PYTHON+= meson_post_install.py 15REPLACE_PYTHON+= meson_post_install.py
18 16
 17.include "options.mk"
 18
19BUILDLINK_API_DEPENDS.glib2+= glib2>=2.56.0 19BUILDLINK_API_DEPENDS.glib2+= glib2>=2.56.0
20.include "../../devel/glib2/modules.mk" 20.include "../../devel/glib2/modules.mk"
21BUILDLINK_API_DEPENDS.libproxy+= libproxy>=0.3.1 21BUILDLINK_API_DEPENDS.libproxy+= libproxy>=0.3.1
22.include "../../www/libproxy/buildlink3.mk" 22.include "../../www/libproxy/buildlink3.mk"
23BUILDLINK_API_DEPENDS.gnutls+= gnutls>=3.6.0nb1 
24.include "../../security/gnutls/buildlink3.mk" 
25.include "../../security/p11-kit/buildlink3.mk" 23.include "../../security/p11-kit/buildlink3.mk"
26.include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk" 24.include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk"
27.include "../../devel/py-meson/build.mk" 25.include "../../devel/py-meson/build.mk"
28.include "../../lang/python/application.mk" 26.include "../../lang/python/application.mk"
29.include "../../mk/bsd.pkg.mk" 27.include "../../mk/bsd.pkg.mk"
cvs diff -r1.14 -r1.15 pkgsrc/net/glib-networking/PLIST (expand / switch to unified diff)

--- pkgsrc/net/glib-networking/PLIST 2018/05/27 12:28:12 1.14
+++ pkgsrc/net/glib-networking/PLIST 2019/06/12 22:04:40 1.15
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1@comment $NetBSD: PLIST,v 1.14 2018/05/27 12:28:12 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.15 2019/06/12 22:04:40 leot Exp $
2lib/gio/modules/libgiognomeproxy.so 2lib/gio/modules/libgiognomeproxy.so
3lib/gio/modules/libgiognutls.so 3${PLIST.gnutls}lib/gio/modules/libgiognutls.so
4lib/gio/modules/libgiolibproxy.so 4lib/gio/modules/libgiolibproxy.so
 5${PLIST.openssl}lib/gio/modules/libgioopenssl.so
5lib/systemd/user/glib-pacrunner.service 6lib/systemd/user/glib-pacrunner.service
6libexec/glib-pacrunner 7libexec/glib-pacrunner
7share/dbus-1/services/org.gtk.GLib.PACRunner.service 8share/dbus-1/services/org.gtk.GLib.PACRunner.service
8share/locale/an/LC_MESSAGES/glib-networking.mo 9share/locale/an/LC_MESSAGES/glib-networking.mo
9share/locale/ar/LC_MESSAGES/glib-networking.mo 10share/locale/ar/LC_MESSAGES/glib-networking.mo
10share/locale/as/LC_MESSAGES/glib-networking.mo 11share/locale/as/LC_MESSAGES/glib-networking.mo
11share/locale/be/LC_MESSAGES/glib-networking.mo 12share/locale/be/LC_MESSAGES/glib-networking.mo
12share/locale/bg/LC_MESSAGES/glib-networking.mo 13share/locale/bg/LC_MESSAGES/glib-networking.mo
13share/locale/bn_IN/LC_MESSAGES/glib-networking.mo 14share/locale/bn_IN/LC_MESSAGES/glib-networking.mo
14share/locale/bs/LC_MESSAGES/glib-networking.mo 15share/locale/bs/LC_MESSAGES/glib-networking.mo
15share/locale/ca/LC_MESSAGES/glib-networking.mo 16share/locale/ca/LC_MESSAGES/glib-networking.mo
16share/locale/ca@valencia/LC_MESSAGES/glib-networking.mo 17share/locale/ca@valencia/LC_MESSAGES/glib-networking.mo
17share/locale/cs/LC_MESSAGES/glib-networking.mo 18share/locale/cs/LC_MESSAGES/glib-networking.mo
cvs diff -r1.19 -r1.20 pkgsrc/net/glib-networking/distinfo (expand / switch to unified diff)

--- pkgsrc/net/glib-networking/distinfo 2019/06/11 12:45:46 1.19
+++ pkgsrc/net/glib-networking/distinfo 2019/06/12 22:04:40 1.20
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.19 2019/06/11 12:45:46 wiz Exp $ 1$NetBSD: distinfo,v 1.20 2019/06/12 22:04:40 leot Exp $
2 2
3SHA1 (glib-networking-2.60.1.tar.xz) = c509054837277aa64926cae635f32973d1c1029d 3SHA1 (glib-networking-2.60.3.tar.xz) = a8b3cdc3b6ecabec176b414212233fadf0e22533
4RMD160 (glib-networking-2.60.1.tar.xz) = 273054d23d63ef3b9f2180a07828ac2cb5ccd13d 4RMD160 (glib-networking-2.60.3.tar.xz) = 96af57cce499ec3242071b01d93be5639236459d
5SHA512 (glib-networking-2.60.1.tar.xz) = a40a7e9678076db1a469f0d8ffdcb0c6658ef96ff1d9637299fbb07985f4c42bae3f1415f8df15242718420d20eb90de93253a00d1f6a347110b3f8a74bcc717 5SHA512 (glib-networking-2.60.3.tar.xz) = 06a50aee1a563f5e992549e963d3980b02c9068976a244ce4a84eb0aca064b2ab7e8d50e3ef26dbd0d8d5edbddc82c5ce83d4a93bfaa0822b79465f0d3b8609f
6Size (glib-networking-2.60.1.tar.xz) = 184828 bytes 6Size (glib-networking-2.60.3.tar.xz) = 185132 bytes
cvs diff -r1.1 -r1.2 pkgsrc/net/glib-networking/hacks.mk (expand / switch to unified diff)

--- pkgsrc/net/glib-networking/hacks.mk 2018/06/04 05:31:02 1.1
+++ pkgsrc/net/glib-networking/hacks.mk 2019/06/12 22:04:40 1.2
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1# $NetBSD: hacks.mk,v 1.1 2018/06/04 05:31:02 dbj Exp $ 1# $NetBSD: hacks.mk,v 1.2 2019/06/12 22:04:40 leot Exp $
2 2
3# devel/glib2 expects modules to end in .so on darwin 3# devel/glib2 expects modules to end in .so on darwin
4# net/glib-networking uses py-meson to build 4# net/glib-networking uses py-meson to build
5# py-meson's build.py SharedModule class inherits from SharedLibrary and assumes .dylib suffix 5# py-meson's build.py SharedModule class inherits from SharedLibrary and assumes .dylib suffix
6# (true as of py36-meson-0.44.1nb3) 6# (true as of py36-meson-0.44.1nb3)
7 7
8.if ${OPSYS} == "Darwin" 8.if ${OPSYS} == "Darwin"
9post-install: 9post-install:
10 for l in libgiognomeproxy libgiognutls libgiolibproxy; do \ 10 for l in libgiognomeproxy libgiognutls libgiolibproxy libgioopenssl; do \
11 ${MV} "${DESTDIR}${PREFIX}/lib/gio/modules/$${l}.dylib" \ 11 if ${TEST} -f "${DESTDIR}${PREFIX}/lib/gio/modules/$${l}.dylib"; then \
12 "${DESTDIR}${PREFIX}/lib/gio/modules/$${l}.so"; \ 12 ${MV} "${DESTDIR}${PREFIX}/lib/gio/modules/$${l}.dylib" \
 13 "${DESTDIR}${PREFIX}/lib/gio/modules/$${l}.so"; \
 14 fi; \
13 done 15 done
14.endif 16.endif
File Added: pkgsrc/net/glib-networking/options.mk
# $NetBSD: options.mk,v 1.1 2019/06/12 22:04:40 leot Exp $

PKG_OPTIONS_VAR=	PKG_OPTIONS.glib-networking

PKG_OPTIONS_REQUIRED_GROUPS=	ssl
PKG_OPTIONS_GROUP.ssl=		gnutls openssl

PKG_SUGGESTED_OPTIONS=		gnutls

.include "../../mk/bsd.options.mk"

PLIST_VARS+=	gnutls openssl

###
### SSL support
###
.if !empty(PKG_OPTIONS:Mgnutls)
PLIST.gnutls=	yes
BUILDLINK_API_DEPENDS.gnutls+= gnutls>=3.6.0nb1
.  include "../../security/gnutls/buildlink3.mk"
MESON_ARGS+=	-Dgnutls=enabled
MESON_ARGS+=	-Dopenssl=disabled
.elif !empty(PKG_OPTIONS:Mopenssl)
PLIST.openssl=	yes
.  include "../../security/openssl/buildlink3.mk"
MESON_ARGS+=	-Dopenssl=enabled
MESON_ARGS+=	-Dgnutls=disabled
.endif