rpms/asterisk/F-12 .cvsignore, 1.25, 1.26 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch, 1.11, 1.12 asterisk.spec, 1.61, 1.62 sources, 1.25, 1.26 0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch, 1.1, NONE

[Jeffrey C. Ollie]

Author: jcollie

Update of /cvs/pkgs/rpms/asterisk/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv369

Modified Files:
	.cvsignore 
	0001-Modify-init-scripts-for-better-Fedora-compatibility.patch 
	asterisk.spec sources 
Removed Files:
	0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch 
Log Message:
* Thu Nov 19 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1.10-1
- Update to 1.6.1.10
- Drop unneeded patch to get Lua extensions building



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-12/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	5 Nov 2009 12:59:39 -0000	1.25
+++ .cvsignore	19 Nov 2009 15:51:51 -0000	1.26
@@ -1,2 +1,2 @@
-asterisk-1.6.1.9.tar.gz
-asterisk-1.6.1.9.tar.gz.asc
+asterisk-1.6.1.10.tar.gz
+asterisk-1.6.1.10.tar.gz.asc

0001-Modify-init-scripts-for-better-Fedora-compatibility.patch:
 init.d/rc.redhat.asterisk |   76 ++++++++++++++++++++--------------------------
 sysconfig/asterisk        |   19 +++++++++++
 2 files changed, 53 insertions(+), 42 deletions(-)

Index: 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-12/0001-Modify-init-scripts-for-better-Fedora-compatibility.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch	25 Oct 2009 04:45:49 -0000	1.11
+++ 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch	19 Nov 2009 15:51:52 -0000	1.12
@@ -1,6 +1,6 @@
 Index: contrib/init.d/rc.redhat.asterisk
 ===================================================================
---- contrib/init.d/rc.redhat.asterisk	(revision 225759)
+--- contrib/init.d/rc.redhat.asterisk	(revision 228657)
 +++ contrib/init.d/rc.redhat.asterisk	(working copy)
 @@ -3,7 +3,7 @@
  #
@@ -114,13 +114,21 @@ Index: contrib/init.d/rc.redhat.asterisk
  	RETVAL=$?
  	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/asterisk
  	echo
-@@ -99,7 +97,7 @@
+@@ -98,14 +96,8 @@
+ }
  
  stop() {
- 	# Stop daemons.
+-	# Stop daemons.
+-	if [ -f $SAFE_ASTERISK ]; then
+-		# Kill safe_asterisk first, to prevent us from starting up 2 instances of safe_asterisk
+-		echo -n $"Stopping safe_asterisk: "
+-		killproc `basename $SAFE_ASTERISK`
+-		echo
+-	fi
 -	echo -n $"Shutting down asterisk: "
++	# Stop daemon.
 +	echo -n $"Stopping asterisk: "
- 	killproc asterisk
+ 	killproc `basename $DAEMON`
  	RETVAL=$?
  	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/asterisk
 Index: contrib/sysconfig/asterisk


Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-12/asterisk.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- asterisk.spec	5 Nov 2009 12:59:39 -0000	1.61
+++ asterisk.spec	19 Nov 2009 15:51:52 -0000	1.62
@@ -1,7 +1,7 @@
 #define _rc 2
 Summary: The Open Source PBX
 Name: asterisk
-Version: 1.6.1.9
+Version: 1.6.1.10
 Release: 1%{?_rc:.rc%{_rc}}%{?dist}
 License: GPLv2
 Group: Applications/Internet
@@ -17,7 +17,6 @@ Patch1:  0001-Modify-init-scripts-for-be
 Patch2:  0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
 Patch5:  0005-Build-using-external-libedit.patch
 Patch8:  0008-change-configure.ac-to-look-for-pkg-config-gmime-2.0.patch
-Patch9:  0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch
 Patch11: 0011-Fix-up-some-paths.patch
 Patch12: 0012-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch
 
@@ -383,7 +382,6 @@ local filesystem.
 %patch2 -p0
 %patch5 -p0
 %patch8 -p0
-%patch9 -p1
 %patch11 -p0
 %patch12 -p1
 
@@ -993,6 +991,10 @@ fi
 %{_libdir}/asterisk/modules/app_voicemail_plain.so
 
 %changelog
+* Thu Nov 19 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1.10-1
+- Update to 1.6.1.10
+- Drop unneeded patch to get Lua extensions building
+
 * Wed Nov  4 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1.9-1
 - Update to 1.6.1.9 to fix AST-2009-009/CVE-2008-7220 and AST-2009-008
 - Fix obsoletes for firmware subpackage


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-12/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	5 Nov 2009 12:59:39 -0000	1.25
+++ sources	19 Nov 2009 15:51:52 -0000	1.26
@@ -1,2 +1,2 @@
-e40cc69fb53e1cad9f30d1d533383efd  asterisk-1.6.1.9.tar.gz
-fba8322f5b26f2530b3fef92a6ce7be1  asterisk-1.6.1.9.tar.gz.asc
+68e7158ed9455bedd97ef079609c397b  asterisk-1.6.1.10.tar.gz
+0781ad3663529c67fea96b2aae9b4678  asterisk-1.6.1.10.tar.gz.asc


--- 0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch DELETED ---