Attachment 185907 Details for Bug 221929 – SVN diff - update CalendarServer 9.0 to 9.1 (www/calendarserver, devel/py-twext, databases/py-sqlparse02)

[patch] SVN diff - update CalendarServer 9.0 to 9.1 (www/calendarserver, devel/py-twext, databases/py-sqlparse02)

www_calendarserver-9.1.diff (text/plain), 10.71 KB, created by Cullum Smith on 2017-08-30 03:42:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Cullum Smith

Created: 2017-08-30 03:42:57 UTC

Size: 10.71 KB

patch

obsolete

>Index: www/calendarserver/Makefile
>===================================================================
>--- www/calendarserver/Makefile	(revision 448955)
>+++ www/calendarserver/Makefile	(working copy)
>@@ -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 @@
> 		${PYTHON_PKGNAMEPREFIX}PyGreSQL>=5.0:databases/py-PyGreSQL \
> 		${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6.1:security/py-pycrypto \
> 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.5.3:devel/py-dateutil \
>+		${PYTHON_PKGNAMEPREFIX}kerberos>=1.2.5:security/py-kerberos \
> 		${PYTHON_PKGNAMEPREFIX}openssl>=16.0.0:security/py-openssl \
> 		${PYTHON_PKGNAMEPREFIX}pg8000>=1.10.6:databases/py-pg8000 \
> 		${PYTHON_PKGNAMEPREFIX}psutil>=4.3.0:sysutils/py-psutil \
>@@ -23,8 +24,8 @@
> 		${PYTHON_PKGNAMEPREFIX}service_identity>=16.0.0:security/py-service_identity \
> 		${PYTHON_PKGNAMEPREFIX}setproctitle>=1.1.10:devel/py-setproctitle \
> 		${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7:databases/py-sqlite3 \
>-		${PYTHON_PKGNAMEPREFIX}twext>=0.20160817:devel/py-twext \
>-		${PYTHON_PKGNAMEPREFIX}twisted>=16.4.1:devel/py-twisted \
>+		${PYTHON_PKGNAMEPREFIX}twext>=0.20170227:devel/py-twext \
>+		${PYTHON_PKGNAMEPREFIX}twisted>=16.6.0:devel/py-twisted \
> 		${PYTHON_PKGNAMEPREFIX}xattr>=0.7.8:devel/py-xattr \
> 		${PYTHON_PKGNAMEPREFIX}zope.interface>=4.1.3:devel/py-zope.interface
> 
>@@ -62,7 +63,7 @@
> 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)|"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
>Index: www/calendarserver/distinfo
>===================================================================
>--- www/calendarserver/distinfo	(revision 448955)
>+++ www/calendarserver/distinfo	(working copy)
>@@ -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 = 1503863851
>+SHA256 (apple-ccs-calendarserver-CalendarServer-9.1_GH0.tar.gz) = 676405baf03f7cbeb3da7f32581e0c9c5b5a042f8d022bdd93f036b7ce45d29a
>+SIZE (apple-ccs-calendarserver-CalendarServer-9.1_GH0.tar.gz) = 3688246
>Index: www/calendarserver/files/patch-calendarserver_tools_dkimtool.py
>===================================================================
>--- www/calendarserver/files/patch-calendarserver_tools_dkimtool.py	(nonexistent)
>+++ www/calendarserver/files/patch-calendarserver_tools_dkimtool.py	(working copy)
>@@ -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: 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: www/calendarserver/files/patch-setup.py
>===================================================================
>--- www/calendarserver/files/patch-setup.py	(revision 448955)
>+++ www/calendarserver/files/patch-setup.py	(working copy)
>@@ -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",
>          ],
>Index: www/calendarserver/files/patch-txdav_base_datastore_dbapiclient.py
>===================================================================
>--- www/calendarserver/files/patch-txdav_base_datastore_dbapiclient.py	(revision 448955)
>+++ 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: 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: devel/py-twext/Makefile
>===================================================================
>--- devel/py-twext/Makefile	(revision 448955)
>+++ devel/py-twext/Makefile	(working copy)
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	twext
>-PORTVERSION=	0.20160818
>+PORTVERSION=	0.20170227
> CATEGORIES=	devel python
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
> 
>@@ -10,13 +10,13 @@
> 
> LICENSE=	APACHE20
> 
>-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twisted>=15.4.0:devel/py-twisted
>+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twisted>=16.6.0:devel/py-twisted
> RUN_DEPENDS=	\
>  ${PYTHON_PKGNAMEPREFIX}cffi>=0.6:devel/py-cffi \
>- ${PYTHON_PKGNAMEPREFIX}twisted>=15.4:devel/py-twisted
>+ ${PYTHON_PKGNAMEPREFIX}twisted>=16.6:devel/py-twisted
> 
> DAL_RUN_DEPENDS=	\
>- ${PYTHON_PKGNAMEPREFIX}sqlparse01>=0.1.19:databases/py-sqlparse01 \
>+ ${PYTHON_PKGNAMEPREFIX}sqlparse02==0.2.0:databases/py-sqlparse02 \
> 
> POSTGRES_RUN_DEPENDS=	\
>  ${PYTHON_PKGNAMEPREFIX}pg8000>=1.10.2:databases/py-pg8000
>@@ -34,9 +34,9 @@
> USE_GITHUB=	yes
> GH_ACCOUNT=	apple
> GH_PROJECT=	ccs-twistedextensions
>-GH_TAGNAME=	a8528bc
>+GH_TAGNAME=	2c4046d
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's|"{}a1+unknown".format(base_version)|"0.20160928"|' ${WRKSRC}/setup.py
>+	@${REINPLACE_CMD} -e 's|"{}a1+unknown".format(base_version)|"0.20170227"|' ${WRKSRC}/setup.py
> 
> .include <bsd.port.mk>
>Index: devel/py-twext/distinfo
>===================================================================
>--- devel/py-twext/distinfo	(revision 448955)
>+++ devel/py-twext/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1479895744
>-SHA256 (apple-ccs-twistedextensions-0.20160818-a8528bc_GH0.tar.gz) = b53ea069486a20b4b0f14a73ebc4f873376aa4aa497c81183ab4f1613d3b6ed4
>-SIZE (apple-ccs-twistedextensions-0.20160818-a8528bc_GH0.tar.gz) = 269151
>+TIMESTAMP = 1503863135
>+SHA256 (apple-ccs-twistedextensions-0.20170227-2c4046d_GH0.tar.gz) = 63206d11e4477581bd3ecfd9dccdf88fdb7ec5a71526456bbc8e408423e61c66
>+SIZE (apple-ccs-twistedextensions-0.20170227-2c4046d_GH0.tar.gz) = 270786
>Index: databases/py-sqlparse02/Makefile
>===================================================================
>--- databases/py-sqlparse02/Makefile	(nonexistent)
>+++ databases/py-sqlparse02/Makefile	(working copy)
>@@ -0,0 +1,19 @@
>+# Created by: Cullum Smith <cullum@c0ffee.net>
>+
>+PORTNAME=	sqlparse02
>+PORTVERSION=	0.2.0
>+CATEGORIES=	databases python
>+MASTER_SITES=	CHEESESHOP
>+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>+DISTNAME=	sqlparse-${DISTVERSION}
>+
>+MAINTAINER=	cullum@c0ffee.net
>+COMMENT=	Non-validating SQL parser for Python (version 0.2.0)
>+
>+LICENSE=	BSD3CLAUSE
>+
>+NO_ARCH=	yes
>+USE_PYTHON=	autoplist concurrent distutils
>+USES=		python
>+
>+.include <bsd.port.mk>
>
>Property changes on: databases/py-sqlparse02/Makefile
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: databases/py-sqlparse02/distinfo
>===================================================================
>--- databases/py-sqlparse02/distinfo	(nonexistent)
>+++ databases/py-sqlparse02/distinfo	(working copy)
>@@ -0,0 +1,3 @@
>+TIMESTAMP = 1503863532
>+SHA256 (sqlparse-0.2.0.tar.gz) = 7fac8d39ac543499b191be19e811ff275f2df0d45c4ba5fc24850aa883ac2060
>+SIZE (sqlparse-0.2.0.tar.gz) = 52554
>
>Property changes on: databases/py-sqlparse02/distinfo
>___________________________________________________________________
>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: databases/py-sqlparse02/pkg-descr
>===================================================================
>--- databases/py-sqlparse02/pkg-descr	(nonexistent)
>+++ databases/py-sqlparse02/pkg-descr	(working copy)
>@@ -0,0 +1,5 @@
>+sqlparse is a non-validating SQL parser module.
>+It provides support for parsing, splitting and formatting SQL statements.
>+
>+WWW: https://pypi.python.org/pypi/sqlparse
>+WWW: https://github.com/andialbrecht/sqlparse
>
>Property changes on: databases/py-sqlparse02/pkg-descr
>___________________________________________________________________
>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

Actions: View | Diff

Attachments on bug 221929: 185907 | 188658 | 188659 | 188726