From 4de62d0cd56a6c8c82c246b348ea694aabf7312d Mon Sep 17 00:00:00 2001 From: John Khvatov Date: Nov 06 2011 22:17:45 +0000 Subject: removed unused patches --- diff --git a/opensips-0002-fixed-pvar-overlapping-both-auth-realm-and-auth-resp.patch b/opensips-0002-fixed-pvar-overlapping-both-auth-realm-and-auth-resp.patch deleted file mode 100644 index ba17c2f..0000000 --- a/opensips-0002-fixed-pvar-overlapping-both-auth-realm-and-auth-resp.patch +++ /dev/null @@ -1,29 +0,0 @@ -From faaaacc7d9ad641e3d18b670703e2ca8108c9cda Mon Sep 17 00:00:00 2001 -From: bogdan_iancu -Date: Fri, 28 Jan 2011 10:17:40 +0000 -Subject: [PATCH 2/3] - fixed pvar overlapping - both auth realm and auth - response were defined as $ar. auth response moved as - $auth.resp Credits for report go to medve on IRC - channel - -git-svn-id: https://opensips.svn.sourceforge.net/svnroot/opensips/trunk@7686 689a6050-402a-0410-94f2-e92a70836424 ---- - pvar.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/pvar.c b/pvar.c -index a3cda2a..3b6c46e 100644 ---- a/pvar.c -+++ b/pvar.c -@@ -2958,7 +2958,7 @@ static pv_export_t _pv_names_table[] = { - {{"an", (sizeof("an")-1)}, /* */ - PVT_AUTH_NONCE, pv_get_authattr, 0, - 0, 0, pv_init_iname, 6}, -- {{"ar", (sizeof("ar")-1)}, /* */ -+ {{"auth.resp", (sizeof("auth.resp")-1)}, /* */ - PVT_AUTH_RESPONSE, pv_get_authattr, 0, - 0, 0, pv_init_iname, 7}, - {{"aU", (sizeof("aU")-1)}, /* */ --- -1.7.6 - diff --git a/opensips-0003-Fixed-init-script.patch b/opensips-0003-Fixed-init-script.patch deleted file mode 100644 index b412fd3..0000000 --- a/opensips-0003-Fixed-init-script.patch +++ /dev/null @@ -1,99 +0,0 @@ -From e4356713348159a9d4c8a30884c1852dc2edea4d Mon Sep 17 00:00:00 2001 -From: Peter Lemenkov -Date: Mon, 11 Jul 2011 16:24:51 +0400 -Subject: [PATCH 3/3] Fixed init-script - -Signed-off-by: Peter Lemenkov ---- - packaging/fedora/opensips.init | 39 ++++++++++++++++++++++++++++++--------- - 1 files changed, 30 insertions(+), 9 deletions(-) - -diff --git a/packaging/fedora/opensips.init b/packaging/fedora/opensips.init -index 40adb88..685d1ef 100644 ---- a/packaging/fedora/opensips.init -+++ b/packaging/fedora/opensips.init -@@ -20,28 +20,49 @@ - # Source function library. - . /etc/rc.d/init.d/functions - --oser=/usr/sbin/opensips - prog=opensips -+oser=/usr/sbin/$prog -+pidfile="/var/run/$prog.pid" -+lockfile="/var/lock/subsys/$prog" -+configfile="/etc/$prog/$prog.cfg" -+OPTIONS="" -+ - RETVAL=0 - - [ -f /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog - - start() { - echo -n $"Starting $prog: " -+ -+ # check whether OpenSIPs was already started -+ if status $prog > /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 OpenSIPs is running -+ if ! status $prog > /dev/null 2>&1 ; then -+ echo -n "not running" && warning && echo -+ return 0 -+ fi -+ -+ killproc $prog 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. -@@ -53,22 +74,22 @@ case "$1" in - stop - ;; - status) -- status $oser -+ status $prog - RETVAL=$? - ;; - restart|reload) - stop - start - ;; -- condrestart) -- if [ -f /var/run/opensips.pid ] ; then -+ condrestart|try-restart) -+ if [ -f $pidfile ] ; then - stop - start - fi - ;; - *) - echo $"Usage: $prog {start|stop|reload|restart|condrestart|status|help}" -- exit 1 -+ RETVAL=2 - esac - - exit $RETVAL --- -1.7.6 -