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

component/haproxy/buildout.cfg

@@ -9,8 +9,8 @@ parts = haproxy
 
 [haproxy]
 recipe = slapos.recipe.cmmi
-url = http://haproxy.1wt.eu/download/1.4/src/haproxy-1.4.23.tar.gz
-md5sum = 6535d5e58037ada4b58b439cebe03c79
+url = http://haproxy.1wt.eu/download/1.4/src/haproxy-1.4.24.tar.gz
+md5sum = 86422620faa9759907563d5e0524b98c
 configure-command = true
 # If the system is running on Linux 2.6, we use "linux26" as the TARGET,
 # otherwise use "generic".

component/libreoffice-bin/buildout.cfg

@@ -12,11 +12,11 @@ find-links =
 [libreoffice-bin]
 recipe = slapos.recipe.build
 # here, two %s are used, first one is for directory name (eg. x86_64), and second one is for filename (eg. x86-64).
-version = 3.6.5
+version = 3.6.6
 url = http://download.documentfoundation.org/libreoffice/stable/${:version}/rpm/%s/LibO_${:version}_Linux_%s_install-rpm_en-US.tar.gz
 # supported architectures md5sums
-md5sum_x86 = 9575c9a567d48a9feeaed2f915bfdf7f
-md5sum_x86-64 = 302e326f2b2a524a78994705ea782770
+md5sum_x86 = 922935201a350a7e0d3f83c08f739ee2
+md5sum_x86-64 = fa41089ce29eb03cdfb34d06a1e786db
 
 # where office code can be found?
 officedir = libreoffice3.6

component/python-2.7/buildout.cfg

@@ -25,9 +25,9 @@ python = python2.7
 
 [python2.7]
 recipe = slapos.recipe.cmmi
-package_version = 2.7.4
+package_version = 2.7.5
 package_version_suffix =
-md5sum = 62704ea0f125923208d84ff0568f7d50
+md5sum = 6334b666b7ff2038c761d7b27ba699c1
 
 depends =
   ${gdbm:version}

component/rpm2cpio/buildout.cfg

@@ -6,4 +6,4 @@ parts =
 # https://github.com/ruda/rpm2cpio
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:_buildout_section_name_}
-md5sum = c5bb6227d99e1ff5df880f997cbed2e3
+md5sum = aa3a5920a1d8963592be0c2666ee05e2

component/rpm2cpio/rpm2cpio

@@ -3,7 +3,33 @@
 #
 # Standalone RPM to CPIO converter
 # Copyright (c) 2012 Rudá Moura
+# https://github.com/ruda/rpm2cpio
 #
+# Impove gzip header detection thanks to
+# http://afb.users.sourceforge.net/centos/rpm2cpio.py
+#
+# Copyright (C) 1997,1998,1999, Roger Espel Llima
+# Copyright (C) 2000, Sergey Babkin
+# Copyright (C) 2009, Alex Kozlov
+# Copyright (C) 2010, Anders F Bjorklund
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and any associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# SOFTWARE'S COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE
 
 '''Extract cpio archive from RPM package.
 
@@ -21,6 +47,7 @@ rpm2cpio < adjtimex-1.20-2.1.i386.rpm  | cpio -it
 '''
 
 import sys
+import struct
 import StringIO
 import gzip
 
@@ -31,12 +58,32 @@ def rpm2cpio(stream_in=sys.stdin, stream_out=sys.stdout):
     lead = stream_in.read(96)
     if lead[0:4] != RPM_MAGIC:
         raise IOError, 'the input is not a RPM package'
-    data = stream_in.read()
-    idx = data.find(GZIP_MAGIC)
-    if idx == -1:
-        raise IOError, 'could not find compressed cpio archive'
-    gzstream = StringIO.StringIO(data[idx:])
-    gzipper = gzip.GzipFile(fileobj=gzstream)
+    lead = stream_in.read(16)
+    if not lead:
+        raise IOError, 'No header'
+
+    while True:
+        (magic, ignore, sections, bytes) = struct.unpack("!LLLL", lead)
+        (smagic, smagic2) = struct.unpack("!HL", lead[0:6])
+
+        if smagic == 0x1f8b:
+            break
+
+        # skip the headers
+        stream_in.seek(16 * sections + bytes, 1)
+        while True:
+            lead = stream_in.read(1)
+            if lead == "":
+                raise IOError, 'No header'
+            if (0,) == struct.unpack("B", lead):
+                continue
+            break
+        lead += stream_in.read(15)
+        if lead == "":
+            raise IOError, 'No header'
+
+    stream_in.seek(-len(lead), 1)
+    gzipper = gzip.GzipFile(fileobj=stream_in)
     data = gzipper.read()
     stream_out.write(data)
 

component/slapos/buildout.cfg

@@ -44,6 +44,8 @@ allow-hosts =
   github.com
   peak.telecommunity.com
 
+unzip = true
+
 # separate from system python
 include-site-packages = false
 exec-sitecustomize = false
@@ -137,14 +139,15 @@ zc.recipe.egg = 1.3.2
 # Use own version of h.r.download to be able to open archives not supported by python2.x: .xz
 hexagonit.recipe.download = 1.6nxd002
 
-Jinja2 = 2.6
+Jinja2 = 2.7
+MarkupSafe = 0.18
 Werkzeug = 0.8.3
 buildout-versions = 1.7
 collective.recipe.template = 1.10
 lxml = 3.1.2
 meld3 = 0.6.10
 netaddr = 0.7.10
-slapos.libnetworkcache = 0.13.3
+slapos.libnetworkcache = 0.13.4
 xml-marshaller = 0.9.7
 z3c.recipe.scripts = 1.0.1
 
@@ -166,9 +169,8 @@ setuptools = 0.6c12dev-r88846
 
 # Required by:
 # slapos.core==0.35.2-dev
-supervisor = 3.0b1
+supervisor = 3.0b2
 
 # Required by:
 # slapos.core==0.35.2-dev
 zope.interface = 4.0.5
-

component/varnish/buildout.cfg

@@ -10,6 +10,7 @@ extends =
   ../ncurses/buildout.cfg
   ../pcre/buildout.cfg
   ../pkgconfig/buildout.cfg
+  ../readline/buildout.cfg
 
 [varnish]
 <= varnish-2.0
@@ -35,10 +36,10 @@ configure-options =
 environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${pcre:location}/lib/pkgconfig
-  CPPFLAGS=-I${ncurses:location}/include
-  LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib
+  CPPFLAGS=-I${ncurses:location}/include -I${readline:location}/include
+  LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib
 
 [varnish-3.0]
 <= varnish-2.1
-url = http://repo.varnish-cache.org/source/varnish-3.0.3.tar.gz
-md5sum = 714310c83fdbd2061d897dacd3f63d8b
+url = http://repo.varnish-cache.org/source/varnish-3.0.4.tar.gz
+md5sum = a130ce9c3504b9603a46542635e18701

component/xorg/buildout.cfg

@@ -346,7 +346,7 @@ recipe = slapos.recipe.cmmi
 url = http://www.x.org/releases/X11R7.6/src/lib/libXinerama-1.1.1.tar.bz2
 md5sum = ecd4839ad01f6f637c6fb5327207f89b
 environment =
-  PKG_CONFIG_PATH=${libX11:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libXext:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${xineramaproto:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig
+  PKG_CONFIG_PATH=${kbproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libXext:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${xineramaproto:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig
   PATH=${pkgconfig:location}/bin:%(PATH)s
 configure-options =
   --disable-static

software/hexaglobe-watermarking/README.rst

+Watermarking Software Release
+=============================
+
+This Software Release is used by Hexaglobe to deploy their video "watermarking"
+system.
+
+This is basically just an nginx daemon compiled with a few custom modules and with
+a custom configuration, and an "administration" nginx daemon.
+
+This Software Release also supports some early version of the "edge" support
+(i.e you request an instance of hexaglobe-watermarking, with "edge" software-type,
+and this instance will itself request many instances of watermakring over the world, in a
+"computing CDN" style).
+

software/jio/instance.cfg.in

@@ -16,9 +16,6 @@ offline = true
 [directory]
 recipe = slapos.cookbook:mkdirectory
 etc = $${buildout:directory}/etc
-script = $${:etc}/run/
-service = $${:etc}/service
-promise = $${:etc}/promise/
 bin = $${buildout:directory}/bin/
 
 [download-source]
@@ -47,6 +44,6 @@ LD_LIBRARY_PATH = ${libxslt:location}/lib:${libxml2:location}/lib:${zlib:locatio
 
 [phantomjs-wrapper]
 recipe = slapos.cookbook:wrapper
-command-line = ${phantomjs:location}/bin/phantomjs
+command-line = ${phantomjs:location}/phantomjs-slapos
 wrapper-path = $${directory:bin}/phantomjs
 parameters_extra = true

software/jio/software.cfg

@@ -8,12 +8,7 @@ extends =
   ../../component/python-2.7/buildout.cfg
   ../../component/python-setuptools/buildout.cfg
 
-# Local development
-develop =
-  ${:parts-directory}/slapos.cookbook-repository
 parts =
-  slapos.cookbook-repository
-  slapos-cookbook
   template
   phantomjs
   eggs
@@ -30,20 +25,12 @@ entry-points =
 scripts =
   runTestSuite
 
-# Local development until new egg is published (extra parameters to slapos.cookbook:wrapper
-[slapos.cookbook-repository]
-recipe = slapos.recipe.build:gitclone
-git-executable = ${git:location}/bin/git
-forbid-download-cache = true
-repository = http://git.erp5.org/repos/slapos.git
-branch = master
-
 [template]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg.in
 output = ${buildout:directory}/instance.cfg
 # MD5 checksum can be skipped for development, but must be filled for production
-md5sum = 1ef1bc6a3fb81300ce7139c512af96d7
+md5sum = 50fd41ad6f4aa6c49f4c80e3a81df61f
 mode = 0644
 
 [jio-repository]
@@ -64,7 +51,7 @@ lxml = 3.1.1
 meld3 = 0.6.10
 plone.recipe.command = 1.1
 psutil = 0.6.1
-slapos.cookbook = 0.76.0
+slapos.cookbook = 0.78.1
 slapos.recipe.build = 0.11.6
 slapos.recipe.template = 2.4.2
 

software/zabbix-agent/README.rst

+============================
+Zabbix Agent Software Release
+=============================
+
+This Software Release allows to deploy a Zabbix Agent that will connect
+to an existing Zabbix Server.
+
+Please see http://www.zabbix.com/ for more informations.
+
+
+Mandatory parameters
+====================
+
+hostname
+--------
+Name of the machine probed by the agent.
+
+server
+------
+list of Zabbix servers to connect to, comma-seperated.
+
+Optional parameters
+===================
+
+custom-user-parameter
+---------------------
+Add custom UserParameter(s) lines to the Zabbix Agent configuration file.
+
+
+Examples of instance parameters XML
+===================================
+
+Example 1
+~~~~~~~~~
+
+Simple request: just request a new instance of it, with the following parameters::
+
+  <?xml version="1.0" encoding="utf-8"?>
+    <instance>
+    <parameter id="server">REPLACE BY IP(v6) OF ZABBIX SERVER</parameter>
+    <parameter id="hostname">REPLACE BY DESIRED HOSTNAME OF MACHINE</parameter>
+  </instance>
+
+Example 2
+~~~~~~~~~
+
+Deploy a Zabbix Agent instance for machine named "mymachine" connecting to a Zabbix server accessible from 2001:41d0:1:9b1a::1::
+
+  <?xml version="1.0" encoding="utf-8"?>
+    <instance>
+    <parameter id="server">2001:41d0:1:9b1a::1</parameter>
+    <parameter id="hostname">mymachine</parameter>
+  </instance>
+
+Example 3
+~~~~~~~~~
+
+Deploy a Zabbix Agent instance for machine named "mymachine" connecting to a Zabbix server accessible from 2001:41d0:1:9b1a::1, with several custom parameters::
+
+  <?xml version="1.0" encoding="utf-8"?>
+  <instance>
+    <parameter id="server">2001:41d0:1:9b1a::1</parameter>
+    <parameter id="hostname">mymachine</parameter>
+    <parameter id="custom-user-parameter">
+    UserParameter=custom_random,echo $RANDOM
+    UserParameter=custom_date,date
+    </parameter>
+  </instance>
+

software/zabbix-agent/README.txt

-Zabbix Agent
-============
-
-This Software Release allows to deploy a Zabbix Agent that will connect
-to an existing Zabbix Server.
-
-
-How to request
-==============
-
-Just request a new instance of it, with the following parameters::
-
-  <?xml version="1.0" encoding="utf-8"?>
-    <instance>
-    <parameter id="server">REPLACE BY IP(v6) OF ZABBIX SERVER</parameter>
-    <parameter id="hostname">REPLACE BY DESIRED HOSTNAME OF MACHINE</parameter>
-  </instance>

software/zabbix-agent/software.cfg

@@ -52,73 +52,49 @@ signature-certificate-list =
 
 [versions]
 Jinja2 = 2.6
-Pygments = 1.5
 Werkzeug = 0.8.3
 buildout-versions = 1.7
-docutils = 0.9.1
-hexagonit.recipe.cmmi = 1.6
-ipython = 0.13
-meld3 = 0.6.8
-slapos.cookbook = 0.59
-slapos.recipe.template = 2.4
+inotifyx = 0.2.0-1
+lxml = 3.2.0
+meld3 = 0.6.10
+netaddr = 0.7.10
+pytz = 2013b
+slapos.cookbook = 0.78.0
+slapos.core = 0.35.1
+slapos.recipe.cmmi = 0.1
+slapos.recipe.template = 2.4.2
+xml-marshaller = 0.9.7
 
 # Required by:
-# slapos.core==0.26.2
+# slapos.core==0.35.1
 Flask = 0.9
 
 # Required by:
-# hexagonit.recipe.cmmi==1.6
-hexagonit.recipe.download = 1.6nxd002
-
-# Required by:
-# slapos.cookbook==0.59
-PyXML = 0.8.4
-
-# Required by:
-# netaddr==0.7.7
-Sphinx = 1.1.3
-
-# Required by:
-# slapos.cookbook==0.59
-inotifyx = 0.2.0
+# slapos.core==0.35.1
+netifaces = 0.8-1
 
 # Required by:
-# slapos.cookbook==0.59
-# slapos.core==0.26.2
-# xml-marshaller==0.9.7
-lxml = 2.3.4
+# slapos.core==0.35.1
+pyflakes = 0.7.2
 
 # Required by:
-# slapos.cookbook==0.59
-netaddr = 0.7.7
-
-# Required by:
-# slapos.core==0.26.2
-netifaces = 0.8
-
-# Required by:
-# slapos.cookbook==0.59
-# slapos.core==0.26.2
-# zc.buildout==1.6.0-dev-SlapOS-006
-# zc.recipe.egg==1.3.2
+# hexagonit.recipe.download==1.6nxd002
+# slapos.cookbook==0.78.0
+# slapos.core==0.35.1
+# supervisor==3.0b1
+# zc.buildout==1.6.0-dev-SlapOS-010
+# zope.interface==4.0.5
 setuptools = 0.6c12dev-r88846
 
 # Required by:
-# slapos.cookbook==0.59
-slapos.core = 0.26.2
+# slapos.core==0.35.1
+supervisor = 3.0b1
 
 # Required by:
-# slapos.core==0.26.2
-supervisor = 3.0a12
+# slapos.core==0.35.1
+unittest2 = 0.5.1
 
 # Required by:
-# slapos.cookbook==0.59
-xml-marshaller = 0.9.7
+# slapos.core==0.35.1
+zope.interface = 4.0.5
 
-# Required by:
-# slapos.cookbook==0.59
-zc.recipe.egg = 1.3.2
-
-# Required by:
-# slapos.core==0.26.2
-zope.interface = 4.0.1

stack/erp5/buildout.cfg

@@ -526,7 +526,7 @@ scripts = zodbanalyze
 
 [cloudooo-repository]
 branch = master
-revision = 168786a4c747d4dc4578a6428d39b3b2b3e1eb10
+revision = 5c67568c403239bd8e25993602d03c553236fcec
 
 [mysql-python]
 python = python2.6
@@ -626,7 +626,7 @@ Pygments = 1.6
 StructuredText = 2.11.1
 WSGIUtils = 0.7
 Werkzeug = 0.8.3
-apache-libcloud = 0.12.1
+apache-libcloud = 0.12.4
 argparse = 1.2.1
 async = 0.6.1
 atomize = 0.1.1
@@ -636,7 +636,7 @@ coverage = 3.6
 csp-eventlet = 0.7.0
 elementtree = 1.2.7-20070827-preview
 erp5.recipe.cmmiforcei686 = 0.1.3
-erp5.util = 0.4.33
+erp5.util = 0.4.34
 erp5diff = 0.8.1.5
 eventlet = 0.12.1
 feedparser = 5.1.3
@@ -649,23 +649,23 @@ http-parser = 0.8.1
 huBarcode = 0.63
 inotifyx = 0.2.0
 ipdb = 0.7
-ipython = 0.13.1
+ipython = 0.13.2
 meld3 = 0.6.10
 mr.developer = 1.25
 netaddr = 0.7.10
-netifaces = 0.8
+netifaces = 0.8_1
 ordereddict = 1.1
-paramiko = 1.10.0
+paramiko = 1.10.1
 plone.recipe.command = 1.1
 ply = 3.4
 polib = 1.0.3
-psutil = 0.6.1
+psutil = 0.7.1
 pyPdf = 1.13
-pyflakes = 0.6.1
+pyflakes = 0.7.2
 python-ldap = 2.4.10
 python-magic = 0.4.3
-qrcode = 2.5.1
-requests = 1.1.0
+qrcode = 2.7
+requests = 1.2.3
 restkit = 4.2.1
 rtjp-eventlet = 0.3.2
 slapos.core = 0.35.1
@@ -674,12 +674,12 @@ slapos.recipe.template = 2.4.2
 slapos.toolbox = 0.33.1
 smmap = 0.8.2
 socketpool = 0.5.2
-spyne = 2.9.4
-supervisor = 3.0b1
+spyne = 2.10.7
+supervisor = 3.0b2
 threadframe = 0.2
 timerserver = 2.0.2
 urlnorm = 1.1.2
 uuid = 1.30
-validictory = 0.9.0
+validictory = 0.9.1
 xml-marshaller = 0.9.7
 xupdate-processor = 0.4

stack/slapos.cfg

@@ -60,18 +60,20 @@ recipe = zc.recipe.egg
 eggs =
   ${lxml-python:egg}
   slapos.cookbook
+  cliff
   hexagonit.recipe.download
   inotifyx
   netaddr
+  netifaces
+  requests
   slapos.core
+  supervisor
   xml_marshaller
   pytz
 
 [versions]
 # Use SlapOS patched zc.buildout
 zc.buildout = 1.6.0-dev-SlapOS-010
-# Use xz-friendly hexagonit.recipe.download
-hexagonit.recipe.download = 1.6nxd002
 # zc.recipe.egg 2.x is for Buildout 2
 zc.recipe.egg = 1.3.2
 # Use own version of h.r.download to be able to open xz-like archives