rpms/asterisk/F-10 0015-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch, NONE, 1.1 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch, 1.7, 1.8 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch, 1.7, 1.8 0003-Allow-alternate-extensions-to-be-specified-in-users.patch, 1.6, 1.7 0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch, 1.6, 1.7 0005-Add-chan_mobile-from-asterisk-addons.patch, 1.6, 1.7 0006-Use-pkgconfig-to-check-for-Lua.patch, 1.6, 1.7 0007-Build-using-external-libedit.patch, 1.6, 1.7 0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch, 1.3, 1.4 0009-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch, 1.3, 1.4 0010-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch, 1.3, 1.4 0011-Merged-revisions-160170-160172-via-svnmerge-from.patch, 1.3, 1.4 0012-Merged-revisions-162275-via-svnmerge-from.patch, 1.2, 1.3 0013-Update-autoconf.patch, 1.2, 1.3 0014-Fix-up-some-paths.patch, 1.1, 1.2 asterisk.spec, 1.40, 1.41

Jeffrey C. Ollie jcollie at fedoraproject.org
Mon Jan 5 03:10:31 UTC 2009


Author: jcollie

Update of /cvs/pkgs/rpms/asterisk/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25007

Modified Files:
	0001-Modify-init-scripts-for-better-Fedora-compatibility.patch 
	0002-Modify-modules.conf-so-that-different-voicemail-modu.patch 
	0003-Allow-alternate-extensions-to-be-specified-in-users.patch 
	0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch 
	0005-Add-chan_mobile-from-asterisk-addons.patch 
	0006-Use-pkgconfig-to-check-for-Lua.patch 
	0007-Build-using-external-libedit.patch 
	0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch 
	0009-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch 
	0010-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch 
	0011-Merged-revisions-160170-160172-via-svnmerge-from.patch 
	0012-Merged-revisions-162275-via-svnmerge-from.patch 
	0013-Update-autoconf.patch 0014-Fix-up-some-paths.patch 
	asterisk.spec 
Added Files:
	0015-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch 
Log Message:
* Sun Jan  4 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0.2-4
- Fedora Directory Server compatibility patch/subpackage. BZ#452176


0015-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch:

--- NEW FILE 0015-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch ---
>From f8a1e831086e6022b69773826f75f8bb759a40b5 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 15/15] Add LDAP schema that is compatible with Fedora Directory Server.

---
 contrib/scripts/99asterisk.ldif |  489 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 489 insertions(+), 0 deletions(-)
 create mode 100644 contrib/scripts/99asterisk.ldif

diff --git a/contrib/scripts/99asterisk.ldif b/contrib/scripts/99asterisk.ldif
new file mode 100644
index 0000000..ef878a8
--- /dev/null
+++ b/contrib/scripts/99asterisk.ldif
@@ -0,0 +1,489 @@
+dn: cn=schema
+#
+attributeTypes: (
+  
+  NAME 'AstContext'
+  DESC 'Asterisk Context'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstExtension'
+  DESC 'Asterisk Extension'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstPriority'
+  DESC 'Asterisk Priority'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstApplication'
+  DESC 'Asterisk Application'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstApplicationData'
+  DESC 'Asterisk Application Data'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountAMAFlags'
+  DESC 'Asterisk Account AMA Flags'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountCallerID'
+  DESC 'Asterisk Account CallerID'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountContext'
+  DESC 'Asterisk Account Context'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountMailbox'
+  DESC 'Asterisk Account Mailbox'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstMD5secret'
+  DESC 'Asterisk Account MD5 Secret'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountDeny'
+  DESC 'Asterisk Account Deny'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountPermit'
+  DESC 'Asterisk Account Permit'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountQualify'
+  DESC 'Asterisk Account Qualify'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountType'
+  DESC 'Asterisk Account Type'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountDisallowedCodec'
+  DESC 'Asterisk Account Disallowed Codec'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountExpirationTimestamp'
+  DESC 'Asterisk Account Allowed Codec'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountRegistrationContext'
+  DESC 'Asterisk Account AMA Flags'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountRegistrationExten'
+  DESC 'Asterisk Account AMA Flags'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountNoTransfer'
+  DESC 'Asterisk Account AMA Flags'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountCallGroup'
+  DESC 'Asterisk Account Call Group'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountCanReinvite'
+  DESC 'Asterisk Account Can Reinvite'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountDTMFMode'
+  DESC 'Asterisk Account DTMF Flags'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+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
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountFullContact'
+  DESC 'Asterisk Account Full Contact'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountHost'
+  DESC 'Asterisk Account Host'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountInsecure'
+  DESC 'Asterisk Account Insecure'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountNAT'
+  DESC 'Asterisk Account NAT'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountPickupGroup'
+  DESC 'Asterisk Account PickupGroup'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountPort'
+  DESC 'Asterisk Account Port'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountRestrictCID'
+  DESC 'Asterisk Restrict CallerID'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountRTPTimeout'
+  DESC 'Asterisk RTP Timeout'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountRTPHoldTimeout'
+  DESC 'Asterisk RTP Hold Timeout'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountRealmedPassword'
+  DESC 'Asterisk RTP Hold Timeout'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountAllowedCodec'
+  DESC 'Asterisk Account Allowed Codec'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountMusicOnHold'
+  DESC 'Asterisk Account Allowed Codec'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountCanCallForward'
+  DESC 'Asterisk Can CAll Forward'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountSecret'
+  DESC 'Asterisk Can CAll Forward'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountName'
+  DESC 'Asterisk Account Username'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstConfigFilename'
+  DESC 'Asterisk LDAP Configuration Filename'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstConfigCategory'
+  DESC 'Asterisk LDAP Configuration Category'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstConfigCategoryMetric'
+  DESC 'Asterisk LDAP Configuration Category Metric'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstConfigVariableName'
+  DESC 'Asterisk LDAP Configuration Variable Name'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstConfigVariableValue'
+  DESC 'Asterisk LDAP Configuration Variable Value'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstConfigCommented'
+  DESC 'Asterisk LDAP Configuration Commented'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountIPAddress'
+  DESC 'Asterisk Account IP Address'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountDefaultUser'
+  DESC 'Asterisk Account Default User'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+attributeTypes: (
+  
+  NAME 'AstAccountRegistrationServer'
+  DESC 'Asterisk Account Registration Server'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  )
+#
+objectClasses: (
+  
+  NAME 'AsteriskExtension'
+  DESC 'PBX Extension Information for Asterisk'
+  SUP top
+  AUXILIARY
+  MUST cn
+  MAY ( AstContext $ AstExtension $ AstPriority $ AstApplication 
+      $ AstApplicationData )
+  )
+#
+objectClasses: (
+  
+  NAME 'AsteriskIAXUser'
+  DESC 'IAX2 User information for Asterisk'
+  SUP AsteriskExtension
+  AUXILIARY
+  MUST cn
+  MAY ( AstAccountAMAFlags $ AstAccountCallerID $ AstAccountContext 
+      $ AstAccountFullContact $ AstAccountHost $ AstAccountMailbox $ AstMD5secret 
+      $ AstAccountDeny $ AstAccountPermit $ AstAccountPort $ AstAccountQualify 
+      $ AstAccountType $ AstAccountDisallowedCodec $ AstAccountExpirationTimestamp 
+      $ AstAccountRegistrationContext$ AstAccountRegistrationExten 
+      $ AstAccountNoTransfer $ AstAccountName )
+  )
+#
+objectClasses: (
+  
+  NAME 'AsteriskSIPUser'
+  DESC 'SIP User information for Asterisk'
+  SUP AsteriskExtension
+  AUXILIARY
+  MUST cn
+  MAY ( AstAccountAMAFlags $ AstAccountCallGroup $ AstAccountCallerID 
+      $ AstAccountCanReinvite $ AstAccountContext $ AstAccountDefaultUser
+      $ AstAccountDTMFMode $ AstAccountFromUser $ AstAccountFromDomain 
+      $ AstAccountFullContact $ AstAccountHost $ AstAccountInsecure 
+      $ AstAccountIPAddress $ AstAccountMailbox $ AstAccountRealmedPassword 
+      $ AstAccountNAT $ AstAccountDeny $ AstAccountPermit $ AstAccountPickupGroup 
+      $ AstAccountPort $ AstAccountQualify $ AstAccountRestrictCID 
+      $ AstAccountRTPTimeout $ AstAccountRTPHoldTimeout $ AstAccountType 
+      $ AstAccountDisallowedCodec $ AstAccountAllowedCodec $ AstAccountMusicOnHold 
+      $ AstAccountExpirationTimestamp $ AstAccountRegistrationContext 
+      $ AstAccountRegistrationExten $ AstAccountRegistrationServer 
+      $ AstAccountCanCallForward $ AstAccountSecret $ AstAccountName )
+  )
+#
+objectClasses: (
+  
+  NAME 'AsteriskConfig'
+  DESC 'Asterisk configuration Information'
+  SUP top
+  AUXILIARY
+  MUST cn
+  MAY ( AstConfigFilename $ AstConfigCategory $ AstConfigCategoryMetric 
+      $ AstConfigVariableName $ AstConfigVariableValue $ AstConfigCommented )
+  )
-- 
1.6.1


0001-Modify-init-scripts-for-better-Fedora-compatibility.patch:

Index: 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0001-Modify-init-scripts-for-better-Fedora-compatibility.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch	4 Jan 2009 18:58:38 -0000	1.7
+++ 0001-Modify-init-scripts-for-better-Fedora-compatibility.patch	5 Jan 2009 03:10:28 -0000	1.8
@@ -1,7 +1,7 @@
 From 0040bd97782e9db8c341af9ffe171749644e35f1 Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Sun, 18 Nov 2007 21:47:59 -0600
-Subject: [PATCH 01/14] Modify init scripts for better Fedora compatibility.
+Subject: [PATCH 01/15] Modify init scripts for better Fedora compatibility.
 
 ---
  contrib/init.d/rc.redhat.asterisk |   61 +++++++++++++++++-------------------

0002-Modify-modules.conf-so-that-different-voicemail-modu.patch:

Index: 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0002-Modify-modules.conf-so-that-different-voicemail-modu.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch	4 Jan 2009 18:58:38 -0000	1.7
+++ 0002-Modify-modules.conf-so-that-different-voicemail-modu.patch	5 Jan 2009 03:10:28 -0000	1.8
@@ -1,7 +1,7 @@
 From 42cd072beba88049783a7bedb029760a5952706e Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jcollie at pc21224.campus.dmacc.edu>
 Date: Thu, 8 Nov 2007 15:52:36 -0600
-Subject: [PATCH 02/14] Modify modules.conf so that different voicemail modules can be loaded.
+Subject: [PATCH 02/15] Modify modules.conf so that different voicemail modules can be loaded.
 
 ---
  configs/modules.conf.sample |   27 +++++++++++++++++++++++++++

0003-Allow-alternate-extensions-to-be-specified-in-users.patch:

Index: 0003-Allow-alternate-extensions-to-be-specified-in-users.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0003-Allow-alternate-extensions-to-be-specified-in-users.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- 0003-Allow-alternate-extensions-to-be-specified-in-users.patch	4 Jan 2009 18:58:38 -0000	1.6
+++ 0003-Allow-alternate-extensions-to-be-specified-in-users.patch	5 Jan 2009 03:10:28 -0000	1.7
@@ -1,7 +1,7 @@
 From a9d27e3b5f93ff8658fa06a0c454140f27244363 Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jcollie at pc21224.campus.dmacc.edu>
 Date: Thu, 8 Nov 2007 16:32:56 -0600
-Subject: [PATCH 03/14] Allow alternate extensions to be specified in users.conf
+Subject: [PATCH 03/15] Allow alternate extensions to be specified in users.conf
 
 ---
  pbx/pbx_config.c |   14 ++++++++++++++

0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch:

Index: 0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- 0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch	4 Jan 2009 18:58:38 -0000	1.6
+++ 0004-Minor-changes-to-reduce-packaging-changes-made-by-th.patch	5 Jan 2009 03:10:28 -0000	1.7
@@ -1,7 +1,7 @@
 From 42991016984f9e7930686527706ab0f36baa41d1 Mon Sep 17 00:00:00 2001
 From: tilghman <tilghman at 614ede4d-c843-0410-af14-a771ab80d22e>
 Date: Tue, 29 Jul 2008 23:00:45 +0000
-Subject: [PATCH 04/14] Minor changes to reduce packaging changes made by the Fedora maintainer.
+Subject: [PATCH 04/15] Minor changes to reduce packaging changes made by the Fedora maintainer.
  (closes issue #12974)
   Reported by: jcollie
   Patches:

0005-Add-chan_mobile-from-asterisk-addons.patch:

Index: 0005-Add-chan_mobile-from-asterisk-addons.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0005-Add-chan_mobile-from-asterisk-addons.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- 0005-Add-chan_mobile-from-asterisk-addons.patch	4 Jan 2009 18:58:38 -0000	1.6
+++ 0005-Add-chan_mobile-from-asterisk-addons.patch	5 Jan 2009 03:10:28 -0000	1.7
@@ -1,7 +1,7 @@
 From 8cc8002094fe880d374a727aa0be389ca68b0342 Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Mon, 25 Feb 2008 09:23:28 -0600
-Subject: [PATCH 05/14] Add chan_mobile from asterisk-addons.
+Subject: [PATCH 05/15] Add chan_mobile from asterisk-addons.
 
 ---
  build_tools/menuselect-deps.in |    1 +

0006-Use-pkgconfig-to-check-for-Lua.patch:

Index: 0006-Use-pkgconfig-to-check-for-Lua.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0006-Use-pkgconfig-to-check-for-Lua.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- 0006-Use-pkgconfig-to-check-for-Lua.patch	4 Jan 2009 18:58:38 -0000	1.6
+++ 0006-Use-pkgconfig-to-check-for-Lua.patch	5 Jan 2009 03:10:28 -0000	1.7
@@ -1,7 +1,7 @@
 From d633181f75ea7dc879e8ac9d014cf1fc0fe364ef Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Mon, 25 Feb 2008 13:14:23 -0600
-Subject: [PATCH 06/14] Use pkgconfig to check for Lua.
+Subject: [PATCH 06/15] Use pkgconfig to check for Lua.
 
 ---
  configure.ac |    9 ++++++++-

0007-Build-using-external-libedit.patch:

Index: 0007-Build-using-external-libedit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0007-Build-using-external-libedit.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- 0007-Build-using-external-libedit.patch	4 Jan 2009 18:58:38 -0000	1.6
+++ 0007-Build-using-external-libedit.patch	5 Jan 2009 03:10:28 -0000	1.7
@@ -1,7 +1,7 @@
 From a50090dc47540b5c3df28c9846fe753f5476c4fc Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Tue, 25 Mar 2008 00:50:27 -0500
-Subject: [PATCH 07/14] Build using external libedit.
+Subject: [PATCH 07/15] Build using external libedit.
 
 ---
  build_tools/menuselect-deps.in |    1 +

0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch:

Index: 0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch	4 Jan 2009 18:58:38 -0000	1.3
+++ 0008-Revert-changes-to-pbx_lua-from-rev-126363-that-cause.patch	5 Jan 2009 03:10:28 -0000	1.4
@@ -1,7 +1,7 @@
 From a092080315b7bfa9b7d174b6114cb957ac1590d8 Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Fri, 10 Oct 2008 11:54:10 -0500
-Subject: [PATCH 08/14] Revert changes to pbx_lua from rev 126363 that cause some problems.
+Subject: [PATCH 08/15] Revert changes to pbx_lua from rev 126363 that cause some problems.
 
 ---
  pbx/pbx_lua.c |    6 +++---

0009-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch:

Index: 0009-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0009-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 0009-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch	4 Jan 2009 18:58:38 -0000	1.3
+++ 0009-change-configure.ac-to-look-for-pkg-config-gmime-2.4.patch	5 Jan 2009 03:10:28 -0000	1.4
@@ -1,7 +1,7 @@
 From 7719af5a016f40f573c90aae17910f7f77b9b4e6 Mon Sep 17 00:00:00 2001
 From: Caolan McNamara <caolanm at redhat.com>
 Date: Sat, 3 Jan 2009 19:06:18 -0600
-Subject: [PATCH 09/14] change configure.ac to look for pkg-config gmime-2.4 instead of gmime-2.4 gmime-config
+Subject: [PATCH 09/15] change configure.ac to look for pkg-config gmime-2.4 instead of gmime-2.4 gmime-config
 
 ---
  configure.ac |   12 +++++++++++-

0010-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch:

Index: 0010-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0010-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 0010-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch	4 Jan 2009 18:58:38 -0000	1.3
+++ 0010-fix-the-AST_PROG_SED-problem-that-makes-.-bootstrap.patch	5 Jan 2009 03:10:28 -0000	1.4
@@ -1,7 +1,7 @@
 From 9a6c4641b2aa353c9076df9794d72fba5acdafb0 Mon Sep 17 00:00:00 2001
 From: Caolan McNamara <caolanm at redhat.com>
 Date: Sat, 3 Jan 2009 19:12:18 -0600
-Subject: [PATCH 10/14] fix the AST_PROG_SED problem that makes ./bootstrap.sh fail
+Subject: [PATCH 10/15] fix the AST_PROG_SED problem that makes ./bootstrap.sh fail
 
 Need to regenerate configure from configure.ac after patch one with
 ./bootsrap.sh, so fix the broken .m4 in the autoconfig dir. (alternatively

0011-Merged-revisions-160170-160172-via-svnmerge-from.patch:

Index: 0011-Merged-revisions-160170-160172-via-svnmerge-from.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0011-Merged-revisions-160170-160172-via-svnmerge-from.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 0011-Merged-revisions-160170-160172-via-svnmerge-from.patch	4 Jan 2009 18:58:38 -0000	1.3
+++ 0011-Merged-revisions-160170-160172-via-svnmerge-from.patch	5 Jan 2009 03:10:29 -0000	1.4
@@ -1,7 +1,7 @@
 From c38fa4eb3cf989c110a737058c46a916ebab19c8 Mon Sep 17 00:00:00 2001
 From: seanbright <seanbright at f38db490-d61c-443f-a65b-d21fe96a405b>
 Date: Mon, 1 Dec 2008 23:41:16 +0000
-Subject: [PATCH 11/14] Merged revisions 160170-160172 via svnmerge from
+Subject: [PATCH 11/15] Merged revisions 160170-160172 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/trunk
 
 ................

0012-Merged-revisions-162275-via-svnmerge-from.patch:

Index: 0012-Merged-revisions-162275-via-svnmerge-from.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0012-Merged-revisions-162275-via-svnmerge-from.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 0012-Merged-revisions-162275-via-svnmerge-from.patch	4 Jan 2009 18:58:38 -0000	1.2
+++ 0012-Merged-revisions-162275-via-svnmerge-from.patch	5 Jan 2009 03:10:29 -0000	1.3
@@ -1,7 +1,7 @@
 From 986c677766137383378252947eafb3eb8c86718a Mon Sep 17 00:00:00 2001
 From: file <file at f38db490-d61c-443f-a65b-d21fe96a405b>
 Date: Tue, 9 Dec 2008 20:47:11 +0000
-Subject: [PATCH 12/14] Merged revisions 162275 via svnmerge from
+Subject: [PATCH 12/15] Merged revisions 162275 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/trunk
 
 ................

0013-Update-autoconf.patch:

Index: 0013-Update-autoconf.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0013-Update-autoconf.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 0013-Update-autoconf.patch	4 Jan 2009 18:58:38 -0000	1.2
+++ 0013-Update-autoconf.patch	5 Jan 2009 03:10:29 -0000	1.3
@@ -1,7 +1,7 @@
 From 249cd4bd1b4b9a0b99a07d44359e098c10dacbdb Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Sun, 4 Jan 2009 00:37:02 -0600
-Subject: [PATCH 13/14] Update autoconf.
+Subject: [PATCH 13/15] Update autoconf.
 
 ---
  configure                        |23025 ++++++++++++++++++++------------------

0014-Fix-up-some-paths.patch:

Index: 0014-Fix-up-some-paths.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/0014-Fix-up-some-paths.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0014-Fix-up-some-paths.patch	4 Jan 2009 18:58:38 -0000	1.1
+++ 0014-Fix-up-some-paths.patch	5 Jan 2009 03:10:29 -0000	1.2
@@ -1,7 +1,7 @@
 From 57e9e58cb5d501da652d227eb8c07b2593d333ff Mon Sep 17 00:00:00 2001
 From: Jeffrey C. Ollie <jeff at ocjtech.us>
 Date: Sun, 4 Jan 2009 12:51:05 -0600
-Subject: [PATCH 14/14] Fix up some paths.
+Subject: [PATCH 14/15] Fix up some paths.
 
 ---
  UPGRADE-1.4.txt                             |    2 +-


Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/F-10/asterisk.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- asterisk.spec	4 Jan 2009 18:58:38 -0000	1.40
+++ asterisk.spec	5 Jan 2009 03:10:29 -0000	1.41
@@ -3,7 +3,7 @@
 Summary: The Open Source PBX
 Name: asterisk
 Version: 1.6.0.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.asterisk.org/
@@ -47,6 +47,7 @@
 Patch12: 0012-Merged-revisions-162275-via-svnmerge-from.patch
 Patch13: 0013-Update-autoconf.patch
 Patch14: 0014-Fix-up-some-paths.patch
+Patch15: 0015-Add-LDAP-schema-that-is-compatible-with-Fedora-Direc.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
@@ -235,6 +236,16 @@
 %description ldap
 LDAP resources for Asterisk.
 
+%package ldap-fds
+Summary: LDAP resources for Asterisk and the Fedora Directory Server
+Group: Applications/Internet
+Requires: asterisk = %{version}-%{release}
+Requires: asterisk-ldap = %{version}-%{release}
+Requires: fedora-ds-base
+
+%description ldap-fds
+LDAP resources for Asterisk and the Fedora Directory Server.
+
 %package misdn
 Summary: mISDN channel for Asterisk
 Group: Applications/Internet
@@ -425,6 +436,7 @@
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
 
 cp %{SOURCE2} menuselect.makedeps
 cp %{SOURCE3} menuselect.makeopts
@@ -505,6 +517,7 @@
 
 install -D -p -m 0755 contrib/init.d/rc.redhat.asterisk %{buildroot}%{_initrddir}/asterisk
 install -D -p -m 0644 contrib/sysconfig/asterisk %{buildroot}%{_sysconfdir}/sysconfig/asterisk
+install -D -p -m 0644 contrib/scripts/99asterisk.ldif %{buildroot}%{_sysconfdir}/dirsrv/schema/99asterisk.ldif
 install -D -p -m 0644 %{S:1} %{buildroot}%{_sysconfdir}/logrotate.d/asterisk
 install -D -p -m 0644 doc/asterisk-mib.txt %{buildroot}%{_datadir}/snmp/mibs/ASTERISK-MIB.txt
 install -D -p -m 0644 doc/digium-mib.txt %{buildroot}%{_datadir}/snmp/mibs/DIGIUM-MIB.txt
@@ -928,6 +941,10 @@
 %config(noreplace) %{_sysconfdir}/asterisk/res_ldap.conf
 %{_libdir}/asterisk/modules/res_config_ldap.so
 
+%files ldap-fds
+%defattr(-,root,root,-)
+%{_sysconfdir}/dirsrv/schema/99asterisk.ldif
+
 %files minivm
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/asterisk/extensions_minivm.conf
@@ -1037,6 +1054,9 @@
 %{_libdir}/asterisk/modules/app_voicemail_plain.so
 
 %changelog
+* Sun Jan  4 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0.2-4
+- Fedora Directory Server compatibility patch/subpackage. BZ#452176
+
 * Sun Jan  4 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0.2-3
 - Don't package func_curl in the main package. BZ#475910
 - Fix up paths. BZ#477238




More information about the fedora-extras-commits mailing list