[asterisk/f14] 1.6.2.20
Jeffrey C. Ollie
jcollie at fedoraproject.org
Tue Sep 20 20:23:13 UTC 2011
commit d77e83d3c1c50d06ca4ffeab18d23d78d62de0c4
Author: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Tue Sep 20 15:22:31 2011 -0500
1.6.2.20
.gitignore | 2 +
...it-scripts-for-better-Fedora-compatibilty.patch | 8 +-
...les.conf-so-that-different-voicemail-modu.patch | 10 +-
...king-building-against-an-external-libedit.patch | 8 +-
...rary-function-for-loading-command-history.patch | 8 +-
0005-Fix-up-some-paths.patch | 8 +-
...hema-that-is-compatible-with-Fedora-Direc.patch | 10 +-
...2html-to-copy-icons-when-building-documen.patch | 8 +-
...hat-AST_ARGS-is-used-consistently-in-Fedo.patch | 56 +++
...se-consistently-in-the-Fedora-init-script.patch | 25 ++
...hat-the-Fedora-init-script-can-find-the-p.patch | 27 ++
...k-lines-to-improve-compat-with-389-Direct.patch | 432 ++++++++++++++++++++
asterisk.spec | 25 ++-
sources | 4 +-
14 files changed, 598 insertions(+), 33 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9891438..49dc672 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,5 @@ asterisk-1.6.2.11.tar.gz.asc
/asterisk-1.6.2.19-rc1.tar.gz.asc
/asterisk-1.6.2.19.tar.gz
/asterisk-1.6.2.19.tar.gz.asc
+/asterisk-1.6.2.20.tar.gz
+/asterisk-1.6.2.20.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 a0b1cee..56b5db6 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 d592be20a6e7142140dd8916daac8d73cca25cd0 Mon Sep 17 00:00:00 2001
-From: Jeffrey C. Ollie <jeff at ocjtech.us>
+From f841a588117ad72e821a4194a6e97cfed40a42cd 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/7] Modify init scripts for better Fedora compatibilty.
+Subject: [PATCH 01/12] 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.4.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 dd118f1..6a2c0a3 100644
--- a/0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
+++ b/0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
@@ -1,8 +1,8 @@
-From 7c1c9c2deb5e0378dd7fb2196965d2a9def0b96d Mon Sep 17 00:00:00 2001
-From: Jeffrey C. Ollie <jeff at ocjtech.us>
+From 693361fd7d6258db884fa757def62387e9af6b2b 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/7] Modify modules.conf so that different voicemail modules
- don't load at the same time.
+Subject: [PATCH 02/12] Modify modules.conf so that different voicemail
+ modules don't load at the same time.
---
configs/modules.conf.sample | 26 ++++++++++++++++++++++++++
@@ -43,5 +43,5 @@ index 5b553a4..39645c3 100644
+;noload => app_directory_plain.so
+;noload => app_voicemail_plain.so
--
-1.7.4.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 9fbbf41..30b7fc2 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 b7448140ce8a86ec812e28b99d62ba59371d8c5c Mon Sep 17 00:00:00 2001
-From: Jeffrey C. Ollie <jeff at ocjtech.us>
+From a83890f6f08be6405e94982c6856b0f423d12cc9 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/7] Allow linking/building against an external libedit.
+Subject: [PATCH 03/12] 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
@@ -134,5 +134,5 @@ index 83ae26b..143a12e 100644
+LIBEDIT_LIB=@LIBEDIT_LIB@
+LIBEDIT_OBJ=@LIBEDIT_OBJ@
--
-1.7.4.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 14ca877..db72f84 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 c9f2e1e0d29076980cbf5750718b05c480bcfe3f Mon Sep 17 00:00:00 2001
-From: Jeffrey C. Ollie <jeff at ocjtech.us>
+From 55aa7fa87fb53be641f4f436c3e9ea4f0959ed54 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/7] Use the library function for loading command history
+Subject: [PATCH 04/12] Use the library function for loading command history
rather than implementing our own.
---
@@ -45,5 +45,5 @@ index 431a9ea..ce356c3 100644
static void ast_remotecontrol(char *data)
--
-1.7.4.4
+1.7.6.2
diff --git a/0005-Fix-up-some-paths.patch b/0005-Fix-up-some-paths.patch
index 8181c84..c861819 100644
--- a/0005-Fix-up-some-paths.patch
+++ b/0005-Fix-up-some-paths.patch
@@ -1,7 +1,7 @@
-From 2a65d7a5c9bcad7d2bfed34220cad5288fac51b1 Mon Sep 17 00:00:00 2001
-From: Jeffrey C. Ollie <jeff at ocjtech.us>
+From dea8b4e977998aac18ae2e08f491165d5f5f0d47 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 5/7] Fix up some paths
+Subject: [PATCH 05/12] Fix up some paths
---
UPGRADE-1.4.txt | 2 +-
@@ -612,5 +612,5 @@ index 3c66be2..bedb8d8 100644
exten => 762,1,agi(tts-riddle.agi)
exten => 762,2,Background(gsm/what-time-it-is2)
--
-1.7.4.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 24662a3..6eb4cf4 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,8 +1,8 @@
-From cfdb10c9d777c3f52f2eea79ebfe43559019dd0b Mon Sep 17 00:00:00 2001
-From: Jeffrey C. Ollie <jeff at ocjtech.us>
+From afdb6b0d91bd8853c4999f9fec64a38a899c4296 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 6/7] Add LDAP schema that is compatible with Fedora Directory
- Server.
+Subject: [PATCH 06/12] Add LDAP schema that is compatible with Fedora
+ Directory Server.
---
contrib/scripts/99asterisk.ldif | 489 +++++++++++++++++++++++++++++++++++++++
@@ -505,5 +505,5 @@ index 0000000..f3bdf4e
+ $ AstConfigVariableName $ AstConfigVariableValue $ AstConfigCommented )
+ )
--
-1.7.4.4
+1.7.6.2
diff --git a/0007-Tell-laxtex2html-to-copy-icons-when-building-documen.patch b/0007-Tell-laxtex2html-to-copy-icons-when-building-documen.patch
index 459fb12..7a36a97 100644
--- a/0007-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 6431e84e83fdf9e0e60570c36aa1129c62b15fb0 Mon Sep 17 00:00:00 2001
-From: Jeffrey C. Ollie <jeff at ocjtech.us>
+From 9cf889ce1074871c9d26127b3655db11d3bf755d 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 7/7] Tell laxtex2html to copy icons when building
+Subject: [PATCH 07/12] Tell laxtex2html to copy icons when building
documentation so that we don't have run-time
dependencies on latex2html.
@@ -23,5 +23,5 @@ index 4add45a..e448c95 100644
txt: asterisk.txt
--
-1.7.4.4
+1.7.6.2
diff --git a/0009-Make-sure-that-AST_ARGS-is-used-consistently-in-Fedo.patch b/0009-Make-sure-that-AST_ARGS-is-used-consistently-in-Fedo.patch
new file mode 100644
index 0000000..e4abda6
--- /dev/null
+++ b/0009-Make-sure-that-AST_ARGS-is-used-consistently-in-Fedo.patch
@@ -0,0 +1,56 @@
+From dd62d45987cf5d5beb879cb8b4f7fc5bd51aa4da 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 09/12] Make sure that AST_ARGS is used consistently in Fedora
+ init script
+
+---
+ contrib/init.d/rc.redhat.asterisk | 29 ++++++++++++++++++++++++++++-
+ 1 files changed, 28 insertions(+), 1 deletions(-)
+
+diff --git a/contrib/init.d/rc.redhat.asterisk b/contrib/init.d/rc.redhat.asterisk
+index a72ea2a..b0ec0de 100755
+--- a/contrib/init.d/rc.redhat.asterisk
++++ b/contrib/init.d/rc.redhat.asterisk
+@@ -86,10 +86,37 @@ start() {
+ fi
+ if [ $AST_CONFIG ]; then
+ AST_ARGS="$AST_ARGS -C $AST_CONFIG"
++ elif [ $ALTCONF ]; then
++ AST_ARGS="$AST_ARGS -C $ALTCONF"
++ fi
++ if [ "x$COREDUMP" = "xyes" ]; then
++ AST_ARGS="$AST_ARGS -g"
++ fi
++ if [ "0$MAXLOAD" -gt "0" ]; then
++ AST_ARGS="$AST_ARGS -L $MAXLOAD"
++ fi
++ if [ "0$MAXCALLS" -gt "0" ]; then
++ AST_ARGS="$AST_ARGS -M $MAXCALLS"
++ fi
++ if [ "0$VERBOSITY" -gt "0" ]; then
++ for i in `seq 1 $VERBOSITY`; do
++ AST_ARGS="$AST_ARGS -v"
++ done
++ fi
++ if [ "x$INTERNALTIMING" = "xyes" ]; then
++ AST_ARGS="$AST_ARGS -I"
++ fi
++ if [ "x$TEMPRECORDINGLOCATION" = "xyes" -o "x$TMPRECORDINGLOCATION" = "xyes" ]; then
++ AST_ARGS="$AST_ARGS -t"
+ fi
+ export HOME=~asterisk
+ cd $HOME
+- daemon $DAEMON $AST_ARGS $AST_EXTRA_ARGS
++ if [ "x$COLOR" = "xyes" ]; then
++ export TERM=linux
++ daemon sh -c "$DAEMON $AST_ARGS $AST_EXTRA_ARGS -c" >/dev/null </dev/null 2>&1 &
++ else
++ daemon $DAEMON $AST_ARGS $AST_EXTRA_ARGS
++ fi
+ RETVAL=$?
+ [ $RETVAL -eq 0 ] && touch /var/lock/subsys/asterisk
+ echo
+--
+1.7.6.2
+
diff --git a/0010-Use-consistently-in-the-Fedora-init-script.patch b/0010-Use-consistently-in-the-Fedora-init-script.patch
new file mode 100644
index 0000000..24a150b
--- /dev/null
+++ b/0010-Use-consistently-in-the-Fedora-init-script.patch
@@ -0,0 +1,25 @@
+From 360be0b9dbf95dc54960a3879265c7ffec4a5af3 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 10/12] 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 b0ec0de..4425175 100755
+--- a/contrib/init.d/rc.redhat.asterisk
++++ b/contrib/init.d/rc.redhat.asterisk
+@@ -70,7 +70,7 @@ RETVAL=0
+ start() {
+ # Check if Asterisk is already running. If it is, then bug out, because
+ # starting safe_asterisk when Asterisk is running is very bad.
+- VERSION=`${AST_SBIN}/asterisk -rx 'core show version'`
++ VERSION=`$DAEMON -rx 'core show version'`
+ if [ "`echo $VERSION | cut -c 1-8`" = "Asterisk" ]; then
+ echo "Asterisk is already running."
+ exit 1
+--
+1.7.6.2
+
diff --git a/0011-Make-sure-that-the-Fedora-init-script-can-find-the-p.patch b/0011-Make-sure-that-the-Fedora-init-script-can-find-the-p.patch
new file mode 100644
index 0000000..8269c87
--- /dev/null
+++ b/0011-Make-sure-that-the-Fedora-init-script-can-find-the-p.patch
@@ -0,0 +1,27 @@
+From 553cd8397ba0c55cb08c8c8f2ec7455271f9b40a 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 11/12] Make sure that the Fedora init script can find the pid
+ file.
+
+---
+ contrib/init.d/rc.redhat.asterisk | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/contrib/init.d/rc.redhat.asterisk b/contrib/init.d/rc.redhat.asterisk
+index 4425175..4f35791 100755
+--- a/contrib/init.d/rc.redhat.asterisk
++++ b/contrib/init.d/rc.redhat.asterisk
+@@ -126,7 +126,8 @@ start() {
+ stop() {
+ # Stop daemon.
+ echo -n $"Stopping asterisk: "
+- killproc `basename $DAEMON`
++ piddir=`awk '$1 == "astrundir" { print $3 }' $AST_CONFIG`
++ killproc -p $piddir/asterisk.pid `basename $DAEMON`
+ RETVAL=$?
+ [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/asterisk
+ echo
+--
+1.7.6.2
+
diff --git a/0012-Remove-blank-lines-to-improve-compat-with-389-Direct.patch b/0012-Remove-blank-lines-to-improve-compat-with-389-Direct.patch
new file mode 100644
index 0000000..589c173
--- /dev/null
+++ b/0012-Remove-blank-lines-to-improve-compat-with-389-Direct.patch
@@ -0,0 +1,432 @@
+From 5f7e49922f4953c4b6fa13f41e5e37ac314a1313 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 12/12] Remove blank lines to improve compat with 389
+ Directory Server
+
+---
+ contrib/scripts/99asterisk.ldif | 52 ---------------------------------------
+ 1 files changed, 0 insertions(+), 52 deletions(-)
+
+diff --git a/contrib/scripts/99asterisk.ldif b/contrib/scripts/99asterisk.ldif
+index f3bdf4e..d5cd6a1 100644
+--- a/contrib/scripts/99asterisk.ldif
++++ b/contrib/scripts/99asterisk.ldif
+@@ -1,7 +1,6 @@
+ dn: cn=schema
+ #
+ attributeTypes: (
+-
+ NAME 'AstContext'
+ DESC 'Asterisk Context'
+ EQUALITY caseIgnoreMatch
+@@ -10,7 +9,6 @@ attributeTypes: (
+ )
+ #
+ attributeTypes: (
+-
+ NAME 'AstExtension'
+ DESC 'Asterisk Extension'
+ EQUALITY caseIgnoreMatch
+@@ -19,7 +17,6 @@ attributeTypes: (
+ )
+ #
+ attributeTypes: (
+-
+ NAME 'AstPriority'
+ DESC 'Asterisk Priority'
+ EQUALITY caseIgnoreMatch
+@@ -28,7 +25,6 @@ attributeTypes: (
+ )
+ #
+ attributeTypes: (
+-
+ NAME 'AstApplication'
+ DESC 'Asterisk Application'
+ EQUALITY caseIgnoreMatch
+@@ -37,7 +33,6 @@ attributeTypes: (
+ )
+ #
+ attributeTypes: (
+-
+ NAME 'AstApplicationData'
+ DESC 'Asterisk Application Data'
+ EQUALITY caseIgnoreMatch
+@@ -46,7 +41,6 @@ attributeTypes: (
+ )
+ #
+ attributeTypes: (
+-
+ NAME 'AstAccountAMAFlags'
+ DESC 'Asterisk Account AMA Flags'
+ EQUALITY caseIgnoreMatch
+@@ -55,7 +49,6 @@ attributeTypes: (
+ )
+ #
+ attributeTypes: (
+-
+ NAME 'AstAccountCallerID'
+ DESC 'Asterisk Account CallerID'
+ EQUALITY caseIgnoreMatch
+@@ -64,7 +57,6 @@ attributeTypes: (
+ )
+ #
+ attributeTypes: (
+-
+ NAME 'AstAccountContext'
+ DESC 'Asterisk Account Context'
+ EQUALITY caseIgnoreMatch
+@@ -73,7 +65,6 @@ attributeTypes: (
+ )
+ #
+ attributeTypes: (
+-
+ NAME 'AstAccountMailbox'
+ DESC 'Asterisk Account Mailbox'
+ EQUALITY caseIgnoreMatch
+@@ -82,7 +73,6 @@ attributeTypes: (
+ )
+ #
+ attributeTypes: (
+-
+ NAME 'AstMD5secret'
+ DESC 'Asterisk Account MD5 Secret'
+ EQUALITY caseIgnoreMatch
+@@ -91,7 +81,6 @@ attributeTypes: (
+ )
+ #
+ attributeTypes: (
+-
+ NAME 'AstAccountDeny'
+ DESC 'Asterisk Account Deny'
+ EQUALITY caseIgnoreMatch
+@@ -100,7 +89,6 @@ attributeTypes: (
+ )
+ #
+ attributeTypes: (
+-
+ NAME 'AstAccountPermit'
+ DESC 'Asterisk Account Permit'
+ EQUALITY caseIgnoreMatch
+@@ -109,7 +97,6 @@ attributeTypes: (
+ )
+ #
+ attributeTypes: (
+-
+ NAME 'AstAccountQualify'
+ DESC 'Asterisk Account Qualify'
+ EQUALITY caseIgnoreMatch
+@@ -118,7 +105,6 @@ attributeTypes: (
+ )
+ #
+ attributeTypes: (
+-
+ NAME 'AstAccountType'
+ DESC 'Asterisk Account Type'
+ EQUALITY caseIgnoreMatch
+@@ -127,7 +113,6 @@ attributeTypes: (
+ )
+ #
+ attributeTypes: (
+-
+ NAME 'AstAccountDisallowedCodec'
+ DESC 'Asterisk Account Disallowed Codec'
+ EQUALITY caseIgnoreMatch
+@@ -136,7 +121,6 @@ attributeTypes: (
+ )
+ #
+ attributeTypes: (
+-
+ NAME 'AstAccountExpirationTimestamp'
+ DESC 'Asterisk Account Allowed Codec'
+ EQUALITY caseIgnoreMatch
+@@ -145,7 +129,6 @@ attributeTypes: (
+ )
+ #
+ attributeTypes: (
+-
+ NAME 'AstAccountRegistrationContext'
+ DESC 'Asterisk Account AMA Flags'
+ EQUALITY caseIgnoreMatch
+@@ -154,7 +137,6 @@ attributeTypes: (
+ )
+ #
+ attributeTypes: (
+-
+ NAME 'AstAccountRegistrationExten'
+ DESC 'Asterisk Account AMA Flags'
+ EQUALITY caseIgnoreMatch
+@@ -163,7 +145,6 @@ attributeTypes: (
+ )
+ #
+ attributeTypes: (
+-
+ NAME 'AstAccountNoTransfer'
+ DESC 'Asterisk Account AMA Flags'
+ EQUALITY caseIgnoreMatch
+@@ -172,7 +153,6 @@ attributeTypes: (
+ )
+ #
+ attributeTypes: (
+-
+ NAME 'AstAccountCallGroup'
+ DESC 'Asterisk Account Call Group'
+ EQUALITY caseIgnoreMatch
+@@ -181,7 +161,6 @@ attributeTypes: (
+ )
+ #
+ attributeTypes: (
+-
+ NAME 'AstAccountCanReinvite'
+ DESC 'Asterisk Account Can Reinvite'
+ EQUALITY caseIgnoreMatch
+@@ -190,7 +169,6 @@ attributeTypes: (
+ )
+ #
+ attributeTypes: (
+-
+ NAME 'AstAccountDTMFMode'
+ DESC 'Asterisk Account DTMF Flags'
+ EQUALITY caseIgnoreMatch
+@@ -199,14 +177,12 @@ attributeTypes: (
+ )
+ #
+ attributeTypes: (
+-
+ NAME 'AstAccountFromUser'
+ DESC 'Asterisk Account From User'
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+ )
+ #
+ attributeTypes: (
+-
+ NAME 'AstAccountFromDomain'
+ DESC 'Asterisk Account From Domain'
+ EQUALITY caseIgnoreMatch
+@@ -215,7 +191,6 @@ attributeTypes: (
+ )
+ #
+ attributeTypes: (
+-
+ NAME 'AstAccountFullContact'
+ DESC 'Asterisk Account Full Contact'
+ EQUALITY caseIgnoreMatch
+@@ -224,7 +199,6 @@ attributeTypes: (
+ )
+ #
+ attributeTypes: (
+-
+ NAME 'AstAccountHost'
+ DESC 'Asterisk Account Host'
+ EQUALITY caseIgnoreMatch
+@@ -233,7 +207,6 @@ attributeTypes: (
+ )
+ #
+ attributeTypes: (
+-
+ NAME 'AstAccountInsecure'
+ DESC 'Asterisk Account Insecure'
+ EQUALITY caseIgnoreMatch
+@@ -242,7 +215,6 @@ attributeTypes: (
+ )
+ #
+ attributeTypes: (
+-
+ NAME 'AstAccountNAT'
+ DESC 'Asterisk Account NAT'
+ EQUALITY caseIgnoreMatch
+@@ -251,7 +223,6 @@ attributeTypes: (
+ )
+ #
+ attributeTypes: (
+-
+ NAME 'AstAccountPickupGroup'
+ DESC 'Asterisk Account PickupGroup'
+ EQUALITY caseIgnoreMatch
+@@ -260,7 +231,6 @@ attributeTypes: (
+ )
+ #
+ attributeTypes: (
+-
+ NAME 'AstAccountPort'
+ DESC 'Asterisk Account Port'
+ EQUALITY caseIgnoreMatch
+@@ -269,7 +239,6 @@ attributeTypes: (
+ )
+ #
+ attributeTypes: (
+-
+ NAME 'AstAccountRestrictCID'
+ DESC 'Asterisk Restrict CallerID'
+ EQUALITY caseIgnoreMatch
+@@ -278,7 +247,6 @@ attributeTypes: (
+ )
+ #
+ attributeTypes: (
+-
+ NAME 'AstAccountRTPTimeout'
+ DESC 'Asterisk RTP Timeout'
+ EQUALITY caseIgnoreMatch
+@@ -287,7 +255,6 @@ attributeTypes: (
+ )
+ #
+ attributeTypes: (
+-
+ NAME 'AstAccountRTPHoldTimeout'
+ DESC 'Asterisk RTP Hold Timeout'
+ EQUALITY caseIgnoreMatch
+@@ -296,7 +263,6 @@ attributeTypes: (
+ )
+ #
+ attributeTypes: (
+-
+ NAME 'AstAccountRealmedPassword'
+ DESC 'Asterisk RTP Hold Timeout'
+ EQUALITY caseIgnoreMatch
+@@ -305,7 +271,6 @@ attributeTypes: (
+ )
+ #
+ attributeTypes: (
+-
+ NAME 'AstAccountAllowedCodec'
+ DESC 'Asterisk Account Allowed Codec'
+ EQUALITY caseIgnoreMatch
+@@ -314,7 +279,6 @@ attributeTypes: (
+ )
+ #
+ attributeTypes: (
+-
+ NAME 'AstAccountMusicOnHold'
+ DESC 'Asterisk Account Allowed Codec'
+ EQUALITY caseIgnoreMatch
+@@ -323,7 +287,6 @@ attributeTypes: (
+ )
+ #
+ attributeTypes: (
+-
+ NAME 'AstAccountCanCallForward'
+ DESC 'Asterisk Can CAll Forward'
+ EQUALITY caseIgnoreMatch
+@@ -332,7 +295,6 @@ attributeTypes: (
+ )
+ #
+ attributeTypes: (
+-
+ NAME 'AstAccountSecret'
+ DESC 'Asterisk Can CAll Forward'
+ EQUALITY caseIgnoreMatch
+@@ -341,7 +303,6 @@ attributeTypes: (
+ )
+ #
+ attributeTypes: (
+-
+ NAME 'AstAccountName'
+ DESC 'Asterisk Account Username'
+ EQUALITY caseIgnoreMatch
+@@ -350,7 +311,6 @@ attributeTypes: (
+ )
+ #
+ attributeTypes: (
+-
+ NAME 'AstConfigFilename'
+ DESC 'Asterisk LDAP Configuration Filename'
+ EQUALITY caseIgnoreMatch
+@@ -359,7 +319,6 @@ attributeTypes: (
+ )
+ #
+ attributeTypes: (
+-
+ NAME 'AstConfigCategory'
+ DESC 'Asterisk LDAP Configuration Category'
+ EQUALITY caseIgnoreMatch
+@@ -368,7 +327,6 @@ attributeTypes: (
+ )
+ #
+ attributeTypes: (
+-
+ NAME 'AstConfigCategoryMetric'
+ DESC 'Asterisk LDAP Configuration Category Metric'
+ EQUALITY caseIgnoreMatch
+@@ -377,7 +335,6 @@ attributeTypes: (
+ )
+ #
+ attributeTypes: (
+-
+ NAME 'AstConfigVariableName'
+ DESC 'Asterisk LDAP Configuration Variable Name'
+ EQUALITY caseIgnoreMatch
+@@ -386,7 +343,6 @@ attributeTypes: (
+ )
+ #
+ attributeTypes: (
+-
+ NAME 'AstConfigVariableValue'
+ DESC 'Asterisk LDAP Configuration Variable Value'
+ EQUALITY caseIgnoreMatch
+@@ -395,7 +351,6 @@ attributeTypes: (
+ )
+ #
+ attributeTypes: (
+-
+ NAME 'AstConfigCommented'
+ DESC 'Asterisk LDAP Configuration Commented'
+ EQUALITY caseIgnoreMatch
+@@ -404,7 +359,6 @@ attributeTypes: (
+ )
+ #
+ attributeTypes: (
+-
+ NAME 'AstAccountIPAddress'
+ DESC 'Asterisk Account IP Address'
+ EQUALITY caseIgnoreMatch
+@@ -413,7 +367,6 @@ attributeTypes: (
+ )
+ #
+ attributeTypes: (
+-
+ NAME 'AstAccountDefaultUser'
+ DESC 'Asterisk Account Default User'
+ EQUALITY caseIgnoreMatch
+@@ -422,7 +375,6 @@ attributeTypes: (
+ )
+ #
+ attributeTypes: (
+-
+ NAME 'AstAccountRegistrationServer'
+ DESC 'Asterisk Account Registration Server'
+ EQUALITY caseIgnoreMatch
+@@ -431,7 +383,6 @@ attributeTypes: (
+ )
+ #
+ objectClasses: (
+-
+ NAME 'AsteriskExtension'
+ DESC 'PBX Extension Information for Asterisk'
+ SUP top
+@@ -442,7 +393,6 @@ objectClasses: (
+ )
+ #
+ objectClasses: (
+-
+ NAME 'AsteriskIAXUser'
+ DESC 'IAX2 User information for Asterisk'
+ SUP AsteriskExtension
+@@ -457,7 +407,6 @@ objectClasses: (
+ )
+ #
+ objectClasses: (
+-
+ NAME 'AsteriskSIPUser'
+ DESC 'SIP User information for Asterisk'
+ SUP AsteriskExtension
+@@ -478,7 +427,6 @@ objectClasses: (
+ )
+ #
+ objectClasses: (
+-
+ NAME 'AsteriskConfig'
+ DESC 'Asterisk configuration Information'
+ SUP top
+--
+1.7.6.2
+
diff --git a/asterisk.spec b/asterisk.spec
index 7c1acd3..d019448 100644
--- a/asterisk.spec
+++ b/asterisk.spec
@@ -1,7 +1,7 @@
#global _rc 1
Summary: The Open Source PBX
Name: asterisk
-Version: 1.6.2.19
+Version: 1.6.2.20
Release: 1%{?_rc:.rc%{_rc}}%{?dist}
License: GPLv2
Group: Applications/Internet
@@ -21,6 +21,10 @@ 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-Tell-laxtex2html-to-copy-icons-when-building-documen.patch
+Patch9: 0009-Make-sure-that-AST_ARGS-is-used-consistently-in-Fedo.patch
+Patch10: 0010-Use-consistently-in-the-Fedora-init-script.patch
+Patch11: 0011-Make-sure-that-the-Fedora-init-script-can-find-the-p.patch
+Patch12: 0012-Remove-blank-lines-to-improve-compat-with-389-Direct.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
@@ -393,6 +397,10 @@ local filesystem.
%patch5 -p1
%patch6 -p1
%patch7 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
cp %{SOURCE2} menuselect.makedeps
cp %{SOURCE3} menuselect.makeopts
@@ -1032,6 +1040,21 @@ fi
%{_libdir}/asterisk/modules/app_voicemail_plain.so
%changelog
+* Mon Sep 20 2011 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2.20-1:
+- The Asterisk Development Team announces the release of Asterisk 1.6.2.20. This
+- release is available for immediate download at
+- http://downloads.asterisk.org/pub/telephony/asterisk/
+-
+- The release of Asterisk 1.6.2.20 resolves a regression that was introduced just
+- prior to the release of Asterisk 1.6.2.19.
+-
+- * Fix reload crash caused by destroying default parking lot.
+- (Closes issue ASTERISK-18103. Reported by 808blogger. Patched by jrose.
+-
+- For a full list of changes in this release, please see the ChangeLog:
+-
+- http://downloads.asterisk.org/pub/telephony/asterisk/releases/ChangeLog-1.6.2.20
+
* Wed Jun 29 2011 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.2.19-1:
- The Asterisk Development Team has announced the final maintenance release of
- Asterisk, version 1.6.2.19. This release is available for immediate download at
diff --git a/sources b/sources
index 750f4a5..18d8631 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-5dfb9352bacfa7f4dc2ef72cb83715c2 asterisk-1.6.2.19.tar.gz
-29dc73b21003b0923fd84a263f910a9d asterisk-1.6.2.19.tar.gz.asc
+70d14a8748cffe0c28125328d88f8374 asterisk-1.6.2.20.tar.gz
+2d4ac465fb502131032fbbb770002b2c asterisk-1.6.2.20.tar.gz.asc
More information about the scm-commits
mailing list