All of lore.kernel.org
 help / color / mirror / Atom feed
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 1/2] libupnp: bump to version 1.6.17
Date: Wed, 11 Apr 2012 11:36:21 -0300	[thread overview]
Message-ID: <1334154982-23530-1-git-send-email-gustavo@zacarias.com.ar> (raw)

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 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(-)
 delete mode 100644 package/libupnp/libupnp-1.6.14-no-ipv6.patch
 create mode 100644 package/libupnp/libupnp-1.6.17-no-ipv6.patch

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 <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 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 <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 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
-- 
1.7.3.4

             reply	other threads:[~2012-04-11 14:36 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-04-11 14:36 Gustavo Zacarias [this message]
2012-04-11 14:36 ` [Buildroot] [PATCH 2/2] ushare: new package Gustavo Zacarias
2012-04-15 13:38   ` Peter Korsgaard
2012-04-15 13:49     ` Gustavo Zacarias
2012-04-15 21:06       ` Peter Korsgaard
2012-04-14 14:08 ` [Buildroot] [PATCH 1/2] libupnp: bump to version 1.6.17 Sagaert Johan
2012-04-14 21:51 ` Peter Korsgaard

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1334154982-23530-1-git-send-email-gustavo@zacarias.com.ar \
    --to=gustavo@zacarias.com.ar \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.