FreeBSD Bugzilla – Attachment 188726 Details for
Bug 221929
[patch] www/calendarserver: update to version 9.1
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
svn diff against 455863
py27-calendarserver-9.1.diff (text/plain), 6.09 KB, created by
Axel.Rau
on 2017-12-11 18:26:02 UTC
(
hide
)
Description:
svn diff against 455863
Filename:
MIME Type:
Creator:
Axel.Rau
Created:
2017-12-11 18:26:02 UTC
Size:
6.09 KB
patch
obsolete
>Index: Makefile >=================================================================== >--- Makefile (revision 455863) >+++ 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@${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 @@ > ${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} > >@@ -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: distinfo >=================================================================== >--- distinfo (revision 455863) >+++ 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 = 1509793500 >+SHA256 (apple-ccs-calendarserver-CalendarServer-9.1_GH0.tar.gz) = 4ca524f27a750628af46fb246002baba108748cd331bd378c2429db793821366 >+SIZE (apple-ccs-calendarserver-CalendarServer-9.1_GH0.tar.gz) = 3688342 >Index: files/patch-calendarserver_tools_dkimtool.py >=================================================================== >--- files/patch-calendarserver_tools_dkimtool.py (nonexistent) >+++ 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: 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: files/patch-setup.py >=================================================================== >--- files/patch-setup.py (revision 455863) >+++ 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: files/patch-txdav_base_datastore_dbapiclient.py >=================================================================== >--- files/patch-txdav_base_datastore_dbapiclient.py (revision 455863) >+++ 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: 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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Flags:
Axel.Rau:
maintainer-approval+
Actions:
View
|
Diff
Attachments on
bug 221929
:
185907
|
188658
|
188659
| 188726