From patchwork Sat Apr 14 21:49:09 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 152563 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id CA643B7001 for ; Sun, 15 Apr 2012 07:53:53 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A4FA28F99F; Sat, 14 Apr 2012 21:53:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5FMabdMY9CnL; Sat, 14 Apr 2012 21:53:41 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id C275E8FA70; Sat, 14 Apr 2012 21:53:38 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 69C018F75B for ; Sat, 14 Apr 2012 21:52:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 590188F973 for ; Sat, 14 Apr 2012 21:52:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id sXYv5VMhPBbN for ; Sat, 14 Apr 2012 21:52:34 +0000 (UTC) Received: from busybox.osuosl.org (busybox.osuosl.org [140.211.167.224]) by whitealder.osuosl.org (Postfix) with ESMTP id 10BA78F9B4 for ; Sat, 14 Apr 2012 21:52:34 +0000 (UTC) Received: by busybox.osuosl.org (Postfix, from userid 4021) id 04B7E96AC0; Sat, 14 Apr 2012 21:52:34 +0000 (UTC) From: Peter Korsgaard To: buildroot@busybox.net Date: Sat, 14 Apr 2012 23:49:09 +0200 X-Git-Refname: refs/heads/master X-Git-Oldrev: d6c110e77fce6ebaf79b02caa69f1f5659f86100 X-Git-Newrev: 0c004d28f9b597ab50b376ed19ee23f188b6e3c5 X-Patchwork-Hint: ignore Message-Id: <20120414215234.04B7E96AC0@busybox.osuosl.org> Subject: [Buildroot] [git commit] libupnp: bump to version 1.6.17 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net commit: http://git.buildroot.net/buildroot/commit/?id=0c004d28f9b597ab50b376ed19ee23f188b6e3c5 branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master 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.17-no-ipv6.patch | 37 ++++++++++++++++++++++++++ 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 929c309..0000000 --- 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 - -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 0000000..67b3895 --- /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 +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 +--- + 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 5ac68c3..a6028e1 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