summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Dartiguelongue <eva@gentoo.org>2009-02-01 00:05:23 +0000
committerGilles Dartiguelongue <eva@gentoo.org>2009-02-01 00:05:23 +0000
commit9d2a0dd607e62d62828e22062817276bcb7b0380 (patch)
treee32d4be5c74aa43b88dcec65d5467c564845498d /gnome-extra/evolution-data-server
parentstable sparc, bug 249703 (diff)
downloadhistorical-9d2a0dd607e62d62828e22062817276bcb7b0380.tar.gz
historical-9d2a0dd607e62d62828e22062817276bcb7b0380.tar.bz2
historical-9d2a0dd607e62d62828e22062817276bcb7b0380.zip
Bump to 2.24.4. Lots of bug fixes. Install LDAP schemas, bug #83988.
Package-Manager: portage-2.2_rc23/cvs/Linux x86_64
Diffstat (limited to 'gnome-extra/evolution-data-server')
-rw-r--r--gnome-extra/evolution-data-server/ChangeLog10
-rw-r--r--gnome-extra/evolution-data-server/Manifest21
-rw-r--r--gnome-extra/evolution-data-server/evolution-data-server-2.24.2.ebuild25
-rw-r--r--gnome-extra/evolution-data-server/evolution-data-server-2.24.3.ebuild23
-rw-r--r--gnome-extra/evolution-data-server/evolution-data-server-2.24.4.ebuild (renamed from gnome-extra/evolution-data-server/evolution-data-server-2.22.2.ebuild)52
-rw-r--r--gnome-extra/evolution-data-server/files/calentry.schema108
6 files changed, 211 insertions, 28 deletions
diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index e0ee5140fa33..5d110fd80fde 100644
--- a/gnome-extra/evolution-data-server/ChangeLog
+++ b/gnome-extra/evolution-data-server/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for gnome-extra/evolution-data-server
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.200 2009/01/18 06:48:42 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.201 2009/02/01 00:05:23 eva Exp $
+
+*evolution-data-server-2.24.4 (01 Feb 2009)
+
+ 01 Feb 2009; Gilles Dartiguelongue <eva@gentoo.org>
+ +files/calentry.schema, -evolution-data-server-2.22.2.ebuild,
+ evolution-data-server-2.24.2.ebuild, evolution-data-server-2.24.3.ebuild,
+ +evolution-data-server-2.24.4.ebuild:
+ Bump to 2.24.4. Lots of bug fixes. Install LDAP schemas, bug #83988.
*evolution-data-server-2.24.3 (18 Jan 2009)
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 974d7265fb42..a4dee4938d36 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,3 +1,7 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX calentry.schema 3661 RMD160 68dfc3a8bbf08a1cf2713727c6617b2de613cb7c SHA1 06ddcc64c3b2b3230fbbef21a7e2a682bd95788c SHA256 107d60463833d5ceb5f752335dd07fef303093c58a51fb03405fed5837999431
AUX evolution-data-server-1.11.3-as-needed.patch 1942 RMD160 1db5815026e06a47c91295f4b502b94692dbe115 SHA1 0f94fb16e14ed685154cd0ad1211095431e179ca SHA256 95b1d4a23e801a36c7027080347e8fcb1ad90bc1d4040e9bdab8d00eb1f27986
AUX evolution-data-server-1.11.3-no-libdb.patch 570 RMD160 404dfda7aac4e9ff6504ecd9ee5b7af6efafc969 SHA1 411f311317439bf20643491d2b7d1cbee99c561e SHA256 992602fd04cfa8afba084238f62f765b1d5caf29cc10ad739c7e63ea78291905
AUX evolution-data-server-1.12.1-icaltz-util.patch 839 RMD160 58b17c2bed830ccabf4682fada9e5bd22d3fae48 SHA1 cd9aa108ba32d38ecc46b1749ff378faff4dc870 SHA256 8d7c5c5abab727eecd5cff1980e9987bf0dcadf0324288775c347e0da4f81175
@@ -13,15 +17,22 @@ AUX evolution-data-server-2.22.3-timezone-western.patch 2041 RMD160 8a0d9e308123
AUX evolution-data-server-2.23.6-as-needed.patch 3469 RMD160 43c48a35d0480a82db6cf131c0fdd0062353efc4 SHA1 96ef4dd901730ab2f77716646517a5ef40a5f982 SHA256 4899ffd8773229ecb43afbffdb91faa1fd433630395792998973f62aa54afb37
AUX evolution-data-server-no_lazy_bindings.patch 551 RMD160 d86bf9a9ed25615bcb3dab23977ac01c341a799c SHA1 34aa3d902e0e704f67c6fceee820dad158d82be2 SHA256 772bdd99f3936d377cd0ce59c4f03789d227b79c4a2ca2d5e7e3165c378c6403
DIST evolution-data-server-1.12.3.tar.bz2 7447166 RMD160 c7102c38af4888f3f8933c9d28981d1809d504f8 SHA1 12b8b23fb77ff6436def3cc5ea472886c8e0350e SHA256 e2d9038e3cd115ea5af2f3b7d381f5803c62d1ec36206e5a1bea0f823d25fab5
-DIST evolution-data-server-2.22.2.tar.bz2 7613774 RMD160 92677046697b0f48b273ad3fb3fbf656dac02e5b SHA1 d3fc33802fec51a16b017abb7516f4ed79311dfa SHA256 dc86b3f61cc4f9db08012deee692774562cfc93a3313298517fca8639a6eb3de
DIST evolution-data-server-2.22.3.tar.bz2 7621470 RMD160 eed9c26fba0b69f0cbe44b01d698388c4ae44a0b SHA1 5d01b1248fcacef9c478787892f223338dff731b SHA256 6e9fa1258c8b4d1fd75a1da78ee637ad5b8a82bc58c93324d73afecf8d73fe87
DIST evolution-data-server-2.24.2.tar.bz2 7886652 RMD160 703b064095b960954ebb0621e15887731c429010 SHA1 8c4988446c6a8552972974800766eb536fcf267c SHA256 ac66e2f5341c488fa9e5e02c7e4eb7a7a1c01c093ad4a7a9b9e0e028f43f617a
DIST evolution-data-server-2.24.3.tar.bz2 7882341 RMD160 f0a83cf0d77c7798f6d0dbaa0dd9c77198629740 SHA1 079a2a0a139d4073e7a4122c81271695dfc56de8 SHA256 4bb4c8f8bafdcca558299d317817efbb3c35fe06b163b41e543ed2a15c2aefb4
+DIST evolution-data-server-2.24.4.tar.bz2 7893360 RMD160 c79ad1d9c8629347d00c1b1a2fedae66fb5501d3 SHA1 210c6f8f4a42aac1f5b7031dbe9d79a634a58ac9 SHA256 072ad609eb669c1a9d5448007e80ef4ba8b01a22429ff81f2ae6fc750e45b525
EBUILD evolution-data-server-1.12.3.ebuild 5047 RMD160 47e7a7a27fc51270a57644179594e302ffe11a73 SHA1 8e819d7c74c140aed79e5f265082a96541dbdb74 SHA256 482df2b372d83beaf408af1b0d6e7162d52481eef0513a25b6f9fc1805e7a229
-EBUILD evolution-data-server-2.22.2.ebuild 3121 RMD160 b25a0c60d2724073c6fa7a12ef05d37ff64c5c51 SHA1 7792a7a2f0902fd55cfad7dc7a5099ae3b31e3df SHA256 6e2bb7b8b57d839a35bfac3ed3b970da6a3088ca23985170a2941aaf78eb1ece
EBUILD evolution-data-server-2.22.3-r1.ebuild 3233 RMD160 54447c637693f00b42eb87f5392f8674290c3657 SHA1 d39ef796968ad6aec398318b388956518711b22a SHA256 adaaffe22b38cd3e59801b82664348ec715d8d0671141e126b2b5cc17f7c6728
EBUILD evolution-data-server-2.22.3.ebuild 3118 RMD160 11a9c2f85fc84d848c47fc478a55a1ca77361efa SHA1 4b4ecd802fc9c7a1e997f8b35a9e95bcbda0da80 SHA256 2194dfb3d1cdf85e448e6fd6aa3e5a62f0759c7054b3c50fa3cd0ee3af9c4700
-EBUILD evolution-data-server-2.24.2.ebuild 3015 RMD160 bee5734c69aadc03670b796b2c9aae3e3711e79b SHA1 21c3d1040da61eaf0cd89d959543abaa8933710d SHA256 3f7019bba2a6e621746a0aae94e22e2fd0456c89ee1e02f812cbd34bfb198cc8
-EBUILD evolution-data-server-2.24.3.ebuild 2874 RMD160 7c22a18a82f9d2e86750a2dfa1ce15ac380257fe SHA1 7eda7eaa6337f50c8a8206e46a437838d9f9ad4e SHA256 a8ce2e39e717c97be2b49b275b1adf19e431dfbd721ef66276412ac4c00dffc5
-MISC ChangeLog 38057 RMD160 09dd398d6e7d792972f1cefce842cc3fb2f67cfa SHA1 bb708b0b97b038a9573c83bbb231394268ae0d53 SHA256 ecf629940cc83042476e9c97a2bf18aca933e0d3ea4f733e381ece67a38ee250
+EBUILD evolution-data-server-2.24.2.ebuild 3451 RMD160 99354f74976ce35c63f299b8b8e19d82ea06e766 SHA1 aaa59d4a55cdd905bbc14d2d638e9fd50f903a56 SHA256 d2eb70ef8f74660ffe783b1952cb578c7d2d4b1dc088ab957c541074aa82a16d
+EBUILD evolution-data-server-2.24.3.ebuild 3301 RMD160 c84b5378dd51df2c438f579e5193be5999c8d8c9 SHA1 ffaac8310f590b7ef5b7ce50074e22afc2dc6144 SHA256 ec46d6d50c196d0adebea4012372a1b0256d176d9b8a596d71e58d4fee50f392
+EBUILD evolution-data-server-2.24.4.ebuild 3472 RMD160 d0d336c625b32473189e103ba84f45d96f12f475 SHA1 5fa1b5d410346deec4592d09c851ea4a1e3e8755 SHA256 8f3989b03da0dc724029e98bcbe000e9d934c07a2389e1266a878d4ed0e5321f
+MISC ChangeLog 38399 RMD160 fcf2d82335ee4d5bad1bd7887e467c936550fdf8 SHA1 16b376c46b54bb686a0143df220896075867462c SHA256 bbcf08265cf87e50b9f9b9d7361fdaa809b1c9986311a383009d586c48ed441c
MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkmE9VYACgkQ1fmVwcYIWAYStACgmhRwn2r9UZHTsUt+77lS5v6q
+u8YAn3mYjmOpkHvaNpJXxj2jx5/kbuFD
+=lggx
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-2.24.2.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-2.24.2.ebuild
index b25b437ff39b..187e5a4e2ac3 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-2.24.2.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-2.24.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-2.24.2.ebuild,v 1.1 2008/12/01 10:41:27 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-2.24.2.ebuild,v 1.2 2009/02/01 00:05:23 eva Exp $
-inherit db-use eutils flag-o-matic gnome2 autotools
+inherit db-use eutils flag-o-matic gnome2 autotools versionator
DESCRIPTION="Evolution groupware backend"
HOMEPAGE="http://www.gnome.org/projects/evolution/"
@@ -107,3 +107,22 @@ src_compile() {
cd "${S}"
gnome2_src_compile
}
+
+src_install() {
+ gnome2_src_install
+
+ if use ldap; then
+ MY_MAJORV=$(get_version_component_range 1-2)
+ insinto /etc/openldap/schema
+ doins "${FILESDIR}"/calentry.schema
+ dosym "${D}"/usr/share/${PN}-${MY_MAJORV}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
+ fi
+
+}
+
+pkg_postinst() {
+ if use ldap; then
+ elog ""
+ elog "LDAP schemas needed by evolution are installed in /etc/openldap/schema"
+ fi
+}
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-2.24.3.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-2.24.3.ebuild
index 2fe70806e5ae..f281be8addfd 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-2.24.3.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-2.24.3.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-2.24.3.ebuild,v 1.1 2009/01/18 06:48:42 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-2.24.3.ebuild,v 1.2 2009/02/01 00:05:23 eva Exp $
-inherit db-use eutils flag-o-matic gnome2 autotools
+inherit db-use eutils flag-o-matic gnome2 autotools versionator
DESCRIPTION="Evolution groupware backend"
HOMEPAGE="http://www.gnome.org/projects/evolution/"
@@ -103,3 +103,22 @@ src_compile() {
cd "${S}"
gnome2_src_compile
}
+
+src_install() {
+ gnome2_src_install
+
+ if use ldap; then
+ MY_MAJORV=$(get_version_component_range 1-2)
+ insinto /etc/openldap/schema
+ doins "${FILESDIR}"/calentry.schema
+ dosym "${D}"/usr/share/${PN}-${MY_MAJORV}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
+ fi
+
+}
+
+pkg_postinst() {
+ if use ldap; then
+ elog ""
+ elog "LDAP schemas needed by evolution are installed in /etc/openldap/schema"
+ fi
+}
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-2.22.2.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-2.24.4.ebuild
index e041d754f9ed..e8e717e96bec 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-2.22.2.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-2.24.4.ebuild
@@ -1,28 +1,28 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-2.22.2.ebuild,v 1.5 2008/08/12 13:51:45 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-2.24.4.ebuild,v 1.1 2009/02/01 00:05:23 eva Exp $
-inherit db-use eutils flag-o-matic gnome2 autotools
+inherit db-use eutils flag-o-matic gnome2 autotools versionator
DESCRIPTION="Evolution groupware backend"
HOMEPAGE="http://www.gnome.org/projects/evolution/"
LICENSE="LGPL-2 Sleepycat"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ~ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE="doc ipv6 kerberos gnome-keyring krb4 ldap ssl"
-RDEPEND=">=dev-libs/glib-2.15.3
+RDEPEND=">=dev-libs/glib-2.16.1
>=x11-libs/gtk+-2.10
>=gnome-base/orbit-2.9.8
- >=gnome-base/gnome-vfs-2.4
>=gnome-base/libbonobo-2.20.3
>=gnome-base/gconf-2
>=gnome-base/libglade-2
>=gnome-base/libgnome-2
>=dev-libs/libxml2-2
>=net-libs/libsoup-2.4
- gnome-keyring? ( >=gnome-base/gnome-keyring-2.20 )
+ gnome-keyring? ( >=gnome-base/gnome-keyring-2.20.1 )
+ >=dev-db/sqlite-3.5
ssl? (
>=dev-libs/nspr-4.4
>=dev-libs/nss-3.9 )
@@ -63,6 +63,7 @@ pkg_setup() {
else
G2CONF="${G2CONF} $(use_with krb4 krb4 /usr)"
fi
+
}
src_unpack() {
@@ -74,22 +75,20 @@ src_unpack() {
# Fix broken libdb build
epatch "${FILESDIR}"/${PN}-1.11.3-no-libdb.patch
- # Resolve symbols at execution time for setgid binaries
- epatch "${FILESDIR}"/${PN}-no_lazy_bindings.patch
-
# Rewind in camel-disco-diary to fix a crash
epatch "${FILESDIR}"/${PN}-1.8.0-camel-rewind.patch
- # Don't assume that endian.h and byteswap.h exist on all non sun os's
- epatch "${FILESDIR}"/${PN}-2.21.90-icaltz-util.patch
+ # Fix building evo-exchange with --as-needed, upstream bug #342830
+ epatch "${FILESDIR}"/${PN}-2.23.6-as-needed.patch
- # Don't error out if gtkdoc-rebase doesn't exist.
- epatch "${FILESDIR}"/${PN}-2.21.4-gtkdoc-rebase.patch
-
- # Fix building evo-exchange with --as-needed
- epatch "${FILESDIR}"/${PN}-2.21.4-as-needed.patch
+ if use doc; then
+ sed "/^TARGET_DIR/i \GTKDOC_REBASE=/usr/bin/gtkdoc-rebase" -i gtk-doc.make
+ else
+ sed "/^TARGET_DIR/i \GTKDOC_REBASE=/bin/true" -i gtk-doc.make
+ fi
# gtk-doc-am and gnome-common needed for this
+ intltoolize --force --copy --automake || die "intltoolize failed"
eautoreconf
}
@@ -111,3 +110,22 @@ src_compile() {
cd "${S}"
gnome2_src_compile
}
+
+src_install() {
+ gnome2_src_install
+
+ if use ldap; then
+ MY_MAJORV=$(get_version_component_range 1-2)
+ insinto /etc/openldap/schema
+ doins "${FILESDIR}"/calentry.schema
+ dosym "${D}"/usr/share/${PN}-${MY_MAJORV}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
+ fi
+
+}
+
+pkg_postinst() {
+ if use ldap; then
+ elog ""
+ elog "LDAP schemas needed by evolution are installed in /etc/openldap/schema"
+ fi
+}
diff --git a/gnome-extra/evolution-data-server/files/calentry.schema b/gnome-extra/evolution-data-server/files/calentry.schema
new file mode 100644
index 000000000000..bc79da273cc2
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/calentry.schema
@@ -0,0 +1,108 @@
+# RFC2739 calEntry schema for OpenLDAP 2.x
+
+#
+# From https://bugs.gentoo.org/show_bug.cgi?id=83988
+# Please notify us of updated revisions by submitting a bug report at bugs.gentoo.org
+#
+
+# Version of RFC 2739 schema translated by Terrelle Shaw
+# (xytek@xytek.org) # Nov. 7, 2002 # Modifications by Peter Marschall
+# <peter.marschall@adpm.de> # Nov. 9, 2002
+
+# Notes:
+# * RFC2739 seems to be a bit sloppy about attribute type and
+# objectclass definitions syntax and also about attribute syntax
+# and matching rules.
+# (It even counts the attributes in the calEntry objectclass wrong ;-)
+# * The following changes have been applied to correct the schema
+# - added description to each attributetype definition
+# - changed SYNTAX from 'IA5String' to corresponding OID
+# to make matching rules and syntax consistent
+# - replaced illegal keyword SUBSTRING by SUBSTR
+# - changed SUBSTR from caseIgnoreIA5Match to caseIgnoreIA5SubstringsMatch
+# - removed illegal keyword MULTI-VALUE
+# - added keyword SINGLE-VALUE where appropriate
+# - removed USAGE since cwuserApplications is the default
+# - added description to the objectclass defintion
+# - corrected typo in objectclass definition
+# - added the attributetypes defined but not used to the objectclass
+
+
+# 2.4.4.1 calCalURI
+attributetype ( 1.2.840.113556.1.4.478
+ NAME 'calCalURI'
+ DESC 'URI to a snapshot of the users entire default calendar'
+ EQUALITY caseIgnoreIA5Match
+ SUBSTR caseIgnoreIA5SubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+ SINGLE-VALUE )
+
+# 2.4.4.2 calFBURL
+attributetype ( 1.2.840.113556.1.4.479
+ NAME 'calFBURL'
+ DESC 'URI to the users default free/busy time data'
+ EQUALITY caseIgnoreIA5Match
+ SUBSTR caseIgnoreIA5SubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+ SINGLE-VALUE )
+
+# 2.4.4.3 calCAPURI
+attributetype ( 1.2.840.113556.1.4.480
+ NAME 'calCAPURI'
+ DESC 'URI used to communicate with the users calendar'
+ EQUALITY caseIgnoreIA5Match
+ SUBSTR caseIgnoreIA5SubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+ SINGLE-VALUE )
+
+# 2.4.4.4 calCalAdrURI
+attributetype ( 1.2.840.113556.1.4.481
+ NAME 'calCalAdrURI'
+ DESC 'URI to which event requests should be sent for the user'
+ EQUALITY caseIgnoreIA5Match
+ SUBSTR caseIgnoreIA5SubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+ SINGLE-VALUE )
+
+# 2.4.4.5 calOtherCalURIs
+attributetype ( 1.2.840.113556.1.4.482
+ NAME 'calOtherCalURIs'
+ DESC 'URIs to snapshots of non-default calendars belonging to the user'
+ EQUALITY caseIgnoreIA5Match
+ SUBSTR caseIgnoreIA5SubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+
+# 2.4.4.6 calOtherFBURLs
+attributetype ( 1.2.840.113556.1.4.483
+ NAME 'calOtherFBURLs'
+ DESC 'URIs to non-default free/busy data belonging to the user'
+ EQUALITY caseIgnoreIA5Match
+ SUBSTR caseIgnoreIA5SubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+
+# 2.4.4.7 calOtherCAPURIs
+attributetype ( 1.2.840.113556.1.4.484
+ NAME 'calOtherCAPURIs'
+ DESC 'URIs to non-default calendars belonging to the user'
+ EQUALITY caseIgnoreIA5Match
+ SUBSTR caseIgnoreIA5SubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+
+# 2.4.4.8 calOtherCalAdrURIs
+attributetype ( 1.2.840.113556.1.4.485
+ NAME 'calOtherCalAdrURIs'
+ DESC 'URIs of destinations for event requests to non-default calendars'
+ EQUALITY caseIgnoreIA5Match
+ SUBSTR caseIgnoreIA5SubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+
+# 2.4.3.1 calEntry
+objectclass ( 1.2.840.113556.1.5.87
+ NAME 'calEntry'
+ DESC 'Calendering and free/busy information'
+ SUP top AUXILIARY
+ MAY ( calCalURI $ calFBURL $ calCAPURI $ calCalAdrURI $
+ calOtherCAPURIs $ calOtherCalURIs $ calOtherFBURLs $
+ calOtherCalAdrURIs ) )
+
+# EOF