[asterisk/f16] 1.8.7.1

Jeffrey C. Ollie jcollie at fedoraproject.org
Mon Oct 17 21:00:46 UTC 2011


commit 80ac0bcf65349936d397dd094877ad38ba1eab95
Author: Jeffrey C. Ollie <jeff at ocjtech.us>
Date:   Mon Oct 17 16:00:35 2011 -0500

    1.8.7.1

 .gitignore                                         |    4 +-
 ...it-scripts-for-better-Fedora-compatibilty.patch |    8 +-
 ...t-enable-modules-that-are-explicitly-disa.patch |   40 ----------
 ...les.conf-so-that-different-voicemail-modu.patch |    6 +-
 ...king-building-against-an-external-libedit.patch |   12 ++--
 ...rary-function-for-loading-command-history.patch |    8 +-
 0005-Fix-up-some-paths.patch                       |    6 +-
 ...hema-that-is-compatible-with-Fedora-Direc.patch |    6 +-
 ...chan_mgcp-and-res_pktccops-because-res_pk.patch |    6 +-
 ...hat-AST_ARGS-is-used-consistently-in-Fedo.patch |    8 +-
 ...se-consistently-in-the-Fedora-init-script.patch |   10 +-
 ...hat-the-Fedora-init-script-can-find-the-p.patch |    8 +-
 ...the-inotify-code-to-handle-call-files-bei.patch |    6 +-
 0012-Fix-two-problems-with-app_sms.patch           |    6 +-
 ...k-lines-to-improve-compat-with-389-Direct.patch |    6 +-
 ...-the-config-in-res_pktccops.conf-for-extr.patch |   80 ++++++++++++++++++++
 asterisk.spec                                      |   72 +++++-------------
 sources                                            |    4 +-
 18 files changed, 150 insertions(+), 146 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5c6dd44..71165bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,5 +58,5 @@ asterisk-1.8.0-beta3.tar.gz.asc
 /asterisk-1.8.7.0-rc2.tar.gz.asc
 /asterisk-1.8.7.0.tar.gz
 /asterisk-1.8.7.0.tar.gz.asc
-/asterisk-1.8.8.0-rc1.tar.gz
-/asterisk-1.8.8.0-rc1.tar.gz.asc
+/asterisk-1.8.7.1.tar.gz
+/asterisk-1.8.7.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 87df0b6..7828e41 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 49f4f57190f7b041b271c3f6c7c0c5ae265d3c54 Mon Sep 17 00:00:00 2001
+From c9e668f62d3cce2df1ab80f16727debd99739764 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 01/13] Modify init scripts for better Fedora compatibilty.
+Subject: [PATCH 01/14] Modify init scripts for better Fedora compatibilty.
 
 ---
  contrib/init.d/rc.redhat.asterisk |   70 ++++++++++++++++++++-----------------
@@ -10,7 +10,7 @@ Subject: [PATCH 01/13] Modify init scripts for better Fedora compatibilty.
  create mode 100644 contrib/sysconfig/asterisk
 
 diff --git a/contrib/init.d/rc.redhat.asterisk b/contrib/init.d/rc.redhat.asterisk
-index 01ab862..049ff8f 100755
+index abf3951..0d53a57 100755
 --- a/contrib/init.d/rc.redhat.asterisk
 +++ b/contrib/init.d/rc.redhat.asterisk
 @@ -3,7 +3,7 @@
@@ -169,5 +169,5 @@ index 0000000..dab2e33
 +# A place to specify extra arguments for the Asterisk command line
 +AST_EXTRA_ARGS=""
 -- 
-1.7.6.4
+1.7.6.2
 
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 d096db2..92a2b30 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 7bc7c460902fcf974c90b0c5271ea41129867cb8 Mon Sep 17 00:00:00 2001
+From 1762acc9571412d03e5ef5fcf936bc0046e8f152 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 02/13] Modify modules.conf so that different voicemail
+Subject: [PATCH 02/14] Modify modules.conf so that different voicemail
  modules don't load at the same time.
 
 ---
@@ -43,5 +43,5 @@ index 38e33e1..9a1c1c3 100644
 +;noload => app_directory_plain.so
 +;noload => app_voicemail_plain.so
 -- 
-1.7.6.4
+1.7.6.2
 
diff --git a/0003-Allow-linking-building-against-an-external-libedit.patch b/0003-Allow-linking-building-against-an-external-libedit.patch
index 62e93a3..f413f91 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 c2ed166d88b573f7b8017b7e91232dcb25f76451 Mon Sep 17 00:00:00 2001
+From 2ec862ecc0024bd4e9a14bd0a2ddc62ad75465ea 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 03/13] Allow linking/building against an external libedit.
+Subject: [PATCH 03/14] 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,7 +31,7 @@ index 35573c3..4425204 100644
  LUA=@PBX_LUA@
  MISDN=@PBX_MISDN@
 diff --git a/configure.ac b/configure.ac
-index 63f8504..8a739ba 100644
+index c05d33f..4bd07ed 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -388,6 +388,7 @@ AST_EXT_LIB_SETUP([JACK], [Jack Audio Connection Kit], [jack])
@@ -42,7 +42,7 @@ index 63f8504..8a739ba 100644
  AST_EXT_LIB_SETUP([LIBXML2], [LibXML2], [libxml2])
  AST_EXT_LIB_SETUP([LTDL], [libtool], [ltdl])
  AST_EXT_LIB_SETUP([LUA], [Lua], [lua])
-@@ -2143,6 +2144,27 @@ AC_SUBST(PBX_GTK2)
+@@ -2161,6 +2162,27 @@ AC_SUBST(PBX_GTK2)
  AC_SUBST(GTK2_INCLUDE)
  AC_SUBST(GTK2_LIB)
  
@@ -71,7 +71,7 @@ index 63f8504..8a739ba 100644
  # or iODBC
  
 diff --git a/main/Makefile b/main/Makefile
-index 67f8b2e..15ad805 100644
+index 07143aa..269ca10 100644
 --- a/main/Makefile
 +++ b/main/Makefile
 @@ -144,6 +144,8 @@ testexpr2: ast_expr2f.c ast_expr2.c ast_expr2.h
@@ -135,5 +135,5 @@ index 3cde814..f86b166 100644
 +LIBEDIT_LIB=@LIBEDIT_LIB@
 +LIBEDIT_OBJ=@LIBEDIT_OBJ@
 -- 
-1.7.6.4
+1.7.6.2
 
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 2004c0c..5f9092a 100644
--- a/0004-Use-the-library-function-for-loading-command-history.patch
+++ b/0004-Use-the-library-function-for-loading-command-history.patch
@@ -1,7 +1,7 @@
-From 18e8bca1d26c39760f75f35e10b56d69959e59e4 Mon Sep 17 00:00:00 2001
+From d7df9875b514750095d24cb6e169ae57bb73c453 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 04/13] Use the library function for loading command history
+Subject: [PATCH 04/14] Use the library function for loading command history
  rather than implementing our own.
 
 ---
@@ -9,7 +9,7 @@ Subject: [PATCH 04/13] Use the library function for loading command history
  1 files changed, 2 insertions(+), 19 deletions(-)
 
 diff --git a/main/asterisk.c b/main/asterisk.c
-index b54ab03..195419d 100644
+index 2e1af3a..e69feb2 100644
 --- a/main/asterisk.c
 +++ b/main/asterisk.c
 @@ -2634,29 +2634,12 @@ static int ast_el_write_history(char *filename)
@@ -45,5 +45,5 @@ index b54ab03..195419d 100644
  
  static void ast_remotecontrol(char *data)
 -- 
-1.7.6.4
+1.7.6.2
 
diff --git a/0005-Fix-up-some-paths.patch b/0005-Fix-up-some-paths.patch
index 9e79da8..de75580 100644
--- a/0005-Fix-up-some-paths.patch
+++ b/0005-Fix-up-some-paths.patch
@@ -1,7 +1,7 @@
-From 184fa376a8a449ad4f5a6198ccf89f02ff4735f0 Mon Sep 17 00:00:00 2001
+From 727299938816d2555db864f557473ea4d77856e4 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 05/13] Fix up some paths
+Subject: [PATCH 05/14] Fix up some paths
 
 ---
  UPGRADE-1.4.txt                             |    2 +-
@@ -513,5 +513,5 @@ index 3c66be2..bedb8d8 100644
  exten => 762,1,agi(tts-riddle.agi)
  exten => 762,2,Background(gsm/what-time-it-is2)
 -- 
-1.7.6.4
+1.7.6.2
 
diff --git a/0006-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch b/0006-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch
index de46204..677f314 100644
--- a/0006-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 6796f72dd844724555e60c6c9f748e21e5d3a1fd Mon Sep 17 00:00:00 2001
+From 802da5c86e571b909bd198fc9460ac5230ef4191 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 06/13] Add LDAP schema that is compatible with Fedora
+Subject: [PATCH 06/14] Add LDAP schema that is compatible with Fedora
  Directory Server.
 
 ---
@@ -505,5 +505,5 @@ index 0000000..f3bdf4e
 +      $ AstConfigVariableName $ AstConfigVariableValue $ AstConfigCommented )
 +  )
 -- 
-1.7.6.4
+1.7.6.2
 
diff --git a/0007-Don-t-load-chan_mgcp-and-res_pktccops-because-res_pk.patch b/0007-Don-t-load-chan_mgcp-and-res_pktccops-because-res_pk.patch
index 664c664..2541ca3 100644
--- a/0007-Don-t-load-chan_mgcp-and-res_pktccops-because-res_pk.patch
+++ b/0007-Don-t-load-chan_mgcp-and-res_pktccops-because-res_pk.patch
@@ -1,7 +1,7 @@
-From f6cf04234bb00333e4a51fd4a8ff116fcd09417d Mon Sep 17 00:00:00 2001
+From f1233019198363c12025f76b710995dfee0e2d38 Mon Sep 17 00:00:00 2001
 From: "Jeffrey C. Ollie" <jeff at ocjtech.us>
 Date: Tue, 20 Sep 2011 08:40:49 -0500
-Subject: [PATCH 07/13] Don't load chan_mgcp and res_pktccops because
+Subject: [PATCH 07/14] Don't load chan_mgcp and res_pktccops because
  res_pktccops floods 192.168.0.24 in the default
  config
 
@@ -22,5 +22,5 @@ index 9a1c1c3..3dc2b74 100644
 +noload => chan_mgcp.so
 +noload => res_pktccops.so
 -- 
-1.7.6.4
+1.7.6.2
 
diff --git a/0008-Make-sure-that-AST_ARGS-is-used-consistently-in-Fedo.patch b/0008-Make-sure-that-AST_ARGS-is-used-consistently-in-Fedo.patch
index 9890ffa..d249eb8 100644
--- a/0008-Make-sure-that-AST_ARGS-is-used-consistently-in-Fedo.patch
+++ b/0008-Make-sure-that-AST_ARGS-is-used-consistently-in-Fedo.patch
@@ -1,7 +1,7 @@
-From 47840cfab26e11a22b9d212baba645d7e15d8d6c Mon Sep 17 00:00:00 2001
+From 48a7a760e910ce6afd59e83ca1e01e62876c59cc Mon Sep 17 00:00:00 2001
 From: "Jeffrey C. Ollie" <jeff at ocjtech.us>
 Date: Tue, 20 Sep 2011 09:11:13 -0500
-Subject: [PATCH 08/13] Make sure that AST_ARGS is used consistently in Fedora
+Subject: [PATCH 08/14] Make sure that AST_ARGS is used consistently in Fedora
  init script
 
 ---
@@ -9,7 +9,7 @@ Subject: [PATCH 08/13] Make sure that AST_ARGS is used consistently in Fedora
  1 files changed, 10 insertions(+), 10 deletions(-)
 
 diff --git a/contrib/init.d/rc.redhat.asterisk b/contrib/init.d/rc.redhat.asterisk
-index 049ff8f..45083b7 100755
+index 0d53a57..186fc18 100755
 --- a/contrib/init.d/rc.redhat.asterisk
 +++ b/contrib/init.d/rc.redhat.asterisk
 @@ -101,35 +101,35 @@ start() {
@@ -59,5 +59,5 @@ index 049ff8f..45083b7 100755
  	RETVAL=$?
  	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/asterisk
 -- 
-1.7.6.4
+1.7.6.2
 
diff --git a/0009-Use-consistently-in-the-Fedora-init-script.patch b/0009-Use-consistently-in-the-Fedora-init-script.patch
index 437f609..96722e9 100644
--- a/0009-Use-consistently-in-the-Fedora-init-script.patch
+++ b/0009-Use-consistently-in-the-Fedora-init-script.patch
@@ -1,14 +1,14 @@
-From 954d99692d5e15f5afd98a137d4a0153b69ac8ac Mon Sep 17 00:00:00 2001
+From 382a378507925b935b130241bd73d2d7e402c006 Mon Sep 17 00:00:00 2001
 From: "Jeffrey C. Ollie" <jeff at ocjtech.us>
 Date: Tue, 20 Sep 2011 09:12:02 -0500
-Subject: [PATCH 09/13] Use  consistently in the Fedora init script
+Subject: [PATCH 09/14] Use  consistently in the Fedora init script
 
 ---
  contrib/init.d/rc.redhat.asterisk |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/contrib/init.d/rc.redhat.asterisk b/contrib/init.d/rc.redhat.asterisk
-index 45083b7..76ffcfd 100755
+index 186fc18..7415138 100755
 --- a/contrib/init.d/rc.redhat.asterisk
 +++ b/contrib/init.d/rc.redhat.asterisk
 @@ -82,7 +82,7 @@ RETVAL=0
@@ -19,7 +19,7 @@ index 45083b7..76ffcfd 100755
 +	VERSION=`$DAEMON -rx 'core show version'`
  	if [ "`echo $VERSION | cut -c 1-8`" = "Asterisk" ]; then
  		echo "Asterisk is already running."
- 		exit 0
+ 		exit 1
 -- 
-1.7.6.4
+1.7.6.2
 
diff --git a/0010-Make-sure-that-the-Fedora-init-script-can-find-the-p.patch b/0010-Make-sure-that-the-Fedora-init-script-can-find-the-p.patch
index d27204c..7b89b86 100644
--- a/0010-Make-sure-that-the-Fedora-init-script-can-find-the-p.patch
+++ b/0010-Make-sure-that-the-Fedora-init-script-can-find-the-p.patch
@@ -1,7 +1,7 @@
-From 777399984360df8c3e0bf781aea58f58542c7654 Mon Sep 17 00:00:00 2001
+From 6a57b68b22473802e2a5d133ba24fd8f24f4be20 Mon Sep 17 00:00:00 2001
 From: "Jeffrey C. Ollie" <jeff at ocjtech.us>
 Date: Tue, 20 Sep 2011 09:12:57 -0500
-Subject: [PATCH 10/13] Make sure that the Fedora init script can find the pid
+Subject: [PATCH 10/14] Make sure that the Fedora init script can find the pid
  file.
 
 ---
@@ -9,7 +9,7 @@ Subject: [PATCH 10/13] Make sure that the Fedora init script can find the pid
  1 files changed, 2 insertions(+), 1 deletions(-)
 
 diff --git a/contrib/init.d/rc.redhat.asterisk b/contrib/init.d/rc.redhat.asterisk
-index 76ffcfd..991b829 100755
+index 7415138..95e83ef 100755
 --- a/contrib/init.d/rc.redhat.asterisk
 +++ b/contrib/init.d/rc.redhat.asterisk
 @@ -140,7 +140,8 @@ start() {
@@ -23,5 +23,5 @@ index 76ffcfd..991b829 100755
  	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/asterisk
  	echo
 -- 
-1.7.6.4
+1.7.6.2
 
diff --git a/0011-This-fixes-the-inotify-code-to-handle-call-files-bei.patch b/0011-This-fixes-the-inotify-code-to-handle-call-files-bei.patch
index 65ff7e7..5a6fa16 100644
--- a/0011-This-fixes-the-inotify-code-to-handle-call-files-bei.patch
+++ b/0011-This-fixes-the-inotify-code-to-handle-call-files-bei.patch
@@ -1,7 +1,7 @@
-From 8779b41f3d0456af9026edc87f1f88266727ee41 Mon Sep 17 00:00:00 2001
+From 7ee9833fa5ad62c5ce3584d9ff3262a7731796b8 Mon Sep 17 00:00:00 2001
 From: David Woodhouse <dwmw2 at infradead.org>
 Date: Tue, 20 Sep 2011 09:19:22 -0500
-Subject: [PATCH 11/13] This fixes the inotify code to handle call files being
+Subject: [PATCH 11/14] This fixes the inotify code to handle call files being
  hardlinked into the spool directory.
 
 The smsq utility does this, instead of rename(), to ensure that it
@@ -132,5 +132,5 @@ index d13b539..40d2a6d 100644
  		AST_LIST_LOCK(&dirlist);
  		while (!AST_LIST_EMPTY(&dirlist) && AST_LIST_FIRST(&dirlist)->mtime <= now) {
 -- 
-1.7.6.4
+1.7.6.2
 
diff --git a/0012-Fix-two-problems-with-app_sms.patch b/0012-Fix-two-problems-with-app_sms.patch
index e3f9a33..138c40d 100644
--- a/0012-Fix-two-problems-with-app_sms.patch
+++ b/0012-Fix-two-problems-with-app_sms.patch
@@ -1,7 +1,7 @@
-From ea2ab9f7d990cae5675c72dfdb557e616c0663bb Mon Sep 17 00:00:00 2001
+From 4401cf3bcf07723bf30724f76074942eb7aaa7be Mon Sep 17 00:00:00 2001
 From: David Woodhouse <dwmw2 at infradead.org>
 Date: Tue, 20 Sep 2011 09:21:47 -0500
-Subject: [PATCH 12/13] Fix two problems with app_sms.
+Subject: [PATCH 12/14] Fix two problems with app_sms.
 
 Firstly, the 'flags' field on the stack in sms_exec() is
 uninitialised, causing it to use the wrong protocol in some cases.
@@ -60,5 +60,5 @@ index 7c13147..120dce5 100644
  	char *p;
  	AST_DECLARE_APP_ARGS(sms_args,
 -- 
-1.7.6.4
+1.7.6.2
 
diff --git a/0013-Remove-blank-lines-to-improve-compat-with-389-Direct.patch b/0013-Remove-blank-lines-to-improve-compat-with-389-Direct.patch
index 2f89cb1..5b2af11 100644
--- a/0013-Remove-blank-lines-to-improve-compat-with-389-Direct.patch
+++ b/0013-Remove-blank-lines-to-improve-compat-with-389-Direct.patch
@@ -1,7 +1,7 @@
-From 4a0aa22b6f150fa1aa9b5d9b5967e9f1bbe370bc Mon Sep 17 00:00:00 2001
+From 0ee8123802c0dbc4b0d4837d1941df9299abf1a5 Mon Sep 17 00:00:00 2001
 From: "Jeffrey C. Ollie" <jeff at ocjtech.us>
 Date: Tue, 20 Sep 2011 10:21:04 -0500
-Subject: [PATCH 13/13] Remove blank lines to improve compat with 389
+Subject: [PATCH 13/14] Remove blank lines to improve compat with 389
  Directory Server
 
 ---
@@ -428,5 +428,5 @@ index f3bdf4e..d5cd6a1 100644
    DESC 'Asterisk configuration Information'
    SUP top
 -- 
-1.7.6.4
+1.7.6.2
 
diff --git a/0014-Comment-out-the-config-in-res_pktccops.conf-for-extr.patch b/0014-Comment-out-the-config-in-res_pktccops.conf-for-extr.patch
new file mode 100644
index 0000000..0661aa5
--- /dev/null
+++ b/0014-Comment-out-the-config-in-res_pktccops.conf-for-extr.patch
@@ -0,0 +1,80 @@
+From d05e88098b8a38b79fdc95650b144a81d23479eb Mon Sep 17 00:00:00 2001
+From: "Jeffrey C. Ollie" <jeff at ocjtech.us>
+Date: Tue, 20 Sep 2011 11:52:03 -0500
+Subject: [PATCH 14/14] Comment out the config in res_pktccops.conf for extra
+ safety
+
+---
+ configs/res_pktccops.conf.sample |   61 ++++++++++++++++++-------------------
+ 1 files changed, 30 insertions(+), 31 deletions(-)
+
+diff --git a/configs/res_pktccops.conf.sample b/configs/res_pktccops.conf.sample
+index 3d61808..3a4c836 100644
+--- a/configs/res_pktccops.conf.sample
++++ b/configs/res_pktccops.conf.sample
+@@ -1,32 +1,31 @@
+ ; Sample res_pktccops.conf
+-
+-[general]
+-gateinfoperiod => 60 ; default 60s
+-gatetimeout = 150 ; default 150
+-t1 => 250 ; default 250s
+-t7 => 200 ; default 200s
+-t8 => 300 ; default 300s
+-keepalive => 60 ; default 60s
+-
+-[teszt]
+-host => 192.168.0.24
+-pool => 10.0.1.0 10.0.1.255
+-pool => 10.0.3.0 10.0.3.255
+-pool => 10.0.7.0 10.0.8.255
+-pool => 10.0.10.0 10.0.11.255
+-
+-[general]
+-gateinfoperiod => 60 ; default 60s
+-gatetimeout = 150 ; default 150
+-t1 => 250 ; default 250s
+-t7 => 200 ; default 200s
+-t8 => 300 ; default 300s
+-keepalive => 60 ; default 60s
+-
+-[test]
+-host => 192.168.0.24
+-pool => 10.0.1.0 10.0.1.255
+-pool => 10.0.3.0 10.0.3.255
+-pool => 10.0.7.0 10.0.8.255
+-pool => 10.0.10.0 10.0.11.255
+-
++;
++;[general]
++;gateinfoperiod => 60 ; default 60s
++;gatetimeout = 150 ; default 150
++;t1 => 250 ; default 250s
++;t7 => 200 ; default 200s
++;t8 => 300 ; default 300s
++;keepalive => 60 ; default 60s
++;
++;[teszt]
++;host => 192.168.0.24
++;pool => 10.0.1.0 10.0.1.255
++;pool => 10.0.3.0 10.0.3.255
++;pool => 10.0.7.0 10.0.8.255
++;pool => 10.0.10.0 10.0.11.255
++;
++;[general]
++;gateinfoperiod => 60 ; default 60s
++;gatetimeout = 150 ; default 150
++;t1 => 250 ; default 250s
++;t7 => 200 ; default 200s
++;t8 => 300 ; default 300s
++;keepalive => 60 ; default 60s
++;
++;[test]
++;host => 192.168.0.24
++;pool => 10.0.1.0 10.0.1.255
++;pool => 10.0.3.0 10.0.3.255
++;pool => 10.0.7.0 10.0.8.255
++;pool => 10.0.10.0 10.0.11.255
+-- 
+1.7.6.2
+
diff --git a/asterisk.spec b/asterisk.spec
index 495de7a..77d3182 100644
--- a/asterisk.spec
+++ b/asterisk.spec
@@ -1,4 +1,4 @@
-%global _rc 1
+#global _rc 1
 #global _beta 5
 
 %if 0%{?fedora} >= 15
@@ -17,8 +17,8 @@
 
 Summary: The Open Source PBX
 Name: asterisk
-Version: 1.8.8.0
-Release: 0.1%{?_rc:.rc%{_rc}}%{?_beta:.beta%{_beta}}%{?dist}
+Version: 1.8.7.1
+Release: 1%{?_rc:.rc%{_rc}}%{?_beta:.beta%{_beta}}%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.asterisk.org/
@@ -47,8 +47,6 @@ Patch11: 0011-This-fixes-the-inotify-code-to-handle-call-files-bei.patch
 Patch12: 0012-Fix-two-problems-with-app_sms.patch
 Patch13: 0013-Remove-blank-lines-to-improve-compat-with-389-Direct.patch
 
-Patch14: 0001-Revert-Don-t-enable-modules-that-are-explicitly-disa.patch
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
 BuildRequires: autoconf
@@ -484,10 +482,6 @@ local filesystem.
 %patch12 -p1
 %patch13 -p1
 
-pushd menuselect
-%patch14 -p1
-popd
-
 cp %{S:3} menuselect.makedeps
 cp %{S:4} menuselect.makeopts
 
@@ -1273,58 +1267,28 @@ fi
 %{_libdir}/asterisk/modules/app_voicemail_plain.so
 
 %changelog
-* Thu Oct  6 2011 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.8.8.0-0.1.rc1
-- The Asterisk Development Team announces the first release candidate of
-- Asterisk 1.8.8.0. This release candidate is available for immediate download at
-- http://downloads.asterisk.org/pub/telephony/asterisk/
+* Mon Oct 17 2011 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.8.7.1-1
+- The Asterisk Development Team has announced a security release for Asterisk 1.8.
+- The available security release is released as version 1.8.7.1.
 -
-- The release of Asterisk 1.8.8.0-rc1 resolves several issues reported by the
-- community and would have not been possible without your participation.
-- Thank you!
+- This release is available for immediate download at
+- http://downloads.asterisk.org/pub/telephony/asterisk/releases
 -
-- The following is a sample of the issues resolved in this release candidate:
+- The release of Asterisk 1.8.7.1 resolves an issue with SIP URI parsing which can
+- lead to a remotely exploitable crash:
 -
--  * Updated SIP 484 handling; added Incomplete control frame
--   When a SIP phone uses the dial application and receives a 484 Address
--   Incomplete response, if overlapped dialing is enabled for SIP, then the 484
--   Address Incomplete is forwarded back to the SIP phone and the HANGUPCAUSE
--   channel variable is set to 28. Previously, the Incomplete application
--   dialplan logic was automatically triggered; now, explicit dialplan usage of
--   the application is required.
--   (Closes ASTERISK-17288. Reported by: Mikael Carlsson Tested by: Matthew
--    Jordan Review: https://reviewboard.asterisk.org/r/1416/)
--
--  * Prevent IAX2 from getting IPv6 addresses via DNS IAX2 does not support IPv6
--   and getting such addresses from DNS can cause error messages on the remote
--   end involving bad IPv4 address casts in the presence of IPv6/IPv4 tunnels.
--   (Closes issue ASTERISK-18090. Patched by Kinsey Moore)
--
--  * Fix bad RTP media bridges in directmedia calls on peers separated by multiple
--   Asterisk nodes.
--   (Closes issue ASTERISK-18340. Reported by: Thomas Arimont. Closes issue
--    ASTERISK-17725. Reported by: kwk. Tested by: twilson, jrose)
--
--  * Fix crashes in ast_rtcp_write()
--   (Closes issue ASTERISK-18570)
--   Related issues that look like they are the same problem:
--   (Issue ASTERISK-17560, ASTERISK-15406, ASTERISK-15257, ASTERISK-13334,
--    ASTERISK-9977, ASTERISK-9716)
--   Review: https://reviewboard.asterisk.org/r/1444/
--   Patched by: Russell Bryant
--
--  * Fix for incorrect voicemail duration in external notifications.
--   This patch fixes an issue where the voicemail duration was being reported
--   with a duration significantly less than the actual sound file duration.
--   (Closes ASTERISK-16981. Reported by: Mary Ciuciu, Byron Clark, Brad House,
--    Karsten Wemheuer, KevinH Tested by: Matt Jordan
--    Review: https://reviewboard.asterisk.org/r/1443)
--
--  * Prevent segfault if call arrives before Asterisk is fully booted.
--   (Patched by alecdavis. https://reviewboard.asterisk.org/r/1407/)
+-    Remote Crash Vulnerability in SIP channel driver (AST-2011-012)
 -
-- For a full list of changes in this release candidate, please see the ChangeLog:
+- The issue and resolution is described in the AST-2011-012 security
+- advisory.
+-
+- For more information about the details of this vulnerability, please read the
+- security advisory AST-2011-012, which was released at the same time as this
+- announcement.
+-
+- For a full list of changes in the current release, please see the ChangeLog:
 -
-- http://downloads.asterisk.org/pub/telephony/asterisk/ChangeLog-1.8.8.0-rc1
+- http://downloads.asterisk.org/pub/telephony/asterisk/releases/ChangeLog-1.8.7.1
 
 * Mon Oct  3 2011 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.8.7.0-1
 - The Asterisk Development Team announces the release of Asterisk 1.8.7.0. This
diff --git a/sources b/sources
index e47eaa1..5be4570 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-d9f7a7c197d62f7ce6a20517fae3d1ba  asterisk-1.8.8.0-rc1.tar.gz
-3ea3a75b307cd771d01963f1d858ab66  asterisk-1.8.8.0-rc1.tar.gz.asc
+a732a608ce60fd523646be618e9da616  asterisk-1.8.7.1.tar.gz
+64a4d195dc3b2d2a5fd21616cd98e39d  asterisk-1.8.7.1.tar.gz.asc


More information about the scm-commits mailing list