From bfd26038c5eeac1483387598be82c4c22f463de9 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 21 Mar 2012 09:02:31 -0300 Subject: libupnp: move to version 1.6.14 As pointed by Sagaert Johan in the mailing list and further testing version 1.6.15 has some issues. So move to version 1.6.14 which is far more stable and compliant. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/libupnp/libupnp-1.6.14-no-ipv6.patch | 23 +++++++++++++++++++++++ package/libupnp/libupnp-1.6.15-no-ipv6.patch | 23 ----------------------- package/libupnp/libupnp.mk | 2 +- 3 files changed, 24 insertions(+), 24 deletions(-) create mode 100644 package/libupnp/libupnp-1.6.14-no-ipv6.patch delete mode 100644 package/libupnp/libupnp-1.6.15-no-ipv6.patch (limited to 'package/libupnp') diff --git a/package/libupnp/libupnp-1.6.14-no-ipv6.patch b/package/libupnp/libupnp-1.6.14-no-ipv6.patch new file mode 100644 index 000000000..929c309ba --- /dev/null +++ b/package/libupnp/libupnp-1.6.14-no-ipv6.patch @@ -0,0 +1,23 @@ +Fix missing knob to properly disable IPv6 support when headers lack it. + +Signed-off-by: Gustavo Zacarias + +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.15-no-ipv6.patch b/package/libupnp/libupnp-1.6.15-no-ipv6.patch deleted file mode 100644 index 929c309ba..000000000 --- a/package/libupnp/libupnp-1.6.15-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 - -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.mk b/package/libupnp/libupnp.mk index 1fa07ca79..5ac68c38a 100644 --- a/package/libupnp/libupnp.mk +++ b/package/libupnp/libupnp.mk @@ -4,7 +4,7 @@ # ############################################################# -LIBUPNP_VERSION = 1.6.15 +LIBUPNP_VERSION = 1.6.14 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 -- cgit v1.2.3-55-g7522