<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7aa30b3379a744aa37d97ec465aeedb3bb056f2b">https://github.com/macports/macports-ports/commit/7aa30b3379a744aa37d97ec465aeedb3bb056f2b</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 7aa30b3379a744aa37d97ec465aeedb3bb056f2b
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Mon Sep 11 16:55:42 2017 -0700

<span style='display:block; white-space:pre;color:#404040;'>    glib2: update to version 2.54.0
</span>---
 devel/glib2/Portfile                                      | 10 ++++++----
 .../files/patch-get-launchd-dbus-session-address.diff     |  4 ++--
 devel/glib2/files/patch-gio_gdbusprivate.c.diff           |  4 ++--
 devel/glib2/files/patch-gmodule-gmodule-dl.c.diff         | 15 ++++++++++-----
 4 files changed, 20 insertions(+), 13 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/Portfile b/devel/glib2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 921ca42..0de1747 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ PortGroup                   compiler_blacklist_versions 1.0
</span> name                        glib2
 conflicts                   glib2-devel
 set my_name                 glib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version                     2.52.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version                     2.54.0
</span> set branch                  [join [lrange [split ${version} .] 0 1] .]
 categories                  devel
 maintainers                 {ryandesign @ryandesign} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,8 +28,8 @@ long_description            Glib is a library which includes support routines \
</span> 
 master_sites                gnome:sources/${my_name}/${branch}/
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums                   rmd160  367e119f257be876718ce135d768705f9f8a56b6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            sha256  25ee7635a7c0fcd4ec91cbc3ae07c7f8f5ce621d8183511f414ded09e7e4e128
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums                   rmd160  20fcb075e92f148c5592eae26c4aa82a2447349d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            sha256  fe22998ff0394ec31e6e5511c379b74011bee61a4421bca7fcab223dfbe0fc6a
</span> 
 # ${prefix}/include/glib-2.0/glib/gi18n.h requires -I${prefix}/include to find libintl.h
 # See https://trac.macports.org/changeset/27148
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -127,7 +127,9 @@ platform darwin {
</span>     configure.args-append   --disable-dtrace
 }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin 8 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} <= 10} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # Requires python 2.7 as of 2.53.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # See https://bugzilla.gnome.org/show_bug.cgi?id=785193
</span>     depends_lib-append      port:python27
     configure.python        ${prefix}/bin/python2.7
 }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/files/patch-get-launchd-dbus-session-address.diff b/devel/glib2/files/patch-get-launchd-dbus-session-address.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 80b86da..c3a7d8f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2/files/patch-get-launchd-dbus-session-address.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2/files/patch-get-launchd-dbus-session-address.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- gio/gdbusaddress.c.orig       2017-02-13 09:53:27.000000000 -0600
 +++ gio/gdbusaddress.c 2017-03-29 21:05:12.000000000 -0500
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1511,6 +1511,103 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1514,6 +1514,103 @@
</span>  
  /* ---------------------------------------------------------------------------------------------------- */
  
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -104,7 +104,7 @@
</span>  static gchar *
  get_session_address_platform_specific (GError **error)
  {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1539,7 +1636,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1542,7 +1639,12 @@
</span>     * X11 autolaunching; on Windows this means a different autolaunching
     * mechanism based on shared memory.
     */
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/files/patch-gio_gdbusprivate.c.diff b/devel/glib2/files/patch-gio_gdbusprivate.c.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 975c283..1e2bd21 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2/files/patch-gio_gdbusprivate.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2/files/patch-gio_gdbusprivate.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- gio/gdbusprivate.c.orig       2017-04-08 00:44:27.000000000 -0500
 +++ gio/gdbusprivate.c 2017-06-19 13:37:11.000000000 -0500
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2075,7 +2075,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2098,7 +2098,7 @@
</span>    /* TODO: use PACKAGE_LOCALSTATEDIR ? */
    ret = NULL;
    first_error = NULL;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@
</span>                              &ret,
                              NULL,
                              &first_error) &&
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2085,7 +2085,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2108,7 +2108,7 @@
</span>                              NULL))
      {
        g_propagate_prefixed_error (error, first_error,
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/files/patch-gmodule-gmodule-dl.c.diff b/devel/glib2/files/patch-gmodule-gmodule-dl.c.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 8368363..708f7bd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2/files/patch-gmodule-gmodule-dl.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2/files/patch-gmodule-gmodule-dl.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gmodule/gmodule-dl.c.orig      2016-10-22 00:22:14.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gmodule/gmodule-dl.c   2017-06-19 13:45:34.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -126,16 +126,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gmodule/gmodule-dl.c.orig      2017-05-13 11:45:43.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gmodule/gmodule-dl.c   2017-05-22 18:44:55.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -133,22 +133,18 @@
</span>  _g_module_close (gpointer handle,
                 gboolean is_unref)
  {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,8 @@
</span> +  /* Intentionally not dlclose()ing because it is safer to leave the library
 +   * loaded in memory than to close it and possibly leave dangling pointers
 +   * to things like atexit handlers, atfork handlers, blocks, etc.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+   *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-   * See above for the Android special case
</span> +   * See https://trac.macports.org/ticket/45309 for an example from when
 +   * a library used by a module added a new dependency which had an
 +   * initializer which added a child atfork handler.  The result is that
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,8 +19,12 @@
</span> +   * and at worst lead to arbitrary code execution of whatever happened to be
 +   * at that location in memory at a later time in the process.
     */
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(__BIONIC__) && !defined(__LP64__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  is_unref = (handle != RTLD_DEFAULT);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span> -  is_unref |= 1;
<span style='display:block; white-space:pre;background:#ffe0e0;'>--  
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span> -  if (is_unref)
 -    {
 -      if (dlclose (handle) != 0)
</pre><pre style='margin:0'>

</pre>