CVS commit: pkgsrc/devel

["Patrick Welche" <prlw1%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   prlw1
Date:           Tue Jun 11 09:15:54 UTC 2019

Modified Files:
        pkgsrc/devel/gdbus-codegen: distinfo
        pkgsrc/devel/glib2: Makefile Makefile.common PLIST distinfo

Log Message:
Update glib2 to 2.60.4

Create GIO_MODULES_DIR - reported by wiz@

Overview of changes in GLib 2.60.4
==================================

* Fixes to improved network status detection with NetworkManager (#1788)

* Leak fixes to some `glib-genmarshal` generated code (#1793)

* Further fixes to the Happy Eyeballs (RFC 8305) implementation (!865)

* File system permissions fix to clamp down permissions in a small time window
  when copying files (CVE-2019-12450, !876)

* Bugs fixed:
 - #1755 Please revert #535 gmacros: Try to use the standard __func__ first in G_STRFUNC
 - #1788 GNetworkMonitor claims I am offline
 - #1792 glib-genmarshal generated valist marshal does not respect static scope for some types
 - #1793 glib-genmarshal generates wrong code for va marshaler for VARIANT type
 - #1795 Fix mingw32 CI on older branches
 - !865 gnetworkaddress: fix "happy eyeballs" logic
 - !878 Backport !876 “gfile: Limit access to files when copying” to glib-2-60


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/gdbus-codegen/distinfo
cvs rdiff -u -r1.250 -r1.251 pkgsrc/devel/glib2/Makefile
cvs rdiff -u -r1.69 -r1.70 pkgsrc/devel/glib2/Makefile.common
cvs rdiff -u -r1.103 -r1.104 pkgsrc/devel/glib2/PLIST
cvs rdiff -u -r1.243 -r1.244 pkgsrc/devel/glib2/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/gdbus-codegen/distinfo
diff -u pkgsrc/devel/gdbus-codegen/distinfo:1.2 pkgsrc/devel/gdbus-codegen/distinfo:1.3
--- pkgsrc/devel/gdbus-codegen/distinfo:1.2     Thu Jun  6 11:05:12 2019
+++ pkgsrc/devel/gdbus-codegen/distinfo Tue Jun 11 09:15:54 2019
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2019/06/06 11:05:12 adam Exp $
+$NetBSD: distinfo,v 1.3 2019/06/11 09:15:54 prlw1 Exp $
 
-SHA1 (glib-2.60.3.tar.xz) = 244be77d07a268d700f5bc41b2aec1d7d659934f
-RMD160 (glib-2.60.3.tar.xz) = d0768846033bacdcd0aaac6e3ec634666729e225
-SHA512 (glib-2.60.3.tar.xz) = e316846770ecbd92ca5359c3d71535a5d4628edbda43477584921c84f3b2d6a34ecfb789069404565059d157e2aa3936e1e9fe64b4b7c59fb5c66c1a6f9a2f07
-Size (glib-2.60.3.tar.xz) = 4587636 bytes
+SHA1 (glib-2.60.4.tar.xz) = f76ef7339fef5784d79520478110caa4c5054806
+RMD160 (glib-2.60.4.tar.xz) = e8520dd0da7c37e6bb18b24a3b3ec308a6fa6aa0
+SHA512 (glib-2.60.4.tar.xz) = 614d25652ec9e8387f7865777e128b7f6fd68ff4a1a000868117cbcf5210b5f6aa476eb2b795a6dde56b997906aeb2157c83308f1421a27c4e379522d0ed0afc
+Size (glib-2.60.4.tar.xz) = 4589384 bytes
 SHA1 (patch-meson.build) = 6877b395f02619ea93b648119373ac1b53438c59

Index: pkgsrc/devel/glib2/Makefile
diff -u pkgsrc/devel/glib2/Makefile:1.250 pkgsrc/devel/glib2/Makefile:1.251
--- pkgsrc/devel/glib2/Makefile:1.250   Thu Jun  6 11:05:12 2019
+++ pkgsrc/devel/glib2/Makefile Tue Jun 11 09:15:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.250 2019/06/06 11:05:12 adam Exp $
+# $NetBSD: Makefile,v 1.251 2019/06/11 09:15:54 prlw1 Exp $
 
 .include "Makefile.common"
 
@@ -26,6 +26,8 @@ FILES_SUBST+=         GIO_QUERYMODULES=${PREFIX
 FILES_SUBST+=          GLIB_COMPILE_SCHEMAS=${PREFIX}/bin/glib-compile-schemas
 FILES_SUBST+=          GLIB_SCHEMAS_DIR=${PREFIX}/share/glib-2.0/schemas
 
+OWN_DIRS=              ${GIO_MODULES_DIR}
+
 BUILD_DEFS+=           VARBASE
 SUBST_CLASSES+=                dbusdb
 SUBST_MESSAGE.dbusdb=  Adjust dbus machine uuid path to dbus package

Index: pkgsrc/devel/glib2/Makefile.common
diff -u pkgsrc/devel/glib2/Makefile.common:1.69 pkgsrc/devel/glib2/Makefile.common:1.70
--- pkgsrc/devel/glib2/Makefile.common:1.69     Thu Jun  6 11:05:12 2019
+++ pkgsrc/devel/glib2/Makefile.common  Tue Jun 11 09:15:54 2019
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.69 2019/06/06 11:05:12 adam Exp $
+# $NetBSD: Makefile.common,v 1.70 2019/06/11 09:15:54 prlw1 Exp $
 # used by devel/gdbus-codegen/Makefile
 # used by devel/glib2/Makefile
 # used by devel/glib2-tools/Makefile
 
-DISTNAME=      glib-2.60.3
+DISTNAME=      glib-2.60.4
 PKGNAME=       ${DISTNAME:S/glib/glib2/}
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/glib/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/devel/glib2/PLIST
diff -u pkgsrc/devel/glib2/PLIST:1.103 pkgsrc/devel/glib2/PLIST:1.104
--- pkgsrc/devel/glib2/PLIST:1.103      Thu Jun  6 11:05:12 2019
+++ pkgsrc/devel/glib2/PLIST    Tue Jun 11 09:15:54 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.103 2019/06/06 11:05:12 adam Exp $
+@comment $NetBSD: PLIST,v 1.104 2019/06/11 09:15:54 prlw1 Exp $
 ${PLIST.nococoa}bin/gapplication
 bin/gdbus
 bin/gio
@@ -280,19 +280,19 @@ ${PLIST.fam}lib/gio/modules/libgiofam.so
 lib/glib-2.0/include/glibconfig.h
 lib/libgio-2.0.so
 lib/libgio-2.0.so.0
-lib/libgio-2.0.so.0.6000.3
+lib/libgio-2.0.so.0.6000.4
 lib/libglib-2.0.so
 lib/libglib-2.0.so.0
-lib/libglib-2.0.so.0.6000.3
+lib/libglib-2.0.so.0.6000.4
 lib/libgmodule-2.0.so
 lib/libgmodule-2.0.so.0
-lib/libgmodule-2.0.so.0.6000.3
+lib/libgmodule-2.0.so.0.6000.4
 lib/libgobject-2.0.so
 lib/libgobject-2.0.so.0
-lib/libgobject-2.0.so.0.6000.3
+lib/libgobject-2.0.so.0.6000.4
 lib/libgthread-2.0.so
 lib/libgthread-2.0.so.0
-lib/libgthread-2.0.so.0.6000.3
+lib/libgthread-2.0.so.0.6000.4
 lib/pkgconfig/gio-2.0.pc
 lib/pkgconfig/gio-unix-2.0.pc
 lib/pkgconfig/glib-2.0.pc
@@ -304,8 +304,8 @@ lib/pkgconfig/gthread-2.0.pc
 share/aclocal/glib-2.0.m4
 share/aclocal/glib-gettext.m4
 share/aclocal/gsettings.m4
-share/gdb/auto-load${LOCALBASE}/lib/libglib-2.0.so.0.6000.3-gdb.py
-share/gdb/auto-load${LOCALBASE}/lib/libgobject-2.0.so.0.6000.3-gdb.py
+share/gdb/auto-load${LOCALBASE}/lib/libglib-2.0.so.0.6000.4-gdb.py
+share/gdb/auto-load${LOCALBASE}/lib/libgobject-2.0.so.0.6000.4-gdb.py
 share/gettext/its/gschema.its
 share/gettext/its/gschema.loc
 share/glib-2.0/gdb/glib_gdb.py

Index: pkgsrc/devel/glib2/distinfo
diff -u pkgsrc/devel/glib2/distinfo:1.243 pkgsrc/devel/glib2/distinfo:1.244
--- pkgsrc/devel/glib2/distinfo:1.243   Thu Jun  6 11:05:12 2019
+++ pkgsrc/devel/glib2/distinfo Tue Jun 11 09:15:54 2019
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.243 2019/06/06 11:05:12 adam Exp $
+$NetBSD: distinfo,v 1.244 2019/06/11 09:15:54 prlw1 Exp $
 
-SHA1 (glib-2.60.3.tar.xz) = 244be77d07a268d700f5bc41b2aec1d7d659934f
-RMD160 (glib-2.60.3.tar.xz) = d0768846033bacdcd0aaac6e3ec634666729e225
-SHA512 (glib-2.60.3.tar.xz) = e316846770ecbd92ca5359c3d71535a5d4628edbda43477584921c84f3b2d6a34ecfb789069404565059d157e2aa3936e1e9fe64b4b7c59fb5c66c1a6f9a2f07
-Size (glib-2.60.3.tar.xz) = 4587636 bytes
+SHA1 (glib-2.60.4.tar.xz) = f76ef7339fef5784d79520478110caa4c5054806
+RMD160 (glib-2.60.4.tar.xz) = e8520dd0da7c37e6bb18b24a3b3ec308a6fa6aa0
+SHA512 (glib-2.60.4.tar.xz) = 614d25652ec9e8387f7865777e128b7f6fd68ff4a1a000868117cbcf5210b5f6aa476eb2b795a6dde56b997906aeb2157c83308f1421a27c4e379522d0ed0afc
+Size (glib-2.60.4.tar.xz) = 4589384 bytes
 SHA1 (patch-gio_gcredentialsprivate.h) = dab92e07f8357a7dc1a569e37f65f9b199aee281
 SHA1 (patch-gio_gdbus-2.0_codegen_meson.build) = 21c806f1a9884000b6a1683bc2fd1276b3c3544f
 SHA1 (patch-gio_giomodule.c) = 0715e77fa97f90631c77e9a2cfd54b74698522e2