Received: by mail.netbsd.org (Postfix, from userid 605) id B6C3E84D61; Wed, 12 Jun 2019 22:04:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 3E16484D4C for ; Wed, 12 Jun 2019 22:04:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id BnrZ_GUe32fP for ; Wed, 12 Jun 2019 22:04:40 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 7E14284CE8 for ; Wed, 12 Jun 2019 22:04:40 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 77CE6FBF4; Wed, 12 Jun 2019 22:04:40 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_156037708030920" MIME-Version: 1.0 Date: Wed, 12 Jun 2019 22:04:40 +0000 From: "Leonardo Taccari" Subject: CVS commit: pkgsrc/net/glib-networking To: pkgsrc-changes@NetBSD.org Reply-To: leot@netbsd.org X-Mailer: log_accum Message-Id: <20190612220440.77CE6FBF4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_156037708030920 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: leot Date: Wed Jun 12 22:04:40 UTC 2019 Modified Files: pkgsrc/net/glib-networking: Makefile PLIST distinfo hacks.mk Added Files: pkgsrc/net/glib-networking: options.mk Log Message: 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) To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 pkgsrc/net/glib-networking/Makefile cvs rdiff -u -r1.14 -r1.15 pkgsrc/net/glib-networking/PLIST cvs rdiff -u -r1.19 -r1.20 pkgsrc/net/glib-networking/distinfo cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/glib-networking/hacks.mk cvs rdiff -u -r0 -r1.1 pkgsrc/net/glib-networking/options.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_156037708030920 Content-Disposition: inline Content-Length: 5242 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/net/glib-networking/Makefile diff -u pkgsrc/net/glib-networking/Makefile:1.41 pkgsrc/net/glib-networking/Makefile:1.42 --- pkgsrc/net/glib-networking/Makefile:1.41 Tue Jun 11 13:12:16 2019 +++ pkgsrc/net/glib-networking/Makefile Wed Jun 12 22:04:40 2019 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.41 2019/06/11 13:12:16 leot Exp $ +# $NetBSD: Makefile,v 1.42 2019/06/12 22:04:40 leot Exp $ -DISTNAME= glib-networking-2.60.1 +DISTNAME= glib-networking-2.60.3 CATEGORIES= net gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/glib-networking/${PKGVERSION_NOREV:R}/} EXTRACT_SUFX= .tar.xz @@ -10,18 +10,16 @@ HOMEPAGE= https://www.gnome.org/ COMMENT= Network-related giomodules for glib LICENSE= gnu-lgpl-v2 -DEPENDS= mozilla-rootcerts>=1.0.20150804nb1:../../security/mozilla-rootcerts - USE_TOOLS+= pkg-config gmake gettext REPLACE_PYTHON+= meson_post_install.py +.include "options.mk" + BUILDLINK_API_DEPENDS.glib2+= glib2>=2.56.0 .include "../../devel/glib2/modules.mk" BUILDLINK_API_DEPENDS.libproxy+= libproxy>=0.3.1 .include "../../www/libproxy/buildlink3.mk" -BUILDLINK_API_DEPENDS.gnutls+= gnutls>=3.6.0nb1 -.include "../../security/gnutls/buildlink3.mk" .include "../../security/p11-kit/buildlink3.mk" .include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk" .include "../../devel/py-meson/build.mk" Index: pkgsrc/net/glib-networking/PLIST diff -u pkgsrc/net/glib-networking/PLIST:1.14 pkgsrc/net/glib-networking/PLIST:1.15 --- pkgsrc/net/glib-networking/PLIST:1.14 Sun May 27 12:28:12 2018 +++ pkgsrc/net/glib-networking/PLIST Wed Jun 12 22:04:40 2019 @@ -1,7 +1,8 @@ -@comment $NetBSD: PLIST,v 1.14 2018/05/27 12:28:12 wiz Exp $ +@comment $NetBSD: PLIST,v 1.15 2019/06/12 22:04:40 leot Exp $ lib/gio/modules/libgiognomeproxy.so -lib/gio/modules/libgiognutls.so +${PLIST.gnutls}lib/gio/modules/libgiognutls.so lib/gio/modules/libgiolibproxy.so +${PLIST.openssl}lib/gio/modules/libgioopenssl.so lib/systemd/user/glib-pacrunner.service libexec/glib-pacrunner share/dbus-1/services/org.gtk.GLib.PACRunner.service Index: pkgsrc/net/glib-networking/distinfo diff -u pkgsrc/net/glib-networking/distinfo:1.19 pkgsrc/net/glib-networking/distinfo:1.20 --- pkgsrc/net/glib-networking/distinfo:1.19 Tue Jun 11 12:45:46 2019 +++ pkgsrc/net/glib-networking/distinfo Wed Jun 12 22:04:40 2019 @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.19 2019/06/11 12:45:46 wiz Exp $ +$NetBSD: distinfo,v 1.20 2019/06/12 22:04:40 leot Exp $ -SHA1 (glib-networking-2.60.1.tar.xz) = c509054837277aa64926cae635f32973d1c1029d -RMD160 (glib-networking-2.60.1.tar.xz) = 273054d23d63ef3b9f2180a07828ac2cb5ccd13d -SHA512 (glib-networking-2.60.1.tar.xz) = a40a7e9678076db1a469f0d8ffdcb0c6658ef96ff1d9637299fbb07985f4c42bae3f1415f8df15242718420d20eb90de93253a00d1f6a347110b3f8a74bcc717 -Size (glib-networking-2.60.1.tar.xz) = 184828 bytes +SHA1 (glib-networking-2.60.3.tar.xz) = a8b3cdc3b6ecabec176b414212233fadf0e22533 +RMD160 (glib-networking-2.60.3.tar.xz) = 96af57cce499ec3242071b01d93be5639236459d +SHA512 (glib-networking-2.60.3.tar.xz) = 06a50aee1a563f5e992549e963d3980b02c9068976a244ce4a84eb0aca064b2ab7e8d50e3ef26dbd0d8d5edbddc82c5ce83d4a93bfaa0822b79465f0d3b8609f +Size (glib-networking-2.60.3.tar.xz) = 185132 bytes Index: pkgsrc/net/glib-networking/hacks.mk diff -u pkgsrc/net/glib-networking/hacks.mk:1.1 pkgsrc/net/glib-networking/hacks.mk:1.2 --- pkgsrc/net/glib-networking/hacks.mk:1.1 Mon Jun 4 05:31:02 2018 +++ pkgsrc/net/glib-networking/hacks.mk Wed Jun 12 22:04:40 2019 @@ -1,4 +1,4 @@ -# $NetBSD: hacks.mk,v 1.1 2018/06/04 05:31:02 dbj Exp $ +# $NetBSD: hacks.mk,v 1.2 2019/06/12 22:04:40 leot Exp $ # devel/glib2 expects modules to end in .so on darwin # net/glib-networking uses py-meson to build @@ -7,8 +7,10 @@ .if ${OPSYS} == "Darwin" post-install: - for l in libgiognomeproxy libgiognutls libgiolibproxy; do \ - ${MV} "${DESTDIR}${PREFIX}/lib/gio/modules/$${l}.dylib" \ - "${DESTDIR}${PREFIX}/lib/gio/modules/$${l}.so"; \ + for l in libgiognomeproxy libgiognutls libgiolibproxy libgioopenssl; do \ + if ${TEST} -f "${DESTDIR}${PREFIX}/lib/gio/modules/$${l}.dylib"; then \ + ${MV} "${DESTDIR}${PREFIX}/lib/gio/modules/$${l}.dylib" \ + "${DESTDIR}${PREFIX}/lib/gio/modules/$${l}.so"; \ + fi; \ done .endif Added files: Index: pkgsrc/net/glib-networking/options.mk diff -u /dev/null pkgsrc/net/glib-networking/options.mk:1.1 --- /dev/null Wed Jun 12 22:04:40 2019 +++ pkgsrc/net/glib-networking/options.mk Wed Jun 12 22:04:40 2019 @@ -0,0 +1,28 @@ +# $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 --_----------=_156037708030920--