[Midnightbsd-cvs] mports [24506] trunk/devel/glib20: update to 2.50.3
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Mon Oct 15 22:01:50 EDT 2018
Revision: 24506
http://svnweb.midnightbsd.org/mports/?rev=24506
Author: laffer1
Date: 2018-10-15 22:01:49 -0400 (Mon, 15 Oct 2018)
Log Message:
-----------
update to 2.50.3
Modified Paths:
--------------
trunk/devel/glib20/Makefile
trunk/devel/glib20/distinfo
Removed Paths:
-------------
trunk/devel/glib20/files/extra-glib_gdbscripts
trunk/devel/glib20/files/patch-bug739424
trunk/devel/glib20/files/patch-bug778515
trunk/devel/glib20/files/patch-glib_gthread-posix.c
Modified: trunk/devel/glib20/Makefile
===================================================================
--- trunk/devel/glib20/Makefile 2018-10-16 01:51:41 UTC (rev 24505)
+++ trunk/devel/glib20/Makefile 2018-10-16 02:01:49 UTC (rev 24506)
@@ -1,7 +1,7 @@
# $MidnightBSD$
PORTNAME= glib
-PORTVERSION= 2.50.2
+PORTVERSION= 2.50.3
PORTREVISION?= 0
CATEGORIES= devel
MASTER_SITES= GNOME
@@ -36,7 +36,7 @@
LDFLAGS+= -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
-LIBVERSION= 0.5000.2
+LIBVERSION= 0.5000.3
PLIST_SUB+= LIBVERSION=${LIBVERSION}
glib_MAN= gtester.1 gtester-report.1 glib-gettextize.1
@@ -53,7 +53,7 @@
CONFIGURE_ARGS+=--disable-dtrace
.if empty(ICONV_LIB)
-CONFIGURE_ARGS+= --with-libiconv=native
+CONFIGURE_ARGS+= --with-libiconv=no
.else
CONFIGURE_ARGS+= --with-libiconv=gnu
.endif
Modified: trunk/devel/glib20/distinfo
===================================================================
--- trunk/devel/glib20/distinfo 2018-10-16 01:51:41 UTC (rev 24505)
+++ trunk/devel/glib20/distinfo 2018-10-16 02:01:49 UTC (rev 24506)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1507391225
-SHA256 (gnome2/glib-2.50.2.tar.xz) = be68737c1f268c05493e503b3b654d2b7f43d7d0b8c5556f7e4651b870acfbf5
-SIZE (gnome2/glib-2.50.2.tar.xz) = 7582312
+TIMESTAMP = 1539655072
+SHA256 (gnome2/glib-2.50.3.tar.xz) = 82ee94bf4c01459b6b00cb9db0545c2237921e3060c0b74cff13fbc020cfd999
+SIZE (gnome2/glib-2.50.3.tar.xz) = 7589284
Deleted: trunk/devel/glib20/files/extra-glib_gdbscripts
===================================================================
--- trunk/devel/glib20/files/extra-glib_gdbscripts 2018-10-16 01:51:41 UTC (rev 24505)
+++ trunk/devel/glib20/files/extra-glib_gdbscripts 2018-10-16 02:01:49 UTC (rev 24506)
@@ -1,20 +0,0 @@
---- glib/Makefile.in.orig 2014-03-09 10:06:29.765325337 +0000
-+++ glib/Makefile.in 2014-03-09 10:06:46.935323979 +0000
-@@ -2834,7 +2834,7 @@
- info-am:
-
- install-data-am: install-data-local install-deprecatedincludeHEADERS \
-- install-dist_gdbSCRIPTS install-glibincludeHEADERS \
-+ install-glibincludeHEADERS \
- install-glibsubincludeHEADERS \
- install-installed_testLTLIBRARIES \
- install-installed_testPROGRAMS install-installed_testSCRIPTS \
-@@ -3084,8 +3084,6 @@
- $(AM_V_GEN) $(SED) -e "s|\@datadir\@|$(datadir)|" $(srcdir)/libglib-gdb.py.in > $(builddir)/libglib-gdb.py
-
- install-data-hook: libglib-gdb.py
-- mkdir -p $(DESTDIR)$(datadir)/gdb/auto-load$(ABS_GLIB_RUNTIME_LIBDIR)
-- $(INSTALL) $(builddir)/libglib-gdb.py $(DESTDIR)$(datadir)/gdb/auto-load$(ABS_GLIB_RUNTIME_LIBDIR)/libglib-2.0.so.0.$(LT_CURRENT).$(LT_REVISION)-gdb.py
- @HAVE_GLIB_RUNTIME_LIBDIR_TRUE@ mkdir -p $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
- @HAVE_GLIB_RUNTIME_LIBDIR_TRUE@ mv $(DESTDIR)$(libdir)/libglib-2.0.so.0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
- @HAVE_GLIB_RUNTIME_LIBDIR_TRUE@ mv $(DESTDIR)$(libdir)/libglib-2.0.so.0.$(LT_CURRENT).$(LT_REVISION) $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
Deleted: trunk/devel/glib20/files/patch-bug739424
===================================================================
--- trunk/devel/glib20/files/patch-bug739424 2018-10-16 01:51:41 UTC (rev 24505)
+++ trunk/devel/glib20/files/patch-bug739424 2018-10-16 02:01:49 UTC (rev 24506)
@@ -1,59 +0,0 @@
-From 22656f16c29591207c667362e2a42fd348fe8494 Mon Sep 17 00:00:00 2001
-From: Martin Pieuchot <mpi at openbsd.org>
-Date: Fri, 28 Apr 2017 15:06:52 +0200
-Subject: [PATCH] kqueue: fix use-after-free of ``kqueue_sub''.
-
-Since ``kqueue_sub'' are not refcounted it is common to see a thread
-freeing one of them while another thread is manipulating them. This
-leads to crashs reported in:
- https://bugzilla.gnome.org/show_bug.cgi?id=739424
-
-To prevent such crash, make sure the threads are holding ``hash_lock''
-when manipulating such items.
----
- gio/kqueue/kqueue-helper.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/gio/kqueue/kqueue-helper.c b/gio/kqueue/kqueue-helper.c
-index d4e66cd4d..84b9ef164 100644
---- gio/kqueue/kqueue-helper.c
-+++ gio/kqueue/kqueue-helper.c
-@@ -291,10 +291,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));
-- G_UNLOCK (hash_lock);
-
- if (sub == NULL)
- {
-+ G_UNLOCK (hash_lock);
- 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,
- g_file_monitor_source_handle_event (source, mask, NULL, NULL, NULL, g_get_monotonic_time ());
- }
-
-+ G_UNLOCK (hash_lock);
- return TRUE;
- }
-
-@@ -451,13 +452,14 @@ _kh_start_watching (kqueue_sub *sub)
-
- G_LOCK (hash_lock);
- g_hash_table_insert (subs_hash_table, GINT_TO_POINTER (sub->fd), sub);
-- G_UNLOCK (hash_lock);
-
- _kqueue_thread_push_fd (sub->fd);
-
- /* Bump the kqueue thread. It will pick up a new sub entry to monitor */
- if (!_ku_write (kqueue_socket_pair[0], "A", 1))
- KH_W ("Failed to bump the kqueue thread (add fd, error %d)", errno);
-+ G_UNLOCK (hash_lock);
-+
- return TRUE;
- }
-
---
-2.12.2
-
Deleted: trunk/devel/glib20/files/patch-bug778515
===================================================================
--- trunk/devel/glib20/files/patch-bug778515 2018-10-16 01:51:41 UTC (rev 24505)
+++ trunk/devel/glib20/files/patch-bug778515 2018-10-16 02:01:49 UTC (rev 24506)
@@ -1,55 +0,0 @@
-From e305fe971e4647d971428a772b7290b9c308a96f Mon Sep 17 00:00:00 2001
-From: Steven McDonald <steven at steven-mcdonald.id.au>
-Date: Sun, 12 Feb 2017 11:02:55 +1100
-Subject: gio: Always purge kqueue subs from missing list
-
-Previously, _kh_cancel_sub assumed that it only needed to call
-_km_remove if sub did not exist in subs_hash_table. This is erroneous
-because the complementary operation, _km_add_missing, can be called
-from process_kqueue_notifications, in which context sub can *only* have
-come from subs_hash_table.
-
-Since _km_remove is implemented using g_slist_remove, which is
-documented to be a noop if the list does not contain the element to be
-removed, it is safe to call _km_remove unconditionally here.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=778515
----
- gio/kqueue/kqueue-helper.c | 15 +++++----------
- 1 file changed, 5 insertions(+), 10 deletions(-)
-
-diff --git a/gio/kqueue/kqueue-helper.c b/gio/kqueue/kqueue-helper.c
-index 4671396..d4e66cd 100644
---- gio/kqueue/kqueue-helper.c
-+++ gio/kqueue/kqueue-helper.c
-@@ -498,22 +498,17 @@ _kh_add_sub (kqueue_sub *sub)
- gboolean
- _kh_cancel_sub (kqueue_sub *sub)
- {
-- gboolean missing = FALSE;
-+ gboolean removed = FALSE;
- g_assert (kqueue_socket_pair[0] != -1);
- g_assert (sub != NULL);
-
-+ _km_remove (sub);
-+
- G_LOCK (hash_lock);
-- missing = !g_hash_table_remove (subs_hash_table, GINT_TO_POINTER (sub->fd));
-+ removed = g_hash_table_remove (subs_hash_table, GINT_TO_POINTER (sub->fd));
- G_UNLOCK (hash_lock);
-
-- if (missing)
-- {
-- /* If there were no fd for this subscription, file is still
-- * missing. */
-- KH_W ("Removing subscription from missing");
-- _km_remove (sub);
-- }
-- else
-+ if (removed)
- {
- /* fd will be closed in the kqueue thread */
- _kqueue_thread_remove_fd (sub->fd);
---
-cgit v0.12
-
Deleted: trunk/devel/glib20/files/patch-glib_gthread-posix.c
===================================================================
--- trunk/devel/glib20/files/patch-glib_gthread-posix.c 2018-10-16 01:51:41 UTC (rev 24505)
+++ trunk/devel/glib20/files/patch-glib_gthread-posix.c 2018-10-16 02:01:49 UTC (rev 24506)
@@ -1,20 +0,0 @@
---- glib/gthread-posix.c.orig 2014-09-22 15:42:12.000000000 +0200
-+++ glib/gthread-posix.c 2014-09-28 09:46:56.659280343 +0200
-@@ -98,7 +98,7 @@
- if G_UNLIKELY (mutex == NULL)
- g_thread_abort (errno, "malloc");
-
--#ifdef PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
-+#if defined(PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP) && !defined(__FreeBSD__)
- pthread_mutexattr_init (&attr);
- pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_ADAPTIVE_NP);
- pattr = &attr;
-@@ -107,7 +107,7 @@
- if G_UNLIKELY ((status = pthread_mutex_init (mutex, pattr)) != 0)
- g_thread_abort (status, "pthread_mutex_init");
-
--#ifdef PTHREAD_ADAPTIVE_MUTEX_NP
-+#if defined(PTHREAD_ADAPTIVE_MUTEX_NP) && !defined(__FreeBSD__)
- pthread_mutexattr_destroy (&attr);
- #endif
-
More information about the Midnightbsd-cvs
mailing list