Author: glen Date: Tue Dec 29 17:22:51 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- run configure our own to catch cflags
- system imap and libedit
- patches from fedora
- asterisk -r no longer segfaults
---- Files affected:
packages/asterisk:
asterisk.spec (1.142 -> 1.143) , FHS-paths.patch (NONE -> 1.1) (NEW),
external-libedit.patch (NONE -> 1.1) (NEW), pkg-config-gmime.patch (NONE ->
1.1) (NEW)
---- Diffs:
================================================================
Index: packages/asterisk/asterisk.spec
diff -u packages/asterisk/asterisk.spec:1.142
packages/asterisk/asterisk.spec:1.143
--- packages/asterisk/asterisk.spec:1.142 Tue Dec 29 18:03:04 2009
+++ packages/asterisk/asterisk.spec Tue Dec 29 18:22:46 2009
@@ -6,6 +6,7 @@
# - CFLAGS passing
# - fix bluetooth patch
# - package commandline tools (aelparse etc.)
+# - system mxml
#
# Conditional build:
%bcond_with rxfax # without rx (also tx :-D) fax
@@ -17,7 +18,7 @@
%bcond_with verbose # verbose build
%define spandsp_version 0.0.2pre26
-%define rel 0.1
+%define rel 0.3
Summary: Asterisk PBX
Summary(pl.UTF-8): Centralka (PBX) Asterisk
Name: asterisk
@@ -43,6 +44,9 @@
Patch2: %{name}-no_k6_on_sparc.patch
Patch3: %{name}-lib.patch
Patch4: %{name}-ppc.patch
+Patch5: external-libedit.patch
+Patch6: pkg-config-gmime.patch
+Patch7: FHS-paths.patch
#
http://soft-switch.org/downloads/spandsp/spandsp-%{spandsp_version}/asterisk-1.2.x/apps_Makefile.patch
Patch10: %{name}-txfax-Makefile.patch
Patch11: %{name}-fix-ptlib.patch
@@ -68,7 +72,7 @@
BuildRequires: gcc >= 5:3.4
BuildRequires: gmime22-devel
BuildRequires: iksemel-devel
-BuildRequires: imap-static
+BuildRequires: imap-devel
BuildRequires: jack-audio-connection-kit-devel
BuildRequires: libcap-devel
BuildRequires: libogg-devel
@@ -169,10 +173,9 @@
#%patch2 -p1
#%patch3 -p1
%patch4 -p1
-#%patch5 -p1
-#%patch6 -p1
-#%patch7 -p1
-#%patch9 -p1
+%patch5 -p0
+%patch6 -p0
+%patch7 -p0
%if %{with rxfax}
cd apps
@@ -193,10 +196,14 @@
sed -i -e "s#/usr/lib/#/usr/%{_lib}/#g#" Makefile
+%if 0
mkdir -p imap/c-client
ln -s %{_libdir}/libc-client.a imap/c-client/c-client.a
ln -s %{_includedir}/imap/* imap/c-client/
echo '-lssl -lpam' > imap/c-client/LDFLAGS
+%else
+rm -rf imap
+%endif
%build
rm -f pbx/.depend
@@ -207,9 +214,28 @@
export CPPFLAGS="%{rpmcppflags} -I/usr/include/openh323"
export WGET="/bin/true"
+
+# be sure to invoke ./configure with our flags
+cd menuselect/mxml
+%configure2_13
+cd ../../
+
+cd menuselect
+%{__aclocal}
+%{__autoheader}
+%{__autoconf}
+%configure
+cd ..
+
+cd main/editline
+%configure2_13
+cd ../..
+
%configure \
%{?with_bristuff:--with-gsmat=%{_prefix}} \
- --with-imap="`pwd`"/imap
+ --with-imap=system \
+ --with-gsm=/usr \
+ --with-libedit=yes
# safe checks
%{?with_bristuff:grep '^#define HAVE_GSMAT 1' include/asterisk/autoconfig.h ||
exit 1}
@@ -366,6 +392,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.143 2009/12/29 17:22:46 glen
+- run configure our own to catch cflags
+- system imap and libedit
+- patches from fedora
+- asterisk -r no longer segfaults
+
Revision 1.142 2009/12/29 17:03:04 glen
- up to 1.6.1.12
================================================================
Index: packages/asterisk/FHS-paths.patch
diff -u /dev/null packages/asterisk/FHS-paths.patch:1.1
--- /dev/null Tue Dec 29 18:22:51 2009
+++ packages/asterisk/FHS-paths.patch Tue Dec 29 18:22:46 2009
@@ -0,0 +1,707 @@
+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 @@
+
+
+ [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 @@
+
+ [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 @@
+
+ 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()
+ {
+- 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 @@
+ 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 @@
+ 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 @@
+
+ }
+ 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 @@
+ 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 @@
+ // 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 @@
+ }
+ 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: 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),
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/asterisk/asterisk.spec?r1=1.142&r2=1.143&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
