Wed Nov 5 14:58:41 UTC 2008

Author: jcollie

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

Modified Files:
	0001-Modify-init-scripts-for-better-Fedora-compatibility.patch 
	0002-Modify-modules.conf-so-that-different-voicemail-modu.patch 
	0003-Allow-alternate-extensions-to-be-specified-in-users.patch 
	0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch 
	0005-Add-chan_mobile-from-asterisk-addons.patch 
	0006-Use-pkgconfig-to-check-for-Lua.patch 
	0007-Build-using-external-libedit.patch 
	0008-Update-autoconf.patch 
	0009-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch 
	asterisk.spec 
Log Message:
* Wed Nov  5 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0.1-3
- Fix issue with init script giving wrong path to config file.


0001-Modify-init-scripts-for-better-Fedora-compatibility.patch:

Index: 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0001-Modify-init-scripts-for-better-Fedora-compatibility.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4

--- 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch	10 Oct 2008 17:16:34 -0000	1.3
+++ 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch	5 Nov 2008 14:58:10 -0000	1.4
@@ -1,16 +1,16 @@
-From 2611b4b4b116867408211ccfa7e2a668c8c92f83 Mon Sep 17 00:00:00 2001
+From efe583b4fb0722cc56e52ff8bbadd06ccc312409 Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Sun, 18 Nov 2007 21:47:59 -0600
 Subject: [PATCH] Modify init scripts for better Fedora compatibility.
 
 ---
- contrib/init.d/rc.redhat.asterisk |   59 +++++++++++++++++-------------------
+ contrib/init.d/rc.redhat.asterisk |   61 +++++++++++++++++-------------------
  contrib/sysconfig/asterisk        |   16 ++++++++++
- 2 files changed, 44 insertions(+), 31 deletions(-)
+ 2 files changed, 45 insertions(+), 32 deletions(-)
  create mode 100644 contrib/sysconfig/asterisk
 
 diff --git a/contrib/init.d/rc.redhat.asterisk b/contrib/init.d/rc.redhat.asterisk
-index d2a630e..51e3459 100755
+index d2a630e..7ac830d 100755
 --- a/contrib/init.d/rc.redhat.asterisk
 +++ b/contrib/init.d/rc.redhat.asterisk
 @@ -3,7 +3,7 @@
@@ -110,6 +110,15 @@
  	if [ $AST_USER ] ; then
  		ASTARGS="-U $AST_USER"
  	fi
+@@ -88,7 +85,7 @@ start() {
+ 		ASTARGS="$ASTARGS -G $AST_GROUP"
+ 	fi
+ 	if [ $AST_CONFIG ]; then
+-		ASTARGS="$ASTARGS -C $AST_CONFIG/asterisk.conf"
++		ASTARGS="$ASTARGS -C $AST_CONFIG"
+ 	fi
+ 	daemon $DAEMON $ASTARGS
+ 	RETVAL=$?
 @@ -99,7 +96,7 @@ start() {
  
  stop() {
@@ -142,5 +151,5 @@
 +# be initialized.
 +#AST_GROUP="asterisk"
 -- 
-1.5.5.2
+1.5.6.5
 

0002-Modify-modules.conf-so-that-different-voicemail-modu.patch:

Index: 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0002-Modify-modules.conf-so-that-different-voicemail-modu.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch	10 Oct 2008 17:16:34 -0000	1.3
+++ 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch	5 Nov 2008 14:58:10 -0000	1.4
@@ -1,4 +1,4 @@
-From c53abf5c0887bf5d821b8f829dc551b17edd956f Mon Sep 17 00:00:00 2001
+From de8c8daa4f1ad9647fd9be2196b1ca4ba6e3955a Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jcollie at pc21224.campus.dmacc.edu>
 Date: Thu, 8 Nov 2007 15:52:36 -0600
 Subject: [PATCH] Modify modules.conf so that different voicemail modules can be loaded.
@@ -43,5 +43,5 @@
 +;noload => app_voicemail_plain.so
 +
 -- 
-1.5.5.2
+1.5.6.5
 

0003-Allow-alternate-extensions-to-be-specified-in-users.patch:

Index: 0003-Allow-alternate-extensions-to-be-specified-in-users.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0003-Allow-alternate-extensions-to-be-specified-in-users.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 0003-Allow-alternate-extensions-to-be-specified-in-users.patch	10 Oct 2008 17:16:34 -0000	1.2
+++ 0003-Allow-alternate-extensions-to-be-specified-in-users.patch	5 Nov 2008 14:58:10 -0000	1.3
@@ -1,4 +1,4 @@
-From 1975154336588486242bc48acb1915c21f4b4b5d Mon Sep 17 00:00:00 2001
+From 2bc910c60188c668d7ad530a61eeacdac8ac9ee6 Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jcollie at pc21224.campus.dmacc.edu>
 Date: Thu, 8 Nov 2007 16:32:56 -0600
 Subject: [PATCH] Allow alternate extensions to be specified in users.conf
@@ -45,5 +45,5 @@
  	}
  	ast_config_destroy(cfg);
 -- 
-1.5.5.2
+1.5.6.5
 

0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch:

Index: 0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch	10 Oct 2008 17:16:34 -0000	1.2
+++ 0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch	5 Nov 2008 14:58:10 -0000	1.3
@@ -1,4 +1,4 @@
-From 0e62c215b2dbb4dde75801d1e78e7c8ed3357457 Mon Sep 17 00:00:00 2001
+From 28e48a2b0b1b50a4dc09051f1250ae667614bedb Mon Sep 17 00:00:00 2001
 From: tilghman <tilghman at 614ede4d-c843-0410-af14-a771ab80d22e>
 Date: Tue, 29 Jul 2008 23:00:45 +0000
 Subject: [PATCH] Minor changes to reduce packaging changes made by the Fedora maintainer.
@@ -49,5 +49,5 @@
  
  ifeq ($(PROC),ppc)
 -- 
-1.5.5.2
+1.5.6.5
 

0005-Add-chan_mobile-from-asterisk-addons.patch:

Index: 0005-Add-chan_mobile-from-asterisk-addons.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0005-Add-chan_mobile-from-asterisk-addons.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 0005-Add-chan_mobile-from-asterisk-addons.patch	10 Oct 2008 17:16:34 -0000	1.2
+++ 0005-Add-chan_mobile-from-asterisk-addons.patch	5 Nov 2008 14:58:10 -0000	1.3
@@ -1,4 +1,4 @@
-From 1c9699ad108002862c21c918f2e91bdcb77e587a Mon Sep 17 00:00:00 2001
+From f3c9272a15f71e3dc084fad107eceb92d8a19475 Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Mon, 25 Feb 2008 09:23:28 -0600
 Subject: [PATCH] Add chan_mobile from asterisk-addons.
@@ -2510,5 +2510,5 @@
  CURL_LIB=@CURL_LIB@
  
 -- 
-1.5.5.2
+1.5.6.5
 

0006-Use-pkgconfig-to-check-for-Lua.patch:

Index: 0006-Use-pkgconfig-to-check-for-Lua.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0006-Use-pkgconfig-to-check-for-Lua.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 0006-Use-pkgconfig-to-check-for-Lua.patch	10 Oct 2008 17:16:34 -0000	1.2
+++ 0006-Use-pkgconfig-to-check-for-Lua.patch	5 Nov 2008 14:58:10 -0000	1.3
@@ -1,4 +1,4 @@
-From 3c8269faf056a4db7ba3cca418d466b0a1473cc7 Mon Sep 17 00:00:00 2001
+From 81bf87aedbf0f1ad5b8ecc97e3012821207445ca Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Mon, 25 Feb 2008 13:14:23 -0600
 Subject: [PATCH] Use pkgconfig to check for Lua.
@@ -28,5 +28,5 @@
  AST_EXT_LIB_CHECK([RADIUS], [radiusclient-ng], [rc_read_config], [radiusclient-ng.h])
  
 -- 
-1.5.5.2
+1.5.6.5
 

0007-Build-using-external-libedit.patch:

Index: 0007-Build-using-external-libedit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0007-Build-using-external-libedit.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 0007-Build-using-external-libedit.patch	10 Oct 2008 17:16:34 -0000	1.2
+++ 0007-Build-using-external-libedit.patch	5 Nov 2008 14:58:10 -0000	1.3
@@ -1,4 +1,4 @@
-From 76f411669b771983c0bdbab8c0f294351d988861 Mon Sep 17 00:00:00 2001
+From bbdbf8b43a846dd5f84cee581cb43eae7fc57c87 Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Tue, 25 Mar 2008 00:50:27 -0500
 Subject: [PATCH] Build using external libedit.
@@ -126,5 +126,5 @@
 +LIBEDIT_LIB=@LIBEDIT_LIB@
 +LIBEDIT_OBJ=@LIBEDIT_OBJ@
 -- 
-1.5.5.2
+1.5.6.5
 

0008-Update-autoconf.patch:

Index: 0008-Update-autoconf.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0008-Update-autoconf.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0008-Update-autoconf.patch	10 Oct 2008 17:16:34 -0000	1.1
+++ 0008-Update-autoconf.patch	5 Nov 2008 14:58:10 -0000	1.2
@@ -1,4 +1,4 @@
-From a76ad8b9310d30d27afafe63c0e1aae1779784b6 Mon Sep 17 00:00:00 2001
+From 7400f417c1a50e8ee2bebb91a315970f1a55e93c Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Thu, 4 Sep 2008 11:52:21 -0500
 Subject: [PATCH] Update autoconf
@@ -1124,5 +1124,5 @@
  #undef HAVE_MALLOC_H
  
 -- 
-1.5.5.2
+1.5.6.5
 

0009-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch:

Index: 0009-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0009-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0009-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch	10 Oct 2008 17:16:34 -0000	1.1
+++ 0009-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch	5 Nov 2008 14:58:10 -0000	1.2
@@ -1,4 +1,4 @@
-From f8b34fb970f0022d4d1a61d1384c2dce65280954 Mon Sep 17 00:00:00 2001
+From e56be188ad6c973b8899d6e34263da9ab322c8bd Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Fri, 10 Oct 2008 11:54:10 -0500
 Subject: [PATCH] Revert changes to pbx_lua from rev 126363 that cause some problems.
@@ -25,5 +25,5 @@
  static char *config = "extensions.lua";
  
 -- 
-1.5.5.2
+1.5.6.5
 


Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/asterisk.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- asterisk.spec	16 Oct 2008 21:32:42 -0000	1.36
+++ asterisk.spec	5 Nov 2008 14:58:10 -0000	1.37
@@ -3,7 +3,7 @@
 Summary: The Open Source PBX
 Name: asterisk
 Version: 1.6.0.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.asterisk.org/
@@ -1024,6 +1024,9 @@
 %{_libdir}/asterisk/modules/app_voicemail_plain.so
 
 %changelog
+* Wed Nov  5 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0.1-3
+- Fix issue with init script giving wrong path to config file.
+
 * Thu Oct 16 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0.1-2
 - Explicitly require dahdi-tools-libs to see if we can get this to build.
 


