Prepare new release

component/apache/buildout.cfg

@@ -30,9 +30,9 @@ md5sum = 2202b18f269ad606d70e1864857ed93c
 [apache]
 # inspired on http://old.aclark.net/team/aclark/blog/a-lamp-buildout-for-wordpress-and-other-php-apps/
 recipe = slapos.recipe.cmmi
-version = 2.4.17
+version = 2.4.18
 url = https://archive.apache.org/dist/httpd/httpd-${:version}.tar.bz2
-md5sum = cf4dfee11132cde836022f196611a8b7
+md5sum = 3690b3cc991b7dfd22aea9e1264a11b9
 pre-configure =
   cp -ar ${apr:location}/apr-${apr:version} srclib/apr/ &&
   cp -ar ${apr-util:location}/apr-util-${apr-util:version} srclib/apr-util

component/babeld/buildout.cfg

 [buildout]
-extends =
-  ../../stack/slapos.cfg 
-
 parts = babeld
 
 [babeld]
 recipe = slapos.recipe.cmmi
-url = https://lab.nexedi.com/rafael/babeld/repository/archive.tar.gz?ref=v1.6.0-nxd1
-md5sum = 1f269d01321103873b8d245df19984f0 
+url = http://git.erp5.org/gitweb/babeld.git/snapshot/v1.6.2-nxd1.tar.xz
+md5sum = 336d25fd7630052ccb3a61d3603029b9
 configure-command =
   echo "No configure.."
 
-make-targets = 
-  install PREFIX=${buildout:parts-directory}/${:_buildout_section_name_} 
+make-targets =
+  install PREFIX=${buildout:parts-directory}/${:_buildout_section_name_}

component/ca-certificates/buildout.cfg

@@ -11,10 +11,11 @@ parts =
 
 [ca-certificates]
 recipe = slapos.recipe.cmmi
-url = ftp://ftp.free.fr/mirrors/ftp.debian.org/pool/main/c/ca-certificates/ca-certificates_20150426.tar.xz
+url = http://http.debian.net/debian/pool/main/c/ca-certificates/ca-certificates_20160104.tar.xz
 patch-binary = ${patch:location}/bin/patch
-md5sum = 717455f13fb31fd014a11a468ea3895d
+md5sum = d9665a83d0d3ef8176a38e6aa20458e9
 patches =
+  ${:_profile_base_location_}/ca-certificates-any-python.patch#087b5e860c7a4b8ff6656c95c5835ee2
   ${:_profile_base_location_}/ca-certificates-sbin-dir.patch#0b4e7d82ce768823c01954ee41ef177b
 patch-options = -p0
 configure-command = true

component/ca-certificates/ca-certificates-any-python.patch

+--- mozilla/certdata2pem.py	2016-01-04 18:31:05.000000000 +0100
++++ mozilla/certdata2pem.py	2016-01-05 20:05:53.595360495 +0100
+@@ -63,7 +63,7 @@
+             else:
+                 value += line
+             continue
+-        obj[field] = value
++        obj[field] = bytes(value)
+         in_multiline = False
+         continue
+     if line.startswith('CKA_CLASS'):
+--- mozilla/Makefile	2015-12-20 10:49:23.000000000 +0100
++++ mozilla/Makefile	2016-01-05 20:19:11.006874271 +0100
+@@ -3,7 +3,8 @@
+ #
+ 
+ all:
+-	python certdata2pem.py
++	for x in '' 2 3; do type python$$x && break; done >/dev/null \
++	&& python$$x certdata2pem.py
+ 
+ clean:
+ 	-rm -f *.crt

component/chrpath/buildout.cfg

+[buildout]
+parts =
+  chrpath
+
+[chrpath]
+recipe = slapos.recipe.cmmi
+url = http://http.debian.net/debian/pool/main/c/chrpath/chrpath_0.16.orig.tar.gz
+md5sum = 2bf8d1d1ee345fc8a7915576f5649982

component/git/buildout.cfg

@@ -16,8 +16,8 @@ parts =
 
 [git]
 recipe = slapos.recipe.cmmi
-url = https://www.kernel.org/pub/software/scm/git/git-2.5.3.tar.xz
-md5sum = e69b41f2d0a93f3d3dc5eb19196e4e5c
+url = https://www.kernel.org/pub/software/scm/git/git-2.7.0.tar.xz
+md5sum = 0214e04f7041f835c5c38f2b78eccced
 configure-options =
   --with-curl=${curl:location}
   --with-openssl=${openssl:location}

component/groonga/buildout.cfg

@@ -13,8 +13,8 @@ extends =
 
 [groonga]
 recipe = slapos.recipe.cmmi
-url = http://packages.groonga.org/source/groonga/groonga-5.1.0.tar.gz
-md5sum = df2e716efee92bc80efd3ddaa84fafb7
+url = http://packages.groonga.org/source/groonga/groonga-5.1.1.tar.gz
+md5sum = 50a869f710c005c0bb46ba7b790621fc
 # temporary patch to respect more tokens in natural language mode.
 patches =
   ${:_profile_base_location_}/groonga.patch#9ed02fbe8400402d3eab47eee149978b

component/gtk-2/buildout.cfg

@@ -53,6 +53,7 @@ configure-options =
   --disable-gtk-doc-html
   --with-cairo
   --with-freetype
+  --without-icu
 environment =
   PATH=${glib:location}/bin:${freetype:location}/bin:${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${:pkg_config_depends}

component/haproxy/buildout.cfg

@@ -22,6 +22,7 @@ make-options =
   TARGET="$(uname -sr 2>/dev/null|grep -Eq '^Linux (2\.6\.2[89]|2\.6\.[3-9]|3)' && echo linux2628 || echo generic)"
   ARCH="$(uname -m 2>/dev/null|grep -E '^(x86_64|i[3456]86)$')"
   PREFIX=${buildout:parts-directory}/${:_buildout_section_name_}
+  USE_DL=1
   USE_LUA=1
   LUA_INC=${lua:location}/include
   LUA_LIB=${lua:location}/lib

component/ipython/buildout.cfg

@@ -15,7 +15,7 @@ egg = ipython
 environment = ipython-env
 setup-eggs = ${numpy:egg}
 
-[ipython_notebook]
+[ipython-notebook]
 recipe = zc.recipe.egg:scripts
 eggs = ipython[notebook]
   ${matplotlib:egg}

component/libpng/buildout.cfg

@@ -18,15 +18,15 @@ environment =
 
 [libpng12]
 <= libpng-common
-url = http://download.sourceforge.net/libpng/libpng-1.2.54.tar.xz
-md5sum = bbb7a7264f1c7d9c444fd16bf6f89832
+url = http://download.sourceforge.net/libpng/libpng-1.2.56.tar.xz
+md5sum = 868562bd1c58b76ed8703f135a2e439a
 
 [libpng15]
 <= libpng-common
-url = http://download.sourceforge.net/libpng/libpng-1.5.24.tar.xz
-md5sum = b7f828f2907214fe1e8951a3b9d4623a
+url = http://download.sourceforge.net/libpng/libpng-1.5.26.tar.xz
+md5sum = 3414d556788e14b4a154369e67eacaa3
 
 [libpng]
 <= libpng-common
-url = http://download.sourceforge.net/libpng/libpng-1.6.19.tar.xz
-md5sum = 1e6a458429e850fc93c1f3b6dc00a48f
+url = http://download.sourceforge.net/libpng/libpng-1.6.20.tar.xz
+md5sum = 3968acb7c66ef81a9dab867f35d0eb4b

component/mariadb/buildout.cfg

@@ -13,6 +13,7 @@ extends =
   ../pcre/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../readline/buildout.cfg
+  ../xz-utils/buildout.cfg
   ../zlib/buildout.cfg
 
 parts =
@@ -20,9 +21,9 @@ parts =
 
 [mariadb]
 recipe = slapos.recipe.cmmi
-version = 10.1.9
+version = 10.1.10
 url = https://downloads.mariadb.org/f/mariadb-${:version}/source/mariadb-${:version}.tar.gz/from/http:/ftp.osuosl.org/pub/mariadb
-md5sum = 71d0e2408a671e1125c1310ce657f688
+md5sum = 9aa4d68b24c1ddd8cb56923a920684b3
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 patch-options = -p0
 patches =
@@ -42,17 +43,23 @@ configure-options =
   -DWITH_EXTRA_CHARSETS=complex
   -DWITH_EMBEDDED_SERVER=0
   -DWITH_JEMALLOC=yes
+  -DWITH_INNODB_BZIP2=OFF
+  -DWITH_INNODB_LZ4=OFF
+  -DWITH_INNODB_LZMA=ON
+  -DWITH_INNODB_LZO=OFF
+  -DWITH_INNODB_SNAPPY=OFF
+  -DWITH_SAFEMALLOC=OFF
   -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1
   -DWITHOUT_MROONGA_STORAGE_ENGINE=1
   -DWITHOUT_DAEMON_EXAMPLE=1
-  -DCMAKE_C_FLAGS="-I${jemalloc:location}/include -I${libaio:location}/include -I${libxml2:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${pcre:location}/include -I${readline5:location}/include -I${zlib:location}/include"
-  -DCMAKE_CXX_FLAGS="-I${jemalloc:location}/include -I${libaio:location}/include -I${libxml2:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${pcre:location}/include -I${readline5:location}/include -I${zlib:location}/include"
-  -DCMAKE_INSTALL_RPATH=${jemalloc:location}/lib:${libaio:location}/lib:${libxml2:location}/lib:${ncurses:location}/lib:${openssl:location}/lib:${pcre:location}/lib:${readline5:location}/lib:${zlib:location}/lib
+  -DCMAKE_C_FLAGS="-I${jemalloc:location}/include -I${libaio:location}/include -I${libxml2:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${pcre:location}/include -I${readline5:location}/include -I${xz-utils:location}/include -I${zlib:location}/include"
+  -DCMAKE_CXX_FLAGS="-I${jemalloc:location}/include -I${libaio:location}/include -I${libxml2:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${pcre:location}/include -I${readline5:location}/include -I${xz-utils:location}/include -I${zlib:location}/include"
+  -DCMAKE_INSTALL_RPATH=${jemalloc:location}/lib:${libaio:location}/lib:${libxml2:location}/lib:${ncurses:location}/lib:${openssl:location}/lib:${pcre:location}/lib:${readline5:location}/lib:${xz-utils:location}/lib:${zlib:location}/lib
 environment =
   CMAKE_PROGRAM_PATH=${cmake:location}/bin
-  CMAKE_INCLUDE_PATH=${libaio:location}/include:${libaio:location}/include:${libxml2:location}/include:${ncurses:location}/include:${openssl:location}/include:${pcre:location}/include:${readline5:location}/include:${zlib:location}/include
-  CMAKE_LIBRARY_PATH=${libaio:location}/lib:{libaio:location}/lib:${libxml2:location}/lib:${ncurses:location}/lib:${openssl:location}/lib:${pcre:location}/lib:${readline5:location}/lib:${zlib:location}/lib
-  LDFLAGS=-L${jemalloc:location}/lib -Wl,-rpath=${jemalloc:location}/lib -L${libaio:location}/lib -Wl,-rpath=${libaio:location}/lib -L${pcre:location}/lib -L${zlib:location}/lib
+  CMAKE_INCLUDE_PATH=${libaio:location}/include:${libaio:location}/include:${libxml2:location}/include:${ncurses:location}/include:${openssl:location}/include:${pcre:location}/include:${readline5:location}/include:${xz-utils:location}/include:${zlib:location}/include
+  CMAKE_LIBRARY_PATH=${libaio:location}/lib:{libaio:location}/lib:${libxml2:location}/lib:${ncurses:location}/lib:${openssl:location}/lib:${pcre:location}/lib:${readline5:location}/lib:${xz-utils:location}/lib:${zlib:location}/lib
+  LDFLAGS=-L${jemalloc:location}/lib -Wl,-rpath=${jemalloc:location}/lib -L${libaio:location}/lib -Wl,-rpath=${libaio:location}/lib -L${pcre:location}/lib -L${xz-utils:location}/lib -L${zlib:location}/lib
 post-install =
   mkdir -p ${:location}/include/wsrep &&
   cp -p wsrep/wsrep_api.h ${:location}/include/wsrep
@@ -61,8 +68,8 @@ post-install =
 # mroonga - a storage engine for MySQL. It provides fast fulltext search feature to all MySQL users.
 # http://mroonga.github.com/
 recipe = slapos.recipe.cmmi
-url = http://packages.groonga.org/source/mroonga/mroonga-5.10.tar.gz
-md5sum = 2fc6a7ae9e58bfd3430cdc8cb38ccf7f
+url = http://packages.groonga.org/source/mroonga/mroonga-5.11.tar.gz
+md5sum = 0ca8525da3594685ec039d22a6ceec8d
 pre-configure =
   mkdir fake_mariadb_source &&
   ln -s ${mariadb:location}/include/mysql/private fake_mariadb_source/sql

component/ncurses/buildout.cfg

 [buildout]
+extends =
+  ../patch/buildout.cfg
 parts =
   ncurses
 
@@ -6,6 +8,9 @@ parts =
 recipe = slapos.recipe.cmmi
 url = ftp://ftp.gnu.org/pub/gnu/ncurses/ncurses-6.0.tar.gz
 md5sum = ee13d052e1ead260d7c28071f46eefb1
+patch-options = -p1
+patches =
+  ${:_profile_base_location_}/ncurses-5.9-gcc-5.patch#57f4cd0cc0c0a42a5ddb2167f9546d72
 configure-options =
   --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
   --with-shared
@@ -22,5 +27,6 @@ make-targets =
 # pass dummy LDCONFIG to skip needless calling of ldconfig by non-root user
 environment =
   LDCONFIG=/bin/echo
+  PATH=${patch:location}/bin:%(PATH)s
 make-options =
   -j1

component/ncurses/ncurses-5.9-gcc-5.patch

+https://bugs.gentoo.org/545114
+
+extracted from the upstream change (which had many unrelated commits in one)
+
+From 97bb4678dc03e753290b39bbff30ba2825df9517 Mon Sep 17 00:00:00 2001
+From: "Thomas E. Dickey" <dickey@invisible-island.net>
+Date: Sun, 7 Dec 2014 03:10:09 +0000
+Subject: [PATCH] ncurses 5.9 - patch 20141206
+
++ modify MKlib_gen.sh to work around change in development version of
+  gcc introduced here:
+	  https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html
+	  https://gcc.gnu.org/ml/gcc-patches/2014-07/msg00236.html
+  (reports by Marcus Shawcroft, Maohui Lei).
+
+diff --git a/ncurses/base/MKlib_gen.sh b/ncurses/base/MKlib_gen.sh
+index d8cc3c9..b91398c 100755
+--- a/ncurses/base/MKlib_gen.sh
++++ b/ncurses/base/MKlib_gen.sh
+@@ -474,11 +474,22 @@ sed -n -f $ED1 \
+ 	-e 's/gen_$//' \
+ 	-e 's/  / /g' >>$TMP
+ 
++cat >$ED1 <<EOF
++s/  / /g
++s/^ //
++s/ $//
++s/P_NCURSES_BOOL/NCURSES_BOOL/g
++EOF
++
++# A patch discussed here:
++#	https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html
++# introduces spurious #line markers.  Work around that by ignoring the system's
++# attempt to define "bool" and using our own symbol here.
++sed -e 's/bool/P_NCURSES_BOOL/g' $TMP > $ED2
++cat $ED2 >$TMP
++
+ $preprocessor $TMP 2>/dev/null \
+-| sed \
+-	-e 's/  / /g' \
+-	-e 's/^ //' \
+-	-e 's/_Bool/NCURSES_BOOL/g' \
++| sed -f $ED1 \
+ | $AWK -f $AW2 \
+ | sed -f $ED3 \
+ | sed \

component/openvpn/buildout.cfg

 [buildout]
 extends =
   ../lzo/buildout.cfg
-  ../patch/buildout.cfg
   ../openssl/buildout.cfg
   ../flex/buildout.cfg
 
@@ -10,16 +9,11 @@ parts =
 
 [openvpn]
 recipe = slapos.recipe.cmmi
-url = http://swupdate.openvpn.org/community/releases/openvpn-2.3.6.tar.gz
-md5sum = 6ca03fe0fd093e0d01601abee808835c 
-patch-binary = ${patch:location}/bin/patch
-patches =
-  ${:_profile_base_location_}/openvpn-ciphernone.patch#462b53a45da2fa686822618c4faafd19
-patch-options = -p0
-configure-options = 
+url = http://swupdate.openvpn.org/community/releases/openvpn-2.3.8.tar.xz
+md5sum = acc5ea4b08ad53173784520acbd4e9c3
+configure-options =
   --disable-plugin-auth-pam
   --enable-static
-/bin/bash: q: command not found
 environment =
   LZO_LIBS=-L${lzo:location}/lib -llzo2
   LZO_CFLAGS=-I${lzo:location}/include
@@ -29,4 +23,3 @@ environment =
   OPENSSL_CRYPTO_CFLAGS="-I${openssl:location}/include"
   LDFLAGS =-Wl,-rpath=${lzo:location}/lib -Wl,-rpath=${flex:location}/lib -Wl,-rpath=${openssl:location}/lib
   CPPFLAGS=-I${lzo:location}/include -I${flex:location}/include
-

component/openvpn/openvpn-ciphernone.patch

---- src/openvpn/crypto_backend.h
-+++ src/openvpn/crypto_backend.h
-@@ -237,8 +237,7 @@
-  *
-  * @return		true iff the cipher is a CBC mode cipher.
-  */
--bool cipher_kt_mode_cbc(const cipher_kt_t *cipher)
--  __attribute__((nonnull));
-+bool cipher_kt_mode_cbc(const cipher_kt_t *cipher);
- 
- /**
-  * Check if the supplied cipher is a supported OFB or CFB mode cipher.
-@@ -247,8 +246,7 @@
-  *
-  * @return		true iff the cipher is a OFB or CFB mode cipher.
-  */
--bool cipher_kt_mode_ofb_cfb(const cipher_kt_t *cipher)
--  __attribute__((nonnull));
-+bool cipher_kt_mode_ofb_cfb(const cipher_kt_t *cipher);
- 
- 
- /**

component/python-2.7/buildout.cfg

@@ -27,9 +27,9 @@ python = python2.7
 
 [python2.7]
 recipe = slapos.recipe.cmmi
-package_version = 2.7.10
+package_version = 2.7.11
 package_version_suffix =
-md5sum = c685ef0b8e9f27b5e3db5db12b268ac6
+md5sum = 1dbcc848b4cd8399a8199d000f9f823c
 
 # This is actually the default setting for prefix, but we can't use it in
 # other settings in this part if we don't set it explicitly here.
@@ -41,6 +41,7 @@ patch-options = -p1
 patches =
   ${:_profile_base_location_}/fix_compiler_module_issue_20613.patch#94443a77f903e9de880a029967fa6aa7
   ${:_profile_base_location_}/pytracemalloc_pep445.patch#46662cf0ccc7cb7cfb8289bbfd68b21a
+  ${:_profile_base_location_}/disabled_module_list.patch#71ad30d32bcdbc50c19cf48675b1246e
 url =
   http://python.org/ftp/python/${:package_version}/Python-${:package_version}${:package_version_suffix}.tar.xz
 configure-options =

component/python-2.7/disabled_module_list.patch

+--- Python-2.7.11/setup.py.orig	2015-12-05 20:47:20.000000000 +0100
++++ Python-2.7.11/setup.py	2015-12-23 20:57:13.471968160 +0100
+@@ -33,7 +33,7 @@
+ COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS"))
+ 
+ # This global variable is used to hold the list of modules to be disabled.
+-disabled_module_list = []
++disabled_module_list = ['_bsddb', '_tkinter', 'bsddb185']
+ 
+ def add_dir_to_list(dirlist, dir):
+     """Add the directory 'dir' to the list 'dirlist' (at the front) if

component/python-cryptography/buildout.cfg

@@ -2,6 +2,7 @@
 extends =
   ../openssl/buildout.cfg
   ../pkgconfig/buildout.cfg
+  ../python-cffi/buildout.cfg
 
 parts =
   python-cryptography

component/re6stnet/buildout.cfg

 [buildout]
 extends =
-  ./common.cfg
+  ../babeld/buildout.cfg
+  ../openvpn/buildout.cfg
+  ../python-cryptography/buildout.cfg
 
-parts = 
-  babeld
+parts =
   re6stnet
 
-[versions]
-re6stnet = 0.435
+[re6stnet]
+recipe = zc.recipe.egg
+eggs =
+  ${python-cffi:egg}
+  ${python-cryptography:egg}
+  pyOpenSSL
+  re6stnet
+
+# Note: For now original PATH is appended to the end, as not all tools are
+#       provided by SlapOS
+initialization =
+  import os
+  os.environ['PATH'] = "${openvpn:location}/sbin:${babeld:location}/bin:${openssl:location}/bin:${python2.7:location}/bin:" + os.environ['PATH']