[asterisk/f16] Add patch
Jeffrey C. Ollie
jcollie at fedoraproject.org
Tue Sep 20 16:09:09 UTC 2011
commit 468f0b0680ae7fef957c733c87dea8e87cd7fa2a
Author: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Tue Sep 20 11:08:52 2011 -0500
Add patch
...it-scripts-for-better-Fedora-compatibilty.patch | 2 +-
...les.conf-so-that-different-voicemail-modu.patch | 2 +-
...king-building-against-an-external-libedit.patch | 2 +-
...rary-function-for-loading-command-history.patch | 2 +-
0005-Fix-up-some-paths.patch | 2 +-
...hema-that-is-compatible-with-Fedora-Direc.patch | 2 +-
...chan_mgcp-and-res_pktccops-because-res_pk.patch | 2 +-
...hat-AST_ARGS-is-used-consistently-in-Fedo.patch | 2 +-
...se-consistently-in-the-Fedora-init-script.patch | 2 +-
...hat-the-Fedora-init-script-can-find-the-p.patch | 2 +-
...the-inotify-code-to-handle-call-files-bei.patch | 2 +-
0012-Fix-two-problems-with-app_sms.patch | 2 +-
...k-lines-to-improve-compat-with-389-Direct.patch | 432 ++++++++++++++++++++
asterisk.spec | 4 +-
14 files changed, 447 insertions(+), 13 deletions(-)
---
diff --git a/0001-Modify-init-scripts-for-better-Fedora-compatibilty.patch b/0001-Modify-init-scripts-for-better-Fedora-compatibilty.patch
index 1d8f321..8a836e2 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 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/12] Modify init scripts for better Fedora compatibilty.
+Subject: [PATCH 01/13] Modify init scripts for better Fedora compatibilty.
---
contrib/init.d/rc.redhat.asterisk | 70 ++++++++++++++++++++-----------------
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 2b3ee2e..84e285d 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 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/12] Modify modules.conf so that different voicemail
+Subject: [PATCH 02/13] Modify modules.conf so that different voicemail
modules don't load at the same time.
---
diff --git a/0003-Allow-linking-building-against-an-external-libedit.patch b/0003-Allow-linking-building-against-an-external-libedit.patch
index 9674b4f..cb1b38a 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: "Jeffrey C. Ollie" <jeff at ocjtech.us>
Date: Fri, 5 Mar 2010 14:10:52 -0600
-Subject: [PATCH 03/12] Allow linking/building against an external libedit.
+Subject: [PATCH 03/13] 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
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 69268c7..c09734f 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 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/12] Use the library function for loading command history
+Subject: [PATCH 04/13] Use the library function for loading command history
rather than implementing our own.
---
diff --git a/0005-Fix-up-some-paths.patch b/0005-Fix-up-some-paths.patch
index 254427c..46fbfa8 100644
--- a/0005-Fix-up-some-paths.patch
+++ b/0005-Fix-up-some-paths.patch
@@ -1,7 +1,7 @@
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/12] Fix up some paths
+Subject: [PATCH 05/13] Fix up some paths
---
UPGRADE-1.4.txt | 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 525b414..09d7abc 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 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/12] Add LDAP schema that is compatible with Fedora
+Subject: [PATCH 06/13] Add LDAP schema that is compatible with Fedora
Directory Server.
---
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 ecb43dc..90406c5 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 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/12] Don't load chan_mgcp and res_pktccops because
+Subject: [PATCH 07/13] Don't load chan_mgcp and res_pktccops because
res_pktccops floods 192.168.0.24 in the default
config
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 4197082..9403b6d 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 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/12] Make sure that AST_ARGS is used consistently in Fedora
+Subject: [PATCH 08/13] Make sure that AST_ARGS is used consistently in Fedora
init script
---
diff --git a/0009-Use-consistently-in-the-Fedora-init-script.patch b/0009-Use-consistently-in-the-Fedora-init-script.patch
index 38425d8..56659ef 100644
--- a/0009-Use-consistently-in-the-Fedora-init-script.patch
+++ b/0009-Use-consistently-in-the-Fedora-init-script.patch
@@ -1,7 +1,7 @@
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/12] Use consistently in the Fedora init script
+Subject: [PATCH 09/13] Use consistently in the Fedora init script
---
contrib/init.d/rc.redhat.asterisk | 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 8517594..32dc2dc 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 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/12] Make sure that the Fedora init script can find the pid
+Subject: [PATCH 10/13] Make sure that the Fedora init script can find the pid
file.
---
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 07d5d36..c79c234 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 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/12] This fixes the inotify code to handle call files being
+Subject: [PATCH 11/13] 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
diff --git a/0012-Fix-two-problems-with-app_sms.patch b/0012-Fix-two-problems-with-app_sms.patch
index ac84b44..bae257d 100644
--- a/0012-Fix-two-problems-with-app_sms.patch
+++ b/0012-Fix-two-problems-with-app_sms.patch
@@ -1,7 +1,7 @@
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/12] Fix two problems with app_sms.
+Subject: [PATCH 12/13] 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.
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
new file mode 100644
index 0000000..3dafa11
--- /dev/null
+++ b/0013-Remove-blank-lines-to-improve-compat-with-389-Direct.patch
@@ -0,0 +1,432 @@
+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
+ 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 2563d0b..b807b92 100644
--- a/asterisk.spec
+++ b/asterisk.spec
@@ -18,7 +18,7 @@
Summary: The Open Source PBX
Name: asterisk
Version: 1.8.6.0
-Release: 2%{?_rc:.rc%{_rc}}%{?_beta:.beta%{_beta}}%{?dist}
+Release: 3%{?_rc:.rc%{_rc}}%{?_beta:.beta%{_beta}}%{?dist}
License: GPLv2
Group: Applications/Internet
URL: http://www.asterisk.org/
@@ -45,6 +45,7 @@ Patch10: 0010-Make-sure-that-the-Fedora-init-script-can-find-the-p.patch
# Submitted upstream: https://issues.asterisk.org/jira/browse/ASTERISK-18331
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
BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
@@ -479,6 +480,7 @@ local filesystem.
%patch10 -p1
%patch11 -p1
%patch12 -p1
+%patch13 -p1
cp %{S:3} menuselect.makedeps
cp %{S:4} menuselect.makeopts
More information about the scm-commits
mailing list