[Pkg-voip-commits] r2360 - asterisk/branches/sarge/debian

[Tzafrir Cohen]

Author: tzafrir-guest
Date: 2006-09-09 22:12:55 +0000 (Sat, 09 Sep 2006)
New Revision: 2360

Modified:
   asterisk/branches/sarge/debian/asterisk.init
   asterisk/branches/sarge/debian/asterisk_fix
   asterisk/branches/sarge/debian/changelog
Log:
Syncing from trunk:
* Better error handling on init.d reload, if asterisk isn't running .
* Use restart in asterisk_fix .
* Changelog sync.


Modified: asterisk/branches/sarge/debian/asterisk.init
===================================================================
--- asterisk/branches/sarge/debian/asterisk.init	2006-09-08 13:27:53 UTC (rev 2359)
+++ asterisk/branches/sarge/debian/asterisk.init	2006-09-09 22:12:55 UTC (rev 2360)
@@ -93,7 +93,7 @@
   start)
 	if status > /dev/null; then
 		echo "$DESC is already running. Use restart."
-		exit 1
+		exit 0
 	fi
 	echo -n "Starting $DESC: "
 	if [ "$RUNASTSAFE" != "yes" ];then
@@ -102,7 +102,7 @@
 		# "safe mode"
 		if status > /dev/null; then
 			echo "$DESC is already running. Use restart."
-			exit 1
+			exit 0
 		fi
 		start-stop-daemon --start --group $GROUP --pidfile "$PIDFILE" \
 			--exec $REALDAEMON -- $PARAMS
@@ -141,14 +141,14 @@
 	;;
   reload)
 	echo "Reloading $DESC configuration files."
-	$DAEMON -rx 'reload'
+	$DAEMON -rx 'reload' || true
 	;;
   logger-reload)
-	$DAEMON -rx 'logger reload'
+	$DAEMON -rx 'logger reload' || true
 	;;
   extensions-reload)
 	echo "Reloading $DESC configuration files."
-	$DAEMON -rx 'extensions reload'
+	$DAEMON -rx 'extensions reload' || true
 	;;
   restart|force-reload)
 	$0 stop

Modified: asterisk/branches/sarge/debian/asterisk_fix
===================================================================
--- asterisk/branches/sarge/debian/asterisk_fix	2006-09-08 13:27:53 UTC (rev 2359)
+++ asterisk/branches/sarge/debian/asterisk_fix	2006-09-09 22:12:55 UTC (rev 2360)
@@ -78,6 +78,6 @@
 	if [ -f /var/run/asterisk/asterisk.pid ];then
 	    invoke-rc.d asterisk reload || exit $?
 	else
-	    invoke-rc.d asterisk start || exit $?
+	    invoke-rc.d asterisk restart || exit $?
 	fi
 fi

Modified: asterisk/branches/sarge/debian/changelog
===================================================================
--- asterisk/branches/sarge/debian/changelog	2006-09-08 13:27:53 UTC (rev 2359)
+++ asterisk/branches/sarge/debian/changelog	2006-09-09 22:12:55 UTC (rev 2360)
@@ -1,7 +1,22 @@
-asterisk (1:1.2.11.dfsg-1) UNRELEASED; urgency=low
+asterisk (1:1.2.11.dfsg-1) unstable; urgency=low
 
-  * Unofficial pkg-voip Sarge backport
+  [ Tzafrir Cohen]
+  * apprecord_sprintf.dpatch: fix format string issue in app_record.so .
 
+  [ Mark Purcell ]
+  * New Upstream Release
+  * Urgency high as fixes CVE-2006-4346
+  * CVE-2006-4346: Asterisk MGCP AUEP Response Handling Buffer
+    Overflow (Closes: Bug#385060)
+  * Please package Asterisk 1.2.11 and Zaptel 1.2.8 (Closes: #384283)
+  * Better error handling on init.d reload, if asterisk isn't running
+  * Lintian cleanup: not-binnmuable-any-depends-all
+  * Use restart in asterisk_fix
+
+ -- Mark Purcell <msp at debian.org>  Sat,  2 Sep 2006 13:01:02 +0100
+
+asterisk (1:1.2.10.dfsg-3) unstable; urgency=low
+
   [ Kilian Krause ]
   * Add iaxy.bin to asterisk debs to have working IAX support.
   * asterisk_fix is included on the main asterisk package