From patchwork Wed Mar 21 00:12:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Zacarias X-Patchwork-Id: 147884 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 8B351B6EEC for ; Wed, 21 Mar 2012 11:12:43 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 6A863FF997; Wed, 21 Mar 2012 00:12:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tnuXnvUkjsdq; Wed, 21 Mar 2012 00:12:40 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id E0FA41004CB; Wed, 21 Mar 2012 00:12:39 +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 EC18C8F75B for ; Wed, 21 Mar 2012 00:12:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id E0B958D01F for ; Wed, 21 Mar 2012 00:12:37 +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 PgF+LajlbiSj for ; Wed, 21 Mar 2012 00:12:36 +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 1DE138CEFA for ; Wed, 21 Mar 2012 00:12:36 +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 q2L0CUKS025199 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 20 Mar 2012 21:12:32 -0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zacarias.com.ar; s=dkey; t=1332288754; bh=/a/wGeA0N52SkuDKVV7sc7L+envtF2n3T5kr5tfXlJ4=; h=From:To:Cc:Subject:Date:Message-Id; b=kJ7KgB9nbkcMperAYJZNT7n5Aqdgf7O1jqeOm7h8x2iv1xMwxceUrupM+9n0MpVHw gZ/uX5UPAhZAEZ6paLto8YQJMCel1x5CveHskF2KtODW+8RK0/DrBBtQY18I2Oq2b3 csJ3eIXW5UEsZoMFP0Too1pERZhTf72IFVyTOL5o= Received: by asgard (sSMTP sendmail emulation); Tue, 20 Mar 2012 21:12:30 -0300 From: Gustavo Zacarias To: buildroot@busybox.net Date: Tue, 20 Mar 2012 21:12:29 -0300 Message-Id: <1332288749-27658-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] [PATCHv3] 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/libupnp-1.6.15-no-ipv6.patch | 23 ++++++++++++++++++++ .../libupnp/libupnp-1.6.6-remove-sys_timeb.h.patch | 11 --------- package/libupnp/libupnp.mk | 9 +++---- 3 files changed, 27 insertions(+), 16 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/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))