Attachment #188726 for bug #221929




# $FreeBSD$

PORTNAME=	calendarserver
PORTVERSION=	9.1
DISTVERSIONPREFIX=	CalendarServer-
CATEGORIES=	    www python
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

		${PYTHON_PKGNAMEPREFIX}PyGreSQL>=5.0:databases/py-PyGreSQL@${FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6.1:security/py-pycrypto@${FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}dateutil>=2.5.3:devel/py-dateutil@${FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}kerberos>=1.2.5:security/py-kerberos@${FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}openssl>=16.0.0:security/py-openssl@${FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}pg8000>=1.10.6:databases/py-pg8000@${FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}psutil>=4.3.0:sysutils/py-psutil@${FLAVOR} \

		${PYTHON_PKGNAMEPREFIX}service_identity>=16.0.0:security/py-service_identity@${FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}setproctitle>=1.1.10:devel/py-setproctitle@${FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7:databases/py-sqlite3@${FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}twext>=0.20170227:devel/py-twext@${FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}twisted>=16.6.0:devel/py-twisted@${FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}xattr>=0.7.8:devel/py-xattr@${FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}zope.interface>=4.1.3:devel/py-zope.interface@${FLAVOR}


GROUPS=			${CALDAVD_USER}

post-patch:
	@${REINPLACE_CMD} -e 's|"{}a1+unknown".format(base_version)|"9.1"|' ${WRKSRC}/setup.py
	@${REINPLACE_CMD} -e 's|"/etc/caldavd/caldavd.plist"|"${ETCDIR}/caldavd.plist"|g' ${WRKSRC}/twistedcaldav/stdconfig.py
	@${REINPLACE_CMD} -e 's|/etc/caldavd|${ETCDIR}|g' ${WRKSRC}/conf/caldavd.plist
	@${REINPLACE_CMD} -e 's|daemon|caldavd|g' ${WRKSRC}/conf/caldavd.plist

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1496753993	1	TIMESTAMP = 1509793500
2	SHA256 (apple-ccs-calendarserver-CalendarServer-9.0_GH0.tar.gz) = 557f0497d9b112040ebb3d40556ae2e1a6d6391069a928926ac3c0abea45d836	2	SHA256 (apple-ccs-calendarserver-CalendarServer-9.1_GH0.tar.gz) = 4ca524f27a750628af46fb246002baba108748cd331bd378c2429db793821366
3	SIZE (apple-ccs-calendarserver-CalendarServer-9.0_GH0.tar.gz) = 4836315	3	SIZE (apple-ccs-calendarserver-CalendarServer-9.1_GH0.tar.gz) = 3688342




--- calendarserver/tools/dkimtool.py.orig	2017-08-28 15:45:35.281722000 -0400
+++ calendarserver/tools/dkimtool.py	2017-08-28 15:47:12.632627000 -0400
@@ -36,7 +36,7 @@
 
 def _doKeyGeneration(options):
 
-    key = RSA.generate(options["key-size"])
+    key = RSA.generate(int(options["key-size"]))
     output = key.exportKey()
     lineBreak = False
     if options["key"]:
@@ -289,12 +289,6 @@
     options = DKIMToolOptions()
     options.parseOptions(argv[1:])
 
-    #
-    # Send logging output to stdout
-    #
-    observer = STDLibLogObserver()
-    observer.start()
-
     if options["verbose"]:
         log.levels().setLogLevelForNamespace("txdav.caldav.datastore.scheduling.ischedule.dkim", LogLevel.debug)
 

Lines 1-6 Link Here

(-)files/patch-setup.py (-3 / +12 lines)
1	--- setup.py.orig 2016-08-23 16:28:28 UTC	1	--- setup.py.orig 2017-08-27 16:10:56.170135000 -0400
2	+++ setup.py	2	+++ setup.py 2017-08-27 16:11:54.314120000 -0400
3	@@ -419,9 +419,6 @@ def doSetup():	3	@@ -306,7 +306,7 @@
		4	install_requirements = [
		5	# Core frameworks
		6	"zope.interface",
		7	- "Twisted==16.6.0",
		8	+ "Twisted>=16.6.0",
		9	"twextpy",
		10
		11	# Security frameworks
		12	@@ -416,9 +416,6 @@
4	scripts=[	13	scripts=[
5	"bin/caldavd",	14	"bin/caldavd",
6	],	15	],




--- txdav/base/datastore/dbapiclient.py.orig	2016-12-15 11:56:26 UTC
+++ txdav/base/datastore/dbapiclient.py
@@ -24,6 +24,7 @@ from twext.python.filepath import Cachin
 from txdav.common.icommondatastore import InternalDataStoreError
 
 import pg8000 as postgres
+import six
 
 try:
     import os
@@ -430,7 +431,7 @@ def pg8000Preflight(connection, **kwargs
         return v.encode("utf-8") if isinstance(v, unicode) else str(v)
 
     connection.realConnection.py_types[str] = (705, postgres.core.FC_TEXT, my_text_out)
-    connection.realConnection.py_types[postgres.six.text_type] = (705, postgres.core.FC_TEXT, my_text_out)
+    connection.realConnection.py_types[six.text_type] = (705, postgres.core.FC_TEXT, my_text_out)
 
     def my_text_recv(data, offset, length):
         return str(data[offset: offset + length])

Return to bug 221929

Lines 1-7 Link Here

(-)Makefile (-4 / +5 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= calendarserver	3	PORTNAME= calendarserver
4	PORTVERSION= 9.0	4	PORTVERSION= 9.1
5	DISTVERSIONPREFIX= CalendarServer-	5	DISTVERSIONPREFIX= CalendarServer-
6	CATEGORIES= www python	6	CATEGORIES= www python
7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Lines 16-21 Link Here
16	${PYTHON_PKGNAMEPREFIX}PyGreSQL>=5.0:databases/py-PyGreSQL@${FLAVOR} \	16	${PYTHON_PKGNAMEPREFIX}PyGreSQL>=5.0:databases/py-PyGreSQL@${FLAVOR} \
17	${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6.1:security/py-pycrypto@${FLAVOR} \	17	${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6.1:security/py-pycrypto@${FLAVOR} \
18	${PYTHON_PKGNAMEPREFIX}dateutil>=2.5.3:devel/py-dateutil@${FLAVOR} \	18	${PYTHON_PKGNAMEPREFIX}dateutil>=2.5.3:devel/py-dateutil@${FLAVOR} \
		19	${PYTHON_PKGNAMEPREFIX}kerberos>=1.2.5:security/py-kerberos@${FLAVOR} \
19	${PYTHON_PKGNAMEPREFIX}openssl>=16.0.0:security/py-openssl@${FLAVOR} \	20	${PYTHON_PKGNAMEPREFIX}openssl>=16.0.0:security/py-openssl@${FLAVOR} \
20	${PYTHON_PKGNAMEPREFIX}pg8000>=1.10.6:databases/py-pg8000@${FLAVOR} \	21	${PYTHON_PKGNAMEPREFIX}pg8000>=1.10.6:databases/py-pg8000@${FLAVOR} \
21	${PYTHON_PKGNAMEPREFIX}psutil>=4.3.0:sysutils/py-psutil@${FLAVOR} \	22	${PYTHON_PKGNAMEPREFIX}psutil>=4.3.0:sysutils/py-psutil@${FLAVOR} \
Lines 23-30 Link Here
23	${PYTHON_PKGNAMEPREFIX}service_identity>=16.0.0:security/py-service_identity@${FLAVOR} \	24	${PYTHON_PKGNAMEPREFIX}service_identity>=16.0.0:security/py-service_identity@${FLAVOR} \
24	${PYTHON_PKGNAMEPREFIX}setproctitle>=1.1.10:devel/py-setproctitle@${FLAVOR} \	25	${PYTHON_PKGNAMEPREFIX}setproctitle>=1.1.10:devel/py-setproctitle@${FLAVOR} \
25	${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7:databases/py-sqlite3@${FLAVOR} \	26	${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7:databases/py-sqlite3@${FLAVOR} \
26	${PYTHON_PKGNAMEPREFIX}twext>=0.20160817:devel/py-twext@${FLAVOR} \	27	${PYTHON_PKGNAMEPREFIX}twext>=0.20170227:devel/py-twext@${FLAVOR} \
27	${PYTHON_PKGNAMEPREFIX}twisted>=16.4.1:devel/py-twisted@${FLAVOR} \	28	${PYTHON_PKGNAMEPREFIX}twisted>=16.6.0:devel/py-twisted@${FLAVOR} \
28	${PYTHON_PKGNAMEPREFIX}xattr>=0.7.8:devel/py-xattr@${FLAVOR} \	29	${PYTHON_PKGNAMEPREFIX}xattr>=0.7.8:devel/py-xattr@${FLAVOR} \
29	${PYTHON_PKGNAMEPREFIX}zope.interface>=4.1.3:devel/py-zope.interface@${FLAVOR}	30	${PYTHON_PKGNAMEPREFIX}zope.interface>=4.1.3:devel/py-zope.interface@${FLAVOR}
30		31
Lines 62-68 Link Here
62	GROUPS= ${CALDAVD_USER}	63	GROUPS= ${CALDAVD_USER}
63		64
64	post-patch:	65	post-patch:
65	@${REINPLACE_CMD} -e 's\|"{}a1+unknown".format(base_version)\|"9.0"\|' ${WRKSRC}/setup.py	66	@${REINPLACE_CMD} -e 's\|"{}a1+unknown".format(base_version)\|"9.1"\|' ${WRKSRC}/setup.py
66	@${REINPLACE_CMD} -e 's\|"/etc/caldavd/caldavd.plist"\|"${ETCDIR}/caldavd.plist"\|g' ${WRKSRC}/twistedcaldav/stdconfig.py	67	@${REINPLACE_CMD} -e 's\|"/etc/caldavd/caldavd.plist"\|"${ETCDIR}/caldavd.plist"\|g' ${WRKSRC}/twistedcaldav/stdconfig.py
67	@${REINPLACE_CMD} -e 's\|/etc/caldavd\|${ETCDIR}\|g' ${WRKSRC}/conf/caldavd.plist	68	@${REINPLACE_CMD} -e 's\|/etc/caldavd\|${ETCDIR}\|g' ${WRKSRC}/conf/caldavd.plist
68	@${REINPLACE_CMD} -e 's\|daemon\|caldavd\|g' ${WRKSRC}/conf/caldavd.plist	69	@${REINPLACE_CMD} -e 's\|daemon\|caldavd\|g' ${WRKSRC}/conf/caldavd.plist

Line 0 Link Here

(-)files/patch-calendarserver_tools_dkimtool.py (+24 lines)
	1	--- calendarserver/tools/dkimtool.py.orig 2017-08-28 15:45:35.281722000 -0400
	2	+++ calendarserver/tools/dkimtool.py 2017-08-28 15:47:12.632627000 -0400
	3	@@ -36,7 +36,7 @@
	4
	5	def _doKeyGeneration(options):
	6
	7	- key = RSA.generate(options["key-size"])
	8	+ key = RSA.generate(int(options["key-size"]))
	9	output = key.exportKey()
	10	lineBreak = False
	11	if options["key"]:
	12	@@ -289,12 +289,6 @@
	13	options = DKIMToolOptions()
	14	options.parseOptions(argv[1:])
	15
	16	- #
	17	- # Send logging output to stdout
	18	- #
	19	- observer = STDLibLogObserver()
	20	- observer.start()
	21	-
	22	if options["verbose"]:
	23	log.levels().setLogLevelForNamespace("txdav.caldav.datastore.scheduling.ischedule.dkim", LogLevel.debug)
	24

Lines 1-19 Link Here

(-)files/patch-txdav_base_datastore_dbapiclient.py (-19 lines)
1	--- txdav/base/datastore/dbapiclient.py.orig 2016-12-15 11:56:26 UTC
2	+++ txdav/base/datastore/dbapiclient.py
3	@@ -24,6 +24,7 @@ from twext.python.filepath import Cachin
4	from txdav.common.icommondatastore import InternalDataStoreError
5
6	import pg8000 as postgres
7	+import six
8
9	try:
10	import os
11	@@ -430,7 +431,7 @@ def pg8000Preflight(connection, **kwargs
12	return v.encode("utf-8") if isinstance(v, unicode) else str(v)
13
14	connection.realConnection.py_types[str] = (705, postgres.core.FC_TEXT, my_text_out)
15	- connection.realConnection.py_types[postgres.six.text_type] = (705, postgres.core.FC_TEXT, my_text_out)
16	+ connection.realConnection.py_types[six.text_type] = (705, postgres.core.FC_TEXT, my_text_out)
17
18	def my_text_recv(data, offset, length):
19	return str(data[offset: offset + length])