From ad44e41f4cd6c2851a5634d616b538f9a04453ba Mon Sep 17 00:00:00 2001 From: Jeffrey C. Ollie Date: Nov 05 2008 15:37:26 +0000 Subject: - Fix issue with init script giving wrong path to config file. --- diff --git a/0001-Modify-init-scripts-for-better-Fedora-compatibility.patch b/0001-Modify-init-scripts-for-better-Fedora-compatibility.patch index fb9fe53..70f91a5 100644 --- a/0001-Modify-init-scripts-for-better-Fedora-compatibility.patch +++ b/0001-Modify-init-scripts-for-better-Fedora-compatibility.patch @@ -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 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 @@ index d2a630e..51e3459 100755 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 @@ index 0000000..2d3598a +# be initialized. +#AST_GROUP="asterisk" -- -1.5.5.2 +1.5.6.5 diff --git a/0002-Modify-modules.conf-so-that-different-voicemail-modu.patch b/0002-Modify-modules.conf-so-that-different-voicemail-modu.patch index bffa05f..8eca489 100644 --- a/0002-Modify-modules.conf-so-that-different-voicemail-modu.patch +++ b/0002-Modify-modules.conf-so-that-different-voicemail-modu.patch @@ -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 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 @@ index 2ca3c03..ae20637 100644 +;noload => app_voicemail_plain.so + -- -1.5.5.2 +1.5.6.5 diff --git a/0003-Allow-alternate-extensions-to-be-specified-in-users.patch b/0003-Allow-alternate-extensions-to-be-specified-in-users.patch index b9a0736..2a4ccb3 100644 --- a/0003-Allow-alternate-extensions-to-be-specified-in-users.patch +++ b/0003-Allow-alternate-extensions-to-be-specified-in-users.patch @@ -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 Date: Thu, 8 Nov 2007 16:32:56 -0600 Subject: [PATCH] Allow alternate extensions to be specified in users.conf @@ -45,5 +45,5 @@ index b63fedd..3574d0d 100644 } ast_config_destroy(cfg); -- -1.5.5.2 +1.5.6.5 diff --git a/0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch b/0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch index ae239a8..0631566 100644 --- a/0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch +++ b/0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch @@ -1,4 +1,4 @@ -From 0e62c215b2dbb4dde75801d1e78e7c8ed3357457 Mon Sep 17 00:00:00 2001 +From 28e48a2b0b1b50a4dc09051f1250ae667614bedb Mon Sep 17 00:00:00 2001 From: tilghman 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 @@ index a874a7c..f82602c 100644 ifeq ($(PROC),ppc) -- -1.5.5.2 +1.5.6.5 diff --git a/0005-Add-chan_mobile-from-asterisk-addons.patch b/0005-Add-chan_mobile-from-asterisk-addons.patch index 90ca119..f4dac15 100644 --- a/0005-Add-chan_mobile-from-asterisk-addons.patch +++ b/0005-Add-chan_mobile-from-asterisk-addons.patch @@ -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 Date: Mon, 25 Feb 2008 09:23:28 -0600 Subject: [PATCH] Add chan_mobile from asterisk-addons. @@ -2510,5 +2510,5 @@ index b3e5c49..05de366 100644 CURL_LIB=@CURL_LIB@ -- -1.5.5.2 +1.5.6.5 diff --git a/0006-Use-pkgconfig-to-check-for-Lua.patch b/0006-Use-pkgconfig-to-check-for-Lua.patch index 5a32841..95f150a 100644 --- a/0006-Use-pkgconfig-to-check-for-Lua.patch +++ b/0006-Use-pkgconfig-to-check-for-Lua.patch @@ -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 Date: Mon, 25 Feb 2008 13:14:23 -0600 Subject: [PATCH] Use pkgconfig to check for Lua. @@ -28,5 +28,5 @@ index f86e8f5..f4e445c 100644 AST_EXT_LIB_CHECK([RADIUS], [radiusclient-ng], [rc_read_config], [radiusclient-ng.h]) -- -1.5.5.2 +1.5.6.5 diff --git a/0007-Build-using-external-libedit.patch b/0007-Build-using-external-libedit.patch index 2fa02c3..d49acec 100644 --- a/0007-Build-using-external-libedit.patch +++ b/0007-Build-using-external-libedit.patch @@ -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 Date: Tue, 25 Mar 2008 00:50:27 -0500 Subject: [PATCH] Build using external libedit. @@ -96,7 +96,7 @@ diff --git a/main/cli.c b/main/cli.c index 70d26e1..90454d8 100644 --- a/main/cli.c +++ b/main/cli.c -@@ -34,6 +34,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.2 $") +@@ -34,6 +34,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.3 $") #include #include @@ -105,7 +105,7 @@ index 70d26e1..90454d8 100644 #include "asterisk/cli.h" #include "asterisk/linkedlists.h" #include "asterisk/module.h" -@@ -42,7 +44,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.2 $") +@@ -42,7 +44,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.3 $") #include "asterisk/utils.h" #include "asterisk/app.h" #include "asterisk/lock.h" @@ -126,5 +126,5 @@ index 05de366..72d5315 100644 +LIBEDIT_LIB=@LIBEDIT_LIB@ +LIBEDIT_OBJ=@LIBEDIT_OBJ@ -- -1.5.5.2 +1.5.6.5 diff --git a/0008-Update-autoconf.patch b/0008-Update-autoconf.patch index e88620e..01ce085 100644 --- a/0008-Update-autoconf.patch +++ b/0008-Update-autoconf.patch @@ -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 Date: Thu, 4 Sep 2008 11:52:21 -0500 Subject: [PATCH] Update autoconf @@ -1124,5 +1124,5 @@ index a79f773..1bdb72a 100644 #undef HAVE_MALLOC_H -- -1.5.5.2 +1.5.6.5 diff --git a/0009-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch b/0009-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch index fa1d90c..1659371 100644 --- a/0009-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch +++ b/0009-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch @@ -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 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 @@ index 704d811..6302ac6 100644 static char *config = "extensions.lua"; -- -1.5.5.2 +1.5.6.5 diff --git a/asterisk.spec b/asterisk.spec index 159f222..4401ba0 100644 --- a/asterisk.spec +++ b/asterisk.spec @@ -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 @@ fi %{_libdir}/asterisk/modules/app_voicemail_plain.so %changelog +* Wed Nov 5 2008 Jeffrey C. Ollie - 1.6.0.1-3 +- Fix issue with init script giving wrong path to config file. + * Thu Oct 16 2008 Jeffrey C. Ollie - 1.6.0.1-2 - Explicitly require dahdi-tools-libs to see if we can get this to build.