rpms/asterisk/F-11 .cvsignore, 1.22, 1.23 0005-Build-using-external-libedit.patch, 1.6, 1.7 0011-Fix-up-some-paths.patch, 1.1, 1.2 asterisk.spec, 1.52, 1.53 sources, 1.22, 1.23 0006-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch, 1.5, NONE asterisk-strip.sh, 1.5, NONE
Jeffrey C. Ollie
jcollie at fedoraproject.org
Thu Oct 8 13:45:31 UTC 2009
Author: jcollie
Update of /cvs/pkgs/rpms/asterisk/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22358
Modified Files:
.cvsignore 0005-Build-using-external-libedit.patch
0011-Fix-up-some-paths.patch asterisk.spec sources
Removed Files:
0006-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch
asterisk-strip.sh
Log Message:
* Thu Oct 8 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1.7-0.1.rc2
- Update to 1.6.1.7-rc2
- Merge firmware subpackage back into main package
- No longer need to strip tarball since it no longer contains any non-free items
- Tighten up permissions/ownership of config files.
- Fix up some more paths
- Drop unneeded patch
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-11/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore 7 Sep 2009 04:50:08 -0000 1.22
+++ .cvsignore 8 Oct 2009 13:45:31 -0000 1.23
@@ -1,3 +1,3 @@
-asterisk-1.6.1.6-stripped.tar.gz
-asterisk-1.6.1.6.tar.gz.asc
asterisk-developer-pubring.gpg
+asterisk-1.6.1.7-rc2.tar.gz
+asterisk-1.6.1.7-rc2.tar.gz.asc
0005-Build-using-external-libedit.patch:
build_tools/menuselect-deps.in | 1 +
configure.ac | 22 ++++++++++++++++++++++
main/Makefile | 8 +++++---
main/cli.c | 3 ++-
makeopts.in | 4 ++++
5 files changed, 34 insertions(+), 4 deletions(-)
Index: 0005-Build-using-external-libedit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-11/0005-Build-using-external-libedit.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- 0005-Build-using-external-libedit.patch 7 Sep 2009 04:50:09 -0000 1.6
+++ 0005-Build-using-external-libedit.patch 8 Oct 2009 13:45:31 -0000 1.7
@@ -1,6 +1,6 @@
Index: build_tools/menuselect-deps.in
===================================================================
---- build_tools/menuselect-deps.in (revision 216642)
+--- build_tools/menuselect-deps.in (revision 222649)
+++ build_tools/menuselect-deps.in (working copy)
@@ -17,6 +17,7 @@
IXJUSER=@PBX_IXJUSER@
@@ -12,9 +12,9 @@ Index: build_tools/menuselect-deps.in
MISDN=@PBX_MISDN@
Index: configure.ac
===================================================================
---- configure.ac (revision 216642)
+--- configure.ac (revision 222649)
+++ configure.ac (working copy)
-@@ -232,6 +232,7 @@
+@@ -244,6 +244,7 @@
AST_EXT_LIB_SETUP([ISDNNET], [ISDN4Linux Library], [isdnnet])
AST_EXT_LIB_SETUP([JACK], [Jack Audio Connection Kit], [jack])
AST_EXT_LIB_SETUP([LDAP], [OpenLDAP], [ldap])
@@ -22,7 +22,7 @@ Index: configure.ac
AST_EXT_LIB_SETUP([LTDL], [libtool], [ltdl])
AST_EXT_LIB_SETUP([LUA], [Lua], [lua])
AST_EXT_LIB_SETUP([MISDN], [mISDN User Library], [misdn])
-@@ -1621,6 +1622,27 @@
+@@ -1605,6 +1606,27 @@
AC_SUBST(GTK2_INCLUDE)
AC_SUBST(GTK2_LIB)
@@ -47,12 +47,12 @@ Index: configure.ac
+AC_SUBST(LIBEDIT_LIB)
+AC_SUBST(LIBEDIT_OBJ)
+
- if test "${USE_CURL}" != "no"; then
- AC_PATH_TOOL([CURL_CONFIG], [curl-config], No)
- if test ! x"${CURL_CONFIG}" = xNo; then
+ AST_LIBCURL_CHECK_CONFIG([], [7.10.1])
+
+ AC_CONFIG_FILES([build_tools/menuselect-deps makeopts channels/h323/Makefile])
Index: main/Makefile
===================================================================
---- main/Makefile (revision 216642)
+--- main/Makefile (revision 222649)
+++ main/Makefile (working copy)
@@ -129,6 +129,8 @@
$(CC) -g -o testexpr2 ast_expr2f.o ast_expr2.o -lm
@@ -82,7 +82,7 @@ Index: main/Makefile
Index: main/cli.c
===================================================================
---- main/cli.c (revision 216642)
+--- main/cli.c (revision 222649)
+++ main/cli.c (working copy)
@@ -34,6 +34,8 @@
#include <ctype.h>
@@ -103,9 +103,9 @@ Index: main/cli.c
/*!
Index: makeopts.in
===================================================================
---- makeopts.in (revision 216642)
+--- makeopts.in (revision 222649)
+++ makeopts.in (working copy)
-@@ -246,3 +246,7 @@
+@@ -249,3 +249,7 @@
# if poll is not present, let the makefile know.
POLL_AVAILABLE=@HAS_POLL@
0011-Fix-up-some-paths.patch:
UPGRADE-1.4.txt | 2 +-
agi/DialAnMp3.agi | 2 +-
agi/jukebox.agi | 2 +-
agi/numeralize | 2 +-
apps/app_rpt.c | 2 +-
configs/festival.conf.sample | 2 +-
configs/http.conf.sample | 6 +++---
configs/iax.conf.sample | 4 ++--
configs/musiconhold.conf.sample | 10 +++++-----
configs/osp.conf.sample | 4 ++--
configs/phoneprov.conf.sample | 2 +-
configs/res_config_sqlite.conf | 2 +-
contrib/scripts/astgenkey | 2 +-
contrib/scripts/astgenkey.8 | 6 +++---
contrib/utils/README.rawplayer | 4 ++--
doc/osp.txt | 8 ++++----
doc/tex/ael.tex | 2 +-
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 +++++++++++++-------------
utils/ael_main.c | 2 +-
24 files changed, 79 insertions(+), 79 deletions(-)
Index: 0011-Fix-up-some-paths.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-11/0011-Fix-up-some-paths.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 0011-Fix-up-some-paths.patch 9 Feb 2009 05:54:21 -0000 1.1
+++ 0011-Fix-up-some-paths.patch 8 Oct 2009 13:45:31 -0000 1.2
@@ -1,279 +1,223 @@
-From 2f393dd3178974151a4b69a56bb1523546ff1b10 Mon Sep 17 00:00:00 2001
-From: Jeffrey C. Ollie <jeff at ocjtech.us>
-Date: Sun, 4 Jan 2009 12:51:05 -0600
-Subject: [PATCH 11/15] 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 | 10 ++++----
- 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/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 ++++++++++++------------
- 15 files changed, 68 insertions(+), 68 deletions(-)
-
-diff --git a/UPGRADE-1.4.txt b/UPGRADE-1.4.txt
-index 4f82694..69bf322 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 dc3c465..69de2b4 100644
---- a/configs/iax.conf.sample
-+++ b/configs/iax.conf.sample
-@@ -361,8 +361,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 4df1afd..b730335 100644
---- a/configs/musiconhold.conf.sample
-+++ b/configs/musiconhold.conf.sample
-@@ -39,11 +39,11 @@
-
- [default]
- mode=files
--directory=/var/lib/asterisk/moh
-+directory=/usr/share/asterisk/moh
- ;
- ;[native-random]
- ;mode=files
--;directory=/var/lib/asterisk/moh
-+;directory=/usr/share/asterisk/moh
- ;digit=# ; If this option is set for a class, then when callers are
- ; ; listening to music on hold, they can press this digit, and
- ; ; they will switch to listening to this music class.
-@@ -51,7 +51,7 @@ directory=/var/lib/asterisk/moh
-
- ;[native-alphabetical]
- ;mode=files
--;directory=/var/lib/asterisk/moh
-+;directory=/usr/share/asterisk/moh
- ;sort=alpha ; Sort the files in alphabetical order. If this option is
- ; ; not specified, the sort order is undefined.
-
-@@ -63,7 +63,7 @@ directory=/var/lib/asterisk/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]
-@@ -75,5 +75,5 @@ directory=/var/lib/asterisk/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..2e346e6 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 8f55fa8..2608914 100644
---- a/configs/phoneprov.conf.sample
-+++ b/configs/phoneprov.conf.sample
-@@ -57,4 +57,4 @@ ${TOLOWER(${MAC})}.cfg => 000000000000.cfg ; Dynamically generated
- ${TOLOWER(${MAC})}-phone.cfg => 000000000000-phone.cfg ; (relative to AST_DATA_DIR/phoneprov)
- config/${TOLOWER(${MAC})} => polycom.xml ; Dynamic Filename => template file
- ${TOLOWER(${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
-
- 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 @@ 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..932f214 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/phoneprov.tex b/doc/tex/phoneprov.tex
-index cb236a8..be01d34 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.
+Index: pbx/ael/ael-test/ref.ael-vtest13
+===================================================================
+--- pbx/ael/ael-test/ref.ael-vtest13 (revision 222649)
++++ pbx/ael/ael-test/ref.ael-vtest13 (working copy)
+@@ -2107,7 +2107,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 @@ 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.
+ [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 @@
-@@ -260,7 +260,7 @@ loudspeakers, and perhaps other nifty things. For instance:
+ [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 222649)
++++ pbx/ael/ael-test/ael-test3/extensions.ael (working copy)
+@@ -2049,7 +2049,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}
-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()
+ {
+- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/priv-callerintros/LIAR.gsm&);
++ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/priv-callerintros/LIAR.gsm&);
+ 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 @@
+ PrivacyManager();
+ if( "${PRIVACYMGRSTATUS}" = "FAILED" )
+ {
+- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm);
++ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/privmanfailed.gsm);
+ &std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
+ Hangup();
+ return;
+@@ -2138,7 +2138,7 @@
+ 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);
+- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
++ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
+ TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&);
+ switch(${direct})
+ {
+@@ -2223,7 +2223,7 @@
+
+ }
+ 1 => { // Sonya
+- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
++ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
+ 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 @@
+ Background(murphy-homeline-kids); // Which Kid? 1=Sean, 2:Eric, 3:Ryan, 4:Kyle, 5:Amber, 6:Alex, 7:Neal
+ }
+ 1 => { // SEAN
+- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
++ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
+ TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/3/greet.wav&);
+ // &std-priv-exten(Zap/3r2&Zap/5r2,3,35,mtw,telemarket,telemarket);
+ &std-priv-exten(IAX2/seaniax&Zap/5r2,3,35,mtw,telemarket,telemarket);
+ goto homeline|s|loopback;
+ }
+ 2 => { // ERIC
+- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
++ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
+ TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&);
+ Voicemail(u4);
+ goto homeline|s|loopback;
+
+ // SetMusicOnHold(erics);
+- // TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
++ // TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
+ // TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&);
+ // &std-priv-exten(Zap/3r2&Zap/5r2,4,35,mtw,telemarket,telemarket);
+ // goto homeline|s|loopback;
+ }
+ 3 => { // RYAN
+- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
++ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
+ TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/5/greet.wav&);
+ &std-priv-exten(Zap/3r2&Zap/5r2,5,35,mtw,telemarket,telemarket);
+ goto homeline|s|loopback;
+ }
+ 4 => { // KYLE
+- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
++ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
+ TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/6/greet.wav&);
+ &std-priv-exten(Zap/3r2&Zap/5r2,6,35,mtw,telemarket,telemarket);
+ goto homeline|s|loopback;
+ }
+ 5 => {
+- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
++ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
+ TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/7/greet.wav&);
+ &std-priv-exten(Zap/3r2&Zap/5r2,7,35,mtw,telemarket,telemarket);
+ goto homeline|s|loopback;
+
+ }
+ 6 => {
+- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
++ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
+ TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/8/greet.wav&);
+ &std-priv-exten(Zap/3r2&Zap/5r2,8,35,mtw,telemarket,telemarket);
+ goto homeline|s|loopback;
+ }
+ 7 => {
+- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
++ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
+ 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 @@
+ // Otherwise, dial 1, and hopefully, you will reach Steve.
+ }
+ 1 => {
+- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
++ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
+ 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 @@
+ }
+ 761 => {
+ Record(announcement:gsm);
+- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/announcement.gsm&);
++ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/announcement.gsm&);
+ goto s|loopback;
+ }
+ 762 => {
+Index: pbx/ael/ael-test/ael-vtest13/extensions.ael
+===================================================================
+--- pbx/ael/ael-test/ael-vtest13/extensions.ael (revision 222649)
++++ pbx/ael/ael-test/ael-vtest13/extensions.ael (working copy)
+@@ -2048,7 +2048,7 @@
macro callerid-liar()
{
@@ -282,7 +226,7 @@ index ff1f6ae..53fb918 100755
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 @@ context homeline {
+@@ -2105,7 +2105,7 @@
PrivacyManager();
if( "${PRIVACYMGRSTATUS}" = "FAILED" )
{
@@ -291,7 +235,7 @@ index ff1f6ae..53fb918 100755
&std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
Hangup();
return;
-@@ -2138,7 +2138,7 @@ context homeline {
+@@ -2137,7 +2137,7 @@
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);
@@ -300,7 +244,7 @@ index ff1f6ae..53fb918 100755
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&);
switch(${direct})
{
-@@ -2223,7 +2223,7 @@ context homeline {
+@@ -2222,7 +2222,7 @@
}
1 => { // Sonya
@@ -309,7 +253,7 @@ index ff1f6ae..53fb918 100755
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 @@ context homeline-kids {
+@@ -2420,51 +2420,51 @@
Background(murphy-homeline-kids); // Which Kid? 1=Sean, 2:Eric, 3:Ryan, 4:Kyle, 5:Amber, 6:Alex, 7:Neal
}
1 => { // SEAN
@@ -369,7 +313,7 @@ index ff1f6ae..53fb918 100755
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 @@ context workline {
+@@ -2516,7 +2516,7 @@
// Otherwise, dial 1, and hopefully, you will reach Steve.
}
1 => {
@@ -378,7 +322,7 @@ index ff1f6ae..53fb918 100755
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 @@ context homeext {
+@@ -2777,7 +2777,7 @@
}
761 => {
Record(announcement:gsm);
@@ -387,221 +331,377 @@ index ff1f6ae..53fb918 100755
goto s|loopback;
}
762 => {
-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
+Index: agi/jukebox.agi
+===================================================================
+--- agi/jukebox.agi (revision 222649)
++++ agi/jukebox.agi (working copy)
+@@ -17,7 +17,7 @@
+ #
+ # Uses festival to list off all your MP3 music files over a channel in
+ # a hierarchical fashion. Put this file in your agi-bin folder which
+-# is located at: /var/lib/asterisk/agi-bin Be sure to chmod +x it!
++# is located at: /usr/share/asterisk/agi-bin Be sure to chmod +x it!
+ #
+ # Invocation Example:
+ # exten => 68742,1,Answer()
+Index: agi/DialAnMp3.agi
+===================================================================
+--- agi/DialAnMp3.agi (revision 222649)
++++ agi/DialAnMp3.agi (working copy)
+@@ -17,7 +17,7 @@
+ print STDERR " -- $i = $AGI{$i}\n";
+ }
+
+-dbmopen(%DIGITS, "/var/lib/asterisk/mp3list", 0644) || die("Unable to open mp3list");;
++dbmopen(%DIGITS, "/usr/share/asterisk/mp3list", 0644) || die("Unable to open mp3list");;
+
+ sub checkresult {
+ my ($res) = @_;
+Index: agi/numeralize
+===================================================================
+--- agi/numeralize (revision 222649)
++++ agi/numeralize (working copy)
+@@ -6,7 +6,7 @@
+
+ $mp3dir="/usr/media/mpeg3";
+
+-dbmopen(%DIGITS, "/var/lib/asterisk/mp3list", 0644) || die("Unable to open mp3list");;
++dbmopen(%DIGITS, "/usr/share/asterisk/mp3list", 0644) || die("Unable to open mp3list");;
+ sub process_dir {
+ my ($dir) = @_;
+ my $file;
+Index: apps/app_rpt.c
+===================================================================
+--- apps/app_rpt.c (revision 222649)
++++ apps/app_rpt.c (working copy)
+@@ -241,7 +241,7 @@
+ #define TONEMACRO "tonemacro"
+ #define FUNCCHAR '*'
+ #define ENDCHAR '#'
+-#define EXTNODEFILE "/var/lib/asterisk/rpt_extnodes"
++#define EXTNODEFILE "/usr/share/asterisk/rpt_extnodes"
+ #define NODENAMES "rpt/nodenames"
+ #define PARROTFILE "/tmp/parrot_%s_%u"
+
+Index: doc/osp.txt
+===================================================================
+--- doc/osp.txt (revision 222649)
++++ 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).
+
+ 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 222649)
++++ 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/ael.tex
+===================================================================
+--- doc/tex/ael.tex (revision 222649)
++++ doc/tex/ael.tex (working copy)
+@@ -1167,7 +1167,7 @@
+ the application that would set that variable is not called in
+ the same extension. This is a warning only...
+ \item Calls to applications not in the "applist" database (installed
+- in \path{/var/lib/asterisk/applist}" on most systems).
++ in \path{/usr/share/asterisk/applist}" on most systems).
+ \item In an assignment statement, if the assignment is to a function,
+ the function name used is checked to see if it one of the
+ currently known functions. A warning is issued if it is not.
+Index: doc/tex/asterisk-conf.tex
+===================================================================
+--- doc/tex/asterisk-conf.tex (revision 222649)
++++ 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 222649)
++++ 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 222649)
++++ configs/iax.conf.sample (working copy)
+@@ -412,8 +412,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 222649)
++++ 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 222649)
++++ 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 222649)
++++ configs/phoneprov.conf.sample (working copy)
+@@ -57,4 +57,4 @@
+ ${TOLOWER(${MAC})}-phone.cfg => 000000000000-phone.cfg ; (relative to AST_DATA_DIR/phoneprov)
+ config/${TOLOWER(${MAC})} => polycom.xml ; Dynamic Filename => template file
+ ${TOLOWER(${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 222649)
++++ configs/musiconhold.conf.sample (working copy)
+@@ -39,11 +39,11 @@
+
+ [default]
+ mode=files
+-directory=/var/lib/asterisk/moh
++directory=/usr/share/asterisk/moh
+ ;
+ ;[native-random]
+ ;mode=files
+-;directory=/var/lib/asterisk/moh
++;directory=/usr/share/asterisk/moh
+ ;digit=# ; If this option is set for a class, then when callers are
+ ; ; listening to music on hold, they can press this digit, and
+ ; ; they will switch to listening to this music class.
+@@ -51,7 +51,7 @@
- macro callerid-liar()
- {
-- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/priv-callerintros/LIAR.gsm&);
-+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/priv-callerintros/LIAR.gsm&);
- 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 @@ context homeline {
- PrivacyManager();
- if( "${PRIVACYMGRSTATUS}" = "FAILED" )
- {
-- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm);
-+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/privmanfailed.gsm);
- &std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
- Hangup();
- return;
-@@ -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);
-- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
-+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
- TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&);
- switch(${direct})
- {
-@@ -2222,7 +2222,7 @@ context homeline {
-
- }
- 1 => { // Sonya
-- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
-+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
- 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 @@ 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
-- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
-+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
- TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/3/greet.wav&);
- // &std-priv-exten(Zap/3r2&Zap/5r2,3,35,mtw,telemarket,telemarket);
- &std-priv-exten(IAX2/seaniax&Zap/5r2,3,35,mtw,telemarket,telemarket);
- goto homeline|s|loopback;
- }
- 2 => { // ERIC
-- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
-+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
- TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&);
- Voicemail(u4);
- goto homeline|s|loopback;
-
- // SetMusicOnHold(erics);
-- // TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
-+ // TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
- // TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&);
- // &std-priv-exten(Zap/3r2&Zap/5r2,4,35,mtw,telemarket,telemarket);
- // goto homeline|s|loopback;
- }
- 3 => { // RYAN
-- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
-+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
- TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/5/greet.wav&);
- &std-priv-exten(Zap/3r2&Zap/5r2,5,35,mtw,telemarket,telemarket);
- goto homeline|s|loopback;
- }
- 4 => { // KYLE
-- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
-+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
- TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/6/greet.wav&);
- &std-priv-exten(Zap/3r2&Zap/5r2,6,35,mtw,telemarket,telemarket);
- goto homeline|s|loopback;
- }
- 5 => {
-- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
-+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
- TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/7/greet.wav&);
- &std-priv-exten(Zap/3r2&Zap/5r2,7,35,mtw,telemarket,telemarket);
- goto homeline|s|loopback;
-
- }
- 6 => {
-- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
-+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
- TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/8/greet.wav&);
- &std-priv-exten(Zap/3r2&Zap/5r2,8,35,mtw,telemarket,telemarket);
- goto homeline|s|loopback;
- }
- 7 => {
-- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
-+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
- 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 @@ context workline {
- // Otherwise, dial 1, and hopefully, you will reach Steve.
- }
- 1 => {
-- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
-+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
- 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 @@ context homeext {
- }
- 761 => {
- Record(announcement:gsm);
-- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/announcement.gsm&);
-+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/announcement.gsm&);
- goto s|loopback;
- }
- 762 => {
-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()
+ ;[native-alphabetical]
+ ;mode=files
+-;directory=/var/lib/asterisk/moh
++;directory=/usr/share/asterisk/moh
+ ;sort=alpha ; Sort the files in alphabetical order. If this option is
+ ; ; not specified, the sort order is undefined.
+@@ -63,7 +63,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
- [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)
+ ;[ulawstream]
+@@ -75,5 +75,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 222649)
++++ 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: configs/res_config_sqlite.conf
+===================================================================
+--- configs/res_config_sqlite.conf (revision 222649)
++++ configs/res_config_sqlite.conf (working copy)
+@@ -1,7 +1,7 @@
+ [general]
+
+ ; The database file.
+-dbfile => /var/lib/asterisk/sqlite.db
++dbfile => /var/spool/asterisk/sqlite.db
+
+ ; Both config_table and cdr_table are optional. If config_table is omitted,
+ ; you must specify it in extconfig.conf. If it is both provided here and in
+Index: utils/ael_main.c
+===================================================================
+--- utils/ael_main.c (revision 222649)
++++ utils/ael_main.c (working copy)
+@@ -496,7 +496,7 @@
+ strcpy(config_dir, "/etc/asterisk");
+ localized_use_conf_dir();
+ }
+- strcpy(var_dir, "/var/lib/asterisk");
++ strcpy(var_dir, "/usr/share/asterisk");
+
+ if( dump_extensions ) {
+ dumpfile = fopen("extensions.conf.aeldump","w");
+Index: contrib/scripts/astgenkey.8
+===================================================================
+--- contrib/scripts/astgenkey.8 (revision 222649)
++++ contrib/scripts/astgenkey.8 (working copy)
+@@ -88,7 +88,7 @@
+ .RE
- [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.6.1
-
+ 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
+
+Index: contrib/scripts/astgenkey
+===================================================================
+--- contrib/scripts/astgenkey (revision 222649)
++++ 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: contrib/utils/README.rawplayer
+===================================================================
+--- contrib/utils/README.rawplayer (revision 222649)
++++ contrib/utils/README.rawplayer (working copy)
+@@ -16,11 +16,11 @@
+ sox -c 1 track01.wav -t raw -r 8000 -c 1 -s -w track01.raw
+
+
+-Once you have the raw files put them in any dir on your system (eg /var/lib/asterisk/holdmusic_raw).
++Once you have the raw files put them in any dir on your system (eg /usr/share/asterisk/holdmusic_raw).
+ and set up a class in musiconhold.conf like so:
+
+ [classes]
+-default => custom:/var/lib/asterisk/holdmusic_raw,/usr/bin/rawplayer
++default => custom:/usr/share/asterisk/holdmusic_raw,/usr/bin/rawplayer
+
+
+ This is the most efficient way to implement moh because no cpu usage is required to
+Index: UPGRADE-1.4.txt
+===================================================================
+--- UPGRADE-1.4.txt (revision 222649)
++++ 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
Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-11/asterisk.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- asterisk.spec 7 Sep 2009 04:50:09 -0000 1.52
+++ asterisk.spec 8 Oct 2009 13:45:31 -0000 1.53
@@ -1,49 +1,22 @@
-%define with_apidoc %{?_with_apidoc: 1} %{!?_with_apidoc: 0}
-#define _rc 1
+%define _rc 2
Summary: The Open Source PBX
Name: asterisk
-Version: 1.6.1.6
-Release: 1%{?_rc:.rc%{_rc}}%{?dist}
+Version: 1.6.1.7
+Release: 0.1%{?_rc:.rc%{_rc}}%{?dist}
License: GPLv2
Group: Applications/Internet
URL: http://www.asterisk.org/
-# The Asterisk tarball contains some items that we don't want in there,
-# so start with the original tarball from here:
-#
-# http://downloads.digium.com/pub/telephony/asterisk/releases/asterisk-%{version}%{?_rc:-rc%{_rc}}.tar.gz
-#
-# Then run the included script file to build the stripped tarball:
-#
-# sh asterisk-strip.sh %{version}
-
-# MD5 Sums
-# ========
-# 63a928373e741524aac09d8c078df7d5 asterisk-1.6.1.6.tar.gz
-# 4f57c6c9fff1bfeb9061679c123f7468 asterisk-1.6.1.6-stripped.tar.gz
-#
-# SHA1 Sums
-# =========
-# 79a9a3635fdf2e8422dadabd9f05da3329e60dc1 asterisk-1.6.1.6.tar.gz
-# b6ef13ec7b7b2335cd98dec09f143f9f446d9bb1 asterisk-1.6.1.6-stripped.tar.gz
-#
-# SHA256 Sums
-# =========
-# ce56be843b85946bebbb89af06819585f45dd50ac544c21ca81acab994036c22 asterisk-1.6.1.6.tar.gz
-# 4a91e3b8a420756f3b7b2b2d85335e0c47431bcaa8f02ea40e2c9ed835283fe3 asterisk-1.6.1.6-stripped.tar.gz
-
-Source0: asterisk-%{version}%{?_rc:-rc%{_rc}}-stripped.tar.gz
+Source0: http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-%{version}%{?_rc:-rc%{_rc}}.tar.gz
Source1: asterisk-logrotate
Source2: menuselect.makedeps
Source3: menuselect.makeopts
-Source4: asterisk-strip.sh
-Source5: asterisk-%{version}%{?_rc:-rc%{_rc}}.tar.gz.asc
+Source5: http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-%{version}%{?_rc:-rc%{_rc}}.tar.gz.asc
Source6: asterisk-developer-pubring.gpg
Patch1: 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch
Patch2: 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
Patch5: 0005-Build-using-external-libedit.patch
-Patch6: 0006-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch
Patch8: 0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch
Patch10: 0010-my-guess-as-replacements-for-the-missing-broken-stuf.patch
Patch11: 0011-Fix-up-some-paths.patch
@@ -67,15 +40,13 @@ BuildRequires: gtk2-devel
# for res_http_post
BuildRequires: gmime-devel
-%if %{with_apidoc}
# for building docs
BuildRequires: doxygen
BuildRequires: graphviz
BuildRequires: graphviz-gd
-%endif
# for codec_speex
-BuildRequires: speex-devel
+BuildRequires: speex-devel >= 1.2
# for format_ogg_vorbis
BuildRequires: libogg-devel
@@ -96,6 +67,7 @@ Requires(preun): /sbin/service
# asterisk-conference package removed since patch no longer compiles
Obsoletes: asterisk-conference <= 1.6.0-0.14.beta9
Obsoletes: asterisk-mobile <= 1.6.1-0.23.rc1
+Obsoletes: asterisk-firmware <= 1.6.1.6-1
%description
Asterisk is a complete PBX in software. It runs on Linux and provides
@@ -122,7 +94,6 @@ BuildRequires: alsa-lib-devel
%description alsa
Modules for Asterisk that use Alsa sound drivers.
-%if %{with_apidoc}
%package apidoc
Summary: API documentation for Asterisk
Group: Applications/Internet
@@ -130,7 +101,6 @@ Requires: asterisk = %{version}-%{releas
%description apidoc
API documentation for Asterisk.
-%endif
%package curl
Summary: Modules for Asterisk that use cURL
@@ -183,15 +153,6 @@ Requires: festival
%description festival
Application for the Asterisk PBX that uses Festival to convert text to speech.
-%package firmware
-Summary: Firmware for the Digium S101I (IAXy)
-Group: Applications/Internet
-License: Redistributable, no modification permitted
-Requires: asterisk = %{version}-%{release}
-
-%description firmware
-Firmware for the Digium S101I (IAXy).
-
%package ices
Summary: Stream audio from Asterisk to an IceCast server
Group: Applications/Internet
@@ -419,10 +380,9 @@ local filesystem.
%patch1 -p1
%patch2 -p0
%patch5 -p0
-%patch6 -p1
%patch8 -p0
%patch10 -p1
-%patch11 -p1
+%patch11 -p0
%patch12 -p1
cp %{SOURCE2} menuselect.makedeps
@@ -462,21 +422,21 @@ popd
%configure --with-imap=system --with-gsm=/usr --with-libedit=yes
-ASTCFLAGS="%{optflags}" make DEBUG= OPTIMIZE= ASTVARRUNDIR=%{_localstatedir}/run/asterisk ASTDATADIR=%{_datadir}/asterisk NOISY_BUILD=1
+ASTCFLAGS="%{optflags}" make DEBUG= OPTIMIZE= ASTVARRUNDIR=%{_localstatedir}/run/asterisk ASTDATADIR=%{_datadir}/asterisk ASTVARLIBDIR=%{_datadir}/asterisk ASTDBDIR=%{_localstatedir}/spool/asterisk NOISY_BUILD=1
rm apps/app_voicemail.o apps/app_directory.o
mv apps/app_voicemail.so apps/app_voicemail_plain.so
mv apps/app_directory.so apps/app_directory_plain.so
%{__sed} -i -e 's/^MENUSELECT_OPTS_app_voicemail=.*$/MENUSELECT_OPTS_app_voicemail=IMAP_STORAGE/' menuselect.makeopts
-ASTCFLAGS="%{optflags}" make DEBUG= OPTIMIZE= ASTVARRUNDIR=%{_localstatedir}/run/asterisk ASTDATADIR=%{_datadir}/asterisk NOISY_BUILD=1
+ASTCFLAGS="%{optflags}" make DEBUG= OPTIMIZE= ASTVARRUNDIR=%{_localstatedir}/run/asterisk ASTDATADIR=%{_datadir}/asterisk ASTVARLIBDIR=%{_datadir}/asterisk ASTDBDIR=%{_localstatedir}/spool/asterisk NOISY_BUILD=1
rm apps/app_voicemail.o apps/app_directory.o
mv apps/app_voicemail.so apps/app_voicemail_imap.so
mv apps/app_directory.so apps/app_directory_imap.so
%{__sed} -i -e 's/^MENUSELECT_OPTS_app_voicemail=.*$/MENUSELECT_OPTS_app_voicemail=ODBC_STORAGE/' menuselect.makeopts
-ASTCFLAGS="%{optflags}" make DEBUG= OPTIMIZE= ASTVARRUNDIR=%{_localstatedir}/run/asterisk ASTDATADIR=%{_datadir}/asterisk NOISY_BUILD=1
+ASTCFLAGS="%{optflags}" make DEBUG= OPTIMIZE= ASTVARRUNDIR=%{_localstatedir}/run/asterisk ASTDATADIR=%{_datadir}/asterisk ASTVARLIBDIR=%{_datadir}/asterisk ASTDBDIR=%{_localstatedir}/spool/asterisk NOISY_BUILD=1
rm apps/app_voicemail.o apps/app_directory.o
mv apps/app_voicemail.so apps/app_voicemail_odbc.so
@@ -486,18 +446,16 @@ mv apps/app_directory.so apps/app_direct
touch apps/app_voicemail.o apps/app_directory.o
touch apps/app_voicemail.so apps/app_directory.so
-%if %{with_apidoc}
-ASTCFLAGS="%{optflags}" make progdocs DEBUG= OPTIMIZE= ASTVARRUNDIR=%{_localstatedir}/run/asterisk ASTDATADIR=%{_datadir}/asterisk NOISY_BUILD=1
+ASTCFLAGS="%{optflags}" make progdocs DEBUG= OPTIMIZE= ASTVARRUNDIR=%{_localstatedir}/run/asterisk ASTDATADIR=%{_datadir}/asterisk ASTVARLIBDIR=%{_datadir}/asterisk ASTDBDIR=%{_localstatedir}/spool/asterisk NOISY_BUILD=1
# fix dates so that we don't get multilib conflicts
find doc/api/html -type f -print0 | xargs --null touch -r ChangeLog
-%endif
%install
rm -rf %{buildroot}
-ASTCFLAGS="%{optflags}" make install DEBUG= OPTIMIZE= DESTDIR=%{buildroot} ASTVARRUNDIR=%{_localstatedir}/run/asterisk ASTDATADIR=%{_datadir}/asterisk
-ASTCFLAGS="%{optflags}" make samples DEBUG= OPTIMIZE= DESTDIR=%{buildroot} ASTVARRUNDIR=%{_localstatedir}/run/asterisk ASTDATADIR=%{_datadir}/asterisk
+ASTCFLAGS="%{optflags}" make install DEBUG= OPTIMIZE= DESTDIR=%{buildroot} ASTVARRUNDIR=%{_localstatedir}/run/asterisk ASTDATADIR=%{_datadir}/asterisk ASTVARLIBDIR=%{_datadir}/asterisk ASTDBDIR=%{_localstatedir}/spool/asterisk
+ASTCFLAGS="%{optflags}" make samples DEBUG= OPTIMIZE= DESTDIR=%{buildroot} ASTVARRUNDIR=%{_localstatedir}/run/asterisk ASTDATADIR=%{_datadir}/asterisk ASTVARLIBDIR=%{_datadir}/asterisk ASTDBDIR=%{_localstatedir}/spool/asterisk
install -D -p -m 0755 contrib/init.d/rc.redhat.asterisk %{buildroot}%{_initrddir}/asterisk
install -D -p -m 0644 contrib/sysconfig/asterisk %{buildroot}%{_sysconfdir}/sysconfig/asterisk
@@ -508,22 +466,22 @@ install -D -p -m 0644 doc/digium-mib.txt
rm %{buildroot}%{_libdir}/asterisk/modules/app_directory.so
rm %{buildroot}%{_libdir}/asterisk/modules/app_voicemail.so
-install -D -p -m 0755 apps/app_directory_imap.so %{buildroot}%{_libdir}/asterisk/modules/
-install -D -p -m 0755 apps/app_voicemail_imap.so %{buildroot}%{_libdir}/asterisk/modules/
-install -D -p -m 0755 apps/app_directory_odbc.so %{buildroot}%{_libdir}/asterisk/modules/
-install -D -p -m 0755 apps/app_voicemail_odbc.so %{buildroot}%{_libdir}/asterisk/modules/
-install -D -p -m 0755 apps/app_directory_plain.so %{buildroot}%{_libdir}/asterisk/modules/
-install -D -p -m 0755 apps/app_voicemail_plain.so %{buildroot}%{_libdir}/asterisk/modules/
+install -D -p -m 0755 apps/app_directory_imap.so %{buildroot}%{_libdir}/asterisk/modules
+install -D -p -m 0755 apps/app_voicemail_imap.so %{buildroot}%{_libdir}/asterisk/modules
+install -D -p -m 0755 apps/app_directory_odbc.so %{buildroot}%{_libdir}/asterisk/modules
+install -D -p -m 0755 apps/app_voicemail_odbc.so %{buildroot}%{_libdir}/asterisk/modules
+install -D -p -m 0755 apps/app_directory_plain.so %{buildroot}%{_libdir}/asterisk/modules
+install -D -p -m 0755 apps/app_voicemail_plain.so %{buildroot}%{_libdir}/asterisk/modules
# create some directories that need to be packaged
-mkdir -p %{buildroot}%{_datadir}/asterisk/moh/
-mkdir -p %{buildroot}%{_datadir}/asterisk/sounds/
+mkdir -p %{buildroot}%{_datadir}/asterisk/moh
+mkdir -p %{buildroot}%{_datadir}/asterisk/sounds
mkdir -p %{buildroot}%{_localstatedir}/lib/asterisk
-mkdir -p %{buildroot}%{_localstatedir}/log/asterisk/cdr-custom/
-mkdir -p %{buildroot}%{_localstatedir}/spool/asterisk/festival/
-mkdir -p %{buildroot}%{_localstatedir}/spool/asterisk/monitor/
-mkdir -p %{buildroot}%{_localstatedir}/spool/asterisk/outgoing/
-mkdir -p %{buildroot}%{_localstatedir}/spool/asterisk/uploads/
+mkdir -p %{buildroot}%{_localstatedir}/log/asterisk/cdr-custom
+mkdir -p %{buildroot}%{_localstatedir}/spool/asterisk/festival
+mkdir -p %{buildroot}%{_localstatedir}/spool/asterisk/monitor
+mkdir -p %{buildroot}%{_localstatedir}/spool/asterisk/outgoing
+mkdir -p %{buildroot}%{_localstatedir}/spool/asterisk/uploads
# We're not going to package any of the sample AGI scripts
rm -f %{buildroot}%{_datadir}/asterisk/agi-bin/*
@@ -538,9 +496,7 @@ rm -rf %{buildroot}%{_datadir}/asterisk/
rm -rf %{buildroot}%{_sbindir}/hashtest
rm -rf %{buildroot}%{_sbindir}/hashtest2
-%if %{with_apidoc}
find doc/api/html -name \*.map -size 0 -delete
-%endif
%clean
rm -rf %{buildroot}
@@ -760,110 +716,110 @@ fi
%{_mandir}/man8/autosupport.8*
%{_mandir}/man8/safe_asterisk.8*
-%dir %{_sysconfdir}/asterisk
-%config(noreplace) %{_sysconfdir}/asterisk/adsi.conf
-%config(noreplace) %{_sysconfdir}/asterisk/adtranvofr.conf
-%config(noreplace) %{_sysconfdir}/asterisk/agents.conf
-%config(noreplace) %{_sysconfdir}/asterisk/alarmreceiver.conf
-%config(noreplace) %{_sysconfdir}/asterisk/amd.conf
-%config(noreplace) %{_sysconfdir}/asterisk/asterisk.adsi
-%config(noreplace) %{_sysconfdir}/asterisk/asterisk.conf
-%config(noreplace) %{_sysconfdir}/asterisk/cdr.conf
-%config(noreplace) %{_sysconfdir}/asterisk/cdr_custom.conf
-%config(noreplace) %{_sysconfdir}/asterisk/cdr_manager.conf
-%config(noreplace) %{_sysconfdir}/asterisk/cli.conf
-%config(noreplace) %{_sysconfdir}/asterisk/codecs.conf
-%config(noreplace) %{_sysconfdir}/asterisk/dnsmgr.conf
-%config(noreplace) %{_sysconfdir}/asterisk/dsp.conf
-%config(noreplace) %{_sysconfdir}/asterisk/dundi.conf
-%config(noreplace) %{_sysconfdir}/asterisk/enum.conf
-%config(noreplace) %{_sysconfdir}/asterisk/extconfig.conf
-%config(noreplace) %{_sysconfdir}/asterisk/extensions.ael
-%config(noreplace) %{_sysconfdir}/asterisk/extensions.conf
-%config(noreplace) %{_sysconfdir}/asterisk/features.conf
-%config(noreplace) %{_sysconfdir}/asterisk/followme.conf
-%config(noreplace) %{_sysconfdir}/asterisk/h323.conf
-%config(noreplace) %{_sysconfdir}/asterisk/http.conf
-%config(noreplace) %{_sysconfdir}/asterisk/iax.conf
-%config(noreplace) %{_sysconfdir}/asterisk/iaxprov.conf
-%config(noreplace) %{_sysconfdir}/asterisk/indications.conf
-%config(noreplace) %{_sysconfdir}/asterisk/logger.conf
-%config(noreplace) %{_sysconfdir}/asterisk/manager.conf
-%config(noreplace) %{_sysconfdir}/asterisk/mgcp.conf
-%config(noreplace) %{_sysconfdir}/asterisk/modules.conf
-%config(noreplace) %{_sysconfdir}/asterisk/musiconhold.conf
-%config(noreplace) %{_sysconfdir}/asterisk/muted.conf
-%config(noreplace) %{_sysconfdir}/asterisk/osp.conf
-%config(noreplace) %{_sysconfdir}/asterisk/phone.conf
-%config(noreplace) %{_sysconfdir}/asterisk/phoneprov.conf
-%config(noreplace) %{_sysconfdir}/asterisk/queuerules.conf
-%config(noreplace) %{_sysconfdir}/asterisk/queues.conf
-%config(noreplace) %{_sysconfdir}/asterisk/rpt.conf
-%config(noreplace) %{_sysconfdir}/asterisk/rtp.conf
-%config(noreplace) %{_sysconfdir}/asterisk/say.conf
-%config(noreplace) %{_sysconfdir}/asterisk/sip.conf
-%config(noreplace) %{_sysconfdir}/asterisk/sip_notify.conf
-%config(noreplace) %{_sysconfdir}/asterisk/sla.conf
-%config(noreplace) %{_sysconfdir}/asterisk/smdi.conf
-%config(noreplace) %{_sysconfdir}/asterisk/telcordia-1.adsi
-%config(noreplace) %{_sysconfdir}/asterisk/udptl.conf
-%config(noreplace) %{_sysconfdir}/asterisk/users.conf
-%config(noreplace) %{_sysconfdir}/asterisk/vpb.conf
+%attr(0750,asterisk,asterisk) %dir %{_sysconfdir}/asterisk
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/adsi.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/adtranvofr.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/agents.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/alarmreceiver.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/amd.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/asterisk.adsi
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/asterisk.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/cdr.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/cdr_custom.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/cdr_manager.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/cli.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/codecs.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/dnsmgr.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/dsp.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/dundi.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/enum.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/extconfig.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/extensions.ael
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/extensions.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/features.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/followme.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/h323.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/http.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/iax.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/iaxprov.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/indications.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/logger.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/manager.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/mgcp.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/modules.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/musiconhold.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/muted.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/osp.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/phone.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/phoneprov.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/queuerules.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/queues.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/rpt.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/rtp.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/say.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/sip.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/sip_notify.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/sla.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/smdi.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/telcordia-1.adsi
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/udptl.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/users.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/vpb.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/asterisk
-%dir %{_datadir}/asterisk/
-%dir %{_datadir}/asterisk/agi-bin/
-%{_datadir}/asterisk/images/
-%{_datadir}/asterisk/keys/
-%{_datadir}/asterisk/phoneprov/
-%{_datadir}/asterisk/static-http/
-%dir %{_datadir}/asterisk/moh/
-%dir %{_datadir}/asterisk/sounds/
-
-%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/lib/asterisk/
-
-%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/log/asterisk/
-%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/log/asterisk/cdr-csv/
-%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/log/asterisk/cdr-custom/
-
-%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/
-%attr(0770,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/monitor/
-%attr(0770,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/outgoing/
-%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/tmp/
-%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/uploads/
-%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/voicemail/
+%dir %{_datadir}/asterisk
+%dir %{_datadir}/asterisk/agi-bin
+%dir %{_datadir}/asterisk/firmware
+%dir %{_datadir}/asterisk/firmware/iax
+%{_datadir}/asterisk/images
+%attr(0750,asterisk,asterisk) %{_datadir}/asterisk/keys
+%{_datadir}/asterisk/phoneprov
+%{_datadir}/asterisk/static-http
+%dir %{_datadir}/asterisk/moh
+%dir %{_datadir}/asterisk/sounds
+
+%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/lib/asterisk
+
+%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/log/asterisk
+%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/log/asterisk/cdr-csv
+%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/log/asterisk/cdr-custom
+
+%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk
+%attr(0770,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/monitor
+%attr(0770,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/outgoing
+%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/tmp
+%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/uploads
+%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/voicemail
%attr(0755,asterisk,asterisk) %dir %{_localstatedir}/run/asterisk
%files ais
%defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/ais.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/ais.conf
%{_libdir}/asterisk/modules/res_ais.so
%files alsa
%defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/alsa.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/alsa.conf
%{_libdir}/asterisk/modules/chan_alsa.so
-%if %{with_apidoc}
%files apidoc
%defattr(-,root,root,-)
%doc doc/api/html/*
-%endif
%files curl
%defattr(-,root,root,-)
%doc contrib/scripts/dbsep.cgi
-%config(noreplace) %{_sysconfdir}/asterisk/dbsep.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/dbsep.conf
%{_libdir}/asterisk/modules/func_curl.so
%{_libdir}/asterisk/modules/res_config_curl.so
%{_libdir}/asterisk/modules/res_curl.so
%files dahdi
%defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/meetme.conf
-%config(noreplace) %{_sysconfdir}/asterisk/chan_dahdi.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/meetme.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/chan_dahdi.conf
%{_libdir}/asterisk/modules/app_flash.so
%{_libdir}/asterisk/modules/app_meetme.so
%{_libdir}/asterisk/modules/app_page.so
@@ -891,14 +847,10 @@ fi
%files festival
%defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/festival.conf
-%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/festival/
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/festival.conf
+%attr(0750,asterisk,asterisk) %dir %{_localstatedir}/spool/asterisk/festival
%{_libdir}/asterisk/modules/app_festival.so
-%files firmware
-%defattr(-,root,root,-)
-%{_datadir}/asterisk/firmware/
-
%files ices
%defattr(-,root,root,-)
%doc contrib/asterisk-ices.xml
@@ -908,9 +860,9 @@ fi
%defattr(-,root,root,-)
%doc doc/jabber.txt
%doc doc/jingle.txt
-%config(noreplace) %{_sysconfdir}/asterisk/gtalk.conf
-%config(noreplace) %{_sysconfdir}/asterisk/jabber.conf
-%config(noreplace) %{_sysconfdir}/asterisk/jingle.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/gtalk.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/jabber.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/jingle.conf
%{_libdir}/asterisk/modules/chan_gtalk.so
%{_libdir}/asterisk/modules/chan_jingle.so
%{_libdir}/asterisk/modules/res_jabber.so
@@ -921,13 +873,13 @@ fi
%files lua
%defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/extensions.lua
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/extensions.lua
%{_libdir}/asterisk/modules/pbx_lua.so
%files ldap
%defattr(-,root,root,-)
%doc doc/ldap.txt
-%config(noreplace) %{_sysconfdir}/asterisk/res_ldap.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/res_ldap.conf
%{_libdir}/asterisk/modules/res_config_ldap.so
%files ldap-fds
@@ -936,21 +888,21 @@ fi
%files minivm
%defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/extensions_minivm.conf
-%config(noreplace) %{_sysconfdir}/asterisk/minivm.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/extensions_minivm.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/minivm.conf
%{_libdir}/asterisk/modules/app_minivm.so
%files misdn
%defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/misdn.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/misdn.conf
%{_libdir}/asterisk/modules/chan_misdn.so
%files odbc
%defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/cdr_adaptive_odbc.conf
-%config(noreplace) %{_sysconfdir}/asterisk/cdr_odbc.conf
-%config(noreplace) %{_sysconfdir}/asterisk/func_odbc.conf
-%config(noreplace) %{_sysconfdir}/asterisk/res_odbc.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/cdr_adaptive_odbc.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/cdr_odbc.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/func_odbc.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/res_odbc.conf
%{_libdir}/asterisk/modules/cdr_adaptive_odbc.so
%{_libdir}/asterisk/modules/cdr_odbc.so
%{_libdir}/asterisk/modules/func_odbc.so
@@ -959,18 +911,18 @@ fi
%files oss
%defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/oss.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/oss.conf
%{_libdir}/asterisk/modules/chan_oss.so
%files portaudio
%defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/console.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/console.conf
%{_libdir}/asterisk/modules/chan_console.so
%files postgresql
%defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/cdr_pgsql.conf
-%config(noreplace) %{_sysconfdir}/asterisk/res_pgsql.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/cdr_pgsql.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/res_pgsql.conf
%doc contrib/scripts/realtime_pgsql.sql
%{_libdir}/asterisk/modules/cdr_pgsql.so
%{_libdir}/asterisk/modules/res_config_pgsql.so
@@ -981,7 +933,7 @@ fi
%files skinny
%defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/skinny.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/skinny.conf
%{_libdir}/asterisk/modules/chan_skinny.so
%files snmp
@@ -989,35 +941,35 @@ fi
%doc doc/asterisk-mib.txt
%doc doc/digium-mib.txt
%doc doc/snmp.txt
-%config(noreplace) %{_sysconfdir}/asterisk/res_snmp.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/res_snmp.conf
%{_datadir}/snmp/mibs/ASTERISK-MIB.txt
%{_datadir}/snmp/mibs/DIGIUM-MIB.txt
%{_libdir}/asterisk/modules/res_snmp.so
%files sqlite
%defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/cdr_sqlite3_custom.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/cdr_sqlite3_custom.conf
%{_libdir}/asterisk/modules/cdr_sqlite3_custom.so
%files tds
%defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/cdr_tds.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/cdr_tds.conf
%{_libdir}/asterisk/modules/cdr_tds.so
%files unistim
%defattr(-,root,root,-)
%doc doc/unistim.txt
-%config(noreplace) %{_sysconfdir}/asterisk/unistim.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/unistim.conf
%{_libdir}/asterisk/modules/chan_unistim.so
%files usbradio
%defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/usbradio.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/usbradio.conf
%{_libdir}/asterisk/modules/chan_usbradio.so
%files voicemail
%defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/asterisk/voicemail.conf
+%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/voicemail.conf
%{_libdir}/asterisk/modules/func_vmcount.so
%files voicemail-imap
@@ -1037,10 +989,31 @@ fi
%{_libdir}/asterisk/modules/app_voicemail_plain.so
%changelog
+* Thu Oct 8 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1.7-0.1.rc2
+- Update to 1.6.1.7-rc2
+- Merge firmware subpackage back into main package
+- No longer need to strip tarball since it no longer contains any non-free items
+- Tighten up permissions/ownership of config files.
+- Fix up some more paths
+- Drop unneeded patch
+
+* Wed Sep 9 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1.6-2
+- Enable building of API docs.
+- Depend on version 1.2 or newer of speex
+
* Sun Sep 6 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1.6-1
- Update to 1.6.1.6
- Drop patches that are too troublesome to maintain anymore or have been integrated upstream.
+* Tue Sep 1 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1-0.26.rc1
+- Add a patch from Quentin Armitage and rebuld.
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.6.1-0.25.rc1
+- rebuilt with new openssl
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.1-0.24.rc1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
* Thu Mar 5 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1-0.23.rc1
- Rebuild to pick up new AIS and ODBC deps.
- Update script that strips out bad content from tarball to do the
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-11/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources 7 Sep 2009 04:50:09 -0000 1.22
+++ sources 8 Oct 2009 13:45:31 -0000 1.23
@@ -1,3 +1,3 @@
-4f57c6c9fff1bfeb9061679c123f7468 asterisk-1.6.1.6-stripped.tar.gz
-0c07f535bada3bca06d459ed3a416f22 asterisk-1.6.1.6.tar.gz.asc
dd089905d0ba9a514359dc2cf1a53303 asterisk-developer-pubring.gpg
+c25b294aa92b547fab5484bf436c9dd2 asterisk-1.6.1.7-rc2.tar.gz
+863d39c44b7ea1c6588535f1a56c2b1a asterisk-1.6.1.7-rc2.tar.gz.asc
--- 0006-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch DELETED ---
--- asterisk-strip.sh DELETED ---
More information about the fedora-extras-commits
mailing list