[asterisk] * Sat Jul 31 2010 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2.10-1 - Update to 1.6.2.10
Jeffrey C. Ollie
jcollie at fedoraproject.org
Sun Aug 1 03:43:56 UTC 2010
commit 149b01998554ab9f211d691efa2587b5e94bcfe9
Author: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Sat Jul 31 22:43:46 2010 -0500
* Sat Jul 31 2010 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2.10-1
- Update to 1.6.2.10
.gitignore | 4 +-
...it-scripts-for-better-Fedora-compatibilty.patch | 48 +-
...les.conf-so-that-different-voicemail-modu.patch | 22 +-
...king-building-against-an-external-libedit.patch | 30 +-
...rary-function-for-loading-command-history.patch | 11 +-
...igure.ac-to-look-for-pkg-config-gmime-2.0.patch | 22 +-
...ome-paths.patch => 0006-Fix-up-some-paths.patch | 755 ++++++++++----------
...hema-that-is-compatible-with-Fedora-Direc.patch | 146 ++--
...2html-to-copy-icons-when-building-documen.patch | 25 +
0013-res_http_post-path-issue.patch | 13 -
0014-latex2html-local_icons.patch | 11 -
asterisk.spec | 44 +-
menuselect.makeopts | 2 +-
sources | 4 +-
14 files changed, 599 insertions(+), 538 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 196c029..4c8f5db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-asterisk-1.6.2.8-rc1.tar.gz
-asterisk-1.6.2.8-rc1.tar.gz.asc
+asterisk-1.6.2.10.tar.gz
+asterisk-1.6.2.10.tar.gz.asc
diff --git a/0001-Modify-init-scripts-for-better-Fedora-compatibility.patch b/0001-Modify-init-scripts-for-better-Fedora-compatibilty.patch
similarity index 78%
rename from 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch
rename to 0001-Modify-init-scripts-for-better-Fedora-compatibilty.patch
index d2af6dc..46c6e72 100644
--- a/0001-Modify-init-scripts-for-better-Fedora-compatibility.patch
+++ b/0001-Modify-init-scripts-for-better-Fedora-compatibilty.patch
@@ -1,7 +1,18 @@
-Index: contrib/init.d/rc.redhat.asterisk
-===================================================================
---- contrib/init.d/rc.redhat.asterisk (revision 228657)
-+++ contrib/init.d/rc.redhat.asterisk (working copy)
+From ed8a94405e46074833a9fc0e7b09db428d3afecd Mon Sep 17 00:00:00 2001
+From: Jeffrey C. Ollie <jeff at ocjtech.us>
+Date: Wed, 28 Jul 2010 07:22:21 -0500
+Subject: [PATCH 1/8] Modify init scripts for better Fedora compatibilty.
+
+---
+ contrib/init.d/rc.redhat.asterisk | 75 +++++++++++++++++--------------------
+ contrib/sysconfig/asterisk | 19 +++++++++
+ 2 files changed, 53 insertions(+), 41 deletions(-)
+ create mode 100644 contrib/sysconfig/asterisk
+
+diff --git a/contrib/init.d/rc.redhat.asterisk b/contrib/init.d/rc.redhat.asterisk
+index 3841afe..a72ea2a 100755
+--- a/contrib/init.d/rc.redhat.asterisk
++++ b/contrib/init.d/rc.redhat.asterisk
@@ -3,7 +3,7 @@
#
# asterisk Starts, Stops and Reloads Asterisk.
@@ -10,21 +21,20 @@ Index: contrib/init.d/rc.redhat.asterisk
+# chkconfig: - 90 60
# description: Asterisk PBX and telephony daemon.
# processname: asterisk
- # pidfile: /var/run/asterisk.pid
+ # pidfile: __ASTERISK_VARRUN_DIR__/asterisk.pid
@@ -20,51 +20,51 @@
# - Added support for -U and -G command line options
# - Modified "reload" to call asterisk -rx 'reload'
--# Use this option to specify a different configuration directory
--#AST_CONFIG=/etc/asterisk
+# Do not modify this script to change any of the settings, instead
+# edit /etc/sysconfig/asterisk
-
-+# Specify the configuration file
-+AST_CONFIG=/etc/asterisk/asterisk.conf
+
+ # Use this option to specify a different configuration directory
+-#AST_CONFIG=__ASTERISK_ETC_DIR__
++AST_CONFIG=__ASTERISK_ETC_DIR__/asterisk.conf
+
# Installation directory
- AST_SBIN=/usr/sbin
+ AST_SBIN=__ASTERISK_SBIN_DIR__
-# Uncomment the following and set them to the user/groups that you
-# want to run Asterisk as. NOTE: this requires substantial work to
@@ -89,7 +99,7 @@ Index: contrib/init.d/rc.redhat.asterisk
RETVAL=0
start() {
-@@ -78,19 +78,18 @@
+@@ -78,19 +78,18 @@ start() {
# Start daemons.
echo -n $"Starting asterisk: "
@@ -115,7 +125,7 @@ Index: contrib/init.d/rc.redhat.asterisk
RETVAL=$?
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/asterisk
echo
-@@ -98,14 +96,8 @@
+@@ -98,14 +97,8 @@ start() {
}
stop() {
@@ -132,10 +142,11 @@ Index: contrib/init.d/rc.redhat.asterisk
killproc `basename $DAEMON`
RETVAL=$?
[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/asterisk
-Index: contrib/sysconfig/asterisk
-===================================================================
---- contrib/sysconfig/asterisk (revision 225759)
-+++ contrib/sysconfig/asterisk (working copy)
+diff --git a/contrib/sysconfig/asterisk b/contrib/sysconfig/asterisk
+new file mode 100644
+index 0000000..dab2e33
+--- /dev/null
++++ b/contrib/sysconfig/asterisk
@@ -0,0 +1,19 @@
+# Specify the configuration file
+AST_CONFIG=/etc/asterisk/asterisk.conf
@@ -156,3 +167,6 @@ Index: contrib/sysconfig/asterisk
+
+# A place to specify extra arguments for the Asterisk command line
+AST_EXTRA_ARGS=""
+--
+1.7.2
+
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 e35af6e..7f96be4 100644
--- a/0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
+++ b/0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
@@ -1,8 +1,17 @@
-Index: configs/modules.conf.sample
-===================================================================
---- configs/modules.conf.sample (revision 216642)
-+++ configs/modules.conf.sample (working copy)
-@@ -38,3 +38,29 @@
+From d21028cd015ad28165533a007d49377cbec11bac Mon Sep 17 00:00:00 2001
+From: Jeffrey C. Ollie <jeff at ocjtech.us>
+Date: Wed, 28 Jul 2010 07:23:49 -0500
+Subject: [PATCH 2/8] Modify modules.conf so that different voicemail modules don't load at the same time.
+
+---
+ configs/modules.conf.sample | 26 ++++++++++++++++++++++++++
+ 1 files changed, 26 insertions(+), 0 deletions(-)
+
+diff --git a/configs/modules.conf.sample b/configs/modules.conf.sample
+index 5b553a4..39645c3 100644
+--- a/configs/modules.conf.sample
++++ b/configs/modules.conf.sample
+@@ -35,3 +35,29 @@ noload => chan_alsa.so
;noload => chan_oss.so
noload => chan_console.so
;
@@ -32,3 +41,6 @@ Index: configs/modules.conf.sample
+;
+;noload => app_directory_plain.so
+;noload => app_voicemail_plain.so
+--
+1.7.2
+
diff --git a/0005-Build-using-external-libedit.patch b/0003-Allow-linking-building-against-an-external-libedit.patch
similarity index 88%
rename from 0005-Build-using-external-libedit.patch
rename to 0003-Allow-linking-building-against-an-external-libedit.patch
index 4afc2c0..7cd8ab9 100644
--- a/0005-Build-using-external-libedit.patch
+++ b/0003-Allow-linking-building-against-an-external-libedit.patch
@@ -1,7 +1,7 @@
-From 6e551983f559c1ca1efa5f452c91f90b20eeb882 Mon Sep 17 00:00:00 2001
+From 61006b2d0679cadf369ce6028cf98ebf722db600 Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Fri, 5 Mar 2010 14:10:52 -0600
-Subject: [PATCH 1/2] Allow linking/building against an external libedit.
+Subject: [PATCH 3/8] Allow linking/building against an external libedit.
The Asterisk tarball includes a very old copy of the editline library
that manages command line history and editing. Fedora (and several
@@ -31,18 +31,18 @@ index 5f399fc..695622c 100644
LUA=@PBX_LUA@
MISDN=@PBX_MISDN@
diff --git a/configure.ac b/configure.ac
-index d4a980d..a9f5646 100644
+index 0b6748e..1b3f9c7 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -312,6 +312,7 @@ AST_EXT_LIB_SETUP([IODBC], [iODBC], [iodbc])
- AST_EXT_LIB_SETUP([ISDNNET], [ISDN4Linux Library], [isdnnet])
+@@ -315,6 +315,7 @@ AST_EXT_LIB_SETUP([ISDNNET], [ISDN4Linux], [isdnnet])
AST_EXT_LIB_SETUP([JACK], [Jack Audio Connection Kit], [jack])
AST_EXT_LIB_SETUP([LDAP], [OpenLDAP], [ldap])
+ AST_LIBCURL_CHECK_CONFIG([], [7.10.1])
+AST_EXT_LIB_SETUP([LIBEDIT], [NetBSD Editline library], [libedit])
AST_EXT_LIB_SETUP([LIBXML2], [LibXML2], [libxml2])
AST_EXT_LIB_SETUP([LTDL], [libtool], [ltdl])
AST_EXT_LIB_SETUP([LUA], [Lua], [lua])
-@@ -1748,6 +1749,27 @@ AC_SUBST(PBX_GTK2)
+@@ -1778,6 +1779,27 @@ AC_SUBST(PBX_GTK2)
AC_SUBST(GTK2_INCLUDE)
AC_SUBST(GTK2_LIB)
@@ -67,14 +67,14 @@ index d4a980d..a9f5646 100644
+AC_SUBST(LIBEDIT_LIB)
+AC_SUBST(LIBEDIT_OBJ)
+
- AST_LIBCURL_CHECK_CONFIG([], [7.10.1])
-
# build a GENERIC_ODBC result based on the presence of either UnixODBC (preferred)
+ # or iODBC
+
diff --git a/main/Makefile b/main/Makefile
-index 4b0de7e..8e43a0a 100644
+index 6e61808..ec2c2bc 100644
--- a/main/Makefile
+++ b/main/Makefile
-@@ -142,6 +142,8 @@ testexpr2: ast_expr2f.c ast_expr2.c ast_expr2.h
+@@ -145,6 +145,8 @@ testexpr2: ast_expr2f.c ast_expr2.c ast_expr2.h
$(CC) -g -o testexpr2 ast_expr2f.o ast_expr2.o -lm
rm ast_expr2.o ast_expr2f.o
@@ -83,7 +83,7 @@ index 4b0de7e..8e43a0a 100644
ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),)
http.o: _ASTCFLAGS+=$(GMIME_INCLUDE)
endif
-@@ -174,13 +176,13 @@ ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),)
+@@ -177,13 +179,13 @@ ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),)
GMIMELDFLAGS+=$(GMIME_LIB)
endif
@@ -101,7 +101,7 @@ index 4b0de7e..8e43a0a 100644
$(CMD_PREFIX) $(ASTTOPDIR)/build_tools/strip_nonapi $@ || rm $@
diff --git a/main/cli.c b/main/cli.c
-index e411c0d..2b6624f 100644
+index 8361e4e..4655ae3 100644
--- a/main/cli.c
+++ b/main/cli.c
@@ -36,6 +36,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
@@ -122,10 +122,10 @@ index e411c0d..2b6624f 100644
/*!
diff --git a/makeopts.in b/makeopts.in
-index a8adbad..c314b9f 100644
+index 8de43af..9b6f757 100644
--- a/makeopts.in
+++ b/makeopts.in
-@@ -265,3 +265,7 @@ TINFO_DIR=@TINFO_DIR@
+@@ -260,3 +260,7 @@ TINFO_DIR=@TINFO_DIR@
# if poll is not present, let the makefile know.
POLL_AVAILABLE=@HAS_POLL@
TIMERFD_INCLUDE=@TIMERFD_INCLUDE@
@@ -134,5 +134,5 @@ index a8adbad..c314b9f 100644
+LIBEDIT_LIB=@LIBEDIT_LIB@
+LIBEDIT_OBJ=@LIBEDIT_OBJ@
--
-1.6.6.1
+1.7.2
diff --git a/0006-Fix-history-loading-when-using-external-libedit.patch b/0004-Use-the-library-function-for-loading-command-history.patch
similarity index 76%
rename from 0006-Fix-history-loading-when-using-external-libedit.patch
rename to 0004-Use-the-library-function-for-loading-command-history.patch
index 71a8748..393ba4f 100644
--- a/0006-Fix-history-loading-when-using-external-libedit.patch
+++ b/0004-Use-the-library-function-for-loading-command-history.patch
@@ -1,18 +1,17 @@
-From 346965149827844aa5a5f06ab155787e54a70e30 Mon Sep 17 00:00:00 2001
+From 98d1fbfcafae782ac728c0e0445917aaf20f37e1 Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Mon, 8 Mar 2010 12:38:56 -0600
-Subject: [PATCH 2/2] Use the library function for loading command history rather than
- implementing our own.
+Subject: [PATCH 4/8] Use the library function for loading command history rather than implementing our own.
---
main/asterisk.c | 21 ++-------------------
1 files changed, 2 insertions(+), 19 deletions(-)
diff --git a/main/asterisk.c b/main/asterisk.c
-index e27f685..b8176c5 100644
+index 67dbfa8..4327d99 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
-@@ -2567,29 +2567,12 @@ static int ast_el_write_history(char *filename)
+@@ -2596,29 +2596,12 @@ static int ast_el_write_history(char *filename)
static int ast_el_read_history(char *filename)
{
@@ -45,5 +44,5 @@ index e27f685..b8176c5 100644
static void ast_remotecontrol(char *data)
--
-1.6.6.1
+1.7.2
diff --git a/0008-change-configure.ac-to-look-for-pkg-config-gmime-2.0.patch b/0005-Change-configure.ac-to-look-for-pkg-config-gmime-2.0.patch
similarity index 56%
rename from 0008-change-configure.ac-to-look-for-pkg-config-gmime-2.0.patch
rename to 0005-Change-configure.ac-to-look-for-pkg-config-gmime-2.0.patch
index 0fc0399..814add4 100644
--- a/0008-change-configure.ac-to-look-for-pkg-config-gmime-2.0.patch
+++ b/0005-Change-configure.ac-to-look-for-pkg-config-gmime-2.0.patch
@@ -1,8 +1,17 @@
-Index: configure.ac
-===================================================================
---- configure.ac (revision 221084)
-+++ configure.ac (working copy)
-@@ -1520,7 +1520,17 @@
+From e9e1c379941a4de1e0c1e63df81f44d9c0562ad9 Mon Sep 17 00:00:00 2001
+From: Jeffrey C. Ollie <jeff at ocjtech.us>
+Date: Wed, 28 Jul 2010 07:26:02 -0500
+Subject: [PATCH 5/8] Change configure.ac to look for pkg-config gmime-2.0
+
+---
+ configure.ac | 12 +++++++++++-
+ 1 files changed, 11 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 1b3f9c7..ce02844 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1631,7 +1631,17 @@ then
AST_CHECK_OSPTK([3], [5], [0])
fi
@@ -21,3 +30,6 @@ Index: configure.ac
AST_EXT_LIB_CHECK([HOARD], [hoard], [malloc], [])
+--
+1.7.2
+
diff --git a/0011-Fix-up-some-paths.patch b/0006-Fix-up-some-paths.patch
similarity index 80%
rename from 0011-Fix-up-some-paths.patch
rename to 0006-Fix-up-some-paths.patch
index 42bc19f..3c090bc 100644
--- a/0011-Fix-up-some-paths.patch
+++ b/0006-Fix-up-some-paths.patch
@@ -1,105 +1,283 @@
-Index: pbx/ael/ael-test/ref.ael-vtest13
-===================================================================
---- pbx/ael/ael-test/ref.ael-vtest13 (revision 221084)
-+++ pbx/ael/ael-test/ref.ael-vtest13 (working copy)
-@@ -2107,7 +2107,7 @@
+From 366115a2031ce0f388826216a8602e2fc2d47fcf Mon Sep 17 00:00:00 2001
+From: Jeffrey C. Ollie <jeff at ocjtech.us>
+Date: Wed, 28 Jul 2010 07:27:48 -0500
+Subject: [PATCH 6/8] Fix up some paths
+
+---
+ UPGRADE-1.4.txt | 2 +-
+ configs/festival.conf.sample | 2 +-
+ configs/http.conf.sample | 6 ++--
+ configs/iax.conf.sample | 4 +-
+ configs/musiconhold.conf.sample | 6 ++--
+ configs/osp.conf.sample | 4 +-
+ configs/phoneprov.conf.sample | 2 +-
+ contrib/scripts/astgenkey | 2 +-
+ contrib/scripts/astgenkey.8 | 6 ++--
+ doc/osp.txt | 8 +++---
+ doc/tex/asterisk-conf.tex | 4 +-
+ doc/tex/phoneprov.tex | 2 +-
+ doc/tex/privacy.tex | 6 ++--
+ pbx/ael/ael-test/ael-test3/extensions.ael | 28 +++++++++++++-------------
+ pbx/ael/ael-test/ael-vtest13/extensions.ael | 28 +++++++++++++-------------
+ pbx/ael/ael-test/ref.ael-vtest13 | 26 ++++++++++++------------
+ 16 files changed, 68 insertions(+), 68 deletions(-)
+
+diff --git a/UPGRADE-1.4.txt b/UPGRADE-1.4.txt
+index f99f937..981bca7 100644
+--- a/UPGRADE-1.4.txt
++++ b/UPGRADE-1.4.txt
+@@ -92,7 +92,7 @@ sound packages in the 'sounds' subdirectory to be used later during installation
+ WARNING: Asterisk 1.4 supports a new layout for sound files in multiple languages;
+ instead of the alternate-language files being stored in subdirectories underneath
+ the existing files (for French, that would be digits/fr, letters/fr, phonetic/fr,
+-etc.) the new layout creates one directory under /var/lib/asterisk/sounds for the
++etc.) the new layout creates one directory under /usr/share/asterisk/sounds for the
+ language itself, then places all the sound files for that language under that
+ directory and its subdirectories. This is the layout that will be created if you
+ select non-English languages to be installed via menuselect, HOWEVER Asterisk does
+diff --git a/configs/festival.conf.sample b/configs/festival.conf.sample
+index 774f1a1..815f11d 100644
+--- a/configs/festival.conf.sample
++++ b/configs/festival.conf.sample
+@@ -21,7 +21,7 @@
+ ; THIS DIRECTORY *MUST* EXIST and must be writable from the asterisk process.
+ ; Defaults to /tmp/
+ ;
+-;cachedir=/var/lib/asterisk/festivalcache/
++;cachedir=/var/spool/asterisk/festival/
+ ;
+ ; Festival command to send to the server.
+ ; Defaults to: (tts_textasterisk "%s" 'file)(quit)\n
+diff --git a/configs/http.conf.sample b/configs/http.conf.sample
+index f15c9cf..6349905 100644
+--- a/configs/http.conf.sample
++++ b/configs/http.conf.sample
+@@ -5,7 +5,7 @@
+ ; Note about Asterisk documentation:
+ ; If Asterisk was installed from a tarball, then the HTML documentation should
+ ; be installed in the static-http/docs directory which is
+-; (/var/lib/asterisk/static-http/docs) on linux by default. If the Asterisk
++; (/usr/share/asterisk/static-http/docs) on linux by default. If the Asterisk
+ ; HTTP server is enabled in this file by setting the "enabled", "bindaddr",
+ ; and "bindport" options, then you should be able to view the documentation
+ ; remotely by browsing to:
+@@ -66,6 +66,6 @@ bindaddr=127.0.0.1
+ ;[post_mappings]
+ ;
+ ; In this example, if the prefix option is set to "asterisk", then using the
+-; POST URL: /asterisk/uploads will put files in /var/lib/asterisk/uploads/.
+-;uploads = /var/lib/asterisk/uploads/
++; POST URL: /asterisk/uploads will put files in /var/spool/asterisk/uploads/.
++;uploads = /var/spool/asterisk/uploads/
+ ;
+diff --git a/configs/iax.conf.sample b/configs/iax.conf.sample
+index 76194fa..beb2bc5 100644
+--- a/configs/iax.conf.sample
++++ b/configs/iax.conf.sample
+@@ -443,8 +443,8 @@ inkeys=freeworlddialup
+ ; authentication is used, "inkeys" is a list of acceptable public keys on the
+ ; local system that can be used to authenticate the remote peer, separated by
+ ; the ":" character. "outkey" is a single, private key to use to authenticate
+-; to the other side. Public keys are named /var/lib/asterisk/keys/<name>.pub
+-; while private keys are named /var/lib/asterisk/keys/<name>.key. Private
++; to the other side. Public keys are named /usr/share/asterisk/keys/<name>.pub
++; while private keys are named /usr/share/asterisk/keys/<name>.key. Private
+ ; keys should always be 3DES encrypted.
+ ;
+ ;
+diff --git a/configs/musiconhold.conf.sample b/configs/musiconhold.conf.sample
+index 8ccc851..10c066e 100644
+--- a/configs/musiconhold.conf.sample
++++ b/configs/musiconhold.conf.sample
+@@ -32,7 +32,7 @@
+ ; The path specified can be either an absolute path (starts with '/'),
+ ; or a relative path; relative paths are interpreted as being relative
+ ; to the 'astvarlibdir' in asterisk.conf, which defaults to
+-; /var/lib/asterisk.
++; /usr/share/asterisk.
+ ;
+ ; NOTE:
+ ; If you are not using "autoload" in modules.conf, then you
+@@ -68,7 +68,7 @@ directory=moh
+ ;mode=custom
+ ; Note that with mode=custom, a directory is not required, such as when reading
+ ; from a stream.
+-;directory=/var/lib/asterisk/mohmp3
++;directory=/usr/share/asterisk/mohmp3
+ ;application=/usr/bin/mpg123 -q -r 8000 -f 8192 -b 2048 --mono -s
+ ;[ulawstream]
+@@ -80,5 +80,5 @@ directory=moh
+ ; choice
+ ;[solaris]
+ ;mode=custom
+-;directory=/var/lib/asterisk/mohmp3
++;directory=/usr/share/asterisk/mohmp3
+ ;application=/site/sw/bin/madplay -Q -o raw:- --mono -R 8000 -a -12
+diff --git a/configs/osp.conf.sample b/configs/osp.conf.sample
+index e342337..bab1b18 100644
+--- a/configs/osp.conf.sample
++++ b/configs/osp.conf.sample
+@@ -36,8 +36,8 @@
+ ;source=domain name or [IP address in brackets]
+ ;
+ ; Define path and file name of crypto files.
+-; The default path for crypto file is /var/lib/asterisk/keys. If no path is
+-; defined, crypto files will in /var/lib/asterisk/keys directory.
++; The default path for crypto file is /usr/share/asterisk/keys. If no path is
++; defined, crypto files will in /usr/share/asterisk/keys directory.
+ ;
+ ; Specify the private key file name.
+ ; If this parameter is unspecified or not present, the default name will be the
+diff --git a/configs/phoneprov.conf.sample b/configs/phoneprov.conf.sample
+index cb1acec..dba6b46 100644
+--- a/configs/phoneprov.conf.sample
++++ b/configs/phoneprov.conf.sample
+@@ -114,4 +114,4 @@ ${MAC}.cfg => 000000000000.cfg ; Dynamically generated files.
+ ${MAC}-phone.cfg => 000000000000-phone.cfg ; (relative to AST_DATA_DIR/phoneprov)
+ config/${MAC} => polycom.xml ; Dynamic Filename => template file
+ ${MAC}-directory.xml => 000000000000-directory.xml
+-setvar => CUSTOM_CONFIG=/var/lib/asterisk/phoneprov/configs/custom.cfg ; Custom variable
++setvar => CUSTOM_CONFIG=/usr/share/asterisk/phoneprov/configs/custom.cfg ; Custom variable
+diff --git a/contrib/scripts/astgenkey b/contrib/scripts/astgenkey
+index 6376048..e4a5a80 100644
+--- a/contrib/scripts/astgenkey
++++ b/contrib/scripts/astgenkey
+@@ -29,7 +29,7 @@ if [ "$QUIET" != 'y' ]; then
+ echo "in PEM format for use by Asterisk. You will be asked to"
+ echo "enter a passcode for your key multiple times. Please"
+ echo "enter the same code each time. The resulting files will"
+- echo "need to be moved to /var/lib/asterisk/keys if you want"
++ echo "need to be moved to /usr/share/asterisk/keys if you want"
+ echo "to use them, and any private keys (.key files) will"
+ echo "need to be initialized at runtime either by running"
+ echo "Asterisk with the '-i' option, or with the 'init keys'"
+diff --git a/contrib/scripts/astgenkey.8 b/contrib/scripts/astgenkey.8
+index 328a4d2..ac6feae 100644
+--- a/contrib/scripts/astgenkey.8
++++ b/contrib/scripts/astgenkey.8
+@@ -88,7 +88,7 @@ The private key: secret.
+ .RE
- [callerid-liar]
--exten => s,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/priv-callerintros/LIAR.gsm&)
-+exten => s,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/priv-callerintros/LIAR.gsm&)
- exten => s,2,Background(priv-liar)
- exten => s,3,Hangup()
- exten => s,4,Return()
-@@ -2142,7 +2142,7 @@
- exten => s,4,Zapateller(nocallerid)
- exten => s,5,PrivacyManager()
- exten => s,6,GotoIf($["${PRIVACYMGRSTATUS}" = "FAILED" ]?7:11)
--exten => s,7,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm)
-+exten => s,7,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/privmanfailed.gsm)
- exten => s,8,Gosub(std-priv-exten,s,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket))
- exten => s,9,Hangup()
- exten => s,10,Return()
-@@ -2168,7 +2168,7 @@
- exten => s,30,verbose(direct is XXX#${direct}XXXX)
- exten => s,31,Playback(greetings/direct)
- exten => s,32,Playback(/var/spool/asterisk/voicemail/default/${direct}/greet)
--exten => s,33,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
-+exten => s,33,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
- exten => s,34,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&)
- exten => s,35,Goto(sw-92-${direct},10)
- exten => s,36,NoOp(Finish switch-if-homeline-91-92)
-@@ -2247,7 +2247,7 @@
- exten => sw-92-2,11,Goto(s,loopback)
- exten => sw-92-1,10,Gosub(std-priv-exten,s,1(Zap/6r3&Sip/murf,1,25,mpA(beep)tw,telemarket,telemarket))
- exten => sw-92-1,11,Goto(s,loopback)
--exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
-+exten => 1,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
- exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/2/greet.wav&)
- exten => 1,3,Gosub(std-priv-exten,s,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket))
- exten => 1,4,Goto(s,loopback)
-@@ -2324,31 +2324,31 @@
+ Those files should be copied to
+-.I /var/lib/asterisk/keys
++.I /usr/share/asterisk/keys
- [homeline-kids]
- exten => s,1(begin),Background(murphy-homeline-kids)
--exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
-+exten => 1,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
- exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/3/greet.wav&)
- exten => 1,3,Gosub(std-priv-exten,s,1(IAX2/seaniax&Zap/5r2,3,35,mtw,telemarket,telemarket))
- exten => 1,4,Goto(homeline,s,loopback)
--exten => 2,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
-+exten => 2,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
- exten => 2,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&)
- exten => 2,3,Voicemail(u4)
- exten => 2,4,Goto(homeline,s,loopback)
--exten => 3,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
-+exten => 3,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
- exten => 3,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/5/greet.wav&)
- exten => 3,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,5,35,mtw,telemarket,telemarket))
- exten => 3,4,Goto(homeline,s,loopback)
--exten => 4,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
-+exten => 4,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
- exten => 4,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/6/greet.wav&)
- exten => 4,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,6,35,mtw,telemarket,telemarket))
- exten => 4,4,Goto(homeline,s,loopback)
--exten => 5,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
-+exten => 5,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
- exten => 5,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/7/greet.wav&)
- exten => 5,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,7,35,mtw,telemarket,telemarket))
- exten => 5,4,Goto(homeline,s,loopback)
--exten => 6,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
-+exten => 6,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
- exten => 6,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/8/greet.wav&)
- exten => 6,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,8,35,mtw,telemarket,telemarket))
- exten => 6,4,Goto(homeline,s,loopback)
--exten => 7,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
-+exten => 7,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
- exten => 7,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/9/greet.wav&)
- exten => 7,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,9,35,mtw,telemarket,telemarket))
- exten => 7,4,Goto(homeline,s,loopback)
-@@ -2376,7 +2376,7 @@
- exten => s,6,TrySystem(/usr/local/bin/who-is-it ${CALLERID(num)} "${CALLERID(name)}"&)
- exten => s,7(loopback),Background(greetings/greeting)
- exten => s,8,Background(murphy-office-intro1)
--exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
-+exten => 1,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
- exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/1/greet.wav&)
- exten => 1,3,Gosub(std-priv-exten,s,1(Zap/6&Sip/murf,1,30,mtw,telemarket,telemarket))
- exten => 1,4,Goto(s,loopback)
-@@ -2502,7 +2502,7 @@
- exten => 760,1,DateTime()
- exten => 760,2,Goto(s,loopback)
- exten => 761,1,Record(announcement:gsm)
--exten => 761,2,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/announcement.gsm&)
-+exten => 761,2,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/announcement.gsm&)
- exten => 761,3,Goto(s,loopback)
- exten => 762,1,agi(tts-riddle.agi)
- exten => 762,2,Background(gsm/what-time-it-is2)
-Index: pbx/ael/ael-test/ael-test3/extensions.ael
-===================================================================
---- pbx/ael/ael-test/ael-test3/extensions.ael (revision 221084)
-+++ pbx/ael/ael-test/ael-test3/extensions.ael (working copy)
-@@ -2049,7 +2049,7 @@
+ (The private key: on your system. The public key: on other systems)
+
+@@ -122,10 +122,10 @@ readable, such as with the following commands:
+ And then make the key accessible to Asterisk (assuming you run it as
+ user "asterisk").
+
+- chown asterisk /var/lib/asterisk/keys/yourname.*
++ chown asterisk /usr/share/asterisk/keys/yourname.*
+
+ .SH FILES
+-.I /var/lib/asterisk/keys
++.I /usr/share/asterisk/keys
+ .RS
+ .RE
+
+diff --git a/doc/osp.txt b/doc/osp.txt
+index a0cd429..c865cd2 100644
+--- a/doc/osp.txt
++++ b/doc/osp.txt
+@@ -136,7 +136,7 @@ make clean; make linux
+ Compilation is successful if there are no errors in the compiler output. The enroll program is now located in the OSP Toolkit/bin directory (example: /usr/src/ TK-3_3_6-20060303/bin).
+
+ 2.2 Obtain Crypto Files
+-The OSP module in Asterisk requires three crypto files containing a local certificate (localcert.pem), private key (pkey.pem), and CA certificate (cacert_0.pem). Asterisk will try to load the files from the Asterisk public/private key directory - /var/lib/asterisk/keys. If the files are not present, the OSP module will not start and the Asterisk will not support the OSP protocol. Use the enroll.sh script from the toolkit distribution to enroll Asterisk with an OSP server and obtain the crypto files. Documentation explaining how to use the enroll.sh script (Device Enrollment) to enroll with an OSP server is available at http://www.transnexus.com/OSP%20Toolkit/OSP%20Toolkit%20Documents/Device_Enrollment.pdf. Copy the files generated by the enrollment process to the Asterisk /var/lib/asterisk/keys directory.
++The OSP module in Asterisk requires three crypto files containing a local certificate (localcert.pem), private key (pkey.pem), and CA certificate (cacert_0.pem). Asterisk will try to load the files from the Asterisk public/private key directory - /usr/share/asterisk/keys. If the files are not present, the OSP module will not start and the Asterisk will not support the OSP protocol. Use the enroll.sh script from the toolkit distribution to enroll Asterisk with an OSP server and obtain the crypto files. Documentation explaining how to use the enroll.sh script (Device Enrollment) to enroll with an OSP server is available at http://www.transnexus.com/OSP%20Toolkit/OSP%20Toolkit%20Documents/Device_Enrollment.pdf. Copy the files generated by the enrollment process to the Asterisk /usr/share/asterisk/keys directory.
+
+ Note: The osptestserver.transnexus.com is configured only for sending and receiving non-SSL messages, and issuing signed tokens. If you need help, post a message on the OSP mailing list at https://lists.sourceforge.net/lists/listinfo/osp-toolkit-client..
+
+@@ -183,7 +183,7 @@ depth=0 /CN=osptestserver.transnexus.com/O=OSPServer
+ verify return:1
+ The certificate request was successful.
+ Error Code returned from localcert command : 0
+-The files generated should be copied to the /var/lib/asterisk/keys directory.
++The files generated should be copied to the /usr/share/asterisk/keys directory.
+ Note: The script enroll.sh requires AT&T korn shell (ksh) or any of its compatible variants. The /usr/src/TK-3_3_6-20060303/bin directory should be in the PATH variable. Otherwise, enroll.sh cannot find the enroll file.
+
+ 3 Asterisk
+@@ -247,9 +247,9 @@ servicepoint=http://OSP server IP:1080/osp
+ source=[host IP]
+ ;
+ ; Define path and file name of crypto files.
+-; The default path for crypto file is /var/lib/asterisk/keys. If no
++; The default path for crypto file is /usr/share/asterisk/keys. If no
+ ; path is defined, crypto files should be in
+-; /var/lib/asterisk/keys directory.
++; /usr/share/asterisk/keys directory.
+ ;
+ ; Specify the private key file name.
+ ; If this parameter is unspecified or not present, the default name
+diff --git a/doc/tex/asterisk-conf.tex b/doc/tex/asterisk-conf.tex
+index 4b08023..3e35f92 100644
+--- a/doc/tex/asterisk-conf.tex
++++ b/doc/tex/asterisk-conf.tex
+@@ -18,10 +18,10 @@ astetcdir => /etc/asterisk
+ astmoddir => /usr/lib/asterisk/modules
+
+ ; Where additional 'library' elements (scripts, etc.) are located
+-astvarlibdir => /var/lib/asterisk
++astvarlibdir => /usr/share/asterisk
+
+ ; Where AGI scripts/programs are located
+-astagidir => /var/lib/asterisk/agi-bin
++astagidir => /usr/share/asterisk/agi-bin
+
+ ; Where spool directories are located
+ ; Voicemail, monitor, dictation and other apps will create files here
+diff --git a/doc/tex/phoneprov.tex b/doc/tex/phoneprov.tex
+index 790c1d7..b30b5c5 100644
+--- a/doc/tex/phoneprov.tex
++++ b/doc/tex/phoneprov.tex
+@@ -58,7 +58,7 @@ files, respectively. A sample profile:
+ [polycom]
+ staticdir => configs/
+ mime_type => text/xml
+-setvar => CUSTOM_CONFIG=/var/lib/asterisk/phoneprov/configs/custom.cfg
++setvar => CUSTOM_CONFIG=/usr/share/asterisk/phoneprov/configs/custom.cfg
+ static_file => bootrom.ld,application/octet-stream
+ static_file => bootrom.ver,plain/text
+ static_file => sip.ld,application/octet-stream
+diff --git a/doc/tex/privacy.tex b/doc/tex/privacy.tex
+index a4ae7b9..bad6815 100644
+--- a/doc/tex/privacy.tex
++++ b/doc/tex/privacy.tex
+@@ -210,7 +210,7 @@ helpful.
+
+ When there is no CallerID, P and p options will always record an intro
+ for the incoming caller. This intro will be stored temporarily in the
+-\path{/var/lib/asterisk/sounds/priv-callerintros} dir, under the name
++\path{/usr/share/asterisk/sounds/priv-callerintros} dir, under the name
+ NOCALLERID\_$<$extension$>$ $<$channelname$>$ and will be erased after the
+ callee decides what to do with the call.
+
+@@ -245,7 +245,7 @@ introductions are stored and re-used for the convenience of the CALLER.
+ \subsubsection{Introductions}
+ Unless instructed to not save introductions (see the 'n' option above),
+ the screening modes will save the recordings of the caller's names in
+-the directory \path{/var/lib/asterisk/sounds/priv-callerintros}, if they have
++the directory \path{/usr/share/asterisk/sounds/priv-callerintros}, if they have
+ a CallerID. Just the 10-digit callerid numbers are used as filenames,
+ with a ".gsm" at the end.
+
+@@ -260,7 +260,7 @@ loudspeakers, and perhaps other nifty things. For instance:
+
+ \begin{astlisting}
+ \begin{verbatim}
+-exten => s,6,Set(PATH=/var/lib/asterisk/sounds/priv-callerintros)
++exten => s,6,Set(PATH=/usr/share/asterisk/sounds/priv-callerintros)
+ exten => s,7,System(/usr/bin/play ${PATH}/${CALLERID(num)}.gsm&,0)
+ \end{verbatim}
+ \end{astlisting}
+diff --git a/pbx/ael/ael-test/ael-test3/extensions.ael b/pbx/ael/ael-test/ael-test3/extensions.ael
+index ff1f6ae..53fb918 100755
+--- a/pbx/ael/ael-test/ael-test3/extensions.ael
++++ b/pbx/ael/ael-test/ael-test3/extensions.ael
+@@ -2049,7 +2049,7 @@ macro ciddial2(dialnum, lookup, waittime, dialopts, ddev) // give priority to tc
macro callerid-liar()
{
@@ -108,7 +286,7 @@ Index: pbx/ael/ael-test/ael-test3/extensions.ael
Background(priv-liar); // Script: OOOps! Sorry! I don't allow men with ski masks pulled over their
// faces to get in the front door, and unidentified callers won't fair
// any better. You entered *MY* phone number. That won't work.
-@@ -2106,7 +2106,7 @@
+@@ -2106,7 +2106,7 @@ context homeline {
PrivacyManager();
if( "${PRIVACYMGRSTATUS}" = "FAILED" )
{
@@ -117,7 +295,7 @@ Index: pbx/ael/ael-test/ael-test3/extensions.ael
&std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
Hangup();
return;
-@@ -2138,7 +2138,7 @@
+@@ -2138,7 +2138,7 @@ context homeline {
verbose(direct is XXX#${direct}XXXX);
Playback(greetings/direct); // Welcome to the Murphy residence. This system will automatically try to connect you to...
Playback(/var/spool/asterisk/voicemail/default/${direct}/greet);
@@ -126,7 +304,7 @@ Index: pbx/ael/ael-test/ael-test3/extensions.ael
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&);
switch(${direct})
{
-@@ -2223,7 +2223,7 @@
+@@ -2223,7 +2223,7 @@ context homeline {
}
1 => { // Sonya
@@ -135,7 +313,7 @@ Index: pbx/ael/ael-test/ael-test3/extensions.ael
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/2/greet.wav&);
&std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
goto s|loopback;
-@@ -2421,51 +2421,51 @@
+@@ -2421,51 +2421,51 @@ context homeline-kids {
Background(murphy-homeline-kids); // Which Kid? 1=Sean, 2:Eric, 3:Ryan, 4:Kyle, 5:Amber, 6:Alex, 7:Neal
}
1 => { // SEAN
@@ -195,7 +373,7 @@ Index: pbx/ael/ael-test/ael-test3/extensions.ael
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/9/greet.wav&);
&std-priv-exten(Zap/3r2&Zap/5r2,9,35,mtw,telemarket,telemarket);
goto homeline|s|loopback;
-@@ -2517,7 +2517,7 @@
+@@ -2517,7 +2517,7 @@ context workline {
// Otherwise, dial 1, and hopefully, you will reach Steve.
}
1 => {
@@ -204,7 +382,7 @@ Index: pbx/ael/ael-test/ael-test3/extensions.ael
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/1/greet.wav&);
&std-priv-exten(Zap/6&Sip/murf,1,30,mtw,telemarket,telemarket);
-@@ -2778,7 +2778,7 @@
+@@ -2778,7 +2778,7 @@ context homeext {
}
761 => {
Record(announcement:gsm);
@@ -213,11 +391,11 @@ Index: pbx/ael/ael-test/ael-test3/extensions.ael
goto s|loopback;
}
762 => {
-Index: pbx/ael/ael-test/ael-vtest13/extensions.ael
-===================================================================
---- pbx/ael/ael-test/ael-vtest13/extensions.ael (revision 221084)
-+++ pbx/ael/ael-test/ael-vtest13/extensions.ael (working copy)
-@@ -2048,7 +2048,7 @@
+diff --git a/pbx/ael/ael-test/ael-vtest13/extensions.ael b/pbx/ael/ael-test/ael-vtest13/extensions.ael
+index b7e953e..48baaef 100755
+--- a/pbx/ael/ael-test/ael-vtest13/extensions.ael
++++ b/pbx/ael/ael-test/ael-vtest13/extensions.ael
+@@ -2048,7 +2048,7 @@ macro ciddial2(dialnum, lookup, waittime, dialopts, ddev) // give priority to tc
macro callerid-liar()
{
@@ -226,7 +404,7 @@ Index: pbx/ael/ael-test/ael-vtest13/extensions.ael
Background(priv-liar); // Script: OOOps! Sorry! I don't allow men with ski masks pulled over their
// faces to get in the front door, and unidentified callers won't fair
// any better. You entered *MY* phone number. That won't work.
-@@ -2105,7 +2105,7 @@
+@@ -2105,7 +2105,7 @@ context homeline {
PrivacyManager();
if( "${PRIVACYMGRSTATUS}" = "FAILED" )
{
@@ -235,7 +413,7 @@ Index: pbx/ael/ael-test/ael-vtest13/extensions.ael
&std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
Hangup();
return;
-@@ -2137,7 +2137,7 @@
+@@ -2137,7 +2137,7 @@ context homeline {
verbose(direct is XXX#${direct}XXXX);
Playback(greetings/direct); // Welcome to the Murphy residence. This system will automatically try to connect you to...
Playback(/var/spool/asterisk/voicemail/default/${direct}/greet);
@@ -244,7 +422,7 @@ Index: pbx/ael/ael-test/ael-vtest13/extensions.ael
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&);
switch(${direct})
{
-@@ -2222,7 +2222,7 @@
+@@ -2222,7 +2222,7 @@ context homeline {
}
1 => { // Sonya
@@ -253,7 +431,7 @@ Index: pbx/ael/ael-test/ael-vtest13/extensions.ael
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/2/greet.wav&);
&std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
goto s|loopback;
-@@ -2420,51 +2420,51 @@
+@@ -2420,51 +2420,51 @@ context homeline-kids {
Background(murphy-homeline-kids); // Which Kid? 1=Sean, 2:Eric, 3:Ryan, 4:Kyle, 5:Amber, 6:Alex, 7:Neal
}
1 => { // SEAN
@@ -313,7 +491,7 @@ Index: pbx/ael/ael-test/ael-vtest13/extensions.ael
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/9/greet.wav&);
&std-priv-exten(Zap/3r2&Zap/5r2,9,35,mtw,telemarket,telemarket);
goto homeline|s|loopback;
-@@ -2516,7 +2516,7 @@
+@@ -2516,7 +2516,7 @@ context workline {
// Otherwise, dial 1, and hopefully, you will reach Steve.
}
1 => {
@@ -322,7 +500,7 @@ Index: pbx/ael/ael-test/ael-vtest13/extensions.ael
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/1/greet.wav&);
&std-priv-exten(Zap/6&Sip/murf,1,30,mtw,telemarket,telemarket);
-@@ -2777,7 +2777,7 @@
+@@ -2777,7 +2777,7 @@ context homeext {
}
761 => {
Record(announcement:gsm);
@@ -331,254 +509,103 @@ Index: pbx/ael/ael-test/ael-vtest13/extensions.ael
goto s|loopback;
}
762 => {
-Index: doc/osp.txt
-===================================================================
---- doc/osp.txt (revision 221084)
-+++ doc/osp.txt (working copy)
-@@ -136,7 +136,7 @@
- Compilation is successful if there are no errors in the compiler output. The enroll program is now located in the OSP Toolkit/bin directory (example: /usr/src/ TK-3_3_6-20060303/bin).
+diff --git a/pbx/ael/ael-test/ref.ael-vtest13 b/pbx/ael/ael-test/ref.ael-vtest13
+index 07ae29e..70956d4 100644
+--- a/pbx/ael/ael-test/ref.ael-vtest13
++++ b/pbx/ael/ael-test/ref.ael-vtest13
+@@ -2107,7 +2107,7 @@ exten => s,20,Return()
- 2.2 Obtain Crypto Files
--The OSP module in Asterisk requires three crypto files containing a local certificate (localcert.pem), private key (pkey.pem), and CA certificate (cacert_0.pem). Asterisk will try to load the files from the Asterisk public/private key directory - /var/lib/asterisk/keys. If the files are not present, the OSP module will not start and the Asterisk will not support the OSP protocol. Use the enroll.sh script from the toolkit distribution to enroll Asterisk with an OSP server and obtain the crypto files. Documentation explaining how to use the enroll.sh script (Device Enrollment) to enroll with an OSP server is available at http://www.transnexus.com/OSP%20Toolkit/OSP%20Toolkit%20Documents/Device_Enrollment.pdf. Copy the files generated by the enrollment process to the Asterisk /var/lib/asterisk/keys directory.
-+The OSP module in Asterisk requires three crypto files containing a local certificate (localcert.pem), private key (pkey.pem), and CA certificate (cacert_0.pem). Asterisk will try to load the files from the Asterisk public/private key directory - /usr/share/asterisk/keys. If the files are not present, the OSP module will not start and the Asterisk will not support the OSP protocol. Use the enroll.sh script from the toolkit distribution to enroll Asterisk with an OSP server and obtain the crypto files. Documentation explaining how to use the enroll.sh script (Device Enrollment) to enroll with an OSP server is available at http://www.transnexus.com/OSP%20Toolkit/OSP%20Toolkit%20Documents/Device_Enrollment.pdf. Copy the files generated by the enrollment process to the Asterisk /usr/share/asterisk/keys directory.
-
- Note: The osptestserver.transnexus.com is configured only for sending and receiving non-SSL messages, and issuing signed tokens. If you need help, post a message on the OSP mailing list at https://lists.sourceforge.net/lists/listinfo/osp-toolkit-client..
-
-@@ -183,7 +183,7 @@
- verify return:1
- The certificate request was successful.
- Error Code returned from localcert command : 0
--The files generated should be copied to the /var/lib/asterisk/keys directory.
-+The files generated should be copied to the /usr/share/asterisk/keys directory.
- Note: The script enroll.sh requires AT&T korn shell (ksh) or any of its compatible variants. The /usr/src/TK-3_3_6-20060303/bin directory should be in the PATH variable. Otherwise, enroll.sh cannot find the enroll file.
-
- 3 Asterisk
-@@ -247,9 +247,9 @@
- source=[host IP]
- ;
- ; Define path and file name of crypto files.
--; The default path for crypto file is /var/lib/asterisk/keys. If no
-+; The default path for crypto file is /usr/share/asterisk/keys. If no
- ; path is defined, crypto files should be in
--; /var/lib/asterisk/keys directory.
-+; /usr/share/asterisk/keys directory.
- ;
- ; Specify the private key file name.
- ; If this parameter is unspecified or not present, the default name
-Index: doc/tex/phoneprov.tex
-===================================================================
---- doc/tex/phoneprov.tex (revision 221084)
-+++ doc/tex/phoneprov.tex (working copy)
-@@ -58,7 +58,7 @@
- [polycom]
- staticdir => configs/
- mime_type => text/xml
--setvar => CUSTOM_CONFIG=/var/lib/asterisk/phoneprov/configs/custom.cfg
-+setvar => CUSTOM_CONFIG=/usr/share/asterisk/phoneprov/configs/custom.cfg
- static_file => bootrom.ld,application/octet-stream
- static_file => bootrom.ver,plain/text
- static_file => sip.ld,application/octet-stream
-Index: doc/tex/asterisk-conf.tex
-===================================================================
---- doc/tex/asterisk-conf.tex (revision 221084)
-+++ doc/tex/asterisk-conf.tex (working copy)
-@@ -18,10 +18,10 @@
- astmoddir => /usr/lib/asterisk/modules
-
- ; Where additional 'library' elements (scripts, etc.) are located
--astvarlibdir => /var/lib/asterisk
-+astvarlibdir => /usr/share/asterisk
-
- ; Where AGI scripts/programs are located
--astagidir => /var/lib/asterisk/agi-bin
-+astagidir => /usr/share/asterisk/agi-bin
-
- ; Where spool directories are located
- ; Voicemail, monitor, dictation and other apps will create files here
-Index: doc/tex/privacy.tex
-===================================================================
---- doc/tex/privacy.tex (revision 221084)
-+++ doc/tex/privacy.tex (working copy)
-@@ -210,7 +210,7 @@
-
- When there is no CallerID, P and p options will always record an intro
- for the incoming caller. This intro will be stored temporarily in the
--\path{/var/lib/asterisk/sounds/priv-callerintros} dir, under the name
-+\path{/usr/share/asterisk/sounds/priv-callerintros} dir, under the name
- NOCALLERID\_$<$extension$>$ $<$channelname$>$ and will be erased after the
- callee decides what to do with the call.
-
-@@ -245,7 +245,7 @@
- \subsubsection{Introductions}
- Unless instructed to not save introductions (see the 'n' option above),
- the screening modes will save the recordings of the caller's names in
--the directory \path{/var/lib/asterisk/sounds/priv-callerintros}, if they have
-+the directory \path{/usr/share/asterisk/sounds/priv-callerintros}, if they have
- a CallerID. Just the 10-digit callerid numbers are used as filenames,
- with a ".gsm" at the end.
-
-@@ -260,7 +260,7 @@
-
- \begin{astlisting}
- \begin{verbatim}
--exten => s,6,Set(PATH=/var/lib/asterisk/sounds/priv-callerintros)
-+exten => s,6,Set(PATH=/usr/share/asterisk/sounds/priv-callerintros)
- exten => s,7,System(/usr/bin/play ${PATH}/${CALLERID(num)}.gsm&,0)
- \end{verbatim}
- \end{astlisting}
-Index: configs/iax.conf.sample
-===================================================================
---- configs/iax.conf.sample (revision 221084)
-+++ configs/iax.conf.sample (working copy)
-@@ -416,8 +416,8 @@
- ; authentication is used, "inkeys" is a list of acceptable public keys on the
- ; local system that can be used to authenticate the remote peer, separated by
- ; the ":" character. "outkey" is a single, private key to use to authenticate
--; to the other side. Public keys are named /var/lib/asterisk/keys/<name>.pub
--; while private keys are named /var/lib/asterisk/keys/<name>.key. Private
-+; to the other side. Public keys are named /usr/share/asterisk/keys/<name>.pub
-+; while private keys are named /usr/share/asterisk/keys/<name>.key. Private
- ; keys should always be 3DES encrypted.
- ;
- ;
-Index: configs/festival.conf.sample
-===================================================================
---- configs/festival.conf.sample (revision 221084)
-+++ configs/festival.conf.sample (working copy)
-@@ -21,7 +21,7 @@
- ; THIS DIRECTORY *MUST* EXIST and must be writable from the asterisk process.
- ; Defaults to /tmp/
- ;
--;cachedir=/var/lib/asterisk/festivalcache/
-+;cachedir=/var/spool/asterisk/festival/
- ;
- ; Festival command to send to the server.
- ; Defaults to: (tts_textasterisk "%s" 'file)(quit)\n
-Index: configs/http.conf.sample
-===================================================================
---- configs/http.conf.sample (revision 221084)
-+++ configs/http.conf.sample (working copy)
-@@ -5,7 +5,7 @@
- ; Note about Asterisk documentation:
- ; If Asterisk was installed from a tarball, then the HTML documentation should
- ; be installed in the static-http/docs directory which is
--; (/var/lib/asterisk/static-http/docs) on linux by default. If the Asterisk
-+; (/usr/share/asterisk/static-http/docs) on linux by default. If the Asterisk
- ; HTTP server is enabled in this file by setting the "enabled", "bindaddr",
- ; and "bindport" options, then you should be able to view the documentation
- ; remotely by browsing to:
-@@ -66,6 +66,6 @@
- ;[post_mappings]
- ;
- ; In this example, if the prefix option is set to "asterisk", then using the
--; POST URL: /asterisk/uploads will put files in /var/lib/asterisk/uploads/.
--;uploads = /var/lib/asterisk/uploads/
-+; POST URL: /asterisk/uploads will put files in /var/spool/asterisk/uploads/.
-+;uploads = /var/spool/asterisk/uploads/
- ;
-Index: configs/phoneprov.conf.sample
-===================================================================
---- configs/phoneprov.conf.sample (revision 221084)
-+++ configs/phoneprov.conf.sample (working copy)
-@@ -114,4 +114,4 @@
- ${MAC}-phone.cfg => 000000000000-phone.cfg ; (relative to AST_DATA_DIR/phoneprov)
- config/${MAC} => polycom.xml ; Dynamic Filename => template file
- ${MAC}-directory.xml => 000000000000-directory.xml
--setvar => CUSTOM_CONFIG=/var/lib/asterisk/phoneprov/configs/custom.cfg ; Custom variable
-+setvar => CUSTOM_CONFIG=/usr/share/asterisk/phoneprov/configs/custom.cfg ; Custom variable
-Index: configs/musiconhold.conf.sample
-===================================================================
---- configs/musiconhold.conf.sample (revision 221084)
-+++ configs/musiconhold.conf.sample (working copy)
-@@ -32,7 +32,7 @@
- ; The path specified can be either an absolute path (starts with '/'),
- ; or a relative path; relative paths are interpreted as being relative
- ; to the 'astvarlibdir' in asterisk.conf, which defaults to
--; /var/lib/asterisk.
-+; /usr/share/asterisk.
- ;
- ; NOTE:
- ; If you are not using "autoload" in modules.conf, then you
-@@ -68,7 +68,7 @@
- ;mode=custom
- ; Note that with mode=custom, a directory is not required, such as when reading
- ; from a stream.
--;directory=/var/lib/asterisk/mohmp3
-+;directory=/usr/share/asterisk/mohmp3
- ;application=/usr/bin/mpg123 -q -r 8000 -f 8192 -b 2048 --mono -s
- ;[ulawstream]
-@@ -80,5 +80,5 @@
- ; choice
- ;[solaris]
- ;mode=custom
--;directory=/var/lib/asterisk/mohmp3
-+;directory=/usr/share/asterisk/mohmp3
- ;application=/site/sw/bin/madplay -Q -o raw:- --mono -R 8000 -a -12
-Index: configs/osp.conf.sample
-===================================================================
---- configs/osp.conf.sample (revision 221084)
-+++ configs/osp.conf.sample (working copy)
-@@ -36,8 +36,8 @@
- ;source=domain name or [IP address in brackets]
- ;
- ; Define path and file name of crypto files.
--; The default path for crypto file is /var/lib/asterisk/keys. If no path is
--; defined, crypto files will in /var/lib/asterisk/keys directory.
-+; The default path for crypto file is /usr/share/asterisk/keys. If no path is
-+; defined, crypto files will in /usr/share/asterisk/keys directory.
- ;
- ; Specify the private key file name.
- ; If this parameter is unspecified or not present, the default name will be the
-Index: contrib/scripts/astgenkey.8
-===================================================================
---- contrib/scripts/astgenkey.8 (revision 221084)
-+++ contrib/scripts/astgenkey.8 (working copy)
-@@ -88,7 +88,7 @@
- .RE
-
- Those files should be copied to
--.I /var/lib/asterisk/keys
-+.I /usr/share/asterisk/keys
-
- (The private key: on your system. The public key: on other systems)
-
-@@ -122,10 +122,10 @@
- And then make the key accessible to Asterisk (assuming you run it as
- user "asterisk").
-
-- chown asterisk /var/lib/asterisk/keys/yourname.*
-+ chown asterisk /usr/share/asterisk/keys/yourname.*
-
- .SH FILES
--.I /var/lib/asterisk/keys
-+.I /usr/share/asterisk/keys
- .RS
- .RE
+ [callerid-liar]
+-exten => s,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/priv-callerintros/LIAR.gsm&)
++exten => s,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/priv-callerintros/LIAR.gsm&)
+ exten => s,2,Background(priv-liar)
+ exten => s,3,Hangup()
+ exten => s,4,Return()
+@@ -2142,7 +2142,7 @@ exten => s,3,Set(repeatcount=0)
+ exten => s,4,Zapateller(nocallerid)
+ exten => s,5,PrivacyManager()
+ exten => s,6,GotoIf($["${PRIVACYMGRSTATUS}" = "FAILED" ]?7:11)
+-exten => s,7,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm)
++exten => s,7,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/privmanfailed.gsm)
+ exten => s,8,Gosub(std-priv-exten,s,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket))
+ exten => s,9,Hangup()
+ exten => s,10,Return()
+@@ -2168,7 +2168,7 @@ exten => s,29,GotoIf($["${direct}" != "" & ${direct} != 0 ]?30:37)
+ exten => s,30,verbose(direct is XXX#${direct}XXXX)
+ exten => s,31,Playback(greetings/direct)
+ exten => s,32,Playback(/var/spool/asterisk/voicemail/default/${direct}/greet)
+-exten => s,33,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
++exten => s,33,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
+ exten => s,34,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&)
+ exten => s,35,Goto(sw-92-${direct},10)
+ exten => s,36,NoOp(Finish switch-if-homeline-91-92)
+@@ -2247,7 +2247,7 @@ exten => sw-92-2,10,Gosub(std-priv-exten,s,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket
+ exten => sw-92-2,11,Goto(s,loopback)
+ exten => sw-92-1,10,Gosub(std-priv-exten,s,1(Zap/6r3&Sip/murf,1,25,mpA(beep)tw,telemarket,telemarket))
+ exten => sw-92-1,11,Goto(s,loopback)
+-exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
++exten => 1,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
+ exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/2/greet.wav&)
+ exten => 1,3,Gosub(std-priv-exten,s,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket))
+ exten => 1,4,Goto(s,loopback)
+@@ -2324,31 +2324,31 @@ exten => o,1,Goto(s,begin)
-Index: contrib/scripts/astgenkey
-===================================================================
---- contrib/scripts/astgenkey (revision 221084)
-+++ contrib/scripts/astgenkey (working copy)
-@@ -29,7 +29,7 @@
- echo "in PEM format for use by Asterisk. You will be asked to"
- echo "enter a passcode for your key multiple times. Please"
- echo "enter the same code each time. The resulting files will"
-- echo "need to be moved to /var/lib/asterisk/keys if you want"
-+ echo "need to be moved to /usr/share/asterisk/keys if you want"
- echo "to use them, and any private keys (.key files) will"
- echo "need to be initialized at runtime either by running"
- echo "Asterisk with the '-i' option, or with the 'init keys'"
-Index: UPGRADE-1.4.txt
-===================================================================
---- UPGRADE-1.4.txt (revision 221084)
-+++ UPGRADE-1.4.txt (working copy)
-@@ -92,7 +92,7 @@
- WARNING: Asterisk 1.4 supports a new layout for sound files in multiple languages;
- instead of the alternate-language files being stored in subdirectories underneath
- the existing files (for French, that would be digits/fr, letters/fr, phonetic/fr,
--etc.) the new layout creates one directory under /var/lib/asterisk/sounds for the
-+etc.) the new layout creates one directory under /usr/share/asterisk/sounds for the
- language itself, then places all the sound files for that language under that
- directory and its subdirectories. This is the layout that will be created if you
- select non-English languages to be installed via menuselect, HOWEVER Asterisk does
+ [homeline-kids]
+ exten => s,1(begin),Background(murphy-homeline-kids)
+-exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
++exten => 1,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
+ exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/3/greet.wav&)
+ exten => 1,3,Gosub(std-priv-exten,s,1(IAX2/seaniax&Zap/5r2,3,35,mtw,telemarket,telemarket))
+ exten => 1,4,Goto(homeline,s,loopback)
+-exten => 2,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
++exten => 2,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
+ exten => 2,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&)
+ exten => 2,3,Voicemail(u4)
+ exten => 2,4,Goto(homeline,s,loopback)
+-exten => 3,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
++exten => 3,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
+ exten => 3,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/5/greet.wav&)
+ exten => 3,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,5,35,mtw,telemarket,telemarket))
+ exten => 3,4,Goto(homeline,s,loopback)
+-exten => 4,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
++exten => 4,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
+ exten => 4,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/6/greet.wav&)
+ exten => 4,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,6,35,mtw,telemarket,telemarket))
+ exten => 4,4,Goto(homeline,s,loopback)
+-exten => 5,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
++exten => 5,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
+ exten => 5,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/7/greet.wav&)
+ exten => 5,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,7,35,mtw,telemarket,telemarket))
+ exten => 5,4,Goto(homeline,s,loopback)
+-exten => 6,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
++exten => 6,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
+ exten => 6,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/8/greet.wav&)
+ exten => 6,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,8,35,mtw,telemarket,telemarket))
+ exten => 6,4,Goto(homeline,s,loopback)
+-exten => 7,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
++exten => 7,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
+ exten => 7,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/9/greet.wav&)
+ exten => 7,3,Gosub(std-priv-exten,s,1(Zap/3r2&Zap/5r2,9,35,mtw,telemarket,telemarket))
+ exten => 7,4,Goto(homeline,s,loopback)
+@@ -2376,7 +2376,7 @@ exten => s,5,Gosub(fillcidname,s,1)
+ exten => s,6,TrySystem(/usr/local/bin/who-is-it ${CALLERID(num)} "${CALLERID(name)}"&)
+ exten => s,7(loopback),Background(greetings/greeting)
+ exten => s,8,Background(murphy-office-intro1)
+-exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
++exten => 1,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
+ exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/1/greet.wav&)
+ exten => 1,3,Gosub(std-priv-exten,s,1(Zap/6&Sip/murf,1,30,mtw,telemarket,telemarket))
+ exten => 1,4,Goto(s,loopback)
+@@ -2502,7 +2502,7 @@ exten => 6,1,Background(recording)
+ exten => 760,1,DateTime()
+ exten => 760,2,Goto(s,loopback)
+ exten => 761,1,Record(announcement:gsm)
+-exten => 761,2,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/announcement.gsm&)
++exten => 761,2,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/announcement.gsm&)
+ exten => 761,3,Goto(s,loopback)
+ exten => 762,1,agi(tts-riddle.agi)
+ exten => 762,2,Background(gsm/what-time-it-is2)
+--
+1.7.2
+
diff --git a/0012-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch b/0007-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch
similarity index 95%
rename from 0012-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch
rename to 0007-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch
index 9cca6c1..6248c9d 100644
--- a/0012-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch
+++ b/0007-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch
@@ -1,7 +1,7 @@
-From e60e1cdc9a967778a007acfefa80184125b58d0c Mon Sep 17 00:00:00 2001
+From 88a8723215b9c27ece6c18d7ef6019a50b0178af Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Sun, 4 Jan 2009 19:22:39 -0600
-Subject: [PATCH 12/15] Add LDAP schema that is compatible with Fedora Directory Server.
+Subject: [PATCH 7/8] Add LDAP schema that is compatible with Fedora Directory Server.
---
contrib/scripts/99asterisk.ldif | 489 +++++++++++++++++++++++++++++++++++++++
@@ -10,14 +10,14 @@ Subject: [PATCH 12/15] Add LDAP schema that is compatible with Fedora Directory
diff --git a/contrib/scripts/99asterisk.ldif b/contrib/scripts/99asterisk.ldif
new file mode 100644
-index 0000000..ef878a8
+index 0000000..f3bdf4e
--- /dev/null
+++ b/contrib/scripts/99asterisk.ldif
@@ -0,0 +1,489 @@
+dn: cn=schema
+#
+attributeTypes: (
-+
++
+ NAME 'AstContext'
+ DESC 'Asterisk Context'
+ EQUALITY caseIgnoreMatch
@@ -26,7 +26,7 @@ index 0000000..ef878a8
+ )
+#
+attributeTypes: (
-+
++
+ NAME 'AstExtension'
+ DESC 'Asterisk Extension'
+ EQUALITY caseIgnoreMatch
@@ -35,7 +35,7 @@ index 0000000..ef878a8
+ )
+#
+attributeTypes: (
-+
++
+ NAME 'AstPriority'
+ DESC 'Asterisk Priority'
+ EQUALITY caseIgnoreMatch
@@ -44,7 +44,7 @@ index 0000000..ef878a8
+ )
+#
+attributeTypes: (
-+
++
+ NAME 'AstApplication'
+ DESC 'Asterisk Application'
+ EQUALITY caseIgnoreMatch
@@ -53,7 +53,7 @@ index 0000000..ef878a8
+ )
+#
+attributeTypes: (
-+
++
+ NAME 'AstApplicationData'
+ DESC 'Asterisk Application Data'
+ EQUALITY caseIgnoreMatch
@@ -62,7 +62,7 @@ index 0000000..ef878a8
+ )
+#
+attributeTypes: (
-+
++
+ NAME 'AstAccountAMAFlags'
+ DESC 'Asterisk Account AMA Flags'
+ EQUALITY caseIgnoreMatch
@@ -71,7 +71,7 @@ index 0000000..ef878a8
+ )
+#
+attributeTypes: (
-+
++
+ NAME 'AstAccountCallerID'
+ DESC 'Asterisk Account CallerID'
+ EQUALITY caseIgnoreMatch
@@ -80,7 +80,7 @@ index 0000000..ef878a8
+ )
+#
+attributeTypes: (
-+
++
+ NAME 'AstAccountContext'
+ DESC 'Asterisk Account Context'
+ EQUALITY caseIgnoreMatch
@@ -89,7 +89,7 @@ index 0000000..ef878a8
+ )
+#
+attributeTypes: (
-+
++
+ NAME 'AstAccountMailbox'
+ DESC 'Asterisk Account Mailbox'
+ EQUALITY caseIgnoreMatch
@@ -98,7 +98,7 @@ index 0000000..ef878a8
+ )
+#
+attributeTypes: (
-+
++
+ NAME 'AstMD5secret'
+ DESC 'Asterisk Account MD5 Secret'
+ EQUALITY caseIgnoreMatch
@@ -107,7 +107,7 @@ index 0000000..ef878a8
+ )
+#
+attributeTypes: (
-+
++
+ NAME 'AstAccountDeny'
+ DESC 'Asterisk Account Deny'
+ EQUALITY caseIgnoreMatch
@@ -116,7 +116,7 @@ index 0000000..ef878a8
+ )
+#
+attributeTypes: (
-+
++
+ NAME 'AstAccountPermit'
+ DESC 'Asterisk Account Permit'
+ EQUALITY caseIgnoreMatch
@@ -125,7 +125,7 @@ index 0000000..ef878a8
+ )
+#
+attributeTypes: (
-+
++
+ NAME 'AstAccountQualify'
+ DESC 'Asterisk Account Qualify'
+ EQUALITY caseIgnoreMatch
@@ -134,7 +134,7 @@ index 0000000..ef878a8
+ )
+#
+attributeTypes: (
-+
++
+ NAME 'AstAccountType'
+ DESC 'Asterisk Account Type'
+ EQUALITY caseIgnoreMatch
@@ -143,7 +143,7 @@ index 0000000..ef878a8
+ )
+#
+attributeTypes: (
-+
++
+ NAME 'AstAccountDisallowedCodec'
+ DESC 'Asterisk Account Disallowed Codec'
+ EQUALITY caseIgnoreMatch
@@ -152,7 +152,7 @@ index 0000000..ef878a8
+ )
+#
+attributeTypes: (
-+
++
+ NAME 'AstAccountExpirationTimestamp'
+ DESC 'Asterisk Account Allowed Codec'
+ EQUALITY caseIgnoreMatch
@@ -161,7 +161,7 @@ index 0000000..ef878a8
+ )
+#
+attributeTypes: (
-+
++
+ NAME 'AstAccountRegistrationContext'
+ DESC 'Asterisk Account AMA Flags'
+ EQUALITY caseIgnoreMatch
@@ -170,7 +170,7 @@ index 0000000..ef878a8
+ )
+#
+attributeTypes: (
-+
++
+ NAME 'AstAccountRegistrationExten'
+ DESC 'Asterisk Account AMA Flags'
+ EQUALITY caseIgnoreMatch
@@ -179,7 +179,7 @@ index 0000000..ef878a8
+ )
+#
+attributeTypes: (
-+
++
+ NAME 'AstAccountNoTransfer'
+ DESC 'Asterisk Account AMA Flags'
+ EQUALITY caseIgnoreMatch
@@ -188,7 +188,7 @@ index 0000000..ef878a8
+ )
+#
+attributeTypes: (
-+
++
+ NAME 'AstAccountCallGroup'
+ DESC 'Asterisk Account Call Group'
+ EQUALITY caseIgnoreMatch
@@ -197,7 +197,7 @@ index 0000000..ef878a8
+ )
+#
+attributeTypes: (
-+
++
+ NAME 'AstAccountCanReinvite'
+ DESC 'Asterisk Account Can Reinvite'
+ EQUALITY caseIgnoreMatch
@@ -206,7 +206,7 @@ index 0000000..ef878a8
+ )
+#
+attributeTypes: (
-+
++
+ NAME 'AstAccountDTMFMode'
+ DESC 'Asterisk Account DTMF Flags'
+ EQUALITY caseIgnoreMatch
@@ -215,14 +215,14 @@ index 0000000..ef878a8
+ )
+#
+attributeTypes: (
-+
++
+ NAME 'AstAccountFromUser'
+ DESC 'Asterisk Account From User'
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
-+
++
+ NAME 'AstAccountFromDomain'
+ DESC 'Asterisk Account From Domain'
+ EQUALITY caseIgnoreMatch
@@ -231,7 +231,7 @@ index 0000000..ef878a8
+ )
+#
+attributeTypes: (
-+
++
+ NAME 'AstAccountFullContact'
+ DESC 'Asterisk Account Full Contact'
+ EQUALITY caseIgnoreMatch
@@ -240,7 +240,7 @@ index 0000000..ef878a8
+ )
+#
+attributeTypes: (
-+
++
+ NAME 'AstAccountHost'
+ DESC 'Asterisk Account Host'
+ EQUALITY caseIgnoreMatch
@@ -249,7 +249,7 @@ index 0000000..ef878a8
+ )
+#
+attributeTypes: (
-+
++
+ NAME 'AstAccountInsecure'
+ DESC 'Asterisk Account Insecure'
+ EQUALITY caseIgnoreMatch
@@ -258,7 +258,7 @@ index 0000000..ef878a8
+ )
+#
+attributeTypes: (
-+
++
+ NAME 'AstAccountNAT'
+ DESC 'Asterisk Account NAT'
+ EQUALITY caseIgnoreMatch
@@ -267,7 +267,7 @@ index 0000000..ef878a8
+ )
+#
+attributeTypes: (
-+
++
+ NAME 'AstAccountPickupGroup'
+ DESC 'Asterisk Account PickupGroup'
+ EQUALITY caseIgnoreMatch
@@ -276,7 +276,7 @@ index 0000000..ef878a8
+ )
+#
+attributeTypes: (
-+
++
+ NAME 'AstAccountPort'
+ DESC 'Asterisk Account Port'
+ EQUALITY caseIgnoreMatch
@@ -285,7 +285,7 @@ index 0000000..ef878a8
+ )
+#
+attributeTypes: (
-+
++
+ NAME 'AstAccountRestrictCID'
+ DESC 'Asterisk Restrict CallerID'
+ EQUALITY caseIgnoreMatch
@@ -294,7 +294,7 @@ index 0000000..ef878a8
+ )
+#
+attributeTypes: (
-+
++
+ NAME 'AstAccountRTPTimeout'
+ DESC 'Asterisk RTP Timeout'
+ EQUALITY caseIgnoreMatch
@@ -303,7 +303,7 @@ index 0000000..ef878a8
+ )
+#
+attributeTypes: (
-+
++
+ NAME 'AstAccountRTPHoldTimeout'
+ DESC 'Asterisk RTP Hold Timeout'
+ EQUALITY caseIgnoreMatch
@@ -312,7 +312,7 @@ index 0000000..ef878a8
+ )
+#
+attributeTypes: (
-+
++
+ NAME 'AstAccountRealmedPassword'
+ DESC 'Asterisk RTP Hold Timeout'
+ EQUALITY caseIgnoreMatch
@@ -321,7 +321,7 @@ index 0000000..ef878a8
+ )
+#
+attributeTypes: (
-+
++
+ NAME 'AstAccountAllowedCodec'
+ DESC 'Asterisk Account Allowed Codec'
+ EQUALITY caseIgnoreMatch
@@ -330,7 +330,7 @@ index 0000000..ef878a8
+ )
+#
+attributeTypes: (
-+
++
+ NAME 'AstAccountMusicOnHold'
+ DESC 'Asterisk Account Allowed Codec'
+ EQUALITY caseIgnoreMatch
@@ -339,7 +339,7 @@ index 0000000..ef878a8
+ )
+#
+attributeTypes: (
-+
++
+ NAME 'AstAccountCanCallForward'
+ DESC 'Asterisk Can CAll Forward'
+ EQUALITY caseIgnoreMatch
@@ -348,7 +348,7 @@ index 0000000..ef878a8
+ )
+#
+attributeTypes: (
-+
++
+ NAME 'AstAccountSecret'
+ DESC 'Asterisk Can CAll Forward'
+ EQUALITY caseIgnoreMatch
@@ -357,7 +357,7 @@ index 0000000..ef878a8
+ )
+#
+attributeTypes: (
-+
++
+ NAME 'AstAccountName'
+ DESC 'Asterisk Account Username'
+ EQUALITY caseIgnoreMatch
@@ -366,7 +366,7 @@ index 0000000..ef878a8
+ )
+#
+attributeTypes: (
-+
++
+ NAME 'AstConfigFilename'
+ DESC 'Asterisk LDAP Configuration Filename'
+ EQUALITY caseIgnoreMatch
@@ -375,7 +375,7 @@ index 0000000..ef878a8
+ )
+#
+attributeTypes: (
-+
++
+ NAME 'AstConfigCategory'
+ DESC 'Asterisk LDAP Configuration Category'
+ EQUALITY caseIgnoreMatch
@@ -384,7 +384,7 @@ index 0000000..ef878a8
+ )
+#
+attributeTypes: (
-+
++
+ NAME 'AstConfigCategoryMetric'
+ DESC 'Asterisk LDAP Configuration Category Metric'
+ EQUALITY caseIgnoreMatch
@@ -393,7 +393,7 @@ index 0000000..ef878a8
+ )
+#
+attributeTypes: (
-+
++
+ NAME 'AstConfigVariableName'
+ DESC 'Asterisk LDAP Configuration Variable Name'
+ EQUALITY caseIgnoreMatch
@@ -402,7 +402,7 @@ index 0000000..ef878a8
+ )
+#
+attributeTypes: (
-+
++
+ NAME 'AstConfigVariableValue'
+ DESC 'Asterisk LDAP Configuration Variable Value'
+ EQUALITY caseIgnoreMatch
@@ -411,7 +411,7 @@ index 0000000..ef878a8
+ )
+#
+attributeTypes: (
-+
++
+ NAME 'AstConfigCommented'
+ DESC 'Asterisk LDAP Configuration Commented'
+ EQUALITY caseIgnoreMatch
@@ -420,7 +420,7 @@ index 0000000..ef878a8
+ )
+#
+attributeTypes: (
-+
++
+ NAME 'AstAccountIPAddress'
+ DESC 'Asterisk Account IP Address'
+ EQUALITY caseIgnoreMatch
@@ -429,7 +429,7 @@ index 0000000..ef878a8
+ )
+#
+attributeTypes: (
-+
++
+ NAME 'AstAccountDefaultUser'
+ DESC 'Asterisk Account Default User'
+ EQUALITY caseIgnoreMatch
@@ -438,7 +438,7 @@ index 0000000..ef878a8
+ )
+#
+attributeTypes: (
-+
++
+ NAME 'AstAccountRegistrationServer'
+ DESC 'Asterisk Account Registration Server'
+ EQUALITY caseIgnoreMatch
@@ -447,62 +447,62 @@ index 0000000..ef878a8
+ )
+#
+objectClasses: (
-+
++
+ NAME 'AsteriskExtension'
+ DESC 'PBX Extension Information for Asterisk'
+ SUP top
+ AUXILIARY
+ MUST cn
-+ MAY ( AstContext $ AstExtension $ AstPriority $ AstApplication
++ MAY ( AstContext $ AstExtension $ AstPriority $ AstApplication
+ $ AstApplicationData )
+ )
+#
+objectClasses: (
-+
++
+ NAME 'AsteriskIAXUser'
+ DESC 'IAX2 User information for Asterisk'
+ SUP AsteriskExtension
+ AUXILIARY
+ MUST cn
-+ MAY ( AstAccountAMAFlags $ AstAccountCallerID $ AstAccountContext
-+ $ AstAccountFullContact $ AstAccountHost $ AstAccountMailbox $ AstMD5secret
-+ $ AstAccountDeny $ AstAccountPermit $ AstAccountPort $ AstAccountQualify
-+ $ AstAccountType $ AstAccountDisallowedCodec $ AstAccountExpirationTimestamp
-+ $ AstAccountRegistrationContext$ AstAccountRegistrationExten
++ MAY ( AstAccountAMAFlags $ AstAccountCallerID $ AstAccountContext
++ $ AstAccountFullContact $ AstAccountHost $ AstAccountMailbox $ AstMD5secret
++ $ AstAccountDeny $ AstAccountPermit $ AstAccountPort $ AstAccountQualify
++ $ AstAccountType $ AstAccountDisallowedCodec $ AstAccountExpirationTimestamp
++ $ AstAccountRegistrationContext$ AstAccountRegistrationExten
+ $ AstAccountNoTransfer $ AstAccountName )
+ )
+#
+objectClasses: (
-+
++
+ NAME 'AsteriskSIPUser'
+ DESC 'SIP User information for Asterisk'
+ SUP AsteriskExtension
+ AUXILIARY
+ MUST cn
-+ MAY ( AstAccountAMAFlags $ AstAccountCallGroup $ AstAccountCallerID
++ MAY ( AstAccountAMAFlags $ AstAccountCallGroup $ AstAccountCallerID
+ $ AstAccountCanReinvite $ AstAccountContext $ AstAccountDefaultUser
-+ $ AstAccountDTMFMode $ AstAccountFromUser $ AstAccountFromDomain
-+ $ AstAccountFullContact $ AstAccountHost $ AstAccountInsecure
-+ $ AstAccountIPAddress $ AstAccountMailbox $ AstAccountRealmedPassword
-+ $ AstAccountNAT $ AstAccountDeny $ AstAccountPermit $ AstAccountPickupGroup
-+ $ AstAccountPort $ AstAccountQualify $ AstAccountRestrictCID
-+ $ AstAccountRTPTimeout $ AstAccountRTPHoldTimeout $ AstAccountType
-+ $ AstAccountDisallowedCodec $ AstAccountAllowedCodec $ AstAccountMusicOnHold
-+ $ AstAccountExpirationTimestamp $ AstAccountRegistrationContext
-+ $ AstAccountRegistrationExten $ AstAccountRegistrationServer
++ $ AstAccountDTMFMode $ AstAccountFromUser $ AstAccountFromDomain
++ $ AstAccountFullContact $ AstAccountHost $ AstAccountInsecure
++ $ AstAccountIPAddress $ AstAccountMailbox $ AstAccountRealmedPassword
++ $ AstAccountNAT $ AstAccountDeny $ AstAccountPermit $ AstAccountPickupGroup
++ $ AstAccountPort $ AstAccountQualify $ AstAccountRestrictCID
++ $ AstAccountRTPTimeout $ AstAccountRTPHoldTimeout $ AstAccountType
++ $ AstAccountDisallowedCodec $ AstAccountAllowedCodec $ AstAccountMusicOnHold
++ $ AstAccountExpirationTimestamp $ AstAccountRegistrationContext
++ $ AstAccountRegistrationExten $ AstAccountRegistrationServer
+ $ AstAccountCanCallForward $ AstAccountSecret $ AstAccountName )
+ )
+#
+objectClasses: (
-+
++
+ NAME 'AsteriskConfig'
+ DESC 'Asterisk configuration Information'
+ SUP top
+ AUXILIARY
+ MUST cn
-+ MAY ( AstConfigFilename $ AstConfigCategory $ AstConfigCategoryMetric
++ MAY ( AstConfigFilename $ AstConfigCategory $ AstConfigCategoryMetric
+ $ AstConfigVariableName $ AstConfigVariableValue $ AstConfigCommented )
+ )
--
-1.6.1
+1.7.2
diff --git a/0008-Tell-laxtex2html-to-copy-icons-when-building-documen.patch b/0008-Tell-laxtex2html-to-copy-icons-when-building-documen.patch
new file mode 100644
index 0000000..46c49bc
--- /dev/null
+++ b/0008-Tell-laxtex2html-to-copy-icons-when-building-documen.patch
@@ -0,0 +1,25 @@
+From 9bba846cd52ec6d026daec14b8c65bb1a38711b3 Mon Sep 17 00:00:00 2001
+From: Jeffrey C. Ollie <jeff at ocjtech.us>
+Date: Wed, 28 Jul 2010 07:32:19 -0500
+Subject: [PATCH 8/8] Tell laxtex2html to copy icons when building documentation so that we don't have run-time dependencies on latex2html.
+
+---
+ doc/tex/Makefile | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/doc/tex/Makefile b/doc/tex/Makefile
+index 4add45a..e448c95 100644
+--- a/doc/tex/Makefile
++++ b/doc/tex/Makefile
+@@ -41,7 +41,7 @@ html:
+ @cp asterisk.tex asterisk.tex.orig
+ @sed -e 's/ASTERISKVERSION/$(ASTERISKVERSION)/' asterisk.tex > asterisk_local.tex
+ @mv asterisk_local.tex asterisk.tex
+- @latex2html asterisk.tex
++ @latex2html -local_icons asterisk.tex
+ @mv asterisk.tex.orig asterisk.tex
+
+ txt: asterisk.txt
+--
+1.7.2
+
diff --git a/asterisk.spec b/asterisk.spec
index 444850c..0412d22 100644
--- a/asterisk.spec
+++ b/asterisk.spec
@@ -1,8 +1,8 @@
-%global _rc 1
+#global _rc 1
Summary: The Open Source PBX
Name: asterisk
-Version: 1.6.2.8
-Release: 0.3%{?_rc:.rc%{_rc}}%{?dist}
+Version: 1.6.2.10
+Release: 1%{?_rc:.rc%{_rc}}%{?dist}
License: GPLv2
Group: Applications/Internet
URL: http://www.asterisk.org/
@@ -13,19 +13,16 @@ Source2: menuselect.makedeps
Source3: menuselect.makeopts
Source5: http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-%{version}%{?_rc:-rc%{_rc}}.tar.gz.asc
-Patch1: 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch
+Patch1: 0001-Modify-init-scripts-for-better-Fedora-compatibilty.patch
Patch2: 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
-
# Submitted upstream: https://issues.asterisk.org/view.php?id=16858
-Patch5: 0005-Build-using-external-libedit.patch
-Patch6: 0006-Fix-history-loading-when-using-external-libedit.patch
-
+Patch3: 0003-Allow-linking-building-against-an-external-libedit.patch
+Patch4: 0004-Use-the-library-function-for-loading-command-history.patch
# Submitted upstream: https://issues.asterisk.org/view.php?id=16155
-Patch8: 0008-change-configure.ac-to-look-for-pkg-config-gmime-2.0.patch
-Patch11: 0011-Fix-up-some-paths.patch
-Patch12: 0012-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch
-
-Patch14: 0014-latex2html-local_icons.patch
+Patch5: 0005-Change-configure.ac-to-look-for-pkg-config-gmime-2.0.patch
+Patch6: 0006-Fix-up-some-paths.patch
+Patch7: 0007-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch
+Patch8: 0008-Tell-laxtex2html-to-copy-icons-when-building-documen.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
@@ -391,14 +388,14 @@ local filesystem.
%prep
%setup0 -q -n asterisk-%{version}%{?_rc:-rc%{_rc}}
-%patch1 -p0
-%patch2 -p0
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
%patch5 -p1
%patch6 -p1
-%patch8 -p0
-%patch11 -p0
-%patch12 -p1
-%patch14 -p1
+%patch7 -p1
+%patch8 -p1
cp %{SOURCE2} menuselect.makedeps
cp %{SOURCE3} menuselect.makeopts
@@ -738,10 +735,6 @@ fi
%if 0%{?fedora} > 0
%{_libdir}/asterisk/modules/res_timing_timerfd.so
%endif
-%{_libdir}/asterisk/modules/test_dlinklists.so
-%{_libdir}/asterisk/modules/test_heap.so
-%{_libdir}/asterisk/modules/test_sched.so
-%{_libdir}/asterisk/modules/test_skel.so
%{_sbindir}/aelparse
%{_sbindir}/astcanary
@@ -1042,7 +1035,10 @@ fi
%{_libdir}/asterisk/modules/app_voicemail_plain.so
%changelog
-* Wed Jul 14 2010 Jeffrey C. Ollie <jcollie at lt27416.campus.dmacc.edu> - 1.6.2.8-0.31:.rc%{_rc}}%{?dist}
+* Sat Jul 31 2010 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2.10-1
+- Update to 1.6.2.10
+
+* Wed Jul 14 2010 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2.8-0.3.rc1
- Add patch to remove requirement on latex2html
* Tue Jun 01 2010 Marcela Maslanova <mmaslano at redhat.com> - 1.6.2.8-0.2.rc1
diff --git a/menuselect.makeopts b/menuselect.makeopts
index 2530243..b47ae03 100644
--- a/menuselect.makeopts
+++ b/menuselect.makeopts
@@ -12,7 +12,7 @@ MENUSELECT_EMBED=
MENUSELECT_CORE_SOUNDS=
MENUSELECT_MOH=
MENUSELECT_EXTRA_SOUNDS=
-MENUSELECT_TEST=test_skel
+MENUSELECT_TESTS=test_skel test_heap test_sched test_astobj2 test_dlinklists
MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_osplookup
MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_h323
MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_nbs
diff --git a/sources b/sources
index 272e2d3..d286555 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-2b4e78dcfb34cf62e36c2944d7c658c8 asterisk-1.6.2.8-rc1.tar.gz
-6d4ef3681957499bb801896044a9c364 asterisk-1.6.2.8-rc1.tar.gz.asc
+50412a90942ae7306fb8dcc31a05c2ce asterisk-1.6.2.10.tar.gz
+c04a5e701ef88fda2ebff04cd32428ce asterisk-1.6.2.10.tar.gz.asc
More information about the scm-commits
mailing list