[vlc-commits] contribs: Bump libmicrodns to 0.0.10

[Hugo Beauzée-Luyssen]

vlc/vlc-3.0 | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Mon Mar 19 15:24:40 2018 +0100| [ca6188446c29ff1d93a495462400b789687b0ae3] | committer: Hugo Beauzée-Luyssen

contribs: Bump libmicrodns to 0.0.10

(cherry picked from commit 20a56554f5d60236e6a5d769bd663d999fe2576b)
Signed-off-by: Hugo Beauzée-Luyssen <hugo at beauzee.fr>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=ca6188446c29ff1d93a495462400b789687b0ae3
---

 contrib/src/microdns/SHA512SUMS           |  2 +-
 contrib/src/microdns/fix-null-deref.patch | 27 ---------------------------
 contrib/src/microdns/rules.mak            |  3 +--
 3 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/contrib/src/microdns/SHA512SUMS b/contrib/src/microdns/SHA512SUMS
index 3e2de4d4c5..d309a2162e 100644
--- a/contrib/src/microdns/SHA512SUMS
+++ b/contrib/src/microdns/SHA512SUMS
@@ -1 +1 @@
-f843ecd336e648496b29a285608b30b64b7a7fb0480061aac99db20480fce83892ced6df84ec293c47fc726a6cc96c7aa5339f33586288bbf0ef752ed4ce2127  microdns-0.0.9.tar.gz
+47faa9d6342d3ae2b138009765a5a684e2c2474e53de15dc1deb88f87dbe558e79ab392f71971ee162eac3cf995f26ed35a74d6abfaf074dc1a249d042843954  microdns-0.0.10.tar.gz
diff --git a/contrib/src/microdns/fix-null-deref.patch b/contrib/src/microdns/fix-null-deref.patch
deleted file mode 100644
index f09a7b9e48..0000000000
--- a/contrib/src/microdns/fix-null-deref.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From efdf2754f9f8b801048b8fdae2b269f091128193 Mon Sep 17 00:00:00 2001
-From: Jean-Baptiste Kempf <jb at videolan.org>
-Date: Thu, 1 Mar 2018 02:58:13 +0100
-Subject: [PATCH] Fix more of the same crash
-
----
- src/mdns.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/mdns.c b/src/mdns.c
-index 132beef..55c5cb4 100644
---- a/src/mdns.c
-+++ b/src/mdns.c
-@@ -117,7 +117,9 @@ mdns_list_interfaces(multicast_if** pp_intfs, size_t* p_nb_intf, int ai_family)
-                 return (MDNS_ERROR);
-         }
-         for (c = ifs; c != NULL; c = c->ifa_next) {
--                if (c->ifa_addr->sa_family != ai_family || !mdns_is_interface_valuable(c))
-+                if (c->ifa_addr == NULL ||
-+                    c->ifa_addr->sa_family != ai_family ||
-+                    !mdns_is_interface_valuable(c))
-                         continue;
-                 memcpy(intfs, c->ifa_addr, sizeof(*intfs));
-                 intfs++;
--- 
-2.11.0
-
diff --git a/contrib/src/microdns/rules.mak b/contrib/src/microdns/rules.mak
index 26e2614d10..7092360c9b 100644
--- a/contrib/src/microdns/rules.mak
+++ b/contrib/src/microdns/rules.mak
@@ -1,6 +1,6 @@
 # libmicrodns
 
-LIBMICRODNS_VERSION := 0.0.9
+LIBMICRODNS_VERSION := 0.0.10
 LIBMICRODNS_URL := https://github.com/videolabs/libmicrodns/releases/download/$(LIBMICRODNS_VERSION)/microdns-$(LIBMICRODNS_VERSION).tar.gz
 
 ifndef HAVE_MACOSX
@@ -19,7 +19,6 @@ $(TARBALLS)/microdns-$(LIBMICRODNS_VERSION).tar.gz:
 
 microdns: microdns-$(LIBMICRODNS_VERSION).tar.gz .sum-microdns
 	$(UNPACK)
-	$(APPLY) $(SRC)/microdns/fix-null-deref.patch
 	$(MOVE)
 
 .microdns: microdns