rpms/ushare/devel ushare-0.9.5-buffer.diff, NONE, 1.1 ushare.init, NONE, 1.1 ushare.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Eric Tanguy (tanguy) fedora-extras-commits at redhat.com
Thu Jan 26 17:04:04 UTC 2006


Author: tanguy

Update of /cvs/extras/rpms/ushare/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5319/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ushare-0.9.5-buffer.diff ushare.init ushare.spec 
Log Message:
auto-import ushare-0.9.5-4 on branch devel from ushare-0.9.5-4.src.rpm

ushare-0.9.5-buffer.diff:

--- NEW FILE ushare-0.9.5-buffer.diff ---
--- ushare-0.9.5/src/buffer.c   2005-11-26 15:03:55.000000000 -0500
+++ ushare-0.9.5.p/src/buffer.c   2005-12-21 21:38:38.000000000 -0500
@@ -62,7 +62,7 @@
   len = buffer->len + strlen (str);
   if (len >= buffer->capacity)
   {
-    buffer->capacity = MIN (len, 2 * buffer->capacity);
+    buffer->capacity = MAX (len+1, 2 * buffer->capacity);
     buffer->buf = realloc (buffer->buf, buffer->capacity);
   }
 
@@ -74,14 +74,23 @@
 buffer_appendf (struct buffer_t *buffer, const char *format, ...)
 {
   char str[BUFFER_DEFAULT_CAPACITY];
+  int size;
   va_list va;
 
   if (!buffer || !format)
     return;
 
   va_start (va, format);
-  vsprintf (str, format, va);
-  buffer_append (buffer, str);
+  if ((size = vsnprintf (str, BUFFER_DEFAULT_CAPACITY, format, va))
+      >= BUFFER_DEFAULT_CAPACITY)
+  {
+    char* dynstr = (char*) malloc (size+1);
+    vsnprintf (dynstr,size+1,format,va);
+    buffer_append (buffer, dynstr);
+    free (dynstr);
+  }
+  else
+    buffer_append (buffer, str);
   va_end (va);
 } 


--- NEW FILE ushare.init ---
#!/bin/sh
#
# ushare		This shell script takes care of starting and stopping ushare.
#
# chkconfig: - 75 25
# description:	uShare UPnP A/V Media Server.
#

# Source function library.
. /etc/rc.d/init.d/functions

# Source networking configuration.
. /etc/sysconfig/network

# Check that networking is up.
[ ${NETWORKING} = "no" ] && exit 0

OPTIONS=""
prog=ushare
DESC="UPnP A/V Media Server"

[ -r "/etc/ushare.conf" ] && . /etc/ushare.conf
# abort if no shared directory is defined
[ -z "$USHARE_DIR" ] && exit 0


start() {
	echo -n $"Starting $prog: "
	daemon --user ushare $prog -D
	RETVAL=$?
	echo
	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog
}

stop() {
	echo -n $"Stopping $prog: "
	killproc $prog
	RETVAL=$?
	echo
	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog /var/run/ircd.pid
}

reload() {
	echo -n $"Reloading $prog: "
	killproc $prog -HUP
	RETVAL=$?
	echo
}

# See how we were called.
case "$1" in
  start)
	start
	;;
  stop)
	stop
	;;
  status)
	status $prog
	RETVAL=$?
	;;
  restart)
	stop
	start
	;;
  condrestart)
	if [ -f /var/lock/subsys/$prog ]; then
	  stop
	  start
	fi
	;;
  reload)
	reload
	;;
  *)
	echo $"Usage: $prog {start|stop|restart|condrestart|reload|status"
	exit 1
esac

exit $RETVAL


--- NEW FILE ushare.spec ---
Summary: UPnP (TM) A/V Media Server
Name: ushare
Version: 0.9.5
Release: 4%{?dist}
License: GPL
Group: Applications/Multimedia
URL: http://ushare.geexbox.org/

Source: http://ushare.geexbox.org/releases/%{name}-%{version}.tar.bz2
Source1:ushare.init
Patch0:	ushare-0.9.5-buffer.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: libupnp-devel
Requires(pre): fedora-usermgmt
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/service, /sbin/chkconfig
Requires(postun): /sbin/service

%description
uShare is a UPnP (TM) A/V Media Server. It implements the server 
component that provides UPnP media devices with information on 
available multimedia files. uShare uses the built-in http server 
of libupnp to stream the files to clients.

%prep
%setup -q
%patch0 -p1

%build
%configure
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
%makeinstall
%{__rm} -rf   %{buildroot}%{_sysconfdir}/init.d
%{__install} -m 0755 -D %{SOURCE1} %{buildroot}%{_initrddir}/ushare
%{__mkdir_p} %{buildroot}%{_var}/lib/ushare
%find_lang %{name}

%clean
rm -rf %{buildroot}

%pre
%{_sbindir}/fedora-useradd 21 -s /sbin/nologin -M -r -d %{_var}/lib/ushare \
    -c "ushare service account" ushare &>/dev/null || :

%post
/sbin/chkconfig --add ushare

%preun
if [ $1 -eq 0 ]; then
    /sbin/service ushare stop &>/dev/null || :
    /sbin/chkconfig --del ushare
fi

%postun
if [ $1 -ge 1 ]; then
    /sbin/service ushare condrestart &>/dev/null || :
fi

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%{_bindir}/ushare
%config(noreplace) %{_sysconfdir}/ushare.conf
%{_initrddir}/ushare
%{_mandir}/man1/*
%attr(770,ushare,ushare) %dir %{_var}/lib/ushare/

%changelog
* Tue Dec 27 2005 Eric Tanguy 0.9.5-4
- Use %find_lang macro instead of %{_datadir}/locale/*

* Tue Dec 27 2005 Eric Tanguy 0.9.5-3
- Drop "Requires: libupnp"
- replace %{_sysconfdir}/ushare.conf by %config(noreplace) %{_sysconfdir}/ushare.conf

* Tue Dec 27 2005 Eric Tanguy 0.9.5-2
- add patch for buffer

* Tue Dec 27 2005 Eric Tanguy 0.9.5-1
- First build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ushare/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2006 17:01:48 -0000	1.1
+++ .cvsignore	26 Jan 2006 17:04:03 -0000	1.2
@@ -0,0 +1 @@
+ushare-0.9.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ushare/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2006 17:01:48 -0000	1.1
+++ sources	26 Jan 2006 17:04:03 -0000	1.2
@@ -0,0 +1 @@
+2f5371f84a17548988bdd4f0fbe781ff  ushare-0.9.5.tar.bz2




More information about the fedora-extras-commits mailing list