Revbump to support net-libs/libupnp-1.6.14 (thanks Sal Gonzalez, bug 415649)

Package-Manager: portage-2.1.10.62/cvs/Linux x86_64

4 files changed, 222 insertions, 17 deletions

diff --git a/media-video/ushare/ChangeLog b/media-video/ushare/ChangeLog
index eef42b49b2ba..cffef77c68b3 100644
--- a/media-video/ushare/ChangeLog
+++ b/media-video/ushare/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/ushare
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ushare/ChangeLog,v 1.8 2012/05/25 16:55:36 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ushare/ChangeLog,v 1.9 2012/05/27 15:10:27 xmw Exp $
+
+*ushare-1.1a-r2 (27 May 2012)
+
+  27 May 2012; Michael Weber <xmw@gentoo.org>
+  +files/04_all_ushare_upnp_build_fix.patch, +ushare-1.1a-r2.ebuild:
+  Revbump to support net-libs/libupnp-1.6.14 (thanks Sal Gonzalez, bug 415649)
 
   25 May 2012; Markos Chandras <hwoarang@gentoo.org> ushare-1.1a-r1.ebuild:
   Lower libupnp dependency
diff --git a/media-video/ushare/Manifest b/media-video/ushare/Manifest
index 993ca5866837..bc4fb1a615f5 100644
--- a/media-video/ushare/Manifest
+++ b/media-video/ushare/Manifest
@@ -1,29 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 01_all_ushare_build_system.patch 4276 RMD160 b646d374e9983c5b3e9f585b5fb8fe3dbc6e55d3 SHA1 d153c028bc3df44e106215614f11e1e6dde5ded1 SHA256 6455181cd32b9962de2dddc0140201a56c0dc21e161f8a24bf9f037de012e3f9
 AUX 02_all_ushare_build_warnings.patch 989 RMD160 3dd83946c30e801a9edf85e1bda3b92a67b6eae4 SHA1 0e9633594494c073e178c2803fb0b019b1f1d64e SHA256 5c35ace53d189726459eb4d45f05430eeb854eec411bd0f46b0b3fcb4ad682ce
 AUX 03_all_ushare_mp4_video_mime.patch 971 RMD160 9ea7b04396345014b8e99f27279984e588388ac3 SHA1 2a0eeea248e91a8866ce0367e10ea7189a8b61a7 SHA256 b44ea6fdde6af5e978cc9c76945feed8ed0cdac76be9b1777e0849dae44fb0f0
+AUX 04_all_ushare_upnp_build_fix.patch 4617 RMD160 208d55cc611b0207e98a874666617c28a5317038 SHA1 0f38c8db7a05b76c3c9889ef87551ebef1ef6700 SHA256 0ceb221da7bf28b9f84191c02bb45f6c034818c6dd57652b42bfc6efefe32ffa
 AUX ushare.conf.d 896 RMD160 8bf9d92633778a80a7492f8de120d03ca9d33a0d SHA1 d87f3bf5f813dc1a567d49c81809f57788b56036 SHA256 cf333cc495177828c8a5bf3fde9462190435843ffd51d95ef676c3c6df1c5563
 AUX ushare.init.d 2164 RMD160 adbee9c14af514ca8c91dfd0c9f37114828965ee SHA1 cde78bc810b58a2e1d7c2564750f38f81d325fb4 SHA256 7a8c4c06aacf9a87ae2036df24751a74a29e741a39e89e0c704c63a27ad2a4c2
 DIST ushare-1.1a.tar.bz2 65864 RMD160 6194ffec031d20fd897f2c7cf71c3c810238713f SHA1 1539e83cde5d80f433d262d971f5fe78486c9375 SHA256 7b9b85c79968d4f4560f02a99e33c6a33ff58f9d41d8faea79e31cce2ee78665
 EBUILD ushare-1.1a-r1.ebuild 1404 RMD160 5b8a621ac6be3c8a7c6f46cabf4f3fadb18cbb56 SHA1 5105fe0ffadf89785c4fa700c59c7cbf1394b5f5 SHA256 686c1a485a9843edefee9e8d5c134cddd62719d8c6d279886fe6b67971bccb01
-MISC ChangeLog 1568 RMD160 7ca385c13ba8ebb7a9b7a9c4cf901060d6ae1d7a SHA1 64a95345ef874988234b039c91280552d36ba27d SHA256 9f9569c53d4618baf143c05514034c3da9d91d4308c58a01897eed020b6310ff
+EBUILD ushare-1.1a-r2.ebuild 1402 RMD160 bd7222f34a1fa2e00461af12bf93434dae58224e SHA1 aa6d38ba78bcf47fc3e771a7b13f91ddda5ab283 SHA256 d7bbd8686ef6ae71a49410bcc9ad49f755814bb4994c4e61f3de901698398eea
+MISC ChangeLog 1789 RMD160 b347a07cb017d259b469b05348506462b2cf1318 SHA1 bb4f0e2e0247cd5c4cee3f125146fb4aa2c70f3a SHA256 ac2fcf739d27c11f031b2dfa5501f69cafdb14c6bce11d8e34b6d1a9d217893e
 MISC metadata.xml 407 RMD160 b3d1e6f28ce77646da192d9a8257ae71903235b7 SHA1 6f81856c98942d69c3f170946f71b3191977b3f4 SHA256 84d3e1691781da3fbc0304d3a0263cf1f456942a6b26140b4296c937df057f8f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPv7mNAAoJEPqDWhW0r/LCZAsP/2tGPoFKbqCsAKFf/vajb8oX
-6rQUBkfTXlXJ5ogRVQj+S6KWYaGHSXY7CxILIFPRdQJaZQaEfVmeEKcigvUJMgzT
-/+DtIZxZ+j+MUHNPpoquD9uBl1Svjf3jWhnPItjSdFugLgsABa8uswXUmeQKzBe9
-ioxzxb0QBYAQ7idwEOJt+yuhdfQv1OoMkGzRft88qISNzPcp/ayAi9JxSdXX7XQz
-laJMSrJKFiJ3F+8qrRQ81/HPNFdPRqWlUDzPu0XULTg43Jm7GujChmSdStN5uSyg
-PkPa07AdShQXdgkij3aWnc3QS9qvc3glHOJJ41Ngu2ZMWT8sP3TfECEfDQ5ITd4q
-VgBD7tvQN6X9rertRbz220+NNrKomXRHyHtTLQzBGbdyddJAnZNif5wkX+4pVS3l
-aeRfcUo46iFJBKov0XDb5w+WOa3vbCKMIubFH8FGpA1FYTFss2lF0D4CcbzuNjwS
-0kb0rCl0KzAxPOfWGwXiD46gkIUlRIyZK4qNBdUHCs3kIP/HV7k9y3ZxJteQGKjM
-Dvh/VMvuDdgSQ5RtiAz5IcCJDKh45SxInd65/qAwnygGxDkQngDc/k/VFrxb1Sci
-GXYH6SzZ6yQCqnjRdpm4UvLpj1NbpPCsXGXwzj7pkXOjb6+B7+T5qjAZPIpWU5Lx
-YTSWBrY22iUpvKc8BLFs
-=zQig
+iF4EAREIAAYFAk/CQ9UACgkQknrdDGLu8JASqQD/XChvJkNgFHa33Gk344QGFmS9
+1Ud5fALE/n1+QWghE9QBAIpa8bYyWlMpYjgDijrJeCIYCuWRyyrUu8+q1dGJgHGf
+=LVkx
 -----END PGP SIGNATURE-----
diff --git a/media-video/ushare/files/04_all_ushare_upnp_build_fix.patch b/media-video/ushare/files/04_all_ushare_upnp_build_fix.patch
new file mode 100644
index 000000000000..c3ec37a324c5
--- /dev/null
+++ b/media-video/ushare/files/04_all_ushare_upnp_build_fix.patch
@@ -0,0 +1,156 @@
+diff -wbBur ushare-1.1a/src/http.c ushare-1.1a.my/src/http.c
+--- ushare-1.1a/src/http.c	2007-12-09 13:03:36.000000000 +0000
++++ ushare-1.1a.my/src/http.c	2010-10-29 11:13:07.000000000 +0000
+@@ -77,8 +77,7 @@
+   info->content_type = ixmlCloneDOMString (content_type);
+ }
+ 
+-static int
+-http_get_info (const char *filename, struct File_Info *info)
++int http_get_info (const char *filename, struct File_Info *info)
+ {
+   extern struct ushare_t *ut;
+   struct upnp_entry_t *entry = NULL;
+@@ -197,8 +196,7 @@
+   return ((UpnpWebFileHandle) file);
+ }
+ 
+-static UpnpWebFileHandle
+-http_open (const char *filename, enum UpnpOpenFileMode mode)
++UpnpWebFileHandle http_open (const char *filename, enum UpnpOpenFileMode mode)
+ {
+   extern struct ushare_t *ut;
+   struct upnp_entry_t *entry = NULL;
+@@ -251,8 +249,7 @@
+   return ((UpnpWebFileHandle) file);
+ }
+ 
+-static int
+-http_read (UpnpWebFileHandle fh, char *buf, size_t buflen)
++int http_read (UpnpWebFileHandle fh, char *buf, size_t buflen)
+ {
+   struct web_file_t *file = (struct web_file_t *) fh;
+   ssize_t len = -1;
+@@ -286,8 +283,7 @@
+   return len;
+ }
+ 
+-static int
+-http_write (UpnpWebFileHandle fh __attribute__((unused)),
++int http_write (UpnpWebFileHandle fh __attribute__((unused)),
+             char *buf __attribute__((unused)),
+             size_t buflen __attribute__((unused)))
+ {
+@@ -296,8 +292,7 @@
+   return 0;
+ }
+ 
+-static int
+-http_seek (UpnpWebFileHandle fh, off_t offset, int origin)
++int http_seek (UpnpWebFileHandle fh, off_t offset, int origin)
+ {
+   struct web_file_t *file = (struct web_file_t *) fh;
+   off_t newpos = -1;
+@@ -371,8 +366,7 @@
+   return 0;
+ }
+ 
+-static int
+-http_close (UpnpWebFileHandle fh)
++int http_close (UpnpWebFileHandle fh)
+ {
+   struct web_file_t *file = (struct web_file_t *) fh;
+ 
+@@ -402,13 +396,3 @@
+ 
+   return 0;
+ }
+-
+-struct UpnpVirtualDirCallbacks virtual_dir_callbacks =
+-  {
+-    http_get_info,
+-    http_open,
+-    http_read,
+-    http_write,
+-    http_seek,
+-    http_close
+-  };
+diff -wbBur ushare-1.1a/src/http.h ushare-1.1a.my/src/http.h
+--- ushare-1.1a/src/http.h	2007-12-09 13:03:36.000000000 +0000
++++ ushare-1.1a.my/src/http.h	2010-10-29 11:13:11.000000000 +0000
+@@ -25,6 +25,13 @@
+ #include <upnp/upnp.h>
+ #include <upnp/upnptools.h>
+ 
+-struct UpnpVirtualDirCallbacks virtual_dir_callbacks;
++int http_close (UpnpWebFileHandle fh);
++int http_write (UpnpWebFileHandle fh __attribute__((unused)),
++            char *buf __attribute__((unused)),
++            size_t buflen __attribute__((unused)));
++int http_seek (UpnpWebFileHandle fh, off_t offset, int origin);
++UpnpWebFileHandle http_open (const char *filename, enum UpnpOpenFileMode mode);
++int http_read (UpnpWebFileHandle fh, char *buf, size_t buflen);
++int http_get_info (const char *filename, struct File_Info *info);
+ 
+ #endif /* _HTTP_H_ */
+diff -wbBur ushare-1.1a/src/ushare.c ushare-1.1a.my/src/ushare.c
+--- ushare-1.1a/src/ushare.c	2007-12-09 13:03:36.000000000 +0000
++++ ushare-1.1a.my/src/ushare.c	2010-10-29 11:17:45.000000000 +0000
+@@ -188,7 +188,7 @@
+   if (strcmp (request->DevUDN + 5, ut->udn))
+     return;
+ 
+-  ip = request->CtrlPtIPAddr.s_addr;
++  ip = (*(struct sockaddr_in*)&request->CtrlPtIPAddr).sin_addr.s_addr;
+   ip = ntohl (ip);
+   sprintf (val, "%d.%d.%d.%d",
+            (ip >> 24) & 0xFF, (ip >> 16) & 0xFF, (ip >> 8) & 0xFF, ip & 0xFF);
+@@ -348,7 +348,47 @@
+ 
+   UpnpEnableWebserver (TRUE);
+ 
+-  res = UpnpSetVirtualDirCallbacks (&virtual_dir_callbacks);
++  res = UpnpVirtualDir_set_WriteCallback(http_write);
++  if (res != UPNP_E_SUCCESS)
++  {
++    log_error (_("Cannot set virtual directory callbacks\n"));
++    free (description);
++    return -1;
++  }
++
++  res = UpnpVirtualDir_set_GetInfoCallback(http_get_info);
++  if (res != UPNP_E_SUCCESS)
++  {
++    log_error (_("Cannot set virtual directory callbacks\n"));
++    free (description);
++    return -1;
++  }
++
++  res = UpnpVirtualDir_set_ReadCallback(http_read);
++  if (res != UPNP_E_SUCCESS)
++  {
++    log_error (_("Cannot set virtual directory callbacks\n"));
++    free (description);
++    return -1;
++  }
++
++  res = UpnpVirtualDir_set_OpenCallback(http_open);
++  if (res != UPNP_E_SUCCESS)
++  {
++    log_error (_("Cannot set virtual directory callbacks\n"));
++    free (description);
++    return -1;
++  }
++
++  res = UpnpVirtualDir_set_SeekCallback(http_seek);
++  if (res != UPNP_E_SUCCESS)
++  {
++    log_error (_("Cannot set virtual directory callbacks\n"));
++    free (description);
++    return -1;
++  }
++
++  res = UpnpVirtualDir_set_CloseCallback(http_close);
+   if (res != UPNP_E_SUCCESS)
+   {
+     log_error (_("Cannot set virtual directory callbacks\n"));
diff --git a/media-video/ushare/ushare-1.1a-r2.ebuild b/media-video/ushare/ushare-1.1a-r2.ebuild
new file mode 100644
index 000000000000..24c02825e225
--- /dev/null
+++ b/media-video/ushare/ushare-1.1a-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/ushare/ushare-1.1a-r2.ebuild,v 1.1 2012/05/27 15:10:27 xmw Exp $
+
+EAPI=4
+inherit eutils multilib
+
+DESCRIPTION="uShare is a UPnP (TM) A/V & DLNA Media Server"
+HOMEPAGE="http://ushare.geexbox.org/"
+SRC_URI="http://ushare.geexbox.org/releases/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dlna nls"
+
+RDEPEND=">=net-libs/libupnp-1.6.14
+	dlna? ( >=media-libs/libdlna-0.2.4 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	EPATCH_SOURCE="${FILESDIR}" EPATCH_SUFFIX="patch" \
+		EPATCH_OPTS="-p1" epatch
+}
+
+src_configure() {
+	local myconf
+	myconf="--prefix=/usr --disable-sysconf --disable-strip $(use_enable dlna)"
+	# nls can only be disabled, on by default.
+	use nls || myconf="${myconf} --disable-nls"
+
+	# I can't use econf
+	# --host is not implemented in ./configure file
+	./configure ${myconf} || die "./configure failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	doman src/ushare.1
+	newconfd "${FILESDIR}"/ushare.conf.d ushare
+	newinitd "${FILESDIR}"/ushare.init.d ushare
+	dodoc NEWS README TODO THANKS AUTHORS
+}
+
+pkg_postinst() {
+	enewuser ushare
+	elog "Please edit /etc/conf.d/ushare to set the shared directories"
+	elog "and other important settings. Check system log if ushare is"
+	elog "not booting."
+}