Merge branch 'master' into grid-computing

Conflicts:
	software/etherpad-lite/common.cfg

CHANGES.txt

 Changes
 =======
 
+0.85 (2013-12-03)
+-----------------
+
+ * Slaprunner: recipe replaced by a buildout profile [14fbcd92]
+ * Slaprunner: import instances can automatically deploy Software Releases [64c48388]
+ * Slaprunner: backup script passes basic authentification [8877615]
+ * Slaprunner: backup doesn't destroy symlinks for Software Releases [f519a078]
+ * Shellinabox: now uses uid and gid to start [e9349c65]
+ * Shellinabox: can do autoconnection [516e772]
+ * Librecipe-generic: correction of bash code for /bin/sh compatibility [bee8c9c8]
+
 0.84.2 (2013-10-04)
 -------------------
 

component/alsa/buildout.cfg

@@ -19,3 +19,4 @@ configure-options =
   --disable-alisp
   --disable-old-symbols
   --disable-python
+  --without-debug

component/apache-php/buildout.cfg

@@ -116,7 +116,7 @@ environment =
 
 [libmcrypt]
 recipe = slapos.recipe.cmmi
-url = http://sourceforge.net/projects/mcrypt/files/Libmcrypt/2.5.8/libmcrypt-2.5.8.tar.bz2/download
+url = http://downloads.sourceforge.net/project/mcrypt/Libmcrypt/2.5.8/libmcrypt-2.5.8.tar.bz2
 md5sum = c4f491dd411a09e9de3b8702ea6f73eb
 
 [xml-rpc]

component/apache/buildout.cfg

@@ -15,25 +15,25 @@ extends =
 
 [apr]
 recipe = hexagonit.recipe.download
-version = 1.4.6
+version = 1.5.0
 url = http://mir2.ovh.net/ftp.apache.org/dist/apr/apr-${:version}.tar.bz2
-md5sum = ffee70a111fd07372982b0550bbb14b7
+md5sum = cc93bd2c12d0d037f68e21cc6385dc31
 
 [apr-util]
 recipe = hexagonit.recipe.download
-version = 1.5.2
+version = 1.5.3
 url = http://mir2.ovh.net/ftp.apache.org/dist/apr/apr-util-${:version}.tar.bz2
-md5sum = 89c1348aa79e898d7c34a6206311c9c2
+md5sum = 6f3417691c7a27090f36e7cf4d94b36e
 
 [apache]
 # inspired on http://old.aclark.net/team/aclark/blog/a-lamp-buildout-for-wordpress-and-other-php-apps/
 recipe = slapos.recipe.cmmi
 depends =
   ${gdbm:version}
-version = 2.4.4
+version = 2.4.9
 revision = 1
 url = http://mir2.ovh.net/ftp.apache.org/dist/httpd/httpd-${:version}.tar.bz2
-md5sum = 0e712ee2119cd798c8ae39d5f11a9206
+md5sum = 2ef4e65353497606b24fa9bb3e5a3c40
 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
@@ -90,27 +90,20 @@ environment =
   CPPFLAGS =-I${libuuid:location}/include -I${openssl: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 = slapos.recipe.cmmi
-url = http://sourceforge.net/projects/mod-antiloris/files/mod_antiloris-0.4.tar.bz2/download
+url = http://downloads.sourceforge.net/project/mod-antiloris/mod_antiloris-0.4.tar.bz2
 md5sum = 66862bf10e9be3a023e475604a28a0b4
 patch-options = -p0
+# http://www.apachelounge.com/viewtopic.php?p=19139
+# http://www.apachelounge.com/viewtopic.php?p=20551
 patches =
-  ${mod_antiloris-apache-2.4.patch:location}/${mod_antiloris-apache-2.4.patch:filename}
+  ${:_profile_base_location_}/mod_antiloris-apache-2.4.patch#4f074f035d3b37f3f3e71cd9616440f3
 depends =
   ${apache:version}
   ${apache:revision}
-  ${mod_antiloris-apache-2.4.patch:md5sum}
+  ${gdbm:version}
 configure-command = ${apache:location}/bin/apxs
 configure-options = -c mod_antiloris.c
 make-binary = ${:configure-command}
@@ -120,9 +113,9 @@ make-targets =
 [apache-2.2]
 # inspired on http://old.aclark.net/team/aclark/blog/a-lamp-buildout-for-wordpress-and-other-php-apps/
 recipe = slapos.recipe.cmmi
-version = 2.2.25
+version = 2.2.26
 url = http://mir2.ovh.net/ftp.apache.org/dist/httpd/httpd-${:version}.tar.bz2
-md5sum = 9ebe3070c0bb4311f21a0cd0e34f0045
+md5sum = 254eda547f8d624604e4bf403241e617
 patch-options = -p1
 configure-options = --disable-static
                     --enable-authn-alias
@@ -181,7 +174,7 @@ environment =
 [apache-antiloris-apache-2.2]
 # Note: Shall react on each build of apache and reinstall itself
 recipe = slapos.recipe.cmmi
-url = http://sourceforge.net/projects/mod-antiloris/files/mod_antiloris-0.4.tar.bz2/download
+url = http://downloads.sourceforge.net/project/mod-antiloris/mod_antiloris-0.4.tar.bz2
 md5sum = 66862bf10e9be3a023e475604a28a0b4
 depends =
   ${apache-2.2:version}

component/bison/buildout.cfg

@@ -4,18 +4,10 @@ extends =
 parts =
   bison
 
-[bison-drop.gets.patch]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-md5sum = ac06cbaa298ac686d0b0c04bc03e6ad8
-download-only = true
-filename = drop.gets.patch
-
 [bison]
-virtual-depends = ${bison-drop.gets.patch:md5sum}
 patch-options = -p1
 patches =
-  ${bison-drop.gets.patch:location}/${bison-drop.gets.patch:filename}
+  ${:_profile_base_location_}/bison-drop.gets.patch#ac06cbaa298ac686d0b0c04bc03e6ad8
 
 recipe = slapos.recipe.cmmi
 url = http://ftp.gnu.org/gnu/bison/bison-2.5.tar.bz2

component/boost-lib/buildout.cfg

@@ -2,21 +2,12 @@
 parts =
   boost-lib
 
-[boost-lib-download]
-recipe = hexagonit.recipe.download
+[boost-lib]
+recipe = slapos.recipe.cmmi
 url = http://downloads.sourceforge.net/sourceforge/boost/boost_1_43_0.tar.gz
 md5sum = 734565ca4819bf04bd8e903e116c3fb1
-strip-top-level-dir = true
-
-[boost-lib]
-recipe = plone.recipe.command
-source = ${boost-lib-download:location}
-destination = ${buildout:parts-directory}/${:_buildout_section_name_}
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
-stop-on-error = true
-command =
-  rm -fr ${:destination} &&
-  mkdir -p ${:destination} &&
-  cd ${:source} &&
-  ./bootstrap.sh --prefix=${:location} &&
-  ./bjam install
+configure-command = ./bootstrap.sh --prefix=${:location}
+make-binary =
+make-options =
+make-targets = ./bjam link=shared install

component/busybox/buildout.cfg

@@ -4,11 +4,14 @@ parts = busybox
 
 [busybox]
 recipe = slapos.recipe.build
-url = http://git.busybox.net/busybox/snapshot/busybox-1_20_1.tar.gz
-md5sum = 2dcfee8add6b9c52d6a91e97ba705b66
+url = http://git.busybox.net/busybox/snapshot/busybox-1_20_2.tar.gz
+md5sum = 025acebb48040ef62dd635d416d317e8
+patches =
+    ${:_profile_base_location_}/busybox-1_20_2.patch#292498db86c46e101bb14bf2c74c36f0
 script =
     extract_dir = self.extract(self.download(%(url)r, %(md5sum)r))
     workdir = guessworkdir(extract_dir)
+    self.applyPatchList(self.options.get('patches'), '-p1', cwd=workdir)
     self.logger.info("Creating default configuration")
     call(['make', 'defconfig'], cwd=workdir, env=env)
     self.logger.info("Building")

component/busybox/busybox-1_20_2.patch

+diff --git a/include/libbb.h b/include/libbb.h
+index f12800f..e7806c2 100644
+--- a/include/libbb.h
++++ b/include/libbb.h
+@@ -40,6 +40,7 @@
+ #include <sys/poll.h>
+ #include <sys/ioctl.h>
+ #include <sys/mman.h>
++#include <sys/resource.h>
+ #include <sys/socket.h>
+ #include <sys/stat.h>
+ #include <sys/time.h>

component/bzip2/buildout.cfg

@@ -2,13 +2,6 @@
 parts =
   bzip2
 
-[bzip2-hooks-download]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-md5sum = 066c8355b7d726f30176ea5b6a35e1a2
-download-only = true
-filename = bzip2-hooks.py
-
 [bzip2]
 recipe = slapos.recipe.cmmi
 url = http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz
@@ -17,4 +10,4 @@ configure-command = true
 make-options =
   PREFIX=${buildout:parts-directory}/${:_buildout_section_name_}
   CFLAGS="-fpic -fPIC -Wall -Winline -O2 -g -D_FILE_OFFSET_BITS=64"
-post-make-hook = ${bzip2-hooks-download:location}/${bzip2-hooks-download:filename}:post_make_hook
+post-make-hook =  ${:_profile_base_location_}/bzip2-hooks.py#066c8355b7d726f30176ea5b6a35e1a2:post_make_hook

component/ca-certificates/buildout.cfg

@@ -8,22 +8,14 @@ extends =
 parts =
   ca-certificates
 
-
-[ca-certificates-sbin-dir.patch]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-md5sum = 0b4e7d82ce768823c01954ee41ef177b
-filename = ${:_buildout_section_name_}
-download-only = true
-
 [ca-certificates]
 recipe = slapos.recipe.cmmi
-version = 20130119
+version = 20130906
 url = ftp://ftp.free.fr/mirrors/ftp.debian.org/pool/main/c/ca-certificates/ca-certificates_${:version}.tar.gz
 patch-binary = ${patch:location}/bin/patch
-md5sum = 1fbbec2028a33cf865b79c204aa2e626
+md5sum = 67d42b6be21c616a8b7d3d85d95ae912
 patches =
-  ${ca-certificates-sbin-dir.patch:location}/${ca-certificates-sbin-dir.patch:filename}
+  ${:_profile_base_location_}/ca-certificates-sbin-dir.patch#0b4e7d82ce768823c01954ee41ef177b
 patch-options = -p0
 configure-command = true
 make-targets = install DESTDIR=${buildout:parts-directory}/${:_buildout_section_name_} CERTSDIR=certs SBINDIR=sbin

component/cloud9/buildout.cfg

@@ -19,7 +19,7 @@ recipe = slapos.recipe.build:npm
 packages = sm@0.2.11
 node = nodejs
 environment =
-  PATH=${nodejs:location}/bin:%(PATH)s
+  PATH=${nodejs-0.6:location}/bin:%(PATH)s
 
 [cloud9-stable]
 # Online IDE written in javascript/node.js
@@ -49,7 +49,34 @@ recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/${:filename}
 filename = cloud9-socket.patch
 download-only = true
-#md5sum = 5dc8cc28447ed3747b8a53c768d872aa
+md5sum = c581456cb3a76841898f79f9600e3a1e
+
+[cloud9-file-already-exist.patch]
+# This patch prevents the error "File already exists"
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+filename = cloud9-file_already_exist.patch
+download-only = true
+md5sum = 0bc104af8176388d60cbf884b72c8318
+
+[cloud9-remove-all-listeners.patch]
+# This patch prevents cloud9 to die every
+# time a tab is closed
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+filename = cloud9-removeAllListeners.patch
+download-only = true
+md5sum = 357915330d677f4917140e02a55646b7
+
+[cloud9-git-download]
+recipe = slapos.recipe.build:gitclone
+repository = https://github.com/ajaxorg/cloud9.git
+revision = f7d102bc225c922f116d2cea52a746d64343ea59
+location = ${buildout:parts-directory}/cloud9
+git-executable = ${git:location}/bin/git
+develop = true
+use-cache = true
+ignore-ssl-certificate = true
 
 [cloud9-git]
 # Online IDE written in javascript/node.js
@@ -58,13 +85,10 @@ download-only = true
 # NODE_PATH=${:destination}/node_modules ${nodejs:node_location} ${:cloud9_js_location}
 recipe = plone.recipe.command
 stop-on-error = true
-commit = f7d102bc225c922f116d2cea52a746d64343ea59
-repository = https://github.com/ajaxorg/cloud9.git
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-environment = export GIT_SSL_NO_VERIFY=true; export PATH=${git:location}/bin:${nodejs:location}/bin:${node-sm:location}/node_modules/sm/bin:$PATH; export CPPFLAGS="-I${libxml2:location}/include -I${nodejs:location}/include"; export LDFLAGS="-L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib"; export HOME=${:location};
-command = ${:environment} (git clone --quiet ${:repository} ${:location} && cd ${:location} && git reset --hard ${:commit} && ${node-sm:location}/node_modules/.bin/sm install && patch -p1 < ${cloud9-session-directory.patch:location}/${cloud9-session-directory.patch:filename} && ${node-sm:location}/node_modules/.bin/sm install && patch -p1 < ${cloud9-socket.patch:location}/${cloud9-socket.patch:filename}) || (rm -fr ${:location}; exit 1)
-update-command =
-executable = ${:location}/server.js
+environment = export GIT_SSL_NO_VERIFY=true; export PATH=${git:location}/bin:${nodejs-0.6:location}/bin:${node-sm:location}/node_modules/.bin/:$PATH; export CPPFLAGS="-I${libxml2:location}/include -I${nodejs-0.6:location}/include"; export LDFLAGS="-L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib"; export HOME=${cloud9-git-download:location};
+command = ${:environment} (cd ${cloud9-git-download:location} && ${node-sm:location}/node_modules/.bin/sm install && patch -p1 < ${cloud9-session-directory.patch:location}/${cloud9-session-directory.patch:filename} && patch -p1 < ${cloud9-socket.patch:location}/${cloud9-socket.patch:filename} && patch -p1 < ${cloud9-file-already-exist.patch:location}/${cloud9-file-already-exist.patch:filename} && patch -p1 < ${cloud9-remove-all-listeners.patch:location}/${cloud9-remove-all-listeners.patch:filename}) || (rm -fr ${cloud9-git-download:location}; exit 1)
+update-command = true
+executable = ${cloud9-git-download:location}/server.js
 
 [cloud9-npm]
 # Online IDE written in javascript/node.js

component/cloud9/cloud9-file_already_exist.patch

+diff --git a/node_modules/vfs-local/localfs.js b/node_modules/vfs-local/localfs.js
+index 7ce9981..1dd07b7 100644
+--- a/node_modules/vfs-local/localfs.js
++++ b/node_modules/vfs-local/localfs.js
+@@ -677,7 +677,7 @@ module.exports = function setup(fsOptions) {
+                     else {
+                         var err = new Error("File already exists.");
+                         err.code = "EEXIST";
+-                        callback(err);
++                        //callback(err);
+                     }
+                 });
+             });

component/cloud9/cloud9-removeAllListeners.patch

+diff --git a/plugins-server/cloud9.ide.watcher/file_watcher.js b/plugins-server/cloud9.ide.watcher/file_watcher.
+index b7ed7da..36dcd05 100644
+--- a/plugins-server/cloud9.ide.watcher/file_watcher.js
++++ b/plugins-server/cloud9.ide.watcher/file_watcher.js
+@@ -69,11 +69,11 @@ util.inherits(FileWatcher, EventEmitter);
+ 
+     this.close = function() {
+         if (this.watcher) {
+-            this.watcher.removeAllListeners();
++            //this.watcher.removeAllListeners();
+             this.watcher.close();
+             this.emit("close");
+         }
+         this.watcher = null;
+     };
+ 
+-}).call(FileWatcher.prototype);
+\ No newline at end of file
++}).call(FileWatcher.prototype);
+

component/cloudooo/buildout.cfg

@@ -22,7 +22,6 @@ git-executable = ${git:location}/bin/git
 
 [cloudooo]
 recipe = zc.recipe.egg
-python = python2.7
 extra-paths = ${cloudooo-repository:location}
 eggs =
   ${lxml-python:egg}

component/cmake/buildout.cfg

@@ -7,8 +7,8 @@ parts =
 
 [cmake]
 recipe = slapos.recipe.cmmi
-url = http://www.cmake.org/files/v2.8/cmake-2.8.10.2.tar.gz
-md5sum = 097278785da7182ec0aea8769d06860c
+url = http://www.cmake.org/files/v2.8/cmake-2.8.12.1.tar.gz
+md5sum = 9d38cd4e2c94c3cea97d0e2924814acc
 environment =
   CMAKE_INCLUDE_PATH=${ncurses:location}/include
   CMAKE_LIBRARY_PATH=${ncurses:location}/lib

component/coreutils/buildout.cfg

@@ -19,7 +19,7 @@ environment =
 recipe = plone.recipe.command
 stop-on-error = true
 update-command = ${:command}
-command = ${:test} -x ${:test} -a -x ${:cat} -a -x ${:rm} -a -x ${:echo} -a -x ${:date} -a -x ${:md5sum} -a -x ${:basename}
+command = ${:test} -x ${:test} -a -x ${:cat} -a -x ${:rm} -a -x ${:echo} -a -x ${:date} -a -x ${:md5sum} -a -x ${:basename} -a -x ${:sort} -a -x ${:tail}
 test = ${coreutils:location}/bin/test
 cat = ${coreutils:location}/bin/cat
 rm = ${coreutils:location}/bin/rm
@@ -27,3 +27,5 @@ echo = ${coreutils:location}/bin/echo
 date = ${coreutils:location}/bin/date
 md5sum = ${coreutils:location}/bin/md5sum
 basename = ${coreutils:location}/bin/basename
+sort = ${coreutils:location}/bin/sort
+tail = ${coreutils:location}/bin/tail

component/cpio/buildout.cfg

@@ -2,19 +2,10 @@
 [buildout]
 parts = cpio
 
-[cpio-drop.gets.patch]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-md5sum = 6c79cb9caf407063543efff93647c450
-download-only = true
-filename = drop.gets.patch
-
 [cpio]
-virtual-depends =
-  ${cpio-drop.gets.patch:md5sum}
 patch-options = -p1
 patches =
-  ${cpio-drop.gets.patch:location}/${cpio-drop.gets.patch:filename}
+  ${:_profile_base_location_}/cpio-drop.gets.patch#6c79cb9caf407063543efff93647c450
 recipe = slapos.recipe.cmmi
 url = http://ftp.gnu.org/gnu/cpio/cpio-2.11.tar.bz2
 md5sum = 20fc912915c629e809f80b96b2e75d7d

component/cups/buildout.cfg

+[buildout]
+extends =
+  ../zlib/buildout.cfg
+parts =
+  cups
+
+# for now we build and install library and header files only.
+[cups]
+recipe = slapos.recipe.cmmi
+url = http://www.cups.org/software/1.7.1/cups-1.7.1-source.tar.bz2
+md5sum = 55277c40fd4b7183dc3671d39c5c42b7
+configure-options =
+  --disable-static
+  --disable-dbus
+  --disable-gssapi
+  --disable-ssl
+  --disable-pam
+  --disable-avahi
+  --disable-dnssd
+  --disable-launchd
+  --disable-browsing
+  --disable-default-shared
+  --disable-raw-printing
+  --disable-webif
+make-options =
+  libs
+make-targets =
+  install-headers
+  install-libs
+environment =
+  CPPFLAGS=-I${zlib:location}/include
+  DSOFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib

component/curl/buildout.cfg

@@ -11,8 +11,8 @@ parts =
 
 [curl]
 recipe = slapos.recipe.cmmi
-url = http://curl.haxx.se/download/curl-7.31.0.tar.bz2
-md5sum = b7bea20579ac2f696338ae03f2c19ba5
+url = http://curl.haxx.se/download/curl-7.35.0.tar.bz2
+md5sum = c18fbdd031adb0529ae09fce399f2d10
 configure-options =
   --disable-static
   --disable-ldap
@@ -28,12 +28,15 @@ configure-options =
   --enable-ipv6
   --disable-sspi
   --without-gnutls
+  --without-spnego
   --with-ssl=${openssl:location}
   --with-zlib=${zlib:location}
   --without-nss
+  --without-libmetalink
   --without-libssh2
   --without-librtmp
   --without-libidn
+  --without-nghttp2
 
 environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s

component/dbus/buildout.cfg

@@ -9,10 +9,13 @@ parts =
 
 [dbus]
 recipe = slapos.recipe.cmmi
-url = http://dbus.freedesktop.org/releases/dbus/dbus-1.4.10.tar.gz
-md5sum = 402a2f8102bedbe236e2891b2b0f31c2
-configure-options = 
+url = http://dbus.freedesktop.org/releases/dbus/dbus-1.8.0.tar.gz
+md5sum = 059fbe84e39fc99c67a14f15b1f39dff
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+configure-options =
   --disable-static
+  --without-x
+make-targets = install && ${:location}/bin/dbus-uuidgen > ${:location}/var/lib/dbus/machine-id
 environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${libxml2:location}/lib/pkgconfig
@@ -21,8 +24,11 @@ environment =
 
 [dbus-glib]
 recipe = slapos.recipe.cmmi
-url = http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.94.tar.gz
-md5sum = e1f1506a6f4941e67bffd614b1ad5af6
+url = http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.102.tar.gz
+md5sum = f76b8558fd575d0106c3a556eaa49184
+configure-options =
+  --disable-static
+  --disable-gtk-doc-html
 environment =
   PATH=${pkgconfig:location}/bin:${glib:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${dbus:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig

component/dcron/buildout.cfg

 [buildout]
-extends = 
+extends =
   ../coreutils/buildout.cfg
 
 parts = dcron-output
 
-[dcron-hooks-download]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-md5sum = 860e914dff4108b47565965fe5ebc7b5
-download-only = true
-filename = dcron-hooks.py
-
-[dcron-patch-nonroot]
-recipe = hexagonit.recipe.download
-md5sum = d5408ab682b65cc1eda40d588fcd7db8
-url = ${:_profile_base_location_}/${:filename}
-filename = dcron-4.4.noroot.no.globals.patch
-download-only = true
-
 [dcron]
 recipe = slapos.recipe.cmmi
 url = http://www.jimpryor.net/linux/releases/dcron-4.4.tar.gz
 md5sum = 02d848ba043a9df5bf2102a9f4bc04bd
 configure-command = true
 patches =
-  ${dcron-patch-nonroot:location}/${dcron-patch-nonroot:filename}
+  ${:_profile_base_location_}/dcron-4.4.noroot.no.globals.patch#d5408ab682b65cc1eda40d588fcd7db8
 patch-options = -p1
 make-options =
   PREFIX=${buildout:parts-directory}/${:_buildout_section_name_}
-post-make-hook = ${dcron-hooks-download:location}/${dcron-hooks-download:filename}:post_make_hook
+post-make-hook = ${:_profile_base_location_}/dcron-hooks.py#860e914dff4108b47565965fe5ebc7b5:post_make_hook
 
 [dcron-output]
 # Shared binary location to ease migration

component/egg-patch/Acquisition/aq_dynamic.patch

+diff -uNr Acquisition-2.13.8/src/Acquisition/_Acquisition.c Acquisition-2.13.8nxd001/src/Acquisition/_Acquisition.c
+--- Acquisition-2.13.8/src/Acquisition/_Acquisition.c	2011-06-11 17:19:14.000000000 +0200
++++ Acquisition-2.13.8nxd001/src/Acquisition/_Acquisition.c	2013-10-31 16:24:55.665085888 +0100
+@@ -448,6 +448,64 @@
+ }
+ 
+ static PyObject *
++Wrapper_GetAttr(PyObject *self, PyObject *attr_name, PyObject *orig)
++{
++  /* This function retrieves an attribute from an object by PyObject_GetAttr.
++
++     The main difference between Wrapper_GetAttr and PyObject_GetAttr is that
++     Wrapper_GetAttr calls _aq_dynamic to generate an attribute dynamically, if
++     the attribute is not found.
++  */
++  PyObject *r, *v, *tb;
++  PyObject *d, *m;
++  PyObject *o;
++
++  if (isWrapper (self))
++    o = WRAPPER(self)->obj;
++  else
++    o = self;
++  
++  /* Try to get an attribute in the normal way first.  */
++  r = PyObject_GetAttr(o, attr_name);
++  if (r)
++    return r;
++
++  /* If an unexpected error happens, return immediately.  */
++  PyErr_Fetch(&r,&v,&tb);
++  if (r != PyExc_AttributeError)
++    {
++      PyErr_Restore(r,v,tb);
++      return NULL;
++    }
++
++  /* Try to get _aq_dynamic.  */
++  m = PyObject_GetAttrString(o, "_aq_dynamic");
++  if (! m) {
++    PyErr_Restore(r,v,tb);
++    return NULL;
++  }
++
++  /* Call _aq_dynamic in the context of the original acquisition wrapper.  */
++  if (PyECMethod_Check(m) && PyECMethod_Self(m)==o)
++    ASSIGN(m,PyECMethod_New(m,OBJECT(self)));
++  else if (has__of__(m)) ASSIGN(m,__of__(m,OBJECT(self)));
++  d = PyObject_CallFunction(m, "O", attr_name);
++  Py_DECREF(m);
++
++  /* In the case of None, assume that the attribute is not found.  */
++  if (d == Py_None) {
++    Py_DECREF(d);
++    PyErr_Restore(r,v,tb);
++    return NULL;
++  }
++
++  Py_XDECREF(r);
++  Py_XDECREF(v);
++  Py_XDECREF(tb);
++  return d;
++}
++
++static PyObject *
+ Wrapper_acquire(Wrapper *self, PyObject *oname, 
+ 		PyObject *filter, PyObject *extra, PyObject *orig,
+ 		int explicit, int containment);
+@@ -545,8 +603,8 @@
+ 	  Py_XDECREF(r); Py_XDECREF(v); Py_XDECREF(tb);
+ 	  r=NULL;
+ 	}
+-	  /* normal attribute lookup */
+-      else if ((r=PyObject_GetAttr(self->obj,oname)))
++      /* Give _aq_dynamic a chance, then normal attribute lookup */
++      else if ((r=Wrapper_GetAttr(OBJECT(self),oname,orig)))
+ 	{
+ 	  if (r==Acquired)
+ 	    {
+@@ -670,7 +728,7 @@
+           Py_XDECREF(r); Py_XDECREF(v); Py_XDECREF(tb);
+           r=NULL;
+ 
+-	  if ((r=PyObject_GetAttr(self->container,oname))) {
++	  if ((r=Wrapper_GetAttr(self->container,oname,orig))) {
+ 	    if (r == Acquired) {
+ 	      Py_DECREF(r);
+ 	    }
+@@ -707,7 +765,7 @@
+ Wrapper_getattro(Wrapper *self, PyObject *oname)
+ {
+   if (self->obj || self->container)
+-    return Wrapper_findattr(self, oname, NULL, NULL, NULL, 1, 1, 0, 0);
++    return Wrapper_findattr(self, oname, NULL, NULL, OBJECT(self), 1, 1, 0, 0);
+ 
+   /* Maybe we are getting initialized? */
+   return Py_FindAttr(OBJECT(self),oname);
+@@ -724,7 +782,7 @@
+     return Py_FindAttr(OBJECT(self),oname);
+ 
+   if (self->obj || self->container)
+-    return Wrapper_findattr(self, oname, NULL, NULL, NULL, 1, 0, 0, 0);
++    return Wrapper_findattr(self, oname, NULL, NULL, OBJECT(self), 1, 0, 0, 0);
+ 
+   /* Maybe we are getting initialized? */
+   return Py_FindAttr(OBJECT(self),oname);
+diff -uNr Acquisition-2.13.8/src/Acquisition/test_dynamic_acquisition.py Acquisition-2.13.8nxd001/src/Acquisition/test_dynamic_acquisition.py
+--- Acquisition-2.13.8/src/Acquisition/test_dynamic_acquisition.py	1970-01-01 01:00:00.000000000 +0100
++++ Acquisition-2.13.8nxd001/src/Acquisition/test_dynamic_acquisition.py	2013-10-31 16:24:55.665085888 +0100
+@@ -0,0 +1,160 @@
++##############################################################################
++#
++# Copyright (c) 1996-2002 Zope Corporation and Contributors.
++# All Rights Reserved.
++#
++# This software is subject to the provisions of the Zope Public License,
++# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
++# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
++# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
++# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
++# FOR A PARTICULAR PURPOSE
++#
++##############################################################################
++import Acquisition
++
++def checkContext(self, o):
++    # Python equivalent to aq_inContextOf
++    from Acquisition import aq_base, aq_parent, aq_inner
++    subob = self
++    o = aq_base(o)
++    while 1:
++        if aq_base(subob) is o:
++            return True
++        self = aq_inner(subob)
++        if self is None: break
++        subob = aq_parent(self)
++        if subob is None: break
++    return False
++
++class B(Acquisition.Implicit):
++    color='red'
++
++    def __init__(self, name='b'):
++        self.name = name
++
++    def _aq_dynamic(self, attr):
++        if attr == 'bonjour': return None
++
++        def dynmethod():
++            chain = ' <- '.join(repr(obj) for obj in Acquisition.aq_chain(self))
++            print repr(self) + '.' + attr
++            print 'chain:', chain
++
++        return dynmethod
++
++    def __repr__(self):
++        return "%s(%r)" % (self.__class__.__name__, self.name)
++
++class A(Acquisition.Implicit):
++
++    def __init__(self, name='a'):
++        self.name = name
++
++    def hi(self):
++        print self, self.color
++
++    def _aq_dynamic(self, attr):
++        return None
++
++    def __repr__(self):
++        return "%s(%r)" % (self.__class__.__name__, self.name)
++
++def test_dynamic():
++    r'''
++    The _aq_dynamic functionality allows an object to dynamically provide an
++    attribute.
++    
++    If an object doesn't have an attribute, Acquisition checks to see if the
++    object has a _aq_dynamic method, which is then called. It is functionally
++    equivalent to __getattr__, but _aq_dynamic is called with 'self' as the
++    acquisition wrapped object where as __getattr__ is called with self as the
++    unwrapped object.
++
++    Let's see how this works. In the examples below, the A class defines
++    '_aq_dynamic', but returns 'None' for all attempts, which means that no new
++    attributes should be generated dynamically. It also doesn't define 'color'
++    attribute, even though it uses it in the 'hi' method.
++
++        >>> A().hi()
++        Traceback (most recent call last):
++        ...
++        AttributeError: color
++    
++    The class B, on the other hand, generates all attributes dynamically,
++    except if it is called 'bonjour'.
++    
++    First we need to check that, even if an object provides '_aq_dynamic',
++    "regular" Aquisition attribute access should still work:
++
++        >>> b=B()
++        >>> b.a=A()
++        >>> b.a.hi()
++        A('a') red
++        >>> b.a.color='green'
++        >>> b.a.hi()
++        A('a') green
++
++    Now, let's see some dynamically generated action. B does not define a
++    'salut' method, but remember that it dynamically generates a method for
++    every attribute access:
++
++        >>> b.a.salut()
++        B('b').salut
++        chain: B('b')
++
++        >>> a=A('a1')
++        >>> a.b=B('b1')
++        >>> a.b.salut()
++        B('b1').salut
++        chain: B('b1') <- A('a1')
++
++        >>> b.a.bonjour()
++        Traceback (most recent call last):
++        ...
++        AttributeError: bonjour
++
++        >>> a.b.bonjour()
++        Traceback (most recent call last):
++        ...
++        AttributeError: bonjour
++
++    '''
++
++def test_wrapper_comparissons():
++    r'''
++
++    Test wrapper comparisons in presence of _aq_dynamic
++
++        >>> b=B()
++        >>> b.a=A()
++        >>> foo = b.a
++        >>> bar = b.a
++        >>> assert( foo == bar )
++        >>> c = A('c')
++        >>> b.c = c
++        >>> b.c.d = c
++        >>> b.c.d == c
++        True
++        >>> b.c.d == b.c
++        True
++        >>> b.c == c
++        True
++
++    Test contextuality in presence of _aq_dynamic
++
++        >>> checkContext(b.c, b)
++        True
++        >>> checkContext(b.c, b.a)
++        False
++
++        >>> assert b.a.aq_inContextOf(b)
++        >>> assert b.c.aq_inContextOf(b)
++        >>> assert b.c.d.aq_inContextOf(b)
++        >>> assert b.c.d.aq_inContextOf(c)
++        >>> assert b.c.d.aq_inContextOf(b.c)
++        >>> assert not b.c.aq_inContextOf(foo)
++        >>> assert not b.c.aq_inContextOf(b.a)
++        >>> assert not b.a.aq_inContextOf('somestring')
++'''
++
+diff -uNr Acquisition-2.13.8/src/Acquisition/tests.py Acquisition-2.13.8nxd001/src/Acquisition/tests.py
+--- Acquisition-2.13.8/src/Acquisition/tests.py	2011-06-11 17:09:38.000000000 +0200
++++ Acquisition-2.13.8nxd001/src/Acquisition/tests.py	2013-10-31 16:24:55.669085888 +0100
+@@ -2552,6 +2552,7 @@
+ def test_suite():
+     return unittest.TestSuite((
+         DocTestSuite(),
++        DocTestSuite('Acquisition.test_dynamic_acquisition'),
+         DocFileSuite('README.txt', package='Acquisition'),
+         unittest.makeSuite(TestParent),
+         unittest.makeSuite(TestAcquire),
+diff -uNr Acquisition-2.13.8/src/Acquisition.egg-info/SOURCES.txt Acquisition-2.13.8nxd001/src/Acquisition.egg-info/SOURCES.txt
+--- Acquisition-2.13.8/src/Acquisition.egg-info/SOURCES.txt	2011-06-11 17:21:18.000000000 +0200
++++ Acquisition-2.13.8nxd001/src/Acquisition.egg-info/SOURCES.txt	2013-10-31 16:24:55.669085888 +0100
+@@ -15,6 +15,7 @@
+ src/Acquisition/_Acquisition.c
+ src/Acquisition/__init__.py
+ src/Acquisition/interfaces.py
++src/Acquisition/test_dynamic_acquisition.py
+ src/Acquisition/tests.py
+ src/Acquisition.egg-info/PKG-INFO
+ src/Acquisition.egg-info/SOURCES.txt

component/egg-patch/Products.DCWorkflow/workflow_method.patch

+diff -uNr Products.DCWorkflow-2.2.4/Products/DCWorkflow/DCWorkflow.py Products.DCWorkflow-2.2.4nxd001/Products/DCWorkflow/DCWorkflow.py
+--- Products.DCWorkflow-2.2.4/Products/DCWorkflow/DCWorkflow.py	2011-11-01 18:55:01.000000000 +0100
++++ Products.DCWorkflow-2.2.4nxd001/Products/DCWorkflow/DCWorkflow.py	2013-10-31 16:42:05.021141352 +0100
+@@ -40,6 +40,7 @@
+ from Products.DCWorkflow.permissions import ManagePortal
+ from Products.DCWorkflow.Transitions import TRIGGER_AUTOMATIC
+ from Products.DCWorkflow.Transitions import TRIGGER_USER_ACTION
++from Products.DCWorkflow.Transitions import TRIGGER_WORKFLOW_METHOD
+ from Products.DCWorkflow.utils import Message as _
+ from Products.DCWorkflow.utils import modifyRolesForGroup
+ from Products.DCWorkflow.utils import modifyRolesForPermission
+@@ -281,6 +282,52 @@
+             raise Unauthorized(action)
+         self._changeStateOf(ob, tdef, kw)
+ 
++    security.declarePrivate('isWorkflowMethodSupported')
++    def isWorkflowMethodSupported(self, ob, method_id):
++        '''
++        Returns a true value if the given workflow method
++        is supported in the current state.
++        '''
++        sdef = self._getWorkflowStateOf(ob)
++        if sdef is None:
++            return 0
++        if method_id in sdef.transitions:
++            tdef = self.transitions.get(method_id, None)
++            if (tdef is not None and
++                tdef.trigger_type == TRIGGER_WORKFLOW_METHOD and
++                self._checkTransitionGuard(tdef, ob)):
++                return 1
++        return 0
++
++    security.declarePrivate('wrapWorkflowMethod')
++    def wrapWorkflowMethod(self, ob, method_id, func, args, kw):
++        '''
++        Allows the user to request a workflow action.  This method
++        must perform its own security checks.
++        '''
++        sdef = self._getWorkflowStateOf(ob)
++        if sdef is None:
++            raise WorkflowException, 'Object is in an undefined state'
++        if method_id not in sdef.transitions:
++            raise Unauthorized(method_id)
++        tdef = self.transitions.get(method_id, None)
++        if tdef is None or tdef.trigger_type != TRIGGER_WORKFLOW_METHOD:
++            raise WorkflowException, (
++                'Transition %s is not triggered by a workflow method'
++                % method_id)
++        if not self._checkTransitionGuard(tdef, ob):
++            raise Unauthorized(method_id)
++        res = func(*args, **kw)
++        try:
++            self._changeStateOf(ob, tdef)
++        except ObjectDeleted:
++            # Re-raise with a different result.
++            raise ObjectDeleted(res)
++        except ObjectMoved, ex:
++            # Re-raise with a different result.
++            raise ObjectMoved(ex.getNewObject(), res)
++        return res
++
+     security.declarePrivate('isInfoSupported')
+     def isInfoSupported(self, ob, name):
+         '''
+diff -uNr Products.DCWorkflow-2.2.4/Products/DCWorkflow/dtml/transition_properties.dtml Products.DCWorkflow-2.2.4nxd001/Products/DCWorkflow/dtml/transition_properties.dtml
+--- Products.DCWorkflow-2.2.4/Products/DCWorkflow/dtml/transition_properties.dtml	2011-11-01 18:55:01.000000000 +0100
++++ Products.DCWorkflow-2.2.4nxd001/Products/DCWorkflow/dtml/transition_properties.dtml	2013-10-31 16:42:05.021141352 +0100
+@@ -56,6 +56,16 @@
+ </tr>
+ 
+ <tr>
++<th></th>
++<td>
++<dtml-let checked="trigger_type==2 and 'checked' or ' '">
++<input type="radio" name="trigger_type" value="2" &dtml-checked; />
++Initiated by WorkflowMethod
++</dtml-let>
++</td>
++</tr>
++
++<tr>
+ <th align="left">Script (before)</th>
+ <td>
+ <select name="script_name">
+diff -uNr Products.DCWorkflow-2.2.4/Products/DCWorkflow/dtml/transitions.dtml Products.DCWorkflow-2.2.4nxd001/Products/DCWorkflow/dtml/transitions.dtml
+--- Products.DCWorkflow-2.2.4/Products/DCWorkflow/dtml/transitions.dtml	2011-11-01 18:55:01.000000000 +0100
++++ Products.DCWorkflow-2.2.4nxd001/Products/DCWorkflow/dtml/transitions.dtml	2013-10-31 16:42:05.021141352 +0100
+@@ -17,7 +17,8 @@
+   <td>
+    Destination state: <code><dtml-if new_state_id>&dtml-new_state_id;<dtml-else>(Remain in state)</dtml-if></code> <br />
+    Trigger: <dtml-var expr="(trigger_type == 0 and 'Automatic') or
+-                            (trigger_type == 1 and 'User action')">
++                            (trigger_type == 1 and 'User action') or
++                            (trigger_type == 2 and 'WorkflowMethod')">
+    <br />
+    <dtml-if script_name>
+      Script (before): &dtml-script_name;
+diff -uNr Products.DCWorkflow-2.2.4/Products/DCWorkflow/exportimport.py Products.DCWorkflow-2.2.4nxd001/Products/DCWorkflow/exportimport.py
+--- Products.DCWorkflow-2.2.4/Products/DCWorkflow/exportimport.py	2011-11-01 18:55:01.000000000 +0100
++++ Products.DCWorkflow-2.2.4nxd001/Products/DCWorkflow/exportimport.py	2013-10-31 16:42:09.221141578 +0100
+@@ -34,7 +34,7 @@
+ from Products.GenericSetup.interfaces import ISetupEnviron
+ from Products.GenericSetup.utils import BodyAdapterBase
+ 
+-TRIGGER_TYPES = ( 'AUTOMATIC', 'USER' )
++TRIGGER_TYPES = ( 'AUTOMATIC', 'USER', 'METHOD' )
+ _FILENAME = 'workflows.xml'
+ 
+ 
+diff -uNr Products.DCWorkflow-2.2.4/Products/DCWorkflow/Transitions.py Products.DCWorkflow-2.2.4nxd001/Products/DCWorkflow/Transitions.py
+--- Products.DCWorkflow-2.2.4/Products/DCWorkflow/Transitions.py	2011-11-01 18:55:01.000000000 +0100
++++ Products.DCWorkflow-2.2.4nxd001/Products/DCWorkflow/Transitions.py	2013-10-31 16:42:12.389141749 +0100
+@@ -31,6 +31,7 @@
+ 
+ TRIGGER_AUTOMATIC = 0
+ TRIGGER_USER_ACTION = 1
++TRIGGER_WORKFLOW_METHOD = 2
+ 
+ 
+ class TransitionDefinition (SimpleItem):

component/egg-patch/ZODB3-3.10.5.patch

+# https://mail.zope.org/pipermail/zodb-dev/2014-February/015182.html
+diff --git a/src/ZODB/FileStorage/FileStorage.py b/src/ZODB/FileStorage/FileStorage.py
+index d45cbbf..d662bf4 100644
+--- a/src/ZODB/FileStorage/FileStorage.py
++++ b/src/ZODB/FileStorage/FileStorage.py
+@@ -683,6 +683,7 @@ def tpc_vote(self, transaction):
+                 # Hm, an error occurred writing out the data. Maybe the
+                 # disk is full. We don't want any turd at the end.
+                 self._file.truncate(self._pos)
++                self._files.flush()
+                 raise
+             self._nextpos = self._pos + (tl + 8)
+ 
+@@ -737,6 +738,7 @@ def _finish_finish(self, tid):
+     def _abort(self):
+         if self._nextpos:
+             self._file.truncate(self._pos)
++            self._files.flush()
+             self._nextpos=0
+             self._blob_tpc_abort()
+ 
+@@ -1996,6 +1998,15 @@ def __init__(self, file_name):
+         self._out = []
+         self._cond = threading.Condition()
+ 
++    def flush(self):
++        """Empty read buffers.
++
++        This is required if they may contain data of rolled back transactions.
++        """
++        with self.write_lock():
++            for f in self._files:
++                f.flush()
++
+     @contextlib.contextmanager
+     def write_lock(self):
+         with self._cond:
+
+# https://github.com/zopefoundation/ZODB/pull/15/files
+diff -ur a/src/ZODB/FileStorage/FileStorage.py b/src/ZODB/FileStorage/FileStorage.py
+--- a/src/ZODB/FileStorage/FileStorage.py
++++ b/src/ZODB/FileStorage/FileStorage.py
+@@ -430,7 +430,7 @@
+                 if h.tid == serial:
+                     break
+                 pos = h.prev
+-                if not pos:
++                if h.tid < serial or not pos:
+                     raise POSKeyError(oid)
+             if h.plen:
+                 return self._file.read(h.plen)

component/fastjar/buildout.cfg

@@ -5,7 +5,7 @@ extends =
 
 [fastjar]
 recipe = slapos.recipe.cmmi
-url = http://sourceforge.net/projects/fastjar/files/fastjar/0.94/fastjar-0.94.tar.gz/download
+url = http://downloads.sourceforge.net/project/fastjar/fastjar/0.94/fastjar-0.94.tar.gz
 md5sum = 14d4bdfac236e347d806c6743dba48c6
 environment =
   CPPFLAGS=-I${zlib:location}/include

component/ffmpeg/buildout.cfg

 [buildout]
-extends = 
+extends =
   ../bzip2/buildout.cfg
   ../libpng/buildout.cfg
   ../patch/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../zlib/buildout.cfg
 
-parts = 
+parts =
   ffmpeg
 
 [ffmpeg]
@@ -25,28 +25,23 @@ url = http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.2.tar.bz2
 md5sum = 798a4211221073c1409f26eac4567e8b
 configure-options =
   --disable-static
-environment = 
+environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${libogg:location}/lib/pkgconfig
 
-[libtheora-png_sizeof.patch]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-filename = libtheora-png_sizeof.patch
-md5sum = eaa1454081b50f05b59495a12f52b0d5
-download-only = true
-
 [libtheora]
 recipe = slapos.recipe.cmmi
 url = http://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.bz2
 md5sum = 292ab65cedd5021d6b7ddd117e07cd8e
 depends =
   ${libpng:so_version}
-patches = ${libtheora-png_sizeof.patch:location}/${libtheora-png_sizeof.patch:filename}
+patches =
+  ${:_profile_base_location_}/libtheora-png_sizeof.patch#eaa1454081b50f05b59495a12f52b0d5
+
 patch-options = -p1
 configure-options =
   --disable-static
-environment = 
+environment =
   PATH=${patch:location}/bin:${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${libogg:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig:${libvorbis:location}/lib/pkgconfig
 
@@ -58,9 +53,9 @@ url = http://www.tortall.net/projects/yasm/releases/yasm-1.1.0.tar.gz
 recipe = slapos.recipe.cmmi
 url = http://webm.googlecode.com/files/libvpx-v0.9.6.tar.bz2
 md5sum = 383f3f07a76099682abb43f79b692b72
-configure-options = 
+configure-options =
  --enable-shared
-environment = 
+environment =
   PATH=${yasm:location}/bin:%(PATH)s
 
 [libx264]
@@ -70,7 +65,7 @@ md5sum = f86260b2ea6d6cb5186937c9363891d7
 configure-options =
   --enable-shared
   --enable-pic
-environment = 
+environment =
   PATH=${yasm:location}/bin:%(PATH)s
 
 [lame]
@@ -92,7 +87,7 @@ configure-options =
 recipe = slapos.recipe.cmmi
 url = http://ffmpeg.org/releases/ffmpeg-0.8.5.tar.bz2
 md5sum = 726877b19ece7ea64def8b7e6727e182
-configure-options = 
+configure-options =
  --enable-gpl
  --enable-version3
  --enable-postproc
@@ -108,7 +103,7 @@ configure-options =
  --enable-zlib
  --disable-static
  --extra-ldflags="-Wl,-rpath=${buildout:parts-directory}/${:_buildout_section_name_}/lib"
-environment = 
+environment =
   CPPFLAGS=-I${bzip2:location}/include -I${libogg:location}/include -I${libvorbis:location}/include -I${libtheora:location}/include -I${libvpx:location}/include -I${libx264:location}/include -I${lame:location}/include -I${opencore-amr:location}/include -I${zlib:location}/include
   LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${libogg:location}/lib -Wl,-rpath=${libogg:location}/lib -L${libvorbis:location}/lib -Wl,-rpath=${libvorbis:location}/lib -L${libtheora:location}/lib -Wl,-rpath=${libtheora:location}/lib -L${libvpx:location}/lib -Wl,-rpath=${libvpx:location}/lib -L${libx264:location}/lib -Wl,-rpath=${libx264:location}/lib -L${lame:location}/lib -Wl,-rpath=${lame:location}/lib -L${opencore-amr:location}/lib -Wl,-rpath=${opencore-amr:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
   PATH=${yasm:location}/bin:%(PATH)s

component/file/buildout.cfg

@@ -8,8 +8,8 @@ extends =
 
 [file]
 recipe = slapos.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.17.tar.gz
+md5sum = e19c47e069ced7b01ccb4db402cc01d3
 configure-options =
   --disable-static
 environment =

component/findutils/buildout.cfg

+[buildout]
+extends =
+  ../coreutils/buildout.cfg
+parts =
+  findutils-output
+
+[findutils]
+recipe = slapos.recipe.cmmi
+url = http://ftp.gnu.org/gnu/findutils/findutils-4.4.2.tar.gz
+md5sum = 351cc4adb07d54877fa15f75fb77d39f
+
+[findutils-output]
+# Shared binary location to ease migration
+recipe = plone.recipe.command
+stop-on-error = true
+update-command = ${:command}
+command = ${coreutils-output:test} -x ${:find} -a -x ${:xargs}
+find = ${findutils:location}/bin/find
+xargs = ${findutils:location}/bin/xargs

component/firefox/buildout.cfg

@@ -7,11 +7,13 @@ extends =
   ../gtk-2/buildout.cfg
   ../libpng/buildout.cfg
   ../dash/buildout.cfg
-  ../openssl/buildout.cfg
 
 parts =
   firefox
 
+# XXX : Firefox binary tries to find libgnomeui-2.so.0 and it will
+# fail to run if exists.
+
 [firefox]
 recipe = slapos.recipe.build
 slapos_promise =
@@ -22,8 +24,10 @@ depends =
   ${liberation-fonts:location}
   ${ipaex-fonts:location}
 
-x86 = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/18.0.2/linux-i686/en-US/firefox-18.0.2.tar.bz2 9eb4dcf2e9578203a16da3c70817ccb2
-x86-64 = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/18.0.2/linux-x86_64/en-US/firefox-18.0.2.tar.bz2 29903172f6fd788f04dbeb27b9193fe6
+version = 28.0
+
+x86 = http://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-i686/en-US/firefox-${:version}.tar.bz2 b9992b491c3d4131bd7f4982d0240d6d
+x86-64 = http://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-x86_64/en-US/firefox-${:version}.tar.bz2 8264fda486828d925aa094de902eb182
 
 script =
   if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ')
@@ -34,9 +38,8 @@ script =
   wrapper = open(wrapper_location, 'w')
   wrapper.write("""#!${dash:location}/bin/dash
   cd %(location)s
-  export LD_LIBRARY_PATH=%(location)s:${libXrender:location}/lib/:{dbus:location}/lib/:${dbus-glib:location}/lib/:${freetype:location}/lib/:${fontconfig:location}/lib/:${libX11:location}/lib/:${bzip2:location}/lib/:${libXext:location}/lib/:${libXt:location}/lib/:${zlib:location}/lib/:${libXcursor:location}/lib/:${gtk-2:location}/lib/:${cairo:location}/lib/:${pango:location}/lib/:${glib:location}/lib/:${atk:location}/lib/:${gdk-pixbuf:location}/lib/:${alsa:location}/lib/:${libpng15:location}/lib/:${libSM:location}/lib/:${libICE:location}/lib:${libxml2:location}/lib:${openssl:location}/lib
+  export LD_LIBRARY_PATH=%(location)s:${alsa:location}/lib:${atk:location}/lib:${bzip2:location}/lib:${cairo:location}/lib:${dbus:location}/lib:${dbus-glib:location}/lib:${fontconfig:location}/lib:${freetype:location}/lib:${gdk-pixbuf:location}/lib:${gettext:location}/lib:${glib:location}/lib:${gtk-2:location}/lib:${harfbuzz:location}/lib:${libICE:location}/lib:${libSM:location}/lib:${libX11:location}/lib:${libXau:location}/lib:${libXcursor:location}/lib:${libXext:location}/lib:${libXrender:location}/lib:${libXt:location}/lib:${libffi:location}/lib:${libpng:location}/lib:${libtool:location}/lib:${libuuid:location}/lib:${libxcb:location}/lib:${libxml2:location}/lib:${pango:location}/lib:${pixman:location}/lib:${xfixes:location}/lib:${zlib:location}/lib
   export PATH=${fontconfig:location}/bin:$PATH
   exec %(location)s/firefox $*""")
   wrapper.close()
   os.chmod(wrapper_location, 0755)
-

component/fontconfig/buildout.cfg

@@ -13,8 +13,9 @@ parts =
 
 [fontconfig]
 recipe = slapos.recipe.cmmi
-url = http://fontconfig.org/release/fontconfig-2.10.2.tar.bz2
-md5sum = 2f239690057d1438aa282e051f721d08
+url = http://fontconfig.org/release/fontconfig-2.11.0.tar.bz2
+md5sum = 000bd4baf7aefa828e03414d0c8c7dc5
+pkg_config_depends = ${freetype:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig
 # XXX-Cedric : should we use --with-add-fonts={somefont:location}/share,{someotherfont:location}/share?
 configure-options =
   --disable-static
@@ -23,6 +24,6 @@ configure-options =
   --with-default-fonts=${fonts:location}
 environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${freetype:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig
+  PKG_CONFIG_PATH=${:pkg_config_depends}
   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

component/freetype/buildout.cfg

@@ -12,13 +12,16 @@ parts =
 
 [freetype]
 recipe = slapos.recipe.cmmi
-url = http://download.savannah.gnu.org/releases/freetype/freetype-2.5.0.1.tar.bz2
-md5sum = c72e9010b1d986d556fc0b2b5fcbf31a
+url = http://download.savannah.gnu.org/releases/freetype/freetype-2.5.3.tar.bz2
+md5sum = d6b60f06bfc046e43ab2a6cbfd171d65
 depends =
   ${libpng:so_version}
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
 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
   PATH=${libpng:location}/bin:%(PATH)s
+make-targets =
+  install && ln -s . ${:location}/include/freetype2/freetype

component/gdbm/buildout.cfg

@@ -4,11 +4,12 @@ parts =
 
 [gdbm]
 recipe = slapos.recipe.cmmi
-version = 1.10
+version = 1.11
 url = ftp://ftp.gnu.org/gnu/gdbm/gdbm-${:version}.tar.gz
-md5sum = 88770493c2559dc80b561293e39d3570
+md5sum = 72c832680cf0999caedbe5b265c8c1bd
 configure-options =
   --disable-static
+  --enable-libgdbm-compat
 # install as parts/gdbm/include/gdbm/*.h etc. because some softwares
 # (eg. python's dbmmodule.c extension) assume the location like this.
 includedir = ${buildout:parts-directory}/${:_buildout_section_name_}/include

component/gettext/buildout.cfg

@@ -8,12 +8,13 @@ extends =
 
 [gettext]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnu.org/pub/gnu/gettext/gettext-0.18.2.1.tar.gz
-md5sum = 034c8103b14654ebd300fadac44d6f14
+url = http://ftp.gnu.org/pub/gnu/gettext/gettext-0.18.3.2.tar.gz
+md5sum = 241aba309d07aa428252c74b40a818ef
 
 configure-options =
   --disable-static
   --disable-java
+  --disable-native-java
   --disable-csharp
   --with-libncurses-prefix=${ncurses:location}
   --with-libxml2-prefix=${libxml2:location}
@@ -22,6 +23,8 @@ configure-options =
   --disable-acl
   --disable-openmp
   --without-git
+  --without-bz2
+  --without-xz
 
 environment =
   CPPFLAGS=-I${libxml2:location}/include -I${zlib:location}/include -I${ncurses:location}/include

component/ghostscript/buildout.cfg

 [buildout]
 extends =
   ../fontconfig/buildout.cfg
+  ../freetype/buildout.cfg
   ../libjpeg/buildout.cfg
   ../libtiff/buildout.cfg
+  ../libxml2/buildout.cfg
   ../pkgconfig/buildout.cfg
 
 parts = ghostscript
@@ -11,6 +13,7 @@ parts = ghostscript
 recipe = slapos.recipe.cmmi
 depends =
   ${libtiff:version}
+pkg_config_depends = ${libtiff:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${fontconfig:pkg_config_depends}
 configure-options =
   --disable-cups
   --disable-threadsafe
@@ -23,17 +26,17 @@ configure-options =
 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=${:pkg_config_depends}
+  LDFLAGS=-Wl,-rpath=${fontconfig:location}/lib -Wl,-rpath=${freetype:location}/lib -Wl,-rpath=${libtiff:location}/lib
+  LD_LIBRARY_PATH=${fontconfig:location}/lib:${freetype:location}/lib:${libtiff:location}/lib:${libxml2:location}/lib
 
 [ghostscript]
 <= ghostscript-9
 
 [ghostscript-9]
 <= ghostscript-common
-url = http://downloads.ghostscript.com/public/ghostscript-9.07.tar.bz2
-md5sum = eea27befc1e85bef6d4768202f6b03a5
+url = http://downloads.ghostscript.com/public/ghostscript-9.10.tar.bz2
+md5sum = 7179bb1ed4f6f453147e6f7e1f210ce8
 
 [ghostscript-fonts]
 recipe = hexagonit.recipe.download

component/giflib/buildout.cfg

@@ -4,8 +4,8 @@ parts =
 
 [giflib]
 recipe = slapos.recipe.cmmi
-url = http://prdownloads.sourceforge.net/giflib/giflib-4.2.0.tar.bz2?download
-md5sum = 711ad48551ee14db7c200b5f402df849
+url = http://downloads.sourceforge.net/project/giflib/giflib-4.x/giflib-4.2.3.tar.bz2
+md5sum = be1f5749c24644257a88c9f42429343d
 configure-options =
   --without-x
   --disable-x11

component/git/buildout.cfg

@@ -13,8 +13,8 @@ parts =
 
 [git]
 recipe = slapos.recipe.cmmi
-url = http://git-core.googlecode.com/files/git-1.8.2.3.tar.gz
-md5sum = 03ebfd403a8cf355da0e3f15e53b8925
+url = http://git-core.googlecode.com/files/git-1.8.5.3.tar.gz
+md5sum = 57b966065882f83ef5879620a1e329ca
 configure-options =
   --with-curl=${curl:location}
   --with-openssl=${openssl:location}

component/glib/buildout.cfg

 [buildout]
 extends =
   ../gettext/buildout.cfg
+  ../libffi/buildout.cfg
+  ../xz-utils/buildout.cfg
   ../zlib/buildout.cfg
+parts =
+  glib
 
 [glib]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnome.org/pub/gnome/sources/glib/2.28/glib-2.28.8.tar.bz2
-md5sum = 789e7520f71c6a4bf08bc683ec764d24
+url = http://ftp.gnome.org/pub/gnome/sources/glib/2.39/glib-2.39.3.tar.xz
+md5sum = c8ddc045e12cfafdea607c138f3f8429
 configure-options =
   --disable-static
   --disable-selinux
   --disable-fam
   --disable-xattr
-
+  --disable-man
 environment =
-  CPPFLAGS=-I${zlib:location}/include -I${gettext:location}/include
-  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib
-  PATH=${gettext:location}/bin:%(PATH)s
+  PATH=${gettext:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  CPPFLAGS=-I${gettext:location}/include -I${zlib:location}/include
+  LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+  LIBFFI_CFLAGS=-I${libffi:location}/lib/libffi-${libffi:version}/include
+  LIBFFI_LIBS= -L${libffi:location}/lib -Wl,-rpath=${libffi:location}/lib -lffi
 
 [x86-cygwin-glib]
 patches =

component/glibmm/buildout.cfg

+[buildout]
+extends =
+  ../gettext/buildout.cfg
+  ../glib/buildout.cfg
+  ../libsigc/buildout.cfg
+  ../pkgconfig/buildout.cfg
+  ../xz-utils/buildout.cfg
+parts =
+  glibmm
+
+[glibmm]
+recipe = slapos.recipe.cmmi
+url = http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.39/glibmm-2.39.3.tar.xz
+md5sum = 4cd63bdb100b4ddc4c69504d1cec62f7
+pkg_config_depends = ${glib:location}/lib/pkgconfig:${libsigc:location}/lib/pkgconfig
+configure-options =
+  --disable-documentation
+environment =
+  PATH=${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${:pkg_config_depends}
+  CPPFLAGS=-I${gettext:location}/include
+  LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib

component/gnutls/buildout.cfg

@@ -4,6 +4,7 @@ extends =
   ../nettle/buildout.cfg
   ../ncurses/buildout.cfg
   ../readline/buildout.cfg
+  ../xz-utils/buildout.cfg
   ../zlib/buildout.cfg
 
 parts = gnutls
@@ -31,6 +32,6 @@ configure-options =
   --with-libgcrypt-prefix=${gcrypt:location}
   --disable-static
 environment =
+  PATH=${xz-utils:location}/bin:%(PATH)s
   CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${gmp:location}/include -I${gcrypt:location}/include -I${gpg-error:location}/include -I${nettle:location}/include
   LDFLAGS=-lgcrypt -L${gmp:location}/lib -Wl,-rpath=${gmp:location}/lib -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${gcrypt:location}/lib -Wl,-rpath=${gcrypt:location}/lib -L${nettle:location}/lib -Wl,-rpath=${nettle:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${gpg-error:location}/lib -Wl,-rpath=${gpg-error:location}/lib
-

component/graphviz/buildout.cfg

@@ -9,25 +9,28 @@ extends =
   ../fontconfig/buildout.cfg
   ../freetype/buildout.cfg
   ../libpng/buildout.cfg
+  ../glib/buildout.cfg
+  ../gtk-2/buildout.cfg
   ../pkgconfig/buildout.cfg
+  ../xorg/buildout.cfg
   ../zlib/buildout.cfg
 
 [graphviz]
 recipe = slapos.recipe.cmmi
-url = http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.28.0.tar.gz
-md5sum = 8d26c1171f30ca3b1dc1b429f7937e58
+url = http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.36.0.tar.gz
+md5sum = 1f41664dba0c93109ac8b71216bf2b57
 depends =
   ${libpng:so_version}
+pkg_config_depends = ${pango:location}/lib/pkgconfig:${pango:pkg_config_depends}
 configure-options =
   --with-included-ltdl
-  --with-pngincludedir=${libpng:location}/include
-  --with-pnglibdir=${libpng:location}/lib
   --with-zincludedir=${zlib:location}/include
   --with-zlibdir=${zlib:location}/lib
   --with-freetype2
   --with-fontconfig
   --disable-swig
   --disable-sharp
+  --disable-go
   --disable-guile
   --disable-io
   --disable-java
@@ -42,16 +45,25 @@ configure-options =
   --without-x
   --without-expat
   --without-devil
+  --without-webp
+  --without-poppler
   --without-rsvg
   --without-ghostscript
   --without-visio
-  --without-pangocairo
+  --with-pangocairo
   --without-lasi
   --without-glitz
-  --without-jpeg
+  --without-gdk
+  --without-gtk
+  --without-gts
+  --without-ann
+  --without-glade
+  --without-ming
+  --without-qt
+  --without-libgd
   --without-glut
 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
+  PKG_CONFIG_PATH=${:pkg_config_depends}
+  CPPFLAGS=-I${zlib:location}/include
   LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib

component/grep/buildout.cfg

@@ -8,8 +8,8 @@ parts =
 
 [grep]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnu.org/gnu/grep/grep-2.14.tar.xz
-md5sum = d4a3f03849d1e17ce56ab76aa5a24cab
+url = http://ftp.gnu.org/gnu/grep/grep-2.17.tar.xz
+md5sum = 3b1f0cbf1139e76171f790665b1b41cf
 environment =
   PATH=${xz-utils:location}/bin:%(PATH)s
   CPPFLAGS=-I${pcre:location}/include

component/groonga/buildout.cfg

@@ -11,9 +11,9 @@ extends =
 
 [groonga]
 recipe = slapos.recipe.cmmi
-version = 3.0.9
+version = 4.0.0
 url = http://packages.groonga.org/source/groonga/groonga-${:version}.tar.gz
-md5sum = 2e9f7090f40876233c1f077fd25c26ee
+md5sum = 63d1ae3453719f7bef06a30f8966e886
 configure-options =
   --disable-static
   --disable-glibtest
@@ -27,9 +27,9 @@ environment =
 
 [groonga-normalizer-mysql]
 recipe = slapos.recipe.cmmi
-version = 1.0.5
+version = 1.0.6
 url = http://packages.groonga.org/source/groonga-normalizer-mysql/groonga-normalizer-mysql-${:version}.tar.gz
-md5sum = 88c0ab0d07c761877a5271e4a7f18551
+md5sum = 12740a835cfdf4b0dac66c3f2f152d84
 location = ${groonga:location}
 depends =
   ${groonga:version}

component/gtkmm/buildout.cfg

+[buildout]
+extends =
+  ../bzip2/buildout.cfg
+  ../fontconfig/buildout.cfg
+  ../freetype/buildout.cfg
+  ../glibmm/buildout.cfg
+  ../gtk-2/buildout.cfg
+  ../libpng/buildout.cfg
+  ../libxml2/buildout.cfg
+  ../xorg/buildout.cfg
+  ../xz-utils/buildout.cfg
+  ../zlib/buildout.cfg
+parts =
+  gtkmm
+
+[cairomm]
+recipe = slapos.recipe.cmmi
+url = http://cairographics.org/releases/cairomm-1.11.2.tar.gz
+md5sum = 732a3ff5b57401eb5dfeef795a2a0c52
+depends =
+  ${libpng:so_version}
+pkg_config_depends = ${cairo:location}/lib/pkgconfig:${cairo:pkg_config_depends}:${libsigc:location}/lib/pkgconfig
+configure-options =
+  --disable-static
+  --disable-documentation
+environment =
+  PATH=${freetype:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${:pkg_config_depends}
+  CPPFLAGS=-I${libX11:location}/include -I${libXrender:location}/include -I${render:location}/include -I${xproto:location}/include
+  LDFLAGS=-L${libX11:location}/lib -Wl,-rpath=${libX11:location}/lib -L${libXext:location}/lib -Wl,-rpath=${libXext:location}/lib -L${libXrender:location}/lib -Wl,-rpath=${libXrender:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+
+[pangomm]
+recipe = slapos.recipe.cmmi
+url = ftp://ftp.gnome.org/pub/gnome/sources/pangomm/2.34/pangomm-2.34.0.tar.xz
+md5sum = 2c702caede167323c9ed9eed2b933098
+pkg_config_depends = ${pango:location}/lib/pkgconfig:${pango:pkg_config_depends}:${glibmm:location}/lib/pkgconfig:${glibmm:pkg_config_depends}:${cairomm:location}/lib/pkgconfig
+configure-options =
+  --disable-static
+  --disable-documentation
+environment =
+  PATH=${glib:location}/bin:${freetype:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${:pkg_config_depends}
+  LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib
+
+[atkmm]
+recipe = slapos.recipe.cmmi
+url = http://ftp.gnome.org/pub/gnome/sources/atkmm/2.22/atkmm-2.22.7.tar.xz
+md5sum = fec7db3fc47ba2e0c95d130ec865a236
+pkg_config_depends = ${glib:location}/lib/pkgconfig:${atk:location}/lib/pkgconfig:${libsigc:location}/lib/pkgconfig:${glibmm:location}/lib/pkgconfig:
+configure-options =
+  --disable-static
+  --disable-documentation
+environment =
+  PATH=${glib:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${:pkg_config_depends}
+  LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib
+
+[gtkmm]
+recipe = slapos.recipe.cmmi
+url = http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.24/gtkmm-2.24.4.tar.xz
+md5sum = b9ac60c90959a71095f07f84dd39961d
+pkg_config_depends = ${pangomm:location}/lib/pkgconfig:${pangomm:pkg_config_depends}:${atkmm:location}/lib/pkgconfig:${atkmm:pkg_config_depends}:${gtk-2:location}/lib/pkgconfig:${gtk-2:pkg_config_depends}
+configure-options =
+  --disable-static
+  --disable-documentation
+environment =
+  PATH=${gdk-pixbuf:location}/bin:${glib:location}/bin:${gtk-2:location}/bin:${pango:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${:pkg_config_depends}
+  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib

component/gzip/drop.gets.patch

-diff -ur gzip-1.4.orig/lib/stdio.in.h gzip-1.4/lib/stdio.in.h
---- gzip-1.4.orig/lib/stdio.in.h	2010-01-20 14:20:36.000000000 +0100
-+++ gzip-1.4/lib/stdio.in.h	2012-07-23 16:20:24.299373437 +0200
-@@ -125,7 +125,9 @@
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
- #undef gets
-+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !__GLIBC_PREREQ(2, 16)
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-+#endif
- 
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@

component/imagemagick/buildout.cfg

@@ -8,6 +8,7 @@ extends =
   ../fontconfig/buildout.cfg
   ../freetype/buildout.cfg
   ../ghostscript/buildout.cfg
+  ../lcms/buildout.cfg
   ../librsvg/buildout.cfg
   ../libjpeg/buildout.cfg
   ../libpng/buildout.cfg
@@ -21,22 +22,16 @@ extends =
   ../xz-utils/buildout.cfg
   ../zlib/buildout.cfg
 
-[imagemagick-6.6.6-1-no-gsx-gsc-probe.patch]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-path = ${:filename}
-md5sum = 3f28ecd9f6722cf2c3238ce6ec3d7a68
-download-only = true
-filename = imagemagick-6.6.6-1-no-gsx-gsc-probe.patch
-
 [imagemagick]
 recipe = slapos.recipe.cmmi
-url = http://ftp.vim.org/ImageMagick/ImageMagick-6.8.2-6.tar.xz
-md5sum = ee01558201041a9978dd14b1db946ce8
+version = 6.8.8-9
+url = http://ftp.vim.org/ImageMagick/ImageMagick-${:version}.tar.xz
+md5sum = d4a7ac7400622a325580e52cf9a562c7
 depends =
   ${libtiff:version}
   ${libpng:so_version}
   ${webp:so_version}
+pkg_config_depends = ${fontconfig:location}/lib/pkgconfig:${fontconfig:pkg_config_depends}:${xz-utils:location}/lib/pkgconfig
 configure-options =
   --disable-static
   --without-x
@@ -51,8 +46,10 @@ configure-options =
   --without-gslib
   --without-gvc
   --without-lcms
-  --without-lcms2
+  --with-lcms2
+  --without-openjp2
   --without-lqr
+  --without-lzma
   --without-openexr
   --without-pango
   --without-rsvg
@@ -65,9 +62,9 @@ configure-options =
   --with-frozenpaths
 patch-options = -p1
 patches =
-  ${imagemagick-6.6.6-1-no-gsx-gsc-probe.patch:location}/${imagemagick-6.6.6-1-no-gsx-gsc-probe.patch:filename}
+  ${:_profile_base_location_}/imagemagick-6.6.6-1-no-gsx-gsc-probe.patch#3f28ecd9f6722cf2c3238ce6ec3d7a68
 environment =
   PATH=${freetype:location}/bin:${ghostscript:location}/bin:${librsvg:location}/bin:${libxml2:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${xz-utils:location}/lib/pkgconfig
-  CPPFLAGS=-I${bzip2:location}/include -I${zlib:location}/include -I${jbigkit:location}/include -I${libjpeg:location}/include -I${libtiff:location}/include -I${libpng:location}/include -I${jasper:location}/include -I${freetype:location}/include -I${webp:location}/include
-  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib: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${libpng:location}/lib -Wl,-rpath=${libpng:location}/lib -L${jasper:location}/lib -Wl,-rpath=${jasper:location}/lib -L${freetype:location}/lib -Wl,-rpath=${freetype:location}/lib -L${webp:location}/lib -Wl,-rpath=${webp:location}/lib
+  PKG_CONFIG_PATH=${:pkg_config_depends}
+  CPPFLAGS=-I${bzip2:location}/include -I${zlib:location}/include -I${jbigkit:location}/include -I${libjpeg:location}/include -I${libtiff:location}/include -I${libpng:location}/include -I${jasper:location}/include -I${freetype:location}/include -I${webp:location}/include -I${lcms2:location}/include
+  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib: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${libpng:location}/lib -Wl,-rpath=${libpng:location}/lib -L${jasper:location}/lib -Wl,-rpath=${jasper:location}/lib -L${freetype:location}/lib -Wl,-rpath=${freetype:location}/lib -L${webp:location}/lib -Wl,-rpath=${webp:location}/lib -L${lcms2:location}/lib -Wl,-rpath=${lcms2:location}/lib

component/inkscape/buildout.cfg

+[buildout]
+parts = inkscape
+extends =
+  ../boost-lib/buildout.cfg
+  ../bzip2/buildout.cfg
+  ../freetype/buildout.cfg
+  ../garbage-collector/buildout.cfg
+  ../gcc/buildout.cfg
+  ../gettext/buildout.cfg
+  ../glibmm/buildout.cfg
+  ../gtk-2/buildout.cfg
+  ../gtkmm/buildout.cfg
+  ../intltool/buildout.cfg
+  ../libpng/buildout.cfg
+  ../libsigc/buildout.cfg
+  ../libxml2/buildout.cfg
+  ../libxslt/buildout.cfg
+  ../perl/buildout.cfg
+  ../pkgconfig/buildout.cfg
+  ../popt/buildout.cfg
+  ../xorg/buildout.cfg
+  ../zlib/buildout.cfg
+
+[gsl]
+recipe = slapos.recipe.cmmi
+url = ftp://ftp.gnu.org/gnu/gsl/gsl-1.16.tar.gz
+md5sum = e49a664db13d81c968415cd53f62bc8b
+configure-options =
+  --disable-static
+environment =
+  PATH=${glib:location}/bin:${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${atk:location}/lib/pkgconfig:${libsigc:location}/lib/pkgconfig:${glibmm:location}/lib/pkgconfig:
+  LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib
+
+[inkscape]
+recipe = slapos.recipe.cmmi
+url = http://sourceforge.net/projects/inkscape/files/inkscape/0.48.4/inkscape-0.48.4.tar.bz2
+md5sum = 47bd8546e42ba396624eef9eb66b9b6c
+depends =
+  ${libpng:so_version}
+pkg_config_depends = ${gtkmm:location}/lib/pkgconfig:${gtkmm:pkg_config_depends}:${gsl:location}/lib/pkgconfig:${popt:location}/lib/pkgconfig:${garbage-collector:location}/lib/pkgconfig:${libxslt:location}/lib/pkgconfig
+patch-options = -p0
+patches =
+  ${:_profile_base_location_}/inkscape-0.48.4.patch#1bdb1154e98c08cb676445b625d7cec0
+configure-options =
+  --disable-lcms
+  --without-gnome-vfs
+  --without-perl
+  --without-python
+environment =
+  PATH=${freetype:location}/bin:${gdk-pixbuf:location}/bin:${gettext:location}/bin:${glib:location}/bin:${intltool:location}/bin:${libxml2:location}/bin:${pkgconfig:location}/bin:${pango:location}/bin:${perl:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${:pkg_config_depends}
+  CPPFLAGS=-I${boost-lib:location}/include -I${cairo:location}/include -I${garbage-collector:location}/include -I${libpng:location}/include -I${popt:location}/include  -I${zlib:location}/include
+# rpath seems not taken from pkgconfig...
+  LDFLAGS=-L${atk:location}/lib -Wl,-rpath=${atk:location}/lib -L${atkmm:location}/lib -Wl,-rpath=${atkmm:location}/lib -L${boost-lib:location}/lib -Wl,-rpath=${boost-lib:location}/lib -L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${cairo:location}/lib -Wl,-rpath=${cairo:location}/lib -L${cairomm:location}/lib -Wl,-rpath=${cairomm:location}/lib -L${fontconfig:location}/lib -Wl,-rpath=${fontconfig:location}/lib -L${freetype:location}/lib -Wl,-rpath=${freetype:location}/lib -L${garbage-collector:location}/lib -Wl,-rpath=${garbage-collector:location}/lib -L${gdk-pixbuf:location}/lib -Wl,-rpath=${gdk-pixbuf:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${glib:location}/lib -Wl,-rpath=${glib:location}/lib -L${glibmm:location}/lib -Wl,-rpath=${glibmm:location}/lib -L${gsl:location}/lib -Wl,-rpath=${gsl:location}/lib -L${gtk-2:location}/lib -Wl,-rpath=${gtk-2:location}/lib -L${gtkmm:location}/lib -Wl,-rpath=${gtkmm:location}/lib -L${libX11:location}/lib -Wl,-rpath=${libX11:location}/lib -L${libXext:location}/lib -Wl,-rpath=${libXext:location}/lib -L${libpng:location}/lib -Wl,-rpath=${libpng:location}/lib -L${libsigc:location}/lib -Wl,-rpath=${libsigc:location}/lib -L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib -L${libxslt:location}/lib -Wl,-rpath=${libxslt:location}/lib -L${pango:location}/lib -Wl,-rpath=${pango:location}/lib -L${pangomm:location}/lib -Wl,-rpath=${pangomm:location}/lib -L${popt:location}/lib -Wl,-rpath=${popt:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib

component/inkscape/inkscape-0.48.4.patch

+--- src/widgets/desktop-widget.h~       2011-07-08 20:25:09.000000000 +0200
++++ src/widgets/desktop-widget.h        2014-01-17 13:22:48.503773743 +0100
+@@ -239,7 +239,7 @@
+ private:
+     GtkWidget *tool_toolbox;
+     GtkWidget *aux_toolbox;
+-    GtkWidget *commands_toolbox,;
++    GtkWidget *commands_toolbox;
+     GtkWidget *snap_toolbox;
+ 
+     static void init(SPDesktopWidget *widget);

component/jbigkit/buildout.cfg

@@ -2,30 +2,16 @@
 parts =
   jbigkit
 
-[jbigkit-hooks]
-recipe = hexagonit.recipe.download
-download-only = true
-url = ${:_profile_base_location_}/${:filename}
-md5sum = f1edb4ddd212d2d100d7ea8b2e42d21f
-filename = jbigkit-hooks.py
-
-[jbigkit-build-patch]
-recipe = hexagonit.recipe.download
-# Patched thanks to Gentoo developers:
-# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-libs/jbigkit/files/jbigkit-2.0-build.patch?revision=1.1
-url = ${:_profile_base_location_}/${:filename}
-download-only = true
-filename = jbigkit-2.0-build.patch
-md5sum = e974958e9331735c07478e9c2dde8795
-
 [jbigkit]
 recipe = slapos.recipe.cmmi
 url = http://www.cl.cam.ac.uk/~mgk25/download/jbigkit-2.0.tar.gz
 md5sum = 3dd87f605abb1a97a22dc79d8b3e8f6c
 patch-options =
   -p1
+# Patched thanks to Gentoo developers:
+# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-libs/jbigkit/files/jbigkit-2.0-build.patch?revision=1.1
 patches =
-  ${jbigkit-build-patch:location}/${jbigkit-build-patch:filename}
+  ${:_profile_base_location_}/jbigkit-2.0-build.patch#e974958e9331735c07478e9c2dde8795
 configure-command = true
 make-targets = lib pbm
-post-make-hook = ${jbigkit-hooks:location}/${jbigkit-hooks:filename}:post_make_hook
+post-make-hook = ${:_profile_base_location_}/jbigkit-hooks.py#f1edb4ddd212d2d100d7ea8b2e42d21f:post_make_hook

component/lcms/buildout.cfg

+# Little CMS - Great color at small footprint
+# http://www.littlecms.com
+
+[buildout]
+extends =
+  ../jbigkit/buildout.cfg
+  ../libjpeg/buildout.cfg
+  ../libtiff/buildout.cfg
+  ../zlib/buildout.cfg
+
+parts =
+  lcms2
+
+[lcms2]
+recipe = slapos.recipe.cmmi
+url = http://downloads.sourceforge.net/project/lcms/lcms/2.6/lcms2-2.6.tar.gz
+md5sum = f4c08d38ceade4a664ebff7228910a33
+depends =
+  ${libpng:so_version}
+  ${libtiff:version}
+configure-options =
+  --disable-static
+environment =
+  CPPFLAGS=-I${libjpeg: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/leptonica/buildout.cfg

@@ -21,15 +21,8 @@ configure-command =
   ./configure --prefix=${buildout:parts-directory}/${:_buildout_section_name_} --disable-static
 patch-options = -p1
 patches =
-  ${leptonica-1.69-zlib-include.patch:location}/${leptonica-1.69-zlib-include.patch:filename}
+  ${:_profile_base_location_}/leptonica-1.69-zlib-include.patch#cff3dc942075190939b407c38e0d3201
 environment =
   ACLOCAL_ARGS=-I${libtool:location}/share/aclocal
   CPPFLAGS=-I${zlib:location}/include -I${libjpeg:location}/include -I${libpng:location}/include -I${libtiff:location}/include -I${webp:location}/include -I${giflib:location}/include
   LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${libpng:location}/lib -Wl,-rpath=${libpng:location}/lib -L${libtiff:location}/lib -Wl,-rpath=${libtiff:location}/lib -L${webp:location}/lib -Wl,-rpath=${webp:location}/lib -L${giflib:location}/lib -Wl,-rpath=${giflib:location}/lib
-
-[leptonica-1.69-zlib-include.patch]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-md5sum = cff3dc942075190939b407c38e0d3201
-download-only = true
-filename = ${:_buildout_section_name_}

component/libdmtx/buildout.cfg

@@ -25,6 +25,7 @@ url = http://prdownloads.sourceforge.net/libdmtx/dmtx-utils-0.7.4.tar.bz2
 md5sum = b132ab9fb1d289869469b8bb4959a08a
 depends =
   ${libpng:so_version}
+  ${imagemagick:version}
 configure-options =
   --disable-static
 environment =

component/libexpat/buildout.cfg

@@ -4,7 +4,7 @@ parts =
 
 [libexpat]
 recipe = slapos.recipe.cmmi
-url = http://sourceforge.net/projects/expat/files/expat/2.1.0/expat-2.1.0.tar.gz/download
+url = http://downloads.sourceforge.net/project/expat/expat/2.1.0/expat-2.1.0.tar.gz
 md5sum = dd7dab7a5fea97d2a6a43f511449b7cd
 configure-options =
   --disable-static

component/libffi/buildout.cfg

+[buildout]
+parts =
+  libffi
+
+[libffi]
+recipe = slapos.recipe.cmmi
+version = 3.0.13
+url = ftp://sourceware.org/pub/libffi/libffi-${:version}.tar.gz
+md5sum = 45f3b6dbc9ee7c7dfbbbc5feba571529
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+configure-options =
+  --disable-static
+# on x86_64 OpenSuse, libraries are installed under parts/libffi/lib64.
+make-targets =
+  install && cp -av ${:location}/lib64/* ${:location}/lib/ || true

component/libpng/buildout.cfg

@@ -18,16 +18,16 @@ environment =
 
 [libpng12]
 <= libpng-common
-url = http://download.sourceforge.net/libpng/libpng-1.2.50.tar.bz2
-md5sum = 717caa58e9c71a80820eb38c4f4d6ec3
+url = http://download.sourceforge.net/libpng/libpng-1.2.51.tar.xz
+md5sum = 4efba67fa5aa2b785c6fcec2cc3e90c9
 
 [libpng15]
 <= libpng-common
-url = http://download.sourceforge.net/libpng/libpng-1.5.16.tar.xz
-md5sum = fd85af68f84cbdf549147811006488c1
+url = http://download.sourceforge.net/libpng/libpng-1.5.18.tar.xz
+md5sum = 23fb6a0e9f4dbaab7b34b6fd317a4f2d
 
 [libpng]
 <= libpng-common
-url = http://download.sourceforge.net/libpng/libpng-1.6.6.tar.xz
-md5sum = 3a41dcd58bcac7cc191c2ec80c7fb2ac
+url = http://download.sourceforge.net/libpng/libpng-1.6.10.tar.xz
+md5sum = 5f414b20f683b1d96b163c89e3eff768
 so_version = 16

component/libreoffice-bin/buildout.cfg

@@ -12,14 +12,14 @@ 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.6
-url = http://download.documentfoundation.org/libreoffice/stable/${:version}/rpm/%s/LibO_${:version}_Linux_%s_install-rpm_en-US.tar.gz
+version = 4.2.1.1
+url = http://downloadarchive.documentfoundation.org/libreoffice/old/${:version}/rpm/%s/LibreOffice_${:version}_Linux_%s_rpm.tar.gz
 # supported architectures md5sums
-md5sum_x86 = 922935201a350a7e0d3f83c08f739ee2
-md5sum_x86-64 = fa41089ce29eb03cdfb34d06a1e786db
+md5sum_x86 = 55f1bb4384b27d12df17185d22c238d3
+md5sum_x86-64 = 77140164da124c2f6e1eac3cad117542
 
 # where office code can be found?
-officedir = libreoffice3.6
+officedir = libreoffice4.2
 
 # script to install
 script =

component/librsvg/buildout.cfg

@@ -14,6 +14,8 @@ extends =
 recipe = slapos.recipe.cmmi
 url = http://ftp.gnome.org/pub/gnome/sources/libcroco/0.6/libcroco-0.6.8.tar.xz
 md5sum = 767e73c4174f75b99695d4530fd9bb80
+configure-options =
+  --disable-static
 environment =
   PATH=${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${pkgconfig:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig
@@ -21,11 +23,11 @@ environment =
 
 [librsvg]
 recipe = slapos.recipe.cmmi
-version = 2.36.1
-url = http://ftp.gnome.org/pub/GNOME/sources/librsvg/2.36/librsvg-2.36.4.tar.xz
-md5sum = 3c94524c8ccf668e30b236f409239f54
+url = http://ftp.gnome.org/pub/GNOME/sources/librsvg/2.40/librsvg-2.40.2.tar.xz
+md5sum = acdecdb9f08f3bf662a68bf7dafb8b82
 depends =
   ${libpng:so_version}
+pkg_config_depends = ${pango:location}/lib/pkgconfig:${pango:pkg_config_depends}:${zlib:location}/lib/pkgconfig:${gdk-pixbuf:location}/lib/pkgconfig:${libcroco:location}/lib/pkgconfig
 configure-options =
   --disable-static
   --disable-gtk-theme
@@ -36,5 +38,5 @@ configure-options =
   --enable-introspection=no
 environment =
   PATH=${gdk-pixbuf:location}/bin:${glib:location}/bin:${libxml2:location}/bin:${pkgconfig:location}/bin:${pango:location}/bin:${xz-utils:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${cairo:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${gdk-pixbuf:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libXrender:location}/lib/pkgconfig:${libcroco:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig:${pango:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig
+  PKG_CONFIG_PATH=${:pkg_config_depends}
   LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${zlib:location}/lib

component/libsigc/buildout.cfg

+[buildout]
+extends =
+  ../m4/buildout.cfg
+  ../xz-utils/buildout.cfg
+
+parts =
+  libsigc
+
+[libsigc]
+recipe = slapos.recipe.cmmi
+url = http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.3/libsigc++-2.3.1.tar.xz
+md5sum = 06a0569e8ba161d3428e7daa838682f8
+configure-options =
+  --disable-documentation
+environment =
+  PATH=${m4:location}/bin:${xz-utils:location}/bin:%(PATH)s

component/logrotate/buildout.cfg

@@ -3,20 +3,13 @@ extends =
   ../popt/buildout.cfg
 parts = logrotate
 
-[logrotate-3.7.9-O_CLOEXEC.optional.patch]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-download-only = true
-md5sum = 6beac248c978b767d4bccc1b7eebe6bd
-filename = ${:_buildout_section_name_}
-
 [logrotate]
 recipe = slapos.recipe.cmmi
 url = https://fedorahosted.org/releases/l/o/logrotate/logrotate-3.7.9.tar.gz
 md5sum = eeba9dbca62a9210236f4b83195e4ea5
 patch-options = -p1
 patches =
-  ${logrotate-3.7.9-O_CLOEXEC.optional.patch:location}/${logrotate-3.7.9-O_CLOEXEC.optional.patch:filename}
+  ${:_profile_base_location_}/logrotate-3.7.9-O_CLOEXEC.optional.patch#6beac248c978b767d4bccc1b7eebe6bd
 configure-command = true
 make-options = PREFIX=${buildout:parts-directory}/${:_buildout_section_name_} 
 environment =

component/m4/buildout.cfg

 [buildout]
+extends =
+  ../xz-utils/buildout.cfg
 parts =
   m4
 
-[m4-drop.gets.patch]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-md5sum = dc5f06fb42649e181c40177eb1edc333
-download-only = true
-filename = drop.gets.patch
-
 [m4]
-virtual-depends = ${m4-drop.gets.patch:md5sum}
-patch-options = -p1
-patches =
-  ${m4-drop.gets.patch:location}/${m4-drop.gets.patch:filename}
-
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnu.org/gnu/m4/m4-1.4.16.tar.bz2
-md5sum = 8a7cef47fecab6272eb86a6be6363b2f
+url = http://ftp.gnu.org/gnu/m4/m4-1.4.17.tar.xz
+md5sum = 12a3c829301a4fd6586a57d3fcf196dc
+environment =
+  PATH=${xz-utils:location}/bin:%(PATH)s

component/m4/drop.gets.patch

-diff -ur m4-1.4.16.orig/lib/stdio.in.h m4-1.4.16/lib/stdio.in.h
---- m4-1.4.16.orig/lib/stdio.in.h	2011-03-01 17:39:29.000000000 +0100
-+++ m4-1.4.16/lib/stdio.in.h	2012-07-23 09:28:57.945703705 +0200
-@@ -162,7 +162,9 @@
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
- #undef gets
-+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !__GLIBC_PREREQ(2, 16)
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-+#endif
- 
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@

component/mariadb/buildout.cfg

@@ -12,28 +12,22 @@ extends =
   ../openssl/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../readline/buildout.cfg
+  ../libxml2/buildout.cfg
 
 parts =
   mariadb
 
-[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]
 recipe = slapos.recipe.cmmi
-version = 5.5.33a
+version = 10.0.9
 revision = 1
 url = http://downloads.askmonty.org/f/mariadb-${:version}/kvm-tarbake-jaunty-x86/mariadb-${:version}.tar.gz/from/http://ftp.osuosl.org/pub/mariadb
-md5sum = 00449a034b88490f16bd679b800bb850
+md5sum = 36363eaaeace9e81a64ac94d9d53bffe
 # 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}
+  ${:_profile_base_location_}/mariadb_10.0.8_create_system_tables__no_test.patch#a176d491cf45fccd53ee397c70393bc4
 configure-command = ${cmake:location}/bin/cmake
 configure-options =
   -DCMAKE_INSTALL_PREFIX=${buildout:parts-directory}/${:_buildout_section_name_}
@@ -49,24 +43,29 @@ configure-options =
   -DWITH_EMBEDDED_SERVER=0
   -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1
   -DWITHOUT_DAEMON_EXAMPLE=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_CXX_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
+  -DCMAKE_C_FLAGS="-I${libaio:location}/include -I${libxml2:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${readline5:location}/include -I${zlib:location}/include"
+  -DCMAKE_CXX_FLAGS="-I${libaio:location}/include -I${libxml2:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${readline5:location}/include -I${zlib:location}/include"
+  -DCMAKE_INSTALL_RPATH=${libaio:location}/lib:${libxml2: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
+  CMAKE_INCLUDE_PATH=${libaio:location}/include:${libxml2:location}/include:${ncurses:location}/include:${openssl:location}/include:${readline5:location}/include:${zlib:location}/include
+  CMAKE_LIBRARY_PATH=${libaio:location}/lib:${libxml2:location}/lib:${ncurses:location}/lib:${openssl:location}/lib:${readline5:location}/lib:${zlib:location}/lib
   LDFLAGS=-L${libaio:location}/lib -L${zlib:location}/lib
 
 [mroonga-mariadb]
 # 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-3.09.tar.gz
-md5sum = bdcd1d86185a64520881d33e12b7d7a7
+url = http://packages.groonga.org/source/mroonga/mroonga-4.00.tar.gz
+md5sum = f54c44c1ab0a98bea9f6ea6c4a8b2787
+patch-options = -p1
+patches =
+  ${:_profile_base_location_}/mroonga-4.00-mariadb-10.0.9.patch#1ad028d2d5701eecc7cb5b40b78abdc0
 configure-options =
   --with-mysql-source=${mariadb:location}__compile__/mariadb-${mariadb:version}
   --with-mysql-config=${mariadb:location}/bin/mysql_config
+  --disable-static
+  --disable-document
 depends =
   ${mariadb:version}
   ${mariadb:revision}

component/mariadb/mariadb_5.5_create_system_tables__no_test.patch → component/mariadb/mariadb_10.0.8_create_system_tables__no_test.patch

@@ -5,9 +5,9 @@ circumstances as it is checked first.
 See http://bugs.debian.org/301741
 and http://bugs.mysql.com/bug.php?id=6901
 
---- scripts/mysql_system_tables_data.sql	2008-12-04 22:59:44.000000000 +0100
-+++ scripts/mysql_system_tables_data.sql	2008-12-04 23:00:07.000000000 +0100
-@@ -27,8 +27,6 @@
+--- scripts/mysql_system_tables_data.sql.orig   2013-11-05 17:46:05.000000000 +0100
++++ scripts/mysql_system_tables_data.sql        2013-11-08 09:28:34.707291508 +0100
+@@ -30,8 +30,6 @@
  -- Fill "db" table with default grants for anyone to
  -- access database 'test' and 'test_%' if "db" table didn't exist
  CREATE TEMPORARY TABLE tmp_db LIKE db;
@@ -16,12 +16,12 @@ and http://bugs.mysql.com/bug.php?id=6901
  INSERT INTO db SELECT * FROM tmp_db WHERE @had_db_table=0;
  DROP TABLE tmp_db;
  
-@@ -41,8 +39,6 @@
- REPLACE INTO tmp_user SELECT @current_hostname,'root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','' FROM dual WHERE LOWER( @current_hostname) != 'localhost';
- REPLACE INTO tmp_user VALUES ('127.0.0.1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','');
- REPLACE INTO tmp_user VALUES ('::1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','');
+@@ -43,8 +41,6 @@
+ REPLACE INTO tmp_user SELECT @current_hostname,'root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','','N','N' FROM dual WHERE @current_hostname != 'localhost';
+ REPLACE INTO tmp_user VALUES ('127.0.0.1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','','N','N');
+ REPLACE INTO tmp_user VALUES ('::1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','','N','N');
 -INSERT INTO tmp_user (host,user) VALUES ('localhost','');
--INSERT INTO tmp_user (host,user) SELECT @current_hostname,'' FROM dual WHERE LOWER(@current_hostname ) != 'localhost';
+-INSERT INTO tmp_user (host,user) SELECT @current_hostname,'' FROM dual WHERE @current_hostname != 'localhost';
  INSERT INTO user SELECT * FROM tmp_user WHERE @had_user_table=0;
  DROP TABLE tmp_user;
  

component/mariadb/mroonga-2.01-mariadb-5.5.23.patch

---- ha_mroonga.cc.orig	2012-04-11 17:59:24.171323133 +0200
-+++ ha_mroonga.cc	2012-04-11 18:01:50.431325458 +0200
-@@ -10319,10 +10319,11 @@
- bool ha_mroonga::wrapper_auto_repair() const
- {
-   bool res;
-+  int ha_err = 0;
-   MRN_DBUG_ENTER_METHOD();
-   MRN_SET_WRAP_SHARE_KEY(share, table->s);
-   MRN_SET_WRAP_TABLE_KEY(this, table);
--  res = wrap_handler->auto_repair();
-+  res = wrap_handler->auto_repair(ha_err);
-   MRN_SET_BASE_SHARE_KEY(share, table->s);
-   MRN_SET_BASE_TABLE_KEY(this, table);
-   DBUG_RETURN(res);
-@@ -10330,9 +10331,10 @@
- 
- bool ha_mroonga::storage_auto_repair() const
- {
-+  int ha_err = 0;
-   MRN_DBUG_ENTER_METHOD();
-   // XXX: success is valid variable name?
--  bool success = handler::auto_repair();
-+  bool success = handler::auto_repair(ha_err);
-   DBUG_RETURN(success);
- }
- 

component/mariadb/mroonga-4.00-mariadb-10.0.9.patch

+commit e2d340aa5eff721eaff24003a3d04eb01f0aaa3c
+Author: Kouhei Sutou <kou@clear-code.com>
+Date:   Sat Mar 15 17:47:08 2014 +0900
+
+    mariadb: support MariaDB 10.0.9
+    
+    Redmine: fixes #2387
+    
+    We drop MariaDB 10.0.0 - 10.0.8 support. You should use the latest
+    MariaDB for 10.0 series.
+    
+    Reported by Kazuhiko Shiozaki. Thanks!!!
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 496deed..3310a16 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -182,6 +182,13 @@ else()
+   set_mysql_config_value("--version" MYSQL_VERSION)
+ endif()
+ 
++if((${MYSQL_VERSION} VERSION_GREATER "10.0.0") AND
++    (${MYSQL_VERSION} VERSION_LESS "10.0.9"))
++  message(FATAL_ERROR
++    "Mroonga doesn't supports MariaDB 10.0.0-10.0.8: <${MYSQL_VERSION}>")
++  return()
++endif()
++
+ if(MRN_GROONGA_BUNDLED)
+   set(GROONGA_INCLUDE_DIRS "${MRN_BUNDLED_GROONGA_DIR}/include")
+   set(GROONGA_LIBRARY_DIRS "${MRN_BUNDLED_GROONGA_DIR}/lib")
+diff --git a/mrn_mysql_compat.h b/mrn_mysql_compat.h
+index 4dd878b..7312dd7 100644
+--- a/mrn_mysql_compat.h
++++ b/mrn_mysql_compat.h
+@@ -105,12 +105,11 @@
+ #  define MRN_ITEM_HAVE_ITEM_NAME
+ #endif
+ 
+-#if MYSQL_VERSION_ID >= 50500 && \
+-  !(defined(MRN_MARIADB_P) && MYSQL_VERSION_ID >= 100004)
++#if MYSQL_VERSION_ID >= 50500 && MYSQL_VERSION_ID < 50700
+ #  define MRN_HAVE_TABLE_DEF_CACHE
+ #endif
+ 
+-#if defined(MRN_MARIADB_P) && MYSQL_VERSION_ID >= 100004
++#if defined(MRN_MARIADB_P) && MYSQL_VERSION_ID >= 100009
+ #  define MRN_HAVE_TDC_ACQUIRE_SHARE
+ #endif
+ 
+diff --git a/mrn_table.cpp b/mrn_table.cpp
+index 7a7d4c2..79e1c83 100644
+--- a/mrn_table.cpp
++++ b/mrn_table.cpp
+@@ -1,7 +1,7 @@
+ /* -*- c-basic-offset: 2 -*- */
+ /*
+   Copyright(C) 2011-2013 Kentoku SHIBA
+-  Copyright(C) 2011-2013 Kouhei Sutou <kou@clear-code.com>
++  Copyright(C) 2011-2014 Kouhei Sutou <kou@clear-code.com>
+ 
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+@@ -970,7 +970,9 @@ TABLE_SHARE *mrn_get_table_share(TABLE_LIST *table_list, int *error)
+                           hash_value);
+ #elif defined(MRN_HAVE_TDC_ACQUIRE_SHARE)
+   share = tdc_acquire_share(thd, table_list->db, table_list->table_name, key,
+-                            key_length, GTS_TABLE, NULL);
++                            key_length,
++                            table_list->mdl_request.key.tc_hash_value(),
++                            GTS_TABLE, NULL);
+ #else
+   share = get_table_share(thd, table_list, key, key_length, 0, error);
+ #endif

component/mariadb/mysql_create_system_tables__no_test.patch

-# 33_scripts__mysql_create_system_tables__no_test.dpatch by  <ch@debian.org>
-
-A user with no password prevents a normal user from login under certain
-circumstances as it is checked first.
-See http://bugs.debian.org/301741
-and http://bugs.mysql.com/bug.php?id=6901
-
---- scripts/mysql_system_tables_data.sql	2008-12-04 22:59:44.000000000 +0100
-+++ scripts/mysql_system_tables_data.sql	2008-12-04 23:00:07.000000000 +0100
-@@ -11,8 +11,6 @@
- -- Fill "db" table with default grants for anyone to
- -- access database 'test' and 'test_%' if "db" table didn't exist
- CREATE TEMPORARY TABLE tmp_db LIKE db;
--INSERT INTO tmp_db VALUES ('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y');
--INSERT INTO tmp_db VALUES ('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y');
- INSERT INTO db SELECT * FROM tmp_db WHERE @had_db_table=0;
- DROP TABLE tmp_db;
- 
-@@ -24,7 +22,5 @@
- INSERT INTO tmp_user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','');
- REPLACE INTO tmp_user SELECT @current_hostname,'root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','' FROM dual WHERE LOWER( @current_hostname) != 'localhost';
- REPLACE INTO tmp_user VALUES ('127.0.0.1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','');
--INSERT INTO tmp_user (host,user) VALUES ('localhost','');
--INSERT INTO tmp_user (host,user) SELECT @current_hostname,'' FROM dual WHERE LOWER(@current_hostname ) != 'localhost';
- INSERT INTO user SELECT * FROM tmp_user WHERE @had_user_table=0;
- DROP TABLE tmp_user;

component/mariadb/plugin_handler_socket_libhsclient_fatal.patch

-# inspired by handlersocket-1.0.6-80-g88bf1e0-1.1-nmu.diff by gregoa@debian.org
-
-Description: add missing include to avoid FTBFS with gcc 4.7
-bug-debian: http://bugs.debian.org/667198
-More informations: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=667198
-Author: gregor herrmann <gregoa@debian.org>
-
---- plugin/handler_socket/libhsclient/fatal.cpp
-+++ plugin/handler_socket/libhsclient/fatal.cpp
-@@ -9,6 +9,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <syslog.h>
-+#include <unistd.h>
-
- #include "fatal.hpp"

component/nginx/buildout.cfg

@@ -19,6 +19,27 @@ configure-options=
   --with-ld-opt="-L ${zlib:location}/lib -L ${openssl:location}/lib -L ${pcre:location}/lib  -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib"
   --with-cc-opt="-I ${pcre:location}/include -I ${openssl:location}/include -I ${zlib:location}/include"
 
+[webdav-module]
+recipe = hexagonit.recipe.download
+url = https://github.com/arut/nginx-dav-ext-module/archive/master.zip
+strip-top-level-dir = true
+#md5sum =
+mode = 0644
+
+[nginx-webdav]
+recipe = slapos.recipe.cmmi
+url = http://nginx.org/download/nginx-1.5.3.tar.gz
+md5sum = 1e735dd6a6ade2b5c20e924b67c3d355
+configure-options =
+  --with-ipv6
+  --with-http_ssl_module
+  --with-mail
+  --with-mail_ssl_module
+  --with-ld-opt="-L ${zlib:location}/lib -L ${openssl:location}/lib -L ${pcre:location}/lib  -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib -L ${libexpat:location}/lib"
+  --with-cc-opt="-I ${pcre:location}/include -I ${openssl:location}/include -I ${zlib:location}/include -I ${libexpat:location}/include"
+  --with-http_dav_module 
+  --add-module='${webdav-module:location}'
+
 [nginx-output]
 # Shared binary location to ease migration
 recipe = plone.recipe.command

component/openssl/buildout.cfg

@@ -13,29 +13,16 @@ extends =
 parts =
   openssl-output
 
-[openssl-nodoc.patch]
-# Disable doc generation part in Makefile 
-recipe = hexagonit.recipe.download
-md5sum = b4887a7b4e18402447bc6227d2493b92
-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 = slapos.recipe.cmmi
-url = https://www.openssl.org/source/openssl-1.0.1e.tar.gz
-md5sum = 66bf6f10f060d561929de96f9dfe5b8c
+url = https://www.openssl.org/source/openssl-1.0.1f.tar.gz
+md5sum = f26b09c028a0541cab33da697d522b25
+depends =
+  ${ca-certificates:version}
 patch-binary = ${patch:location}/bin/patch
 patches =
-  ${openssl-nodoc.patch:location}/${openssl-nodoc.patch:filename}
-  ${openssl-exlibs.patch:location}/${openssl-exlibs.patch:filename}
+  ${:_profile_base_location_}/openssl-nodoc.patch#b4887a7b4e18402447bc6227d2493b92
+  ${:_profile_base_location_}/openssl-exlibs.patch#dfb8979460d6d75f2d23d1ea83bbb40a
 patch-options = -p0
 configure-command = ./config
 configure-options =

component/pcre/buildout.cfg

@@ -4,8 +4,8 @@ parts =
 
 [pcre]
 recipe = slapos.recipe.cmmi
-url = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.32.tar.bz2
-md5sum = 62f02a76bb57a40bc66681760ed511d5
+url = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.34.tar.bz2
+md5sum = 5439e321351bddd5533551bbce128d07
 configure-options =
   --disable-static
   --enable-unicode-properties

component/percona-toolkit/buildout.cfg

@@ -10,8 +10,8 @@ parts =
 recipe = slapos.recipe.cmmi
 depends =
   ${perl:version}
-version = 2.2.5
+version = 2.2.7
 url = http://www.percona.com/redir/downloads/percona-toolkit/${:version}/percona-toolkit-${:version}.tar.gz
-md5sum = 66165271fc3ddf8311e5ff3b1a954595
+md5sum = 7514af32e0edff70c4934da2e5e36303
 configure-command =
   ${perl:location}/bin/perl Makefile.PL

component/perl-DBD-MySQL/buildout.cfg

 [buildout]
 extends =
   ../mysql-tritonn-5.0/buildout.cfg
-  ../perl-DBD-common/buildout.cfg
 
 parts =
   perl-DBD-MySQL
@@ -15,7 +14,7 @@ depends =
 url = http://search.cpan.org/CPAN/authors/id/C/CA/CAPTTOFU/DBD-mysql-4.019.tar.gz
 md5sum = 566d98ab8ffac9626a31f6f6d455558e
 patches =
-  ${perl-DBD-MySQL-patch:location}/${perl-DBD-MySQL-patch:filename}
+  ${:_profile_base_location_}/DBD-mysql-4.019.rpathsupport.patch#e12e9233f20b0370cfcf5228ea767fbc
 patch-options = -p1
 configure-command =
   ${perl:location}/bin/perl Makefile.PL --mysql_config=${mysql-tritonn-5.0:location}/bin/mysql_config

component/perl-DBD-common/buildout.cfg

-# Please use perl-DBD-MySQL or perl-DBD-mariadb
-[buildout]
-extends =
-  ../perl/buildout.cfg
-  ../perl-DBI/buildout.cfg
-  ../zlib/buildout.cfg
-  ../openssl/buildout.cfg
-
-[perl-DBD-MySQL-patch]
-recipe = hexagonit.recipe.download
-md5sum = e12e9233f20b0370cfcf5228ea767fbc
-url = ${:_profile_base_location_}/${:filename}
-filename = DBD-mysql-4.019.rpathsupport.patch
-download-only = true
-
-

component/perl-DBD-mariadb/DBD-mysql-4.019.rpathsupport.patch

+--- DBD-mysql-4.019.back/Makefile.PL    2011-05-09 03:12:07.000000000 +0200
++++ DBD-mysql-4.019/Makefile.PL 2011-06-22 11:44:06.478371893 +0200
+@@ -358,7 +358,14 @@  
+                      'Data::Dumper' => 0 };
+ }
+
+-ExtUtils::MakeMaker::WriteMakefile(%o);
++
++my %config;
++if (defined($ENV{'OTHERLDFLAGS'})) {
++    $config{dynamic_lib} = { OTHERLDFLAGS => " $ENV{'OTHERLDFLAGS'} " };
++}
++
++
++ExtUtils::MakeMaker::WriteMakefile(%o, %config);
+ exit 0;
+
+
+

component/perl-DBD-mariadb/buildout.cfg

 [buildout]
 extends =
   ../mariadb/buildout.cfg
-  ../perl-DBD-common/buildout.cfg
 
 parts =
   perl-DBD-mariadb
@@ -18,7 +17,7 @@ depends =
 url = http://search.cpan.org/CPAN/authors/id/C/CA/CAPTTOFU/DBD-mysql-4.019.tar.gz
 md5sum = 566d98ab8ffac9626a31f6f6d455558e
 patches =
-  ${perl-DBD-MySQL-patch:location}/${perl-DBD-MySQL-patch:filename}
+  ${:_profile_base_location_}/DBD-mysql-4.019.rpathsupport.patch#e12e9233f20b0370cfcf5228ea767fbc
 patch-options = -p1
 configure-command =
   ${perl:location}/bin/perl Makefile.PL --mysql_config=${mariadb:location}/bin/mysql_config

component/perl-Image-Magick/buildout.cfg

@@ -4,13 +4,6 @@ extends =
   ../imagemagick/buildout.cfg
 parts = perl-Image-Magick
 
-[perl-Image-Magick_MakefilePL.patch]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-md5sum = 31043e2b79e725d3b251aa09b4549046
-download-only = true
-filename = ${:_buildout_section_name_}
-
 [perl-Image-Magick]
 recipe = slapos.recipe.cmmi
 depends =
@@ -20,6 +13,6 @@ url = http://search.cpan.org/CPAN/authors/id/J/JC/JCRISTY/PerlMagick-6.77.tar.gz
 md5sum = fa0f66fa0cabbd1b196254f94dec8e99
 patch-options = -p0
 patches =
-  ${perl-Image-Magick_MakefilePL.patch:location}/${perl-Image-Magick_MakefilePL.patch:filename}
+  ${:_profile_base_location_}/perl-Image-Magick_MakefilePL.patch#31043e2b79e725d3b251aa09b4549046
 configure-command =
   ${perl:location}/bin/perl Makefile.PL LIBS="-L${imagemagick:location}/lib -Wl,-R${imagemagick:location}/lib -L${perl:location}/libs-c -Wl,-R${perl:location}/libs-c" INC="-I${imagemagick:location}/include/ImageMagick"

component/perl/buildout.cfg

@@ -5,20 +5,6 @@ extends =
 parts =
   perl
 
-[perl-keep-linker-flags-in-ldflags.patch]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-md5sum = 9873a89c969bd5a478434c3b8b2d57d8
-download-only = true
-filename = ${:_buildout_section_name_}
-
-[perl-postmakehook-download]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-md5sum = 7fded8308c1676decf77575c6d6b325f
-download-only = true
-filename = create-libs-symlink.py
-
 [perl]
 recipe = slapos.recipe.cmmi
 depends =
@@ -31,7 +17,7 @@ md5sum = 025102de0e4a597cf541e57da80c6aa3
 siteprefix = ${buildout:parts-directory}/site_${:_buildout_section_name_}
 patch-options = -p1
 patches =
-  ${perl-keep-linker-flags-in-ldflags.patch:location}/${perl-keep-linker-flags-in-ldflags.patch:filename}
+  ${:_profile_base_location_}/perl-keep-linker-flags-in-ldflags.patch#9873a89c969bd5a478434c3b8b2d57d8
 configure-command =
   sh Configure -des \
     -Dprefix=${buildout:parts-directory}/${:_buildout_section_name_} \
@@ -43,4 +29,4 @@ configure-command =
     -Dusethreads
 environment =
   PATH=${patch:location}/bin:%(PATH)s
-post-make-hook = ${perl-postmakehook-download:location}/${perl-postmakehook-download:filename}:post_make_hook
+post-make-hook = ${:_profile_base_location_}/perl-create-libs-symlink.py#7fded8308c1676decf77575c6d6b325f:post_make_hook

component/poppler/buildout.cfg

@@ -8,13 +8,15 @@ extends =
   ../libjpeg/buildout.cfg
   ../libpng/buildout.cfg
   ../libtiff/buildout.cfg
+  ../libxml2/buildout.cfg
   ../pkgconfig/buildout.cfg
+  ../xz-utils/buildout.cfg
   ../zlib/buildout.cfg
 
 [poppler]
 recipe = slapos.recipe.cmmi
-url = http://poppler.freedesktop.org/poppler-0.22.5.tar.gz
-md5sum = 1cd27460f7e3379d1eb109cfd7bcdb39
+url = http://poppler.freedesktop.org/poppler-0.24.5.tar.xz
+md5sum = 334f2ac95cc8039f2a57fe63e4a81c69
 depends =
   ${libtiff:version}
   ${libpng:so_version}
@@ -27,10 +29,11 @@ configure-options =
   --disable-poppler-cpp
   --disable-poppler-glib
   --disable-poppler-qt4
+  --disable-poppler-qt5
   --disable-static
   --enable-zlib
 environment =
-  PATH=${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig
+  PATH=${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${fontconfig:location}/lib/pkgconfig:${fontconfig:pkg_config_depends}:${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

component/python-2.7/buildout.cfg

@@ -4,6 +4,7 @@ extends =
   ../gdbm/buildout.cfg
   ../gettext/buildout.cfg
   ../libexpat/buildout.cfg
+  ../libffi/buildout.cfg
   ../ncurses/buildout.cfg
   ../openssl/buildout.cfg
   ../readline/buildout.cfg
@@ -27,8 +28,8 @@ python = python2.7
 [python2.7]
 recipe = slapos.recipe.cmmi
 package_version = 2.7.6
-package_version_suffix = rc1
-md5sum = 74e1f6abe529350ac0d239387ee98616
+package_version_suffix =
+md5sum = bcf93efa8eaf383c98ed3ce40b763497
 
 depends =
   ${gdbm:version}
@@ -44,6 +45,7 @@ configure-options =
   --enable-ipv6
   --enable-unicode=ucs4
   --with-system-expat
+  --with-system-ffi
   --with-threads
 # Profiled build:
 make-binary =
@@ -53,5 +55,5 @@ make-targets = make profile-opt && make install
 # which would otherwise load the system libmagic.so with ctypes
 environment =
   PATH=${xz-utils:location}/bin:%(PATH)s
-  CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${libexpat:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${bzip2:location}/include  -I${gdbm:location}/include -I${openssl:location}/include -I${sqlite3:location}/include -I${gettext:location}/include
-  LDFLAGS=-L${zlib:location}/lib -L${readline:location}/lib -L${libexpat:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${file:location}/lib
+  CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${libexpat:location}/include -I${libffi:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${bzip2:location}/include  -I${gdbm:location}/include -I${openssl:location}/include -I${sqlite3:location}/include -I${gettext:location}/include
+  LDFLAGS=-L${zlib:location}/lib -L${readline:location}/lib -L${libexpat:location}/lib -L${libffi:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${libffi:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${file:location}/lib

component/python-cffi/buildout.cfg

+[buildout]
+extends =
+  ../libffi/buildout.cfg
+  ../pkgconfig/buildout.cfg
+
+parts =
+  python-cffi
+
+[python-cffi]
+recipe = zc.recipe.egg:custom
+egg = cffi
+environment = python-cffi-env
+library-dirs =
+  ${libffi:location}/lib/
+rpath =
+  ${libffi:location}/lib/
+
+[python-cffi-env]
+PATH = ${pkgconfig:location}/bin:%(PATH)s
+PKG_CONFIG_PATH = ${libffi:location}/lib/pkgconfig

component/python-cryptography/buildout.cfg

+[buildout]
+extends =
+  ../libffi/buildout.cfg
+  ../openssl/buildout.cfg
+  ../pkgconfig/buildout.cfg
+
+parts =
+  python-cryptography
+
+[python-cryptography]
+recipe = zc.recipe.egg:custom
+egg = cryptography
+environment = python-cryptography-env
+
+[python-cryptography-env]
+PATH = ${pkgconfig:location}/bin:%(PATH)s
+PKG_CONFIG_PATH = ${libffi:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig
+LD_LIBRARY_PATH = ${libffi:location}/lib:${openssl:location}/lib
+CPATH = ${libffi:location}/include:${openssl:location}/include

component/python-openssl/buildout.cfg

-[buildout]
-extends =
-  ../openssl/buildout.cfg
-
-parts =
-  python-openssl
-
-[python-openssl]
-recipe = zc.recipe.egg:custom
-egg = pyOpenSSL
-include-dirs =
-  ${openssl:location}/include/
-library-dirs =
-  ${openssl:location}/lib/
-rpath =
-  ${openssl:location}/lib/

component/python-setuptools/buildout.cfg

@@ -4,9 +4,10 @@ parts = python-setuptools
 [setuptools-download]
 recipe = hexagonit.recipe.download
 download-only = true
-filename = setuptools-0.6c11-py2.7.egg
-url = http://pypi.python.org/packages/2.7/s/setuptools/${:filename}
-md5sum = fe1f997bc722265116870bc7919059ea
+package_suffix = setuptools-1.4.2
+filename = ${:package_suffix}.tar.gz
+url = https://pypi.python.org/packages/source/s/setuptools/${:filename}
+md5sum = 13951be6711438073fbe50843e7f141f
 mode = 0644
 
 [python-setuptools]
@@ -16,9 +17,10 @@ mode = 0644
 # To be able to use it, you should in your instance do an:
 # export PYTHONPATH=${:location} (defined in ${:environment})
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
-environment = export PATH=${python2.7:location}/bin:$PATH; export PYTHONPATH=${:location};
+pythonpath = ${:location}/${setuptools-download:package_suffix}
+environment = export PATH=${python2.7:location}/bin:$PATH; export PYTHONPATH=${:pythonpath};
 stop-on-error = true
 recipe = plone.recipe.command
 update = true
 # chmod is a hack, but the mode of hexagonit.recipe.download above didn't worked yet (there was new version recently)
-command = ${:environment} (mkdir ${:location}; chmod 644 ${setuptools-download:location}/${setuptools-download:filename} ; sh ${setuptools-download:location}/${setuptools-download:filename} --install-dir ${:location}) || (rm -fr ${:location}; exit 1)
+command = ${:environment} (mkdir ${:location}; cd ${:location} && tar -xzvf ${setuptools-download:location}/${setuptools-download:filename} && cd ${:pythonpath} && ${buildout:executable} setup.py build) || (rm -fr ${:location}; exit 1)

component/rdiff-backup/buildout.cfg

@@ -18,7 +18,6 @@ find-links = http://pkgs.fedoraproject.org/repo/pkgs/rdiff-backup/rdiff-backup-1
 
 [rdiff-backup]
 # Scripts only generation part for rdiff-backup
-unzip = true
 recipe = zc.recipe.egg
 eggs =
   ${rdiff-backup-build:egg}

component/screen/buildout.cfg

+[buildout]
+parts =
+  screen
+
+extends =
+  ../ncurses/buildout.cfg
+
+[screen]
+recipe = slapos.recipe.cmmi
+version = 4.0.3
+url = http://ftp.gnu.org/gnu/screen/screen-4.0.3.tar.gz
+md5sum = 8506fd205028a96c741e4037de6e3c42
+environment=
+    CFLAGS=-I${ncurses:location}/include
+    LDFLAGS=-L${ncurses:location}/lib/ -Wl,-rpath=${ncurses:location}/lib/
\ No newline at end of file

component/shellinabox/buildout.cfg

@@ -6,19 +6,6 @@ extends =
 
 parts = shellinabox
 
-[shellinabox-full-path-patch]
-recipe = hexagonit.recipe.download
-filename = 0002-Allow-to-run-entire-command-path.patch
-url = ${:_profile_base_location_}/${:filename}
-download-only = true
-
-
-[shellinabox-ipv6-patch]
-recipe = hexagonit.recipe.download
-filename = 0001-Switch-to-IPv6.patch
-url = ${:_profile_base_location_}/${:filename}
-download-only = true
-
 [shellinabox]
 recipe = slapos.recipe.cmmi
 url = http://shellinabox.googlecode.com/files/shellinabox-2.10.tar.gz
@@ -30,5 +17,5 @@ environment =
 patch-binary = ${patch:location}/bin/patch
 patch-options = -p1
 patches =
-    ${shellinabox-ipv6-patch:location}/${shellinabox-ipv6-patch:filename}
-    ${shellinabox-full-path-patch:location}/${shellinabox-full-path-patch:filename}
+    ${:_profile_base_location_}/0001-Switch-to-IPv6.patch#b61cb099c00e15a5fcaf6c98134fff45
+    ${:_profile_base_location_}/0002-Allow-to-run-entire-command-path.patch#a506b4d83021e24c830f767501c1d3fc

component/slapos/buildout.cfg

 # This file is used to install SlapOS Node itself.
-
 [buildout]
 extends =
+  ../../stack/slapos.cfg
   ../../stack/shacache-client.cfg
-  ../bison/buildout.cfg
-  ../bzip2/buildout.cfg
   ../gdbm/buildout.cfg
   ../gettext/buildout.cfg
-  ../glib/buildout.cfg
-  ../libxml2/buildout.cfg
-  ../libxslt/buildout.cfg
-  ../lxml-python/buildout.cfg
   ../m4/buildout.cfg
-  ../ncurses/buildout.cfg
-  ../openssl/buildout.cfg
-  ../pkgconfig/buildout.cfg
-  ../popt/buildout.cfg
   ../python-2.7/buildout.cfg
-  ../python-openssl/buildout.cfg
-  ../readline/buildout.cfg
   ../sqlite3/buildout.cfg
   ../swig/buildout.cfg
-  ../zlib/buildout.cfg
   ../patch/buildout.cfg
 
 parts =
@@ -30,22 +17,7 @@ parts =
   sh-environment
   py
 
-find-links =
-  http://www.nexedi.org/static/packages/source/slapos.buildout/
-  http://www.nexedi.org/static/packages/source/hexagonit.recipe.download/
-
-versions = versions
-
-allow-hosts =
-  *.googlecode.com
-  *.nexedi.org
-  *.python.org
-  alastairs-place.net
-  code.google.com
-  github.com
-  peak.telecommunity.com
 
-unzip = true
 
 # separate from system python
 include-site-packages = false
@@ -88,15 +60,24 @@ input = inline:
   export PS1="[SlapOS env Active] $PS1"
 output = ${buildout:directory}/environment.sh
 
-[lxml-python]
-python = python2.7
-
+##############################################
+# Included locally in order to permit we build
+# packages offline. 
+###############################################
 [python-openssl]
-python = python2.7
+recipe = zc.recipe.egg:custom
+egg = pyOpenSSL
+include-dirs =
+  ${openssl:location}/include/
+library-dirs =
+  ${openssl:location}/lib/
+rpath =
+  ${openssl:location}/lib/
+
+#############################################
 
 [slapos]
 recipe = z3c.recipe.scripts
-python = python2.7
 eggs =
   ${python-openssl:egg}
   slapos.libnetworkcache
@@ -130,70 +111,59 @@ scripts =
 recipe = zc.recipe.egg
 eggs = 
     ${slapos:eggs}
-python = python2.7
 interpreter = py
 scripts = py
 
 [versions]
-# Use our own buildout version
-zc.buildout = 1.6.0-dev-SlapOS-012
-
-# Force to use zc.recipe.egg 1.x
-zc.recipe.egg = 1.3.2
+# Use setuptools-1.x for python 2.4/2.5 support
+setuptools = 1.4.2
 
-# Use own version of h.r.download to be able to open archives not supported by python2.x: .xz
-hexagonit.recipe.download = 1.7nxd002
+# pyOpenSSL 0.14 uses cryptograpic which is
+# incompatible with slapos package generation. 
+pyOpenSSL = 0.13.1
 
-Jinja2 = 2.7.1
-MarkupSafe = 0.18
-Pygments = 1.6
+Jinja2 = 2.7.2
+MarkupSafe = 0.19
 Werkzeug = 0.9.4
-buildout-versions = 1.7
 cmd2 = 0.6.7
-collective.recipe.template = 1.10
+collective.recipe.template = 1.11
 itsdangerous = 0.23
-lxml = 3.2.3
+lxml = 3.3.3
 meld3 = 0.6.10
 netaddr = 0.7.10
-prettytable = 0.7.2
-pyOpenSSL = 0.13.1
+prettytable = 0.7.3
 pyparsing = 2.0.1
-setuptools = 1.1.6
-slapos.core = 1.0.0rc6
+six = 1.6.1
+slapos.core = 1.0.3
 slapos.libnetworkcache = 0.13.4
-slapos.recipe.cmmi = 0.1.1
+slapos.recipe.cmmi = 0.2
 xml-marshaller = 0.9.7
 z3c.recipe.scripts = 1.0.1
 
 # Required by:
-# slapos.core==1.0.0rc6
+# slapos.core==1.0.3
 Flask = 0.10.1
 
 # Required by:
-# slapos.core==1.0.0rc6
-bpython = 0.12
+# slapos.core==1.0.3
+cliff = 1.5.2
 
 # Required by:
-# slapos.core==1.0.0rc6
-cliff = 1.4.5
+# slapos.core==1.0.3
+netifaces = 0.8-1
 
 # Required by:
-# slapos.core==1.0.0rc6
-ipython = 1.1.0
+# slapos.core==1.0.3
+requests = 2.2.1
 
 # Required by:
-# slapos.core==1.0.0rc6
-netifaces = 0.8
+# cliff==1.5.2
+stevedore = 0.14.1
 
 # Required by:
-# slapos.core==1.0.0rc6
-requests = 2.0.0
-
-# Required by:
-# slapos.core==1.0.0rc6
+# slapos.core==1.0.3
 supervisor = 3.0
 
 # Required by:
-# slapos.core==1.0.0rc6
-zope.interface = 4.0.5
-
+# slapos.core==1.0.3
+zope.interface = 4.1.0

component/slapos/testing.cfg

@@ -8,4 +8,4 @@ find-links +=
   http://www.nexedi.org/static/packages/source/slapos.core-testing/
 
 [versions]
-slapos.core =
+slapos.core = 1.0.0rc6

component/sqlite3/buildout.cfg

@@ -5,8 +5,8 @@ parts =
 
 [sqlite3]
 recipe = slapos.recipe.cmmi
-url = http://www.sqlite.org/2013/sqlite-autoconf-3080100.tar.gz
-md5sum = 8b5a0a02dfcb0c7daf90856a5cfd485a
+url = http://www.sqlite.org/2013/sqlite-autoconf-3080200.tar.gz
+md5sum = f62206713e6a08d4ccbc60b1fd712a1a
 configure-options =
   --disable-static
   --enable-readline

component/stunnel/buildout.cfg

@@ -8,18 +8,11 @@ parts =
 <= stunnel-4
 recipe = slapos.recipe.cmmi
 
-[stunnel-4-hook-download]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-md5sum = 5b099b386c34c5b8d0664c0292ba322a
-download-only=true
-filename = stunnel-4-hooks.py
-
 [stunnel-4]
 recipe = slapos.recipe.cmmi
-url = https://www.stunnel.org/downloads/stunnel-4.56.tar.gz
-md5sum = ac4c4a30bd7a55b6687cbd62d864054c
-pre-configure-hook = ${stunnel-4-hook-download:location}/${stunnel-4-hook-download:filename}:pre_configure_hook
+url = https://www.stunnel.org/downloads/stunnel-5.00.tar.gz
+md5sum = 4f00fd0faf99e3c9cf258a19dd83d14a
+pre-configure-hook = ${:_profile_base_location_}/stunnel-4-hooks.py#5b099b386c34c5b8d0664c0292ba322a:pre_configure_hook
 configure-options =
   --enable-ipv6
   --disable-libwrap

component/subversion/buildout.cfg

@@ -14,21 +14,14 @@ extends =
 parts =
   subversion
 
-[subversion-1.6.0-disable_linking_against_unneeded_libraries]
-recipe = hexagonit.recipe.download
-download-only = true
-filename = ${:_buildout_section_name_}.patch
-# Patch available thanks to gentoo developpers
-# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-vcs/subversion/files/subversion-1.6.0-disable_linking_against_unneeded_libraries.patch?revision=1.1
-url = ${:_profile_base_location_}/${:filename}
-md5sum = 8d911ec2422dc4c08a00693ac915a07a
-
 [subversion]
 recipe = slapos.recipe.cmmi
 url = http://subversion.tigris.org/downloads/subversion-1.6.17.tar.bz2
 md5sum = 81e5dc5beee4b3fc025ac70c0b6caa14
+# Patch available thanks to gentoo developpers
+# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-vcs/subversion/files/subversion-1.6.0-disable_linking_against_unneeded_libraries.patch?revision=1.1
 patches =
-  ${subversion-1.6.0-disable_linking_against_unneeded_libraries:location}/${subversion-1.6.0-disable_linking_against_unneeded_libraries:filename}
+  ${:_profile_base_location_}/subversion-1.6.0-disable_linking_against_unneeded_libraries.patch#8d911ec2422dc4c08a00693ac915a07a
 configure-options =
   --disable-static
   --with-apr=${apache:location}/bin/apr-1-config

component/tar/buildout.cfg

@@ -2,18 +2,10 @@
 
 parts = tar
 
-[tar-drop.gets.patch]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-md5sum = 9352820566aa3534a04bd269c9f89f48
-download-only = true
-filename = drop.gets.patch
-
 [tar]
-virtual-depends = ${tar-drop.gets.patch:md5sum}
 patch-options = -p1
 patches =
-  ${tar-drop.gets.patch:location}/${tar-drop.gets.patch:filename}
+  ${:_profile_base_location_}/tar-drop.gets.patch#9352820566aa3534a04bd269c9f89f48
 
 recipe = slapos.recipe.cmmi
 url = http://ftp.gnu.org/gnu/tar/tar-1.26.tar.gz

component/tesseract/buildout.cfg

@@ -10,20 +10,6 @@ extends =
 parts =
   tesseract
 
-[tesseract-gcc-4.7-build-patch]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-download-only = true
-filename = tesseract-3.00-gcc-4.7-build.patch
-md5sum = ca80db3ec489c547b03f3ee48879c1b1
-
-[tesseract-3.01-remove-bom.patch]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-download-only = true
-filename = ${:_buildout_section_name_}
-md5sum = 2e691858cb492b7c17d23bf0912b3d24
-
 [tesseract]
 recipe = slapos.recipe.cmmi
 url = http://tesseract-ocr.googlecode.com/files/tesseract-3.01.tar.gz
@@ -34,8 +20,8 @@ depends =
 patch-options =
   -p1
 patches =
-  ${tesseract-gcc-4.7-build-patch:location}/${tesseract-gcc-4.7-build-patch:filename}
-  ${tesseract-3.01-remove-bom.patch:location}/${tesseract-3.01-remove-bom.patch:filename}
+  ${:_profile_base_location_}/tesseract-3.00-gcc-4.7-build.patch#ca80db3ec489c547b03f3ee48879c1b1
+  ${:_profile_base_location_}/tesseract-3.01-remove-bom.patch#2e691858cb492b7c17d23bf0912b3d24
 configure-command =
   aclocal -I ${libtool:location}/share/aclocal -I config
   libtoolize -f -c

component/varnish/buildout.cfg

@@ -17,7 +17,7 @@ extends =
 
 [varnish-2.0]
 recipe = slapos.recipe.cmmi
-url = http://sourceforge.net/projects/varnish/files/varnish/2.0.6/varnish-2.0.6.tar.gz/download
+url = http://downloads.sourceforge.net/project/varnish/varnish/2.0.6/varnish-2.0.6.tar.gz
 md5sum = d91dc21c636db61c69b5e8f061c5bb95
 configure-options =
   --disable-static
@@ -41,5 +41,5 @@ environment =
 
 [varnish-3.0]
 <= varnish-2.1
-url = http://repo.varnish-cache.org/source/varnish-3.0.4.tar.gz
-md5sum = a130ce9c3504b9603a46542635e18701
+url = http://repo.varnish-cache.org/source/varnish-3.0.5.tar.gz
+md5sum = 674d44775cc927aee4601edb37f60198

component/vim/buildout.cfg

+[buildout]
+parts =
+  vim
+  
+extends = 
+  ../ncurses/buildout.cfg
+
+[vim]
+recipe = slapos.recipe.cmmi
+version = 7.4
+url = http://ftp.vim.org/pub/vim/unix/vim-7.4.tar.bz2
+md5sum = 607e135c559be642f210094ad023dc65
+environment=
+    CFLAGS=-I${ncurses:location}/include
+    LDFLAGS=-L${ncurses:location}/lib/ -Wl,-rpath=${ncurses:location}/lib/
\ No newline at end of file