From patchwork Wed Mar 21 00:10:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Zacarias X-Patchwork-Id: 147883 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 27F0DB6F13 for ; Wed, 21 Mar 2012 11:10:55 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id F3CA58CE7C; Wed, 21 Mar 2012 00:10:52 +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 onFKfGqD6E63; Wed, 21 Mar 2012 00:10:50 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 1B6138D01F; Wed, 21 Mar 2012 00:10:50 +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 C3B148F75B for ; Wed, 21 Mar 2012 00:10:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id BB53A8CE7C for ; Wed, 21 Mar 2012 00:10:48 +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 khNmdTcXSTDo for ; Wed, 21 Mar 2012 00:10:47 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from loknar.toptech.com.ar (loknar.toptech.com.ar [74.118.36.95]) by whitealder.osuosl.org (Postfix) with ESMTPS id 1CFA48D01F for ; Wed, 21 Mar 2012 00:10:47 +0000 (UTC) Received: from asgard (host249.186-109-21.telecom.net.ar [186.109.21.249]) (authenticated bits=0) by loknar.toptech.com.ar (8.14.4/8.14.4) with ESMTP id q2L0AfrE025172 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 20 Mar 2012 21:10:43 -0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zacarias.com.ar; s=dkey; t=1332288645; bh=VESmz5+mduQLzUFA09jQKiFQyUJx0KMmPNr8r/M3DeI=; h=From:To:Cc:Subject:Date:Message-Id; b=rrNQvdokxYZKXhzuzXlt4cUi+cyCMm8SI2GAoFtsuT7yQ/0TRMQo0hvCYAZTU02JT shcBddnBYfqZCStJ15xCJ3162sgo4TP+mVB/7kO6Yqlio/m9z6EQUsVVh31ZrHMcvh 95h6708n3bw83igdkvZN8gu3stQ2XjXEGbaEeWy8= Received: by asgard (sSMTP sendmail emulation); Tue, 20 Mar 2012 21:10:41 -0300 From: Gustavo Zacarias To: buildroot@busybox.net Date: Tue, 20 Mar 2012 21:10:40 -0300 Message-Id: <1332288640-18267-1-git-send-email-gustavo@zacarias.com.ar> X-Mailer: git-send-email 1.7.3.4 X-Virus-Scanned: clamav-milter 0.97.3 at loknar X-Virus-Status: Clean Subject: [Buildroot] [PATCHv2] libupnp: bump to version 1.6.15 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 Signed-off-by: Gustavo Zacarias --- package/libupnp/Config.in | 5 ++- package/libupnp/libupnp-1.6.15-no-ipv6.patch | 23 ++++++++++++++++++++ .../libupnp/libupnp-1.6.6-remove-sys_timeb.h.patch | 11 --------- package/libupnp/libupnp.mk | 9 +++---- 4 files changed, 30 insertions(+), 18 deletions(-) create mode 100644 package/libupnp/libupnp-1.6.15-no-ipv6.patch delete mode 100644 package/libupnp/libupnp-1.6.6-remove-sys_timeb.h.patch diff --git a/package/libupnp/Config.in b/package/libupnp/Config.in index 2e6edcd..9f73798 100644 --- a/package/libupnp/Config.in +++ b/package/libupnp/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_LIBUPNP bool "libupnp" + depends on BR2_INET_IPV6 depends on BR2_LARGEFILE help The portable SDK for UPnP(tm) Devices (libupnp) provides developers @@ -9,5 +10,5 @@ config BR2_PACKAGE_LIBUPNP http://pupnp.sourceforge.net/ -comment "libupnp requires a toolchain with LARGEFILE support" - depends on !BR2_LARGEFILE +comment "libupnp requires a toolchain with IPV6 and LARGEFILE support" + depends on !(BR2_INET_IPV6 && BR2_LARGEFILE) diff --git a/package/libupnp/libupnp-1.6.15-no-ipv6.patch b/package/libupnp/libupnp-1.6.15-no-ipv6.patch new file mode 100644 index 0000000..929c309 --- /dev/null +++ b/package/libupnp/libupnp-1.6.15-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.6-remove-sys_timeb.h.patch b/package/libupnp/libupnp-1.6.6-remove-sys_timeb.h.patch deleted file mode 100644 index e425392..0000000 --- a/package/libupnp/libupnp-1.6.6-remove-sys_timeb.h.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -urN libupnp-1.6.6-0rig/configure libupnp-1.6.6/configure ---- libupnp-1.6.6-0rig/configure 2008-04-25 13:47:24.000000000 +0200 -+++ libupnp-1.6.6/configure 2009-01-14 21:55:16.000000000 +0100 -@@ -21096,7 +21096,6 @@ - sys/ioctl.h \ - sys/socket.h \ - sys/time.h \ -- sys/timeb.h \ - syslog.h \ - unistd.h \ - diff --git a/package/libupnp/libupnp.mk b/package/libupnp/libupnp.mk index d5b4ee1..1fa07ca 100644 --- a/package/libupnp/libupnp.mk +++ b/package/libupnp/libupnp.mk @@ -3,12 +3,11 @@ # libupnp # ############################################################# -LIBUPNP_VERSION:=1.6.6 -LIBUPNP_SOURCE:=libupnp-$(LIBUPNP_VERSION).tar.bz2 -LIBUPNP_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/pupnp +LIBUPNP_VERSION = 1.6.15 +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 - -LIBUPNP_INSTALL_STAGING:=YES +LIBUPNP_INSTALL_STAGING = YES $(eval $(call AUTOTARGETS))