libupnp: bump to version 1.6.17

PATCH New Gustavo Zacarias 3 participants 7 messages Apr 11, 2012 – Apr 15, 2012

lore

Share & tools

lore

Gustavo Zacarias

author

2012-04-11 14:36 UTC #0 lore raw

PATCH 1/2 libupnp: bump to version 1.6.17

Signed-off-by Gustavo Zacarias <[email protected]>

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

package/libupnp/libupnp-1.6.14-no-ipv6.patch deleted +0 ~~-23~~

deleted file mode 100644
index 929c309..0000000
@@ -1,23 +0,0 @@
-Fix missing knob to properly disable IPv6 support when headers lack it.
-
-Signed-off-by: Gustavo Zacarias <[email protected]>
-
-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.");

package/libupnp/libupnp-1.6.17-no-ipv6.patch new file +37 -0

new file mode 100644
index 0000000..67b3895
@@ -0,0 +1,37 @@
+From 812bdabc2c293173ea943059a577d480884a6cc1 Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias <[email protected]>
+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 <[email protected]>
+---
+ 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
+

package/libupnp/libupnp.mk +1 -1

index 5ac68c3..a6028e1 100644
@@ -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

Signature · 1 line

1.7.3.4

Gustavo Zacarias

author

2012-04-11 14:36 UTC #1 lore raw

PATCH 2/2 ushare: new package

UPnP media streamer.

TODO: Add DLNA support (libdlna) if there's interest.

Signed-off-by Gustavo Zacarias <[email protected]>

---
 package/Config.in                         |    1 +
 package/ushare/Config.in                  |   13 ++
 package/ushare/ushare-compile-fixes.patch |  206 +++++++++++++++++++++++++++++
 package/ushare/ushare.mk                  |   31 +++++
 4 files changed, 251 insertions(+), 0 deletions(-)
 create mode 100644 package/ushare/Config.in
 create mode 100644 package/ushare/ushare-compile-fixes.patch
 create mode 100644 package/ushare/ushare.mk

package/Config.in +1 -0

index aee6fc9..486ddf5 100644
@@ -528,6 +528,7 @@ source "package/tn5250/Config.in"
 source "package/transmission/Config.in"
 source "package/ttcp/Config.in"
 source "package/udpcast/Config.in"
+source "package/ushare/Config.in"
 source "package/vpnc/Config.in"
 source "package/vsftpd/Config.in"
 source "package/vtun/Config.in"

package/ushare/Config.in new file +13 -0

new file mode 100644
index 0000000..a714fa0
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_USHARE
+	bool "ushare"
+	depends on BR2_LARGEFILE
+	select BR2_PACKAGE_LIBUPNP
+	help
+	  uShare is a UPnP (TM) A/V & DLNA Media Server.
+	  It implements the server component that provides UPnP media devices
+	  with information on available multimedia files.
+
+	  http://ushare.geexbox.org/
+
+comment "ushare requires a toolchain with LARGEFILE support"
+	depends on !BR2_LARGEFILE

package/ushare/ushare-compile-fixes.patch new file +206 -0

206 lines not on this page · raw message

package/ushare/ushare.mk new file +31 -0

new file mode 100644
index 0000000..b61b525
@@ -0,0 +1,31 @@
+#############################################################
+#
+# ushare
+#
+#############################################################
+
+USHARE_VERSION = 1.1a
+USHARE_SOURCE = ushare-$(USHARE_VERSION).tar.bz2
+USHARE_SITE = http://ushare.geexbox.org/releases
+USHARE_DEPENDENCIES = host-pkg-config libupnp
+
+define USHARE_CONFIGURE_CMDS
+	(cd $(@D); \
+		$(TARGET_CONFIGURE_OPTS) \
+		./configure --prefix=/usr $(DISABLE_NLS) --cross-compile \
+		--cross-prefix="$(TARGET_CROSS)" --sysconfdir=/etc \
+		--disable-strip --disable-debug \
+	)
+endef
+
+define USHARE_BUILD_CMDS
+	$(MAKE) -C $(@D)
+endef
+
+define USHARE_INSTALL_TARGET_CMDS
+	$(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install
+	rm -f $(TARGET_DIR)/etc/init.d/ushare
+endef
+
+# Even though configure is called it's not autoconf
+$(eval $(call GENTARGETS))

Signature · 1 line

1.7.3.4

Peter Korsgaard

2012-04-15 13:38 UTC #2 lore raw

PATCH 2/2 ushare: new package

Quoted 1 line

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Gustavo> UPnP media streamer.
Gustavo> TODO: Add DLNA support (libdlna) if there's interest.

Gustavo> Signed-off-by: Gustavo Zacarias <[email protected]> Gustavo> +++ b/package/ushare/ushare.mk
Gustavo> @@ -0,0 +1,31 @@

Gustavo> +############################################################# Gustavo> +#
Gustavo> +# ushare
Gustavo> +#
Gustavo> +############################################################# Gustavo> +
Gustavo> +USHARE_VERSION = 1.1a
Gustavo> +USHARE_SOURCE = ushare-$(USHARE_VERSION).tar.bz2 Gustavo> +USHARE_SITE = http://ushare.geexbox.org/releases
Gustavo> +USHARE_DEPENDENCIES = host-pkg-config libupnp Gustavo> +
Gustavo> +define USHARE_CONFIGURE_CMDS
Gustavo> + (cd $(@D); \
Gustavo> + $(TARGET_CONFIGURE_OPTS) \
Gustavo> + ./configure --prefix=/usr $(DISABLE_NLS) --cross-compile \
Gustavo> + --cross-prefix="$(TARGET_CROSS)" --sysconfdir=/etc \
Gustavo> + --disable-strip --disable-debug \

--disable-debug should only be passed if BR2_ENABLE_DEBUG isn't enabled.

Gustavo> + )
Gustavo> +endef
Gustavo> +
Gustavo> +define USHARE_BUILD_CMDS
Gustavo> + $(MAKE) -C $(@D)
Gustavo> +endef
Gustavo> +
Gustavo> +define USHARE_INSTALL_TARGET_CMDS
Gustavo> + $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install
Gustavo> + rm -f $(TARGET_DIR)/etc/init.d/ushare

You don't provide an alternative init script. Could this one not be used (renamed to SXXushare)?

Signature · 1 line

Bye, Peter Korsgaard

Gustavo Zacarias

author

2012-04-15 13:49 UTC #3 lore raw

PATCH 2/2 ushare: new package

Quoted 2 lines · Peter Korsgaard

--disable-debug should only be passed if BR2_ENABLE_DEBUG isn't enabled.

Ok, let's kill it then.

Quoted 3 lines

You don't provide an alternative init script. Could this one not be used
(renamed to SXXushare)?

The shipped script is pretty much LSB so it won't work for us. Also ushare would share some directory (non-standard) with media files, which directory would you suggest for a default?
I don't think we have one in the skeleton for that purpose. Regards.

Peter Korsgaard

2012-04-15 21:06 UTC #4 lore raw

PATCH 2/2 ushare: new package

Quoted 1 line

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Quoted 2 lines · Peter Korsgaard

Quoted 2 lines
--disable-debug should only be passed if BR2_ENABLE_DEBUG isn't enabled.

Gustavo> Ok, let's kill it then.

Ok, done.

Quoted 3 lines

Quoted 3 lines
You don't provide an alternative init script. Could this one not be used
(renamed to SXXushare)?

Gustavo> The shipped script is pretty much LSB so it won't work for us. Gustavo> Also ushare would share some directory (non-standard) with media Gustavo> files, which directory would you suggest for a default? Gustavo> I don't think we have one in the skeleton for that purpose. Gustavo> Regards.

Maybe /mnt/media, but let's just drop the init script for now. Committed, thanks.

Signature · 1 line

Bye, Peter Korsgaard

Sagaert Johan

2012-04-14 14:08 UTC #5 lore raw

PATCH 1/2 libupnp: bump to version 1.6.17

In reply to Gustavo Zacarias

Just have rebuild my app. against the 1.6.17 and it works just fine !

Thanks

-----Oorspronkelijk bericht-----
Van: buildroot-bounces at busybox.net [mailto:buildroot-bounces at busybox.net] Namens Gustavo Zacarias
Verzonden: woensdag 11 april 2012 16:36
Aan: buildroot at busybox.net
Onderwerp: [Buildroot] [PATCH 1/2] libupnp: bump to version 1.6.17

Signed-off-by Gustavo Zacarias <[email protected]>

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

package/libupnp/libupnp-1.6.14-no-ipv6.patch deleted +0 ~~-23~~

deleted file mode 100644
index 929c309..0000000
@@ -1,23 +0,0 @@
-Fix missing knob to properly disable IPv6 support when headers lack it.
-
-Signed-off-by: Gustavo Zacarias <[email protected]>
-
-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.");

package/libupnp/libupnp-1.6.17-no-ipv6.patch new file +37 -0

new file mode 100644
index 0000000..67b3895
@@ -0,0 +1,37 @@
+From 812bdabc2c293173ea943059a577d480884a6cc1 Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias <[email protected]>
+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 <[email protected]>
+---
+ 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
+

package/libupnp/libupnp.mk +1 -1

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

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Peter Korsgaard

2012-04-14 21:51 UTC #6 lore raw

PATCH 1/2 libupnp: bump to version 1.6.17

In reply to Gustavo Zacarias

Quoted 1 line

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Gustavo> Signed-off-by: Gustavo Zacarias <[email protected]>

Committed, thanks.

Signature · 1 line

Bye, Peter Korsgaard