View | Details | Raw Unified | Return to bug 210264 | Differences between
and this patch

Collapse All | Expand All

(-)new/calendarserver/Makefile (-39 / +18 lines)
Lines 1-8 Link Here
1
# $FreeBSD: head/www/calendarserver/Makefile 415742 2016-05-23 20:35:01Z amdmi3 $
1
# $FreeBSD: head/www/calendarserver/Makefile 400207 2015-10-26 21:03:57Z pi $
2
2
3
PORTNAME=	calendarserver
3
PORTNAME=	calendarserver
4
PORTVERSION=	5.1
4
PORTVERSION=	8.0
5
PORTREVISION=	6
6
CATEGORIES=	www python
5
CATEGORIES=	www python
7
MASTER_SITES=	LOCAL/wg
6
MASTER_SITES=	LOCAL/wg
8
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
7
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
Lines 15-62 Link Here
15
14
16
FETCH_DEPENDS=	svn:devel/subversion
15
FETCH_DEPENDS=	svn:devel/subversion
17
BUILD_DEPENDS=	${FETCH_DEPENDS}
16
BUILD_DEPENDS=	${FETCH_DEPENDS}
18
RUN_DEPENDS=	bash:shells/bash \
17
RUN_DEPENDS=	memcached:databases/memcached \
19
		memcached:databases/memcached \
18
		${PYTHON_PKGNAMEPREFIX}calendar>=0.15423:devel/py-calendar \
20
		${PYTHON_PKGNAMEPREFIX}pycrypto>=2.5:security/py-pycrypto \
21
		${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil \
22
		${PYTHON_PKGNAMEPREFIX}openssl>=0.13:security/py-openssl \
23
		${PYTHON_PKGNAMEPREFIX}psutil121>=1.2:sysutils/py-psutil121 \
24
		${PYTHON_PKGNAMEPREFIX}PyGreSQL>=4.1:databases/py-PyGreSQL \
19
		${PYTHON_PKGNAMEPREFIX}PyGreSQL>=4.1:databases/py-PyGreSQL \
20
		${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6.1:security/py-pycrypto \
21
		${PYTHON_PKGNAMEPREFIX}dateutil>=2.4.2:devel/py-dateutil \
22
		${PYTHON_PKGNAMEPREFIX}openssl>=0.14:security/py-openssl \
23
		${PYTHON_PKGNAMEPREFIX}pg8000>=1.10.2:databases/py-pg8000 \
24
		${PYTHON_PKGNAMEPREFIX}psutil>=3.4.2:sysutils/py-psutil \
25
		${PYTHON_PKGNAMEPREFIX}pytz>=2016.1:devel/py-pytz \
25
		${PYTHON_PKGNAMEPREFIX}service_identity>=14.0.0:security/py-service_identity \
26
		${PYTHON_PKGNAMEPREFIX}service_identity>=14.0.0:security/py-service_identity \
27
		${PYTHON_PKGNAMEPREFIX}setproctitle>=1.1.9:devel/py-setproctitle \
26
		${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7:databases/py-sqlite3 \
28
		${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7:databases/py-sqlite3 \
27
		${PYTHON_PKGNAMEPREFIX}sqlparse>=0.1:databases/py-sqlparse \
29
		${PYTHON_PKGNAMEPREFIX}sqlparse>=0.1:databases/py-sqlparse \
28
		${PYTHON_PKGNAMEPREFIX}xattr>=0.6:devel/py-xattr \
30
		${PYTHON_PKGNAMEPREFIX}twext>=0.15423:devel/py-twext \
29
		${PYTHON_PKGNAMEPREFIX}zope.interface>=3.8:devel/py-zope.interface
31
		${PYTHON_PKGNAMEPREFIX}twisted>=15.4.0:devel/py-twisted \
32
		${PYTHON_PKGNAMEPREFIX}xattr>=0.7.5:devel/py-xattr \
33
		${PYTHON_PKGNAMEPREFIX}zope.interface>=4.1.3:devel/py-zope.interface
30
34
31
OPTIONS_DEFINE=	EXAMPLES DOCS
35
USES=	pgsql:9.1+ python:2.7
32
EXAMPLES_DESC=	Install configuration examples
33
DOCS_DESC=	Install additional documentation
34
35
.include <bsd.port.options.mk>
36
37
USES=		shebangfix pgsql python \
38
		twisted:run,conch,mail,names,runner,web,words
39
USE_PYTHON=	autoplist distutils
36
USE_PYTHON=	autoplist distutils
40
37
41
SUB_FILES=	pkg-message
38
SUB_FILES=	pkg-message
42
SUB_LIST+=	USER=${USERS}
39
SUB_LIST+=	USER=${USERS}
43
40
44
45
SHEBANG_FILES=	bin/calendarserver_* \
46
		bin/icalendar_split \
47
		bin/proxyclean \
48
		calendarserver/tools/backup_pg.py \
49
		calendarserver/tools/backup.py \
50
		twext/python/test/pullpipe.py
51
52
USE_RC_SUBR=	caldavd
41
USE_RC_SUBR=	caldavd
53
SUB_LIST+=	PYTHON_CMD=${PYTHON_CMD}
42
SUB_LIST+=	PYTHON_CMD=${PYTHON_CMD}
54
43
55
SVN_REPOSITORY_URL=	http://svn.calendarserver.org/repository/calendarserver
44
SVN_REPOSITORY_URL=	http://svn.calendarserver.org/repository/calendarserver
56
SVN_TAG1=	CalendarServer/tags/release/${DISTNAME}
45
SVN_TAG1=	CalendarServer/tags/release/${DISTNAME}
57
SVN_CMD1=	svn export -r13980
46
SVN_CMD1=	svn export
58
SVN_TAG2=	PyCalendar/trunk
59
SVN_CMD2=	svn export -r11458
60
47
61
LOGDIR=		/var/log/caldavd
48
LOGDIR=		/var/log/caldavd
62
SHAREDIR=	${PREFIX}/share/caldavd
49
SHAREDIR=	${PREFIX}/share/caldavd
Lines 72-80 Link Here
72
		${MKDIR} ${WRKDIR} ; cd ${WRKDIR} ; ${RM} -Rf ${WRKDIR}/${DISTNAME} ; \
59
		${MKDIR} ${WRKDIR} ; cd ${WRKDIR} ; ${RM} -Rf ${WRKDIR}/${DISTNAME} ; \
73
		${ECHO_MSG} "=> Checking out CalendarServer from svn.calendarserver.org/..."; \
60
		${ECHO_MSG} "=> Checking out CalendarServer from svn.calendarserver.org/..."; \
74
		${SVN_CMD1} ${SVN_REPOSITORY_URL}/${SVN_TAG1} > /dev/null ; \
61
		${SVN_CMD1} ${SVN_REPOSITORY_URL}/${SVN_TAG1} > /dev/null ; \
75
		${ECHO_MSG} "=> Checking out PyCalendar from svn.calendarserver.org/..."; \
76
		cd ${WRKDIR}/${DISTNAME} ; ${SVN_CMD2} ${SVN_REPOSITORY_URL}/${SVN_TAG2} > /dev/null ; \
77
		${MV} trunk/src/* . ; \
78
		${ECHO_MSG} "=> Creating tar archive ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}"; \
62
		${ECHO_MSG} "=> Creating tar archive ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}"; \
79
		cd ${WRKDIR} ; tar -czf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ${DISTNAME} ; \
63
		cd ${WRKDIR} ; tar -czf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ${DISTNAME} ; \
80
		${RM} -Rf ${WRKDIR}/${DISTNAME} ; \
64
		${RM} -Rf ${WRKDIR}/${DISTNAME} ; \
Lines 83-98 Link Here
83
	fi
67
	fi
84
68
85
post-patch:
69
post-patch:
86
	@${REINPLACE_CMD} -e 's|"{number} ({info})".format(number=version_number, info=version_info)|"5.1"|' ${WRKSRC}/setup.py
70
	@${REINPLACE_CMD} -e 's|"{}.a1+unknown".format(base_version)|"8.0"|' ${WRKSRC}/setup.py
87
	@${REINPLACE_CMD} -e 's|distutils.core|setuptools|g' ${WRKSRC}/setup.py
88
	@${REINPLACE_CMD} -e 's|/usr/bin|${LOCALBASE}/bin|g' ${WRKSRC}/calendarserver/tools/bootstrapdatabase.py
89
	@${REINPLACE_CMD} -e 's|"/etc/caldavd/caldavd.plist"|"${ETCDIR}/caldavd.plist"|g' ${WRKSRC}/twistedcaldav/stdconfig.py
71
	@${REINPLACE_CMD} -e 's|"/etc/caldavd/caldavd.plist"|"${ETCDIR}/caldavd.plist"|g' ${WRKSRC}/twistedcaldav/stdconfig.py
90
	@${REINPLACE_CMD} -e 's|/usr/share/caldavd/lib/python/txdav/common/datastore|${SHAREDIR}|' ${WRKSRC}/calendarserver/tools/bootstrapdatabase.py
91
	@${REINPLACE_CMD} -e 's|"_postgres"|"pgsql"|' ${WRKSRC}/calendarserver/tools/bootstrapdatabase.py
92
72
93
post-install:
73
post-install:
94
	@${MKDIR} ${STAGEDIR}${ETCDIR}/auth
74
	@${MKDIR} ${STAGEDIR}${ETCDIR}/auth
95
	(cd ${WRKSRC}/bin && ${COPYTREE_BIN} . ${STAGEDIR}${PREFIX}/bin)
96
	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
75
	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
97
	(cd ${WRKSRC}/conf && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
76
	(cd ${WRKSRC}/conf && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
98
	(cd ${WRKSRC}/doc && \
77
	(cd ${WRKSRC}/doc && \
(-)new/calendarserver/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (CalendarServer-5.1.tar.gz) = 9b74ff56c930707f2c987e89fa0a4fa178601c7f8aca7be6f551db05d196455d
1
SHA256 (CalendarServer-8.0.tar.gz) = 284e4f52cd83f2db3c9d8ce789e617399bf186a3933f5b4f2f4cc937fca3d5a5
2
SIZE (CalendarServer-5.1.tar.gz) = 4105027
2
SIZE (CalendarServer-8.0.tar.gz) = 4571878
(-)new/calendarserver/files/patch-twext__python__log.py (-50 lines)
Lines 1-50 Link Here
1
--- twext/python/log.py.orig	2013-09-17 23:08:55 UTC
2
+++ twext/python/log.py
3
@@ -932,24 +932,29 @@
4
         # Don't patch this module
5
         if moduleName is __name__:
6
             continue
7
-
8
-        for name, obj in module.__dict__.iteritems():
9
-            newLogger = Logger(namespace=module.__name__)
10
-            legacyLogger = LegacyLogger(logger=newLogger)
11
-
12
-            if obj is twisted.python.log:
13
-                log.info("Replacing Twisted log module object {0} in {1}"
14
-                         .format(name, module.__name__))
15
-                setattr(module, name, legacyLogger)
16
-            elif obj is twisted.python.log.msg:
17
-                log.info("Replacing Twisted log.msg object {0} in {1}"
18
-                         .format(name, module.__name__))
19
-                setattr(module, name, legacyLogger.msg)
20
-            elif obj is twisted.python.log.err:
21
-                log.info("Replacing Twisted log.err object {0} in {1}"
22
-                         .format(name, module.__name__))
23
-                setattr(module, name, legacyLogger.err)
24
-
25
+    
26
+        try:
27
+            for name, obj in module.__dict__.iteritems():
28
+                newLogger = Logger(namespace=module.__name__)
29
+                legacyLogger = LegacyLogger(logger=newLogger)
30
+    
31
+                if obj is twisted.python.log:
32
+                    log.info("Replacing Twisted log module object {0} in {1}"
33
+                             .format(name, module.__name__))
34
+                    setattr(module, name, legacyLogger)
35
+                elif obj is twisted.python.log.msg:
36
+                    log.info("Replacing Twisted log.msg object {0} in {1}"
37
+                             .format(name, module.__name__))
38
+                    setattr(module, name, legacyLogger.msg)
39
+                elif obj is twisted.python.log.err:
40
+                    log.info("Replacing Twisted log.err object {0} in {1}"
41
+                             .format(name, module.__name__))
42
+                    setattr(module, name, legacyLogger.err)
43
+        except (AttributeError, RuntimeError,):
44
+            # Can't look up __name__.  A hack in the "six" module causes
45
+            # this.  Skip the module.
46
+            # See https://trac.calendarserver.org/ticket/832
47
+            continue
48
 
49
 
50
 ######################################################################
(-)new/calendarserver/files/patch-twistedcaldav_____init____.py (+13 lines)
Line 0 Link Here
1
--- twistedcaldav/__init__.py.orig	2016-01-07 15:18:44 UTC
2
+++ twistedcaldav/__init__.py
3
@@ -33,6 +33,10 @@ File.contentTypes = loadMimeTypes(("/etc
4
 # Register additional WebDAV XML elements
5
 #
6
 
7
+# Make sure the default config is loaded and updated early on to avoid race conditions during startup. (upstream: r15635)
8
+from twistedcaldav.config import config 
9
+config.update()
10
+
11
 import twistedcaldav.caldavxml
12
 import twistedcaldav.carddavxml
13
 import twistedcaldav.mkcolxml
(-)new/calendarserver/files/patch-twistedcaldav_stdconfig.py (+20 lines)
Line 0 Link Here
1
--- twistedcaldav/stdconfig.py.orig	2016-03-01 19:59:08 UTC
2
+++ twistedcaldav/stdconfig.py
3
@@ -53,7 +53,7 @@ log = Logger()
4
 if platform.isMacOSX():
5
     DEFAULT_CONFIG_FILE = "/Applications/Server.app/Contents/ServerRoot/private/etc/caldavd/caldavd-apple.plist"
6
 else:
7
-    DEFAULT_CONFIG_FILE = "/etc/caldavd/caldavd.plist"
8
+    DEFAULT_CONFIG_FILE = "/usr/local/etc/caldavd/caldavd.plist"
9
 
10
 DEFAULT_SERVICE_PARAMS = {
11
     "xml": {
12
@@ -1827,6 +1827,8 @@ config.setProvider(PListConfigProvider(D
13
 config.addPreUpdateHooks(PRE_UPDATE_HOOKS)
14
 config.addPostUpdateHooks(POST_UPDATE_HOOKS)
15
 
16
+# Make sure the default config is loaded and updated early on to avoid race conditions during startup. (upstream: r15635)
17
+config.update() 
18
 
19
 def _preserveConfig(configDict):
20
     """
(-)new/calendarserver/files/patch-txdav__base__propertystore__xattr.py (-20 lines)
Lines 1-20 Link Here
1
--- txdav/base/propertystore/xattr.py.orig	2013-05-30 01:18:39 UTC
2
+++ txdav/base/propertystore/xattr.py
3
@@ -47,10 +47,14 @@
4
 # expose.  Its value is 93.
5
 #
6
 
7
-if sys.platform in ("darwin", "freebsd8", "freebsd9"):
8
-    _ERRNO_NO_ATTR = getattr(errno, "ENOATTR", 93)
9
-else:
10
+_ERRNO_NO_ATTR = 0
11
+try:
12
     _ERRNO_NO_ATTR = errno.ENODATA
13
+except AttributeError:
14
+    if sys.platform[:6] == 'darwin' or sys.platform[:7] == 'freebsd':
15
+        _ERRNO_NO_ATTR = getattr(errno, "ENOATTR", 93)
16
+    else:
17
+        raise
18
 
19
 
20
 
(-)new/calendarserver/files/patch-txdav__common__datastore__sql_schema__current.sql (-11 lines)
Lines 1-11 Link Here
1
--- txdav/common/datastore/sql_schema/current.sql.orig	2015-10-26 13:54:07.000000000 +0000
2
+++ txdav/common/datastore/sql_schema/current.sql	2015-10-26 12:59:45.000000000 +0000
3
@@ -62,7 +62,7 @@
4
 --------------
5
 
6
 create table CALENDAR (
7
-  RESOURCE_ID integer   primary key default nextval('RESOURCE_ID_SEQ') -- implicit index
8
+  RESOURCE_ID integer   primary key default nextval('RESOURCE_ID_SEQ')
9
 );
10
 
11
 ----------------------------
(-)new/calendarserver/files/patch-txdav_base_datastore_dbapiclient.py (+14 lines)
Line 0 Link Here
1
--- txdav/base/datastore/dbapiclient.py.orig	2016-03-01 19:40:29 UTC
2
+++ txdav/base/datastore/dbapiclient.py
3
@@ -427,7 +427,10 @@ def pg8000Preflight(connection, **kwargs
4
         return v.encode("utf-8") if isinstance(v, unicode) else str(v)
5
 
6
     connection.realConnection.py_types[str] = (705, postgres.core.FC_TEXT, my_text_out)
7
-    connection.realConnection.py_types[postgres.six.text_type] = (705, postgres.core.FC_TEXT, my_text_out)
8
+
9
+    # http://trac.calendarserver.org/ticket/940
10
+    from six import text_type
11
+    connection.realConnection.py_types[text_type] = (705, postgres.core.FC_TEXT, my_text_out)
12
 
13
     def my_text_recv(data, offset, length):
14
         return str(data[offset: offset + length])
(-)new/calendarserver/files/patch-txdav_base_propertystore_xattr.py (+20 lines)
Line 0 Link Here
1
--- txdav/base/propertystore/xattr.py.orig	2016-01-07 15:18:44 UTC
2
+++ txdav/base/propertystore/xattr.py
3
@@ -47,10 +47,14 @@ from txdav.idav import PropertyStoreErro
4
 # expose.  Its value is 93.
5
 #
6
 
7
-if sys.platform in ("darwin", "freebsd8", "freebsd9"):
8
-    _ERRNO_NO_ATTR = getattr(errno, "ENOATTR", 93)
9
-else:
10
+_ERRNO_NO_ATTR = 0
11
+try:
12
     _ERRNO_NO_ATTR = errno.ENODATA
13
+except AttributeError:
14
+    if sys.platform[:6] == 'darwin' or sys.platform[:7] == 'freebsd':
15
+        _ERRNO_NO_ATTR = getattr(errno, "ENOATTR", 93)
16
+    else:
17
+        raise
18
 
19
 
20
 
(-)new/calendarserver/files/patch-txdav_common_datastore_sql__schema_current.sql (+11 lines)
Line 0 Link Here
1
--- txdav/common/datastore/sql_schema/current.sql.orig	2016-01-07 15:18:44 UTC
2
+++ txdav/common/datastore/sql_schema/current.sql
3
@@ -90,7 +90,7 @@ insert into HOME_STATUS values (4, 'disa
4
 --------------
5
 
6
 create table CALENDAR (
7
-  RESOURCE_ID integer   primary key default nextval('RESOURCE_ID_SEQ') -- implicit index
8
+  RESOURCE_ID integer   primary key default nextval('RESOURCE_ID_SEQ')
9
 );
10
 
11
 
(-)new/calendarserver/files/pkg-message.in (-2 / +54 lines)
Lines 3-9 Link Here
3
3
4
For general information about the server, see:
4
For general information about the server, see:
5
	http://www.calendarserver.org/
5
	http://www.calendarserver.org/
6
plus online DOCs, including RFCs (if installed).
6
plus online DOCs, including RFCs in
7
	%%PREFIX%%/share/doc/calendarserver .
7
8
8
Getting Started
9
Getting Started
9
---------------
10
---------------
Lines 35-40 Link Here
35
36
36
- OpenDirectoryService: this service uses Apple's OpenDirectory client (which in
37
- OpenDirectoryService: this service uses Apple's OpenDirectory client (which in
37
turn uses LDAP, Active Directory, etc.) to obtain principal information.
38
turn uses LDAP, Active Directory, etc.) to obtain principal information.
39
38
The above configuration uses XMLDirectoryService by default.
40
The above configuration uses XMLDirectoryService by default.
39
This is a generally useful configuration for development and testing.
41
This is a generally useful configuration for development and testing.
40
42
Lines 42-47 Link Here
42
which is set up (in caldavd-test.plist) to have administrative permissions
44
which is set up (in caldavd-test.plist) to have administrative permissions
43
on the server.
45
on the server.
44
46
47
The value of 'user name' in the client configuration is the value of the
48
attribute <short-name>. Often an e-mail address is usefull here.
49
In this case there is no need to define a server path on the client.
50
45
Updates from earlier versions may require a DB schema update, which is done
51
Updates from earlier versions may require a DB schema update, which is done
46
automatically on server start up, if <key>FailIfUpgradeNeeded</key> is set to
52
automatically on server start up, if <key>FailIfUpgradeNeeded</key> is set to
47
<true/>.
53
<false/>.
54
55
56
Upgrading
57
---------
58
59
Upgrading from the previous version of this port (5.1) requires adjustments
60
to the configuration:
61
62
1.	Stop the server, install the new version.
63
64
2.	accounts.xml has a new layout - see
65
		%%PREFIX%%/share/examples/calendarserver/auth/accounts.xml
66
		
67
	In that file <guid> is optional. If present, it must be a valid UUID like
68
		FCB7BFFB-624D-4201-BA65-E133E439A661
69
	If you have invalid UUID values in your guid attributes, the fastes way to
70
	upgrade would be to delete them.
71
	Any change on <guid> requires adjustment of the client configuration, as
72
	the old server path
73
		principals/__uids__/something
74
	changes.
75
	
76
	Creating new uuids can be done with python so:
77
		
78
			# python
79
			Python 2.7.11 (default, Jun	 5 2016, 06:09:57) 
80
			[GCC 4.2.1 Compatible FreeBSD Clang 3.4.1 . . .
81
			>>> import uuid
82
			>>> str(uuid.uuid4()).upper()
83
			'22F5BC05-8EDE-421E-99DD-CEDE1B814635'
84
			>>> str(uuid.uuid4()).upper()
85
			'A7211FE0-1D8F-474B-A5AB-262668EECE6C'
86
		
87
3.	Fix caldavd.plist
88
89
	Adjust AdminPrincipals if you changed the admin uid above.
90
	DatabaseConnection has a new format.
91
	
92
	For these and all other changes review your plist, using
93
		%%PREFIX%%/share/examples/calendarserver/caldavd.plist
94
	 
95
5.	Start the server and follow server log. You should see messages about 
96
	schema and data migration like
97
	   Starting schema upgrade from version 24 to 60.
98
	   Schema upgraded from version 24 to 60.
99
	 These schould complete without errors.
(-)new/calendarserver/pkg-plist (-25 / +36 lines)
Lines 1-21 Link Here
1
bin/_calendarserver_preamble.py
2
bin/calendarserver_dbinspect
3
bin/calendarserver_dkimtool
4
bin/calendarserver_icalendar_validate
5
bin/calendarserver_load_augmentdb
6
bin/calendarserver_make_partition
7
bin/calendarserver_manage_postgres
8
bin/calendarserver_monitor_amp_notifications
9
bin/calendarserver_monitor_notifications
10
bin/calendarserver_monitor_work
11
bin/calendarserver_verify_data
12
bin/icalendar_split
13
bin/make-ssl-ca
14
bin/make-ssl-key
15
bin/proxyclean
16
bin/watch_memcached
17
man/man8/caldavd.8.gz
1
man/man8/caldavd.8.gz
18
man/man8/calendarserver_bootstrap_database.8.gz
19
man/man8/calendarserver_command_gateway.8.gz
2
man/man8/calendarserver_command_gateway.8.gz
20
man/man8/calendarserver_config.8.gz
3
man/man8/calendarserver_config.8.gz
21
man/man8/calendarserver_export.8.gz
4
man/man8/calendarserver_export.8.gz
Lines 33-38 Link Here
33
%%PORTDOCS%%%%DOCSDIR%%/Admin/DirectoryService-XML.rst
16
%%PORTDOCS%%%%DOCSDIR%%/Admin/DirectoryService-XML.rst
34
%%PORTDOCS%%%%DOCSDIR%%/Admin/DirectoryServices.rst
17
%%PORTDOCS%%%%DOCSDIR%%/Admin/DirectoryServices.rst
35
%%PORTDOCS%%%%DOCSDIR%%/Admin/ExtendedLogItems.rst
18
%%PORTDOCS%%%%DOCSDIR%%/Admin/ExtendedLogItems.rst
19
%%PORTDOCS%%%%DOCSDIR%%/Admin/Guide.rst
36
%%PORTDOCS%%%%DOCSDIR%%/Admin/LoadSimulation.rst
20
%%PORTDOCS%%%%DOCSDIR%%/Admin/LoadSimulation.rst
37
%%PORTDOCS%%%%DOCSDIR%%/Admin/MultiServerDeployment.rst
21
%%PORTDOCS%%%%DOCSDIR%%/Admin/MultiServerDeployment.rst
38
%%PORTDOCS%%%%DOCSDIR%%/Admin/iSchedule.txt
22
%%PORTDOCS%%%%DOCSDIR%%/Admin/iSchedule.txt
Lines 41-46 Link Here
41
%%PORTDOCS%%%%DOCSDIR%%/Client-Server/calendar-client.rst
25
%%PORTDOCS%%%%DOCSDIR%%/Client-Server/calendar-client.rst
42
%%PORTDOCS%%%%DOCSDIR%%/Developer/Calendar Store API.graffle
26
%%PORTDOCS%%%%DOCSDIR%%/Developer/Calendar Store API.graffle
43
%%PORTDOCS%%%%DOCSDIR%%/Developer/Calendar Store Schema.graffle
27
%%PORTDOCS%%%%DOCSDIR%%/Developer/Calendar Store Schema.graffle
28
%%PORTDOCS%%%%DOCSDIR%%/Developer/CrossPodDesign.txt
44
%%PORTDOCS%%%%DOCSDIR%%/Extensions/caldav-ctag.txt
29
%%PORTDOCS%%%%DOCSDIR%%/Extensions/caldav-ctag.txt
45
%%PORTDOCS%%%%DOCSDIR%%/Extensions/caldav-ctag.xml
30
%%PORTDOCS%%%%DOCSDIR%%/Extensions/caldav-ctag.xml
46
%%PORTDOCS%%%%DOCSDIR%%/Extensions/caldav-notifications.txt
31
%%PORTDOCS%%%%DOCSDIR%%/Extensions/caldav-notifications.txt
Lines 53-58 Link Here
53
%%PORTDOCS%%%%DOCSDIR%%/Extensions/caldav-proxy.xml
38
%%PORTDOCS%%%%DOCSDIR%%/Extensions/caldav-proxy.xml
54
%%PORTDOCS%%%%DOCSDIR%%/Extensions/caldav-pubsubdiscovery.txt
39
%%PORTDOCS%%%%DOCSDIR%%/Extensions/caldav-pubsubdiscovery.txt
55
%%PORTDOCS%%%%DOCSDIR%%/Extensions/caldav-pubsubdiscovery.xml
40
%%PORTDOCS%%%%DOCSDIR%%/Extensions/caldav-pubsubdiscovery.xml
41
%%PORTDOCS%%%%DOCSDIR%%/Extensions/caldav-recursplit.txt
42
%%PORTDOCS%%%%DOCSDIR%%/Extensions/caldav-recursplit.xml
56
%%PORTDOCS%%%%DOCSDIR%%/Extensions/caldav-schedulingchanges.txt
43
%%PORTDOCS%%%%DOCSDIR%%/Extensions/caldav-schedulingchanges.txt
57
%%PORTDOCS%%%%DOCSDIR%%/Extensions/caldav-schedulingchanges.xml
44
%%PORTDOCS%%%%DOCSDIR%%/Extensions/caldav-schedulingchanges.xml
58
%%PORTDOCS%%%%DOCSDIR%%/Extensions/caldav-sharing.txt
45
%%PORTDOCS%%%%DOCSDIR%%/Extensions/caldav-sharing.txt
Lines 61-68 Link Here
61
%%PORTDOCS%%%%DOCSDIR%%/Extensions/calendarserver-bulk-change.xml
48
%%PORTDOCS%%%%DOCSDIR%%/Extensions/calendarserver-bulk-change.xml
62
%%PORTDOCS%%%%DOCSDIR%%/Extensions/icalendar-maskuids.txt
49
%%PORTDOCS%%%%DOCSDIR%%/Extensions/icalendar-maskuids.txt
63
%%PORTDOCS%%%%DOCSDIR%%/Extensions/icalendar-maskuids.xml
50
%%PORTDOCS%%%%DOCSDIR%%/Extensions/icalendar-maskuids.xml
64
%%PORTDOCS%%%%DOCSDIR%%/RFC/RFC6764-srv-CalDAV.txt
51
%%PORTDOCS%%%%DOCSDIR%%/Notes/attendee-import.txt
65
%%PORTDOCS%%%%DOCSDIR%%/RFC/RFC6868-Parameter Value Encoding.txt
52
%%PORTDOCS%%%%DOCSDIR%%/Notes/index.txt
53
%%PORTDOCS%%%%DOCSDIR%%/Notes/x-items.txt
66
%%PORTDOCS%%%%DOCSDIR%%/RFC/draft-daboo-caldav-extensions.txt
54
%%PORTDOCS%%%%DOCSDIR%%/RFC/draft-daboo-caldav-extensions.txt
67
%%PORTDOCS%%%%DOCSDIR%%/RFC/draft-daboo-calendar-availability.txt
55
%%PORTDOCS%%%%DOCSDIR%%/RFC/draft-daboo-calendar-availability.txt
68
%%PORTDOCS%%%%DOCSDIR%%/RFC/draft-daboo-carddav-directory-gateway.txt
56
%%PORTDOCS%%%%DOCSDIR%%/RFC/draft-daboo-carddav-directory-gateway.txt
Lines 90-122 Link Here
90
%%PORTDOCS%%%%DOCSDIR%%/RFC/rfc6352-CardDAV.txt
78
%%PORTDOCS%%%%DOCSDIR%%/RFC/rfc6352-CardDAV.txt
91
%%PORTDOCS%%%%DOCSDIR%%/RFC/rfc6578-WebDAV Sync.txt
79
%%PORTDOCS%%%%DOCSDIR%%/RFC/rfc6578-WebDAV Sync.txt
92
%%PORTDOCS%%%%DOCSDIR%%/RFC/rfc6638-CalDAV-Scheduling.txt
80
%%PORTDOCS%%%%DOCSDIR%%/RFC/rfc6638-CalDAV-Scheduling.txt
81
%%PORTDOCS%%%%DOCSDIR%%/RFC/RFC6764-srv-CalDAV.txt
82
%%PORTDOCS%%%%DOCSDIR%%/RFC/RFC6868-Parameter Value Encoding.txt
83
%%PORTDOCS%%%%DOCSDIR%%/RFC/RFC7095-jCard.txt
84
%%PORTDOCS%%%%DOCSDIR%%/RFC/RFC7265-jcal.txt
85
%%PORTDOCS%%%%DOCSDIR%%/RFC/RFC7529-RSCALE.txt
93
%%PORTDOCS%%%%DOCSDIR%%/current.sql
86
%%PORTDOCS%%%%DOCSDIR%%/current.sql
87
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/accounts-test-pod.xml
88
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/accounts-test-s2s.xml
94
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/accounts-test.xml
89
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/accounts-test.xml
95
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/accounts.dtd
90
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/accounts.dtd
96
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/accounts.xml
91
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/accounts.xml
97
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/augments-default.xml
92
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/augments-default.xml
98
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/augments-test.xml
93
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/augments-test.xml
94
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/augments-test-pod.xml
95
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/augments-test-s2s.xml
99
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/augments.dtd
96
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/augments.dtd
100
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/proxies-test.xml
97
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/generate_test_accounts.py
101
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/proxies.dtd
98
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/proxies.dtd
99
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/proxies-test-pod.xml
100
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/proxies-test-s2s.xml
101
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/proxies-test.xml
102
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/resources-test-pod.xml
103
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/resources-test-s2s.xml
102
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/resources-test.xml
104
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth/resources-test.xml
103
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/caldavd-apple.plist
105
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/caldavd-apple.plist
104
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/caldavd-partitioning-primary.plist
106
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/caldavd-stdconfig.plist
105
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/caldavd-partitioning-secondary.plist
106
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/caldavd-test.plist
107
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/caldavd-test.plist
108
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/caldavd-test-podA.plist
109
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/caldavd-test-podB.plist
110
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/caldavd-test-s2s.plist
107
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/caldavd.plist
111
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/caldavd.plist
112
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dkim-test-s2s/other_keys/example.com#ischedule
113
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dkim-test-s2s/priv.pem
114
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dkim-test-s2s/pub.pem
115
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dkim-test/other_keys/example.org#ischedule2
116
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dkim-test/priv.pem
117
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dkim-test/pub.pem
108
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/localservers-test.xml
118
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/localservers-test.xml
119
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/localservers.dtd
109
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/localservers.xml
120
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/localservers.xml
110
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mime.types
121
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mime.types
111
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/remoteservers-test.xml
122
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/remoteservers-test.xml
123
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/remoteservers-test-s2s.xml
124
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/remoteservers.dtd
112
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/remoteservers.xml
125
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/remoteservers.xml
113
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/resources.xml
126
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/resources.xml
114
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/resources/caldavd-resources.plist
127
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/resources/caldavd-resources.plist
115
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/resources/locations-resources-orig.xml
128
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/resources/locations-resources-orig.xml
116
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/resources/locations-resources.xml
129
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/resources/locations-resources.xml
117
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/resources/users-groups.xml
130
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/resources/users-groups.xml
118
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/servers.dtd
119
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/servertoserver.dtd
120
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sudoers.plist
121
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/accounts.xml
131
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/accounts.xml
132
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test-db.zones
122
@dir etc/caldavd/auth
133
@dir etc/caldavd/auth

Return to bug 210264