Merge remote-tracking branch 'origin/erp5-component' into erp5

component/apache/buildout.cfg

@@ -30,10 +30,10 @@ md5sum = 52b31b33fb1aa16e65ddaefc76e41151
 recipe = hexagonit.recipe.cmmi
 depends =
   ${gdbm:version}
-version = 2.4.2
+version = 2.4.3
 revision = 1
 url = http://mir2.ovh.net/ftp.apache.org/dist/httpd/httpd-${:version}.tar.bz2
-md5sum = 6bb12f726e22656f0ad2baf91f1f8329
+md5sum = 87aaf7bc7e8715f0455997bb8c6791aa
 configure-command = cp -ar ${apr:location}/apr-${apr:version} srclib/apr/; cp -ar ${apr-util:location}/apr-util-${apr-util:version} srclib/apr-util; ./configure
 configure-options = --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
                     --disable-static

component/gcc/buildout.cfg

@@ -170,4 +170,4 @@ make-targets = install -j1
 # until gcc will be simplified by using more robust build recipe (like
 # slapos.recipe.build) each time any of parts which reuses this one gets updated
 # the hack-revision have to be increased
-hack-revision = 1
+hack-revision = 2

component/varnish/buildout.cfg

@@ -40,5 +40,5 @@ environment =
 
 [varnish-3.0]
 <= varnish-2.1
-url = http://repo.varnish-cache.org/source/varnish-3.0.2.tar.gz
-md5sum = c8eae0aabbe66b6daabdf3a1f58cd47a
+url = http://repo.varnish-cache.org/source/varnish-3.0.3.tar.gz
+md5sum = 714310c83fdbd2061d897dacd3f63d8b

slapos/recipe/generic_varnish/template/default.vcl.in

@@ -23,10 +23,6 @@ backend default {
 
 # Called at the beginning of a request, after the complete request has been received and parsed
 sub vcl_recv {
-    # Force lookup if the request is a no-cache request from the client
-    if (req.http.cache-control ~ "no-cache") {
-        ban_url(req.url);
-    }
     # Pass any requests that Varnish does not understand straight to the backend.
     if (req.request != "GET" &&
         req.request != "HEAD" &&

stack/erp5/buildout.cfg

@@ -247,7 +247,7 @@ mode = 640
 # XXX: "template.cfg" is hardcoded in instanciation recipe
 filename = template.cfg
 template = ${:_profile_base_location_}/instance.cfg.in
-md5sum = 9704211fdbed6b23854dcc2222d387c4
+md5sum = 26d26c357053af48602b5110120bd085
 extra-context =
     key apache_location apache:location
     key aspell_location aspell:location
@@ -287,8 +287,8 @@ extra-context =
     key poppler_location poppler:location
     key sed_location sed:location
     key template_cloudooo template-cloudooo:target
-    key template_erp5_development template-erp5-development:target
-    key template_erp5_production template-erp5-production:rendered
+    key template_erp5_single template-erp5-single:target
+    key template_erp5_cluster template-erp5-cluster:rendered
     key template_kumofs template-kumofs:rendered
     key template_mariadb template-mariadb:rendered
     key template_memcached template-memcached:rendered
@@ -311,15 +311,15 @@ extra-context =
     key dash_location dash:location
     key memcached_location memcached:location
 
-[template-erp5-development]
+[template-erp5-single]
 recipe = slapos.recipe.build:download
-url = ${:_profile_base_location_}/instance-erp5-development.cfg.in
+url = ${:_profile_base_location_}/instance-erp5-single.cfg.in
 md5sum = 2a4312202a3160f874c4fa3ee9155a1d
 mode = 640
 
-[template-erp5-production]
+[template-erp5-cluster]
 < = template-jinja2-base
-filename = instance-erp5-production.cfg
+filename = instance-erp5-cluster.cfg
 md5sum = 3051f3fea39d7409c417dcac26027b56
 extra-context =
     key local_bt5_repository local-bt5-repository:list
@@ -473,9 +473,10 @@ eggs =
   huBarcode
   qrcode
 
-# Zope 2.12 with patched acquisition
+# Zope
   ZODB3
   Zope2
+# Zope acquisition patch
   Acquisition
 
 # Other Zope 2 packages
@@ -574,7 +575,7 @@ pysvn = 1.7.4nxd006
 
 # CMF 2.3 requries Zope 2.13.
 Products.CMFCalendar = 2.2.2
-Products.CMFCore = 2.2.5
+Products.CMFCore = 2.2.6
 Products.CMFDefault = 2.2.2
 Products.CMFTopic = 2.2.1
 Products.CMFUid = 2.2.1
@@ -583,7 +584,7 @@ Products.CMFUid = 2.2.1
 slapos.cookbook =
 
 # Pinned versions
-Flask = 0.8
+Flask = 0.9
 GitPython = 0.3.2.RC1
 MySQL-python = 1.2.3
 PIL = 1.1.7
@@ -591,68 +592,63 @@ Paste = 1.7.5.1
 PasteDeploy = 1.5.0
 PasteScript = 1.7.5
 Products.CMFActionIcons = 2.1.3
-Products.CMFCalendar = 2.2.2
-Products.CMFCore = 2.2.5
-Products.CMFDefault = 2.2.2
-Products.CMFTopic = 2.2.1
-Products.CMFUid = 2.2.1
 Products.DCWorkflowGraph = 0.4.1
 Products.ExternalEditor = 1.1.0
-Products.GenericSetup = 1.7.1
+Products.GenericSetup = 1.7.2
 Products.MimetypesRegistry = 2.0.3
-Products.PluggableAuthService = 1.7.7
-Products.PluginRegistry = 1.3b1
-Products.TIDStorage = 5.4.7.dev-r45842
+Products.PluggableAuthService = 1.8.0
+Products.PluginRegistry = 1.3
+Products.TIDStorage = 5.4.8
 Products.Zelenium = 1.0.3
 StructuredText = 2.11.1
 WSGIUtils = 0.7
 Werkzeug = 0.8.3
-apache-libcloud = 0.9.1
-argparse = 1.1
+apache-libcloud = 0.11.1
+argparse = 1.2.1
 async = 0.6.1
 atomize = 0.1.1
 buildout-versions = 1.7
 cElementTree = 1.0.5-20051216
-chardet = 1.0.1
-coverage = 3.5.1
+chardet = 1.1
+coverage = 3.5.2
 csp-eventlet = 0.7.0
 elementtree = 1.2.7-20070827-preview
 erp5.recipe.cmmiforcei686 = 0.1.3
 erp5.util = 0.4.6
 erp5diff = 0.8.1.5
-eventlet = 0.9.16
-feedparser = 5.1.1
+eventlet = 0.9.17
+feedparser = 5.1.2
 five.localsitemanager = 2.0.5
 fpconst = 0.7.2
 gitdb = 0.5.4
-greenlet = 0.3.4
-hexagonit.recipe.cmmi = 1.5.0
-http-parser = 0.7.5
+greenlet = 0.4.0
+hexagonit.recipe.cmmi = 1.6
+http-parser = 0.7.8
 huBarcode = 0.63
 inotifyx = 0.2.0
-ipdb = 0.6.1
-ipython = 0.12
+ipdb = 0.7
+ipython = 0.13
 meld3 = 0.6.8
-netaddr = 0.7.6
+netaddr = 0.7.9
 netifaces = 0.8
 ordereddict = 1.1
-paramiko = 1.7.7.1
+paramiko = 1.7.7.2
 plone.recipe.command = 1.1
 ply = 3.4
 polib = 1.0.0
-psutil = 0.4.1
-python-ldap = 2.4.9
+psutil = 0.6.1
+python-ldap = 2.4.10
 python-magic = 0.4.2
 python-memcached = 1.47
-restkit = 4.1.2
+restkit = 4.2.0
 rtjp-eventlet = 0.3.2
 setuptools = 0.6c12dev-r88846
-slapos.core = 0.24
-slapos.recipe.build = 0.7
-slapos.recipe.template = 2.4
-slapos.toolbox = 0.23
+slapos.core = 0.28
+slapos.recipe.build = 0.10
+slapos.recipe.template = 2.4.2
+slapos.toolbox = 0.29
 smmap = 0.8.2
-socketpool = 0.3.0
+socketpool = 0.5.2
 supervisor = 3.0a12
 threadframe = 0.2
 timerserver = 2.0.2

stack/erp5/instance.cfg.in

@@ -165,32 +165,33 @@ extra-context =
     key tesseract_location dynamic-template-zope-parameters:tesseract
     key w3m_location dynamic-template-zope-parameters:w3m
 
-[template-erp5-development-parameters]
+[template-erp5-single-parameters]
 bin-directory = {{ bin_directory }}
 openssl = {{ openssl_location }}
 local_bt5_repository = {{ local_bt5_repository  }}
 dash = {{ dash_location }}
 curl = {{ curl_location }}
 
-[template-erp5-development]
+[template-erp5-single]
 < = jinja2-template-base
-template = {{ template_erp5_development }}
-filename = instance-erp5-development.cfg
+template = {{ template_erp5_single }}
+filename = instance-erp5-single.cfg
 # XXX: duplicates above section, so less is modified in template in this
 # commit. Should be replaced by a "section" line (preserving template_zope
 # definition).
 extra-context =
-    key bin_directory template-erp5-development-parameters:bin-directory
-    key openssl_location template-erp5-development-parameters:openssl
-    key curl_location template-erp5-development-parameters:curl
-    key dash_location template-erp5-development-parameters:dash
+    key bin_directory template-erp5-single-parameters:bin-directory
+    key openssl_location template-erp5-single-parameters:openssl
+    key curl_location template-erp5-single-parameters:curl
+    key dash_location template-erp5-single-parameters:dash
     key template_zope dynamic-template-zope:rendered
-    key local_bt5_repository template-erp5-development-parameters:local_bt5_repository
+    key local_bt5_repository template-erp5-single-parameters:local_bt5_repository
 
 [switch-softwaretype]
 recipe = slapos.cookbook:softwaretype
-default = ${template-erp5-development:rendered}
-production = {{ template_erp5_production }}
+default = ${template-erp5-single:rendered}
+production = {{ template_erp5_cluster }}
+cluster = {{ template_erp5_cluster }}
 kumofs = {{ template_kumofs }}
 memcached = {{ template_memcached }}
 cloudooo = ${dynamic-template-cloudooo:rendered}

stack/slapos.cfg

@@ -21,6 +21,7 @@ find-links +=
 
 # Use only quite well working sites.
 allow-hosts +=
+  *.googlecode.com
   *.nexedi.org
   *.python.org
   *.sourceforge.net
@@ -31,7 +32,6 @@ allow-hosts +=
   github.com
   launchpad.net
   peak.telecommunity.com
-  psutil.googlecode.com
   sourceforge.net
   www.dabeaz.com
   www.owlfish.com