diff options
| author | Gustavo Zacarias <gustavo@zacarias.com.ar> | 2012-04-11 11:36:21 -0300 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2012-04-14 23:49:09 +0200 |
| commit | 0c004d28f9b597ab50b376ed19ee23f188b6e3c5 (patch) | |
| tree | 4dd493d58c3170324b13a4a61419f80b2591e2c1 /package | |
| parent | d6c110e77fce6ebaf79b02caa69f1f5659f86100 (diff) | |
| download | buildroot-novena-0c004d28f9b597ab50b376ed19ee23f188b6e3c5.tar.gz buildroot-novena-0c004d28f9b597ab50b376ed19ee23f188b6e3c5.zip | |
libupnp: bump to version 1.6.17
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package')
| -rw-r--r-- | package/libupnp/libupnp-1.6.14-no-ipv6.patch | 23 | ||||
| -rw-r--r-- | package/libupnp/libupnp-1.6.17-no-ipv6.patch | 37 | ||||
| -rw-r--r-- | package/libupnp/libupnp.mk | 2 |
3 files changed, 38 insertions, 24 deletions
diff --git a/package/libupnp/libupnp-1.6.14-no-ipv6.patch b/package/libupnp/libupnp-1.6.14-no-ipv6.patch deleted file mode 100644 index 929c309ba..000000000 --- a/package/libupnp/libupnp-1.6.14-no-ipv6.patch +++ /dev/null @@ -1,23 +0,0 @@ -Fix missing knob to properly disable IPv6 support when headers lack it. - -Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> - -diff -Nura libupnp-1.6.15/upnp/src/ssdp/ssdp_device.c libupnp-1.6.15-noipv6/upnp/src/ssdp/ssdp_device.c ---- libupnp-1.6.15/upnp/src/ssdp/ssdp_device.c 2011-11-04 19:33:59.000000000 -0300 -+++ libupnp-1.6.15-noipv6/upnp/src/ssdp/ssdp_device.c 2012-03-20 21:00:26.274098343 -0300 -@@ -199,6 +199,7 @@ - setsockopt(ReplySock, IPPROTO_IP, IP_MULTICAST_TTL, - (char *)&ttl, sizeof(int)); - socklen = sizeof(struct sockaddr_in); -+#ifdef UPNP_ENABLE_IPV6 - } else if (DestAddr->sa_family == AF_INET6) { - inet_ntop(AF_INET6, - &((struct sockaddr_in6 *)DestAddr)->sin6_addr, -@@ -207,6 +208,7 @@ - (char *)&gIF_INDEX, sizeof(gIF_INDEX)); - setsockopt(ReplySock, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, - (char *)&hops, sizeof(hops)); -+#endif - } else { - UpnpPrintf(UPNP_CRITICAL, SSDP, __FILE__, __LINE__, - "Invalid destination address specified."); diff --git a/package/libupnp/libupnp-1.6.17-no-ipv6.patch b/package/libupnp/libupnp-1.6.17-no-ipv6.patch new file mode 100644 index 000000000..67b3895e5 --- /dev/null +++ b/package/libupnp/libupnp-1.6.17-no-ipv6.patch @@ -0,0 +1,37 @@ +From 812bdabc2c293173ea943059a577d480884a6cc1 Mon Sep 17 00:00:00 2001 +From: Gustavo Zacarias <gustavo@zacarias.com.ar> +Date: Wed, 11 Apr 2012 11:17:45 -0300 +Subject: [PATCH] ssdp_device: exclude IPv6 stuff when there's no IPv6 + +Add an additional INET_IPV6 exclusion around IPV6_MULTICAST_HOPS since +the definition isn't guaranteed to exist when the toolchain lacks IPv6 +support. + +Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> +--- + upnp/src/ssdp/ssdp_device.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/upnp/src/ssdp/ssdp_device.c b/upnp/src/ssdp/ssdp_device.c +index d3517cc..a439005 100644 +--- a/upnp/src/ssdp/ssdp_device.c ++++ b/upnp/src/ssdp/ssdp_device.c +@@ -210,6 +210,7 @@ static int NewRequestHandler( + (char *)&ttl, sizeof(int)); + socklen = sizeof(struct sockaddr_in); + break; ++#ifdef INET_IPV6 + case AF_INET6: + inet_ntop(AF_INET6, + &((struct sockaddr_in6 *)DestAddr)->sin6_addr, +@@ -219,6 +220,7 @@ static int NewRequestHandler( + setsockopt(ReplySock, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, + (char *)&hops, sizeof(hops)); + break; ++#endif + default: + UpnpPrintf(UPNP_CRITICAL, SSDP, __FILE__, __LINE__, + "Invalid destination address specified."); +-- +1.7.3.4 + diff --git a/package/libupnp/libupnp.mk b/package/libupnp/libupnp.mk index 5ac68c38a..a6028e1ec 100644 --- a/package/libupnp/libupnp.mk +++ b/package/libupnp/libupnp.mk @@ -4,7 +4,7 @@ # ############################################################# -LIBUPNP_VERSION = 1.6.14 +LIBUPNP_VERSION = 1.6.17 LIBUPNP_SOURCE = libupnp-$(LIBUPNP_VERSION).tar.bz2 LIBUPNP_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/pupnp/pupnp/libUPnP%20$(LIBUPNP_VERSION) LIBUPNP_CONF_ENV = ac_cv_lib_compat_ftime=no |