Index: head/www/calendarserver/Makefile =================================================================== --- head/www/calendarserver/Makefile (revision 456062) +++ head/www/calendarserver/Makefile (revision 456063) @@ -1,92 +1,93 @@ # $FreeBSD$ PORTNAME= calendarserver -PORTVERSION= 9.0 +PORTVERSION= 9.1 DISTVERSIONPREFIX= CalendarServer- CATEGORIES= www python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= axel.rau@chaos1.de COMMENT= Calendar and Contacts Server from Apple (RFC 4791, RFC 6352) LICENSE= APACHE20 RUN_DEPENDS= memcached:databases/memcached \ ${PYTHON_PKGNAMEPREFIX}calendar>=2.1:devel/py-calendar@${FLAVOR} \ ${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}pytz>=2016.7:devel/py-pytz@${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.20160817:devel/py-twext@${FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}twisted>=16.4.1:devel/py-twisted@${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} PORTDOCS= * PORTEXAMPLES= * OPTIONS_DEFINE= DOCS EXAMPLES -USES= pgsql:9.1+ python:2.7 +USES= pgsql:9.1+ python:2.7 USE_PYTHON= autoplist distutils USE_GITHUB= yes GH_ACCOUNT= apple GH_PROJECT= ccs-calendarserver NO_ARCH=yes SUB_FILES= pkg-message SUB_LIST+= USER=${USERS} USE_RC_SUBR= caldavd SUB_LIST+= PYTHON_CMD=${PYTHON_CMD} ETCDIR= ${PREFIX}/etc/caldavd SHAREDIR= ${PREFIX}/share/caldavd DBDIR= /var/db/caldavd LOGDIR= /var/log/caldavd RUNDIR= /var/run/caldavd PLIST_SUB= USER=${USERS} GROUP=${GROUPS} \ ETCDIR=${ETCDIR} \ DBDIR=${DBDIR} \ LOGDIR=${LOGDIR} \ RUNDIR=${RUNDIR} CALDAVD_USER= caldavd USERS= ${CALDAVD_USER} GROUPS= ${CALDAVD_USER} post-patch: - @${REINPLACE_CMD} -e 's|"{}a1+unknown".format(base_version)|"9.0"|' ${WRKSRC}/setup.py + @${REINPLACE_CMD} -e 's|"{}a1+unknown".format(base_version)|"${PORTVERSION}"|' ${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 @${REINPLACE_CMD} -e 's|/var/run|/var/run/caldavd|g' ${WRKSRC}/conf/caldavd.plist post-install: ${MKDIR} ${STAGEDIR}${DBDIR}/Data/Documents ${MKDIR} ${STAGEDIR}${DBDIR}/Documents ${MKDIR} ${STAGEDIR}${ETCDIR}/auth ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} (cd ${WRKSRC}/conf && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) ${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) (cd ${STAGEDIR}${DOCSDIR} && ${RM} *.8) ##(cd ${WRKSRC}/doc && \ ## for i in `ls |${GREP} -v '.8'`; do \ ## ${MKDIR} ${STAGEDIR}${DOCSDIR}/$${i} && \ ## ${INSTALL_MAN} ${WRKSRC}/doc/$${i}/* \ ## ${STAGEDIR}${DOCSDIR}/$${i}; \ ## done) ${CP} -p ${WRKSRC}/txdav/common/datastore/sql_schema/current.sql \ ${STAGEDIR}${DOCSDIR} ${INSTALL_MAN} ${WRKSRC}/doc/*.8 ${STAGEDIR}${PREFIX}/man/man8 ${MKDIR} ${STAGEDIR}${LOGDIR} ${MKDIR} ${STAGEDIR}${RUNDIR} .include Index: head/www/calendarserver/distinfo =================================================================== --- head/www/calendarserver/distinfo (revision 456062) +++ head/www/calendarserver/distinfo (revision 456063) @@ -1,3 +1,3 @@ -TIMESTAMP = 1496753993 -SHA256 (apple-ccs-calendarserver-CalendarServer-9.0_GH0.tar.gz) = 557f0497d9b112040ebb3d40556ae2e1a6d6391069a928926ac3c0abea45d836 -SIZE (apple-ccs-calendarserver-CalendarServer-9.0_GH0.tar.gz) = 4836315 +TIMESTAMP = 1509793500 +SHA256 (apple-ccs-calendarserver-CalendarServer-9.1_GH0.tar.gz) = 4ca524f27a750628af46fb246002baba108748cd331bd378c2429db793821366 +SIZE (apple-ccs-calendarserver-CalendarServer-9.1_GH0.tar.gz) = 3688342 Index: head/www/calendarserver/files/patch-txdav_base_datastore_dbapiclient.py =================================================================== --- head/www/calendarserver/files/patch-txdav_base_datastore_dbapiclient.py (revision 456062) +++ head/www/calendarserver/files/patch-txdav_base_datastore_dbapiclient.py (nonexistent) @@ -1,19 +0,0 @@ ---- 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]) Property changes on: head/www/calendarserver/files/patch-txdav_base_datastore_dbapiclient.py ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/calendarserver/files/patch-calendarserver_tools_dkimtool.py =================================================================== --- head/www/calendarserver/files/patch-calendarserver_tools_dkimtool.py (nonexistent) +++ head/www/calendarserver/files/patch-calendarserver_tools_dkimtool.py (revision 456063) @@ -0,0 +1,24 @@ +--- 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) + Property changes on: head/www/calendarserver/files/patch-calendarserver_tools_dkimtool.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/calendarserver/files/patch-setup.py =================================================================== --- head/www/calendarserver/files/patch-setup.py (revision 456062) +++ head/www/calendarserver/files/patch-setup.py (revision 456063) @@ -1,12 +1,21 @@ ---- setup.py.orig 2016-08-23 16:28:28 UTC -+++ setup.py -@@ -419,9 +419,6 @@ def doSetup(): +--- setup.py.orig 2017-08-27 16:10:56.170135000 -0400 ++++ setup.py 2017-08-27 16:11:54.314120000 -0400 +@@ -306,7 +306,7 @@ + install_requirements = [ + # Core frameworks + "zope.interface", +- "Twisted==16.6.0", ++ "Twisted>=16.6.0", + "twextpy", + + # Security frameworks +@@ -416,9 +416,6 @@ scripts=[ "bin/caldavd", ], - data_files=[ - ("caldavd", ["conf/caldavd.plist"]), - ], ext_modules=extensions, py_modules=[], setup_requires=setup_requirements,