rpms/asterisk/devel 0011-Fix-up-some-paths.patch, NONE, 1.1 0012-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch, NONE, 1.1 0013-Bridging-work-as-of-svn-rev-174216.patch, NONE, 1.1 0014-Adding-in-CLI-apps.patch, NONE, 1.1 0015-Update-autoconf.patch, NONE, 1.1 .cvsignore, 1.19, 1.20 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch, 1.9, 1.10 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch, 1.9, 1.10 0003-Add-chan_mobile-from-asterisk-addons.patch, 1.5, 1.6 0004-Use-pkgconfig-to-check-for-Lua.patch, 1.5, 1.6 0005-Build-using-external-libedit.patch, 1.4, 1.5 0006-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch, 1.4, 1.5 0007-Define-missing-variable-when-compiling-on-PPC.patch, 1.3, 1.4 0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch, 1.3, 1.4 0009-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch, 1.3, 1.4 0010-my-guess-as-replacements-for-the-missing-broken-stuf.patch, 1.3, 1.4 asterisk.spec, 1.48, 1.49 menuselect.makeopts, 1.4, 1.5 sources, 1.19, 1.20 0011-Update-autoconf.patch, 1.3, NONE 0012-Fix-up-some-paths.patch, 1.2, NONE 0013-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch, 1.1, NONE
Jeffrey C. Ollie
jcollie at fedoraproject.org
Mon Feb 9 05:54:23 UTC 2009
- Previous message: rpms/perl-Time-Progress/F-10 perl-Time-Progress.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message: rpms/perl-Lingua-Stem-Snowball/F-10 perl-Lingua-Stem-Snowball.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jcollie
Update of /cvs/pkgs/rpms/asterisk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9101
Modified Files:
.cvsignore
0001-Modify-init-scripts-for-better-Fedora-compatibility.patch
0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
0003-Add-chan_mobile-from-asterisk-addons.patch
0004-Use-pkgconfig-to-check-for-Lua.patch
0005-Build-using-external-libedit.patch
0006-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch
0007-Define-missing-variable-when-compiling-on-PPC.patch
0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch
0009-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch
0010-my-guess-as-replacements-for-the-missing-broken-stuf.patch
asterisk.spec menuselect.makeopts sources
Added Files:
0011-Fix-up-some-paths.patch
0012-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch
0013-Bridging-work-as-of-svn-rev-174216.patch
0014-Adding-in-CLI-apps.patch 0015-Update-autoconf.patch
Removed Files:
0011-Update-autoconf.patch 0012-Fix-up-some-paths.patch
0013-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch
Log Message:
* Sun Feb 8 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1-0.21.rc1
- Update to 1.6.1-rc1
- Add backport of conference bridging that is slated for 1.6.2
- Add patches to conference bridging that implement CLI apps
0011-Fix-up-some-paths.patch:
--- NEW FILE 0011-Fix-up-some-paths.patch ---
>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.
When there is no CallerID, P and p options will always record an intro
for the incoming caller. This intro will be stored temporarily in the
-\path{/var/lib/asterisk/sounds/priv-callerintros} dir, under the name
+\path{/usr/share/asterisk/sounds/priv-callerintros} dir, under the name
NOCALLERID\_$<$extension$>$ $<$channelname$>$ and will be erased after the
callee decides what to do with the call.
@@ -245,7 +245,7 @@ introductions are stored and re-used for the convenience of the CALLER.
\subsubsection{Introductions}
Unless instructed to not save introductions (see the 'n' option above),
the screening modes will save the recordings of the caller's names in
-the directory \path{/var/lib/asterisk/sounds/priv-callerintros}, if they have
+the directory \path{/usr/share/asterisk/sounds/priv-callerintros}, if they have
a CallerID. Just the 10-digit callerid numbers are used as filenames,
with a ".gsm" at the end.
@@ -260,7 +260,7 @@ loudspeakers, and perhaps other nifty things. For instance:
\begin{astlisting}
\begin{verbatim}
-exten => s,6,Set(PATH=/var/lib/asterisk/sounds/priv-callerintros)
+exten => s,6,Set(PATH=/usr/share/asterisk/sounds/priv-callerintros)
exten => s,7,System(/usr/bin/play ${PATH}/${CALLERID(num)}.gsm&,0)
\end{verbatim}
\end{astlisting}
diff --git a/pbx/ael/ael-test/ael-test3/extensions.ael b/pbx/ael/ael-test/ael-test3/extensions.ael
index ff1f6ae..53fb918 100755
--- a/pbx/ael/ael-test/ael-test3/extensions.ael
+++ b/pbx/ael/ael-test/ael-test3/extensions.ael
@@ -2049,7 +2049,7 @@ macro ciddial2(dialnum, lookup, waittime, dialopts, ddev) // give priority to tc
macro callerid-liar()
{
- 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 @@ 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;
@@ -2138,7 +2138,7 @@ context homeline {
verbose(direct is XXX#${direct}XXXX);
Playback(greetings/direct); // Welcome to the Murphy residence. This system will automatically try to connect you to...
Playback(/var/spool/asterisk/voicemail/default/${direct}/greet);
- 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 @@ 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;
@@ -2421,51 +2421,51 @@ context homeline-kids {
Background(murphy-homeline-kids); // Which Kid? 1=Sean, 2:Eric, 3:Ryan, 4:Kyle, 5:Amber, 6:Alex, 7:Neal
}
1 => { // SEAN
- 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 @@ 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);
@@ -2778,7 +2778,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/ael-vtest13/extensions.ael b/pbx/ael/ael-test/ael-vtest13/extensions.ael
index b7e953e..48baaef 100755
--- a/pbx/ael/ael-test/ael-vtest13/extensions.ael
+++ b/pbx/ael/ael-test/ael-vtest13/extensions.ael
@@ -2048,7 +2048,7 @@ macro ciddial2(dialnum, lookup, waittime, dialopts, ddev) // give priority to tc
macro callerid-liar()
{
- 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()
[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)
[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
0012-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch:
--- NEW FILE 0012-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch ---
>From e60e1cdc9a967778a007acfefa80184125b58d0c Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Sun, 4 Jan 2009 19:22:39 -0600
Subject: [PATCH 12/15] Add LDAP schema that is compatible with Fedora Directory Server.
---
contrib/scripts/99asterisk.ldif | 489 +++++++++++++++++++++++++++++++++++++++
1 files changed, 489 insertions(+), 0 deletions(-)
create mode 100644 contrib/scripts/99asterisk.ldif
diff --git a/contrib/scripts/99asterisk.ldif b/contrib/scripts/99asterisk.ldif
new file mode 100644
index 0000000..ef878a8
--- /dev/null
+++ b/contrib/scripts/99asterisk.ldif
@@ -0,0 +1,489 @@
+dn: cn=schema
+#
+attributeTypes: (
+
+ NAME 'AstContext'
+ DESC 'Asterisk Context'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstExtension'
+ DESC 'Asterisk Extension'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstPriority'
+ DESC 'Asterisk Priority'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstApplication'
+ DESC 'Asterisk Application'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstApplicationData'
+ DESC 'Asterisk Application Data'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountAMAFlags'
+ DESC 'Asterisk Account AMA Flags'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountCallerID'
+ DESC 'Asterisk Account CallerID'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountContext'
+ DESC 'Asterisk Account Context'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountMailbox'
+ DESC 'Asterisk Account Mailbox'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstMD5secret'
+ DESC 'Asterisk Account MD5 Secret'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountDeny'
+ DESC 'Asterisk Account Deny'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountPermit'
+ DESC 'Asterisk Account Permit'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountQualify'
+ DESC 'Asterisk Account Qualify'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountType'
+ DESC 'Asterisk Account Type'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountDisallowedCodec'
+ DESC 'Asterisk Account Disallowed Codec'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountExpirationTimestamp'
+ DESC 'Asterisk Account Allowed Codec'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountRegistrationContext'
+ DESC 'Asterisk Account AMA Flags'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountRegistrationExten'
+ DESC 'Asterisk Account AMA Flags'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountNoTransfer'
+ DESC 'Asterisk Account AMA Flags'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountCallGroup'
+ DESC 'Asterisk Account Call Group'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountCanReinvite'
+ DESC 'Asterisk Account Can Reinvite'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountDTMFMode'
+ DESC 'Asterisk Account DTMF Flags'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountFromUser'
+ DESC 'Asterisk Account From User'
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountFromDomain'
+ DESC 'Asterisk Account From Domain'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountFullContact'
+ DESC 'Asterisk Account Full Contact'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountHost'
+ DESC 'Asterisk Account Host'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountInsecure'
+ DESC 'Asterisk Account Insecure'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountNAT'
+ DESC 'Asterisk Account NAT'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountPickupGroup'
+ DESC 'Asterisk Account PickupGroup'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountPort'
+ DESC 'Asterisk Account Port'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountRestrictCID'
+ DESC 'Asterisk Restrict CallerID'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountRTPTimeout'
+ DESC 'Asterisk RTP Timeout'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountRTPHoldTimeout'
+ DESC 'Asterisk RTP Hold Timeout'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountRealmedPassword'
+ DESC 'Asterisk RTP Hold Timeout'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountAllowedCodec'
+ DESC 'Asterisk Account Allowed Codec'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountMusicOnHold'
+ DESC 'Asterisk Account Allowed Codec'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountCanCallForward'
+ DESC 'Asterisk Can CAll Forward'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountSecret'
+ DESC 'Asterisk Can CAll Forward'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountName'
+ DESC 'Asterisk Account Username'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstConfigFilename'
+ DESC 'Asterisk LDAP Configuration Filename'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstConfigCategory'
+ DESC 'Asterisk LDAP Configuration Category'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstConfigCategoryMetric'
+ DESC 'Asterisk LDAP Configuration Category Metric'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstConfigVariableName'
+ DESC 'Asterisk LDAP Configuration Variable Name'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstConfigVariableValue'
+ DESC 'Asterisk LDAP Configuration Variable Value'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstConfigCommented'
+ DESC 'Asterisk LDAP Configuration Commented'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountIPAddress'
+ DESC 'Asterisk Account IP Address'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountDefaultUser'
+ DESC 'Asterisk Account Default User'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+attributeTypes: (
+
+ NAME 'AstAccountRegistrationServer'
+ DESC 'Asterisk Account Registration Server'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+#
+objectClasses: (
+
+ NAME 'AsteriskExtension'
+ DESC 'PBX Extension Information for Asterisk'
+ SUP top
+ AUXILIARY
+ MUST cn
+ MAY ( AstContext $ AstExtension $ AstPriority $ AstApplication
+ $ AstApplicationData )
+ )
+#
+objectClasses: (
+
+ NAME 'AsteriskIAXUser'
+ DESC 'IAX2 User information for Asterisk'
+ SUP AsteriskExtension
+ AUXILIARY
+ MUST cn
+ MAY ( AstAccountAMAFlags $ AstAccountCallerID $ AstAccountContext
+ $ AstAccountFullContact $ AstAccountHost $ AstAccountMailbox $ AstMD5secret
+ $ AstAccountDeny $ AstAccountPermit $ AstAccountPort $ AstAccountQualify
+ $ AstAccountType $ AstAccountDisallowedCodec $ AstAccountExpirationTimestamp
+ $ AstAccountRegistrationContext$ AstAccountRegistrationExten
+ $ AstAccountNoTransfer $ AstAccountName )
+ )
+#
+objectClasses: (
+
+ NAME 'AsteriskSIPUser'
+ DESC 'SIP User information for Asterisk'
+ SUP AsteriskExtension
+ AUXILIARY
+ MUST cn
+ MAY ( AstAccountAMAFlags $ AstAccountCallGroup $ AstAccountCallerID
+ $ AstAccountCanReinvite $ AstAccountContext $ AstAccountDefaultUser
+ $ AstAccountDTMFMode $ AstAccountFromUser $ AstAccountFromDomain
+ $ AstAccountFullContact $ AstAccountHost $ AstAccountInsecure
+ $ AstAccountIPAddress $ AstAccountMailbox $ AstAccountRealmedPassword
+ $ AstAccountNAT $ AstAccountDeny $ AstAccountPermit $ AstAccountPickupGroup
+ $ AstAccountPort $ AstAccountQualify $ AstAccountRestrictCID
+ $ AstAccountRTPTimeout $ AstAccountRTPHoldTimeout $ AstAccountType
+ $ AstAccountDisallowedCodec $ AstAccountAllowedCodec $ AstAccountMusicOnHold
+ $ AstAccountExpirationTimestamp $ AstAccountRegistrationContext
+ $ AstAccountRegistrationExten $ AstAccountRegistrationServer
+ $ AstAccountCanCallForward $ AstAccountSecret $ AstAccountName )
+ )
+#
+objectClasses: (
+
+ NAME 'AsteriskConfig'
+ DESC 'Asterisk configuration Information'
+ SUP top
+ AUXILIARY
+ MUST cn
+ MAY ( AstConfigFilename $ AstConfigCategory $ AstConfigCategoryMetric
+ $ AstConfigVariableName $ AstConfigVariableValue $ AstConfigCommented )
+ )
--
1.6.1
0013-Bridging-work-as-of-svn-rev-174216.patch:
--- NEW FILE 0013-Bridging-work-as-of-svn-rev-174216.patch ---
>From 4debddc6428e52e3df96c7aab9f17a62304dc5d9 Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Sun, 8 Feb 2009 22:56:41 -0600
Subject: [PATCH 13/15] Bridging work as of svn rev 174216.
---
Makefile | 2 +-
apps/app_bridgetest.c | 121 +++
apps/app_confbridge.c | 793 +++++++++++++++++++
bridges/Makefile | 26 +
bridges/bridge_builtin_features.c | 257 +++++++
bridges/bridge_multiplexed.c | 326 ++++++++
bridges/bridge_simple.c | 103 +++
bridges/bridge_softmix.c | 297 ++++++++
bridges/bridge_zaptel.c | 255 +++++++
channels/chan_bridge.c | 246 ++++++
include/asterisk/bridging.h | 426 +++++++++++
include/asterisk/bridging_features.h | 298 ++++++++
include/asterisk/bridging_technology.h | 174 +++++
include/asterisk/channel.h | 1 +
main/Makefile | 2 +-
main/bridging.c | 1296 ++++++++++++++++++++++++++++++++
16 files changed, 4621 insertions(+), 2 deletions(-)
create mode 100644 apps/app_bridgetest.c
create mode 100644 apps/app_confbridge.c
create mode 100644 bridges/Makefile
create mode 100644 bridges/bridge_builtin_features.c
create mode 100644 bridges/bridge_multiplexed.c
create mode 100644 bridges/bridge_simple.c
create mode 100644 bridges/bridge_softmix.c
create mode 100644 bridges/bridge_zaptel.c
create mode 100644 channels/chan_bridge.c
create mode 100644 include/asterisk/bridging.h
create mode 100644 include/asterisk/bridging_features.h
create mode 100644 include/asterisk/bridging_technology.h
create mode 100644 main/bridging.c
diff --git a/Makefile b/Makefile
index 444a7e4..b5d2c45 100644
--- a/Makefile
+++ b/Makefile
@@ -290,7 +290,7 @@ endif
# value directly to ASTCFLAGS
ASTCFLAGS+=$(MALLOC_DEBUG)$(OPTIONS)
-MOD_SUBDIRS:=channels pbx apps codecs formats cdr funcs tests main res $(LOCAL_MOD_SUBDIRS)
+MOD_SUBDIRS:=channels pbx apps codecs formats cdr bridges funcs tests main res $(LOCAL_MOD_SUBDIRS)
OTHER_SUBDIRS:=utils agi
SUBDIRS:=$(OTHER_SUBDIRS) $(MOD_SUBDIRS)
SUBDIRS_INSTALL:=$(SUBDIRS:%=%-install)
diff --git a/apps/app_bridgetest.c b/apps/app_bridgetest.c
new file mode 100644
index 0000000..380eaa3
--- /dev/null
+++ b/apps/app_bridgetest.c
@@ -0,0 +1,121 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
+ *
+ * Copyright (C) 1999 - 2007, Digium, Inc.
+ *
+ * Joshua Colp <jcolp at digium.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*! \file
+ *
+ * \brief Bridging API Test Application
+ *
+ * \author Joshua Colp <jcolp at digium.com>
+ *
+ * This is a test application for the new bridging API.
+ * \ingroup applications
+ */
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/lock.h"
+#include "asterisk/app.h"
+#include "asterisk/dial.h"
+#include "asterisk/bridging.h"
+
+static char *app = "BridgeTest";
+static char *synopsis =
+"Bridging API Test Application.";
+static char *descrip = "Bridging API Test Application.\n";
+
+static int bridge_test_exec(struct ast_channel *chan, void *data)
+{
+ struct ast_dial *dial = NULL;
+ struct ast_bridge *bridge0 = NULL, *bridge1 = NULL;
+ char *tech = NULL, *resource = NULL;
+
+ if (ast_strlen_zero(data)) {
+ ast_log(LOG_WARNING, "%s requires an argument (Tech/Resource)\n", app);
+ return -1;
+ }
+
+ /* Create local duplicate for manipulation */
+ tech = ast_strdupa(data);
+
+ /* Split up technology and resource */
+ if (!(resource = strchr(tech, '/'))) {
+ ast_log(LOG_WARNING, "%s requires an argument (Tech/Resource)\n", app);
+ return -1;
+ }
+ *resource++ = '\0';
+
+ /* Okay... create a new dialing structure */
+ if (!(dial = ast_dial_create()))
+ return -1;
+
+ ast_dial_append(dial, tech, resource);
+
+ /* Actually dial what we want to call */
+ if (ast_dial_run(dial, chan, 0) != AST_DIAL_RESULT_ANSWERED || !ast_dial_answered(dial)) {
+ ast_log(LOG_WARNING, "Failed to call %s\n", (char*)data);
+ ast_dial_destroy(dial);
+ return -1;
+ }
+
+ /* Create a new bridge to put the channel that answered into */
+ bridge0 = ast_bridge_new(AST_BRIDGE_CAPABILITY_1TO1MIX, AST_BRIDGE_FLAG_DISSOLVE | AST_BRIDGE_FLAG_SMART);
+
+ /* Impart it onto the bridge... */
+ ast_bridge_impart(bridge0, ast_dial_answered(dial), NULL, NULL);
+
+ /* Create a new bridge to put the channel that called into */
+ bridge1 = ast_bridge_new(AST_BRIDGE_CAPABILITY_1TO1MIX, AST_BRIDGE_FLAG_DISSOLVE | AST_BRIDGE_FLAG_SMART);
+
+ /* Impart this one as well onto the bridge... */
+ ast_bridge_impart(bridge1, chan, NULL, NULL);
+
+ /* Merge them together */
+ ast_bridge_merge(bridge0, bridge1);
+
+ /* Destroy the second bridge since it's over */
+ ast_bridge_destroy(bridge1);
+
+ /* Hang out for a bit */
+ usleep(10000000);
+
+ return 0;
+}
+
+static int unload_module(void)
+{
+ return ast_unregister_application(app);
+}
+
+static int load_module(void)
+{
+ return ast_register_application(app, bridge_test_exec, synopsis, descrip);
+}
+
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Bridging API Test Application");
diff --git a/apps/app_confbridge.c b/apps/app_confbridge.c
new file mode 100644
index 0000000..bcac44f
--- /dev/null
+++ b/apps/app_confbridge.c
@@ -0,0 +1,793 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
+ *
+ * Copyright (C) 2007-2008, Digium, Inc.
+ *
+ * Joshua Colp <jcolp at digium.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
[...4375 lines suppressed...]
+ ao2_ref(bridge0, +1);
+
+ bridge_array_add(bridge0, bridge_channel->chan);
+
+ /* Make the channel compatible with the new bridge it is joining or else formats would go amuck */
+ bridge_make_compatible(bridge0, bridge_channel);
+
+ /* Tell the technology handling bridge0 that the bridge channel is joining */
+ if (bridge0->technology->join) {
+ ast_debug(1, "Giving bridge technology %s notification that %p is joining bridge %p\n", bridge0->technology->name, bridge_channel, bridge0);
+ if (bridge0->technology->join(bridge0, bridge_channel)) {
+ ast_debug(1, "Bridge technology %s failed to join %p to bridge %p\n", bridge0->technology->name, bridge_channel, bridge0);
+ }
+ }
+
+ /* Poke the bridge channel, this will cause it to wake up and execute the proper threading model for the new bridge it is in */
+ pthread_kill(bridge_channel->thread, SIGURG);
+ ast_mutex_lock(&bridge_channel->lock);
+ ast_cond_signal(&bridge_channel->cond);
+ ast_mutex_unlock(&bridge_channel->lock);
+ }
+
+ ast_debug(1, "Merged channels from bridge %p into bridge %p\n", bridge1, bridge0);
+
+ ao2_unlock(bridge1);
+ ao2_unlock(bridge0);
+
+ return 0;
+}
+
+int ast_bridge_suspend(struct ast_bridge *bridge, struct ast_channel *chan)
+{
+ struct ast_bridge_channel *bridge_channel;
+
+ ao2_lock(bridge);
+
+ if (!(bridge_channel = find_bridge_channel(bridge, chan))) {
+ ao2_unlock(bridge);
+ return -1;
+ }
+
+ bridge_channel->suspended = 1;
+
+ bridge_array_remove(bridge, chan);
+
+ ao2_unlock(bridge);
+
+ return 0;
+}
+
+int ast_bridge_unsuspend(struct ast_bridge *bridge, struct ast_channel *chan)
+{
+ struct ast_bridge_channel *bridge_channel;
+
+ ao2_lock(bridge);
+
+ if (!(bridge_channel = find_bridge_channel(bridge, chan))) {
+ ao2_unlock(bridge);
+ return -1;
+ }
+
+ bridge_channel->suspended = 0;
+
+ bridge_array_add(bridge, chan);
+
+ ao2_unlock(bridge);
+
+ return 0;
+}
+
+void ast_bridge_technology_suspend(struct ast_bridge_technology *technology)
+{
+ technology->suspended = 1;
+ return;
+}
+
+void ast_bridge_technology_unsuspend(struct ast_bridge_technology *technology)
+{
+ technology->suspended = 0;
+ return;
+}
+
+int ast_bridge_features_register(enum ast_bridge_builtin_feature feature, ast_bridge_features_hook_callback callback, const char *dtmf)
+{
+ if (builtin_features_handlers[feature]) {
+ return -1;
+ }
+
+ if (!ast_strlen_zero(dtmf)) {
+ ast_copy_string(builtin_features_dtmf[feature], dtmf, sizeof(builtin_features_dtmf[feature]));
+ }
+
+ builtin_features_handlers[feature] = callback;
+
+ return 0;
+}
+
+int ast_bridge_features_unregister(enum ast_bridge_builtin_feature feature)
+{
+ if (!builtin_features_handlers[feature]) {
+ return -1;
+ }
+
+ builtin_features_handlers[feature] = NULL;
+
+ return 0;
+}
+
+int ast_bridge_features_hook(struct ast_bridge_features *features, const char *dtmf, ast_bridge_features_hook_callback callback, void *hook_pvt)
+{
+ struct ast_bridge_features_hook *hook = NULL;
+
+ /* Allocate new memory and setup it's various variables */
+ if (!(hook = ast_calloc(1, sizeof(*hook)))) {
+ return -1;
+ }
+
+ ast_copy_string(hook->dtmf, dtmf, sizeof(hook->dtmf));
+ hook->callback = callback;
+ hook->hook_pvt = hook_pvt;
+
+ /* Once done we add it onto the list. Now it will be picked up when DTMF is used */
+ AST_LIST_INSERT_TAIL(&features->hooks, hook, entry);
+
+ features->usable = 1;
+
+ return 0;
+}
+
+int ast_bridge_features_enable(struct ast_bridge_features *features, enum ast_bridge_builtin_feature feature, const char *dtmf, void *config)
+{
+ /* If no alternate DTMF stream was provided use the default one */
+ if (ast_strlen_zero(dtmf)) {
+ dtmf = builtin_features_dtmf[feature];
+ /* If no DTMF is still available (ie: it has been disabled) then error out now */
+ if (ast_strlen_zero(dtmf)) {
+ ast_debug(1, "Failed to enable built in feature %d on %p, no DTMF string is available for it.\n", feature, features);
+ return -1;
+ }
+ }
+
+ if (!builtin_features_handlers[feature]) {
+ return -1;
+ }
+
+ /* The rest is basically pretty easy. We create another hook using the built in feature's callback and DTMF, easy as pie. */
+ return ast_bridge_features_hook(features, dtmf, builtin_features_handlers[feature], config);
+}
+
+int ast_bridge_features_set_flag(struct ast_bridge_features *features, enum ast_bridge_feature_flags flag)
+{
+ ast_set_flag(&features->feature_flags, flag);
+ features->usable = 1;
+ return 0;
+}
+
+int ast_bridge_features_init(struct ast_bridge_features *features)
+{
+ /* Zero out the structure */
+ memset(features, 0, sizeof(*features));
+
+ /* Initialize the hooks list, just in case */
+ AST_LIST_HEAD_INIT_NOLOCK(&features->hooks);
+
+ return 0;
+}
+
+int ast_bridge_features_cleanup(struct ast_bridge_features *features)
+{
+ struct ast_bridge_features_hook *hook = NULL;
+
+ /* This is relatively simple, hooks are kept as a list on the features structure so we just pop them off and free them */
+ while ((hook = AST_LIST_REMOVE_HEAD(&features->hooks, entry))) {
+ ast_free(hook);
+ }
+
+ return 0;
+}
+
+int ast_bridge_dtmf_stream(struct ast_bridge *bridge, const char *dtmf, struct ast_channel *chan)
+{
+ struct ast_bridge_channel *bridge_channel = NULL;
+
+ ao2_lock(bridge);
+
+ AST_LIST_TRAVERSE(&bridge->channels, bridge_channel, entry) {
+ if (bridge_channel->chan == chan) {
+ continue;
+ }
+ ast_copy_string(bridge_channel->dtmf_stream_q, dtmf, sizeof(bridge_channel->dtmf_stream_q));
+ ast_bridge_change_state(bridge_channel, AST_BRIDGE_CHANNEL_STATE_DTMF);
+ }
+
+ ao2_unlock(bridge);
+
+ return 0;
+}
--
1.6.1
0014-Adding-in-CLI-apps.patch:
--- NEW FILE 0014-Adding-in-CLI-apps.patch ---
>From 8c73da265c76acc07a9fd776183bcb7990e00368 Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Sun, 8 Feb 2009 22:59:58 -0600
Subject: [PATCH 14/15] Adding in CLI apps.
---
apps/app_confbridge.c | 165 +++++++++++++++++++++++++++++++++++++++++++++++++
bridges/Makefile | 6 ++-
2 files changed, 170 insertions(+), 1 deletions(-)
diff --git a/apps/app_confbridge.c b/apps/app_confbridge.c
index bcac44f..f38060f 100644
--- a/apps/app_confbridge.c
+++ b/apps/app_confbridge.c
@@ -36,6 +36,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include <string.h>
#include <signal.h>
+#include "asterisk/cli.h"
#include "asterisk/file.h"
#include "asterisk/logger.h"
#include "asterisk/channel.h"
@@ -763,11 +764,173 @@ static int confbridge_exec(struct ast_channel *chan, void *data)
return res;
}
+static char *complete_confbridge_name(const char *line, const char *word, int pos, int state)
+{
+ int which = 0;
+ struct conference_bridge *bridge = NULL;
+ char *res = NULL;
+ int wordlen = strlen(word);
+ struct ao2_iterator i;
+
+ i = ao2_iterator_init(conference_bridges, 0);
+ while ((bridge = ao2_iterator_next(&i))) {
+ if (!strncasecmp(bridge->name, word, wordlen) && ++which > state) {
+ res = ast_strdup(bridge->name);
+ ao2_ref(bridge, -1);
+ break;
+ }
+ ao2_ref(bridge, -1);
+ }
+
+ return res;
+}
+
+static char *handle_cli_confbridge_kick(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
+{
+
+ struct conference_bridge *bridge = NULL;
+ struct conference_bridge tmp;
+ struct conference_bridge_user *participant = NULL;
+
+ switch (cmd) {
+ case CLI_INIT:
+ e->command = "confbridge kick";
+ e->usage =
+ "Usage: confbridge kick <name> <channel>\n"
+ " Kicks a channel out of the conference bridge.\n";
+ return NULL;
+ case CLI_GENERATE:
+ if (a->pos == 2) {
+ return complete_confbridge_name(a->line, a->word, a->pos, a->n);
+ }
+ /*
+ if (a->pos == 3) {
+ return complete_confbridge_channel(a->line, a->word, a->pos, a->n);
+ }
+ */
+ return NULL;
+ }
+
+ if (a->argc != 4) {
+ return CLI_SHOWUSAGE;
+ }
+
+ ast_copy_string(tmp.name, a->argv[2], sizeof(tmp.name));
+ bridge = ao2_find(conference_bridges, &tmp, OBJ_POINTER);
+ if (!bridge) {
+ ast_cli(a->fd, "No conference bridge named '%s' found!\n", a->argv[2]);
+ return CLI_SUCCESS;
+ }
+ ao2_lock(bridge);
+ AST_LIST_TRAVERSE(&bridge->users_list, participant, list) {
+ if (!strncmp(a->argv[3], participant->chan->name, strlen(participant->chan->name))) {
+ break;
+ }
+ }
+ if (participant) {
+ ast_cli(a->fd, "Kicking %s from confbridge %s\n", participant->chan->name, bridge->name);
+ participant->kicked = 1;
+ ast_bridge_remove(bridge->bridge, participant->chan);
+ }
+ ao2_unlock(bridge);
+ ao2_ref(bridge, -1);
+ return CLI_SUCCESS;
+
+
+ return CLI_SHOWUSAGE;
+}
+
+static char *handle_cli_confbridge_list(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
+{
+ struct ao2_iterator i;
+ struct conference_bridge *bridge = NULL;
+ struct conference_bridge tmp;
+ struct conference_bridge_user *participant = NULL;
+
+ switch (cmd) {
+ case CLI_INIT:
+ e->command = "confbridge list";
+ e->usage =
+ "Usage: confbridge list [<name>]\n"
+ " Lists all currently active conference bridges.\n";
+ return NULL;
+ case CLI_GENERATE:
+ if (a->pos == 2) {
+ return complete_confbridge_name(a->line, a->word, a->pos, a->n);
+ }
+ return NULL;
+ }
+
+ if (a->argc == 2) {
+ ast_cli(a->fd, "Conference Bridge Name Users Marked Locked?\n");
+ ast_cli(a->fd, "================================ ====== ====== ========\n");
+ i = ao2_iterator_init(conference_bridges, 0);
+ while ((bridge = ao2_iterator_next(&i))) {
+ ast_cli(a->fd, "%-32s %6i %6i %s\n", bridge->name, bridge->users, bridge->markedusers, (bridge->locked ? "locked" : "unlocked"));
+ ao2_ref(bridge, -1);
+ }
+ return CLI_SUCCESS;
+ }
+
+ if (a->argc == 3) {
+ ast_copy_string(tmp.name, a->argv[2], sizeof(tmp.name));
+ bridge = ao2_find(conference_bridges, &tmp, OBJ_POINTER);
+ if (!bridge) {
+ ast_cli(a->fd, "No conference bridge named '%s' found!\n", a->argv[2]);
+ return CLI_SUCCESS;
+ }
+ ast_cli(a->fd, "Channel Flags\n");
+ ast_cli(a->fd, "================================ ================\n");
+ AST_LIST_TRAVERSE(&bridge->users_list, participant, list) {
+ ast_cli(a->fd, "%-32s ", participant->chan->name);
+ if (ast_test_flag(&participant->flags, OPTION_MARKEDUSER)) {
+ ast_cli(a->fd, "A");
+ }
+ if (ast_test_flag(&participant->flags, OPTION_ADMIN)) {
+ ast_cli(a->fd, "a");
+ }
+ if (ast_test_flag(&participant->flags, OPTION_ANNOUNCEUSERCOUNT)) {
+ ast_cli(a->fd, "c");
+ }
+ if (ast_test_flag(&participant->flags, OPTION_MENU)) {
+ ast_cli(a->fd, "m");
+ }
+ if (ast_test_flag(&participant->flags, OPTION_MUSICONHOLD)) {
+ ast_cli(a->fd, "M(%s)", participant->opt_args[OPTION_MUSICONHOLD_CLASS]);
+ }
+ if (ast_test_flag(&participant->flags, OPTION_NOONLYPERSON)) {
+ ast_cli(a->fd, "1");
+ }
+ if (ast_test_flag(&participant->flags, OPTION_STARTMUTED)) {
+ ast_cli(a->fd, "s");
+ }
+ if (ast_test_flag(&participant->flags, OPTION_WAITMARKED)) {
+ ast_cli(a->fd, "w");
+ }
+ if (ast_test_flag(&participant->flags, OPTION_QUIET)) {
+ ast_cli(a->fd, "q");
+ }
+ ast_cli(a->fd, "\n");
+ }
+ ao2_ref(bridge, -1);
+ return CLI_SUCCESS;
+ }
+
+ return CLI_SHOWUSAGE;
+}
+
+static struct ast_cli_entry cli_confbridge[] = {
+ AST_CLI_DEFINE(handle_cli_confbridge_list, "List conference bridges and participants."),
+ AST_CLI_DEFINE(handle_cli_confbridge_kick, "Kick participants out of conference bridges.")
+};
+
/*! \brief Called when module is being unloaded */
static int unload_module(void)
{
int res = ast_unregister_application(app);
+ ast_cli_unregister_multiple(cli_confbridge, sizeof(cli_confbridge) / sizeof(struct ast_cli_entry));
+
/* Get rid of the conference bridges container. Since we only allow dynamic ones none will be active. */
ao2_ref(conference_bridges, -1);
@@ -787,6 +950,8 @@ static int load_module(void)
return AST_MODULE_LOAD_DECLINE;
}
+ ast_cli_register_multiple(cli_confbridge, sizeof(cli_confbridge) / sizeof(struct ast_cli_entry));
+
return AST_MODULE_LOAD_SUCCESS;
}
diff --git a/bridges/Makefile b/bridges/Makefile
index b2ba68d..2ef61f2 100644
--- a/bridges/Makefile
+++ b/bridges/Makefile
@@ -9,7 +9,11 @@
# the GNU General Public License
#
--include ../menuselect.makeopts ../menuselect.makedeps
+-include $(ASTTOPDIR)/menuselect.makeopts $(ASTTOPDIR)/menuselect.makedeps
+
+MODULE_PREFIX=bridge
+MENUSELECT_CATEGORY=BRIDGES
+MENUSELECT_DESCRIPTION=Bridging Modules
C_MODS:=$(filter-out $(MENUSELECT_BRIDGES),$(patsubst %.c,%,$(wildcard bridge_*.c)))
CC_MODS:=$(filter-out $(MENUSELECT_BRIDGES),$(patsubst %.cc,%,$(wildcard bridge_*.cc)))
--
1.6.1
0015-Update-autoconf.patch:
--- NEW FILE 0015-Update-autoconf.patch ---
>From 0948a45b88c8d1e4be6bdadc7ad4f87acf691c33 Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Fri, 30 Jan 2009 16:13:36 -0600
Subject: [PATCH 15/15] Update autoconf.
---
configure |23473 ++++++++++++++++++++------------------
include/asterisk/autoconfig.h.in | 60 +-
2 files changed, 12574 insertions(+), 10959 deletions(-)
diff --git a/configure b/configure
index 45c9f2a..b21b693 100755
--- a/configure
+++ b/configure
@@ -1,12 +1,12 @@
#! /bin/sh
-# From configure.ac Revision: 163170 .
+# From configure.ac Revision.
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for asterisk 1.6.
+# Generated by GNU Autoconf 2.63 for asterisk 1.6.
#
# Report bugs to <www.asterisk.org>.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
#
@@ -20,7 +20,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
@@ -42,17 +42,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
as_cr_digits='0123456789'
as_cr_alnum=$as_cr_Letters$as_cr_digits
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- echo "#! /bin/sh" >conf$$.sh
- echo "exit 0" >>conf$$.sh
- chmod +x conf$$.sh
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- PATH_SEPARATOR=';'
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='printf %s\n'
+ as_echo_n='printf %s'
+else
+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+ as_echo_n='/usr/ucb/echo -n'
else
- PATH_SEPARATOR=:
+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+ as_echo_n_body='eval
+ arg=$1;
+ case $arg in
+ *"$as_nl"*)
+ expr "X$arg" : "X\\(.*\\)$as_nl";
+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+ esac;
+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+ '
+ export as_echo_n_body
+ as_echo_n='sh -c $as_echo_n_body as_echo'
fi
- rm -f conf$$.sh
+ export as_echo_body
+ as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ PATH_SEPARATOR=:
+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+ PATH_SEPARATOR=';'
+ }
fi
# Support unset when possible.
@@ -68,8 +96,6 @@ fi
# there to prevent editors from complaining about space-tab.
# (If _AS_PATH_WALK were called with IFS unset, it would disable word
# splitting by setting IFS to empty value.)
-as_nl='
-'
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -92,7 +118,7 @@ if test "x$as_myself" = x; then
as_myself=$0
fi
if test ! -f "$as_myself"; then
- echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
{ (exit 1); exit 1; }
fi
@@ -105,17 +131,10 @@ PS2='> '
PS4='+ '
# NLS nuisances.
-for as_var in \
- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
- LC_TELEPHONE LC_TIME
-do
- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
- eval $as_var=C; export $as_var
- else
- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
# Required to use basename.
if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -137,7 +156,7 @@ as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
sed '/^.*\/\([^/][^/]*\)\/*$/{
s//\1/
q
@@ -163,7 +182,7 @@ else
as_have_required=no
fi
- if test $as_have_required = yes && (eval ":
+ if test $as_have_required = yes && (eval ":
(as_func_return () {
(exit \$1)
}
@@ -245,7 +264,7 @@ IFS=$as_save_IFS
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
@@ -266,7 +285,7 @@ _ASEOF
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
@@ -346,10 +365,10 @@ fi
if test "x$CONFIG_SHELL" != x; then
for as_var in BASH_ENV ENV
- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- done
- export CONFIG_SHELL
- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+ done
+ export CONFIG_SHELL
+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
fi
@@ -418,9 +437,10 @@ fi
test \$exitcode = 0") || {
echo No shell found that supports shell functions.
- echo Please tell autoconf at gnu.org about your system,
- echo including any error possibly output before this
- echo message
+ echo Please tell bug-autoconf at gnu.org about your system,
+ echo including any error possibly output before this message.
+ echo This can help us improve future autoconf versions.
+ echo Configuration will now proceed without shell functions.
}
[...45557 lines suppressed...]
else
- rm -f $ac_file
- mv "$tmp/config.h" $ac_file
+ rm -f "$ac_file"
+ mv "$tmp/config.h" "$ac_file" \
+ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+ { (exit 1); exit 1; }; }
fi
else
- echo "/* $configure_input */"
- cat "$ac_result"
+ $as_echo "/* $configure_input */" \
+ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+ || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
+$as_echo "$as_me: error: could not create -" >&2;}
+ { (exit 1); exit 1; }; }
fi
- rm -f "$tmp/out12"
;;
@@ -51933,6 +53545,11 @@ _ACEOF
chmod +x $CONFIG_STATUS
ac_clean_files=$ac_clean_files_save
+test $ac_write_fail = 0 ||
+ { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
+ { (exit 1); exit 1; }; }
+
# configure is writing to config.log, and then calls config.status.
# config.status does its own redirection, appending to config.log.
@@ -51954,6 +53571,10 @@ if test "$no_create" != yes; then
# would make configure fail if this is the last instruction.
$ac_cs_success || { (exit 1); exit 1; }
fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+ { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
if test "x${silent}" != "xyes" ; then
@@ -51982,17 +53603,17 @@ echo " \$\$\$\$\$\$\$\$\$\$\$\$\$\$\$\$. "
echo
fi
-{ echo "$as_me:$LINENO: Package configured for: " >&5
-echo "$as_me: Package configured for: " >&6;}
-{ echo "$as_me:$LINENO: OS type : $host_os" >&5
-echo "$as_me: OS type : $host_os" >&6;}
-{ echo "$as_me:$LINENO: Host CPU : $host_cpu" >&5
-echo "$as_me: Host CPU : $host_cpu" >&6;}
-{ echo "$as_me:$LINENO: build-cpu:vendor:os: $build_cpu : $build_vendor : $build_os :" >&5
-echo "$as_me: build-cpu:vendor:os: $build_cpu : $build_vendor : $build_os :" >&6;}
-{ echo "$as_me:$LINENO: host-cpu:vendor:os: $host_cpu : $host_vendor : $host_os :" >&5
-echo "$as_me: host-cpu:vendor:os: $host_cpu : $host_vendor : $host_os :" >&6;}
+{ $as_echo "$as_me:$LINENO: Package configured for: " >&5
+$as_echo "$as_me: Package configured for: " >&6;}
+{ $as_echo "$as_me:$LINENO: OS type : $host_os" >&5
+$as_echo "$as_me: OS type : $host_os" >&6;}
+{ $as_echo "$as_me:$LINENO: Host CPU : $host_cpu" >&5
+$as_echo "$as_me: Host CPU : $host_cpu" >&6;}
+{ $as_echo "$as_me:$LINENO: build-cpu:vendor:os: $build_cpu : $build_vendor : $build_os :" >&5
+$as_echo "$as_me: build-cpu:vendor:os: $build_cpu : $build_vendor : $build_os :" >&6;}
+{ $as_echo "$as_me:$LINENO: host-cpu:vendor:os: $host_cpu : $host_vendor : $host_os :" >&5
+$as_echo "$as_me: host-cpu:vendor:os: $host_cpu : $host_vendor : $host_os :" >&6;}
if test "${cross_compiling}" = "yes"; then
- { echo "$as_me:$LINENO: Cross Compilation = YES" >&5
-echo "$as_me: Cross Compilation = YES" >&6;}
+ { $as_echo "$as_me:$LINENO: Cross Compilation = YES" >&5
+$as_echo "$as_me: Cross Compilation = YES" >&6;}
fi
diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in
index e567f45..2cd6e64 100644
--- a/include/asterisk/autoconfig.h.in
+++ b/include/asterisk/autoconfig.h.in
@@ -126,6 +126,12 @@
/* Define to indicate the ${BKTR_DESCRIP} library version */
#undef HAVE_BKTR_VERSION
+/* Define this to indicate the ${BLUETOOTH_DESCRIP} library */
+#undef HAVE_BLUETOOTH
+
+/* Define to indicate the ${BLUETOOTH_DESCRIP} library version */
+#undef HAVE_BLUETOOTH_VERSION
+
/* Define to 1 if byteswap.h macros are available. */
#undef HAVE_BYTESWAP_H
@@ -407,6 +413,9 @@
/* Define to indicate the ${LDAP_DESCRIP} library version */
#undef HAVE_LDAP_VERSION
+/* Define if your system has the NetBSD Editline libraries. */
+#undef HAVE_LIBEDIT
+
/* Define to 1 if you have the <libintl.h> header file. */
#undef HAVE_LIBINTL_H
@@ -464,12 +473,9 @@
/* Define to indicate the ${LTDL_DESCRIP} library version */
#undef HAVE_LTDL_VERSION
-/* Define this to indicate the ${LUA_DESCRIP} library */
+/* Define if your system has the LUA libraries. */
#undef HAVE_LUA
-/* Define to indicate the ${LUA_DESCRIP} library version */
-#undef HAVE_LUA_VERSION
-
/* Define to 1 if you have the <malloc.h> header file. */
#undef HAVE_MALLOC_H
@@ -1115,9 +1121,6 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
-/* Define to 1 if the C compiler supports function prototypes. */
-#undef PROTOTYPES
-
/* Define to necessary symbol if this constant uses a non-standard name on
your system. */
#undef PTHREAD_CREATE_JOINABLE
@@ -1134,11 +1137,6 @@
/* Define to the type of arg 5 for `select'. */
#undef SELECT_TYPE_ARG5
-/* Define to 1 if the `setvbuf' function takes the buffering type as its
- second argument and the buffer pointer as the third, as on System V before
- release 3. */
-#undef SETVBUF_REVERSED
-
/* The size of `int', as computed by sizeof. */
#undef SIZEOF_INT
@@ -1159,20 +1157,30 @@
/* Define to 1 if your <sys/time.h> declares `struct tm'. */
#undef TM_IN_SYS_TIME
-/* Define to 1 if on AIX 3.
- System headers sometimes define this.
- We just want to avoid a redefinition error message. */
+/* Enable extensions on AIX 3, Interix. */
#ifndef _ALL_SOURCE
# undef _ALL_SOURCE
#endif
-
-/* Number of bits in a file offset, on hosts where this is settable. */
-#undef _FILE_OFFSET_BITS
-
/* Enable GNU extensions on systems that have them. */
#ifndef _GNU_SOURCE
# undef _GNU_SOURCE
#endif
+/* Enable threading extensions on Solaris. */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop. */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable general extensions on Solaris. */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#undef _FILE_OFFSET_BITS
/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
#undef _LARGEFILE_SOURCE
@@ -1190,20 +1198,6 @@
/* Define to 1 if you need to in order for `stat' and other things to work. */
#undef _POSIX_SOURCE
-/* Enable extensions on Solaris. */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# undef _POSIX_PTHREAD_SEMANTICS
-#endif
-#ifndef _TANDEM_SOURCE
-# undef _TANDEM_SOURCE
-#endif
-
-/* Define like PROTOTYPES; this can be used by system headers. */
-#undef __PROTOTYPES
-
/* Define to empty if `const' does not conform to ANSI C. */
#undef const
--
1.6.1
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore 4 Jan 2009 05:05:40 -0000 1.19
+++ .cvsignore 9 Feb 2009 05:54:21 -0000 1.20
@@ -1 +1 @@
-asterisk-1.6.1-beta4-stripped.tar.gz
+asterisk-1.6.1-rc1-stripped.tar.gz
0001-Modify-init-scripts-for-better-Fedora-compatibility.patch:
Index: 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0001-Modify-init-scripts-for-better-Fedora-compatibility.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch 5 Jan 2009 02:06:10 -0000 1.9
+++ 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch 9 Feb 2009 05:54:21 -0000 1.10
@@ -1,7 +1,7 @@
-From d397bc03e86335ed571121fa501dfefdc2ddbd4c Mon Sep 17 00:00:00 2001
+From 6cd5722ba64b7cb24b8475395edcc6555e2326d4 Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Sun, 18 Nov 2007 21:47:59 -0600
-Subject: [PATCH 01/13] Modify init scripts for better Fedora compatibility.
+Subject: [PATCH 01/15] Modify init scripts for better Fedora compatibility.
---
contrib/init.d/rc.redhat.asterisk | 61 +++++++++++++++++-------------------
0002-Modify-modules.conf-so-that-different-voicemail-modu.patch:
Index: 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0002-Modify-modules.conf-so-that-different-voicemail-modu.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch 5 Jan 2009 02:06:10 -0000 1.9
+++ 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch 9 Feb 2009 05:54:21 -0000 1.10
@@ -1,7 +1,7 @@
-From e5d3f951bfa543e5d8b8cf85535f80b1d1143e09 Mon Sep 17 00:00:00 2001
+From fa2cd0b2b289e51cba4329c420d2da1855f860c5 Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jcollie at pc21224.campus.dmacc.edu>
Date: Thu, 8 Nov 2007 15:52:36 -0600
-Subject: [PATCH 02/13] Modify modules.conf so that different voicemail modules can be loaded.
+Subject: [PATCH 02/15] Modify modules.conf so that different voicemail modules can be loaded.
---
configs/modules.conf.sample | 26 ++++++++++++++++++++++++++
0003-Add-chan_mobile-from-asterisk-addons.patch:
Index: 0003-Add-chan_mobile-from-asterisk-addons.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0003-Add-chan_mobile-from-asterisk-addons.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- 0003-Add-chan_mobile-from-asterisk-addons.patch 5 Jan 2009 02:06:10 -0000 1.5
+++ 0003-Add-chan_mobile-from-asterisk-addons.patch 9 Feb 2009 05:54:21 -0000 1.6
@@ -1,7 +1,7 @@
-From aeb688bc0889a4b035fd1590ba8df85af6e0a38c Mon Sep 17 00:00:00 2001
+From 3a44ab0365c152d4ae55b7bcce3b6803ac192987 Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Thu, 16 Oct 2008 16:12:01 -0500
-Subject: [PATCH 03/13] Add chan_mobile from asterisk-addons.
+Subject: [PATCH 03/15] Add chan_mobile from asterisk-addons.
---
build_tools/menuselect-deps.in | 1 +
0004-Use-pkgconfig-to-check-for-Lua.patch:
Index: 0004-Use-pkgconfig-to-check-for-Lua.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0004-Use-pkgconfig-to-check-for-Lua.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- 0004-Use-pkgconfig-to-check-for-Lua.patch 5 Jan 2009 02:06:11 -0000 1.5
+++ 0004-Use-pkgconfig-to-check-for-Lua.patch 9 Feb 2009 05:54:21 -0000 1.6
@@ -1,7 +1,7 @@
-From 24b4e78b81a06375e233ccc7745d5d3bc5b1cc7e Mon Sep 17 00:00:00 2001
+From 034417c5bbb8320fe0045a1625c479342ae2decc Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Mon, 25 Feb 2008 13:14:23 -0600
-Subject: [PATCH 04/13] Use pkgconfig to check for Lua.
+Subject: [PATCH 04/15] Use pkgconfig to check for Lua.
---
configure.ac | 9 ++++++++-
0005-Build-using-external-libedit.patch:
Index: 0005-Build-using-external-libedit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0005-Build-using-external-libedit.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 0005-Build-using-external-libedit.patch 5 Jan 2009 02:06:11 -0000 1.4
+++ 0005-Build-using-external-libedit.patch 9 Feb 2009 05:54:21 -0000 1.5
@@ -1,7 +1,7 @@
-From 1fc4e0fd9d7d24fd087a1c0d6f4dff5a1fec010f Mon Sep 17 00:00:00 2001
+From 64a709b530b0fc1dd74805641f7279a6f83e97b7 Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Tue, 25 Mar 2008 00:50:27 -0500
-Subject: [PATCH 05/13] Build using external libedit.
+Subject: [PATCH 05/15] Build using external libedit.
---
build_tools/menuselect-deps.in | 1 +
0006-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch:
Index: 0006-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0006-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 0006-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch 5 Jan 2009 02:06:11 -0000 1.4
+++ 0006-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch 9 Feb 2009 05:54:21 -0000 1.5
@@ -1,7 +1,7 @@
-From eb9cc1a836086024bb619948468a80c4ff75bed9 Mon Sep 17 00:00:00 2001
+From fed4db18b6738e1847b3caeced87a0fa623a7d56 Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Fri, 10 Oct 2008 11:54:10 -0500
-Subject: [PATCH 06/13] Revert changes to pbx_lua from rev 126363 that cause some problems.
+Subject: [PATCH 06/15] Revert changes to pbx_lua from rev 126363 that cause some problems.
---
pbx/pbx_lua.c | 6 +++---
0007-Define-missing-variable-when-compiling-on-PPC.patch:
Index: 0007-Define-missing-variable-when-compiling-on-PPC.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0007-Define-missing-variable-when-compiling-on-PPC.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 0007-Define-missing-variable-when-compiling-on-PPC.patch 5 Jan 2009 02:06:11 -0000 1.3
+++ 0007-Define-missing-variable-when-compiling-on-PPC.patch 9 Feb 2009 05:54:21 -0000 1.4
@@ -1,7 +1,7 @@
-From 06b01dff16e335004e107352fb9a87d56ab5dc57 Mon Sep 17 00:00:00 2001
+From 635e74de63418f0cd61ec5b1098e451a17b7d360 Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Fri, 7 Nov 2008 14:43:16 -0600
-Subject: [PATCH 07/13] Define missing variable when compiling on PPC.
+Subject: [PATCH 07/15] Define missing variable when compiling on PPC.
---
apps/app_festival.c | 1 +
0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch:
Index: 0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch 5 Jan 2009 02:06:11 -0000 1.3
+++ 0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch 9 Feb 2009 05:54:21 -0000 1.4
@@ -1,7 +1,7 @@
-From 15ba569e990035b085d2d983d3c22681ad82be89 Mon Sep 17 00:00:00 2001
+From 0d6267e70e805371772d4375318d08437fe6b5ca Mon Sep 17 00:00:00 2001
From: Caolan McNamara <caolanm at redhat.com>
Date: Sat, 3 Jan 2009 19:06:18 -0600
-Subject: [PATCH 08/13] change configure.ac to look for pkg-config gmime-2.4 instead of gmime-2.4 gmime-config
+Subject: [PATCH 08/15] change configure.ac to look for pkg-config gmime-2.4 instead of gmime-2.4 gmime-config
---
configure.ac | 12 +++++++++++-
0009-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch:
Index: 0009-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0009-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 0009-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch 5 Jan 2009 02:06:11 -0000 1.3
+++ 0009-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch 9 Feb 2009 05:54:21 -0000 1.4
@@ -1,7 +1,7 @@
-From fc4a4f6207cb8454b6d3ec673dba10f8daf57050 Mon Sep 17 00:00:00 2001
+From 28b1fa54f0c606281033ad56046af410756171e6 Mon Sep 17 00:00:00 2001
From: Caolan McNamara <caolanm at redhat.com>
Date: Sat, 3 Jan 2009 19:12:18 -0600
-Subject: [PATCH 09/13] fix the AST_PROG_SED problem that makes ./bootstrap.sh fail
+Subject: [PATCH 09/15] fix the AST_PROG_SED problem that makes ./bootstrap.sh fail
Need to regenerate configure from configure.ac after patch one with
./bootsrap.sh, so fix the broken .m4 in the autoconfig dir. (alternatively
0010-my-guess-as-replacements-for-the-missing-broken-stuf.patch:
Index: 0010-my-guess-as-replacements-for-the-missing-broken-stuf.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/0010-my-guess-as-replacements-for-the-missing-broken-stuf.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 0010-my-guess-as-replacements-for-the-missing-broken-stuf.patch 5 Jan 2009 02:06:11 -0000 1.3
+++ 0010-my-guess-as-replacements-for-the-missing-broken-stuf.patch 9 Feb 2009 05:54:21 -0000 1.4
@@ -1,14 +1,14 @@
-From b7ccdf7e246f75f67529126fb309efd2e6793446 Mon Sep 17 00:00:00 2001
+From 8c0899c97ac05f3c84ef61c4e95e4aa0309b1570 Mon Sep 17 00:00:00 2001
From: Caolan McNamara <caolanm at redhat.com>
Date: Sat, 3 Jan 2009 19:15:12 -0600
-Subject: [PATCH 10/13] my guess as replacements for the missing/broken stuff against the new gmime api
+Subject: [PATCH 10/15] my guess as replacements for the missing/broken stuff against the new gmime api
---
res/res_http_post.c | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/res/res_http_post.c b/res/res_http_post.c
-index deab15c..563ab9c 100644
+index 5fbf46a..8827e65 100644
--- a/res/res_http_post.c
+++ b/res/res_http_post.c
@@ -119,14 +119,10 @@ static void process_message_callback(GMimeObject *part, gpointer user_data)
Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/asterisk.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- asterisk.spec 15 Jan 2009 12:48:56 -0000 1.48
+++ asterisk.spec 9 Feb 2009 05:54:22 -0000 1.49
@@ -1,9 +1,9 @@
%define with_apidoc %{?_with_apidoc: 1} %{!?_with_apidoc: 0}
-%define beta 4
+%define _rc 1
Summary: The Open Source PBX
Name: asterisk
Version: 1.6.1
-Release: 0.13.%{?beta:beta%{beta}}%{?dist}
+Release: 0.21.%{?_rc:rc%{_rc}}%{?dist}
License: GPLv2
Group: Applications/Internet
URL: http://www.asterisk.org/
@@ -11,7 +11,7 @@
# 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}%{?beta:-beta%{beta}}.tar.gz
+# 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:
#
@@ -19,15 +19,15 @@
# MD5 Sums
# ========
-# 6ed4cad3cea37fc0c9bbcc3579a782ff asterisk-1.6.1-beta4.tar.gz
-# ea9b4e1988c92cf40a913cb9e5fb32ef asterisk-1.6.1-beta4-stripped.tar.gz
+# 29f7285b673d52b49d91c8e797acbbb0 asterisk-1.6.1-rc1.tar.gz
+# 077741b7f993925f61bb50ab29b49063 asterisk-1.6.1-rc1-stripped.tar.gz
#
# SHA1 Sums
# =========
-# 2b73ba5b94af16709f41ddeba7d9d93d7d5848af asterisk-1.6.1-beta4.tar.gz
-# 1a5d21df9097baa28d44285a8e9b2e602e3b92ce asterisk-1.6.1-beta4-stripped.tar.gz
+# 517176cad6ecf1e223749ae927a5989f2d2c0c29 asterisk-1.6.1-rc1.tar.gz
+# 3e22952202fafc49f13addaf8852cfa3ebc05fc2 asterisk-1.6.1-rc1-stripped.tar.gz
-Source0: asterisk-%{version}%{?beta:-beta%{beta}}-stripped.tar.gz
+Source0: asterisk-%{version}%{?_rc:-rc%{_rc}}-stripped.tar.gz
Source1: asterisk-logrotate
Source2: menuselect.makedeps
Source3: menuselect.makeopts
@@ -43,9 +43,11 @@
Patch8: 0008-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch
Patch9: 0009-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch
Patch10: 0010-my-guess-as-replacements-for-the-missing-broken-stuf.patch
-Patch11: 0011-Update-autoconf.patch
-Patch12: 0012-Fix-up-some-paths.patch
-Patch13: 0013-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch
+Patch11: 0011-Fix-up-some-paths.patch
+Patch12: 0012-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch
+Patch13: 0013-Bridging-work-as-of-svn-rev-174216.patch
+Patch14: 0014-Adding-in-CLI-apps.patch
+Patch15: 0015-Update-autoconf.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
@@ -431,7 +433,7 @@
local filesystem.
%prep
-%setup0 -q -n asterisk-%{version}%{?beta:-beta%{beta}}
+%setup0 -q -n asterisk-%{version}%{?_rc:-rc%{_rc}}
%patch1 -p1
%patch2 -p1
%patch3 -p1
@@ -445,6 +447,8 @@
%patch11 -p1
%patch12 -p1
%patch13 -p1
+%patch14 -p1
+%patch15 -p1
cp %{SOURCE2} menuselect.makedeps
cp %{SOURCE3} menuselect.makeopts
@@ -623,10 +627,12 @@
%{_libdir}/asterisk/modules/app_alarmreceiver.so
%{_libdir}/asterisk/modules/app_amd.so
%{_libdir}/asterisk/modules/app_authenticate.so
+%{_libdir}/asterisk/modules/app_bridgetest.so
%{_libdir}/asterisk/modules/app_cdr.so
%{_libdir}/asterisk/modules/app_chanisavail.so
%{_libdir}/asterisk/modules/app_channelredirect.so
%{_libdir}/asterisk/modules/app_chanspy.so
+%{_libdir}/asterisk/modules/app_confbridge.so
%{_libdir}/asterisk/modules/app_controlplayback.so
%{_libdir}/asterisk/modules/app_db.so
%{_libdir}/asterisk/modules/app_dial.so
@@ -675,10 +681,15 @@
%{_libdir}/asterisk/modules/app_waituntil.so
%{_libdir}/asterisk/modules/app_while.so
%{_libdir}/asterisk/modules/app_zapateller.so
+%{_libdir}/asterisk/modules/bridge_builtin_features.so
+%{_libdir}/asterisk/modules/bridge_multiplexed.so
+%{_libdir}/asterisk/modules/bridge_simple.so
+%{_libdir}/asterisk/modules/bridge_softmix.so
%{_libdir}/asterisk/modules/cdr_csv.so
%{_libdir}/asterisk/modules/cdr_custom.so
%{_libdir}/asterisk/modules/cdr_manager.so
%{_libdir}/asterisk/modules/chan_agent.so
+%{_libdir}/asterisk/modules/chan_bridge.so
%{_libdir}/asterisk/modules/chan_features.so
%{_libdir}/asterisk/modules/chan_iax2.so
%{_libdir}/asterisk/modules/chan_local.so
@@ -709,6 +720,7 @@
%{_libdir}/asterisk/modules/format_vox.so
%{_libdir}/asterisk/modules/format_wav_gsm.so
%{_libdir}/asterisk/modules/format_wav.so
+%{_libdir}/asterisk/modules/func_audiohookinherit.so
%{_libdir}/asterisk/modules/func_base64.so
%{_libdir}/asterisk/modules/func_blacklist.so
%{_libdir}/asterisk/modules/func_callerid.so
@@ -1080,6 +1092,11 @@
%{_libdir}/asterisk/modules/app_voicemail_plain.so
%changelog
+* Sun Feb 8 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.1-0.21.rc1
+- Update to 1.6.1-rc1
+- Add backport of conference bridging that is slated for 1.6.2
+- Add patches to conference bridging that implement CLI apps
+
* Thu Jan 15 2009 Tomas Mraz <tmraz at redhat.com> - 1.6.1-0.13.beta4
- rebuild with new openssl
Index: menuselect.makeopts
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/menuselect.makeopts,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- menuselect.makeopts 29 Mar 2008 04:53:47 -0000 1.4
+++ menuselect.makeopts 9 Feb 2009 05:54:22 -0000 1.5
@@ -1,4 +1,5 @@
MENUSELECT_APPS=app_ivrdemo app_mp3 app_osplookup app_rpt app_skel
+MENUSELECT_BRIDGES=bridge_zaptel
MENUSELECT_CDR=cdr_sqlite
MENUSELECT_CHANNELS=chan_h323 chan_nbs chan_vpb
MENUSELECT_CODECS=codec_ilbc
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources 4 Jan 2009 05:05:42 -0000 1.19
+++ sources 9 Feb 2009 05:54:22 -0000 1.20
@@ -1 +1 @@
-ea9b4e1988c92cf40a913cb9e5fb32ef asterisk-1.6.1-beta4-stripped.tar.gz
+077741b7f993925f61bb50ab29b49063 asterisk-1.6.1-rc1-stripped.tar.gz
--- 0011-Update-autoconf.patch DELETED ---
--- 0012-Fix-up-some-paths.patch DELETED ---
--- 0013-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch DELETED ---
- Previous message: rpms/perl-Time-Progress/F-10 perl-Time-Progress.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message: rpms/perl-Lingua-Stem-Snowball/F-10 perl-Lingua-Stem-Snowball.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list