diff --git a/component/apache/buildout.cfg b/component/apache/buildout.cfg
index c52f479db005daad086461f76029240cb5b947e9..55096e33bcfa512c56645ba57bd22c89e8ee61a7 100644
--- a/component/apache/buildout.cfg
+++ b/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.4.1
+version = 1.5.3
url = http://mir2.ovh.net/ftp.apache.org/dist/apr/apr-util-${:version}.tar.bz2
-md5sum = 52b31b33fb1aa16e65ddaefc76e41151
+md5sum = 6f3417691c7a27090f36e7cf4d94b36e
[apache]
# inspired on http://old.aclark.net/team/aclark/blog/a-lamp-buildout-for-wordpress-and-other-php-apps/
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
depends =
${gdbm:version}
-version = 2.4.3
+version = 2.4.9
revision = 1
url = http://mir2.ovh.net/ftp.apache.org/dist/httpd/httpd-${:version}.tar.bz2
-md5sum = 87aaf7bc7e8715f0455997bb8c6791aa
+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
@@ -87,30 +87,23 @@ configure-options = --prefix=${buildout:parts-directory}/${:_buildout_section_na
environment =
PATH=${pkgconfig:location}/bin:%(PATH)s
PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig
- CPPFLAGS =-I${libuuid:location}/include
+ 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 = hexagonit.recipe.cmmi
-url = http://sourceforge.net/projects/mod-antiloris/files/mod_antiloris-0.4.tar.bz2/download
+recipe = slapos.recipe.cmmi
+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}
@@ -119,9 +112,10 @@ make-targets =
[apache-2.2]
# inspired on http://old.aclark.net/team/aclark/blog/a-lamp-buildout-for-wordpress-and-other-php-apps/
-recipe = hexagonit.recipe.cmmi
-url = http://mir2.ovh.net/ftp.apache.org/dist//httpd/httpd-2.2.22.tar.gz
-md5sum = d77fa5af23df96a8af68ea8114fa6ce1
+recipe = slapos.recipe.cmmi
+version = 2.2.27
+url = http://mir2.ovh.net/ftp.apache.org/dist/httpd/httpd-${:version}.tar.bz2
+md5sum = 8faef0decf3fa7e69b2568eb2105a3d8
patch-options = -p1
configure-options = --disable-static
--enable-authn-alias
@@ -149,6 +143,7 @@ configure-options = --disable-static
--enable-proxy-scgi
--enable-dav
--enable-dav-fs
+ --enable-dav-lock
--enable-so
--enable-ssl
--with-included-apr
@@ -178,9 +173,11 @@ environment =
[apache-antiloris-apache-2.2]
# Note: Shall react on each build of apache and reinstall itself
-recipe = hexagonit.recipe.cmmi
-url = http://sourceforge.net/projects/mod-antiloris/files/mod_antiloris-0.4.tar.bz2/download
+recipe = slapos.recipe.cmmi
+url = http://downloads.sourceforge.net/project/mod-antiloris/mod_antiloris-0.4.tar.bz2
md5sum = 66862bf10e9be3a023e475604a28a0b4
+depends =
+ ${apache-2.2:version}
configure-command = ${apache-2.2:location}/bin/apxs
configure-options = -c mod_antiloris.c
make-binary = ${:configure-command}
diff --git a/component/coreutils/buildout.cfg b/component/coreutils/buildout.cfg
index cde9896e714f9bc4dbc9137df0201c3844335cb5..a17387cb651db08bcec50f6822ac62b57a4d6ebf 100644
--- a/component/coreutils/buildout.cfg
+++ b/component/coreutils/buildout.cfg
@@ -1,25 +1,31 @@
[buildout]
+extends =
+ ../xz-utils/buildout.cfg
parts =
- coreutils
-
-[coreutils-drop.gets.patch]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-md5sum = 63c2299d92d23e4748abb9668b7e62ea
-download-only = true
-filename = drop.gets.patch
+ coreutils-output
[coreutils]
-virtual-depends = ${coreutils-drop.gets.patch:md5sum}
-recipe = hexagonit.recipe.cmmi
-url = http://ftp.gnu.org/gnu/coreutils/coreutils-8.12.tar.gz
-md5sum = fce7999953a67243d00d75cc86dbcaa6
-
-patch-options = -p1
-patches =
- ${coreutils-drop.gets.patch:location}/${coreutils-drop.gets.patch:filename}
-
+recipe = slapos.recipe.cmmi
+url = http://ftp.gnu.org/gnu/coreutils/coreutils-8.21.tar.xz
+md5sum = 065ba41828644eca5dd8163446de5d64
configure-options =
--prefix=${buildout:parts-directory}/${:_buildout_section_name_} --enable-install-program=tr,basename,uname,cat,cp,ls
environment =
+ PATH=${xz-utils:location}/bin:%(PATH)s
LDFLAGS =-Wl,--as-needed
+
+[coreutils-output]
+# Shared binary location to ease migration
+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} -a -x ${:sort} -a -x ${:tail}
+test = ${coreutils:location}/bin/test
+cat = ${coreutils:location}/bin/cat
+rm = ${coreutils:location}/bin/rm
+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
diff --git a/component/openssl/buildout.cfg b/component/openssl/buildout.cfg
index b7b27e6f77ab881203cbe0d03fd13e01b5f71b2b..28f1d885bb2cd96c9de0a52ec5877209351f0851 100644
--- a/component/openssl/buildout.cfg
+++ b/component/openssl/buildout.cfg
@@ -7,6 +7,8 @@
extends =
../ca-certificates/buildout.cfg
../zlib/buildout.cfg
+ ../patch/buildout.cfg
+ ../coreutils/buildout.cfg
parts =
openssl
@@ -27,12 +29,15 @@ filename = ${:_buildout_section_name_}
download-only = true
[openssl]
-recipe = hexagonit.recipe.cmmi
-url = https://www.openssl.org/source/openssl-1.0.1c.tar.gz
-md5sum = ae412727c8c15b67880aef7bd2999b2e
+recipe = slapos.recipe.cmmi
+url = https://www.openssl.org/source/openssl-1.0.1g.tar.gz
+md5sum = de62b43dfcd858e66a74bee1c834e959
+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 =
@@ -43,9 +48,18 @@ configure-options =
--libdir=lib
shared no-idea no-mdc2 no-rc5 zlib
-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${buildout:parts-directory}/${:_buildout_section_name_}/lib
+ && make depend
# it seems that parallel build sometimes fails for openssl.
make-options =
-j1
make-targets =
- install && rm -f ${buildout:parts-directory}/${:_buildout_section_name_}/etc/ssl/certs/* && for i in ${ca-certificates:location}/certs/*/*.crt; do ln -sv $i ${buildout:parts-directory}/${:_buildout_section_name_}/etc/ssl/certs/`${buildout:parts-directory}/${:_buildout_section_name_}/bin/openssl x509 -hash -noout -in $i`.0; done; true
+ all install_sw && rm -f ${buildout:parts-directory}/${:_buildout_section_name_}/etc/ssl/certs/* && for i in ${ca-certificates:location}/certs/*/*.crt; do ln -sv $i ${buildout:parts-directory}/${:_buildout_section_name_}/etc/ssl/certs/`${buildout:parts-directory}/${:_buildout_section_name_}/bin/openssl x509 -hash -noout -in $i`.0; done; true
+
+[openssl-output]
+# Shared binary location to ease migration
+recipe = plone.recipe.command
+stop-on-error = true
+update-command = ${:command}
+command = ${coreutils-output:test} -x ${:openssl}
+openssl = ${openssl:location}/bin/openssl