diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile index e590f3af50d..d378ef90804 100644 --- a/devel/glib2/Makefile +++ b/devel/glib2/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.267 2017/11/03 13:16:05 bentley Exp $ +# $OpenBSD: Makefile,v 1.268 2018/01/09 12:31:54 ajacoutot Exp $ # Everything is a Freaking GLib/GTK+ problem CFLAGS += -g @@ -7,9 +7,8 @@ INSTALL_STRIP= # empty COMMENT= general-purpose utility library GNOME_PROJECT= glib -GNOME_VERSION= 2.54.2 +GNOME_VERSION= 2.54.3 PKGNAME= ${DISTNAME:S/glib/glib2/} -REVISION= 0 CATEGORIES= devel @@ -21,11 +20,11 @@ MAINTAINER= Antoine Jacoutot # would trigger an abort(): # GLib-GObject:ERROR:gvaluetypes.c:457:_g_value_types_init: # assertion failed: (type == G_TYPE_CHAR) -SHARED_LIBS += glib-2.0 4200.6 # 5400.2 -SHARED_LIBS += gmodule-2.0 4200.6 # 5400.2 -SHARED_LIBS += gthread-2.0 4200.6 # 5400.2 -SHARED_LIBS += gobject-2.0 4200.6 # 5400.2 -SHARED_LIBS += gio-2.0 4200.6 # 5400.2 +SHARED_LIBS += glib-2.0 4200.6 # 5400.3 +SHARED_LIBS += gmodule-2.0 4200.6 # 5400.3 +SHARED_LIBS += gthread-2.0 4200.6 # 5400.3 +SHARED_LIBS += gobject-2.0 4200.6 # 5400.3 +SHARED_LIBS += gio-2.0 4200.6 # 5400.3 # LGPLv2 PERMIT_PACKAGE_CDROM= Yes diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo index 36211ce6e6c..019cd245659 100644 --- a/devel/glib2/distinfo +++ b/devel/glib2/distinfo @@ -1,2 +1,2 @@ -SHA256 (glib-2.54.2.tar.xz) = u4nlxarTMWmox/KLRWcceJnBL3TK9wdzf3hNcQJ1jmw= -SIZE (glib-2.54.2.tar.xz) = 7830724 +SHA256 (glib-2.54.3.tar.xz) = lj/cZoXcPajlOB37nxXKS1cJsovoTZ0FqbuORGq6wKg= +SIZE (glib-2.54.3.tar.xz) = 7836536 diff --git a/devel/glib2/patches/patch-gio_kqueue_kqueue-helper_c b/devel/glib2/patches/patch-gio_kqueue_kqueue-helper_c index 6fcd6f80514..80081515f92 100644 --- a/devel/glib2/patches/patch-gio_kqueue_kqueue-helper_c +++ b/devel/glib2/patches/patch-gio_kqueue_kqueue-helper_c @@ -1,4 +1,4 @@ -$OpenBSD: patch-gio_kqueue_kqueue-helper_c,v 1.3 2017/05/08 16:57:08 ajacoutot Exp $ +$OpenBSD: patch-gio_kqueue_kqueue-helper_c,v 1.4 2018/01/09 12:31:54 ajacoutot Exp $ Prevent a use-after-free resulting in a crash of all apps depending on glib/GIO mostly at "pkg_add -u" time. @@ -16,7 +16,7 @@ Index: gio/kqueue/kqueue-helper.c static int kqueue_descriptor = -1; static int kqueue_socket_pair[] = {-1, -1}; -@@ -291,10 +291,10 @@ process_kqueue_notifications (GIOChannel *gioc, +@@ -293,10 +293,10 @@ process_kqueue_notifications (GIOChannel *gioc, G_LOCK (hash_lock); sub = (kqueue_sub *) g_hash_table_lookup (subs_hash_table, GINT_TO_POINTER (n.fd)); @@ -28,7 +28,7 @@ Index: gio/kqueue/kqueue-helper.c KH_W ("Got a notification for a deleted or non-existing subscription %d", n.fd); return TRUE; -@@ -336,6 +336,7 @@ process_kqueue_notifications (GIOChannel *gioc, +@@ -338,6 +338,7 @@ process_kqueue_notifications (GIOChannel *gioc, g_file_monitor_source_handle_event (source, mask, NULL, NULL, NULL, g_get_monotonic_time ()); } @@ -36,7 +36,7 @@ Index: gio/kqueue/kqueue-helper.c return TRUE; } -@@ -451,13 +452,14 @@ _kh_start_watching (kqueue_sub *sub) +@@ -453,13 +454,14 @@ _kh_start_watching (kqueue_sub *sub) G_LOCK (hash_lock); g_hash_table_insert (subs_hash_table, GINT_TO_POINTER (sub->fd), sub); @@ -52,7 +52,7 @@ Index: gio/kqueue/kqueue-helper.c return TRUE; } -@@ -504,9 +506,7 @@ _kh_cancel_sub (kqueue_sub *sub) +@@ -506,9 +508,7 @@ _kh_cancel_sub (kqueue_sub *sub) _km_remove (sub); diff --git a/devel/glib2/pkg/PLIST b/devel/glib2/pkg/PLIST index 2c31313188c..3e25b5c4856 100644 --- a/devel/glib2/pkg/PLIST +++ b/devel/glib2/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.56 2017/10/28 06:19:08 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.57 2018/01/09 12:31:54 ajacoutot Exp $ @conflict glib2-docs-* @conflict glib2-fam-* @pkgpath devel/glib2,-docs @@ -350,8 +350,8 @@ share/gdb/auto-load/ share/gdb/auto-load/usr/ share/gdb/auto-load/usr/local/ share/gdb/auto-load/usr/local/lib/ -share/gdb/auto-load/usr/local/lib/libglib-2.0.so.0.5400.2-gdb.py -share/gdb/auto-load/usr/local/lib/libgobject-2.0.so.0.5400.2-gdb.py +share/gdb/auto-load/usr/local/lib/libglib-2.0.so.0.5400.3-gdb.py +share/gdb/auto-load/usr/local/lib/libgobject-2.0.so.0.5400.3-gdb.py share/gettext/its/ share/gettext/its/gschema.its share/gettext/its/gschema.loc @@ -475,6 +475,7 @@ share/gtk-doc/html/gio/GPollableOutputStream.html share/gtk-doc/html/gio/GPropertyAction.html share/gtk-doc/html/gio/GProxy.html share/gtk-doc/html/gio/GProxyAddress.html +share/gtk-doc/html/gio/GProxyAddressEnumerator.html share/gtk-doc/html/gio/GProxyResolver.html share/gtk-doc/html/gio/GRemoteActionGroup.html share/gtk-doc/html/gio/GResolver.html @@ -490,6 +491,7 @@ share/gtk-doc/html/gio/GSimplePermission.html share/gtk-doc/html/gio/GSimpleProxyResolver.html share/gtk-doc/html/gio/GSocket.html share/gtk-doc/html/gio/GSocketAddress.html +share/gtk-doc/html/gio/GSocketAddressEnumerator.html share/gtk-doc/html/gio/GSocketClient.html share/gtk-doc/html/gio/GSocketConnectable.html share/gtk-doc/html/gio/GSocketConnection.html