[vlc-commits] Contribs: update pupnp to 1.6.21

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Apr  9 19:08:04 2017 +0200| [87d6c82901f646c93328cb10ce03c4d36ebe369d] | committer: Jean-Baptiste Kempf

Contribs: update pupnp to 1.6.21

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

 contrib/src/upnp/SHA512SUMS               |  2 +-
 contrib/src/upnp/dont_use_down_intf.patch | 18 +++++++++---------
 contrib/src/upnp/rules.mak                |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/contrib/src/upnp/SHA512SUMS b/contrib/src/upnp/SHA512SUMS
index f30c34e49b..7da63fce19 100644
--- a/contrib/src/upnp/SHA512SUMS
+++ b/contrib/src/upnp/SHA512SUMS
@@ -1 +1 @@
-97af62a7483cc19cfe80157cbc3383c1b4b7c9c39b848f4ed063784b74df0b9b0527f7b467e01451e0a44dbf9e8a9eab510619146a6ee1e3dce46f3e4af6e661  libupnp-1.6.19.tar.bz2
+65a2989497b941dfa1f7ac09fe44267de4a5231af25a304f0f6e754c7cbb578bdcb3c500188b5ebfbff9f579099db7501817d45e1724ef8e384d6d918bcdcdeb  libupnp-1.6.21.tar.bz2
diff --git a/contrib/src/upnp/dont_use_down_intf.patch b/contrib/src/upnp/dont_use_down_intf.patch
index 6af6a4795e..a360eb4216 100644
--- a/contrib/src/upnp/dont_use_down_intf.patch
+++ b/contrib/src/upnp/dont_use_down_intf.patch
@@ -1,12 +1,12 @@
---- upnp_clean/upnp/src/api/upnpapi.c	2015-05-11 18:04:45.054340200 +0200
-+++ libupnp-1.6.19/upnp/src/api/upnpapi.c	2015-05-11 18:11:37.438360600 +0200
-@@ -3258,7 +3258,8 @@
-		ifname_found = 1;
-	}
-	for (adapts_item = adapts; adapts_item != NULL; adapts_item = adapts_item->Next) {
+--- libupnp-1.6.21/upnp/src/api/upnpapi.c.orig	2017-04-09 19:05:45.803495288 +0200
++++ libupnp-1.6.21/upnp/src/api/upnpapi.c	2017-04-09 19:07:08.719491594 +0200
+@@ -3260,7 +3260,8 @@
+ 		ifname_found = 1;
+ 	}
+ 	for (adapts_item = adapts; adapts_item != NULL; adapts_item = adapts_item->Next) {
 -		if (adapts_item->Flags & IP_ADAPTER_NO_MULTICAST) {
 +		if (adapts_item->Flags & IP_ADAPTER_NO_MULTICAST ||
 +			adapts_item->OperStatus != IfOperStatusUp) {
-			continue;
-        }
-		if (ifname_found == 0) {
+ 			adapts_item = adapts_item->Next;
+ 			continue;
+ 		}
diff --git a/contrib/src/upnp/rules.mak b/contrib/src/upnp/rules.mak
index 5a4d815872..5c77121ab4 100644
--- a/contrib/src/upnp/rules.mak
+++ b/contrib/src/upnp/rules.mak
@@ -1,5 +1,5 @@
 # UPNP
-UPNP_VERSION := 1.6.19
+UPNP_VERSION := 1.6.21
 UPNP_URL := $(SF)/pupnp/libupnp-$(UPNP_VERSION).tar.bz2
 
 ifdef BUILD_NETWORK