From 7defe250eb5f7d3df889c23bff4b71c0d764122e Mon Sep 17 00:00:00 2001
From: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date: Mon, 9 Apr 2018 17:15:49 +0200
Subject: [PATCH] ERP5 SR: version up Zope2 2.13.27.
---
.../egg-patch/Acquisition/aq_dynamic.patch | 48 +++++++++----------
stack/erp5/buildout.cfg | 4 +-
stack/erp5/zope-versions.cfg | 29 +++++------
3 files changed, 37 insertions(+), 44 deletions(-)
diff --git a/component/egg-patch/Acquisition/aq_dynamic.patch b/component/egg-patch/Acquisition/aq_dynamic.patch
index deb801fcf..fec1c900e 100644
--- a/component/egg-patch/Acquisition/aq_dynamic.patch
+++ b/component/egg-patch/Acquisition/aq_dynamic.patch
@@ -1,7 +1,7 @@
-diff -uNr Acquisition-2.13.8/src/Acquisition/_Acquisition.c Acquisition-2.13.8nxd001/src/Acquisition/_Acquisition.c
---- Acquisition-2.13.8/src/Acquisition/_Acquisition.c 2011-06-11 17:19:14.000000000 +0200
-+++ Acquisition-2.13.8nxd001/src/Acquisition/_Acquisition.c 2013-10-31 16:24:55.665085888 +0100
-@@ -448,6 +448,64 @@
+diff -uNr Acquisition-2.13.12.orig/src/Acquisition/_Acquisition.c Acquisition-2.13.12/src/Acquisition/_Acquisition.c
+--- Acquisition-2.13.12.orig/src/Acquisition/_Acquisition.c 2017-12-01 12:01:34.000000000 +0100
++++ Acquisition-2.13.12/src/Acquisition/_Acquisition.c 2018-04-09 17:10:15.394836944 +0200
+@@ -449,6 +449,64 @@
}
static PyObject *
@@ -66,7 +66,7 @@ diff -uNr Acquisition-2.13.8/src/Acquisition/_Acquisition.c Acquisition-2.13.8nx
Wrapper_acquire(Wrapper *self, PyObject *oname,
PyObject *filter, PyObject *extra, PyObject *orig,
int explicit, int containment);
-@@ -545,8 +603,8 @@
+@@ -589,8 +647,8 @@
Py_XDECREF(r); Py_XDECREF(v); Py_XDECREF(tb);
r=NULL;
}
@@ -77,7 +77,7 @@ diff -uNr Acquisition-2.13.8/src/Acquisition/_Acquisition.c Acquisition-2.13.8nx
{
if (r==Acquired)
{
-@@ -670,7 +728,7 @@
+@@ -714,7 +772,7 @@
Py_XDECREF(r); Py_XDECREF(v); Py_XDECREF(tb);
r=NULL;
@@ -86,7 +86,7 @@ diff -uNr Acquisition-2.13.8/src/Acquisition/_Acquisition.c Acquisition-2.13.8nx
if (r == Acquired) {
Py_DECREF(r);
}
-@@ -707,7 +765,7 @@
+@@ -751,7 +809,7 @@
Wrapper_getattro(Wrapper *self, PyObject *oname)
{
if (self->obj || self->container)
@@ -95,18 +95,18 @@ diff -uNr Acquisition-2.13.8/src/Acquisition/_Acquisition.c Acquisition-2.13.8nx
/* Maybe we are getting initialized? */
return Py_FindAttr(OBJECT(self),oname);
-@@ -724,7 +782,7 @@
- return Py_FindAttr(OBJECT(self),oname);
+@@ -776,7 +834,7 @@
+ result = Py_FindAttr(OBJECT(self),oname);
- if (self->obj || self->container)
-- return Wrapper_findattr(self, oname, NULL, NULL, NULL, 1, 0, 0, 0);
-+ return Wrapper_findattr(self, oname, NULL, NULL, OBJECT(self), 1, 0, 0, 0);
+ else if (self->obj || self->container)
+- result = Wrapper_findattr(self, oname, NULL, NULL, NULL, 1, 0, 0, 0);
++ result = Wrapper_findattr(self, oname, NULL, NULL, OBJECT(self), 1, 0, 0, 0);
/* Maybe we are getting initialized? */
- return Py_FindAttr(OBJECT(self),oname);
-diff -uNr Acquisition-2.13.8/src/Acquisition/test_dynamic_acquisition.py Acquisition-2.13.8nxd001/src/Acquisition/test_dynamic_acquisition.py
---- Acquisition-2.13.8/src/Acquisition/test_dynamic_acquisition.py 1970-01-01 01:00:00.000000000 +0100
-+++ Acquisition-2.13.8nxd001/src/Acquisition/test_dynamic_acquisition.py 2013-10-31 16:24:55.665085888 +0100
+ else result = Py_FindAttr(OBJECT(self),oname);
+diff -uNr Acquisition-2.13.12.orig/src/Acquisition/test_dynamic_acquisition.py Acquisition-2.13.12/src/Acquisition/test_dynamic_acquisition.py
+--- Acquisition-2.13.12.orig/src/Acquisition/test_dynamic_acquisition.py 1970-01-01 01:00:00.000000000 +0100
++++ Acquisition-2.13.12/src/Acquisition/test_dynamic_acquisition.py 2018-04-09 17:07:34.863985305 +0200
@@ -0,0 +1,160 @@
+##############################################################################
+#
@@ -268,10 +268,10 @@ diff -uNr Acquisition-2.13.8/src/Acquisition/test_dynamic_acquisition.py Acquisi
+ >>> assert not b.a.aq_inContextOf('somestring')
+'''
+
-diff -uNr Acquisition-2.13.8/src/Acquisition/tests.py Acquisition-2.13.8nxd001/src/Acquisition/tests.py
---- Acquisition-2.13.8/src/Acquisition/tests.py 2011-06-11 17:09:38.000000000 +0200
-+++ Acquisition-2.13.8nxd001/src/Acquisition/tests.py 2013-10-31 16:24:55.669085888 +0100
-@@ -2552,6 +2552,7 @@
+diff -uNr Acquisition-2.13.12.orig/src/Acquisition/tests.py Acquisition-2.13.12/src/Acquisition/tests.py
+--- Acquisition-2.13.12.orig/src/Acquisition/tests.py 2017-12-01 12:01:34.000000000 +0100
++++ Acquisition-2.13.12/src/Acquisition/tests.py 2018-04-09 17:07:34.867985476 +0200
+@@ -2588,6 +2588,7 @@
def test_suite():
return unittest.TestSuite((
DocTestSuite(),
@@ -279,10 +279,10 @@ diff -uNr Acquisition-2.13.8/src/Acquisition/tests.py Acquisition-2.13.8nxd001/s
DocFileSuite('README.txt', package='Acquisition'),
unittest.makeSuite(TestParent),
unittest.makeSuite(TestAcquire),
-diff -uNr Acquisition-2.13.8/src/Acquisition.egg-info/SOURCES.txt Acquisition-2.13.8nxd001/src/Acquisition.egg-info/SOURCES.txt
---- Acquisition-2.13.8/src/Acquisition.egg-info/SOURCES.txt 2011-06-11 17:21:18.000000000 +0200
-+++ Acquisition-2.13.8nxd001/src/Acquisition.egg-info/SOURCES.txt 2013-10-31 16:24:55.669085888 +0100
-@@ -15,6 +15,7 @@
+diff -uNr Acquisition-2.13.12.orig/src/Acquisition.egg-info/SOURCES.txt Acquisition-2.13.12/src/Acquisition.egg-info/SOURCES.txt
+--- Acquisition-2.13.12.orig/src/Acquisition.egg-info/SOURCES.txt 2017-12-01 12:08:29.000000000 +0100
++++ Acquisition-2.13.12/src/Acquisition.egg-info/SOURCES.txt 2018-04-09 17:07:34.867985476 +0200
+@@ -10,6 +10,7 @@
src/Acquisition/_Acquisition.c
src/Acquisition/__init__.py
src/Acquisition/interfaces.py
diff --git a/stack/erp5/buildout.cfg b/stack/erp5/buildout.cfg
index 5096b4720..d9b02924b 100644
--- a/stack/erp5/buildout.cfg
+++ b/stack/erp5/buildout.cfg
@@ -583,7 +583,7 @@ extra-paths =
# patches for eggs
patch-binary = ${patch:location}/bin/patch
-Acquisition-patches = ${:_profile_base_location_}/../../component/egg-patch/Acquisition/aq_dynamic.patch#e8029103350dad364d25747514a20327
+Acquisition-patches = ${:_profile_base_location_}/../../component/egg-patch/Acquisition/aq_dynamic.patch#1d9a56e9af4371f5b6951ebf217a15d7
Acquisition-patch-options = -p1
Products.DCWorkflow-patches = ${:_profile_base_location_}/../../component/egg-patch/Products.DCWorkflow/workflow_method.patch#975b49e96bae33ac8563454fe5fa9899
Products.DCWorkflow-patch-options = -p1
@@ -625,7 +625,7 @@ scripts +=
# neoppod, mysqlclient, slapos.recipe.template & [slapos-deps-eggs]
# patched eggs
-Acquisition = 2.13.9+SlapOSPatched001
+Acquisition = 2.13.12+SlapOSPatched001
Products.DCWorkflow = 2.2.4+SlapOSPatched001
ocropy = 1.0+SlapOSPatched001
pysvn = 1.7.10+SlapOSPatched002
diff --git a/stack/erp5/zope-versions.cfg b/stack/erp5/zope-versions.cfg
index d10d80bd0..cc80b1ec4 100644
--- a/stack/erp5/zope-versions.cfg
+++ b/stack/erp5/zope-versions.cfg
@@ -1,6 +1,6 @@
[versions]
-AccessControl = 2.13.15
-Acquisition = 2.13.11
+AccessControl = 2.13.16
+Acquisition = 2.13.12
DateTime = 2.12.8
DocumentTemplate = 2.13.4
ExtensionClass = 2.13.2
@@ -21,31 +21,35 @@ Products.Sessions = 3.0
Products.StandardCacheManagers = 2.13.1
Products.TemporaryFolder = 3.0
Products.ZCTextIndex = 2.13.5
-Products.ZCatalog = 2.13.27
+Products.ZCatalog = 2.13.29
Pygments = 2.2.0
Record = 2.13.0
RestrictedPython = 3.6.0
Sphinx = 1.0.8
ZConfig = 2.9.3
ZODB3 = 3.10.7
-Zope2 = 2.13.26
ZServer = 3.0
+Zope2 = 2.13.27
ZopeUndo = 2.12.0
docutils = 0.12
initgroups = 2.13.0
mechanize = 0.2.5
-mr.developer = 1.35
+mr.developer = 1.38
+pluggy = 0.6.0
+py = 1.5.2
+pytz = 2017.2
repoze.retry = 1.2
repoze.tm2 = 1.0
repoze.who = 2.0
tempstorage = 2.12.2
+tox = 2.9.1
transaction = 1.1.1
z3c.checkversions = 0.5
zExceptions = 2.13.0
zLOG = 2.11.2
zc.buildout = 2.3.1
zc.lockfile = 1.0.2
-zc.recipe.egg = 2.0.3
+zc.recipe.egg = 2.0.5
zc.recipe.testrunner = 1.2.1
zdaemon = 2.0.7
zope.annotation = 3.5.0
@@ -66,7 +70,7 @@ zope.exceptions = 3.6.2
zope.filerepresentation = 3.6.1
zope.i18n = 3.7.4
zope.i18nmessageid = 3.5.3
-zope.interface = 3.6.7
+zope.interface = 3.6.8
zope.lifecycleevent = 3.6.2
zope.location = 3.9.1
zope.pagetemplate = 3.5.2
@@ -87,14 +91,3 @@ zope.testbrowser = 3.11.1
zope.testing = 3.9.7
zope.traversing = 3.13.2
zope.viewlet = 3.7.2
-
-# Required by:
-# Jinja2==2.8.1
-MarkupSafe = 0.23
-
-# Required by:
-# DateTime==2.12.8
-# Zope2==2.13.26
-# zope.i18n==3.7.4
-# zope.testbrowser==3.11.1
-pytz = 2016.10
--
2.30.9