[asterisk/f16] 1.8.17.0

Jeffrey C. Ollie jcollie at fedoraproject.org
Wed Oct 10 18:40:22 UTC 2012


commit c028602798e1764499de49250501b520a395f64f
Author: Jeffrey C. Ollie <jeff at ocjtech.us>
Date:   Wed Oct 10 13:40:12 2012 -0500

    1.8.17.0

 .gitignore                                         |    2 +
 ...it-scripts-for-better-Fedora-compatibilty.patch |   12 +-
 ...les.conf-so-that-different-voicemail-modu.patch |   12 +-
 ...king-building-against-an-external-libedit.patch |   40 +++---
 ...rary-function-for-loading-command-history.patch |   14 +-
 0005-Fix-up-some-paths.patch                       |   38 +++---
 ...hema-that-is-compatible-with-Fedora-Direc.patch |   12 +-
 ...chan_mgcp-and-res_pktccops-because-res_pk.patch |   13 +-
 ...tch => 0008-Fix-two-problems-with-app_sms.patch |    8 +-
 ...hat-AST_ARGS-is-used-consistently-in-Fedo.patch |   63 ---------
 ...k-lines-to-improve-compat-with-389-Direct.patch |   12 +-
 ...se-consistently-in-the-Fedora-init-script.patch |   25 ----
 ...hat-the-Fedora-init-script-can-find-the-p.patch |   27 ----
 ...the-inotify-code-to-handle-call-files-bei.patch |  136 --------------------
 ...-the-config-in-res_pktccops.conf-for-extr.patch |   80 ------------
 asterisk.spec                                      |   53 ++++++--
 sources                                            |    4 +-
 17 files changed, 123 insertions(+), 428 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 53f0568..eba354c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -82,3 +82,5 @@ asterisk-1.8.0-beta3.tar.gz.asc
 /asterisk-1.8.15.1.tar.gz.asc
 /asterisk-1.8.16.0.tar.gz
 /asterisk-1.8.16.0.tar.gz.asc
+/asterisk-1.8.17.0.tar.gz
+/asterisk-1.8.17.0.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 7828e41..47dd11e 100644
--- a/0001-Modify-init-scripts-for-better-Fedora-compatibilty.patch
+++ b/0001-Modify-init-scripts-for-better-Fedora-compatibilty.patch
@@ -1,16 +1,16 @@
-From c9e668f62d3cce2df1ab80f16727debd99739764 Mon Sep 17 00:00:00 2001
+From e2fd94f388a1087f11eea8d6cfebdaa49b7fb092 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/14] Modify init scripts for better Fedora compatibilty.
+Subject: [PATCH 1/9] Modify init scripts for better Fedora compatibilty.
 
 ---
- contrib/init.d/rc.redhat.asterisk |   70 ++++++++++++++++++++-----------------
- contrib/sysconfig/asterisk        |   19 ++++++++++
+ contrib/init.d/rc.redhat.asterisk | 70 +++++++++++++++++++++------------------
+ contrib/sysconfig/asterisk        | 19 +++++++++++
  2 files changed, 57 insertions(+), 32 deletions(-)
  create mode 100644 contrib/sysconfig/asterisk
 
 diff --git a/contrib/init.d/rc.redhat.asterisk b/contrib/init.d/rc.redhat.asterisk
-index abf3951..0d53a57 100755
+index 01ab862..049ff8f 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.2
+1.7.12.1
 
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 92a2b30..e2e8cec 100644
--- a/0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
+++ b/0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
@@ -1,12 +1,12 @@
-From 1762acc9571412d03e5ef5fcf936bc0046e8f152 Mon Sep 17 00:00:00 2001
+From 7f0421d954b5978b946dabcdf309d0dd1152b351 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/14] Modify modules.conf so that different voicemail
- modules don't load at the same time.
+Subject: [PATCH 2/9] Modify modules.conf so that different voicemail modules
+ don't load at the same time.
 
 ---
- configs/modules.conf.sample |   26 ++++++++++++++++++++++++++
- 1 files changed, 26 insertions(+), 0 deletions(-)
+ configs/modules.conf.sample | 26 ++++++++++++++++++++++++++
+ 1 file changed, 26 insertions(+)
 
 diff --git a/configs/modules.conf.sample b/configs/modules.conf.sample
 index 38e33e1..9a1c1c3 100644
@@ -43,5 +43,5 @@ index 38e33e1..9a1c1c3 100644
 +;noload => app_directory_plain.so
 +;noload => app_voicemail_plain.so
 -- 
-1.7.6.2
+1.7.12.1
 
diff --git a/0003-Allow-linking-building-against-an-external-libedit.patch b/0003-Allow-linking-building-against-an-external-libedit.patch
index f413f91..203a361 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 2ec862ecc0024bd4e9a14bd0a2ddc62ad75465ea Mon Sep 17 00:00:00 2001
+From a7440988a6631515fda3b8fa09640b5bdfd914a0 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/14] Allow linking/building against an external libedit.
+Subject: [PATCH 3/9] 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
@@ -11,15 +11,15 @@ be very difficult to track down all instances of the library.  This
 patch adds the option of building/linking against an external copy of
 the libedit library.
 ---
- build_tools/menuselect-deps.in |    1 +
- configure.ac                   |   22 ++++++++++++++++++++++
- main/Makefile                  |   10 ++++++----
- main/cli.c                     |    3 ++-
- makeopts.in                    |    4 ++++
+ build_tools/menuselect-deps.in |  1 +
+ configure.ac                   | 22 ++++++++++++++++++++++
+ main/Makefile                  | 10 ++++++----
+ main/cli.c                     |  3 ++-
+ makeopts.in                    |  4 ++++
  5 files changed, 35 insertions(+), 5 deletions(-)
 
 diff --git a/build_tools/menuselect-deps.in b/build_tools/menuselect-deps.in
-index 35573c3..4425204 100644
+index e159c20..720e60e 100644
 --- a/build_tools/menuselect-deps.in
 +++ b/build_tools/menuselect-deps.in
 @@ -26,6 +26,7 @@ JACK=@PBX_JACK@
@@ -31,7 +31,7 @@ index 35573c3..4425204 100644
  LUA=@PBX_LUA@
  MISDN=@PBX_MISDN@
 diff --git a/configure.ac b/configure.ac
-index c05d33f..4bd07ed 100644
+index aa93f96..7b6bcd0 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 c05d33f..4bd07ed 100644
  AST_EXT_LIB_SETUP([LIBXML2], [LibXML2], [libxml2])
  AST_EXT_LIB_SETUP([LTDL], [libtool], [ltdl])
  AST_EXT_LIB_SETUP([LUA], [Lua], [lua])
-@@ -2161,6 +2162,27 @@ AC_SUBST(PBX_GTK2)
+@@ -2211,6 +2212,27 @@ AC_SUBST(PBX_GTK2)
  AC_SUBST(GTK2_INCLUDE)
  AC_SUBST(GTK2_LIB)
  
@@ -71,10 +71,10 @@ index c05d33f..4bd07ed 100644
  # or iODBC
  
 diff --git a/main/Makefile b/main/Makefile
-index 07143aa..269ca10 100644
+index e877c7d..5d54b62 100644
 --- a/main/Makefile
 +++ b/main/Makefile
-@@ -144,6 +144,8 @@ testexpr2: ast_expr2f.c ast_expr2.c ast_expr2.h
+@@ -141,6 +141,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,9 +83,9 @@ index 07143aa..269ca10 100644
  ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),)
  http.o: _ASTCFLAGS+=$(GMIME_INCLUDE)
  endif
-@@ -178,13 +180,13 @@ endif
+@@ -179,13 +181,13 @@ ssl.o: _ASTCFLAGS+=$(OPENSSL_INCLUDE)
  
- $(OBJS): _ASTCFLAGS+=-DAST_MODULE=\"core\"
+ tcptls.o: _ASTCFLAGS+=$(OPENSSL_INCLUDE)
  
 -$(MAIN_TGT): $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS)
 +$(MAIN_TGT): $(OBJS) $(LIBEDIT_OBJ) db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS)
@@ -102,10 +102,10 @@ index 07143aa..269ca10 100644
  
  ifeq ($(GNU_LD),1)
 diff --git a/main/cli.c b/main/cli.c
-index 407973f..52faf4d 100644
+index 066bf5c..3f3a96c 100644
 --- a/main/cli.c
 +++ b/main/cli.c
-@@ -36,6 +36,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+@@ -40,6 +40,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
  #include <pwd.h>
  #include <grp.h>
  
@@ -114,7 +114,7 @@ index 407973f..52faf4d 100644
  #include "asterisk/cli.h"
  #include "asterisk/linkedlists.h"
  #include "asterisk/module.h"
-@@ -44,7 +46,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+@@ -48,7 +50,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
  #include "asterisk/utils.h"
  #include "asterisk/app.h"
  #include "asterisk/lock.h"
@@ -123,10 +123,10 @@ index 407973f..52faf4d 100644
  #include "asterisk/translate.h"
  
 diff --git a/makeopts.in b/makeopts.in
-index 3cde814..f86b166 100644
+index f4a7de2..8ec3d25 100644
 --- a/makeopts.in
 +++ b/makeopts.in
-@@ -308,3 +308,7 @@ TINFO_DIR=@TINFO_DIR@
+@@ -304,3 +304,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 3cde814..f86b166 100644
 +LIBEDIT_LIB=@LIBEDIT_LIB@
 +LIBEDIT_OBJ=@LIBEDIT_OBJ@
 -- 
-1.7.6.2
+1.7.12.1
 
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 5f9092a..f937fd3 100644
--- a/0004-Use-the-library-function-for-loading-command-history.patch
+++ b/0004-Use-the-library-function-for-loading-command-history.patch
@@ -1,18 +1,18 @@
-From d7df9875b514750095d24cb6e169ae57bb73c453 Mon Sep 17 00:00:00 2001
+From af6842b76893098b137192b5fb6da4a0df58f34e 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/14] Use the library function for loading command history
+Subject: [PATCH 4/9] Use the library function for loading command history
  rather than implementing our own.
 
 ---
- main/asterisk.c |   21 ++-------------------
- 1 files changed, 2 insertions(+), 19 deletions(-)
+ main/asterisk.c | 21 ++-------------------
+ 1 file changed, 2 insertions(+), 19 deletions(-)
 
 diff --git a/main/asterisk.c b/main/asterisk.c
-index 2e1af3a..e69feb2 100644
+index 721c1b0..0120891 100644
 --- a/main/asterisk.c
 +++ b/main/asterisk.c
-@@ -2634,29 +2634,12 @@ static int ast_el_write_history(char *filename)
+@@ -2740,29 +2740,12 @@ static int ast_el_write_history(char *filename)
  
  static int ast_el_read_history(char *filename)
  {
@@ -45,5 +45,5 @@ index 2e1af3a..e69feb2 100644
  
  static void ast_remotecontrol(char *data)
 -- 
-1.7.6.2
+1.7.12.1
 
diff --git a/0005-Fix-up-some-paths.patch b/0005-Fix-up-some-paths.patch
index de75580..e22198a 100644
--- a/0005-Fix-up-some-paths.patch
+++ b/0005-Fix-up-some-paths.patch
@@ -1,21 +1,21 @@
-From 727299938816d2555db864f557473ea4d77856e4 Mon Sep 17 00:00:00 2001
+From a28f6d6cd20e35c0d7eab2d279d88ffd5754a0c8 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/14] Fix up some paths
+Subject: [PATCH 5/9] 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             |    8 +++---
- configs/osp.conf.sample                     |    4 +-
- configs/phoneprov.conf.sample               |    2 +-
- contrib/scripts/astgenkey                   |    2 +-
- contrib/scripts/astgenkey.8                 |    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 ++++++++++++------------
+ UPGRADE-1.4.txt                             |  2 +-
+ configs/festival.conf.sample                |  2 +-
+ configs/http.conf.sample                    |  6 +++---
+ configs/iax.conf.sample                     |  4 ++--
+ configs/musiconhold.conf.sample             |  8 ++++----
+ configs/osp.conf.sample                     |  4 ++--
+ configs/phoneprov.conf.sample               |  2 +-
+ contrib/scripts/astgenkey                   |  2 +-
+ contrib/scripts/astgenkey.8                 |  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 +++++++++++++-------------
  12 files changed, 59 insertions(+), 59 deletions(-)
 
 diff --git a/UPGRADE-1.4.txt b/UPGRADE-1.4.txt
@@ -45,7 +45,7 @@ index e918217..31d5fc2 100644
  ; 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 7893caf..8a5fd9c 100644
+index 7d4db43..ca30f45 100644
 --- a/configs/http.conf.sample
 +++ b/configs/http.conf.sample
 @@ -5,7 +5,7 @@
@@ -57,7 +57,7 @@ index 7893caf..8a5fd9c 100644
  ;   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:
-@@ -74,6 +74,6 @@ bindaddr=127.0.0.1
+@@ -73,6 +73,6 @@ bindaddr=127.0.0.1
  ;[post_mappings]
  ;
  ; In this example, if the prefix option is set to "asterisk", then using the
@@ -67,10 +67,10 @@ index 7893caf..8a5fd9c 100644
 +;uploads = /var/spool/asterisk/uploads/
  ;
 diff --git a/configs/iax.conf.sample b/configs/iax.conf.sample
-index a3d0fea..de6e740 100644
+index ec7de83..5334bc7 100644
 --- a/configs/iax.conf.sample
 +++ b/configs/iax.conf.sample
-@@ -456,8 +456,8 @@ inkeys=freeworlddialup
+@@ -457,8 +457,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
@@ -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.2
+1.7.12.1
 
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 677f314..c635e07 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,12 +1,12 @@
-From 802da5c86e571b909bd198fc9460ac5230ef4191 Mon Sep 17 00:00:00 2001
+From 0b8fcac62244e1f42619cd4fe1dd30256bff9da8 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/14] Add LDAP schema that is compatible with Fedora
- Directory Server.
+Subject: [PATCH 6/9] Add LDAP schema that is compatible with Fedora Directory
+ Server.
 
 ---
- contrib/scripts/99asterisk.ldif |  489 +++++++++++++++++++++++++++++++++++++++
- 1 files changed, 489 insertions(+), 0 deletions(-)
+ contrib/scripts/99asterisk.ldif | 489 ++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 489 insertions(+)
  create mode 100644 contrib/scripts/99asterisk.ldif
 
 diff --git a/contrib/scripts/99asterisk.ldif b/contrib/scripts/99asterisk.ldif
@@ -505,5 +505,5 @@ index 0000000..f3bdf4e
 +      $ AstConfigVariableName $ AstConfigVariableValue $ AstConfigCommented )
 +  )
 -- 
-1.7.6.2
+1.7.12.1
 
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 2541ca3..5df8204 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,13 +1,12 @@
-From f1233019198363c12025f76b710995dfee0e2d38 Mon Sep 17 00:00:00 2001
+From ed8e38bff2e805b6bb6e905d5d7263ad40ce7de5 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/14] Don't load chan_mgcp and res_pktccops because
- res_pktccops floods 192.168.0.24 in the default
- config
+Subject: [PATCH 7/9] Don't load chan_mgcp and res_pktccops because
+ res_pktccops floods 192.168.0.24 in the default config
 
 ---
- configs/modules.conf.sample |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
+ configs/modules.conf.sample | 4 ++++
+ 1 file changed, 4 insertions(+)
 
 diff --git a/configs/modules.conf.sample b/configs/modules.conf.sample
 index 9a1c1c3..3dc2b74 100644
@@ -22,5 +21,5 @@ index 9a1c1c3..3dc2b74 100644
 +noload => chan_mgcp.so
 +noload => res_pktccops.so
 -- 
-1.7.6.2
+1.7.12.1
 
diff --git a/0012-Fix-two-problems-with-app_sms.patch b/0008-Fix-two-problems-with-app_sms.patch
similarity index 93%
rename from 0012-Fix-two-problems-with-app_sms.patch
rename to 0008-Fix-two-problems-with-app_sms.patch
index fb3a831..13335c3 100644
--- a/0012-Fix-two-problems-with-app_sms.patch
+++ b/0008-Fix-two-problems-with-app_sms.patch
@@ -1,7 +1,7 @@
-From 7cc61ee500084da60e0ca7aa4f968cdaeee2438b Mon Sep 17 00:00:00 2001
+From 27281c691ee1b1c632fcfd8c99f7b4a2d9fa8921 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] Fix two problems with app_sms.
+Subject: [PATCH 8/9] 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.
@@ -16,7 +16,7 @@ stop bit' message more gracefully in that case, and hang up the call.
  1 file changed, 9 insertions(+), 3 deletions(-)
 
 diff --git a/apps/app_sms.c b/apps/app_sms.c
-index 86ab0bc..0531111 100644
+index 08b90d1..b6c4ade 100644
 --- a/apps/app_sms.c
 +++ b/apps/app_sms.c
 @@ -216,6 +216,7 @@ static const unsigned short escapes[] = {
@@ -60,5 +60,5 @@ index 86ab0bc..0531111 100644
  	char *p;
  	AST_DECLARE_APP_ARGS(sms_args,
 -- 
-1.7.11.4
+1.7.12.1
 
diff --git a/0013-Remove-blank-lines-to-improve-compat-with-389-Direct.patch b/0009-Remove-blank-lines-to-improve-compat-with-389-Direct.patch
similarity index 96%
rename from 0013-Remove-blank-lines-to-improve-compat-with-389-Direct.patch
rename to 0009-Remove-blank-lines-to-improve-compat-with-389-Direct.patch
index 5b2af11..c53f0ff 100644
--- a/0013-Remove-blank-lines-to-improve-compat-with-389-Direct.patch
+++ b/0009-Remove-blank-lines-to-improve-compat-with-389-Direct.patch
@@ -1,12 +1,12 @@
-From 0ee8123802c0dbc4b0d4837d1941df9299abf1a5 Mon Sep 17 00:00:00 2001
+From a4d6710c7f4a36cc6d79c80d85f157e3d7c7c6a8 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/14] Remove blank lines to improve compat with 389
- Directory Server
+Subject: [PATCH 9/9] Remove blank lines to improve compat with 389 Directory
+ Server
 
 ---
- contrib/scripts/99asterisk.ldif |   52 ---------------------------------------
- 1 files changed, 0 insertions(+), 52 deletions(-)
+ contrib/scripts/99asterisk.ldif | 52 -----------------------------------------
+ 1 file changed, 52 deletions(-)
 
 diff --git a/contrib/scripts/99asterisk.ldif b/contrib/scripts/99asterisk.ldif
 index f3bdf4e..d5cd6a1 100644
@@ -428,5 +428,5 @@ index f3bdf4e..d5cd6a1 100644
    DESC 'Asterisk configuration Information'
    SUP top
 -- 
-1.7.6.2
+1.7.12.1
 
diff --git a/asterisk.spec b/asterisk.spec
index 83ef5a6..bf71946 100644
--- a/asterisk.spec
+++ b/asterisk.spec
@@ -17,7 +17,7 @@
 
 Summary: The Open Source PBX
 Name: asterisk
-Version: 1.8.16.0
+Version: 1.8.17.0
 Release: 1%{?_rc:.rc%{_rc}}%{?_beta:.beta%{_beta}}%{?dist}
 License: GPLv2
 Group: Applications/Internet
@@ -39,13 +39,8 @@ Patch4:  0004-Use-the-library-function-for-loading-command-history.patch
 Patch5:  0005-Fix-up-some-paths.patch
 Patch6:  0006-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch
 Patch7:  0007-Don-t-load-chan_mgcp-and-res_pktccops-because-res_pk.patch
-#Patch8:  0008-Make-sure-that-AST_ARGS-is-used-consistently-in-Fedo.patch
-#Patch9:  0009-Use-consistently-in-the-Fedora-init-script.patch
-#Patch10: 0010-Make-sure-that-the-Fedora-init-script-can-find-the-p.patch
-# Submitted upstream: https://issues.asterisk.org/jira/browse/ASTERISK-18331 (now merged)
-#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
+Patch8:  0008-Fix-two-problems-with-app_sms.patch
+Patch9:  0009-Remove-blank-lines-to-improve-compat-with-389-Direct.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
@@ -470,12 +465,8 @@ local filesystem.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-#patch8 -p1
-#patch9 -p1
-#patch10 -p1
-#patch11 -p1
-%patch12 -p1
-%patch13 -p1
+%patch8 -p1
+%patch9 -p1
 
 cp %{S:3} menuselect.makedeps
 cp %{S:4} menuselect.makeopts
@@ -1274,6 +1265,40 @@ fi
 %{_libdir}/asterisk/modules/app_voicemail_plain.so
 
 %changelog
+* Tue Oct  9 2012 Jeffrey Ollie <jeff at ocjtech.us> - 1.8.17.0-1
+- The Asterisk Development Team has announced the release of Asterisk 1.8.17.0.
+- This release is available for immediate download at
+- http://downloads.asterisk.org/pub/telephony/asterisk
+-
+- The release of Asterisk 1.8.17.0 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 channel reference leak in ChanSpy.
+-   (Closes issue ASTERISK-19461. Reported by Irontec)
+-
+- * --- dsp.c: Fix multiple issues when no-interdigit delay is present,
+-       and fast DTMF 50ms/50ms
+-   (Closes issue ASTERISK-19610. Reported by Jean-Philippe Lord)
+-
+- * --- Fix bug where final queue member would not be removed from
+-       memory.
+-   (Closes issue ASTERISK-19793. Reported by Marcus Haas)
+-
+- * --- Fix memory leak when CEL is successfully written to PostgreSQL
+-       database
+-   (Closes issue ASTERISK-19991. Reported by Etienne Lessard)
+-
+- * --- Fix DUNDi message routing bug when neighboring peer is
+-       unreachable
+-   (Closes issue ASTERISK-19309. Reported by Peter Racz)
+-
+- For a full list of changes in this release, please see the ChangeLog:
+-
+- http://downloads.asterisk.org/pub/telephony/asterisk/ChangeLog-1.8.17.0
+
 * Wed Sep 26 2012 Jeffrey Ollie <jeff at ocjtech.us> - 1.8.16.0-1
 - The Asterisk Development Team has announced the release of Asterisk 1.8.16.0.
 - This release is available for immediate download at
diff --git a/sources b/sources
index adb4a6d..5e7dfda 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-9cd61037890c7ff9b7043eae145dbadb  asterisk-1.8.16.0.tar.gz
-567c1d900d4299221dcd614d96997a8c  asterisk-1.8.16.0.tar.gz.asc
+1ecf119fa0cc851eff2c7d39f1dc42c4  asterisk-1.8.17.0.tar.gz
+193e5c6fadd14fa7b1b4d1d94856a8a6  asterisk-1.8.17.0.tar.gz.asc


More information about the scm-commits mailing list