rpms/openser/devel openser--openser_init.diff, NONE, 1.1 import.log, 1.5, 1.6 openser.spec, 1.34, 1.35

[Peter Lemenkov]

Author: peter

Update of /cvs/pkgs/rpms/openser/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4682/devel

Modified Files:
	import.log openser.spec 
Added Files:
	openser--openser_init.diff 
Log Message:
Fixed init-script and added COPYING file

openser--openser_init.diff:
 openser.init |   46 ++++++++++++++++++++++++++++++++++------------
 1 file changed, 34 insertions(+), 12 deletions(-)

--- NEW FILE openser--openser_init.diff ---
--- packaging/fedora/openser.init~	2008-11-24 23:52:32.000000000 +0300
+++ packaging/fedora/openser.init	2009-11-11 13:48:52.901723897 +0300
@@ -12,28 +12,50 @@
 # Source function library.
 . /etc/rc.d/init.d/functions
 
-oser=/usr/sbin/openser
 prog=openser
-RETVAL=0
+oser=/usr/sbin/$prog
+pidfile="/var/run/$prog.pid"
+lockfile="/var/lock/subsys/$prog"
+configfile="/etc/$prog/$prog.cfg"
+
+OPTIONS=""
 
 [ -f /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
 
+RETVAL=0
+
 start() {
 	echo -n $"Starting $prog: "
+
+	# check whether OpenSER was already started
+	if pidofproc -p $pidfile > /dev/null 2>&1 ; then
+		echo -n "already running" && warning && echo
+		return 0
+	fi
+
 	# there is something at end of this output which is needed to
 	# report proper [ OK ] status in Fedora scripts
-	daemon $oser $OPTIONS 2>/dev/null | tail -1
+	daemon $oser -P $pidfile -f $configfile $OPTIONS 2>/dev/null | tail -1
 	RETVAL=$?
 	echo
-	[ $RETVAL = 0 ] && touch /var/lock/subsys/$prog
+	[ $RETVAL = 0 ] && touch $lockfile
+	return $RETVAL
 }
 
 stop() {
 	echo -n $"Stopping $prog: "
-	killproc $oser
+
+	# check whether OpenSER is running
+	if ! pidofproc -p $pidfile > /dev/null 2>&1 ; then
+		echo -n "not running" && warning && echo
+		return 0
+	fi
+
+	killproc -p $pidfile 2> /dev/null
 	RETVAL=$?
 	echo
-	[ $RETVAL = 0 ] && rm -f /var/lock/subsys/$prog /var/run/$prog.pid
+	[ $RETVAL = 0 ] && rm -f $lockfile $pidfile
+	return $RETVAL
 }
 
 # See how we were called.
@@ -45,22 +67,22 @@
 		stop
 		;;
 	status)
-		status $oser
+		status -p $pidfile $prog
 		RETVAL=$?
 		;;
-	restart)
+	restart|force-reload)
 		stop
 		start
 		;;
-	condrestart)
-		if [ -f /var/run/openser.pid ] ; then
+	condrestart|try-restart)
+		if [ -f $pidfile ] ; then
 			stop
 			start
 		fi
 		;;
 	*)
-		echo $"Usage: $prog {start|stop|restart|condrestart|status|help}"
-		exit 1
+		echo $"Usage: $prog {start|stop|restart|condrestart|status}"
+		RETVAL=2
 esac
 
 exit $RETVAL


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/openser/devel/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	8 Dec 2008 16:21:05 -0000	1.5
+++ import.log	12 Nov 2009 15:08:21 -0000	1.6
@@ -3,3 +3,4 @@ openser-1_3_2-4_fc9:HEAD:openser-1.3.2-4
 openser-1_3_3-1_fc9:HEAD:openser-1.3.3-1.fc9.src.rpm:1219909354
 openser-1_3_3-2_fc9:HEAD:openser-1.3.3-2.fc9.src.rpm:1219917365
 openser-1_3_4-1_fc10:HEAD:openser-1.3.4-1.fc10.src.rpm:1228753219
+openser-1_3_4-9_fc11:HEAD:openser-1.3.4-9.fc11.src.rpm:1258038479


Index: openser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openser/devel/openser.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- openser.spec	25 Aug 2009 18:32:08 -0000	1.34
+++ openser.spec	12 Nov 2009 15:08:21 -0000	1.35
@@ -10,7 +10,7 @@
 Summary:	Open Source SIP Server
 Name:		openser
 Version:	1.3.4
-Release:	8%{?dist}
+Release:	9%{?dist}
 License:	GPLv2+
 Group:		System Environment/Daemons
 Source0:	http://www.kamailio.org/pub/%{name}/%{version}/src/%{name}-%{version}-tls_src.tar.gz
@@ -18,6 +18,7 @@ Source1:	%{name}.sysconfig
 Patch1:		openser--acc_radius_enable.diff
 Patch3:		openser--openssl-paths.diff
 Patch4:		openser-1.3.4-openssl10.patch
+Patch5:		openser--openser_init.diff
 URL:		http://www.kamailio.org/
 
 BuildRequires:	expat-devel
@@ -421,6 +422,7 @@ cp -pRf modules/acc modules/acc_radius
 %patch1
 %patch3 -p0 -b .openssl
 %patch4 -p1 -b .openssl10
+%patch5 -p0 -b .old_init
 
 %build
 LOCALBASE=/usr CFLAGS="%{optflags}" %{__make} all %{?_smp_mflags} TLS=1 \
@@ -538,6 +540,7 @@ fi
 %{_mandir}/man8/openserunix.8*
 
 %doc docdir/AUTHORS
+%doc COPYING
 %doc docdir/NEWS
 %doc docdir/README
 %doc docdir/README-MODULES
@@ -849,6 +852,10 @@ fi
 %doc docdir/README.xmpp
 
 %changelog
+* Wed Nov 11 2009 Peter Lemenkov <lemenkov at gmail.com> 1.3.4-9
+- Added patch for the init-script
+- Added COPYING file
+
 * Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 1.3.4-8
 - rebuilt with new openssl