diff --git a/.cvsignore b/.cvsignore index 3c41074..6dbf4e2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -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 diff --git a/0001-Modify-init-scripts-for-better-Fedora-compatibility.patch b/0001-Modify-init-scripts-for-better-Fedora-compatibility.patch index e92c8e9..77ff386 100644 --- a/0001-Modify-init-scripts-for-better-Fedora-compatibility.patch +++ b/0001-Modify-init-scripts-for-better-Fedora-compatibility.patch @@ -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 diff --git a/asterisk.spec b/asterisk.spec index 0f2413e..984557d 100644 --- a/asterisk.spec +++ b/asterisk.spec @@ -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-better-Fedora-compatibility.patch 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 - 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 - 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 diff --git a/sources b/sources index 2532b13..ba1d6f1 100644 --- a/sources +++ b/sources @@ -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