diff --git a/0001-Guard-g_inet_address_mask_equal-against-invalid-inpu.patch b/0001-Guard-g_inet_address_mask_equal-against-invalid-inpu.patch deleted file mode 100644 index 87bd262..0000000 --- a/0001-Guard-g_inet_address_mask_equal-against-invalid-inpu.patch +++ /dev/null @@ -1,26 +0,0 @@ -From b844136fd3262e2f5c9696e2184af7d236993605 Mon Sep 17 00:00:00 2001 -From: Erik van Pienbroek -Date: Thu, 17 Jul 2014 18:37:04 +0200 -Subject: [PATCH 1/2] Guard g_inet_address_mask_equal against invalid input - ---- - gio/ginetaddressmask.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/gio/ginetaddressmask.c b/gio/ginetaddressmask.c -index b33c2f9..dda0d4c 100644 ---- a/gio/ginetaddressmask.c -+++ b/gio/ginetaddressmask.c -@@ -465,6 +465,9 @@ gboolean - g_inet_address_mask_equal (GInetAddressMask *mask, - GInetAddressMask *mask2) - { -+ g_return_val_if_fail(G_IS_INET_ADDRESS_MASK (mask), FALSE); -+ g_return_val_if_fail(G_IS_INET_ADDRESS_MASK (mask2), FALSE); -+ - return ((mask->priv->length == mask2->priv->length) && - g_inet_address_equal (mask->priv->addr, mask2->priv->addr)); - } --- -2.0.1 - diff --git a/0002-GNetworkMonitorBase-don-t-fail-when-IPv6-support-is-.patch b/0002-GNetworkMonitorBase-don-t-fail-when-IPv6-support-is-.patch index b85d63e..0b821bd 100644 --- a/0002-GNetworkMonitorBase-don-t-fail-when-IPv6-support-is-.patch +++ b/0002-GNetworkMonitorBase-don-t-fail-when-IPv6-support-is-.patch @@ -9,10 +9,10 @@ Subject: [PATCH 2/2] GNetworkMonitorBase: don't fail when IPv6 support is 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gio/gnetworkmonitorbase.c b/gio/gnetworkmonitorbase.c -index ead9e64..26837b0 100644 +index f0af804..32ffc74 100644 --- a/gio/gnetworkmonitorbase.c +++ b/gio/gnetworkmonitorbase.c -@@ -99,8 +99,14 @@ g_network_monitor_base_constructed (GObject *object) +@@ -100,8 +100,14 @@ g_network_monitor_base_constructed (GObject *object) g_object_unref (mask); mask = g_inet_address_mask_new_from_string ("::/0", NULL); diff --git a/mingw-glib2.spec b/mingw-glib2.spec index c4c68b9..40723a0 100644 --- a/mingw-glib2.spec +++ b/mingw-glib2.spec @@ -55,7 +55,6 @@ Patch5: glib-prefer-constructors-over-DllMain.patch # Don't segfault when IPv6 support is unavailable # https://bugzilla.gnome.org/show_bug.cgi?id=733338 -Patch7: 0001-Guard-g_inet_address_mask_equal-against-invalid-inpu.patch Patch8: 0002-GNetworkMonitorBase-don-t-fail-when-IPv6-support-is-.patch %description @@ -102,7 +101,6 @@ Static version of the MinGW Windows GLib2 library. %patch1 -p1 %patch3 -p0 %patch5 -p1 -%patch7 -p1 %patch8 -p1