wip

component/PyWavelets/buildout.cfg

@@ -14,6 +14,10 @@ parts =
 [PyWavelets]
 recipe = zc.recipe.egg:custom
 egg = PyWavelets
+patches =
+  ${:_profile_base_location_}/../../component/egg-patch/PyWavelets/warnings.patch#52aed360275ccb6c419eb0b1f9c631c0
+patch-options = -p1
+patch-binary = ${patch:location}/bin/patch
 environment = PyWavelets-env
 setup-eggs =
   ${numpy:egg}

component/dcron/buildout.cfg

@@ -16,7 +16,7 @@ patches =
 patch-options = -p1
 make-options =
   PREFIX=${buildout:parts-directory}/${:_buildout_section_name_}
-post-make-hook = ${:_profile_base_location_}/dcron-hooks.py#860e914dff4108b47565965fe5ebc7b5:post_make_hook
+post-make-hook = ${:_profile_base_location_}/dcron-hooks.py#d7985eef1ceef01af00ffb1d38708c8d:post_make_hook
 environment =
   PATH=${patch:location}/bin:%(PATH)s
 randomsleep_install = ${randomsleep:location}

component/dcron/dcron-hooks.py

@@ -2,4 +2,4 @@ import os
 import shutil
 def post_make_hook(options, buildout):
   crontab_path = os.path.join(options['location'], 'bin', 'crontab')
-  os.chmod(crontab_path, 0750)
+  os.chmod(crontab_path, 0o750)

component/egg-patch/PyWavelets/warnings.patch

+diff -ur PyWavelets-1.0.1.orig/setup.py PyWavelets-1.0.1/setup.py
+--- PyWavelets-1.0.1.orig/setup.py	2018-12-11 11:43:34.663494267 +0100
++++ PyWavelets-1.0.1/setup.py	2018-12-11 11:44:04.480696960 +0100
+@@ -5,6 +5,7 @@
+ import sys
+ import subprocess
+ import textwrap
++import warnings
+ from functools import partial
+ from distutils.sysconfig import get_python_inc

component/egg-patch/ZEO4/TCP_NODELAY.patch

-From 8b31ccec54584a287cc61501948283d7d6ee7073 Mon Sep 17 00:00:00 2001
-From: Julien Muchembled <jm@nexedi.com>
-Date: Mon, 26 Mar 2018 20:39:07 +0200
-Subject: [PATCH] Enable TCP_NODELAY for inet(6) sockets
-
-See commit 3d886d426243655b9f5a2528636e42b5c7662c19.
----
- src/ZEO/zrpc/client.py | 2 ++
- src/ZEO/zrpc/server.py | 1 +
- 2 files changed, 3 insertions(+)
-
-diff --git a/src/ZEO/zrpc/client.py b/src/ZEO/zrpc/client.py
-index 32a7a877..669f5962 100644
---- a/src/ZEO/zrpc/client.py
-+++ b/src/ZEO/zrpc/client.py
-@@ -568,6 +568,8 @@ def __init__(self, domain, addr, mgr, client):
-             self.close()
-             return
-         self.sock.setblocking(0)
-+        if domain in (socket.AF_INET, socket.AF_INET6):
-+            self.sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
-         self.state = "opened"
- 
-     def connect_procedure(self):
-diff --git a/src/ZEO/zrpc/server.py b/src/ZEO/zrpc/server.py
-index b83cc004..af91e3e4 100644
---- a/src/ZEO/zrpc/server.py
-+++ b/src/ZEO/zrpc/server.py
-@@ -66,6 +66,7 @@ def _open_socket(self):
-                         socket.IPPROTO_IPV6, socket.IPV6_V6ONLY, True)
-             else:
-                 self.create_socket(socket.AF_INET, socket.SOCK_STREAM)
-+            self.socket.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
-         else:
-             self.create_socket(socket.AF_UNIX, socket.SOCK_STREAM)
-         self.set_reuse_addr()
--- 
-2.14.1
-

component/kumo/buildout.cfg

@@ -14,7 +14,7 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = https://github.com/downloads/etolabo/kumofs/kumofs-0.4.13.tar.gz
 md5sum = 46148e9536222d0ad2ef36777c55714d
-pre-configure-hook = ${:_profile_base_location_}/kumo-hooks.py#958a595a02de75624728f8d65e39d800:pre_configure_hook
+pre-configure-hook = ${:_profile_base_location_}/kumo-hooks.py#408582cb945eb38b411737168403e1e0:pre_configure_hook
 patches =
   ${:_profile_base_location_}/kumofs-0.4.13_ipv6support_multiiplistenfix.patch#53af9f1f1375940841c589a6cbe11425
   ${:_profile_base_location_}/kumofs-0.4.13_fix_gcc-4.9_ftbfs.patch#c09e04c620ce11c3fdd4afc3459cd355

component/python-ldap-python/buildout.cfg

@@ -5,22 +5,17 @@ extends =
   ../cyrus-sasl/buildout.cfg
   ../openldap/buildout.cfg
   ../openssl/buildout.cfg
-  ../patch/buildout.cfg
 
 [python-ldap-python]
 recipe = zc.recipe.egg:custom
 egg = python-ldap
-patches =
-  ${:_profile_base_location_}/python-ldap-no_default_dirs.patch#959115f13f1de5c63654c69b8dfacd69
-patch-options = -p1
-patch-binary = ${patch:location}/bin/patch
 rpath =
   ${openldap:location}/lib
   ${cyrus-sasl:location}/lib
   ${openssl:location}/lib
 include-dirs =
   ${openldap:location}/include
-  ${cyrus-sasl:location}/include/sasl
+  ${cyrus-sasl:location}/include
   ${openssl:location}/include
 library-dirs =
   ${openldap:location}/lib

component/python-ldap-python/python-ldap-no_default_dirs.patch

-diff -ur python-ldap-2.4.20.orig/setup.cfg python-ldap-2.4.20/setup.cfg
---- python-ldap-2.4.20.orig/setup.cfg	2015-07-07 15:25:42.000000000 +0200
-+++ python-ldap-2.4.20/setup.cfg	2015-09-02 15:59:48.846802676 +0200
-@@ -1,6 +1,4 @@
- [_ldap]
--library_dirs = /usr/lib /usr/lib64 /usr/local/lib /usr/local/lib64
--include_dirs = /usr/include /usr/include/sasl /usr/local/include /usr/local/include/sasl
- defines = HAVE_SASL HAVE_TLS HAVE_LIBLDAP_R
- extra_compile_args = 
- extra_objects = 

component/randomsleep/buildout.cfg

@@ -26,4 +26,4 @@ script =
   wrapper_script_path = os.path.join(self.options['bin_dir'], 'randomsleep')
   with open(wrapper_script_path, 'w') as f:
     f.write(self.options['wrapper_script_code'])
-  os.chmod(wrapper_script_path, 0750)
+  os.chmod(wrapper_script_path, 0o750)

software/erp5/software-py3.cfg

+[buildout]
+extends =
+  ../../component/python3/buildout.cfg
+  software.cfg
+allow-picked-versions = true
+check-signature = false
+python = python3.5
+
+[nghttp2]
+environment =
+  PATH=${autoconf:location}/bin:${automake:location}/bin:${libtool:location}/bin:${m4:location}/bin:${python3.5:location}/bin:%(PATH)s
+
+[boost-lib]
+configure-command = ./bootstrap.sh --prefix=${:location} --without-libraries=python
+#configure-command = ./bootstrap.sh --prefix=${:location} --with-python=${python3.5:location}/bin/python3.5
+#url = http://downloads.sourceforge.net/sourceforge/boost/boost_1_66_0.tar.bz2
+#md5sum = b2dfbd6c717be4a7bb2d88018eaccf75
+
+[atk]
+configure-options =
+  --with-python=${python3.5:location}/bin/python3.5
+  --with-python-root=${python3.5:location}
+  --disable-gtk-doc-html
+
+[supervisor-repository]
+recipe = slapos.recipe.build:gitclone
+git-executable = ${git:location}/bin/git
+forbid-download-cache = true
+branch = master
+repository = https://github.com/Supervisor/supervisor.git
+
+[supervisor-develop]
+recipe = zc.recipe.egg:develop
+egg = supervisor
+setup = ${supervisor-repository:location}
+
+[neoppod-develop]
+setup = /srv/slapgrid/slappart29/srv/runner/project/neoppod
+
+[slapos-deps-eggs]
+eggs +=
+  ${supervisor-develop:egg}
+
+[slapos-cookbook]
+depends = ${slapos-cookbook-develop:recipe}
+
+[slapos.cookbook-repository]
+recipe =
+location = /srv/slapgrid/slappart29/srv/runner/project/slapos
+[erp5]
+recipe =
+location = /srv/slapgrid/slappart29/srv/runner/project/erp5
+
+# Let's ignore these for now
+[rdiff-backup]
+recipe =
+[rdiff-backup-build]
+recipe =
+[ocropy]
+recipe =
+[hookbox]
+recipe =
+
+[eggs]
+# Let's ignore these for now
+eggs -=
+  ${ocropy:egg}
+  PyXML
+  threadframe
+  suds
+  ${pysvn-python:egg}
+  SOAPpy
+  xupdate_processor
+  ZEO
+# pytracemalloc is now part of Python 3.4
+  pytracemalloc
+script += pylint
+
+[versions]
+netifaces = 0.10.7
+supervisor =
+slapos.cookbook =
+zope.testing = 4.6.2
+Acquisition = 4.5+SlapOSPatched001
+zope.security = 4.3.0
+zope.container = 4.2.2
+ExtensionClass = 4.4
+Record = 3.5
+zope.proxy = 4.3.1
+zope.i18nmessageid = 4.3.1
+tempstorage = 4.0.1
+Persistence = 3.0b2
+MultiMapping = 4.1
+Missing = 4.1
+DocumentTemplate = 3.0b5
+AccessControl = 4.0b6
+python-ldap = 3.1.0
+PyWavelets = 1.0.1+SlapOSPatched001
+pyasn1 = 0.4.4
+pyasn1-modules = 0.2.2
+zope.traversing = 4.3.1
+Products.BTreeFolder2 = 4.1
+Zope2 = 4.0b1
+zope.pagetemplate = 4.4.1
+zope.browserresource = 4.3
+zope.browserpage = 4.3.0
+zExceptions = 4.1
+transaction = 2.4.0
+
+# Needed for neoppod, apparently
+ZEO = 5.2.0
+ZODB = 5.5.1
+zodbpickle = 1.0.2
+persistent = 4.4.3
+
+zope.tal = 4.4
+zope.i18n = 4.6.1
+zope.contenttype = 4.4
+RestrictedPython = 4.0b7
+
+[networkcache]
+download-cache-url = http://www.shacache.org/shacache
+download-dir-url = http://www.shacache.org/shadir
+
+#PYTHONPATH=$PYTHONPATH:eggs/six-1.11.0-py3.5.egg/ bin/buildout
\ No newline at end of file

software/neoppod/software-zodb5.cfg

 [buildout]
 extends = software.cfg
 
-[neoppod]
-ZEO-patches =
-
 [versions]
 ZODB = 5.4.0
 ZEO = 5.2.0

software/slapos-testing/software-py3.cfg

@@ -17,9 +17,6 @@ recipe = zc.recipe.egg:develop
 egg = supervisor
 setup = ${supervisor-repository:location}
 
-[slapos.core-repository]
-branch = py3
-
 [slapos.cookbook-repository]
 branch = py3
 

stack/erp5/buildout.cfg

@@ -584,7 +584,7 @@ extra-paths =
 
 # patches for eggs
 patch-binary = ${patch:location}/bin/patch
-Acquisition-patches = ${:_profile_base_location_}/../../component/egg-patch/Acquisition/aq_dynamic.patch#1d9a56e9af4371f5b6951ebf217a15d7
+Acquisition-patches = ${:_profile_base_location_}/../../component/egg-patch/Acquisition/aq_dynamic.patch#e923ab436d53282df536de3ef7d3e127
 Acquisition-patch-options = -p1
 Products.DCWorkflow-patches = ${:_profile_base_location_}/../../component/egg-patch/Products.DCWorkflow/workflow_method.patch#975b49e96bae33ac8563454fe5fa9899
 Products.DCWorkflow-patch-options = -p1