[asterisk: 1/4] Update to 1.8.3-rc1
Jeffrey C. Ollie
jcollie at fedoraproject.org
Wed Jan 26 21:40:25 UTC 2011
commit 29eb470097ed7cc614c8712f3b0b582c64442cf6
Author: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Wed Jan 26 14:45:29 2011 -0600
Update to 1.8.3-rc1
.gitignore | 2 +
...it-scripts-for-better-Fedora-compatibilty.patch | 6 +-
...les.conf-so-that-different-voicemail-modu.patch | 6 +-
...king-building-against-an-external-libedit.patch | 26 +++---
...rary-function-for-loading-command-history.patch | 10 +-
...ome-paths.patch => 0005-Fix-up-some-paths.patch | 92 +++++++++----------
...hema-that-is-compatible-with-Fedora-Direc.patch | 6 +-
...2html-to-copy-icons-when-building-documen.patch | 25 ------
asterisk.spec | 12 ++--
menuselect.makeopts | 2 +-
sources | 4 +-
11 files changed, 82 insertions(+), 109 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 835f42b..20f75e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,5 @@ asterisk-1.8.0-beta3.tar.gz.asc
/asterisk-1.8.1.tar.gz.asc
/asterisk-1.8.2.2.tar.gz
/asterisk-1.8.2.2.tar.gz.asc
+/asterisk-1.8.3-rc1.tar.gz
+/asterisk-1.8.3-rc1.tar.gz.asc
diff --git a/0001-Modify-init-scripts-for-better-Fedora-compatibilty.patch b/0001-Modify-init-scripts-for-better-Fedora-compatibilty.patch
index 30f1253..bf567dc 100644
--- a/0001-Modify-init-scripts-for-better-Fedora-compatibilty.patch
+++ b/0001-Modify-init-scripts-for-better-Fedora-compatibilty.patch
@@ -1,7 +1,7 @@
-From 4b279cdc1a6100021ad8be3325b4e453a257a491 Mon Sep 17 00:00:00 2001
+From b87f6cdd15c9d410609e210d4c6d19c1e20b7489 Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Wed, 28 Jul 2010 07:22:21 -0500
-Subject: [PATCH 1/8] Modify init scripts for better Fedora compatibilty.
+Subject: [PATCH 1/6] Modify init scripts for better Fedora compatibilty.
---
contrib/init.d/rc.redhat.asterisk | 70 ++++++++++++++++++++-----------------
@@ -169,5 +169,5 @@ index 0000000..dab2e33
+# A place to specify extra arguments for the Asterisk command line
+AST_EXTRA_ARGS=""
--
-1.7.3.1
+1.7.3.5
diff --git a/0002-Modify-modules.conf-so-that-different-voicemail-modu.patch b/0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
index 9c8736f..f48e407 100644
--- a/0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
+++ b/0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
@@ -1,7 +1,7 @@
-From 6c599696aae0968c658ba9a6a88ed4ab3371cbef Mon Sep 17 00:00:00 2001
+From ea859e4dc08fe47dcf0262d485dbb9e957ef2128 Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Wed, 28 Jul 2010 07:23:49 -0500
-Subject: [PATCH 2/8] Modify modules.conf so that different voicemail modules don't load at the same time.
+Subject: [PATCH 2/6] Modify modules.conf so that different voicemail modules don't load at the same time.
---
configs/modules.conf.sample | 26 ++++++++++++++++++++++++++
@@ -42,5 +42,5 @@ index 38e33e1..9a1c1c3 100644
+;noload => app_directory_plain.so
+;noload => app_voicemail_plain.so
--
-1.7.3.1
+1.7.3.5
diff --git a/0003-Allow-linking-building-against-an-external-libedit.patch b/0003-Allow-linking-building-against-an-external-libedit.patch
index fa8e0fd..d19d08e 100644
--- a/0003-Allow-linking-building-against-an-external-libedit.patch
+++ b/0003-Allow-linking-building-against-an-external-libedit.patch
@@ -1,7 +1,7 @@
-From 848a3f604b1c1db5bda30d688c00e09b2cf36d83 Mon Sep 17 00:00:00 2001
+From 64c4f685e3168e11fdbde3b9583d078dd63874bb Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Fri, 5 Mar 2010 14:10:52 -0600
-Subject: [PATCH 3/8] Allow linking/building against an external libedit.
+Subject: [PATCH 3/6] Allow linking/building against an external libedit.
The Asterisk tarball includes a very old copy of the editline library
that manages command line history and editing. Fedora (and several
@@ -19,10 +19,10 @@ the libedit library.
5 files changed, 35 insertions(+), 5 deletions(-)
diff --git a/build_tools/menuselect-deps.in b/build_tools/menuselect-deps.in
-index 2a5bcd7..a0f4e16 100644
+index 35573c3..4425204 100644
--- a/build_tools/menuselect-deps.in
+++ b/build_tools/menuselect-deps.in
-@@ -24,6 +24,7 @@ JACK=@PBX_JACK@
+@@ -26,6 +26,7 @@ JACK=@PBX_JACK@
KQUEUE=@PBX_KQUEUE@
LDAP=@PBX_LDAP@
LIBXML2=@PBX_LIBXML2@
@@ -31,10 +31,10 @@ index 2a5bcd7..a0f4e16 100644
LUA=@PBX_LUA@
MISDN=@PBX_MISDN@
diff --git a/configure.ac b/configure.ac
-index bacef33..dc73ca4 100644
+index a17c7b7..549c8c5 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -387,6 +387,7 @@ AST_EXT_LIB_SETUP([JACK], [Jack Audio Connection Kit], [jack])
+@@ -388,6 +388,7 @@ AST_EXT_LIB_SETUP([JACK], [Jack Audio Connection Kit], [jack])
AST_EXT_LIB_SETUP([KQUEUE], [kqueue support], [kqueue])
AST_EXT_LIB_SETUP([LDAP], [OpenLDAP], [ldap])
AST_LIBCURL_CHECK_CONFIG([], [7.10.1])
@@ -42,7 +42,7 @@ index bacef33..dc73ca4 100644
AST_EXT_LIB_SETUP([LIBXML2], [LibXML2], [libxml2])
AST_EXT_LIB_SETUP([LTDL], [libtool], [ltdl])
AST_EXT_LIB_SETUP([LUA], [Lua], [lua])
-@@ -2119,6 +2120,27 @@ AC_SUBST(PBX_GTK2)
+@@ -2158,6 +2159,27 @@ AC_SUBST(PBX_GTK2)
AC_SUBST(GTK2_INCLUDE)
AC_SUBST(GTK2_LIB)
@@ -71,10 +71,10 @@ index bacef33..dc73ca4 100644
# or iODBC
diff --git a/main/Makefile b/main/Makefile
-index af294dd..03700ee 100644
+index 64ad43f..27ef6c8 100644
--- a/main/Makefile
+++ b/main/Makefile
-@@ -139,6 +139,8 @@ testexpr2: ast_expr2f.c ast_expr2.c ast_expr2.h
+@@ -143,6 +143,8 @@ testexpr2: ast_expr2f.c ast_expr2.c ast_expr2.h
$(CC) -g -o testexpr2 ast_expr2f.o ast_expr2.o -lm
rm ast_expr2.o ast_expr2f.o
@@ -83,7 +83,7 @@ index af294dd..03700ee 100644
ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),)
http.o: _ASTCFLAGS+=$(GMIME_INCLUDE)
endif
-@@ -173,13 +175,13 @@ endif
+@@ -177,13 +179,13 @@ endif
$(OBJS): _ASTCFLAGS+=-DAST_MODULE=\"core\"
@@ -123,10 +123,10 @@ index 7f4c179..b85c219 100644
#include "asterisk/translate.h"
diff --git a/makeopts.in b/makeopts.in
-index 5e9ef8c..02b3b51 100644
+index 3cde814..f86b166 100644
--- a/makeopts.in
+++ b/makeopts.in
-@@ -305,3 +305,7 @@ TINFO_DIR=@TINFO_DIR@
+@@ -308,3 +308,7 @@ TINFO_DIR=@TINFO_DIR@
# if poll is not present, let the makefile know.
POLL_AVAILABLE=@HAS_POLL@
TIMERFD_INCLUDE=@TIMERFD_INCLUDE@
@@ -135,5 +135,5 @@ index 5e9ef8c..02b3b51 100644
+LIBEDIT_LIB=@LIBEDIT_LIB@
+LIBEDIT_OBJ=@LIBEDIT_OBJ@
--
-1.7.3.1
+1.7.3.5
diff --git a/0004-Use-the-library-function-for-loading-command-history.patch b/0004-Use-the-library-function-for-loading-command-history.patch
index f36a60a..dee1332 100644
--- a/0004-Use-the-library-function-for-loading-command-history.patch
+++ b/0004-Use-the-library-function-for-loading-command-history.patch
@@ -1,17 +1,17 @@
-From 741b28e4a20936bbe84bb041370a433f24426680 Mon Sep 17 00:00:00 2001
+From 9422ca62e5e74b395e529426ac6d83ec523aa2b6 Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Mon, 8 Mar 2010 12:38:56 -0600
-Subject: [PATCH 4/8] Use the library function for loading command history rather than implementing our own.
+Subject: [PATCH 4/6] Use the library function for loading command history rather than implementing our own.
---
main/asterisk.c | 21 ++-------------------
1 files changed, 2 insertions(+), 19 deletions(-)
diff --git a/main/asterisk.c b/main/asterisk.c
-index ca3f68b..9b8f965 100644
+index e5c530a..fab2d45 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
-@@ -2616,29 +2616,12 @@ static int ast_el_write_history(char *filename)
+@@ -2622,29 +2622,12 @@ static int ast_el_write_history(char *filename)
static int ast_el_read_history(char *filename)
{
@@ -44,5 +44,5 @@ index ca3f68b..9b8f965 100644
static void ast_remotecontrol(char *data)
--
-1.7.3.1
+1.7.3.5
diff --git a/0006-Fix-up-some-paths.patch b/0005-Fix-up-some-paths.patch
similarity index 88%
rename from 0006-Fix-up-some-paths.patch
rename to 0005-Fix-up-some-paths.patch
index 58703d6..2badb9f 100644
--- a/0006-Fix-up-some-paths.patch
+++ b/0005-Fix-up-some-paths.patch
@@ -1,7 +1,7 @@
-From 5049460a98be96ff417427f5f7bc1855a7ee0bce Mon Sep 17 00:00:00 2001
+From ccbf147c96bb7fe40c485f2cf5067ad2a87c529a Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Wed, 28 Jul 2010 07:27:48 -0500
-Subject: [PATCH 6/8] Fix up some paths
+Subject: [PATCH 5/6] Fix up some paths
---
UPGRADE-1.4.txt | 2 +-
@@ -13,14 +13,10 @@ Subject: [PATCH 6/8] Fix up some paths
configs/phoneprov.conf.sample | 2 +-
contrib/scripts/astgenkey | 2 +-
contrib/scripts/astgenkey.8 | 6 ++--
- doc/osp.txt | 8 +++---
- doc/tex/asterisk-conf.tex | 4 +-
- doc/tex/phoneprov.tex | 2 +-
- doc/tex/privacy.tex | 6 ++--
pbx/ael/ael-test/ael-test3/extensions.ael | 28 +++++++++++++-------------
pbx/ael/ael-test/ael-vtest13/extensions.ael | 28 +++++++++++++-------------
pbx/ael/ael-test/ref.ael-vtest13 | 26 ++++++++++++------------
- 16 files changed, 69 insertions(+), 69 deletions(-)
+ 12 files changed, 59 insertions(+), 59 deletions(-)
diff --git a/UPGRADE-1.4.txt b/UPGRADE-1.4.txt
index f99f937..981bca7 100644
@@ -132,10 +128,10 @@ index e72aa32..f7ee625 100644
; 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 ffec829..24fba88 100644
+index a99b44a..528f7c6 100644
--- a/configs/phoneprov.conf.sample
+++ b/configs/phoneprov.conf.sample
-@@ -128,4 +128,4 @@ ${MAC}.cfg => 000000000000.cfg ; Dynamically generated files.
+@@ -130,4 +130,4 @@ ${MAC}.cfg => 000000000000.cfg ; Dynamically generated files.
${MAC}-phone.cfg => 000000000000-phone.cfg ; (relative to AST_DATA_DIR/phoneprov)
config/${MAC} => polycom.xml ; Dynamic Filename => template file
${MAC}-directory.xml => 000000000000-directory.xml
@@ -417,53 +413,53 @@ index b7e953e..48baaef 100755
}
762 => {
diff --git a/pbx/ael/ael-test/ref.ael-vtest13 b/pbx/ael/ael-test/ref.ael-vtest13
-index acecaaa..e205a2c 100644
+index 3c66be2..bedb8d8 100644
--- a/pbx/ael/ael-test/ref.ael-vtest13
+++ b/pbx/ael/ael-test/ref.ael-vtest13
-@@ -2182,7 +2182,7 @@ exten => s,20,Return()
+@@ -2182,7 +2182,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()
-@@ -2218,7 +2218,7 @@ exten => s,4,Set(repeatcount=0)
- exten => s,5,Zapateller(nocallerid)
- exten => s,6,PrivacyManager()
- exten => s,7,GotoIf($["${PRIVACYMGRSTATUS}" = "FAILED" ]?8:12)
--exten => s,8,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm)
-+exten => s,8,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/privmanfailed.gsm)
- exten => s,9,Gosub(std-priv-exten,s,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket))
- exten => s,10,Hangup()
- exten => s,11,Return()
-@@ -2244,7 +2244,7 @@ exten => s,30,GotoIf($["${direct}" != "" & ${direct} != 0 ]?31:38)
- exten => s,31,verbose(direct is XXX#${direct}XXXX)
- exten => s,32,Playback(greetings/direct)
- exten => s,33,Playback(/var/spool/asterisk/voicemail/default/${direct}/greet)
--exten => s,34,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
-+exten => s,34,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
- exten => s,35,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&)
- exten => s,36,Goto(sw_92_${direct},10)
- exten => s,37,NoOp(Finish switch_if_homeline_91_92)
-@@ -2323,7 +2323,7 @@ exten => sw_92_2,10,Gosub(std-priv-exten,s,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket
+-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()
+@@ -2217,7 +2217,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()
+@@ -2243,7 +2243,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)
+@@ -2322,7 +2322,7 @@ exten => sw_92_2,10,Gosub(std-priv-exten,~~s~~,1(Zap/3r1&Zap/5r1,2,25,mtw,telema
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,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,3,Gosub(std-priv-exten,~~s~~,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket))
exten => 1,4,Goto(s,loopback)
-@@ -2400,31 +2400,31 @@ exten => o,1,Goto(s,begin)
+@@ -2399,31 +2399,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,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)
@@ -473,38 +469,38 @@ index acecaaa..e205a2c 100644
-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,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,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,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,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,3,Gosub(std-priv-exten,~~s~~,1(Zap/3r2&Zap/5r2,9,35,mtw,telemarket,telemarket))
exten => 7,4,Goto(homeline,s,loopback)
-@@ -2452,7 +2452,7 @@ exten => s,5,Gosub(fillcidname,s,1)
+@@ -2451,7 +2451,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,3,Gosub(std-priv-exten,~~s~~,1(Zap/6&Sip/murf,1,30,mtw,telemarket,telemarket))
exten => 1,4,Goto(s,loopback)
-@@ -2578,7 +2578,7 @@ exten => 6,1,Background(recording)
+@@ -2577,7 +2577,7 @@ exten => 6,1,Background(recording)
exten => 760,1,DateTime()
exten => 760,2,Goto(s,loopback)
exten => 761,1,Record(announcement:gsm)
@@ -514,5 +510,5 @@ index acecaaa..e205a2c 100644
exten => 762,1,agi(tts-riddle.agi)
exten => 762,2,Background(gsm/what-time-it-is2)
--
-1.7.3.1
+1.7.3.5
diff --git a/0007-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch b/0006-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch
similarity index 98%
rename from 0007-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch
rename to 0006-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch
index 9eec35d..7c437e3 100644
--- a/0007-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch
+++ b/0006-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch
@@ -1,7 +1,7 @@
-From ba4284ed1e238a21fed68d34166d7ae82564728f Mon Sep 17 00:00:00 2001
+From 78d0797f516f399576071334d9ce61524c1b5db4 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 7/8] Add LDAP schema that is compatible with Fedora Directory Server.
+Subject: [PATCH 6/6] Add LDAP schema that is compatible with Fedora Directory Server.
---
contrib/scripts/99asterisk.ldif | 489 +++++++++++++++++++++++++++++++++++++++
@@ -504,5 +504,5 @@ index 0000000..f3bdf4e
+ $ AstConfigVariableName $ AstConfigVariableValue $ AstConfigCommented )
+ )
--
-1.7.3.1
+1.7.3.5
diff --git a/asterisk.spec b/asterisk.spec
index 41585f7..c07d946 100644
--- a/asterisk.spec
+++ b/asterisk.spec
@@ -1,9 +1,9 @@
-#global _rc 1
+%global _rc 1
#global _beta 5
Summary: The Open Source PBX
Name: asterisk
-Version: 1.8.2.2
-Release: 2%{?_rc:.rc%{_rc}}%{?_beta:.beta%{_beta}}%{?dist}
+Version: 1.8.3
+Release: 0.1%{?_rc:.rc%{_rc}}%{?_beta:.beta%{_beta}}%{?dist}
License: GPLv2
Group: Applications/Internet
URL: http://www.asterisk.org/
@@ -19,8 +19,8 @@ Patch2: 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
# Submitted upstream: https://issues.asterisk.org/view.php?id=16858
Patch3: 0003-Allow-linking-building-against-an-external-libedit.patch
Patch4: 0004-Use-the-library-function-for-loading-command-history.patch
-Patch6: 0006-Fix-up-some-paths.patch
-Patch7: 0007-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch
+Patch5: 0005-Fix-up-some-paths.patch
+Patch6: 0006-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
@@ -435,8 +435,8 @@ local filesystem.
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
%patch6 -p1
-%patch7 -p1
cp %{S:3} menuselect.makedeps
cp %{S:4} menuselect.makeopts
diff --git a/menuselect.makeopts b/menuselect.makeopts
index e722c6b..d355f3c 100644
--- a/menuselect.makeopts
+++ b/menuselect.makeopts
@@ -8,7 +8,7 @@ MENUSELECT_FUNCS=
MENUSELECT_PBX=
MENUSELECT_RES=res_config_sqlite res_timing_kqueue
MENUSELECT_OPTS_app_voicemail=
-MENUSELECT_CFLAGS=LOADABLE_MODULES
+MENUSELECT_CFLAGS=LOADABLE_MODULES
MENUSELECT_EMBED=
MENUSELECT_CORE_SOUNDS=
MENUSELECT_MOH=
diff --git a/sources b/sources
index 75c0157..402cb61 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-213ff45524dcd1bfc08ed526ffe38878 asterisk-1.8.2.2.tar.gz
-b50b0f4f61c0971d99dfda9db2fe4517 asterisk-1.8.2.2.tar.gz.asc
+dd27c456789b79b7a01974818db8f17a asterisk-1.8.3-rc1.tar.gz
+71015294e1b0b3cbaa1f83cc6a1ec326 asterisk-1.8.3-rc1.tar.gz.asc
More information about the scm-commits
mailing list