Merge remote-tracking branch 'origin/master' into zope4py3

component/egg-patch/Acquisition/Acquisition-4.7.patch

-diff -Naur Acquisition-4.7.orig/src/Acquisition/_Acquisition.c Acquisition-4.7-py2.7-linux-x86_64.egg/src/Acquisition/_Acquisition.c
---- Acquisition-4.7.orig/src/Acquisition/_Acquisition.c	2021-03-17 16:22:28.266539592 +0100
-+++ Acquisition-4.7-py2.7-linux-x86_64.egg/src/Acquisition/_Acquisition.c	2021-03-17 16:28:59.609842948 +0100
-@@ -543,6 +543,64 @@
- }
- 
- static PyObject *
-+Wrapper_GetAttr(PyObject *self, PyObject *attr_name, PyObject *orig)
-+{
-+  /* This function retrieves an attribute from an object by PyObject_GetAttr.
-+
-+     The main difference between Wrapper_GetAttr and PyObject_GetAttr is that
-+     Wrapper_GetAttr calls _aq_dynamic to generate an attribute dynamically, if
-+     the attribute is not found.
-+  */
-+  PyObject *r, *v, *tb;
-+  PyObject *d, *m;
-+  PyObject *o;
-+
-+  if (isWrapper (self))
-+    o = WRAPPER(self)->obj;
-+  else
-+    o = self;
-+  
-+  /* Try to get an attribute in the normal way first.  */
-+  r = PyObject_GetAttr(o, attr_name);
-+  if (r)
-+    return r;
-+
-+  /* If an unexpected error happens, return immediately.  */
-+  PyErr_Fetch(&r,&v,&tb);
-+  if (r != PyExc_AttributeError)
-+    {
-+      PyErr_Restore(r,v,tb);
-+      return NULL;
-+    }
-+
-+  /* Try to get _aq_dynamic.  */
-+  m = PyObject_GetAttrString(o, "_aq_dynamic");
-+  if (! m) {
-+    PyErr_Restore(r,v,tb);
-+    return NULL;
-+  }
-+
-+  /* Call _aq_dynamic in the context of the original acquisition wrapper.  */
-+  if (PyECMethod_Check(m) && PyECMethod_Self(m)==o)
-+    ASSIGN(m,PyECMethod_New(m,OBJECT(self)));
-+  else if (has__of__(m)) ASSIGN(m,__of__(m,OBJECT(self)));
-+  d = PyObject_CallFunction(m, "O", attr_name);
-+  Py_DECREF(m);
-+
-+  /* In the case of None, assume that the attribute is not found.  */
-+  if (d == Py_None) {
-+    Py_DECREF(d);
-+    PyErr_Restore(r,v,tb);
-+    return NULL;
-+  }
-+
-+  Py_XDECREF(r);
-+  Py_XDECREF(v);
-+  Py_XDECREF(tb);
-+  return d;
-+}
-+
-+static PyObject *
- Wrapper_acquire(Wrapper *self, PyObject *oname,
-                 PyObject *filter, PyObject *extra, PyObject *orig,
-                 int explicit, int containment);
-@@ -677,8 +735,8 @@
-             return NULL;
-         }
- 
--        /* normal attribute lookup */
--        else if ((r = PyObject_GetAttr(self->obj, oname))) {
-+        /* Give _aq_dynamic a chance, then normal attribute lookup */
-+        else if ((r = Wrapper_GetAttr(OBJECT(self), oname, orig))) {
-             if (r == Acquired) {
-                 Py_DECREF(r);
-                 return Wrapper_acquire(
-@@ -806,7 +864,7 @@
-             return NULL;
-         }
- 
--        if ((r = PyObject_GetAttr(self->container, oname)) == NULL) {
-+        if ((r = Wrapper_GetAttr(self->container, oname, orig)) == NULL) {
-             /* May be AttributeError or some other kind of error */
-             return NULL;
-         }
-@@ -830,7 +888,7 @@
- static PyObject *
- Wrapper_getattro(Wrapper *self, PyObject *oname)
- {
--    return Wrapper_findattr(self, oname, NULL, NULL, NULL, 1, 1, 0, 0);
-+    return Wrapper_findattr(self, oname, NULL, NULL, OBJECT(self), 1, 1, 0, 0);
- }
- 
- static PyObject *
-@@ -846,7 +904,7 @@
-     if (STR_EQ(PyBytes_AS_STRING(tmp), "acquire")) {
-         result = Py_FindAttr(OBJECT(self), oname);
-     } else {
--        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);
-     }
- 
-     Py_DECREF(tmp);
-diff -Naur Acquisition-4.7.orig/src/Acquisition/test_dynamic_acquisition.py Acquisition-4.7-py2.7-linux-x86_64.egg/src/Acquisition/test_dynamic_acquisition.py
---- Acquisition-4.7.orig/src/Acquisition/test_dynamic_acquisition.py	1970-01-01 01:00:00.000000000 +0100
-+++ Acquisition-4.7-py2.7-linux-x86_64.egg/src/Acquisition/test_dynamic_acquisition.py	2021-03-17 16:30:07.082413986 +0100
-@@ -0,0 +1,160 @@
-+##############################################################################
-+#
-+# Copyright (c) 1996-2002 Zope Corporation and Contributors.
-+# All Rights Reserved.
-+#
-+# This software is subject to the provisions of the Zope Public License,
-+# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
-+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-+# FOR A PARTICULAR PURPOSE
-+#
-+##############################################################################
-+import Acquisition
-+
-+def checkContext(self, o):
-+    # Python equivalent to aq_inContextOf
-+    from Acquisition import aq_base, aq_parent, aq_inner
-+    subob = self
-+    o = aq_base(o)
-+    while 1:
-+        if aq_base(subob) is o:
-+            return True
-+        self = aq_inner(subob)
-+        if self is None: break
-+        subob = aq_parent(self)
-+        if subob is None: break
-+    return False
-+
-+class B(Acquisition.Implicit):
-+    color='red'
-+
-+    def __init__(self, name='b'):
-+        self.name = name
-+
-+    def _aq_dynamic(self, attr):
-+        if attr == 'bonjour': return None
-+
-+        def dynmethod():
-+            chain = ' <- '.join(repr(obj) for obj in Acquisition.aq_chain(self))
-+            print repr(self) + '.' + attr
-+            print 'chain:', chain
-+
-+        return dynmethod
-+
-+    def __repr__(self):
-+        return "%s(%r)" % (self.__class__.__name__, self.name)
-+
-+class A(Acquisition.Implicit):
-+
-+    def __init__(self, name='a'):
-+        self.name = name
-+
-+    def hi(self):
-+        print self, self.color
-+
-+    def _aq_dynamic(self, attr):
-+        return None
-+
-+    def __repr__(self):
-+        return "%s(%r)" % (self.__class__.__name__, self.name)
-+
-+def test_dynamic():
-+    r'''
-+    The _aq_dynamic functionality allows an object to dynamically provide an
-+    attribute.
-+    
-+    If an object doesn't have an attribute, Acquisition checks to see if the
-+    object has a _aq_dynamic method, which is then called. It is functionally
-+    equivalent to __getattr__, but _aq_dynamic is called with 'self' as the
-+    acquisition wrapped object where as __getattr__ is called with self as the
-+    unwrapped object.
-+
-+    Let's see how this works. In the examples below, the A class defines
-+    '_aq_dynamic', but returns 'None' for all attempts, which means that no new
-+    attributes should be generated dynamically. It also doesn't define 'color'
-+    attribute, even though it uses it in the 'hi' method.
-+
-+        >>> A().hi()
-+        Traceback (most recent call last):
-+        ...
-+        AttributeError: color
-+    
-+    The class B, on the other hand, generates all attributes dynamically,
-+    except if it is called 'bonjour'.
-+    
-+    First we need to check that, even if an object provides '_aq_dynamic',
-+    "regular" Aquisition attribute access should still work:
-+
-+        >>> b=B()
-+        >>> b.a=A()
-+        >>> b.a.hi()
-+        A('a') red
-+        >>> b.a.color='green'
-+        >>> b.a.hi()
-+        A('a') green
-+
-+    Now, let's see some dynamically generated action. B does not define a
-+    'salut' method, but remember that it dynamically generates a method for
-+    every attribute access:
-+
-+        >>> b.a.salut()
-+        B('b').salut
-+        chain: B('b')
-+
-+        >>> a=A('a1')
-+        >>> a.b=B('b1')
-+        >>> a.b.salut()
-+        B('b1').salut
-+        chain: B('b1') <- A('a1')
-+
-+        >>> b.a.bonjour()
-+        Traceback (most recent call last):
-+        ...
-+        AttributeError: bonjour
-+
-+        >>> a.b.bonjour()
-+        Traceback (most recent call last):
-+        ...
-+        AttributeError: bonjour
-+
-+    '''
-+
-+def test_wrapper_comparissons():
-+    r'''
-+
-+    Test wrapper comparisons in presence of _aq_dynamic
-+
-+        >>> b=B()
-+        >>> b.a=A()
-+        >>> foo = b.a
-+        >>> bar = b.a
-+        >>> assert( foo == bar )
-+        >>> c = A('c')
-+        >>> b.c = c
-+        >>> b.c.d = c
-+        >>> b.c.d == c
-+        True
-+        >>> b.c.d == b.c
-+        True
-+        >>> b.c == c
-+        True
-+
-+    Test contextuality in presence of _aq_dynamic
-+
-+        >>> checkContext(b.c, b)
-+        True
-+        >>> checkContext(b.c, b.a)
-+        False
-+
-+        >>> assert b.a.aq_inContextOf(b)
-+        >>> assert b.c.aq_inContextOf(b)
-+        >>> assert b.c.d.aq_inContextOf(b)
-+        >>> assert b.c.d.aq_inContextOf(c)
-+        >>> assert b.c.d.aq_inContextOf(b.c)
-+        >>> assert not b.c.aq_inContextOf(foo)
-+        >>> assert not b.c.aq_inContextOf(b.a)
-+        >>> assert not b.a.aq_inContextOf('somestring')
-+'''
-+
-diff -Naur Acquisition-4.7.orig/src/Acquisition/tests.py Acquisition-4.7-py2.7-linux-x86_64.egg/src/Acquisition/tests.py
---- Acquisition-4.7.orig/src/Acquisition/tests.py	2021-03-17 16:22:28.266539592 +0100
-+++ Acquisition-4.7-py2.7-linux-x86_64.egg/src/Acquisition/tests.py	2021-03-17 16:31:31.971132854 +0100
-@@ -3366,6 +3366,7 @@
- 
-     suites = [
-         DocTestSuite(),
-+        DocTestSuite('Acquisition.test_dynamic_acquisition'),
-         unittest.defaultTestLoader.loadTestsFromName(__name__),
-     ]
- 
-diff -Naur Acquisition-4.7.orig/src/Acquisition.egg-info/SOURCES.txt Acquisition-4.7-py2.7-linux-x86_64.egg/src/Acquisition.egg-info/SOURCES.txt
---- Acquisition-4.7.orig/src/Acquisition.egg-info/SOURCES.txt	2021-03-17 16:22:28.262539558 +0100
-+++ Acquisition-4.7-py2.7-linux-x86_64.egg/src/Acquisition.egg-info/SOURCES.txt	2021-03-17 16:32:31.619638229 +0100
-@@ -15,9 +15,10 @@
- src/Acquisition/__init__.py
- src/Acquisition/interfaces.py
- src/Acquisition/tests.py
-+src/Acquisition/test_dynamic_acquisition.py
- src/Acquisition.egg-info/PKG-INFO
- src/Acquisition.egg-info/SOURCES.txt
- src/Acquisition.egg-info/dependency_links.txt
- src/Acquisition.egg-info/not-zip-safe
- src/Acquisition.egg-info/requires.txt
--src/Acquisition.egg-info/top_level.txt
-\ Pas de fin de ligne à la fin du fichier
-+src/Acquisition.egg-info/top_level.txt

component/inkscape/buildout.cfg

@@ -23,6 +23,7 @@ extends =
   ../popt/buildout.cfg
   ../xorg/buildout.cfg
   ../zlib/buildout.cfg
+# Inkscape < 1.1 only supports python2
   ../python-2.7/buildout.cfg
 
 [gsl]

component/trafficserver/buildout.cfg

@@ -40,6 +40,11 @@ configure-options =
   --disable-hwloc
   --enable-experimental-plugins
   --disable-posix-cap
+patch-options = -p1
+# https://github.com/apache/trafficserver/pull/8545 + https://github.com/apache/trafficserver/pull/8617
+# (see https://github.com/apache/trafficserver/issues/8539 for the detail)
+patches =
+  ${:_profile_base_location_}/trafficserver-9.1.1-TSHttpTxnCacheLookupStatusGet-fix.patch#d8ed3db3a48e97eb72aaaf7d7598a2d2
 environment =
   PATH=${libtool:location}/bin:${make:location}/bin:${patch:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:%(PATH)s
   LDFLAGS =-L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${tcl:location}/lib -Wl,-rpath=${tcl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${luajit:location}/lib  -lm

component/trafficserver/trafficserver-9.1.1-TSHttpTxnCacheLookupStatusGet-fix.patch

+diff -ur trafficserver-9.1.1.orig/src/traffic_server/InkAPI.cc trafficserver-9.1.1/src/traffic_server/InkAPI.cc
+--- trafficserver-9.1.1.orig/src/traffic_server/InkAPI.cc	2021-10-29 15:38:50.000000000 +0000
++++ trafficserver-9.1.1/src/traffic_server/InkAPI.cc	2022-01-31 10:37:24.675347079 +0000
+@@ -5443,7 +5443,11 @@
+     break;
+   case HttpTransact::CACHE_LOOKUP_HIT_WARNING:
+   case HttpTransact::CACHE_LOOKUP_HIT_FRESH:
+-    *lookup_status = TS_CACHE_LOOKUP_HIT_FRESH;
++    if (HttpTransact::need_to_revalidate(&sm->t_state)) {
++      *lookup_status = TS_CACHE_LOOKUP_MISS;
++    } else {
++      *lookup_status = TS_CACHE_LOOKUP_HIT_FRESH;
++    }
+     break;
+   case HttpTransact::CACHE_LOOKUP_SKIPPED:
+     *lookup_status = TS_CACHE_LOOKUP_SKIPPED;

component/wendelin.core/buildout.cfg

@@ -50,7 +50,7 @@ CGO_LDFLAGS += -Wl,-rpath=${zlib:location}/lib
 recipe  = slapos.recipe.build:gitclone
 repository = https://lab.nexedi.com/nexedi/wendelin.core.git
 branch   = master
-revision = wendelin.core-2.0.alpha2-1-gad6305c0
+revision = wendelin.core-2.0.alpha2-2-g3d0f134c
 # dir is pretty name as top-level recipe
 location = ${buildout:parts-directory}/wendelin.core
 git-executable = ${git:location}/bin/git

software/ors-amarisoft/buildout.hash.cfg

@@ -20,7 +20,7 @@ md5sum = 6ea4fa210a91c15278c847a809de5991
 
 [template-lte-enb-epc]
 _update_hash_filename_ = instance-enb-epc.jinja2.cfg
-md5sum = 25fae79db2b30be0f365ad967b278c3c
+md5sum = cf6c400d9fa5b0942f9be7145f77b8de
 
 [template-lte-enb]
 _update_hash_filename_ = instance-enb.jinja2.cfg
@@ -28,7 +28,7 @@ md5sum = fe249168a3f50b0efe6aeae39afb03ae
 
 [template-lte-gnb-epc]
 _update_hash_filename_ = instance-gnb-epc.jinja2.cfg
-md5sum = 5ec4508b02f6e7fbdbe1f37c65b9d897
+md5sum = f94c3e2f714629d9e1fc9b2f7c8eb586
 
 [template-lte-gnb]
 _update_hash_filename_ = instance-gnb.jinja2.cfg
@@ -44,11 +44,11 @@ md5sum = d33163012d6c98efc59161974c649557
 
 [enb.jinja2.cfg]
 filename = config/enb.jinja2.cfg
-md5sum = 97d9cdd07704cae36c5e4234c87025e8
+md5sum = 8cac0de54f54236e750ee85b98de8a31
 
 [gnb.jinja2.cfg]
 filename = config/gnb.jinja2.cfg
-md5sum = b0df7f3b679b25d5296dd67e074364b4
+md5sum = 28cc9fc7b1fa7cccb16315a732d9a15f
 
 [ltelogs.jinja2.sh]
 filename = ltelogs.jinja2.sh

software/ors-amarisoft/config/enb.jinja2.cfg

@@ -61,7 +61,11 @@
   ],
   /* GTP bind address (=address of the ethernet interface connected to
      the MME). Must be modified if the MME runs on a different host. */
+{% if slapparameter_dict.get('mme_addr', '') %}
   gtp_addr: "{{ gtp_addr }}",
+{% else %}
+  gtp_addr: "127.0.1.1",
+{% endif %}
 
   /* high 20 bits of SIB1.cellIdentifier */
   enb_id: {{ slapparameter_dict.get('enb_id', '0x1A2D0') }},

software/ors-amarisoft/config/gnb.jinja2.cfg

@@ -42,7 +42,11 @@
   ],
   /* GTP bind address (=address of the ethernet interface connected to
      the AMF). Must be modified if the AMF runs on a different host. */
+{% if slapparameter_dict.get('mme_addr', '') %}
   gtp_addr: "{{ gtp_addr }}",
+{% else %}
+  gtp_addr: "127.0.1.1",
+{% endif %}
 
   gnb_id_bits: 28,
   gnb_id: {{ slapparameter_dict.get('gnb_id', '0x12345') }},

software/ors-amarisoft/instance-enb-epc.jinja2.cfg

@@ -70,6 +70,12 @@ config-dl_earfcn = {{ dumps(slapparameter_dict["dl_earfcn"]) }}
 {% if slapparameter_dict.get("n_rb_dl", None) %}
 config-n_rb_dl = {{ dumps(slapparameter_dict["n_rb_dl"]) }}
 {% endif %}
+{% if slapparameter_dict.get("mme_addr", None) %}
+config-mme_addr = {{ dumps(slapparameter_dict["mme_addr"]) }}
+{% endif %}
+{% if slapparameter_dict.get("enb_id", None) %}
+config-enb_id = {{ dumps(slapparameter_dict["enb_id"]) }}
+{% endif %}
 
 [monitor-base-url-dict]
 lte-epc-request =  ${lte-epc-request:connection-monitor-base-url}

software/ors-amarisoft/instance-gnb-epc.jinja2.cfg

@@ -73,6 +73,12 @@ config-nr_band = {{ dumps(slapparameter_dict["nr_band"]) }}
 {% if slapparameter_dict.get("nr_bandwidth", None) %}
 config-nr_bandwidth = {{ dumps(slapparameter_dict["nr_bandwidth"]) }}
 {% endif %}
+{% if slapparameter_dict.get("mme_addr", None) %}
+config-mme_addr = {{ dumps(slapparameter_dict["mme_addr"]) }}
+{% endif %}
+{% if slapparameter_dict.get("enb_id", None) %}
+config-enb_id = {{ dumps(slapparameter_dict["enb_id"]) }}
+{% endif %}
 
 [monitor-base-url-dict]
 lte-epc-request =  ${lte-epc-request:connection-monitor-base-url}

stack/erp5/buildout.cfg

@@ -597,7 +597,7 @@ extra-paths =
 patch-binary = ${patch:location}/bin/patch
 PyPDF2-patches = ${:_profile_base_location_}/../../component/egg-patch/PyPDF2/0001-Custom-implementation-of-warnings.formatwarning-remo.patch#d25bb0f5dde7f3337a0a50c2f986f5c8
 PyPDF2-patch-options = -p1
-Acquisition-patches =  ${:_profile_base_location_}/../../component/egg-patch/Acquisition/Acquisition-4.7.patch#85b0090e216cead0fc86c5c274450d96
+Acquisition-patches = ${:_profile_base_location_}/../../component/egg-patch/Acquisition/aq_dynamic-4.7.patch#85b0090e216cead0fc86c5c274450d96
 Acquisition-patch-options = -p1
 python-magic-patches = ${:_profile_base_location_}/../../component/egg-patch/python_magic/magic.patch#de0839bffac17801e39b60873a6c2068
 python-magic-patch-options = -p1