Date: Mon, 11 Dec 2017 19:49:31 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r456063 - in head/www/calendarserver: . files Message-ID: <201712111949.vBBJnVN2018577@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Mon Dec 11 19:49:31 2017 New Revision: 456063 URL: https://svnweb.freebsd.org/changeset/ports/456063 Log: www/calendarserver: update to version 9.1 PR: 221929 Submitted by: Axel.Rau@Chaos1.DE (maintainer) Reported by: Cullum Smith <cullum@c0ffee.net> Added: head/www/calendarserver/files/patch-calendarserver_tools_dkimtool.py (contents, props changed) Deleted: head/www/calendarserver/files/patch-txdav_base_datastore_dbapiclient.py Modified: head/www/calendarserver/Makefile head/www/calendarserver/distinfo head/www/calendarserver/files/patch-setup.py Modified: head/www/calendarserver/Makefile ============================================================================== --- head/www/calendarserver/Makefile Mon Dec 11 19:46:29 2017 (r456062) +++ head/www/calendarserver/Makefile Mon Dec 11 19:49:31 2017 (r456063) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= calendarserver -PORTVERSION= 9.0 +PORTVERSION= 9.1 DISTVERSIONPREFIX= CalendarServer- CATEGORIES= www python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -16,6 +16,7 @@ RUN_DEPENDS= memcached:databases/memcached \ ${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} \ @@ -23,8 +24,8 @@ RUN_DEPENDS= memcached:databases/memcached \ ${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} @@ -32,7 +33,7 @@ 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 @@ -62,7 +63,7 @@ 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 Modified: head/www/calendarserver/distinfo ============================================================================== --- head/www/calendarserver/distinfo Mon Dec 11 19:46:29 2017 (r456062) +++ head/www/calendarserver/distinfo Mon Dec 11 19:49:31 2017 (r456063) @@ -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 Added: head/www/calendarserver/files/patch-calendarserver_tools_dkimtool.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/calendarserver/files/patch-calendarserver_tools_dkimtool.py Mon Dec 11 19:49:31 2017 (r456063) @@ -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) + Modified: head/www/calendarserver/files/patch-setup.py ============================================================================== --- head/www/calendarserver/files/patch-setup.py Mon Dec 11 19:46:29 2017 (r456062) +++ head/www/calendarserver/files/patch-setup.py Mon Dec 11 19:49:31 2017 (r456063) @@ -1,6 +1,15 @@ ---- 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", ],
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201712111949.vBBJnVN2018577>