[asterisk/f14/master] Update to 1.6.2.16.1
Jeffrey C. Ollie
jcollie at fedoraproject.org
Tue Jan 25 16:57:55 UTC 2011
commit fc54330d6b4e876e7969303b4ac33fc16e2a56b6
Author: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Tue Jan 25 10:57:38 2011 -0600
Update to 1.6.2.16.1
.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 | 18 +-
...rary-function-for-loading-command-history.patch | 10 +-
...igure.ac-to-look-for-pkg-config-gmime-2.0.patch | 35 ----
...ome-paths.patch => 0005-Fix-up-some-paths.patch | 76 +++++----
...hema-that-is-compatible-with-Fedora-Direc.patch | 6 +-
...2html-to-copy-icons-when-building-documen.patch | 6 +-
asterisk.spec | 178 +++++++++++++++++++-
menuselect.makeopts | 2 +-
sources | 4 +-
12 files changed, 239 insertions(+), 110 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fe71f2e..3d10de8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,5 @@ asterisk-1.6.2.11.tar.gz.asc
/asterisk-1.6.2.12-rc1.tar.gz.asc
/asterisk-1.6.2.14-rc1.tar.gz
/asterisk-1.6.2.14-rc1.tar.gz.asc
+/asterisk-1.6.2.16.1.tar.gz
+/asterisk-1.6.2.16.1.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 580101d..3a65eaf 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 ddbed41005f04d07e5c0d4050fcad9e11eddb7c3 Mon Sep 17 00:00:00 2001
+From 2d33e87770646d816ede3bde1f6b444d598dbbaa 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/7] Modify init scripts for better Fedora compatibilty.
---
contrib/init.d/rc.redhat.asterisk | 75 +++++++++++++++++--------------------
@@ -168,5 +168,5 @@ index 0000000..dab2e33
+# A place to specify extra arguments for the Asterisk command line
+AST_EXTRA_ARGS=""
--
-1.7.2.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 7ac5424..36368a7 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 c585c45d9e9d2ef30bd1db15454ef707fc22559b Mon Sep 17 00:00:00 2001
+From 8c9cce8f03251918aab779ef3c1302e2fda8d9d5 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/7] 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 5b553a4..39645c3 100644
+;noload => app_directory_plain.so
+;noload => app_voicemail_plain.so
--
-1.7.2.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 d999178..0a283dd 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 4e386d0c25bfbc3c1df0aa18a9d9ab8811cdbb3e Mon Sep 17 00:00:00 2001
+From ad0c67016eee3a65a8847614518a8ece3fc2a413 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/7] Allow linking/building against an external libedit.
The Asterisk tarball includes a very old copy of the editline library
that manages command line history and editing. Fedora (and several
@@ -31,10 +31,10 @@ index 5f399fc..695622c 100644
LUA=@PBX_LUA@
MISDN=@PBX_MISDN@
diff --git a/configure.ac b/configure.ac
-index 0b6748e..1b3f9c7 100644
+index e4b600a..aad7aae 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -315,6 +315,7 @@ AST_EXT_LIB_SETUP([ISDNNET], [ISDN4Linux], [isdnnet])
+@@ -319,6 +319,7 @@ AST_EXT_LIB_SETUP([ISDNNET], [ISDN4Linux], [isdnnet])
AST_EXT_LIB_SETUP([JACK], [Jack Audio Connection Kit], [jack])
AST_EXT_LIB_SETUP([LDAP], [OpenLDAP], [ldap])
AST_LIBCURL_CHECK_CONFIG([], [7.10.1])
@@ -42,7 +42,7 @@ index 0b6748e..1b3f9c7 100644
AST_EXT_LIB_SETUP([LIBXML2], [LibXML2], [libxml2])
AST_EXT_LIB_SETUP([LTDL], [libtool], [ltdl])
AST_EXT_LIB_SETUP([LUA], [Lua], [lua])
-@@ -1778,6 +1779,27 @@ AC_SUBST(PBX_GTK2)
+@@ -1875,6 +1876,27 @@ AC_SUBST(PBX_GTK2)
AC_SUBST(GTK2_INCLUDE)
AC_SUBST(GTK2_LIB)
@@ -101,7 +101,7 @@ index 6e61808..ec2c2bc 100644
$(CMD_PREFIX) $(ASTTOPDIR)/build_tools/strip_nonapi $@ || rm $@
diff --git a/main/cli.c b/main/cli.c
-index 8361e4e..4655ae3 100644
+index b2638cc..096178c 100644
--- a/main/cli.c
+++ b/main/cli.c
@@ -36,6 +36,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
@@ -122,10 +122,10 @@ index 8361e4e..4655ae3 100644
/*!
diff --git a/makeopts.in b/makeopts.in
-index 8de43af..9b6f757 100644
+index 5df805e..0e4f96b 100644
--- a/makeopts.in
+++ b/makeopts.in
-@@ -260,3 +260,7 @@ TINFO_DIR=@TINFO_DIR@
+@@ -262,3 +262,7 @@ TINFO_DIR=@TINFO_DIR@
# if poll is not present, let the makefile know.
POLL_AVAILABLE=@HAS_POLL@
TIMERFD_INCLUDE=@TIMERFD_INCLUDE@
@@ -134,5 +134,5 @@ index 8de43af..9b6f757 100644
+LIBEDIT_LIB=@LIBEDIT_LIB@
+LIBEDIT_OBJ=@LIBEDIT_OBJ@
--
-1.7.2.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 1a2c229..fda897e 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 ecc63fc573595b3dced950c32a7ad83e49c0325d Mon Sep 17 00:00:00 2001
+From 948a80fccc51dec7d76f7a5623775118c4142c4c 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/7] 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 c51e8cc..dda3550 100644
+index 4c79aee..4030213 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
-@@ -2596,29 +2596,12 @@ static int ast_el_write_history(char *filename)
+@@ -2613,29 +2613,12 @@ static int ast_el_write_history(char *filename)
static int ast_el_read_history(char *filename)
{
@@ -44,5 +44,5 @@ index c51e8cc..dda3550 100644
static void ast_remotecontrol(char *data)
--
-1.7.2.1
+1.7.3.5
diff --git a/0006-Fix-up-some-paths.patch b/0005-Fix-up-some-paths.patch
similarity index 94%
rename from 0006-Fix-up-some-paths.patch
rename to 0005-Fix-up-some-paths.patch
index ba1f48a..bc8febf 100644
--- a/0006-Fix-up-some-paths.patch
+++ b/0005-Fix-up-some-paths.patch
@@ -1,14 +1,14 @@
-From 7c011931f00232148a500f51c0ec94edaac8b383 Mon Sep 17 00:00:00 2001
+From 77bef13339b634939e8d52de56e5b929d9908fc9 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/7] Fix up some paths
---
UPGRADE-1.4.txt | 2 +-
configs/festival.conf.sample | 2 +-
configs/http.conf.sample | 6 ++--
configs/iax.conf.sample | 4 +-
- configs/musiconhold.conf.sample | 6 ++--
+ configs/musiconhold.conf.sample | 8 +++---
configs/osp.conf.sample | 4 +-
configs/phoneprov.conf.sample | 2 +-
contrib/scripts/astgenkey | 2 +-
@@ -20,7 +20,7 @@ Subject: [PATCH 6/8] Fix up some paths
pbx/ael/ael-test/ael-test3/extensions.ael | 28 +++++++++++++-------------
pbx/ael/ael-test/ael-vtest13/extensions.ael | 28 +++++++++++++-------------
pbx/ael/ael-test/ref.ael-vtest13 | 26 ++++++++++++------------
- 16 files changed, 68 insertions(+), 68 deletions(-)
+ 16 files changed, 69 insertions(+), 69 deletions(-)
diff --git a/UPGRADE-1.4.txt b/UPGRADE-1.4.txt
index f99f937..981bca7 100644
@@ -86,14 +86,16 @@ index 76194fa..beb2bc5 100644
;
;
diff --git a/configs/musiconhold.conf.sample b/configs/musiconhold.conf.sample
-index 8ccc851..10c066e 100644
+index c7d2b18..cabed3d 100644
--- a/configs/musiconhold.conf.sample
+++ b/configs/musiconhold.conf.sample
-@@ -32,7 +32,7 @@
+@@ -31,8 +31,8 @@
+ ;
; The path specified can be either an absolute path (starts with '/'),
; or a relative path; relative paths are interpreted as being relative
- ; to the 'astvarlibdir' in asterisk.conf, which defaults to
+-; to the 'astdatalibdir' in asterisk.conf, which defaults to
-; /var/lib/asterisk.
++; to the 'astdatadir' in asterisk.conf, which defaults to
+; /usr/share/asterisk.
;
; NOTE:
@@ -130,10 +132,10 @@ index e342337..bab1b18 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 cb1acec..dba6b46 100644
+index c09b76e..6715dfd 100644
--- a/configs/phoneprov.conf.sample
+++ b/configs/phoneprov.conf.sample
-@@ -114,4 +114,4 @@ ${MAC}.cfg => 000000000000.cfg ; Dynamically generated files.
+@@ -128,4 +128,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
@@ -510,10 +512,10 @@ index b7e953e..48baaef 100755
}
762 => {
diff --git a/pbx/ael/ael-test/ref.ael-vtest13 b/pbx/ael/ael-test/ref.ael-vtest13
-index 07ae29e..70956d4 100644
+index acecaaa..e205a2c 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()
+@@ -2182,7 +2182,7 @@ exten => s,20,Return()
[callerid-liar]
@@ -522,34 +524,34 @@ index 07ae29e..70956d4 100644
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)
+@@ -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 => 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)
+@@ -2400,31 +2400,31 @@ exten => o,1,Goto(s,begin)
[homeline-kids]
exten => s,1(begin),Background(murphy-homeline-kids)
@@ -588,7 +590,7 @@ index 07ae29e..70956d4 100644
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)
+@@ -2452,7 +2452,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)
@@ -597,7 +599,7 @@ index 07ae29e..70956d4 100644
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)
+@@ -2578,7 +2578,7 @@ exten => 6,1,Background(recording)
exten => 760,1,DateTime()
exten => 760,2,Goto(s,loopback)
exten => 761,1,Record(announcement:gsm)
@@ -607,5 +609,5 @@ index 07ae29e..70956d4 100644
exten => 762,1,agi(tts-riddle.agi)
exten => 762,2,Background(gsm/what-time-it-is2)
--
-1.7.2.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 a666824..649e775 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 e61133a934d4f7ac8f3b9eb3c36cafcba575b900 Mon Sep 17 00:00:00 2001
+From 8c02e177bf7f45b026deaa7ad4d35dbcfc689774 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/7] 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.2.1
+1.7.3.5
diff --git a/0008-Tell-laxtex2html-to-copy-icons-when-building-documen.patch b/0007-Tell-laxtex2html-to-copy-icons-when-building-documen.patch
similarity index 83%
rename from 0008-Tell-laxtex2html-to-copy-icons-when-building-documen.patch
rename to 0007-Tell-laxtex2html-to-copy-icons-when-building-documen.patch
index ea1d2d1..54c5a59 100644
--- a/0008-Tell-laxtex2html-to-copy-icons-when-building-documen.patch
+++ b/0007-Tell-laxtex2html-to-copy-icons-when-building-documen.patch
@@ -1,7 +1,7 @@
-From 96ce7c2e4bae79fd49c171d0966270edac8b0c5b Mon Sep 17 00:00:00 2001
+From 6b1a7ebf37ab486d92491c58cab7a13d23ebf949 Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Wed, 28 Jul 2010 07:32:19 -0500
-Subject: [PATCH 8/8] Tell laxtex2html to copy icons when building documentation so that we don't have run-time dependencies on latex2html.
+Subject: [PATCH 7/7] Tell laxtex2html to copy icons when building documentation so that we don't have run-time dependencies on latex2html.
---
doc/tex/Makefile | 2 +-
@@ -21,5 +21,5 @@ index 4add45a..e448c95 100644
txt: asterisk.txt
--
-1.7.2.1
+1.7.3.5
diff --git a/asterisk.spec b/asterisk.spec
index 63c8346..4cbc343 100644
--- a/asterisk.spec
+++ b/asterisk.spec
@@ -1,8 +1,8 @@
-%global _rc 1
+#global _rc 1
Summary: The Open Source PBX
Name: asterisk
-Version: 1.6.2.14
-Release: 0.1%{?_rc:.rc%{_rc}}%{?dist}
+Version: 1.6.2.16.1
+Release: 1%{?_rc:.rc%{_rc}}%{?dist}
License: GPLv2
Group: Applications/Internet
URL: http://www.asterisk.org/
@@ -18,11 +18,9 @@ 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
-# Submitted upstream: https://issues.asterisk.org/view.php?id=16155
-Patch5: 0005-Change-configure.ac-to-look-for-pkg-config-gmime-2.0.patch
-Patch6: 0006-Fix-up-some-paths.patch
-Patch7: 0007-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch
-Patch8: 0008-Tell-laxtex2html-to-copy-icons-when-building-documen.patch
+Patch5: 0005-Fix-up-some-paths.patch
+Patch6: 0006-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch
+Patch7: 0007-Tell-laxtex2html-to-copy-icons-when-building-documen.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
@@ -395,7 +393,6 @@ local filesystem.
%patch5 -p1
%patch6 -p1
%patch7 -p1
-%patch8 -p1
cp %{SOURCE2} menuselect.makedeps
cp %{SOURCE3} menuselect.makeopts
@@ -1035,6 +1032,169 @@ fi
%{_libdir}/asterisk/modules/app_voicemail_plain.so
%changelog
+* Tue Jan 25 2011 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2.16.1-1
+-
+- The Asterisk Development Team has announced security releases for the following
+- versions of Asterisk:
+-
+- * 1.4.38.1
+- * 1.4.39.1
+- * 1.6.1.21
+- * 1.6.2.15.1
+- * 1.6.2.16.1
+- * 1.8.1.2
+- * 1.8.2.1
+-
+- These releases are available for immediate download at
+- http://downloads.asterisk.org/pub/telephony/asterisk/releases
+-
+- The releases of Asterisk 1.4.38.1, 1.4.39.1, 1.6.1.21, 1.6.2.15.1, 1.6.2.16.2,
+- 1.8.1.2, and 1.8.2.1 resolve an issue when forming an outgoing SIP request while
+- in pedantic mode, which can cause a stack buffer to be made to overflow if
+- supplied with carefully crafted caller ID information. The issue and resolution
+- are described in the AST-2011-001 security advisory.
+-
+- For more information about the details of this vulnerability, please read the
+- security advisory AST-2011-001, which was released at the same time as this
+- announcement.
+-
+- For a full list of changes in the current releases, please see the ChangeLog:
+-
+- http://downloads.asterisk.org/pub/telephony/asterisk/releases/ChangeLog-1.4.38.1
+- http://downloads.asterisk.org/pub/telephony/asterisk/releases/ChangeLog-1.4.39.1
+- http://downloads.asterisk.org/pub/telephony/asterisk/releases/ChangeLog-1.6.1.21
+- http://downloads.asterisk.org/pub/telephony/asterisk/releases/ChangeLog-1.6.2.15.1
+- http://downloads.asterisk.org/pub/telephony/asterisk/releases/ChangeLog-1.6.2.16.1
+- http://downloads.asterisk.org/pub/telephony/asterisk/releases/ChangeLog-1.8.1.2
+- http://downloads.asterisk.org/pub/telephony/asterisk/releases/ChangeLog-1.8.2.1
+-
+- Security advisory AST-2011-001 is available at:
+-
+- http://downloads.asterisk.org/pub/security/AST-2011-001.pdf
+
+* Tue Jan 25 2011 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2.16.1-1
+-
+- The Asterisk Development Team has announced the release of Asterisk 1.6.2.16.
+- This release is available for immediate download at
+- http://downloads.asterisk.org/pub/telephony/asterisk/
+-
+- The release of Asterisk 1.6.2.16 resolves several issues reported by the
+- community and would have not been possible without your participation.
+- Thank you!
+-
+- The following is a sample of the issues resolved in this release:
+-
+- * Fix cache of device state changes for multiple servers.
+- (Closes issue #18284, #18280. Reported, tested by klaus3000. Patched, tested
+- by russellb)
+-
+- * Resolve issue where channel redirect function (CLI or AMI) hangs up the call
+- instead of redirecting the call.
+- (Closes issue #18171. Reported by: SantaFox)
+- (Closes issue #18185. Reported by: kwemheuer)
+- (Closes issue #18211. Reported by: zahir_koradia)
+- (Closes issue #18230. Reported by: vmarrone)
+- (Closes issue #18299. Reported by: mbrevda)
+- (Closes issue #18322. Reported by: nerbos)
+-
+- * Linux and *BSD disagree on the elements within the ucred structure. Detect
+- which one is in use on the system.
+- (Closes issue #18384. Reported, patched, tested by bjm, tilghman)
+-
+- * app_followme: Don't create a Local channel if the target extension does not
+- exist.
+- (Closes issue #18126. Reported, patched by junky)
+-
+- * Revert code that changed SSRC for DTMF.
+- (Closes issue #17404, #18189, #18352. Reported by sdolloff, marcbou. rsw686.
+- Tested by cmbaker82)
+-
+- * Resolve issue where REGISTER request with a Call-ID matching an existing
+- transaction is received it was possible that the REGISTER request would
+- overwrite the initreq of the private structure.
+- (Closes issue #18051. Reported by eeman. Patched, tested by twilson)
+-
+- For a full list of changes in this release, please see the ChangeLog:
+-
+- http://downloads.asterisk.org/pub/telephony/asterisk/ChangeLog-1.6.2.16
+
+* Tue Jan 25 2011 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2.16.1-1
+-
+- The Asterisk Development Team has announced the release of Asterisk 1.6.2.15.
+- This release is available for immediate download at
+- http://downloads.asterisk.org/pub/telephony/asterisk/
+-
+- The release of Asterisk 1.6.2.15 resolves several issues reported by the
+- community and would have not been possible without your participation.
+- Thank you!
+-
+- The following is a sample of the issues resolved in this release:
+-
+- * When using chan_skinny, don't crash when parking a non-bridged call.
+- (Closes issue #17680. Reported, tested by jmhunter. Patched, tested by DEA)
+-
+- * Add ability for Asterisk to try both the encoded and unencoded subscription
+- URI for a match in hints.
+- (Closes issue #17785. Reported, tested by ramonpeek. Patched by tilghman)
+-
+- * Set the caller id on CDRs when it is set on the parent channel.
+- (Closes issue #17569. Reported, patched by tbelder)
+-
+- * Ensure user portion of SIP URI matches dialplan when using encoded characters
+- (Closes issue #17892. Reported by wdoekes. Patched by jpeeler)
+-
+- * Resolve issue where Party A in an analog 3-way call would continue to hear
+- ringback after party C answers.
+- (Patched by rmudgett)
+-
+- * Fix problem with qualify option packets for realtime peers never stopping.
+- The option packets not only never stopped, but if a realtime peer was not in
+- the peer list multiple options dialogs could accumulate over time.
+- (Closes issue #16382. Reported by lftsy. Tested by zerohalo. Patched by
+- jpeeler)
+-
+- * Multiple fixes related to Local channels.
+-
+- For a full list of changes in this release, please see the ChangeLog:
+-
+- http://downloads.asterisk.org/pub/telephony/asterisk/ChangeLog-1.6.2.15
+
+* Tue Jan 25 2011 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2.16.1-1
+-
+- The Asterisk Development Team has announced the release of Asterisk
+- 1.6.2.14. This release is available for immediate download at
+- http://downloads.asterisk.org/pub/telephony/asterisk/
+-
+- The release of Asterisk 1.6.2.14 resolves several issues reported by the
+- community and would have not been possible without your participation.
+- Thank you!
+-
+- The following is a sample of the issues resolved in this release:
+-
+- * Fix issue where session timers would be advertised as supported even
+- when session-timers=refuse was set in sip.conf. Also fix
+- interoperability problems with session timer behavior in Asterisk.
+- (Closes issue #17005. Reported by alexcarey. Patched by dvossel)
+-
+- * Parse all "Accept" headers for SIP SUBSCRIBE requests.
+- (Closes issue #17758. Reported by ibc. Patched by dvossel)
+-
+- * Fix issue where queue stats would be reset on reload.
+- (Closes issue #17535. Reported by raarts. Patched by tilghman)
+-
+- * Fix issue where MoH files were no longer rescanned on during a
+- reload.
+- (Closes issue #16744. Reported by pj. Patched by Qwell)
+-
+- * Fix issue with dialplan pattern matching where the specificity for
+- pattern ranges and pattern characters was inconsistent.
+- (Closes issue #16903. Reported, patched by Nick_Lewis)
+-
+- For a full list of changes in the current release, please see the
+- ChangeLog:
+-
+- http://downloads.asterisk.org/pub/telephony/asterisk/ChangeLog-1.6.2.14
+
* Fri Oct 8 2010 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2.14-0.1.rc1
- The release of Asterisk 1.6.2.14-rc1 resolves several issues reported by the
- community and would have not been possible without your participation.
diff --git a/menuselect.makeopts b/menuselect.makeopts
index b8007ce..649a5a3 100644
--- a/menuselect.makeopts
+++ b/menuselect.makeopts
@@ -12,7 +12,7 @@ MENUSELECT_EMBED=
MENUSELECT_CORE_SOUNDS=
MENUSELECT_MOH=
MENUSELECT_EXTRA_SOUNDS=
-MENUSELECT_TESTS=test_skel test_heap test_sched test_astobj2 test_dlinklists test_poll
+MENUSELECT_TESTS=test_skel test_heap test_sched test_astobj2 test_dlinklists test_poll test_expr
MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_osplookup
MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_h323
MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_nbs
diff --git a/sources b/sources
index 12a0f9a..7747a28 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-5942e2aeb5f737d47d31e79eb034a118 asterisk-1.6.2.14-rc1.tar.gz
-092b02fd6848d7f91b16d1094591e8e4 asterisk-1.6.2.14-rc1.tar.gz.asc
+8edc697c2766ecf93143b05b4231d838 asterisk-1.6.2.16.1.tar.gz
+f14b77e8d9d17077ee7b44b2042ce4cb asterisk-1.6.2.16.1.tar.gz.asc
More information about the scm-commits
mailing list