Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0858a1a80a982abc475be4505fdceff43cd90002
commit 0858a1a80a982abc475be4505fdceff43cd90002 Author: James Buren <[email protected]> Date: Mon Nov 16 05:14:48 2015 +0100 ushare-1.1-16-x86_64 * remove package diff --git a/source/xmultimedia-extra/ushare/FrugalBuild b/source/xmultimedia-extra/ushare/FrugalBuild deleted file mode 100644 index b5f0449..0000000 --- a/source/xmultimedia-extra/ushare/FrugalBuild +++ /dev/null @@ -1,39 +0,0 @@ -# Compiling time: 0.38 SBU -# Contributor: kikadf <[email protected]> -# Contributor: exceed <[email protected]> -# Contributor: bouleetbil <[email protected]> - -pkgname=ushare -pkgver=1.1 -pkgextraver=a -pkgrel=16 -pkgdesc="uShare is a UPnP (TM) A/V & DLNA Media Server." -url="http://ushare.geexbox.org"; -source=(http://ushare.geexbox.org/releases/$pkgname-$pkgver$pkgextraver.tar.bz2 \ - $pkgname.service $pkgname.default \ - upnp-build-fix.patch stop_segfaults.patch) -up2date="Flasttar http://ushare.geexbox.org/releases/"; -backup=('/etc/sysconfig/ushare' '/etc/ushare.conf') -depends=('libupnp>=1.6.17' 'libdlna>=0.2.4-2' 'faad2>=2.7') -groups=('xmultimedia-extra') -archs=('i686' 'x86_64') -sha1sums=('1539e83cde5d80f433d262d971f5fe78486c9375' \ - 'fd9a9f2eeaf1bf8950efb211e95d5e99f99505b5' \ - '0fbc836a1275190c50b741f144f7f8010ea92272' \ - '0f38c8db7a05b76c3c9889ef87551ebef1ef6700' \ - '2a97d20ceaff59d66db57a894981ffd9998a5218') - -_F_systemd_units=($pkgname=) -Finclude systemd - -build() { - Fpatchall - Fmake --enable-dlna --with-libdlna-dir=/usr/include/libavformat - Fsed "\$(DESTDIR)" "$Fdestdir" config.mak - Fmakeinstall - Ffile ushare.default /etc/sysconfig/ushare - Ffile /lib/systemd/system/$pkgname.service - Fgenscriptlet -} - -# optimization OK diff --git a/source/xmultimedia-extra/ushare/stop_segfaults.patch b/source/xmultimedia-extra/ushare/stop_segfaults.patch deleted file mode 100644 index e43a44a..0000000 --- a/source/xmultimedia-extra/ushare/stop_segfaults.patch +++ /dev/null @@ -1,61 +0,0 @@ ---- ushare-1.1a/src/cds.c 2007-12-09 16:03:36.000000000 +0300 -+++ ushare-1.1a.my/src/cds.c 2012-01-26 05:14:03.317360310 +0400 -@@ -20,6 +20,8 @@ - */ - - #include <stdlib.h> -+#include <string.h> -+#include <stdio.h> - #include <upnp/upnp.h> - #include <upnp/upnptools.h> - ---- ushare-1.1a/src/cms.c 2007-12-09 16:03:36.000000000 +0300 -+++ ushare-1.1a.my/src/cms.c 2012-01-26 05:15:33.236991387 +0400 -@@ -20,6 +20,7 @@ - */ - - #include <stdlib.h> -+#include <string.h> - #include <upnp/upnp.h> - #include <upnp/upnptools.h> - ---- ushare-1.1a/src/http.c 2012-01-26 05:27:44.073992912 +0400 -+++ ushare-1.1a.my/src/http.c 2012-01-26 05:17:31.756505126 +0400 -@@ -25,6 +25,7 @@ - #include <errno.h> - #include <stdio.h> - #include <stdlib.h> -+#include <string.h> - #include <unistd.h> - #include <errno.h> - ---- ushare-1.1a/src/presentation.c 2007-12-09 16:03:36.000000000 +0300 -+++ ushare-1.1a.my/src/presentation.c 2012-01-26 05:19:41.635972259 +0400 -@@ -19,6 +19,8 @@ - */ - - #include <stdlib.h> -+#include <string.h> -+#include <stdio.h> - - #if HAVE_LANGINFO_CODESET - # include <langinfo.h> ---- ushare-1.1a/src/mime.c 2007-12-09 16:03:36.000000000 +0300 -+++ ushare-1.1a.my/src/mime.c 2012-01-26 05:23:54.251602492 +0400 -@@ -21,6 +21,7 @@ - - #include <stdlib.h> - #include <string.h> -+#include <stdio.h> - - #include "mime.h" - #include "ushare.h" ---- ushare-1.1a/src/services.c 2007-12-09 16:03:36.000000000 +0300 -+++ ushare-1.1a.my/src/services.c 2012-01-26 05:21:28.572200186 +0400 -@@ -20,6 +20,7 @@ - */ - - #include <stdlib.h> -+#include <string.h> - #include <upnp/upnp.h> - #include <upnp/upnptools.h> \ No newline at end of file diff --git a/source/xmultimedia-extra/ushare/upnp-build-fix.patch b/source/xmultimedia-extra/ushare/upnp-build-fix.patch deleted file mode 100644 index c3ec37a..0000000 --- a/source/xmultimedia-extra/ushare/upnp-build-fix.patch +++ /dev/null @@ -1,156 +0,0 @@ -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/source/xmultimedia-extra/ushare/ushare.default b/source/xmultimedia-extra/ushare/ushare.default deleted file mode 100644 index 4f22e71..0000000 --- a/source/xmultimedia-extra/ushare/ushare.default +++ /dev/null @@ -1,21 +0,0 @@ -# User to run ushare daemon (if none, root will be used) -USHARE_USER="root" - -# UPNP Friendly Name: -USHARE_NAME="uShare" - -# The interface to bind to: -USHARE_IFACE="eth0" - -# A List of directories to share, each precieded by '-c': -USHARE_DIRS="" - -# Misc. options, like: -# -p $port Use specific port to listen ($port) -# -x, --xbox Use XboX 360 compliant profile -# -d, --dlna Use DLNA compliant profile (PlayStation3 needs this) -# -w, --no-web Disable the control web page (enabled by default) -# -t, --no-telnet Disable the telnet control (enabled by default) -USHARE_OPTS="" - -# Check ushare --help or man ushare for more options. diff --git a/source/xmultimedia-extra/ushare/ushare.service b/source/xmultimedia-extra/ushare/ushare.service deleted file mode 100644 index c325e18..0000000 --- a/source/xmultimedia-extra/ushare/ushare.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=ushare -After=network.target - -[Service] -EnvironmentFile=/etc/sysconfig/ushare -ExecStart=/usr/bin/ushare -D -i $USHARE_IFACE -n $USHARE_NAME $USHARE_OPTS $USHARE_DIRS -Type=forking - -[Install] -WantedBy=multi-user.target _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
