Revert "merge erp5 branch into master"

This reverts commit 1ea46ea8.

Don't use squash because in this way we will lost the history.

MANIFEST.in

@@ -4,4 +4,4 @@ include slapos/recipe/apache_frontend/template/notfound.html
 recursive-include slapos/recipe *.in
 recursive-include slapos/recipe *.bin
 recursive-include slapos/recipe README.*.txt
-recursive-include slapos/recipe *.js
+recursive-include slapos/recipe *.js
\ No newline at end of file

component/apache-php/buildout.cfg

 [buildout]
 parts = apache-php
 
-extends =
+extends = 
   ../apache/buildout.cfg
   ../cclient/buildout.cfg
-  ../curl/buildout.cfg
+  ../curl/buildout.cfg  
   ../freetype/buildout.cfg
   ../gettext/buildout.cfg
   ../libiconv/buildout.cfg
@@ -19,8 +19,8 @@ extends =
 [apache-php]
 # Note: Shall react on each build of apache and reinstall itself
 recipe = hexagonit.recipe.cmmi
-url = http://fr2.php.net/distributions/php-5.3.10.tar.gz
-md5sum = 816259e5ca7d0a7e943e56a3bb32b17f
+url = http://fr2.php.net/distributions/php-5.3.8.tar.gz
+md5sum = f4ce40d5d156ca66a996dbb8a0e7666a
 configure-options =
   --with-apxs2=${apache:location}/bin/apxs
   --with-libxml-dir=${libxml2:location}
@@ -37,7 +37,7 @@ configure-options =
   --with-mysqli=mysqlnd
   --with-curl=${curl:location}
   --with-zip-dir=${zip:location}
-  --with-imap=${cclient:location}
+  --with-imap=${cclient:location}  
   --with-iconv-dir=${libiconv:location}
   --with-gettext=${gettext:location}
   --with-ldap=${openldap:location}

component/apache/buildout.cfg

@@ -13,30 +13,14 @@ extends =
   ../sqlite3/buildout.cfg
   ../zlib/buildout.cfg
 
-[apr]
-recipe = hexagonit.recipe.download
-version = 1.4.6
-url = http://mir2.ovh.net/ftp.apache.org/dist/apr/apr-${:version}.tar.bz2
-md5sum = ffee70a111fd07372982b0550bbb14b7
-
-[apr-util]
-recipe = hexagonit.recipe.download
-version = 1.4.1
-url = http://mir2.ovh.net/ftp.apache.org/dist/apr/apr-util-${:version}.tar.bz2
-md5sum = 52b31b33fb1aa16e65ddaefc76e41151
-
 [apache]
 # inspired on http://old.aclark.net/team/aclark/blog/a-lamp-buildout-for-wordpress-and-other-php-apps/
 recipe = hexagonit.recipe.cmmi
 depends =
   ${gdbm:version}
-version = 2.4.1
-revision = 1
-url = http://mir2.ovh.net/ftp.apache.org/dist/httpd/httpd-${:version}.tar.bz2
-md5sum = 7d3001c7a26b985d17caa367a868f11c
-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
+url = http://mir2.ovh.net/ftp.apache.org/dist//httpd/httpd-2.2.22.tar.bz2
+md5sum = 9fe3093194c8a57f085ff7c3fc43715f
+configure-options = --disable-static
                     --enable-authn-alias
                     --enable-bucketeer
                     --enable-cache
@@ -63,7 +47,6 @@ configure-options = --prefix=${buildout:parts-directory}/${:_buildout_section_na
                     --enable-dav-fs
                     --enable-so
                     --enable-ssl
-                    --disable-lua
                     --with-included-apr
                     --with-ssl=${openssl:location}
                     --with-z=${zlib:location}
@@ -89,27 +72,11 @@ environment =
   CPPFLAGS =-I${libuuid:location}/include
   LDFLAGS =-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${gdbm:location}/lib
 
-[mod_antiloris-apache-2.4.patch]
-# http://www.apachelounge.com/viewtopic.php?p=19139
-# http://www.apachelounge.com/viewtopic.php?p=20551
-recipe = hexagonit.recipe.download
-url =${:_profile_base_location_}/${:filename}
-filename = mod_antiloris-apache-2.4.patch
-download-only = true
-md5sum = 4f074f035d3b37f3f3e71cd9616440f3
-
 [apache-antiloris]
 # Note: Shall react on each build of apache and reinstall itself
 recipe = hexagonit.recipe.cmmi
 url = http://sourceforge.net/projects/mod-antiloris/files/mod_antiloris-0.4.tar.bz2/download
 md5sum = 66862bf10e9be3a023e475604a28a0b4
-patch-options = -p0
-patches =
-  ${mod_antiloris-apache-2.4.patch:location}/${mod_antiloris-apache-2.4.patch:filename}
-depends =
-  ${apache:version}
-  ${apache:revision}
-  ${mod_antiloris-apache-2.4.patch:md5sum}
 configure-command = ${apache:location}/bin/apxs
 configure-options = -c mod_antiloris.c
 make-binary = ${:configure-command}

component/apache/mod_antiloris-apache-2.4.patch

---- mod_antiloris.c.orig	2009-07-28 15:27:42.000000000 +0200
-+++ mod_antiloris.c	2012-03-06 11:05:50.167576066 +0100
-@@ -1,5 +1,5 @@
- /*
--   mod_antiloris 0.2
-+   mod_antiloris 0.5
-    Copyright (C) 2008 Monshouwer Internet Diensten
- 
-    Author: Kees Monshouwer
-@@ -22,11 +22,16 @@
- #include "http_connection.h"
- #include "http_log.h"
- #include "ap_mpm.h"
-+#include "ap_release.h" 
- #include "apr_strings.h"
- #include "scoreboard.h"
- 
- #define MODULE_NAME "mod_antiloris"
--#define MODULE_VERSION "0.4"
-+#define MODULE_VERSION "0.5.1"
-+
-+#ifdef APLOG_USE_MODULE 
-+APLOG_USE_MODULE(antiloris); 
-+#endif 
- 
- module AP_MODULE_DECLARE_DATA antiloris_module;
- 
-@@ -58,6 +63,8 @@
- /* Parse the IPReadLimit directive */
- static const char *ipreadlimit_config_cmd(cmd_parms *parms, void *mconfig, const char *arg)
- {
-+    signed long int limit;
-+
-     antiloris_config *conf = ap_get_module_config(parms->server->module_config, &antiloris_module);
-     const char *err = ap_check_cmd_context (parms, GLOBAL_ONLY);
-     
-@@ -65,7 +72,7 @@
- 	return err;
-     }
-     
--    signed long int limit = strtol(arg, (char **) NULL, 10);
-+    limit = strtol(arg, (char **) NULL, 10);
- 
-     /* No reasonable person would want more than 2^16. Better would be
-        to use LONG_MAX but that causes portability problems on win32 */
-@@ -80,7 +87,7 @@
- 
- /* Array describing structure of configuration directives */
- static command_rec antiloris_cmds[] = {
--    AP_INIT_TAKE1("IPReadLimit", ipreadlimit_config_cmd, NULL, RSRC_CONF, "Maximum simultaneous connections in READ state per IP address"),
-+    AP_INIT_TAKE1("IPReadLimit", ipreadlimit_config_cmd, NULL, RSRC_CONF, "Maximum simultaneous connections per IP address"),
-     {NULL}
- };
- 
-@@ -103,12 +110,15 @@
-     ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, NULL, MODULE_NAME " " MODULE_VERSION " started");
-     ap_mpm_query(AP_MPMQ_HARD_LIMIT_THREADS, &thread_limit);
-     ap_mpm_query(AP_MPMQ_HARD_LIMIT_DAEMONS, &server_limit);
-+    ap_add_version_component(p, MODULE_NAME "/" MODULE_VERSION); 
-     return OK;
- }
- 
- 
- static int pre_connection(conn_rec *c)
- {
-+    char *client_ip;
-+
-     antiloris_config *conf = ap_get_module_config (c->base_server->module_config,  &antiloris_module);
-     sb_handle *sbh = c->sbh;
-     
-@@ -123,16 +133,26 @@
-     worker_score *ws_record;
-     
-     ws_record = &ap_scoreboard_image->servers[sbh->child_num][sbh->thread_num];
--    apr_cpystrn(ws_record->client, c->remote_ip, sizeof(ws_record->client));
-+    apr_cpystrn(ws_record->client, c->client_ip, sizeof(ws_record->client)); 
-     
--    char *client_ip = ws_record->client;
-+    client_ip = ws_record->client;
-     
-     /* Count up the number of connections we are handling right now from this IP address */
-     for (i = 0; i < server_limit; ++i) {
- 	for (j = 0; j < thread_limit; ++j) {
--    	    ws_record = ap_get_scoreboard_worker(i, j);
-+#if AP_SERVER_MAJORVERSION_NUMBER == 2 && AP_SERVER_MINORVERSION_NUMBER > 2 
-+    	    ws_record = ap_get_scoreboard_worker_from_indexes(i, j); 
-+#else 
-+    	    ws_record = ap_get_scoreboard_worker(i, j); 
-+#endif 
-             switch (ws_record->status) {
-         	case SERVER_BUSY_READ:
-+        	case SERVER_BUSY_WRITE:
-+        	case SERVER_BUSY_KEEPALIVE:
-+        	case SERVER_BUSY_DNS:
-+        	case SERVER_BUSY_LOG:
-+        	case SERVER_CLOSING:
-+        	case SERVER_GRACEFUL:
-             	    if (strcmp(client_ip, ws_record->client) == 0)
-             		ip_count++;
-                     break;
-@@ -143,7 +163,7 @@
-     }
-     
-     if (ip_count > conf->limit) {
--	ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL, "Rejected, too many connections in READ state from %s", c->remote_ip);
-+	ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL, "[client %s] Antiloris rejected, too many connections", c->client_ip); 
- 	return OK;
-     } else {
- 	return DECLINED;
-@@ -151,17 +171,10 @@
- }
- 
- 
--static void child_init (apr_pool_t *p, server_rec *s)
--{
--    ap_add_version_component(p, MODULE_NAME "/" MODULE_VERSION);
--}
--
--
- static void register_hooks(apr_pool_t *p)
- {
-     ap_hook_post_config(post_config, NULL, NULL, APR_HOOK_MIDDLE);
-     ap_hook_process_connection(pre_connection, NULL, NULL, APR_HOOK_FIRST);
--    ap_hook_child_init(child_init, NULL, NULL, APR_HOOK_MIDDLE);    
- }
- 
- module AP_MODULE_DECLARE_DATA antiloris_module = {

component/aspell/buildout.cfg

-[buildout]
-parts =
-  aspell
-
-extends = 
-  ../ncurses/buildout.cfg
-
-[aspell]
-recipe = hexagonit.recipe.cmmi
-url = http://ftp.gnu.org/gnu/aspell/aspell-0.60.6.1.tar.gz
-md5sum = e66a9c9af6a60dc46134fdacf6ce97d7

component/automake/buildout.cfg

@@ -7,7 +7,7 @@ parts =
 
 [automake-1.11]
 recipe = hexagonit.recipe.cmmi
-md5sum = 93ecb319f0365cb801990b00f658d026
-url = http://ftp.gnu.org/gnu/automake/automake-1.11.3.tar.gz
+md5sum = c2972c4d9b3e29c03d5f2af86249876f
+url = http://ftp.gnu.org/gnu/automake/automake-1.11.1.tar.bz2
 environment =
   PATH =${autoconf:location}/bin:${perl:location}/bin:%(PATH)s

component/file/buildout.cfg

@@ -8,8 +8,8 @@ extends =
 
 [file]
 recipe = hexagonit.recipe.cmmi
-url = ftp://ftp.astron.com/pub/file/file-5.11.tar.gz
-md5sum = 16a407bd66d6c7a832f3a5c0d609c27b
+url = ftp://ftp.astron.com/pub/file/file-5.10.tar.gz
+md5sum = 4cea34b087b060772511e066e2038196
 configure-options =
   --disable-static
 environment =

component/fontconfig/buildout.cfg

@@ -4,7 +4,6 @@ extends =
   ../freetype/buildout.cfg
   ../libxml2/buildout.cfg
   ../pkgconfig/buildout.cfg
-  ../bzip2/buildout.cfg
   ../zlib/buildout.cfg
 
 parts =
@@ -24,5 +23,5 @@ configure-options =
 environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${libxml2:location}/lib/pkgconfig
-  CPPFLAGS=-I${zlib:location}/include -I${bzip2:location}/include
-  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib
+  CPPFLAGS=-I${zlib:location}/include
+  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib

component/freetype/buildout.cfg

@@ -3,7 +3,6 @@
 
 [buildout]
 extends =
-  ../bzip2/buildout.cfg
   ../zlib/buildout.cfg
 
 parts =
@@ -11,10 +10,10 @@ parts =
 
 [freetype]
 recipe = hexagonit.recipe.cmmi
-url = http://download.savannah.gnu.org/releases/freetype/freetype-2.4.9.tar.bz2
-md5sum = 77a893dae81fd5b896632715ca041179
+url = http://download.savannah.gnu.org/releases/freetype/freetype-2.4.8.tar.bz2
+md5sum = dbf2caca1d3afd410a29217a9809d397
 configure-options =
   --disable-static
 environment =
-  CPPFLAGS=-I${bzip2:location}/include -I${zlib:location}/include
-  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+  CPPFLAGS=-I${zlib:location}/include
+  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib

component/ghostscript/buildout.cfg

@@ -9,25 +9,24 @@ parts = ghostscript
 
 [ghostscript-common]
 recipe = hexagonit.recipe.cmmi
-depends =
-  ${libtiff:version}
 configure-options =
   --disable-cups
-  --with-system-libtiff
+  --disable-cairo
   --without-x
   --with-drivers=FILES
 # it seems that parallel build sometimes fails for ghostscript.
 make-options = -j1
 environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${fontconfig:location}/lib/pkgconfig:${libtiff:location}/lib/pkgconfig
-  LDFLAGS=-Wl,-rpath=${fontconfig:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -Wl,-rpath=${libtiff:location}/lib
-  LD_LIBRARY_PATH=${fontconfig:location}/lib:${libtiff:location}/lib
+  PKG_CONFIG_PATH=${fontconfig:location}/lib/pkgconfig
+  CPPFLAGS=-I${libtiff:location}/include
+  LDFLAGS=-Wl,-rpath=${fontconfig:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${libtiff:location}/lib -Wl,-rpath=${libtiff:location}/lib
+  LD_LIBRARY_PATH=${fontconfig:location}/lib
 
 [ghostscript]
 <= ghostscript-9
 
 [ghostscript-9]
 <= ghostscript-common
-url = http://downloads.ghostscript.com/public/ghostscript-9.05.tar.bz2
-md5sum = 8bcef1f33ddf8a4d12b2cf8da385c191
+url = http://downloads.ghostscript.com/public/ghostscript-9.04.tar.bz2
+md5sum = 9f6899e821ab6d78ab2c856f10fa3023

component/git/buildout.cfg

@@ -13,8 +13,8 @@ parts =
 
 [git]
 recipe = hexagonit.recipe.cmmi
-url = http://git-core.googlecode.com/files/git-1.7.8.4.tar.gz
-md5sum = e6c3319d76d52a830af395046fc56143
+url = http://git-core.googlecode.com/files/git-1.7.8.3.tar.gz
+md5sum = 7a4bc5160166537d4da5eb48a7670dff
 configure-options =
   --with-curl=${curl:location}
   --with-openssl=${openssl:location}

component/graphviz/buildout.cfg

@@ -5,7 +5,6 @@
 parts =
   graphviz
 extends =
-  ../bzip2/buildout.cfg
   ../fontconfig/buildout.cfg
   ../freetype/buildout.cfg
   ../libpng/buildout.cfg
@@ -51,5 +50,5 @@ configure-options =
 environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig
-  CPPFLAGS=-I${bzip2:location}/include -I${zlib:location}/include
-  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+  CPPFLAGS=-I${zlib:location}/include
+  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib

component/groonga/buildout.cfg

@@ -7,11 +7,10 @@ parts =
 
 [groonga]
 recipe = hexagonit.recipe.cmmi
-url = http://packages.groonga.org/source/groonga/groonga-2.0.0.tar.gz
-md5sum = 09e6a34db15cf42b6a3aff07e0f841ff
+url = http://packages.groonga.org/source/groonga/groonga-1.2.9.tar.gz
+md5sum = 47117baa401a3db08362e00f94fced12
 configure-options =
   --disable-static
   --disable-glibtest
   --disable-benchmark
-  --disable-document
   --without-mecab

component/haproxy/buildout.cfg

@@ -10,6 +10,6 @@ configure-command = true
 # otherwise use "generic".
 # For ARCH value, x86_64 and i[3456]86 are supported.
 make-options =
-  TARGET="$(uname -sr 2>/dev/null|grep -Eq '^Linux (2\.6|3)' && echo linux26 || echo generic)"
+  TARGET="$(uname -sr 2>/dev/null|grep -q '^Linux 2\.6' && echo linux26 || echo generic)"
   ARCH="$(uname -m 2>/dev/null|grep -E '^(x86_64|i[3456]86)$')"
   PREFIX=${buildout:parts-directory}/${:_buildout_section_name_}

component/imagemagick/buildout.cfg

@@ -27,10 +27,8 @@ filename = imagemagick-6.6.6-1-no-gsx-gsc-probe.patch
 
 [imagemagick]
 recipe = hexagonit.recipe.cmmi
-url = ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-6.7.5-10.tar.bz2
-md5sum = 99bc7ec1e756fa75f1af6150df3d1383
-depends =
-  ${libtiff:version}
+url = ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-6.7.3-10.tar.bz2
+md5sum = 3c1d1a04b1ed2998217e16001b58069f
 configure-options =
   --disable-static
   --without-x

component/java/buildout.cfg

@@ -29,8 +29,8 @@ slapos_promisee =
   directory:javaws
   file:lib/rt.jar
   file:bin/java
-x86 = http://download.oracle.com/otn-pub/java/jdk/6u30-b12/jre-6u30-linux-i586.bin 3e80243483bc825c34ae01a4373cce5f
-x86-64 = http://download.oracle.com/otn-pub/java/jdk/6u30-b12/jre-6u30-linux-x64.bin a4d28c49251d6b9c2d300b3d61f1ce95
+x86 = http://javadl.sun.com/webapps/download/AutoDL?BundleId=52240 0bd27d325c5ce11ce863d982ad052f7f
+x86-64 =  http://javadl.sun.com/webapps/download/AutoDL?BundleId=52242 a4d929bc4d6511290c07c3745477b77b
 script =
   if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ')
   download_file = self.download(self.options['url'], self.options.get('md5sum'))
@@ -43,7 +43,7 @@ script =
   subprocess.call([auto_extract_bin])
   self.cleanup_dir_list.append(extract_dir)
   workdir = guessworkdir(extract_dir)
-  self.copyTree(os.path.join(workdir, "jre1.6.0_30"), "%(location)s")
+  self.copyTree(os.path.join(workdir, "jre1.6.0_27"), "%(location)s")
 
 [java-sdk-1.6.0]
 recipe = slapos.recipe.build

component/libjpeg/buildout.cfg

@@ -4,7 +4,7 @@ parts =
 
 [libjpeg]
 recipe = hexagonit.recipe.cmmi
-url = http://www.ijg.org/files/jpegsrc.v8d.tar.gz
-md5sum = 52654eb3b2e60c35731ea8fc87f1bd29
+url = http://www.ijg.org/files/jpegsrc.v8b.tar.gz
+md5sum = e022acbc5b36cd2cb70785f5b575661e
 configure-options =
   --disable-static

component/libpng/buildout.cfg

@@ -3,7 +3,6 @@ extends =
   ../zlib/buildout.cfg
 
 parts =
-  libpng12
   libpng
 
 [libpng-common]
@@ -14,12 +13,7 @@ environment =
   CPPFLAGS =-I${zlib:location}/include
   LDFLAGS =-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
 
-[libpng12]
-<= libpng-common
-url = http://download.sourceforge.net/libpng/libpng-1.2.47.tar.bz2
-md5sum = 4389dab9fcd2f9d57ac14701b9115f59
-
 [libpng]
 <= libpng-common
-url = http://download.sourceforge.net/libpng/libpng-1.5.9.tar.bz2
-md5sum = 684ba5f05da436a99c6303a83c7856d6
+url = http://download.sourceforge.net/libpng/libpng-1.5.5.tar.bz2
+md5sum = 3270bf2990c3174ae939388398de751e

component/libreoffice-bin/buildout.cfg

@@ -12,15 +12,15 @@ 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.5.1
+version = 3.4.5
 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 = ee46fdafb8361b8e131994508c2723b3
-md5sum_x86-64 = ddda58719358e5c97ca5d1c118646574
+md5sum_x86 = 34786e6aa570782abac551ab092f3fb3
+md5sum_x86-64 = 2159a50daab707c02b669a83f635ff0c
 
 # where office code can be found?
-officedir = libreoffice3.5
+officedir = libreoffice3.4
 
 # script to install
 script =
@@ -38,11 +38,7 @@ script =
   rpmsdir = os.path.join(workdir, [q for q in os.listdir(workdir) if q == 'RPMS'][0])
   rpmlist = [os.path.join(rpmsdir, q) for q in os.listdir(rpmsdir) if q.endswith('.rpm') and 'javafilter' not in q and 'xsltfilter' not in q]
   [self.pipeCommand([[sys.executable, '${:rpm2cpio}', rpm], ['${:cpio}', '-idum']], cwd=storagedir) for rpm in rpmlist]
-  self.copyTree(os.path.join(storagedir, 'opt', '${:officedir}'), location, ['ure-link'])
-  os.symlink('ure', os.path.join(location, 'ure-link'))
-  # backward compatibility for cloudooo configuration
-  os.mkdir(os.path.join(location, 'basis-link'))
-  os.symlink(os.path.join('..', 'program'), os.path.join(location, 'basis-link', 'program'))
+  self.copyTree(os.path.join(storagedir, 'opt', '${:officedir}'), location, ['basis3.4', 'ure'])
 
 # helper binaries
 cpio = ${cpio:location}/bin/cpio

component/libtiff/buildout.cfg

@@ -9,11 +9,10 @@ parts =
 
 [libtiff]
 recipe = hexagonit.recipe.cmmi
-version = 4.0.1
-#url = http://download.osgeo.org/libtiff/tiff-${:version}.tar.gz
+#url = http://download.osgeo.org/libtiff/tiff-3.9.5.tar.gz
 # server is down - circumvent
-url = http://www.imagemagick.org/download/delegates/tiff-${:version}.tar.gz
-md5sum = fae149cc9da35c598d8be897826dfc63
+url = http://www.imagemagick.org/download/delegates/tiff-3.9.5.tar.gz
+md5sum = 8fc7ce3b4e1d0cc8a319336967815084
 configure-options =
   --disable-static
   --without-x

component/mariadb/buildout.cfg

@@ -3,13 +3,10 @@
 
 [buildout]
 extends =
-  ../cmake/buildout.cfg
   ../zlib/buildout.cfg
   ../groonga/buildout.cfg
-  ../libaio/buildout.cfg
   ../libevent/buildout.cfg
   ../ncurses/buildout.cfg
-  ../openssl/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../readline/buildout.cfg
 
@@ -25,9 +22,9 @@ download-only = true
 
 [mariadb]
 recipe = hexagonit.recipe.cmmi
-version = 5.3.5-ga
+version = 5.3.3-rc
 url = http://downloads.askmonty.org/f/mariadb-${:version}/kvm-tarbake-jaunty-x86/mariadb-${:version}.tar.gz/from/http:/ftp.osuosl.org/pub/mariadb
-md5sum = 98ce0441b37c8d681855150495fdc03b
+md5sum = 715c61bb101acc7d37e893f6a9de9267
 # compile directory is required to build mysql plugins.
 keep-compile-dir = true
 # configure: how to avoid searching for my.cnf?
@@ -45,9 +42,10 @@ configure-options =
   --with-extra-charsets=complex
   --with-collation=utf8_unicode_ci
   --with-big-tables
-  --without-embedded-server
+  --with-embedded-server
   --with-plugins=max-no-ndb
   --with-aria-tmp-tables
+  --without-plugin-innodb_plugin
   --without-plugin-oqgraph
   --without-readline
   --with-ssl
@@ -63,68 +61,11 @@ environment =
 
 [mroonga-mariadb]
 recipe = hexagonit.recipe.cmmi
-url = https://github.com/downloads/mroonga/mroonga/mroonga-2.00.tar.gz
-md5sum = 49dab92863b5c3fa1d49344c73357ca2
+url = https://github.com/downloads/mroonga/mroonga/mroonga-1.11.tar.gz
+md5sum = 69e56246226e0b9969ee7f99e08aa7da
 configure-options =
   --with-mysql-source=${mariadb:location}__compile__/mariadb-${mariadb:version}
   --with-mysql-config=${mariadb:location}/bin/mysql_config
-depends =
-  ${mariadb:version}
-environment =
-  PATH=${groonga:location}/bin:${pkgconfig:location}/bin:%(PATH)s
-  CPPFLAGS=-I${groonga:location}/include/groonga
-  LDFLAGS=-L${groonga:location}/lib
-  PKG_CONFIG_PATH=${groonga:location}/lib/pkgconfig
-
-[mariadb-5.5-no_test-patch]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-md5sum = 14e6d713c16298a10f40d29f2b799aca
-filename = mariadb_5.5_create_system_tables__no_test.patch
-download-only = true
-
-[mariadb-5.5]
-recipe = hexagonit.recipe.cmmi
-version = 5.5.20
-url = http://downloads.askmonty.org/f/mariadb-${:version}/kvm-tarbake-jaunty-x86/mariadb-${:version}.tar.gz/from/http://ftp.osuosl.org/pub/mariadb
-md5sum = e618343b5039fa468c0e1e6098785e3c
-# compile directory is required to build mysql plugins.
-keep-compile-dir = true
-patch-options = -p0
-patches =
-  ${mariadb-5.5-no_test-patch:location}/${mariadb-5.5-no_test-patch:filename}
-configure-command = ${cmake:location}/bin/cmake
-configure-options =
-  -DCMAKE_INSTALL_PREFIX=${buildout:parts-directory}/${:_buildout_section_name_}
-  -DBUILD_CONFIG=mysql_release
-  -DDEFAULT_CHARSET=utf8
-  -DDEFAULT_COLLATION=utf8_unicode_ci
-  -DWITH_SSL=system
-  -DWITH_ZLIB=system
-  -DWITH_READLINE=0
-  -DWITH_PIC=1
-  -DWITH_EXTRA_CHARSETS=complex
-  -DWITH_EMBEDDED_SERVER=0
-  -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1
-  -DWITHOUT_DAEMON_EXAMPLE=1
-  -DWITH_SPHINX_STORAGE_ENGINE=1
-  -DCMAKE_C_FLAGS="-I${libaio:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${readline5:location}/include -I${zlib:location}/include"
-  -DCMAKE_INSTALL_RPATH=${libaio:location}/lib:${ncurses:location}/lib:${openssl:location}/lib:${readline5:location}/lib:${zlib:location}/lib
-environment =
-  CMAKE_PROGRAM_PATH=${cmake:location}/bin
-  CMAKE_INCLUDE_PATH=${libaio:location}/include:${ncurses:location}/include:${openssl:location}/include:${readline5:location}/include:${zlib:location}/include
-  CMAKE_LIBRARY_PATH=${libaio:location}/lib:${ncurses:location}/lib:${openssl:location}/lib:${readline5:location}/lib:${zlib:location}/lib
-  LDFLAGS=-L${libaio:location}/lib
-
-[mroonga-mariadb-5.5]
-recipe = hexagonit.recipe.cmmi
-url = https://github.com/downloads/mroonga/mroonga/mroonga-2.00.tar.gz
-md5sum = 49dab92863b5c3fa1d49344c73357ca2
-configure-options =
-  --with-mysql-source=${mariadb-5.5:location}__compile__/mariadb-${mariadb-5.5:version}
-  --with-mysql-config=${mariadb-5.5:location}/bin/mysql_config
-depends =
-  ${mariadb-5.5:version}
 environment =
   PATH=${groonga:location}/bin:${pkgconfig:location}/bin:%(PATH)s
   CPPFLAGS=-I${groonga:location}/include/groonga

component/openssl/buildout.cfg

@@ -19,20 +19,12 @@ url = ${:_profile_base_location_}/${:filename}
 filename = ${:_buildout_section_name_}
 download-only = true
 
-[openssl-exlibs.patch]
-recipe = hexagonit.recipe.download
-md5sum = dfb8979460d6d75f2d23d1ea83bbb40a
-url = ${:_profile_base_location_}/${:filename}
-filename = ${:_buildout_section_name_}
-download-only = true
-
 [openssl]
 recipe = hexagonit.recipe.cmmi
-url = https://www.openssl.org/source/openssl-1.0.1.tar.gz
-md5sum = 134f168bc2a8333f19f81d684841710b
+url = https://www.openssl.org/source/openssl-1.0.0g.tar.gz
+md5sum = 07ecbe4324f140d157478637d6beccf1
 patches =
   ${openssl-nodoc.patch:location}/${openssl-nodoc.patch:filename}
-  ${openssl-exlibs.patch:location}/${openssl-exlibs.patch:filename}
 patch-options = -p0
 configure-command = ./config
 configure-options =
@@ -41,11 +33,13 @@ configure-options =
   --openssldir=${buildout:parts-directory}/${:_buildout_section_name_}/etc/ssl
   --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
   --libdir=lib
-  shared no-idea no-mdc2 no-rc5 zlib
-  -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${buildout:parts-directory}/${:_buildout_section_name_}/lib
+  shared
+  no-zlib
 
 # it seems that parallel build sometimes fails for openssl.
 make-options =
   -j1
 make-targets =
   install && rm -f ${buildout:parts-directory}/${:_buildout_section_name_}/etc/ssl/certs/* && for i in ${ca-certificates:location}/certs/*/*.crt; do ln -sv $i ${buildout:parts-directory}/${:_buildout_section_name_}/etc/ssl/certs/`${buildout:parts-directory}/${:_buildout_section_name_}/bin/openssl x509 -hash -noout -in $i`.0; done; true
+  LDFLAGS="-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${buildout:parts-directory}/${:_buildout_section_name_}/lib"
+  SHARED_LDFLAGS="-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${buildout:parts-directory}/${:_buildout_section_name_}/lib"

component/openssl/openssl-exlibs.patch

---- engines/ccgost/Makefile~	2010-08-24 23:46:34.000000000 +0200
-+++ engines/ccgost/Makefile	2012-03-14 10:11:46.826419864 +0100
-@@ -7,6 +7,7 @@
- AR= ar r
- CFLAGS= $(INCLUDES) $(CFLAG)
- LIB=$(TOP)/libcrypto.a
-+EX_LIBS= 
- 
- LIBSRC= gost2001.c gost2001_keyx.c gost89.c gost94_keyx.c gost_ameth.c gost_asn1.c gost_crypt.c gost_ctl.c gost_eng.c gosthash.c gost_keywrap.c gost_md.c gost_params.c gost_pmeth.c gost_sign.c
- 
-@@ -32,7 +33,7 @@
- 		$(MAKE) -f $(TOP)/Makefile.shared -e \
- 			LIBNAME=$(LIBNAME) \
- 			LIBEXTRAS='$(LIBOBJ)' \
--			LIBDEPS='-L$(TOP) -lcrypto' \
-+			LIBDEPS='-L$(TOP) -lcrypto $(EX_LIBS)' \
- 			link_o.$(SHLIB_TARGET); \
- 	else \
- 		$(AR) $(LIB) $(LIBOBJ); \

component/percona-toolkit/buildout.cfg

@@ -10,7 +10,7 @@ parts =
 recipe = hexagonit.recipe.cmmi
 depends =
   ${perl:version}
-url = http://www.percona.com/redir/downloads/percona-toolkit/2.0.4/percona-toolkit-2.0.4.tar.gz
-md5sum = df7dffcccb48d50f143849629228d4b4
+url = http://www.percona.com/redir/downloads/percona-toolkit/percona-toolkit-2.0.1.tar.gz
+md5sum = 3a78c78672cb7c634bda35dfb2f817bf
 configure-command =
   ${perl:location}/bin/perl Makefile.PL

component/poppler/buildout.cfg

 [buildout]
 parts = poppler
 extends =
-  ../bzip2/buildout.cfg
   ../fontconfig/buildout.cfg
   ../freetype/buildout.cfg
   ../jbigkit/buildout.cfg
@@ -18,12 +17,10 @@ extends =
 recipe = hexagonit.recipe.cmmi
 md5sum = b566d1fbaa29b9257bf0ecc130e7b2ca
 url = http://poppler.freedesktop.org/poppler-0.17.2.tar.gz
-depends =
-  ${libtiff:version}
 configure-options =
   --disable-cairo-output
   --disable-cms
-  --disable-libcurl
+  --disable-curl
   --disable-gtk-doc-html
   --disable-gtk-test
   --disable-poppler-cpp
@@ -34,5 +31,5 @@ configure-options =
 environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig
-  CPPFLAGS=-I${bzip2:location}/include -I${libjpeg:location}/include -I${libpng:location}/include -I${libtiff:location}/include -I${zlib:location}/include
-  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${jbigkit:location}/lib -Wl,-rpath=${jbigkit:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${libtiff:location}/lib -Wl,-rpath=${libtiff:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+  CPPFLAGS=-I${libjpeg:location}/include -I${libpng:location}/include -I${libtiff:location}/include -I${zlib:location}/include
+  LDFLAGS=-L${jbigkit:location}/lib -Wl,-rpath=${jbigkit:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${libtiff:location}/lib -Wl,-rpath=${libtiff:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib

component/python-2.6/buildout.cfg

@@ -30,18 +30,16 @@ depends =
 # other settings in this part if we don't set it explicitly here.
 prefix = ${buildout:parts-directory}/${:_buildout_section_name_}
 version = 2.6
-package_version = ${:version}.8
-package_version_suffix = rc1
+package_version = ${:version}.7
 executable = ${:prefix}/bin/python${:version}
 
 url =
-  http://python.org/ftp/python/${:package_version}/Python-${:package_version}${:package_version_suffix}.tar.bz2
-md5sum = df6ccdac7da3b7c7c79124b92110277e
+  http://python.org/ftp/pyth