diff --git a/CHANGES.txt b/CHANGES.txt index b90de9f7641e606ec477632ea6b713ce0a30d29a..55ed5c655cc0565a79843656d9eca473c035cdc3 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,6 +1,19 @@ Changes ======= +0.77.1 (2013-04-18) +------------------- + + * Re-release of 0.77.0. + +0.77.0 (2013-04-18) +------------------- + + * Allow to pass extra parameters when creating simple wrapper. [Sebastien Robin] + * Apache frontend: Append all rewrite module options to http as well. [Cedric de Saint Martin] + * Apache frontend: Add https-only support. [Cedric de Saint Martin] + * Apache frontend: make logrotate work by using "generic" component. [Cedric de Saint Martin] + 0.76.0 (2013-04-03) ------------------- diff --git a/component/6tunnel/buildout.cfg b/component/6tunnel/buildout.cfg index e988970d7c19710f86eb09fa09634741ad86e13e..f38bd325388fe6defd514b3dee62a018d40763ce 100644 --- a/component/6tunnel/buildout.cfg +++ b/component/6tunnel/buildout.cfg @@ -8,7 +8,7 @@ extends = ../automake/buildout.cfg [6tunnel] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://toxygen.net/6tunnel/6tunnel-0.11rc2.tar.gz md5sum = 74e02d4f0704b3083a01feda66033449 configure-command = diff --git a/component/alsa/buildout.cfg b/component/alsa/buildout.cfg index 452bb71207ad6caa76e781c837974ca44ffafdeb..f8227fdda799640a925a6a10fd8018fecf3aadff 100644 --- a/component/alsa/buildout.cfg +++ b/component/alsa/buildout.cfg @@ -4,7 +4,7 @@ parts = [alsa] # Contains libasound -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.0.24.1.tar.bz2 md5sum = 7cc05f25e1d5b65da8fb3fdcd540f226 configure-options = diff --git a/component/apache-perl/buildout.cfg b/component/apache-perl/buildout.cfg index fd02044874f1f1996dc2ca393e862c7cdc898fe6..9e3e9a2835bfb8db57e16272d53a1ada36c733da 100644 --- a/component/apache-perl/buildout.cfg +++ b/component/apache-perl/buildout.cfg @@ -8,7 +8,7 @@ extends = [apache-perl] # Note: Shall react on each build of apache and reinstall itself -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://perl.apache.org/dist/mod_perl-2.0.5.tar.gz md5sum = 03d01d135a122bd8cebd0cd5b185d674 configure-command = diff --git a/component/apache-php/buildout.cfg b/component/apache-php/buildout.cfg index 6cd9bd78bcb2de8b693e54fd486e03b7fc91d978..2abe41bfed2adbdf3b4e3c1ca27bc0010478ff31 100644 --- a/component/apache-php/buildout.cfg +++ b/component/apache-php/buildout.cfg @@ -20,7 +20,7 @@ extends = [apache-php] # Note: Shall react on each build of apache and reinstall itself -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi depends = ${mariadb:version} url = http://fr2.php.net/distributions/php-5.4.12.tar.bz2 @@ -68,7 +68,7 @@ environment = [apache-php-postgres] # Note: Shall react on each build of apache and reinstall itself -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi depends = ${postgresql:url} url = http://fr2.php.net/distributions/php-5.4.12.tar.bz2 @@ -113,11 +113,11 @@ environment = [libmcrypt] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://sourceforge.net/projects/mcrypt/files/Libmcrypt/2.5.8/libmcrypt-2.5.8.tar.bz2/download md5sum = c4f491dd411a09e9de3b8702ea6f73eb [xml-rpc] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://downloads.sourceforge.net/project/phpxmlrpc/phpxmlrpc/2.2.2/xmlrpc-2.2.2.tar.gz md5sum = 59a644c636c6d98267d0c99b406ae9e8 diff --git a/component/apache/buildout.cfg b/component/apache/buildout.cfg index f425846e41768a14e4072e14c22b33a03654af48..598549e57986088a6b6f110e7d4f18f1d7a336a8 100644 --- a/component/apache/buildout.cfg +++ b/component/apache/buildout.cfg @@ -27,7 +27,7 @@ md5sum = 9c1db8606e520f201c451ec9a0b095f6 [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.4 @@ -101,7 +101,7 @@ md5sum = 4f074f035d3b37f3f3e71cd9616440f3 [apache-antiloris] # Note: Shall react on each build of apache and reinstall itself -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://sourceforge.net/projects/mod-antiloris/files/mod_antiloris-0.4.tar.bz2/download md5sum = 66862bf10e9be3a023e475604a28a0b4 patch-options = -p0 @@ -119,7 +119,7 @@ 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 +recipe = slapos.recipe.cmmi url = http://mir2.ovh.net/ftp.apache.org/dist//httpd/httpd-2.2.24.tar.gz md5sum = 64a3392018ad60583209a16d728180d3 patch-options = -p1 @@ -179,7 +179,7 @@ environment = [apache-antiloris-apache-2.2] # Note: Shall react on each build of apache and reinstall itself -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://sourceforge.net/projects/mod-antiloris/files/mod_antiloris-0.4.tar.bz2/download md5sum = 66862bf10e9be3a023e475604a28a0b4 configure-command = ${apache-2.2:location}/bin/apxs diff --git a/component/aspell/buildout.cfg b/component/aspell/buildout.cfg index 4bffc1299ffe56ef8cd18db54509499fc5e1326d..3c5d5e1b5aeed269a3a17ed0c90dd6bee559c36b 100644 --- a/component/aspell/buildout.cfg +++ b/component/aspell/buildout.cfg @@ -14,12 +14,12 @@ update-command = ${:command} stop-on-error = yes [aspell] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://ftp.gnu.org/gnu/aspell/aspell-0.60.6.1.tar.gz md5sum = e66a9c9af6a60dc46134fdacf6ce97d7 [aspell-en-dictionary] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = ftp://ftp.gnu.org/gnu/aspell/dict/en/aspell6-en-7.1-0.tar.bz2 md5sum = beba5e8f3afd3ed1644653bb685b2dfb configure-command = ./configure --vars ASPELL=${aspell:location}/bin/aspell PREZIP=${aspell:location}/bin/prezip-bin \ No newline at end of file diff --git a/component/attr/buildout.cfg b/component/attr/buildout.cfg index a279dd8f0f7777fcc0a5c5206b8a26c41da7c169..0c3c3e37347e33f3d58134247b4b26441fcfd0fb 100644 --- a/component/attr/buildout.cfg +++ b/component/attr/buildout.cfg @@ -3,7 +3,7 @@ parts = attr [attr] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = ftp://ftp.igh.cnrs.fr/pub/nongnu/attr/attr-2.4.46.src.tar.gz md5sum = db557c17fdfa4f785333ecda08654010 configure-options = diff --git a/component/autoconf/buildout.cfg b/component/autoconf/buildout.cfg index fe65a23785e8c10598a336fc303c9c4827c18927..6bb8ca87a2d6e53486b2bd7306eb19212f40cab9 100644 --- a/component/autoconf/buildout.cfg +++ b/component/autoconf/buildout.cfg @@ -6,7 +6,7 @@ parts = autoconf [autoconf] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.gz md5sum = 82d05e03b93e45f5a39b828dc9c6c29b environment = diff --git a/component/automake/buildout.cfg b/component/automake/buildout.cfg index 5d483842f57c6af8de43ea84f442c2ca3f2d3383..b0e8c1967901fd8102fe657c55809a549a845c8a 100644 --- a/component/automake/buildout.cfg +++ b/component/automake/buildout.cfg @@ -7,7 +7,7 @@ parts = automake [automake] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi md5sum = 140e084223bf463a24c1a28427c6aec7 url = http://ftp.gnu.org/gnu/automake/automake-1.12.6.tar.xz environment = diff --git a/component/bash/buildout.cfg b/component/bash/buildout.cfg index ce64a8f59a9cc47aa1fee7b6d26a267b94fb6ade..522ccc78f624ede26b5b6cc18660a0179b02cff7 100644 --- a/component/bash/buildout.cfg +++ b/component/bash/buildout.cfg @@ -3,6 +3,6 @@ parts = bash [bash] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = ftp://ftp.gnu.org/gnu/bash/bash-4.2.tar.gz md5sum = 3fb927c7c33022f1c327f14a81c0d4b0 diff --git a/component/binutils/buildout.cfg b/component/binutils/buildout.cfg index e20a1620559712cf2e4dd8f9f5e2c5d58f776e09..2061c3a298e9bdcfe6faadecdd72803b38498925 100644 --- a/component/binutils/buildout.cfg +++ b/component/binutils/buildout.cfg @@ -3,6 +3,6 @@ parts = binutils [binutils] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://ftp.gnu.org/gnu/binutils/binutils-2.21.1.tar.bz2 md5sum = bde820eac53fa3a8d8696667418557ad diff --git a/component/bison/buildout.cfg b/component/bison/buildout.cfg index 7b2171c1f3cf2b222476e551aa3a337c49e49b53..9b42b4c312472a0025c3ce5a66512bec4d050584 100644 --- a/component/bison/buildout.cfg +++ b/component/bison/buildout.cfg @@ -17,7 +17,7 @@ patch-options = -p1 patches = ${bison-drop.gets.patch:location}/${bison-drop.gets.patch:filename} -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://ftp.gnu.org/gnu/bison/bison-2.5.tar.bz2 md5sum = 9dba20116b13fc61a0846b0058fbe004 environment = diff --git a/component/bzip2/buildout.cfg b/component/bzip2/buildout.cfg index 1283c666e4a3d3abc949586ba9b28922a4b844bd..00a34282adffee1c83e7dd2efad9e86cd5e645e6 100644 --- a/component/bzip2/buildout.cfg +++ b/component/bzip2/buildout.cfg @@ -10,7 +10,7 @@ download-only = true filename = bzip2-hooks.py [bzip2] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz md5sum = 00b516f4704d4a7cb50a1d97e6e8e15b configure-command = true diff --git a/component/ca-certificates/buildout.cfg b/component/ca-certificates/buildout.cfg index e19b356d2403e604992bed50ea1ea9f7b2756180..56292ba0a56b50bc119bab07c8e24ce528c9bd5f 100644 --- a/component/ca-certificates/buildout.cfg +++ b/component/ca-certificates/buildout.cfg @@ -17,7 +17,7 @@ filename = ${:_buildout_section_name_} download-only = true [ca-certificates] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi version = 20130119 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 diff --git a/component/ccache/buildout.cfg b/component/ccache/buildout.cfg index 4eb68a30b90e21f1be5c3bf066602f1f109a0fba..43d836796dcc99140c992b2e60e069e715a2b9dd 100644 --- a/component/ccache/buildout.cfg +++ b/component/ccache/buildout.cfg @@ -2,7 +2,7 @@ parts = ccache [ccache-common] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi [ccache] <= ccache-3.1 diff --git a/component/cclient/buildout.cfg b/component/cclient/buildout.cfg index 0d486750c9792a1a57a80b5f2ad1f2c11c7d4d0e..aef676ae8e45e43f599e8e10484ad3f9b7c489dd 100644 --- a/component/cclient/buildout.cfg +++ b/component/cclient/buildout.cfg @@ -17,7 +17,7 @@ md5sum = 42c77fdd5d7a976fc302b93aadb3da98 filename = imap-2007f.patch [cclient] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = ftp://ftp.cac.washington.edu/imap/imap-2007f.tar.gz md5sum = 2126fd125ea26b73b20f01fcd5940369 configure-command = true diff --git a/component/cmake/buildout.cfg b/component/cmake/buildout.cfg index 499066613041708ee24a064aca8742f06c34db92..df2b26402f5a895e4659d59b5fdae3df097c102b 100644 --- a/component/cmake/buildout.cfg +++ b/component/cmake/buildout.cfg @@ -3,6 +3,6 @@ parts = cmake [cmake] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://www.cmake.org/files/v2.8/cmake-2.8.10.2.tar.gz md5sum = 097278785da7182ec0aea8769d06860c diff --git a/component/coreutils/buildout.cfg b/component/coreutils/buildout.cfg index df03be63acfcb3712f77dd3e2fdfd48a27c6ce18..2e2c66af93bf2f6f78c53de0f333770ba65785da 100644 --- a/component/coreutils/buildout.cfg +++ b/component/coreutils/buildout.cfg @@ -5,7 +5,7 @@ parts = coreutils [coreutils] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://ftp.gnu.org/gnu/coreutils/coreutils-8.21.tar.xz md5sum = 065ba41828644eca5dd8163446de5d64 configure-options = diff --git a/component/corosync/buildout.cfg b/component/corosync/buildout.cfg index 13f435a4851a14afc23b1e84ad1f060b257a204b..de13d9cf77691ffeb03c14f8d66c9aeddbeba5af 100644 --- a/component/corosync/buildout.cfg +++ b/component/corosync/buildout.cfg @@ -5,7 +5,7 @@ parts = corocosync [corosync] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = ftp://ftp:downloads@corosync.org/downloads/corosync-1.3.1/corosync-1.3.1.tar.gz md5sum = c58459a009a3a9d0b9c00e276a190d90 environment = diff --git a/component/couchdb/buildout.cfg b/component/couchdb/buildout.cfg index f38f5484914c0756438a76a9b860ba713b2a8f85..0c3568ee07a2d09ba123c7f7a19a2fd1cfced757 100644 --- a/component/couchdb/buildout.cfg +++ b/component/couchdb/buildout.cfg @@ -10,7 +10,7 @@ extends = parts = couchdb [couchdb] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://mir2.ovh.net/ftp.apache.org/dist//couchdb/1.1.1/apache-couchdb-1.1.1.tar.gz md5sum = cd126219b9cb69a4c521abd6960807a6 configure-options = diff --git a/component/cpio/buildout.cfg b/component/cpio/buildout.cfg index 1e449a15d7622eb1555b1f136af4e9704f9b572b..0a5adc57d5431d3d535682c66625c36c4268eea2 100644 --- a/component/cpio/buildout.cfg +++ b/component/cpio/buildout.cfg @@ -15,6 +15,6 @@ virtual-depends = patch-options = -p1 patches = ${cpio-drop.gets.patch:location}/${cpio-drop.gets.patch:filename} -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://ftp.gnu.org/gnu/cpio/cpio-2.11.tar.bz2 md5sum = 20fc912915c629e809f80b96b2e75d7d diff --git a/component/cuneiform/buildout.cfg b/component/cuneiform/buildout.cfg index 99d65ca009bdadc5bb892647f1deb803c932fa91..6f16669818a100e09a16c730bf0d2758045f1bc8 100644 --- a/component/cuneiform/buildout.cfg +++ b/component/cuneiform/buildout.cfg @@ -5,7 +5,7 @@ extends = parts = cuneiform [cuneiform] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://launchpad.net/cuneiform-linux/1.0/1.0/+download/cuneiform-linux-1.0.0.tar.bz2 md5sum = 785232ffffad7d82446fbac08a1c3ef9 location = ${buildout:parts-directory}/${:_buildout_section_name_} diff --git a/component/curl/buildout.cfg b/component/curl/buildout.cfg index a68606b8100457271f649ca1bc13f373f24e53d0..71216d822922a507844f2c7f27e7a1c500433df1 100644 --- a/component/curl/buildout.cfg +++ b/component/curl/buildout.cfg @@ -11,8 +11,8 @@ parts = [curl] recipe = hexagonit.recipe.cmmi -url = http://curl.haxx.se/download/curl-7.29.0.tar.bz2 -md5sum = fa5f37f38a8042020e292ce7ec5341ce +url = http://curl.haxx.se/download/curl-7.30.0.tar.bz2 +md5sum = 0db5ec03a5001b42a2edc03bf63b5ceb configure-options = --disable-static --disable-ldap diff --git a/component/cyrus-sasl/buildout.cfg b/component/cyrus-sasl/buildout.cfg index ee6e00dbdeceed7862719152c4685de8a90fa31f..40fb428e18ddb59e5a485e88be4bfa9a0d5f95e7 100644 --- a/component/cyrus-sasl/buildout.cfg +++ b/component/cyrus-sasl/buildout.cfg @@ -5,7 +5,7 @@ extends = ../zlib/buildout.cfg [cyrus-sasl] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.26.tar.gz md5sum = a7f4e5e559a0e37b3ffc438c9456e425 diff --git a/component/dash/buildout.cfg b/component/dash/buildout.cfg index 6f75d323b657d3c58a3d707dc8068e4157d65e13..e353921b9aea2114bbe001f458ffd446711c9bc2 100644 --- a/component/dash/buildout.cfg +++ b/component/dash/buildout.cfg @@ -3,7 +3,7 @@ parts = dash [dash] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.7.tar.gz md5sum = f6cedb10ae7258adb5ab17a10ae80d51 configure-options = diff --git a/component/dbus/buildout.cfg b/component/dbus/buildout.cfg index d51359506dc6700103a840597942d8f30e1c9676..3015fc1f3bb64201b5a4e8a06849ec9d12920011 100644 --- a/component/dbus/buildout.cfg +++ b/component/dbus/buildout.cfg @@ -8,7 +8,7 @@ parts = dbus [dbus] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://dbus.freedesktop.org/releases/dbus/dbus-1.4.10.tar.gz md5sum = 402a2f8102bedbe236e2891b2b0f31c2 configure-options = @@ -20,7 +20,7 @@ environment = LDFLAGS=-L${libexpat:location}/lib [dbus-glib] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.94.tar.gz md5sum = e1f1506a6f4941e67bffd614b1ad5af6 environment = diff --git a/component/dcron/buildout.cfg b/component/dcron/buildout.cfg index 0572c9a0a5b139c3c2859340f730aca9ebfb6f29..ef5580e727546ed5feeebf33a9c4294933d741cc 100644 --- a/component/dcron/buildout.cfg +++ b/component/dcron/buildout.cfg @@ -9,7 +9,7 @@ filename = dcron-4.4.noroot.no.globals.patch download-only = true [dcron] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://www.jimpryor.net/linux/releases/dcron-4.4.tar.gz md5sum = 02d848ba043a9df5bf2102a9f4bc04bd configure-command = true diff --git a/component/dropbear/buildout.cfg b/component/dropbear/buildout.cfg index b5a63897d65255a41d1f7d2990738c30b330f1c0..83fa5b326f0efb66e6ede5da1c9f0b81b7b96605 100644 --- a/component/dropbear/buildout.cfg +++ b/component/dropbear/buildout.cfg @@ -40,7 +40,7 @@ filename = dropbear-0.53.1-static_build_fix.patch download-only = true [dropbear] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi md5sum = 0284ea239083f04c8b874e08e1aca243 # XXX: We still use an old version of dropbear instead of the last one # in order have all patches working. diff --git a/component/erlang/buildout.cfg b/component/erlang/buildout.cfg index 0743100b9ded9bd7d3464c19d30ae098c9a879ac..46ba271e6ac3b96d60d8d142d59b213d7706016f 100644 --- a/component/erlang/buildout.cfg +++ b/component/erlang/buildout.cfg @@ -8,7 +8,7 @@ extends = parts = erlang [erlang] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://www.erlang.org/download/otp_src_R14B04.tar.gz md5sum = 4b469729f103f52702bfb1fb24529dc0 configure-options = diff --git a/component/fastjar/buildout.cfg b/component/fastjar/buildout.cfg index c7fe1141e5c78d89d23dfe4fc378a14776bf11e0..feadefe71a7139cd8363451aa3bccfa9e0842c6a 100644 --- a/component/fastjar/buildout.cfg +++ b/component/fastjar/buildout.cfg @@ -4,7 +4,7 @@ extends = ../zlib/buildout.cfg [fastjar] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://sourceforge.net/projects/fastjar/files/fastjar/0.94/fastjar-0.94.tar.gz/download md5sum = 14d4bdfac236e347d806c6743dba48c6 environment = diff --git a/component/ffmpeg/buildout.cfg b/component/ffmpeg/buildout.cfg index b9b20474bec71bf3360094f131948b148f880b91..c64ce404f8a0fac805d8001e5152db6233cd1770 100644 --- a/component/ffmpeg/buildout.cfg +++ b/component/ffmpeg/buildout.cfg @@ -12,14 +12,14 @@ parts = <= ffmpeg-0.8 [libogg] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://downloads.xiph.org/releases/ogg/libogg-1.2.2.tar.gz md5sum = 5a9fcabc9a1b7c6f1cd75ddc78f36c56 configure-options = --disable-static [libvorbis] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.2.tar.bz2 md5sum = 798a4211221073c1409f26eac4567e8b configure-options = @@ -29,7 +29,7 @@ environment = PKG_CONFIG_PATH=${libogg:location}/lib/pkgconfig [libtheora] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.bz2 md5sum = 292ab65cedd5021d6b7ddd117e07cd8e configure-options = @@ -39,11 +39,11 @@ environment = PKG_CONFIG_PATH=${libogg:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig:${libvorbis:location}/lib/pkgconfig [yasm] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://www.tortall.net/projects/yasm/releases/yasm-1.1.0.tar.gz [libvpx] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://webm.googlecode.com/files/libvpx-v0.9.6.tar.bz2 md5sum = 383f3f07a76099682abb43f79b692b72 configure-options = @@ -52,7 +52,7 @@ environment = PATH=${yasm:location}/bin:%(PATH)s [libx264] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20111005-2245-stable.tar.bz2 md5sum = f86260b2ea6d6cb5186937c9363891d7 configure-options = @@ -62,7 +62,7 @@ environment = PATH=${yasm:location}/bin:%(PATH)s [lame] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://prdownloads.sourceforge.net/lame/lame-3.98.4.tar.gz md5sum = 8e9866ad6b570c6c95c8cba48060473f configure-options = @@ -70,14 +70,14 @@ configure-options = --disable-gtktest [opencore-amr] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://prdownloads.sourceforge.net/opencore-amr/opencore-amr/opencore-amr-0.1.2.tar.gz md5sum = 8e8b8b253eb046340ff7b6bf7a6ccd3e configure-options = --disable-static [ffmpeg-0.8] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://ffmpeg.org/releases/ffmpeg-0.8.5.tar.bz2 md5sum = 726877b19ece7ea64def8b7e6727e182 configure-options = diff --git a/component/file/buildout.cfg b/component/file/buildout.cfg index 5c171cd90560eee2ceee88ee4028f095e2aad5b7..936b9e82ea357a24980aaf6f06426cd987051968 100644 --- a/component/file/buildout.cfg +++ b/component/file/buildout.cfg @@ -7,7 +7,7 @@ extends = ../zlib/buildout.cfg [file] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = ftp://ftp.astron.com/pub/file/file-5.11.tar.gz md5sum = 16a407bd66d6c7a832f3a5c0d609c27b configure-options = diff --git a/component/flare/buildout.cfg b/component/flare/buildout.cfg index ef3990b16fd7fc19f98f696c98e727fbb0157c86..e2d25bedd26d231d55ea674cad53985c9014b699 100644 --- a/component/flare/buildout.cfg +++ b/component/flare/buildout.cfg @@ -7,7 +7,7 @@ parts = flare [flare] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://labs.gree.jp/data/source/flare-1.0.9.tgz md5sum = e59ccce1ba29e7edf6f665561678d5c8 configure-options = diff --git a/component/flex/buildout.cfg b/component/flex/buildout.cfg index 01445fe69fa71679476c254ac02cac24fbefbc75..ad2d8303ad498fbd094b9c347ea79daf558f048f 100644 --- a/component/flex/buildout.cfg +++ b/component/flex/buildout.cfg @@ -5,7 +5,7 @@ parts = flex [flex] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://downloads.sourceforge.net/project/flex/flex/flex-2.5.35/flex-2.5.35.tar.gz md5sum = 201d3f38758d95436cbc64903386de0b environment = diff --git a/component/fontconfig/buildout.cfg b/component/fontconfig/buildout.cfg index 509cb989bdf1de081d14cb2aa5eadfff543a147c..e86e2cab3eeb5228e01b14f32aa880ab4a02b007 100644 --- a/component/fontconfig/buildout.cfg +++ b/component/fontconfig/buildout.cfg @@ -12,7 +12,7 @@ parts = fontconfig [fontconfig] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://fontconfig.org/release/fontconfig-2.10.2.tar.bz2 md5sum = 2f239690057d1438aa282e051f721d08 # XXX-Cedric : should we use --with-add-fonts={somefont:location}/share,{someotherfont:location}/share? diff --git a/component/freetype/buildout.cfg b/component/freetype/buildout.cfg index f5d1f9a084f1ec90dee23f8f0df346e57d9fae78..eb64ada05f27abe5f68152e4a76fab19537f6347 100644 --- a/component/freetype/buildout.cfg +++ b/component/freetype/buildout.cfg @@ -10,7 +10,7 @@ parts = freetype [freetype] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://download.savannah.gnu.org/releases/freetype/freetype-2.4.11.tar.bz2 md5sum = b93435488942486c8d0ca22e8f768034 configure-options = diff --git a/component/garbage-collector/buildout.cfg b/component/garbage-collector/buildout.cfg index b5e0431e02601806ac093e072c212ca831ff814b..32ef02bda5327d798420a0deaba9bafb8b9dba2d 100644 --- a/component/garbage-collector/buildout.cfg +++ b/component/garbage-collector/buildout.cfg @@ -2,7 +2,7 @@ parts = garbage-collector [garbage-collector] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi md5sum = 2ff9924c7249ef7f736ecfe6f08f3f9b url = http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc-7.1.tar.gz configure-options = diff --git a/component/gcc/buildout.cfg b/component/gcc/buildout.cfg index c9c43b16698b6287d501e72231f84ae960a14723..e5a1b0636de3b184ef5c9c69eaa060f5623f977d 100644 --- a/component/gcc/buildout.cfg +++ b/component/gcc/buildout.cfg @@ -10,7 +10,7 @@ parts = gcc [mpfr] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://www.mpfr.org/mpfr-3.0.1/mpfr-3.0.1.tar.bz2 md5sum = bfbecb2eacb6d48432ead5cfc3f7390a configure-options = @@ -20,7 +20,7 @@ environment = LDFLAGS=-Wl,-rpath=${gmp:location}/lib [mpc] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://www.multiprecision.org/mpc/download/mpc-0.9.tar.gz md5sum = 0d6acab8d214bd7d1fbbc593e83dd00d configure-options = @@ -31,7 +31,7 @@ environment = LDFLAGS=-Wl,-rpath=${mpfr:location}/lib -Wl,-rpath=${gmp:location}/lib [ppl] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi # we should use version 0.10.x for gcc-4.5 url = http://www.cs.unipr.it/ppl/Download/ftp/releases/0.10.2/ppl-0.10.2.tar.bz2 md5sum = 5667111f53150618b0fa522ffc53fc3e @@ -44,7 +44,7 @@ environment = LDFLAGS=-Wl,-rpath=${gmp:location}/lib [cloog-ppl] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = ftp://gcc.gnu.org/pub/gcc/infrastructure/cloog-ppl-0.15.9.tar.gz md5sum = 806e001d1b1a6b130069ff6274900af5 configure-options = @@ -78,7 +78,7 @@ download-only = true hack-revision = ${gcc-interconnection-workaround:hack-revision} depends = ${gcc-download:location} -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi path = ${gcc-source:location} md5sum = bb3265edf0fa7543e50cedb93e04e427 patches = @@ -86,7 +86,7 @@ patches = patch-options = -p2 configure-command = make clean \\; make distclean \\; ./configure # GMP does not correctly detect achitecture so it have to be given -# as hexagonit.recipe.cmmi is using shell expansion in subproceses +# as slapos.recipe.cmmi is using shell expansion in subproceses # backticks are working configure-options = --disable-bootstrap diff --git a/component/gdbm/buildout.cfg b/component/gdbm/buildout.cfg index d8d9105cd5f88e4bcb108f78b713d1f0e8c0b1a3..2d4933bc3e5357f8a3b00d101af8d6a95a4439dc 100644 --- a/component/gdbm/buildout.cfg +++ b/component/gdbm/buildout.cfg @@ -3,7 +3,7 @@ parts = gdbm [gdbm] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi version = 1.10 url = ftp://ftp.gnu.org/gnu/gdbm/gdbm-${:version}.tar.gz md5sum = 88770493c2559dc80b561293e39d3570 diff --git a/component/gettext/buildout.cfg b/component/gettext/buildout.cfg index 6afcab749d4135f988a480c52e5ab33bca3a59fb..fb799ec75f6a51573f437552a617acbafa83f874 100644 --- a/component/gettext/buildout.cfg +++ b/component/gettext/buildout.cfg @@ -7,7 +7,7 @@ extends = ../zlib/buildout.cfg [gettext] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://ftp.gnu.org/pub/gnu/gettext/gettext-0.18.2.1.tar.gz md5sum = 034c8103b14654ebd300fadac44d6f14 diff --git a/component/ghostscript/buildout.cfg b/component/ghostscript/buildout.cfg index 3cc9e0d6b66c0f65baec9600f8b848fb59a59efa..9271cc14c91f378a12837b5fae625b40c02007b1 100644 --- a/component/ghostscript/buildout.cfg +++ b/component/ghostscript/buildout.cfg @@ -8,7 +8,7 @@ extends = parts = ghostscript [ghostscript-common] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi depends = ${libtiff:version} configure-options = diff --git a/component/giflib/buildout.cfg b/component/giflib/buildout.cfg index 08e041a3e0713badfbbb27660ae91aa77fb6613e..29589e6df180e0c8782b02f53f77a1e8960c8b25 100644 --- a/component/giflib/buildout.cfg +++ b/component/giflib/buildout.cfg @@ -3,7 +3,7 @@ parts = giflib [giflib] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://prdownloads.sourceforge.net/giflib/giflib-4.2.0.tar.bz2?download md5sum = 711ad48551ee14db7c200b5f402df849 configure-options = diff --git a/component/git/buildout.cfg b/component/git/buildout.cfg index d0ac32d378ff212eaef29ffe4c7dc71aef05d3fe..365c9a139ac93c3208ca1822fc283c8780db84c1 100644 --- a/component/git/buildout.cfg +++ b/component/git/buildout.cfg @@ -11,7 +11,7 @@ parts = git [git] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://git-core.googlecode.com/files/git-1.7.12.tar.gz md5sum = ceb1a6b17a3e33bbc70eadf8fce5876c configure-options = diff --git a/component/glib/buildout.cfg b/component/glib/buildout.cfg index 42a095cf2790a6bb8aae39550e7b42dabca8c067..ee829185afec67e387a8a90baeee626a8566146e 100644 --- a/component/glib/buildout.cfg +++ b/component/glib/buildout.cfg @@ -4,7 +4,7 @@ extends = ../zlib/buildout.cfg [glib] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://ftp.gnome.org/pub/gnome/sources/glib/2.28/glib-2.28.8.tar.bz2 md5sum = 789e7520f71c6a4bf08bc683ec764d24 configure-options = diff --git a/component/gmp/buildout.cfg b/component/gmp/buildout.cfg index b47bfc8b155963d9fe9fa7e51c73eca1d1eec12f..3a90c862575f60cd59a588f75207b30565340387 100644 --- a/component/gmp/buildout.cfg +++ b/component/gmp/buildout.cfg @@ -6,12 +6,12 @@ parts = gmp [gmp] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi # we should use version 4.x for ppl-0.10 url = ftp://ftp.gmplib.org/pub/gmp-4.3.2/gmp-4.3.2.tar.bz2 md5sum = dd60683d7057917e34630b4a787932e8 # GMP does not correctly detect achitecture so it have to be given -# as hexagonit.recipe.cmmi is using shell expansion in subproceses +# as slapos.recipe.cmmi is using shell expansion in subproceses # backticks are working configure-options = --build=`uname -m`-linux diff --git a/component/gnutls/buildout.cfg b/component/gnutls/buildout.cfg index 3afaa77b0d1421ec9620be2e0a67d457eebed909..a19e00f79eb9f4708312401f3f596bba9e7f4c53 100644 --- a/component/gnutls/buildout.cfg +++ b/component/gnutls/buildout.cfg @@ -7,12 +7,12 @@ extends = parts = gnutls [gpg-error] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.10.tar.gz md5sum = 7c2710ef439f82ac429b88fec88e9a4c [gcrypt] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.5.0.tar.gz md5sum = 78f8f8bec4580f75b25816f7896d0389 configure-options = @@ -23,7 +23,7 @@ environment = [gnutls] # XXX-Cedric : update to latest gnutls -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = ftp://ftp.gnutls.org/gcrypt/gnutls/v2.8/gnutls-2.8.6.tar.bz2 md5sum = eb0a6d7d3cb9ac684d971c14f9f6d3ba configure-options = diff --git a/component/graphviz/buildout.cfg b/component/graphviz/buildout.cfg index 9658c1ad0f270709599968ac4a42d5eb58765677..e4d37561d89c2ebfba513487030a768f33f9ca6c 100644 --- a/component/graphviz/buildout.cfg +++ b/component/graphviz/buildout.cfg @@ -13,7 +13,7 @@ extends = ../zlib/buildout.cfg [graphviz] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.28.0.tar.gz md5sum = 8d26c1171f30ca3b1dc1b429f7937e58 configure-options = diff --git a/component/grep/buildout.cfg b/component/grep/buildout.cfg index 0bbe32ec7046218425f8363063c5275b4d8e2473..3c7f1d8c8a92382913431180f860479391574c35 100644 --- a/component/grep/buildout.cfg +++ b/component/grep/buildout.cfg @@ -6,7 +6,7 @@ parts = grep [grep] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://ftp.gnu.org/gnu/grep/grep-2.14.tar.xz md5sum = d4a3f03849d1e17ce56ab76aa5a24cab environment = diff --git a/component/groff/buildout.cfg b/component/groff/buildout.cfg index e5705e8fa8495afca3e23f374a5108c7a6b703e6..6f9ef9577fb26df82447e9e9c315773126cf76a8 100644 --- a/component/groff/buildout.cfg +++ b/component/groff/buildout.cfg @@ -3,7 +3,7 @@ parts = groff [groff] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://ftp.gnu.org/gnu/groff/groff-1.21.tar.gz md5sum = 8b8cd29385b97616a0f0d96d0951c5bf configure-options = diff --git a/component/groonga/buildout.cfg b/component/groonga/buildout.cfg index 077aee28d72b6b45c84c6bde0241a7d74c84d458..80931daa631cde3a87fe94b9de6b6ce60a7ba24f 100644 --- a/component/groonga/buildout.cfg +++ b/component/groonga/buildout.cfg @@ -10,7 +10,7 @@ extends = ../zlib/buildout.cfg [groonga] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi version = 3.0.2 url = http://packages.groonga.org/source/groonga/groonga-${:version}.tar.gz md5sum = b17934ef2589a4e261ed0d99aec713eb @@ -26,7 +26,7 @@ environment = LDFLAGS =-Wl,-rpath=${zlib:location}/lib -L${zlib:location}/lib [groonga-normalizer-mysql] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi version = 1.0.2 url = http://packages.groonga.org/source/groonga-normalizer-mysql/groonga-normalizer-mysql-${:version}.tar.gz md5sum = 782111599dcba5023beb698dc5ea514a diff --git a/component/gtk-2/buildout.cfg b/component/gtk-2/buildout.cfg index 8ec36e3e1fb531f65163c2904f037a7aa4c7e96d..912984fef33f7b50b178d2b7fbc87b1871945b91 100644 --- a/component/gtk-2/buildout.cfg +++ b/component/gtk-2/buildout.cfg @@ -15,7 +15,7 @@ parts = gtk-2 [cairo] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://cairographics.org/releases/cairo-1.10.2.tar.gz md5sum = f101a9e88b783337b20b2e26dfd26d5f configure-options = @@ -29,7 +29,7 @@ environment = LD_LIBRARY_PATH=${render:location}/lib:${libX11:location}/lib:${libXrender:location}/lib [pango] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://ftp.gnome.org/pub/gnome/sources/pango/1.29/pango-1.29.3.tar.bz2 md5sum = be4e3891353fae6b62a6f8d7689c4266 configure-options = @@ -43,7 +43,7 @@ environment = LD_LIBRARY_PATH=${render:location}/lib:${libX11:location}/lib:${libXrender:location}/lib [gdk-pixbuf] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.24/gdk-pixbuf-2.24.0.tar.bz2 md5sum = d8ece3a4ade4a91c768328620e473ab8 configure-options = @@ -57,7 +57,7 @@ environment = LD_LIBRARY_PATH=${glib:location}/lib:${gettext:location}/lib [atk] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://ftp.gnome.org/pub/gnome/sources/atk/2.0/atk-2.0.1.tar.bz2 md5sum = 87f20b78deaedef858ac54358c0786b1 environment = @@ -67,7 +67,7 @@ environment = LD_LIBRARY_PATH=${glib:location}/lib:${gettext:location}/lib [gtk-2] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-2.24.6.tar.bz2 md5sum = 421100f6597e613234f8dead6091a9fe configure-options = diff --git a/component/gzip/buildout.cfg b/component/gzip/buildout.cfg index 97a75d616c6dc91820bf19cd47cf15931fcc27ee..aaa399d62f52df49d23b792dddd00f9b68eeb71a 100644 --- a/component/gzip/buildout.cfg +++ b/component/gzip/buildout.cfg @@ -5,7 +5,7 @@ parts = gzip [gzip] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = ftp://ftp.gnu.org/pub/gnu/gzip/gzip-1.5.tar.xz md5sum = 2a431e169b6f62f7332ef6d47cc53bae environment = diff --git a/component/haproxy/buildout.cfg b/component/haproxy/buildout.cfg index 5cde2e16bd520f59b5691dfeee159cbfabdc10f4..01ae447bbd713bd0bec0f3b65d945a9aa1aaf9f9 100644 --- a/component/haproxy/buildout.cfg +++ b/component/haproxy/buildout.cfg @@ -8,7 +8,7 @@ extends = parts = haproxy [haproxy] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://haproxy.1wt.eu/download/1.4/src/haproxy-1.4.23.tar.gz md5sum = 6535d5e58037ada4b58b439cebe03c79 configure-command = true diff --git a/component/icu/buildout.cfg b/component/icu/buildout.cfg index 966be46e1ff47a92c0d998b8ac7f1379bf5111dc..7f3bd4aadd551ae6bc2ffb9c95a9713344c5db84 100644 --- a/component/icu/buildout.cfg +++ b/component/icu/buildout.cfg @@ -3,7 +3,7 @@ parts = icu4c [icu4c] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi location = ${buildout:parts-directory}/${:_buildout_section_name_} url = http://download.icu-project.org/files/icu4c/4.8.1.1/icu4c-4_8_1_1-src.tgz md5sum = ea93970a0275be6b42f56953cd332c17 diff --git a/component/imagemagick/buildout.cfg b/component/imagemagick/buildout.cfg index d8661db04cf385bec7931f9db6fa24ae7106b8bf..a6e4ba687cc2eb3956b517dbe95dfe13634d925a 100644 --- a/component/imagemagick/buildout.cfg +++ b/component/imagemagick/buildout.cfg @@ -30,7 +30,7 @@ download-only = true filename = imagemagick-6.6.6-1-no-gsx-gsc-probe.patch [imagemagick] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://ftp.vim.org/ImageMagick/ImageMagick-6.8.2-6.tar.xz md5sum = ee01558201041a9978dd14b1db946ce8 depends = diff --git a/component/intltool/buildout.cfg b/component/intltool/buildout.cfg index 70835edcdba553e50ee09d17cf199cf162bf9cad..15b71683b1ad1c4e6789924c514438514ca7d579 100644 --- a/component/intltool/buildout.cfg +++ b/component/intltool/buildout.cfg @@ -8,7 +8,7 @@ parts = intltool [intltool] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://edge.launchpad.net/intltool/trunk/0.41.1/+download/intltool-0.41.1.tar.gz md5sum = d6c91bf06681919ccfdf3624035b75dc depends = diff --git a/component/jasper/buildout.cfg b/component/jasper/buildout.cfg index 9d9ddce245fdc1b05b35a1797d968f8c0d1d42bb..0addfa3a2a4021831897b5e0d6865054a5c8cb15 100644 --- a/component/jasper/buildout.cfg +++ b/component/jasper/buildout.cfg @@ -5,7 +5,7 @@ parts = jasper [jasper] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-1.900.1.zip md5sum = a342b2b4495b3e1394e161eb5d85d754 # jasper configure script is not executable by default diff --git a/component/jbigkit/buildout.cfg b/component/jbigkit/buildout.cfg index dc7f3f5b3a6f00066184a405ea0941474deee7ed..f5985e08b59865b7872a206a7040ef439a825f9b 100644 --- a/component/jbigkit/buildout.cfg +++ b/component/jbigkit/buildout.cfg @@ -19,7 +19,7 @@ filename = jbigkit-2.0-build.patch md5sum = e974958e9331735c07478e9c2dde8795 [jbigkit] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://www.cl.cam.ac.uk/~mgk25/download/jbigkit-2.0.tar.gz md5sum = 3dd87f605abb1a97a22dc79d8b3e8f6c patch-options = diff --git a/component/leptonica/buildout.cfg b/component/leptonica/buildout.cfg index f9a1c26a6cae22f4fc8a5672f1f17a026ca3d25b..e1fa28e46b0075df83b08a1dedd3f6203d2b4bca 100644 --- a/component/leptonica/buildout.cfg +++ b/component/leptonica/buildout.cfg @@ -10,7 +10,7 @@ extends = ../giflib/buildout.cfg [leptonica] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://leptonica.googlecode.com/files/leptonica-1.68.tar.gz md5sum = 5cd7092f9ff2ca7e3f3e73bfcd556403 configure-command = diff --git a/component/libaio/buildout.cfg b/component/libaio/buildout.cfg index 4d46fe3c4b48486c708addcfa667a751c05f1c35..93cf10540c1bd69bfc3667bd9d832df7b91a8f8b 100644 --- a/component/libaio/buildout.cfg +++ b/component/libaio/buildout.cfg @@ -3,7 +3,7 @@ parts = libaio [libaio] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi # originally located at http://www.kernel.org/pub/linux/libs/aio/ url = http://ftp.free.fr/mirrors/ftp.debian.org/pool/main/liba/libaio/libaio_0.3.109.orig.tar.gz md5sum = 435a5b16ca6198eaf01155263d855756 diff --git a/component/libdb/buildout.cfg b/component/libdb/buildout.cfg index d0babbfb91886fdb179f35f99edf5890130e76c3..1c54f91f0e80f40b3661d9551e5dd9af796078b2 100644 --- a/component/libdb/buildout.cfg +++ b/component/libdb/buildout.cfg @@ -9,7 +9,7 @@ download-only=true filename = libdb-hooks.py [libdb] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://download.oracle.com/berkeley-db/db-4.5.20.tar.gz md5sum = b0f1c777708cb8e9d37fb47e7ed3312d pre-configure-hook = ${libdb-hooks-download:location}/${libdb-hooks-download:filename}:pre_configure_hook diff --git a/component/libdmtx/buildout.cfg b/component/libdmtx/buildout.cfg index 921862d6a3fd4b1287f515998321b29c2779cd5e..f2e33fe3af1826fed6bdaf49e672f973d23dcc06 100644 --- a/component/libdmtx/buildout.cfg +++ b/component/libdmtx/buildout.cfg @@ -12,14 +12,14 @@ parts = dmtx-utils [libdmtx] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://prdownloads.sourceforge.net/libdmtx/libdmtx-0.7.4.tar.bz2 md5sum = d3a4c0becd92895eb606dbdb78b023e2 configure-options = --disable-static [dmtx-utils] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://prdownloads.sourceforge.net/libdmtx/dmtx-utils-0.7.4.tar.bz2 md5sum = b132ab9fb1d289869469b8bb4959a08a configure-options = diff --git a/component/libevent/buildout.cfg b/component/libevent/buildout.cfg index 69dadb5a15453e5025263ee8c0a614dcb3eb24c1..29565a7d5c034ffeca270c53b318960d547be1ae 100644 --- a/component/libevent/buildout.cfg +++ b/component/libevent/buildout.cfg @@ -2,7 +2,7 @@ parts = libevent [libevent] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://www.monkey.org/~provos/libevent-1.4.13-stable.tar.gz md5sum = 0b3ea18c634072d12b3c1ee734263664 configure-options = diff --git a/component/libexpat/buildout.cfg b/component/libexpat/buildout.cfg index c677cc3f4464f64056cdd2a132252f490ceafef6..ab49d4108f923edac01acdae41d9c804a648043a 100644 --- a/component/libexpat/buildout.cfg +++ b/component/libexpat/buildout.cfg @@ -3,7 +3,7 @@ parts = libexpat [libexpat] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://sourceforge.net/projects/expat/files/expat/2.1.0/expat-2.1.0.tar.gz/download md5sum = dd7dab7a5fea97d2a6a43f511449b7cd configure-options = diff --git a/component/libiconv/buildout.cfg b/component/libiconv/buildout.cfg index 23364aea78d48e94685ed1e04e749f3f9fdcaa68..ba02873c7456912ed4270e529fd975b22e093b0e 100644 --- a/component/libiconv/buildout.cfg +++ b/component/libiconv/buildout.cfg @@ -3,6 +3,6 @@ parts = libiconv [libiconv] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.14.tar.gz md5sum = e34509b1623cec449dfeb73d7ce9c6c6 diff --git a/component/libjpeg/buildout.cfg b/component/libjpeg/buildout.cfg index 74e4461d2ff7cb84e17cd11652f868f25015f436..f5457d6bdc013320a8f746371d71084115b5927d 100644 --- a/component/libjpeg/buildout.cfg +++ b/component/libjpeg/buildout.cfg @@ -3,7 +3,7 @@ parts = libjpeg [libjpeg] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://www.ijg.org/files/jpegsrc.v8d.tar.gz md5sum = 52654eb3b2e60c35731ea8fc87f1bd29 configure-options = diff --git a/component/libmemcached/buildout.cfg b/component/libmemcached/buildout.cfg index 4b3b210ea0fabe9258725a0b74a413863e17ea58..309bdef30d157853f98c3e30dd2d67ca835467ce 100644 --- a/component/libmemcached/buildout.cfg +++ b/component/libmemcached/buildout.cfg @@ -17,7 +17,7 @@ url = http://launchpad.net/libmemcached/1.0/0.44/+download/libmemcached-0.44.tar md5sum = e6bd825c46fa080b550f90f9001cba8c [libmemcached-common] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi configure-options = --without-docs --without-memcached diff --git a/component/libpng/buildout.cfg b/component/libpng/buildout.cfg index 888e8dde6a6e6aba16009ab80f3bdf9252ad2a6d..3590a121bff761285e88e5e8e75fca907800d233 100644 --- a/component/libpng/buildout.cfg +++ b/component/libpng/buildout.cfg @@ -8,7 +8,7 @@ parts = libpng [libpng-common] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi configure-options = --disable-static environment = diff --git a/component/librsvg/buildout.cfg b/component/librsvg/buildout.cfg index 269115006f411e18ca3aaa0dbe19d4512b7916b2..d28e2680a4aa02001646fb98ff6751d3c5e08aa2 100644 --- a/component/librsvg/buildout.cfg +++ b/component/librsvg/buildout.cfg @@ -10,7 +10,7 @@ extends = ../xz-utils/buildout.cfg [libcroco] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://ftp.gnome.org/pub/gnome/sources/libcroco/0.6/libcroco-0.6.8.tar.xz md5sum = 767e73c4174f75b99695d4530fd9bb80 environment = @@ -19,7 +19,7 @@ environment = LDFLAGS=-Wl,-rpath=${zlib:location}/lib [librsvg] -recipe = hexagonit.recipe.cmmi +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 diff --git a/component/librsync/buildout.cfg b/component/librsync/buildout.cfg index 172b5227f57b28068cd463348cf7dd297594783f..e9192d216dec92e4a5af078c35d517f45a6465f1 100644 --- a/component/librsync/buildout.cfg +++ b/component/librsync/buildout.cfg @@ -7,7 +7,7 @@ parts = librsync [librsync] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://downloads.sourceforge.net/sourceforge/librsync/librsync-0.9.7.tar.gz md5sum = 24cdb6b78f45e0e83766903fd4f6bc84 configure-options = diff --git a/component/libtiff/buildout.cfg b/component/libtiff/buildout.cfg index 5d2f490fd142e9508b5c759238c6e4a15afb7611..ec6c0e43fed82e5f0161d5680ba39c7c8a15dbe0 100644 --- a/component/libtiff/buildout.cfg +++ b/component/libtiff/buildout.cfg @@ -8,7 +8,7 @@ parts = libtiff [libtiff] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi version = 4.0.3 url = http://www.imagemagick.org/download/delegates/tiff-${:version}.tar.gz md5sum = 051c1068e6a0627f461948c365290410 diff --git a/component/libtool/buildout.cfg b/component/libtool/buildout.cfg index 8d6256665e45aac0682f028fa47575c4d3c22a1c..93db838b216bf8030f4d9e55213c8ebc9514940c 100644 --- a/component/libtool/buildout.cfg +++ b/component/libtool/buildout.cfg @@ -2,7 +2,7 @@ parts = libtool [libtool] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi md5sum = d2f3b7d4627e69e13514a40e72a24d50 url = http://ftp.gnu.org/gnu/libtool/libtool-2.4.2.tar.gz configure-options = diff --git a/component/libuuid/buildout.cfg b/component/libuuid/buildout.cfg index 95f3a1d067cb0f5aa86c4f0ad25a491b036e177e..47150565e964582bbc6e927b24e29a4dd5a5ae5c 100644 --- a/component/libuuid/buildout.cfg +++ b/component/libuuid/buildout.cfg @@ -3,7 +3,7 @@ parts = libuuid [libuuid] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://www.kernel.org/pub/linux/utils/util-linux/v2.18/util-linux-ng-2.18.tar.bz2 md5sum = 2f5f71e6af969d041d73ab778c141a77 configure-options = diff --git a/component/libxml2/buildout.cfg b/component/libxml2/buildout.cfg index f53ac67fd5e9aa3cce568111522994a578a65793..df7f69ad021be684b9e40e439d1d81dc05610c1b 100644 --- a/component/libxml2/buildout.cfg +++ b/component/libxml2/buildout.cfg @@ -7,7 +7,7 @@ parts = libxml2 [libxml2] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = ftp://ftp.xmlsoft.org/libxml2/libxml2-2.9.0.tar.gz md5sum = 5b9bebf4f5d2200ae2c4efe8fa6103f7 configure-options = diff --git a/component/libxslt/buildout.cfg b/component/libxslt/buildout.cfg index 8500e3f2794975edf4d37212815a0204a334002a..78f1b71f3da5abb999ccbe381d7646d1e10f31bd 100644 --- a/component/libxslt/buildout.cfg +++ b/component/libxslt/buildout.cfg @@ -10,7 +10,7 @@ parts = [libxslt] url = ftp://xmlsoft.org/libxslt/libxslt-1.1.28.tar.gz md5sum = 9667bf6f9310b957254fdcf6596600b7 -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi configure-options = --disable-static --with-libxml-prefix=${libxml2:location} diff --git a/component/libyaml/buildout.cfg b/component/libyaml/buildout.cfg index 2b8e7ce4a09b9dc36dda89e8d0fdc0481b8afa63..83cf625883090fb003b9d7569ad33f255417f61f 100644 --- a/component/libyaml/buildout.cfg +++ b/component/libyaml/buildout.cfg @@ -4,6 +4,6 @@ parts = libyaml [libyaml] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://pyyaml.org/download/libyaml/yaml-0.1.4.tar.gz md5sum = 36c852831d02cf90508c29852361d01b diff --git a/component/logrotate/buildout.cfg b/component/logrotate/buildout.cfg index 4a381cecd0be444288208b9f496f7c68edcf0068..c90499e016d4fb0d53c0eb51458225d8d37fb9cd 100644 --- a/component/logrotate/buildout.cfg +++ b/component/logrotate/buildout.cfg @@ -11,7 +11,7 @@ md5sum = 6beac248c978b767d4bccc1b7eebe6bd filename = ${:_buildout_section_name_} [logrotate] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = https://fedorahosted.org/releases/l/o/logrotate/logrotate-3.7.9.tar.gz md5sum = eeba9dbca62a9210236f4b83195e4ea5 patch-options = -p1 diff --git a/component/lxc/buildout.cfg b/component/lxc/buildout.cfg index 00a5388608fa89a31c948621b54a5bb2f86084b7..455b15656e22171e4ba9fec5ddfc19dc1603d571 100644 --- a/component/lxc/buildout.cfg +++ b/component/lxc/buildout.cfg @@ -32,7 +32,7 @@ download-only = true md5sum = 8d3706a9bd60b6ebfea33998644b1a99 [lxc-0.8] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://lxc.sourceforge.net/download/lxc/lxc-0.8.0-rc2.tar.gz md5sum = 9bd6988542fd7dd198d056ef3a2db9f6 patch-binary = ${patch:location}/bin/patch diff --git a/component/lynx/buildout.cfg b/component/lynx/buildout.cfg index 78d575a0d2d89ad1cb304a84f01adea3c68f7513..634792264e8d0f8581201647bb346a25f83d6177 100644 --- a/component/lynx/buildout.cfg +++ b/component/lynx/buildout.cfg @@ -2,6 +2,6 @@ parts = lynx [lynx] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi md5sum = 124253e635f7c76bdffc47b9d036c812 url = http://lynx.isc.org/lynx2.8.7/lynx2.8.7.tar.gz diff --git a/component/m4/buildout.cfg b/component/m4/buildout.cfg index fb5c48b68ba3da9c9089a92ee22e00b49f004728..a11b9ba8122f848f7f60fbc99c652316d67c81c8 100644 --- a/component/m4/buildout.cfg +++ b/component/m4/buildout.cfg @@ -15,6 +15,6 @@ patch-options = -p1 patches = ${m4-drop.gets.patch:location}/${m4-drop.gets.patch:filename} -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://ftp.gnu.org/gnu/m4/m4-1.4.16.tar.bz2 md5sum = 8a7cef47fecab6272eb86a6be6363b2f diff --git a/component/mariadb/buildout.cfg b/component/mariadb/buildout.cfg index 8a8b2455d906041be856da726d436cdeb0fad4c1..56855588039490846e7772418dae4aa3449b0fad 100644 --- a/component/mariadb/buildout.cfg +++ b/component/mariadb/buildout.cfg @@ -24,7 +24,7 @@ filename = mariadb_5.5_create_system_tables__no_test.patch download-only = true [mariadb] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi version = 5.5.30 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 @@ -61,7 +61,7 @@ environment = [mroonga-mariadb] # mroonga - a storage engine for MySQL. It provides fast fulltext search feature to all MySQL users. # http://mroonga.github.com/ -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://packages.groonga.org/source/mroonga/mroonga-3.02.tar.gz md5sum = b2d1a4abc12030fdbd9064bbb6175366 configure-options = diff --git a/component/membase/buildout.cfg b/component/membase/buildout.cfg index 3fd1e63a4c2766bf5bd747cd8d0f41f7fb15db4c..0f47ec2e59699664c238845d81a47dc3f6fb1dde 100644 --- a/component/membase/buildout.cfg +++ b/component/membase/buildout.cfg @@ -34,7 +34,7 @@ recipe = hexagonit.recipe.download strip-top-level-dir = true [membase-component-common] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi path = ${membase-source:location}/${:component} prefix = ${membase:location} configure-options = diff --git a/component/memcached/buildout.cfg b/component/memcached/buildout.cfg index 5a81e69ce7916e3974a94214ed02458405d6d3ff..5fc99937c0c6e78bf0dbd65abf0f10812b392849 100644 --- a/component/memcached/buildout.cfg +++ b/component/memcached/buildout.cfg @@ -20,7 +20,7 @@ download-only = true md5sum = fd98d0cbfc4d3a25ac9808472fbe62f8 [memcached] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://memcached.googlecode.com/files/memcached-1.4.8.tar.gz md5sum = b7104e269511621c2777367d6d6315fe patches = diff --git a/component/memstrike/buildout.cfg b/component/memstrike/buildout.cfg index 5c7936d604bf76e20d87ae933d00f8f564d56dce..2670e2a0382ceda1c2f7f39c065043d25eec9c17 100644 --- a/component/memstrike/buildout.cfg +++ b/component/memstrike/buildout.cfg @@ -10,7 +10,7 @@ parts = memstrike [memstrike] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi path = ${memstrikesource:location} configure-command = ./bootstrap diff --git a/component/mesa/buildout.cfg b/component/mesa/buildout.cfg index 5e04066cd24693ac1a4ef815a8b957902f0f9f1d..0a44cd1275c4cefe5781adfe8c930f894093b666 100644 --- a/component/mesa/buildout.cfg +++ b/component/mesa/buildout.cfg @@ -7,7 +7,7 @@ parts = [libdrm] #does not seem to compile with -jX -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://dri.freedesktop.org/libdrm/libdrm-2.4.26.tar.bz2 md5sum = 062569426773f69b11a47a7712bba770 configure-options = @@ -18,7 +18,7 @@ environment = [mesa] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = ftp://ftp.freedesktop.org//pub/mesa/7.11/MesaLib-7.11.tar.bz2 md5sum = ff03aca82d0560009a076a87c888cf13 configure-options = diff --git a/component/mydumper/buildout.cfg b/component/mydumper/buildout.cfg index 27cf12032f9b8e81b6b2072826668c529ed34bd3..0ba01a4f73203814a7ed9adafc080e193103a3f8 100644 --- a/component/mydumper/buildout.cfg +++ b/component/mydumper/buildout.cfg @@ -59,10 +59,10 @@ script = call(['make'], cwd=workdir, env=env) call(['make', 'install'], cwd=workdir, env=env) -# XXX-Antoine: here's what I did using hexagonit.recipe.cmmi. +# XXX-Antoine: here's what I did using slapos.recipe.cmmi. # and it wasn't working ! #[mydumper] -#recipe = hexagonit.recipe.cmmi +#recipe = slapos.recipe.cmmi #url = http://launchpad.net/mydumper/0.2/0.2.3/+download/mydumper-0.2.3.tar.gz #md5sum = 36e6a1c97a9634a6882ddaac5e2697d5 #strip-top-level-dir = true diff --git a/component/mysql-5.1/buildout.cfg b/component/mysql-5.1/buildout.cfg index cb4ce4c4a3517b50dbc2604e6aea761133e44a0a..f141b0ad23565fc561007bdf6041ea9bae716b1b 100644 --- a/component/mysql-5.1/buildout.cfg +++ b/component/mysql-5.1/buildout.cfg @@ -29,7 +29,7 @@ filename = mysql_create_system_tables__no_test.patch download-only = true [mysql-5.1] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi version = 5.1.58 url = http://mysql.he.net/Downloads/MySQL-5.1/mysql-${:version}.tar.gz md5sum = ae5aef506088e521e4b1cc4f668e96d2 @@ -74,7 +74,7 @@ environment = LDFLAGS =-L${readline:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${readline:location}/lib [groonga-storage-engine-mysql-5.1] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://github.com/downloads/mroonga/mroonga/groonga-storage-engine-1.0.0.tar.gz md5sum = 289b8b7919e790599ea79b6fe9270e04 configure-options = diff --git a/component/mysql-5.5/buildout.cfg b/component/mysql-5.5/buildout.cfg index 09e61902e403da2690a10ae4ac94a9413696b7e7..8e192cdbc4aaf2dbe501ee0d52e1472afbaeca3a 100644 --- a/component/mysql-5.5/buildout.cfg +++ b/component/mysql-5.5/buildout.cfg @@ -32,7 +32,7 @@ filename = mysql_create_system_tables__no_test.patch download-only = true [mysql-5.5] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi version = 5.5.16 url = http://mysql.he.net/Downloads/MySQL-5.5/mysql-${:version}.tar.gz md5sum = 462ab3752dd666ec06ca32f92673b59e @@ -63,7 +63,7 @@ environment = LDFLAGS=-L${libaio:location}/lib [groonga-storage-engine-mysql-5.5] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://github.com/downloads/mroonga/mroonga/groonga-storage-engine-1.0.0.tar.gz md5sum = 289b8b7919e790599ea79b6fe9270e04 configure-options = diff --git a/component/mysql-tritonn-5.0/buildout.cfg b/component/mysql-tritonn-5.0/buildout.cfg index bdbebd177bc0987f12868542f95b6f3d9569d8ac..542ffc8618d3d36b90569ffaaf77024f98230110 100644 --- a/component/mysql-tritonn-5.0/buildout.cfg +++ b/component/mysql-tritonn-5.0/buildout.cfg @@ -18,7 +18,7 @@ parts = mysql-tritonn-5.0 [senna] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://www.nexedi.org/static/tarballs/senna/senna-r1311.tar.gz md5sum = 1cc51554789f81a9e5208da04a5c2f4c configure-command = @@ -50,7 +50,7 @@ filename = mysql-5.0.87-sphinx-1.10.diff download-only = true [mysql-tritonn-5.0] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://www.nexedi.org/static/tarballs/mysql/mysql-5.0.87.tar.gz md5sum = 65e6229cc98b6a8d4c5206d7fe16c7be # configure: how to avoid searching for my.cnf? diff --git a/component/ncurses/buildout.cfg b/component/ncurses/buildout.cfg index 63dea92837fb3305b67ef0d18aa2ded492126ccb..cb6ccbcdf9fc7b7cd5cf0c430a598153ddeb80d2 100644 --- a/component/ncurses/buildout.cfg +++ b/component/ncurses/buildout.cfg @@ -3,7 +3,7 @@ parts = ncurses [ncurses] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = ftp://ftp.gnu.org/pub/gnu/ncurses/ncurses-5.9.tar.gz md5sum = 8cb9c412e5f2d96bc6f459aa8c6282a1 configure-options = diff --git a/component/neon/buildout.cfg b/component/neon/buildout.cfg index 703dcf87d64e28e2babb589733ff0ffe0f1947a9..ed35739e6f3b51c18feaf3dc95afeafb1891e98a 100644 --- a/component/neon/buildout.cfg +++ b/component/neon/buildout.cfg @@ -8,7 +8,7 @@ extends = ../zlib/buildout.cfg [neon] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://www.webdav.org/neon/neon-0.29.5.tar.gz md5sum = ff369e69ef0f0143beb5626164e87ae2 configure-options = diff --git a/component/nginx/buildout.cfg b/component/nginx/buildout.cfg index 5c49f4ab160a65d1d1be6f86d9ebb7b5039844d2..4349f9ff65295ee0b21eeefc8975af3fd3dd164e 100644 --- a/component/nginx/buildout.cfg +++ b/component/nginx/buildout.cfg @@ -5,7 +5,7 @@ extends = ../openssl/buildout.cfg [nginx] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://nginx.org/download/nginx-1.2.7.tar.gz md5sum = d252f5c689a14a668e241c744ccf5f06 configure-options= diff --git a/component/noVNC/buildout.cfg b/component/noVNC/buildout.cfg index 3903f714f3a5e0a88fd9ca939e13279f8680c6f6..c89220892cf0add8ad00720eeedf3e4effb80b36 100644 --- a/component/noVNC/buildout.cfg +++ b/component/noVNC/buildout.cfg @@ -6,5 +6,5 @@ parts = recipe = hexagonit.recipe.download # Post-0.4 release from January 2013 url = http://github.com/kanaka/noVNC/zipball/3b2acc2258d36137a37edfbe0f03a3099189c49d -md5sum = 0d06abc20e59643e14fefe52b42daf60 +md5sum = a276be8fa193652bb5de8a271603f11f strip-top-level-dir = true diff --git a/component/nodejs/buildout.cfg b/component/nodejs/buildout.cfg index 73d363271573a568d632ac4d5a399bd79cc6d1c2..4b9c2d1cae8e7dab97f1fd72633e8a923fd90a3d 100644 --- a/component/nodejs/buildout.cfg +++ b/component/nodejs/buildout.cfg @@ -13,7 +13,7 @@ parts = [nodejs-0.8] # Server-side Javascript. -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://nodejs.org/dist/v0.8.14/node-v0.8.14.tar.gz md5sum = 284fd2c7578064c339d9cf6a3a475ac7 configure-options = @@ -28,7 +28,7 @@ environment = [nodejs-0.6] # Server-side Javascript. -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://nodejs.org/dist/v0.6.21/node-v0.6.21.tar.gz md5sum = 0da985a0bf820400af92363b9f453fe4 configure-options = @@ -42,7 +42,7 @@ environment = LDFLAGS=-Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib [nodejs-0.4] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://nodejs.org/dist/node-v0.4.12.tar.gz md5sum = a6375eaa43db5356bf443e25b828ae16 configure-options = diff --git a/component/nspr/buildout.cfg b/component/nspr/buildout.cfg index cd027e57ec3177babe129d12b73c7eea9762f641..3fca9a61e1fa2b406399b77a0e203df0b5f15206 100644 --- a/component/nspr/buildout.cfg +++ b/component/nspr/buildout.cfg @@ -9,7 +9,7 @@ md5sum = 7c00beff0475314f59214842509e407f download-only = true [nspr] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.8.7/src/nspr-4.8.7.tar.gz md5sum = 97e30989a56ab813453b71261849c200 patches = ${nspr-pkgconfig-patch-download:location}/${nspr-pkgconfig-patch-download:filename} diff --git a/component/nss/buildout.cfg b/component/nss/buildout.cfg index 99aa83c8747f1ca8d9cbdb79b130b3165b9006f2..6b028ec15d37cd30ed394e17033eab0661dd90a8 100644 --- a/component/nss/buildout.cfg +++ b/component/nss/buildout.cfg @@ -58,7 +58,7 @@ command = rm -rf ${:compile-location} [nss-cmmi] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi path = ${nss-download:location}/mozilla/security/nss configure-command = echo "No need to configure" make-binary = gmake diff --git a/component/nullmailer/buildout.cfg b/component/nullmailer/buildout.cfg index d1120ca52bb9147d3319a7a97219a575aa0d7402..bada16f449d961e163bac75cb0e2f20dc5b529d6 100644 --- a/component/nullmailer/buildout.cfg +++ b/component/nullmailer/buildout.cfg @@ -2,6 +2,6 @@ parts = nullmailer [nullmailer] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://untroubled.org/nullmailer/nullmailer-1.05.tar.gz md5sum = 35124cc05f893efba1310e2ec7c876ff diff --git a/component/ocropus/buildout.cfg b/component/ocropus/buildout.cfg index 1822cbf0e66b42f61cbed49a753aa7eb577055ab..26a53802f16a6f5c2cda16e859cbb4ecc92f87d1 100644 --- a/component/ocropus/buildout.cfg +++ b/component/ocropus/buildout.cfg @@ -9,7 +9,7 @@ url = ${:_profile_base_location_}/${:filename} md5sum = 08710ec022f3ce13e5c0b584dfee2c1c [ocropus] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://www.nexedi.org/static/packages/source/ocropus/ocropus-0.4.4.tar.gz md5sum = 1485dbe9aab27574bfe3c8b4395cf3ce configure-options = @@ -37,7 +37,7 @@ url = ${:_profile_base_location_}/${:filename} md5sum = dbbdf909814fb84ffe47e2ff59980db7 [iulib] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://www.nexedi.org/static/packages/source/ocropus/iulib-0.4.4.tar.gz md5sum = 3d9754dbd64c56029ce1cd7c2f61894c # workaround http://code.google.com/p/iulib/issues/detail?id=27 diff --git a/component/openldap/buildout.cfg b/component/openldap/buildout.cfg index 5b7a9921c62edadc018d9e91f8d215548ca0e76c..b44a7522d82483c00097c6cc6822104ad35562d6 100644 --- a/component/openldap/buildout.cfg +++ b/component/openldap/buildout.cfg @@ -7,7 +7,7 @@ extends = ../cyrus-sasl/buildout.cfg [openldap] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.4.33.tgz md5sum = 5adae44897647c15ce5abbff313bc85a configure-options = diff --git a/component/opensp/buildout.cfg b/component/opensp/buildout.cfg index b85f41b7ebff79dea5e703ad25f3805a2b405a9d..da88db7dbe89fb8e889b9a1b73c38aff37cdfba1 100644 --- a/component/opensp/buildout.cfg +++ b/component/opensp/buildout.cfg @@ -1,6 +1,6 @@ [buildout] [opensp] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://prdownloads.sourceforge.net/openjade/OpenSP-1.5.2.tar.gz md5sum = 670b223c5d12cee40c9137be86b6c39b configure-options = diff --git a/component/openssh/buildout.cfg b/component/openssh/buildout.cfg index 35539184ee7ec75912d06393138dfe4d013faee7..c956d9111552cab87eced82b308ab9c8cf3d34f1 100644 --- a/component/openssh/buildout.cfg +++ b/component/openssh/buildout.cfg @@ -12,7 +12,7 @@ parts = openssh [openssh] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi md5sum = 0541579adf9d55abb15ef927048d372e url = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-5.8p2.tar.gz diff --git a/component/openssl/buildout.cfg b/component/openssl/buildout.cfg index d6afb9fb7dcf0f03b802658834b780614a454229..5dd9667e9d18641c66c04e0abf3657925ac51bc2 100644 --- a/component/openssl/buildout.cfg +++ b/component/openssl/buildout.cfg @@ -28,7 +28,7 @@ filename = ${:_buildout_section_name_} download-only = true [openssl] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = https://www.openssl.org/source/openssl-1.0.1e.tar.gz md5sum = 66bf6f10f060d561929de96f9dfe5b8c patch-binary = ${patch:location}/bin/patch diff --git a/component/patch/buildout.cfg b/component/patch/buildout.cfg index de547105c74666a0fb5c4cb3f5ac15e1815d734e..2f8a988dbdbbf317758604905ab8c22cf4611821 100644 --- a/component/patch/buildout.cfg +++ b/component/patch/buildout.cfg @@ -5,7 +5,7 @@ parts = patch [patch] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = ftp://ftp.gnu.org/gnu/patch/patch-2.7.1.tar.xz md5sum = e9ae5393426d3ad783a300a338c09b72 environment = diff --git a/component/pcre/buildout.cfg b/component/pcre/buildout.cfg index aeebe5020e551afa8f82690641fb1416629cb737..072726fe4d92d4c3bdf4165c378b813439f7209c 100644 --- a/component/pcre/buildout.cfg +++ b/component/pcre/buildout.cfg @@ -3,7 +3,7 @@ parts = pcre [pcre] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.32.tar.bz2 md5sum = 62f02a76bb57a40bc66681760ed511d5 configure-options = diff --git a/component/pdftk/buildout.cfg b/component/pdftk/buildout.cfg index 53efe53cdd1ed92d36cb5668ca12d73f4c3dcc72..3d48981ca928b9bf358a19274abb879a76eed12d 100644 --- a/component/pdftk/buildout.cfg +++ b/component/pdftk/buildout.cfg @@ -24,7 +24,7 @@ md5sum = d2a067b98953ad30ba1230f87dfb8b92 download-only = true [pdftk] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/pdftk-1.44-src.zip md5sum = 9eb50fffcd621a627d387750c60982b4 configure-command = true diff --git a/component/percona-toolkit/buildout.cfg b/component/percona-toolkit/buildout.cfg index 2ca4d3e462a199adf9e03bdbee8175ea3a62432a..0d7dad0cb257e3d2bf25d5c3a0f454f88e533330 100644 --- a/component/percona-toolkit/buildout.cfg +++ b/component/percona-toolkit/buildout.cfg @@ -7,7 +7,7 @@ parts = percona-toolkit [percona-toolkit] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi depends = ${perl:version} version = 2.1.9 diff --git a/component/perl-Class-Accessor/buildout.cfg b/component/perl-Class-Accessor/buildout.cfg index ce510f652d40b9c0418b99a679fea8245d593f92..99245eddb7a2f1541a686ace936b4dd3e945e88b 100644 --- a/component/perl-Class-Accessor/buildout.cfg +++ b/component/perl-Class-Accessor/buildout.cfg @@ -5,7 +5,7 @@ parts = perl-Class-Accessor [perl-Class-Accessor] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi depends = ${perl:version} url = http://search.cpan.org/CPAN/authors/id/K/KA/KASEI/Class-Accessor-0.34.tar.gz diff --git a/component/perl-Config-General/buildout.cfg b/component/perl-Config-General/buildout.cfg index 3a05dba7cd6a3a0b209a4c308ac9a1245b6ac3da..02c209c5e09a7910a3ff13830bbb1518941dc5d5 100644 --- a/component/perl-Config-General/buildout.cfg +++ b/component/perl-Config-General/buildout.cfg @@ -5,7 +5,7 @@ parts = perl-Config-General [perl-Config-General] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi depends = ${perl:version} url = http://search.cpan.org/CPAN/authors/id/T/TL/TLINDEN/Config-General-2.50.tar.gz diff --git a/component/perl-DBD-MySQL/buildout.cfg b/component/perl-DBD-MySQL/buildout.cfg index 8be6ddab2e236de40d2bbb2e6d541fd8bccea604..dc2390599429fee027c0c3b934a3c50c0a894dd5 100644 --- a/component/perl-DBD-MySQL/buildout.cfg +++ b/component/perl-DBD-MySQL/buildout.cfg @@ -7,7 +7,7 @@ parts = perl-DBD-MySQL [perl-DBD-MySQL] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi version = 4.019 depends = ${perl:version} diff --git a/component/perl-DBD-mariadb/buildout.cfg b/component/perl-DBD-mariadb/buildout.cfg index 3a2e2f74add8a20dbd675ce10d982c310f55ad3b..0a7a6dd026bce53c150d361a94e97210ae666347 100644 --- a/component/perl-DBD-mariadb/buildout.cfg +++ b/component/perl-DBD-mariadb/buildout.cfg @@ -7,7 +7,7 @@ parts = perl-DBD-mariadb [perl-DBD-mariadb] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi version = 4.019 # binary library should be rebuilt when perl is updated. depends = diff --git a/component/perl-DBI/buildout.cfg b/component/perl-DBI/buildout.cfg index b02990c2c774ce11a1c9b1933c42ee857927335b..15c31e568c1f8899df210248fd1017fb150e8393 100644 --- a/component/perl-DBI/buildout.cfg +++ b/component/perl-DBI/buildout.cfg @@ -5,7 +5,7 @@ parts = perl-DBI [perl-DBI] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi version = 1.616 # binary library should be rebuilt when perl is updated. depends = diff --git a/component/perl-Encode-HanExtra/buildout.cfg b/component/perl-Encode-HanExtra/buildout.cfg index 2e88fa5aaf6c11468f1d4705b172370b89044e22..29f73f973ef059cf54a76282bf414a1eca5825bc 100644 --- a/component/perl-Encode-HanExtra/buildout.cfg +++ b/component/perl-Encode-HanExtra/buildout.cfg @@ -5,7 +5,7 @@ parts = perl-Encode-HanExtra [perl-Encode-HanExtra] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi # binary library should be rebuilt when perl is updated. depends = ${perl:version} diff --git a/component/perl-HTML-Encoding/buildout.cfg b/component/perl-HTML-Encoding/buildout.cfg index f417aa5c94fa89642ac39d15723ea2acc9459502..6468f2f28e006e9a0b5ea2f73f207a0dd987b2f8 100644 --- a/component/perl-HTML-Encoding/buildout.cfg +++ b/component/perl-HTML-Encoding/buildout.cfg @@ -5,7 +5,7 @@ parts = perl-HTML-Encoding [perl-HTML-Encoding] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi depends = ${perl:version} url = http://search.cpan.org/CPAN/authors/id/B/BJ/BJOERN/HTML-Encoding-0.61.tar.gz diff --git a/component/perl-HTML-Parser/buildout.cfg b/component/perl-HTML-Parser/buildout.cfg index 2478122672e9713b10d8a185e7d9d97794f9b4de..4ae218c03c8b17466501bcffc6a39122ec85dad6 100644 --- a/component/perl-HTML-Parser/buildout.cfg +++ b/component/perl-HTML-Parser/buildout.cfg @@ -6,7 +6,7 @@ parts = perl-HTML-Parser [perl-HTML-Parser] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi # binary library should be rebuilt when perl is updated. depends = ${perl:version} diff --git a/component/perl-HTML-Tagset/buildout.cfg b/component/perl-HTML-Tagset/buildout.cfg index f5e55b5dcf939b6d453f7c90ff97f200020d1337..b703fd05882c4e311076bd91572b1306374cd0a2 100644 --- a/component/perl-HTML-Tagset/buildout.cfg +++ b/component/perl-HTML-Tagset/buildout.cfg @@ -5,7 +5,7 @@ parts = perl-HTML-Tagset [perl-HTML-Tagset] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi depends = ${perl:version} url = http://search.cpan.org/CPAN/authors/id/P/PE/PETDANCE/HTML-Tagset-3.20.tar.gz diff --git a/component/perl-HTML-Template/buildout.cfg b/component/perl-HTML-Template/buildout.cfg index 52b3b902d36e875de73cfd8e5c94dc61981a0d3a..93dc7ce6c7efff84b229c57e25dd1fd415f51362 100644 --- a/component/perl-HTML-Template/buildout.cfg +++ b/component/perl-HTML-Template/buildout.cfg @@ -5,7 +5,7 @@ parts = perl-HTML-Template [perl-HTML-Template] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi depends = ${perl:version} url = http://search.cpan.org/CPAN/authors/id/S/SA/SAMTREGAR/HTML-Template-2.9.tar.gz diff --git a/component/perl-Image-Magick/buildout.cfg b/component/perl-Image-Magick/buildout.cfg index 2afdf95cc447c54b565f60c97a8c3cd7f8a381f7..ae5b81d88da145cad629bd60510b2003426c1cd0 100644 --- a/component/perl-Image-Magick/buildout.cfg +++ b/component/perl-Image-Magick/buildout.cfg @@ -12,7 +12,7 @@ download-only = true filename = ${:_buildout_section_name_} [perl-Image-Magick] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi depends = ${perl:version} ${imagemagick:location} diff --git a/component/perl-JSON/buildout.cfg b/component/perl-JSON/buildout.cfg index f68387177efe0a883a09eefcbf120038754f2e3d..f0d0bc765a6839972d672217b7e1a6731db84daa 100644 --- a/component/perl-JSON/buildout.cfg +++ b/component/perl-JSON/buildout.cfg @@ -5,7 +5,7 @@ parts = perl-JSON [perl-JSON] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi depends = ${perl:version} url = http://search.cpan.org/CPAN/authors/id/M/MA/MAKAMAKA/JSON-2.50.tar.gz diff --git a/component/perl-Net-IP/buildout.cfg b/component/perl-Net-IP/buildout.cfg index 1c2f6ac6c81861246e3e0427a41ee22c16363d1b..16f748c658f34aa0631462f2523f3d2369b89d09 100644 --- a/component/perl-Net-IP/buildout.cfg +++ b/component/perl-Net-IP/buildout.cfg @@ -5,7 +5,7 @@ parts = perl-Net-IP [perl-Net-IP] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi depends = ${perl:version} url = http://search.cpan.org/CPAN/authors/id/M/MA/MANU/Net-IP-1.25.tar.gz diff --git a/component/perl-SGML-Parser-OpenSP/buildout.cfg b/component/perl-SGML-Parser-OpenSP/buildout.cfg index dfb3e32920d1e25f572ae0f30aba8ccbe75afe2e..a5cae4e47fedce0030db2edb501184e360499234 100644 --- a/component/perl-SGML-Parser-OpenSP/buildout.cfg +++ b/component/perl-SGML-Parser-OpenSP/buildout.cfg @@ -7,7 +7,7 @@ parts = perl-SGML-Parser-OpenSP [perl-SGML-Parser-OpenSP] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi # binary library should be rebuilt when perl is updated. depends = ${perl:version} @@ -16,7 +16,8 @@ depends = url = http://search.cpan.org/CPAN/authors/id/B/BJ/BJOERN/SGML-Parser-OpenSP-0.994.tar.gz md5sum = b1ee0244e9daa4d37f28cf32c4753691 configure-command = - ${perl:location}/bin/perl Makefile.PL + ${perl:location}/bin/perl Makefile.PL \ + INC=-I${opensp:location}/include \ + LIBS="-lstdc++ -L${opensp:location}/lib -losp" make-options = - INC=-I${opensp:location}/include - OTHERLDFLAGS="-L${opensp:location}/lib -Wl,-rpath=${opensp:location}/lib" + OTHERLDFLAGS="-Wl,-rpath=${opensp:location}/lib" diff --git a/component/perl-Term-ReadLine-Gnu/buildout.cfg b/component/perl-Term-ReadLine-Gnu/buildout.cfg index e9eb4bb341dcede542122ddc4c310aaa61a4d18b..c7858a60922ddea72096756d470a50a58cd4e1f7 100644 --- a/component/perl-Term-ReadLine-Gnu/buildout.cfg +++ b/component/perl-Term-ReadLine-Gnu/buildout.cfg @@ -13,7 +13,7 @@ download-only = true filename = ${:_buildout_section_name_} [perl-Term-ReadLine-Gnu] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi depends = ${perl:version} url = http://search.cpan.org/CPAN/authors/id/H/HA/HAYASHI/Term-ReadLine-Gnu-1.20.tar.gz diff --git a/component/perl-URI/buildout.cfg b/component/perl-URI/buildout.cfg index 80a524d711770fa32222bc3e3992c7a853bcd504..4658975ce58cd2708c9d02a8d6de6efd41b8a81a 100644 --- a/component/perl-URI/buildout.cfg +++ b/component/perl-URI/buildout.cfg @@ -5,7 +5,7 @@ parts = perl-URI [perl-URI] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi depends = ${perl:version} url = http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/URI-1.58.tar.gz diff --git a/component/perl-XML-LibXML/buildout.cfg b/component/perl-XML-LibXML/buildout.cfg index f1f8ee6730e4d92b78ea4711ba2b1c69313ab573..a5e596170f04cfc1962f34607c55339200388d34 100644 --- a/component/perl-XML-LibXML/buildout.cfg +++ b/component/perl-XML-LibXML/buildout.cfg @@ -9,7 +9,7 @@ parts = perl-XML-LibXML [perl-XML-LibXML] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi # binary library should be rebuilt when perl is updated. depends = ${perl:version} diff --git a/component/perl-XML-NamespaceSupport/buildout.cfg b/component/perl-XML-NamespaceSupport/buildout.cfg index a59c5add9bbbdf7bdb3aaeee3e981a56aa167e3e..31604d1760c05d3f1e1fe1888a96f388deb89b38 100644 --- a/component/perl-XML-NamespaceSupport/buildout.cfg +++ b/component/perl-XML-NamespaceSupport/buildout.cfg @@ -5,7 +5,7 @@ parts = perl-XML-NamespaceSupport [perl-XML-NamespaceSupport] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi depends = ${perl:version} url = http://search.cpan.org/CPAN/authors/id/P/PE/PERIGRIN/XML-NamespaceSupport-1.11.tar.gz diff --git a/component/perl-XML-Parser/buildout.cfg b/component/perl-XML-Parser/buildout.cfg index b70813f62d065577b5c52dfb3ccdf8e5320a8296..3b1740dc661aa3169c808f36386824be759f5bb3 100644 --- a/component/perl-XML-Parser/buildout.cfg +++ b/component/perl-XML-Parser/buildout.cfg @@ -9,7 +9,7 @@ parts = perl-XML-Parser [perl-XML-Parser] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi depends = ${perl:version} ${perl-libwww-perl:location} diff --git a/component/perl-XML-SAX/buildout.cfg b/component/perl-XML-SAX/buildout.cfg index 664d6496bb5b7cdef290c6e2f43b9f35d3424858..8001f78f1c8ca378b13d4d90f94cb2389f3ea667 100644 --- a/component/perl-XML-SAX/buildout.cfg +++ b/component/perl-XML-SAX/buildout.cfg @@ -6,7 +6,7 @@ parts = perl-XML-SAX [perl-XML-SAX] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi depends = ${perl:version} ${perl-XML-NamespaceSupport:location} diff --git a/component/perl-libwww-perl/buildout.cfg b/component/perl-libwww-perl/buildout.cfg index 4135212b1b1a8d2fe745217a8c573b7a8ca630cd..92e62c62233c5851e4a56b5d0b428f87da0c81fd 100644 --- a/component/perl-libwww-perl/buildout.cfg +++ b/component/perl-libwww-perl/buildout.cfg @@ -6,7 +6,7 @@ parts = perl-libwww-perl [perl-libwww-perl] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi depends = ${perl:version} ${perl-HTML-Parser:location} diff --git a/component/perl/buildout.cfg b/component/perl/buildout.cfg index b8667880dcdb1a4de9e4e8e75e18e06c385f3d95..1414d935c6690093faee9d0d6b3d706a353fcbe6 100644 --- a/component/perl/buildout.cfg +++ b/component/perl/buildout.cfg @@ -20,12 +20,12 @@ download-only = true filename = create-libs-symlink.py [perl] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi depends = ${gdbm:version} version = 5.16.3 # increase revision when we need to rebuild binary libraries. -revision = 1 +revision = 2 url = http://www.cpan.org/src/5.0/perl-${:version}.tar.bz2 md5sum = 025102de0e4a597cf541e57da80c6aa3 siteprefix = ${buildout:parts-directory}/site_${:_buildout_section_name_} diff --git a/component/phantomjs/buildout.cfg b/component/phantomjs/buildout.cfg new file mode 100644 index 0000000000000000000000000000000000000000..a94d213cf8735d53a1d8064136be7c3cf2078cef --- /dev/null +++ b/component/phantomjs/buildout.cfg @@ -0,0 +1,35 @@ +[buildout] +extends = + ../fontconfig/buildout.cfg + ../libexpat/buildout.cfg + ../dash/buildout.cfg +parts = + phantomjs + +[phantomjs] +recipe = slapos.recipe.build +slapos_promise = + file:phantomjs-slapos + +depends = + ${liberation-fonts:location} + ${ipaex-fonts:location} + +x86 = https://phantomjs.googlecode.com/files/phantomjs-1.9.0-linux-i686.tar.bz2 2e94dcad7660d24309abe01011461693 +x86-64 = https://phantomjs.googlecode.com/files/phantomjs-1.9.0-linux-x86_64.tar.bz2 8075fa873d8741c7ae9093c80a589a1f + +script = + if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ') + extract_dir = self.extract(self.download(self.options['url'], self.options.get('md5sum'))) + workdir = guessworkdir(extract_dir) + self.copyTree(workdir, "%(location)s") + wrapper_location = os.path.join("%(location)s", "phantomjs-slapos") + wrapper = open(wrapper_location, 'w') + wrapper.write("""#!${dash:location}/bin/dash + cd %(location)s + export LD_LIBRARY_PATH=%(location)s:${freetype:location}/lib/:${fontconfig:location}/lib/:${libexpat:location}/lib + export PATH=${fontconfig:location}/bin:$PATH + exec %(location)s/bin/phantomjs $*""") + wrapper.flush() + wrapper.close() + os.chmod(wrapper_location, 0755) \ No newline at end of file diff --git a/component/pkgconfig/buildout.cfg b/component/pkgconfig/buildout.cfg index e96bace6bc8766bdd6ef73db8c6df9d499346ab9..5ed2d9e3ddb9c4127fe453a006b5cb17db5b9045 100644 --- a/component/pkgconfig/buildout.cfg +++ b/component/pkgconfig/buildout.cfg @@ -13,7 +13,7 @@ extends = <= pkgconfig [pkgconfig] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://pkgconfig.freedesktop.org/releases/pkg-config-0.27.1.tar.gz md5sum = 5392b4e3372879c5bf856173b418d6a2 location = ${buildout:parts-directory}/${:_buildout_section_name_} diff --git a/component/poppler/buildout.cfg b/component/poppler/buildout.cfg index b11b5ed8e4c33a55173a0bc8163570ead16b0cde..4cad1a184013829e1d10ca3263d44b9fb9a8a6ba 100644 --- a/component/poppler/buildout.cfg +++ b/component/poppler/buildout.cfg @@ -12,7 +12,7 @@ extends = ../zlib/buildout.cfg [poppler] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi md5sum = 3939740201c59c470bc7198003450a20 url = http://poppler.freedesktop.org/poppler-0.22.2.tar.gz depends = diff --git a/component/popt/buildout.cfg b/component/popt/buildout.cfg index 9796a971fcfcb0c8c80daabb4283b7494b506162..88c0dfd6b0c424085859c850dfabe672ed21ac23 100644 --- a/component/popt/buildout.cfg +++ b/component/popt/buildout.cfg @@ -3,7 +3,7 @@ parts = popt [popt] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = ftp://anduin.linuxfromscratch.org/BLFS/svn/p/popt-1.16.tar.gz md5sum = 3743beefa3dd6247a73f8f7a32c14c33 configure-options = diff --git a/component/postfix/buildout.cfg b/component/postfix/buildout.cfg index cd5151bfae4aee3c68be04931f4e9171075b4cd4..8b67b7e57f2fca693e25a7719d54c5ffc6416901 100644 --- a/component/postfix/buildout.cfg +++ b/component/postfix/buildout.cfg @@ -10,7 +10,7 @@ extends = parts = postfix [postfix] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-2.8.3.tar.gz md5sum = b3922ededd3fd6051f759e58a4ada3ae location = ${buildout:parts-directory}/${:_buildout_section_name_} diff --git a/component/postgresql/buildout.cfg b/component/postgresql/buildout.cfg index 4e2a64ec7dbb02a23e18ebd50e14602126cdc4d1..7218190c73e8a244959a2c190cb379bf8c5b481c 100644 --- a/component/postgresql/buildout.cfg +++ b/component/postgresql/buildout.cfg @@ -13,7 +13,7 @@ parts = postgresql [postgresql91] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://ftp.postgresql.org/pub/source/v9.1.9/postgresql-9.1.9.tar.bz2 md5sum = 6b5ea53dde48fcd79acfc8c196b83535 configure-options = --with-openssl --with-perl @@ -23,7 +23,7 @@ environment = [postgresql92] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://ftp.postgresql.org/pub/source/v9.2.4/postgresql-9.2.4.tar.bz2 md5sum = 6ee5bb53b97da7c6ad9cb0825d3300dd configure-options = --with-openssl diff --git a/component/pwgen/buildout.cfg b/component/pwgen/buildout.cfg index e7ad653d02f7fe96df5f6fe49cd1c6c98a1be3cf..cb92fb3ca9369459423e5f1a0bb3b69cfe887c80 100644 --- a/component/pwgen/buildout.cfg +++ b/component/pwgen/buildout.cfg @@ -3,6 +3,6 @@ parts = pwgen [pwgen] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://downloads.sourceforge.net/project/pwgen/pwgen/2.06/pwgen-2.06.tar.gz md5sum = 935aebcbe610fbc9de8125e7b7d71297 diff --git a/component/python-2.4/buildout.cfg b/component/python-2.4/buildout.cfg index 3146a685edecb769a3c64ca7999e996a4f356cf6..7f6de0ac467dbe5dea67682a384b0dde40a64883 100644 --- a/component/python-2.4/buildout.cfg +++ b/component/python-2.4/buildout.cfg @@ -35,7 +35,7 @@ download-only = true filename = python2.4-backport-CPPFLAGS-setup-from-python2.6.patch [python2.4] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi # This is actually the default setting for prefix, but we can't use it in # other settings in this part if we don't set it explicitly here. prefix = ${buildout:parts-directory}/${:_buildout_section_name_} diff --git a/component/python-2.6/buildout.cfg b/component/python-2.6/buildout.cfg index d446d5c33d689b4778363a41928b9390ecdced4b..7976b6d0aefa1a98fa569fff944fc4eb8ea1edde 100644 --- a/component/python-2.6/buildout.cfg +++ b/component/python-2.6/buildout.cfg @@ -24,7 +24,7 @@ download-only = true filename = python-2.6.6-no_system_inc_dirs.patch [python2.6] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi depends = ${gdbm:version} # This is actually the default setting for prefix, but we can't use it in diff --git a/component/python-2.7/buildout.cfg b/component/python-2.7/buildout.cfg index 88985f8c41d139ee7bcfb4eef2085510024a8c0f..ff6df22fa894b1259075b4f71f04a45fe71f69c1 100644 --- a/component/python-2.7/buildout.cfg +++ b/component/python-2.7/buildout.cfg @@ -24,10 +24,10 @@ arguments = sys.argv[1:] + ["bootstrap"] python = python2.7 [python2.7] -recipe = hexagonit.recipe.cmmi -package_version = 2.7.3 +recipe = slapos.recipe.cmmi +package_version = 2.7.4 package_version_suffix = -md5sum = c57477edd6d18bd9eeca2f21add73919 +md5sum = 62704ea0f125923208d84ff0568f7d50 depends = ${gdbm:version} diff --git a/component/python-setuptools/buildout.cfg b/component/python-setuptools/buildout.cfg index 8a1b96f1ad3eb0568e7dd9fda616728b23eaf20c..ce7b958684cb6499697637143073d26ce9b06516 100644 --- a/component/python-setuptools/buildout.cfg +++ b/component/python-setuptools/buildout.cfg @@ -7,6 +7,7 @@ download-only = true filename = setuptools-0.6c11-py2.7.egg url = http://pypi.python.org/packages/2.7/s/setuptools/${:filename} md5sum = fe1f997bc722265116870bc7919059ea +mode = 0644 [python-setuptools] # Hack to manually install setuptools outside of the Buildout environment. @@ -19,4 +20,5 @@ environment = export PATH=${python2.7:location}/bin:$PATH; export PYTHONPATH=${: stop-on-error = true recipe = plone.recipe.command update = true -command = ${:environment} (mkdir ${:location}; sh ${setuptools-download:location}/${setuptools-download:filename} --install-dir ${:location}) || (rm -fr ${:location}; exit 1) +# 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) diff --git a/component/qemu-kvm/buildout.cfg b/component/qemu-kvm/buildout.cfg index b9d759d1f06ce07bdcc7c79eb0386619c0ec7b3f..9bcab08d1fd5f37e3601ec69ec14d1ee26b4420c 100644 --- a/component/qemu-kvm/buildout.cfg +++ b/component/qemu-kvm/buildout.cfg @@ -3,6 +3,7 @@ extends = ../../component/gnutls/buildout.cfg ../../component/libpng/buildout.cfg ../../component/libuuid/buildout.cfg + ../../component/xorg/buildout.cfg ../../component/zlib/buildout.cfg [kvm] @@ -10,10 +11,12 @@ extends = <= qemu-kvm [qemu-kvm] -recipe = hexagonit.recipe.cmmi -url = http://downloads.sourceforge.net/project/kvm/qemu-kvm/1.2.0/qemu-kvm-1.2.0.tar.gz -md5sum = d7b18b673c48abfee65a9c0245df0415 +recipe = slapos.recipe.cmmi +# qemu-kvm and qemu are now the same since 1.3. +url = http://wiki.qemu-project.org/download/qemu-1.4.1.tar.bz2 +md5sum = eb2d696956324722b5ecfa46e41f9a75 configure-options = + --target-list="" --disable-sdl --disable-xen --enable-vnc-tls @@ -24,9 +27,11 @@ configure-options = --disable-docs --enable-vnc-png --disable-vnc-jpeg + --enable-vnc-ws --extra-cflags="-I${gnutls:location}/include -I${libuuid:location}/include -I${zlib:location}/include -I${libpng:location}/include" --extra-ldflags="-Wl,-rpath -Wl,${glib:location}/lib -L${glib:location}/lib -Wl,-rpath -Wl,${gnutls:location}/lib -L${gnutls:location}/lib -Wl,-rpath -Wl,${gpg-error:location}/lib -L${gpg-error:location}/lib -L${gettext:location}/lib -Wl,-rpath -Wl,${gettext:location}/lib -Wl,-rpath -Wl,${libpng:location}/lib -L${libpng:location}/lib -L${libuuid:location}/lib -Wl,-rpath -Wl,${libuuid:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -lpng -lz -lgnutls" --disable-werror environment = PATH=${pkgconfig:location}/bin:%(PATH)s - PKG_CONFIG_PATH=${gnutls:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig + PKG_CONFIG_PATH=${gnutls:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig + diff --git a/component/readline/buildout.cfg b/component/readline/buildout.cfg index 4210e38ad834bea15d6ddccd7f8466b1476f5a6f..c0672f0a66fe9b7837f51d451ebb24df34d446f9 100644 --- a/component/readline/buildout.cfg +++ b/component/readline/buildout.cfg @@ -5,7 +5,7 @@ parts = # readline-5.x is still used for GPL2 only softwares. [readline5] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://ftp.gnu.org/gnu/readline/readline-5.2.tar.gz md5sum = e39331f32ad14009b9ff49cc10c5e751 configure-options = @@ -13,7 +13,7 @@ configure-options = --disable-static [readline] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://ftp.gnu.org/gnu/readline/readline-6.2.tar.gz md5sum = 67948acb2ca081f23359d0256e9a271c configure-options = diff --git a/component/rsync/buildout.cfg b/component/rsync/buildout.cfg index 127a852cf77fd152aa861662fb3e459ff9eac16a..07a5fb4c11e696648a48f4f61652868ee798cdd0 100644 --- a/component/rsync/buildout.cfg +++ b/component/rsync/buildout.cfg @@ -3,7 +3,7 @@ parts = rsync [rsync] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://rsync.samba.org/ftp/rsync/src/rsync-3.0.9.tar.gz md5sum = 5ee72266fe2c1822333c407e1761b92b make-options = diff --git a/component/ruby/buildout.cfg b/component/ruby/buildout.cfg index 4d8e6c48ff74240c305afead59a8e6186ce230c0..bb8ac7123705817b2979c4e55e530115f8f24dea 100644 --- a/component/ruby/buildout.cfg +++ b/component/ruby/buildout.cfg @@ -11,7 +11,7 @@ extends = parts = ruby [ruby-1.9.3] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.3-p194.tar.gz md5sum = bc0c715c69da4d1d8bd57069c19f6c0e configure-options = diff --git a/component/sed/buildout.cfg b/component/sed/buildout.cfg index a195db3991e85ff2248fa9ba0309d68e1d985abc..c8dd2eedc1250cc591ebb0c16fdf615b7264895c 100644 --- a/component/sed/buildout.cfg +++ b/component/sed/buildout.cfg @@ -3,7 +3,7 @@ parts = sed [sed] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = ftp://ftp.gnu.org/gnu/sed/sed-4.2.1.tar.gz md5sum = f0fd4d7da574d4707e442285fd2d3b86 environment = diff --git a/component/serf/buildout.cfg b/component/serf/buildout.cfg index 62cefa3cd7090fbed316bf4676e9e2646804bf00..576c95dc498955b0bb3bae776d6b6f02e6595bec 100644 --- a/component/serf/buildout.cfg +++ b/component/serf/buildout.cfg @@ -8,7 +8,7 @@ extends = ../zlib/buildout.cfg [serf] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://serf.googlecode.com/files/serf-0.7.0.tar.gz md5sum = 3233f22a5875320da7bdc854d0873080 configure-options = diff --git a/component/sheepstrike/buildout.cfg b/component/sheepstrike/buildout.cfg index ff37b693059f37164432a340dc34f14e601def29..844a3da616bb9300ebebf520eedee20b9663143c 100644 --- a/component/sheepstrike/buildout.cfg +++ b/component/sheepstrike/buildout.cfg @@ -2,7 +2,7 @@ parts = sheepstrike [sheepstrike] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = https://gitorious.org/sheepstrike/sheepstrike/archive-tarball/0.1 md5sum = 2c5009eb7c32d7ba5d270d0b88d7e5ab prefix = ${buildout:parts-directory}/${:_buildout_section_name_} diff --git a/component/shellinabox/buildout.cfg b/component/shellinabox/buildout.cfg index 55c2e6b1771065f06aedc771688dceffc1a0b729..a21078a99e2d81c0525709742141a46105af10a5 100644 --- a/component/shellinabox/buildout.cfg +++ b/component/shellinabox/buildout.cfg @@ -20,7 +20,7 @@ url = ${:_profile_base_location_}/${:filename} download-only = true [shellinabox] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://shellinabox.googlecode.com/files/shellinabox-2.10.tar.gz md5sum = 0e144910d85d92edc54702ab9c46f032 environment = diff --git a/component/slapos/buildout.cfg b/component/slapos/buildout.cfg index 574888fc2396f704500a8f7538bbf8b993899b1b..4a6303b2ddcfddf340c63b473451e2025845313a 100644 --- a/component/slapos/buildout.cfg +++ b/component/slapos/buildout.cfg @@ -131,54 +131,44 @@ scripts = py # Use our own buildout version zc.buildout = 1.6.0-dev-SlapOS-010 -# Don't use beta -lxml = 3.0.2 +# Force to use zc.recipe.egg 1.x +zc.recipe.egg = 1.3.2 + +# Use own version of h.r.download to be able to open archives not supported by python2.x: .xz +hexagonit.recipe.download = 1.6nxd002 Jinja2 = 2.6 Werkzeug = 0.8.3 buildout-versions = 1.7 -collective.recipe.template = 1.9 -hexagonit.recipe.cmmi = 1.6 +collective.recipe.template = 1.10 +lxml = 3.1.2 meld3 = 0.6.10 netaddr = 0.7.10 -slapos.core = 0.35 slapos.libnetworkcache = 0.13.3 xml-marshaller = 0.9.7 z3c.recipe.scripts = 1.0.1 -zc.recipe.egg = 1.3.2 # Required by: -# slapos.core==0.35 +# slapos.core==0.35.2-dev Flask = 0.9 # Required by: -# hexagonit.recipe.cmmi==1.6 -hexagonit.recipe.download = 1.6nxd002 - -# Required by: -# slapos.core==0.35 +# slapos.core==0.35.2-dev netifaces = 0.8 # Required by: -# slapos.core==0.35 -pyflakes = 0.6.1 - -# Required by: -# slapos.core==0.35 +# slapos.core==0.35.2-dev # slapos.libnetworkcache==0.13.3 # supervisor==3.0b1 # zc.buildout==1.6.0-dev-SlapOS-010 -# zope.interface==4.0.3 +# zope.interface==4.0.5 setuptools = 0.6c12dev-r88846 # Required by: -# slapos.core==0.35 +# slapos.core==0.35.2-dev supervisor = 3.0b1 # Required by: -# slapos.core==0.35 -unittest2 = 0.5.1 +# slapos.core==0.35.2-dev +zope.interface = 4.0.5 -# Required by: -# slapos.core==0.35 -zope.interface = 4.0.3 diff --git a/component/sphinx/buildout.cfg b/component/sphinx/buildout.cfg index c4ece92a892ed429492e0409ecee03b8d2b4c248..5b36399b86ab7246c743f09c61d9a0928c1db2f5 100644 --- a/component/sphinx/buildout.cfg +++ b/component/sphinx/buildout.cfg @@ -17,7 +17,7 @@ download-only = true filename = sphinx-1.10-beta-snowball.patch [sphinx] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi depends = ${mariadb:version} url = http://sphinxsearch.com/files/sphinx-2.0.5-release.tar.gz diff --git a/component/sqlite3/buildout.cfg b/component/sqlite3/buildout.cfg index 2052834215e5fc51eaec663e4da3ebe74dc3d6bd..64767df1a6b282b4062aeaf4cccd5fe0c690c99b 100644 --- a/component/sqlite3/buildout.cfg +++ b/component/sqlite3/buildout.cfg @@ -4,7 +4,7 @@ parts = sqlite3 [sqlite3] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://www.sqlite.org/2013/sqlite-autoconf-3071601.tar.gz md5sum = 8860d1a1ed26d40f07e3c7ae035b644a configure-options = diff --git a/component/stunnel/buildout.cfg b/component/stunnel/buildout.cfg index 74776b1fb2f43deae0a2bc08305e7993c2b0d70e..8508d5bcb2c4ed7f6a1f661aebe4b994fcf21f13 100644 --- a/component/stunnel/buildout.cfg +++ b/component/stunnel/buildout.cfg @@ -6,7 +6,7 @@ parts = [stunnel] <= stunnel-4 -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi [stunnel-4-hook-download] recipe = hexagonit.recipe.download @@ -16,7 +16,7 @@ download-only=true filename = stunnel-4-hooks.py [stunnel-4] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = ftp://ftp.stunnel.org/stunnel/archive/4.x/stunnel-4.55.tar.gz md5sum = ebe6670368d30c6a01ca33b9c50cb239 pre-configure-hook = ${stunnel-4-hook-download:location}/${stunnel-4-hook-download:filename}:pre_configure_hook diff --git a/component/subversion/buildout.cfg b/component/subversion/buildout.cfg index 5e384d7528346443e01d349dccd58dfaaf84cf5a..a7ad98d929cbd36813c04861120df54b63bcec80 100644 --- a/component/subversion/buildout.cfg +++ b/component/subversion/buildout.cfg @@ -24,7 +24,7 @@ url = ${:_profile_base_location_}/${:filename} md5sum = 8d911ec2422dc4c08a00693ac915a07a [subversion] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://subversion.tigris.org/downloads/subversion-1.6.17.tar.bz2 md5sum = 81e5dc5beee4b3fc025ac70c0b6caa14 patches = diff --git a/component/swig/buildout.cfg b/component/swig/buildout.cfg index ac24ca5f0a82ef92fafa2ce9bb9fc4bce85e3ad8..3a31b1ebeddaecde333c80042d63d0baa48f3508 100644 --- a/component/swig/buildout.cfg +++ b/component/swig/buildout.cfg @@ -8,7 +8,7 @@ parts = swig [swig] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://downloads.sourceforge.net/project/swig/swig/swig-1.3.40/swig-1.3.40.tar.gz md5sum = 2df766c9e03e02811b1ab4bba1c7b9cc configure-options = diff --git a/component/tar/buildout.cfg b/component/tar/buildout.cfg index 860902e1061b575323950191fba7ad9f420fa587..faf7082412159a47734450665ed0065cf7fdec19 100644 --- a/component/tar/buildout.cfg +++ b/component/tar/buildout.cfg @@ -15,7 +15,7 @@ patch-options = -p1 patches = ${tar-drop.gets.patch:location}/${tar-drop.gets.patch:filename} -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://ftp.gnu.org/gnu/tar/tar-1.26.tar.gz md5sum = 00d1e769c6af702c542cca54b728920d environment = diff --git a/component/tesseract/buildout.cfg b/component/tesseract/buildout.cfg index 765b87d0edd23b2ffeb30f34192bf415ce543e35..64a35af7b5e6e34671b6707bc96a91150a744c3f 100644 --- a/component/tesseract/buildout.cfg +++ b/component/tesseract/buildout.cfg @@ -23,7 +23,7 @@ filename = ${:_buildout_section_name_} md5sum = 2e691858cb492b7c17d23bf0912b3d24 [tesseract] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://tesseract-ocr.googlecode.com/files/tesseract-3.01.tar.gz md5sum = 1ba496e51a42358fb9d3ffe781b2d20a patch-options = diff --git a/component/tokyocabinet/buildout.cfg b/component/tokyocabinet/buildout.cfg index 846761fb1d1a7c3b8a40f913d3642dbf83a7d736..245b7c4cf157744d18c752210d8b7d848c20b51e 100644 --- a/component/tokyocabinet/buildout.cfg +++ b/component/tokyocabinet/buildout.cfg @@ -5,7 +5,7 @@ extends = parts = tokyocabinet [tokyocabinet] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://fallabs.com/tokyocabinet/tokyocabinet-1.4.46.tar.gz md5sum = 341dadd1f3d68760e350f7e731111786 diff --git a/component/varnish/buildout.cfg b/component/varnish/buildout.cfg index 199a3622fb35917e034f530627da54e7584bb243..e329aaf5f5e85d33af1063086263195c19dbe83a 100644 --- a/component/varnish/buildout.cfg +++ b/component/varnish/buildout.cfg @@ -15,7 +15,7 @@ extends = <= varnish-2.0 [varnish-2.0] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://sourceforge.net/projects/varnish/files/varnish/2.0.6/varnish-2.0.6.tar.gz/download md5sum = d91dc21c636db61c69b5e8f061c5bb95 configure-options = @@ -25,7 +25,7 @@ environment = LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib [varnish-2.1] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://repo.varnish-cache.org/source/varnish-2.1.5.tar.gz md5sum = 2d2f227da36a2a240c475304c717b8e3 configure-options = diff --git a/component/w3m/buildout.cfg b/component/w3m/buildout.cfg index 3fc97f224a92ec045da9bb5f3e22566cc825ecae..c170777fa9d5530a42e54bb305954656c7b6c29a 100644 --- a/component/w3m/buildout.cfg +++ b/component/w3m/buildout.cfg @@ -20,7 +20,7 @@ md5sum = 75422a6f7f671b3a6d9add6724cc0945 virtual-depend = ${w3m-w3m.gcc.forward.compat.patch:md5sum} -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi md5sum = 1b845a983a50b8dec0169ac48479eacc url = http://downloads.sourceforge.net/project/w3m/w3m/w3m-0.5.3/w3m-0.5.3.tar.gz configure-options = diff --git a/component/webp/buildout.cfg b/component/webp/buildout.cfg index fc7fa51e82597b42cba4a59742213c1cc22ecdca..e805ba60d4d42fffd2729788aaf8776e27142e8e 100644 --- a/component/webp/buildout.cfg +++ b/component/webp/buildout.cfg @@ -9,7 +9,7 @@ extends = ../libpng/buildout.cfg [webp] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = https://webp.googlecode.com/files/libwebp-0.1.3.tar.gz md5sum = 254d4670e14e9ed881f0536b006ab336 configure-options = diff --git a/component/wget/buildout.cfg b/component/wget/buildout.cfg index 32729eb28bd0cbc649923ed13ebaefde3d4927d3..b203b646e28e7f0fd999f115038a678bab21368d 100644 --- a/component/wget/buildout.cfg +++ b/component/wget/buildout.cfg @@ -9,7 +9,7 @@ parts = wget [wget] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://ftp.gnu.org/gnu/wget/wget-1.14.tar.xz md5sum = 316f6f59292c9098ad81fd54f658c579 configure-options = diff --git a/component/xapian/buildout.cfg b/component/xapian/buildout.cfg index cc518f51dfda540a4a435a42cf73320ba393c51c..19b563287a1479fd4bdbf9be1c18e895d792e484 100644 --- a/component/xapian/buildout.cfg +++ b/component/xapian/buildout.cfg @@ -6,7 +6,7 @@ depends = ../libuuid/buildout.cfg [xapian] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://oligarchy.co.uk/xapian/1.2.12/xapian-core-1.2.12.tar.gz md5sum = faf33a3945edbe4c848627750856cbeb environment = diff --git a/component/xorg/buildout.cfg b/component/xorg/buildout.cfg index 68b006a66d1253920e632702631bd9dfecb4f47a..b126e6de927f2e75f777fc62572b3e9dcee5dacc 100644 --- a/component/xorg/buildout.cfg +++ b/component/xorg/buildout.cfg @@ -27,12 +27,12 @@ parts = ACLOCAL=${xorg-util-macros:location}/share/aclocal [xorg-util-macros] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://www.x.org/releases/X11R7.6/src/util/util-macros-1.11.0.tar.bz2 md5sum = 22d5cdff672450cb6902e0d68c200dcb [xproto] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://www.x.org/releases/X11R7.6/src/proto/xproto-7.0.20.tar.bz2 md5sum = 65633168e5315c19defb4652cd3d83c1 configure-options = @@ -44,7 +44,7 @@ environment = PATH=${libxml2:location}/bin:${pkgconfig:location}/bin:%(PATH)s [xextproto] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://www.x.org/releases/X11R7.6/src/proto/xextproto-7.1.2.tar.bz2 md5sum = 263ae968b223c23b2986603d84e5c30e configure-options = @@ -63,7 +63,7 @@ filename = xtrans_tmp_env.patch md5sum = 37d82a3b6009113023599632117a6855 [xtrans] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://www.x.org/releases/X11R7.6/src/lib/xtrans-1.2.6.tar.bz2 md5sum = c66f9ffd2da4fb012220c6c40ebc7609 patches = @@ -79,7 +79,7 @@ environment = PATH=${pkgconfig:location}/bin:%(PATH)s [libXau] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://www.x.org/releases/X11R7.6/src/lib/libXau-1.0.6.tar.bz2 md5sum = 4a2cbd83727682f9ee1c1e719bac6adb configure-options = @@ -89,7 +89,7 @@ environment = PATH=${pkgconfig:location}/bin:%(PATH)s [xcbproto] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://www.x.org/releases/X11R7.6/src/xcb/xcb-proto-1.6.tar.bz2 md5sum = 04313e1d914b44d0e457f6c494fc178b environment = @@ -97,7 +97,7 @@ environment = PYTHON=${buildout:executable} [xorg-libpthread-stubs] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://www.x.org/releases/X11R7.6/src/xcb/libpthread-stubs-0.3.tar.bz2 md5sum = e8fa31b42e13f87e8f5a7a2b731db7ee @@ -109,7 +109,7 @@ filename = xcb_tmp_env.patch md5sum = 61f39878120ba434a169e24cae2af862 [libxcb] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://www.x.org/releases/X11R7.6/src/xcb/libxcb-1.7.tar.bz2 md5sum = 925699df361b99491165ebc12068056b patches = @@ -129,7 +129,7 @@ environment = # suitable library. [libXext] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://www.x.org/releases/X11R7.6/src/lib/libXext-1.2.0.tar.bz2 md5sum = 9bb236ff0193e9fc1c1fb504dd840331 environment = @@ -158,17 +158,17 @@ filename = 700c7896b832d6e4fb0185f0d5382b01f94e7141.patch md5sum = 52635ef694ee6f1acb642a77ee8eb010 [inputproto] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://www.x.org/releases/X11R7.6/src/everything/inputproto-2.0.1.tar.bz2 md5sum = da9bf9e5d174163f597d2d72757d9038 [kbproto] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://www.x.org/releases/X11R7.6/src/everything/kbproto-1.0.5.tar.bz2 md5sum = e7edb59a3f54af15f749e8f3e314ee62 [libX11] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://www.x.org/releases/X11R7.6/src/lib/libX11-1.4.0.tar.bz2 md5sum = b63d9f7493a61df51d0c0be04ac435e4 configure-options = @@ -189,7 +189,7 @@ environment = [libXdmcp] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://www.x.org/releases/X11R7.6/src/lib/libXdmcp-1.1.0.tar.bz2 md5sum = 762b6bbaff7b7d0831ddb4f072f939a5 environment = @@ -201,67 +201,67 @@ configure-options = --without-fop [fixesproto] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://www.x.org/releases/X11R7.6/src/everything/fixesproto-4.1.2.tar.bz2 md5sum = bdb58ecc313b509247036d5c11fa99df [bigreqsproto] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://www.x.org/releases/X11R7.6/src/everything/bigreqsproto-1.1.1.tar.bz2 md5sum = 6f6c24436c2b3ab235eb14a85b9aaacf [xcmiscproto] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://www.x.org/releases/X11R7.6/src/everything/xcmiscproto-1.2.1.tar.bz2 md5sum = cd7372cd827bfd7ca7e9238f2ce274b1 [damageproto] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://www.x.org/releases/X11R7.6/src/everything/damageproto-1.2.1.tar.bz2 md5sum = 998e5904764b82642cc63d97b4ba9e95 [randrproto] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://www.x.org/releases/X11R7.6/src/everything/randrproto-1.3.2.tar.bz2 md5sum = 597491c0d8055e2a66f11350c4985775 [renderproto] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://www.x.org/releases/X11R7.6/src/everything/renderproto-0.11.1.tar.bz2 md5sum = a914ccc1de66ddeb4b611c6b0686e274 [videoproto] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://www.x.org/releases/X11R7.6/src/everything/videoproto-2.3.1.tar.bz2 md5sum = c3b348c6e2031b72b11ae63fc7f805c2 [fontsproto] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://www.x.org/releases/X11R7.6/src/everything/fontsproto-2.1.1.tar.bz2 md5sum = 37102ffcaa73f77d700acd6f7a25d8f0 [recordproto] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://www.x.org/releases/X11R7.6/src/everything/recordproto-1.14.1.tar.bz2 md5sum = 24541a30b399213def35f48efd926c63 [resourceproto] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://www.x.org/releases/X11R7.6/src/everything/resourceproto-1.1.1.tar.bz2 md5sum = 8ff0525ae7502b48597b78d00bc22284 [xineramaproto] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://www.x.org/releases/X11R7.6/src/everything/xineramaproto-1.2.tar.bz2 md5sum = a8aadcb281b9c11a91303e24cdea45f5 [pixman] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://xorg.freedesktop.org/archive/individual/lib/pixman-0.23.2.tar.bz2 md5sum = 2e2805f5ca02edeb15a7862779670069 [libfontenc] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://www.x.org/releases/X11R7.6/src/everything/libfontenc-1.1.0.tar.bz2 md5sum = 11d3c292f05a90f6f67840a9e9c3d9b8 environment = @@ -273,7 +273,7 @@ environment = PATH=${pkgconfig:location}/bin:%(PATH)s [libXfont] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://www.x.org/releases/X11R7.6/src/everything/libXfont-1.4.3.tar.bz2 md5sum = 6fb689cfe13d8d9460f4abb5bd88588d environment = @@ -285,7 +285,7 @@ environment = PATH=${pkgconfig:location}/bin:%(PATH)s [libxkbfile] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://www.x.org/releases/X11R7.6/src/everything/libxkbfile-1.0.7.tar.bz2 md5sum = 59b4fe0bdf8d9b05e45b59e8fe9e7516 environment = @@ -296,7 +296,7 @@ environment = PATH=${pkgconfig:location}/bin:%(PATH)s [xkeyboard-config] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://www.x.org/releases/individual/data/xkeyboard-config/xkeyboard-config-2.1.tar.bz2 md5sum = 57ecc78bacd8ecc398d8ed6588f4d04b depends = @@ -312,7 +312,7 @@ environment = PKG_CONFIG_PATH=${libX11:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig [xkbcomp] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://www.x.org/releases/X11R7.6/src/app/xkbcomp-1.2.0.tar.bz2 md5sum = 0f55995cd8da9b2d88553e1a2e17cd0a # Hardcoded location for xkeyboard-config, needed during compile time @@ -327,12 +327,12 @@ environment = PATH=${pkgconfig:location}/bin:%(PATH)s [render] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://xlibs.freedesktop.org/release/renderext-0.9.tar.bz2 md5sum = d43c2afc69937655d13c02588c9ff974 [libXrender] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://xlibs.freedesktop.org/release/libXrender-0.9.0.tar.bz2 md5sum = ce7cda009aa0b10a73637941d44ae789 configure-options = @@ -342,7 +342,7 @@ environment = PATH=${pkgconfig:location}/bin:%(PATH)s [libXinerama] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://www.x.org/releases/X11R7.6/src/lib/libXinerama-1.1.1.tar.bz2 md5sum = ecd4839ad01f6f637c6fb5327207f89b environment = @@ -352,7 +352,7 @@ configure-options = --disable-static [libICE] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://www.x.org/releases/X11R7.6/src/lib/libICE-1.0.7.tar.bz2 md5sum = bb72a732b15e9dc25c3036559387eed5 configure-options = @@ -364,7 +364,7 @@ environment = PATH=${pkgconfig:location}/bin:%(PATH)s [libSM] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://www.x.org/releases/X11R7.6/src/lib/libSM-1.2.0.tar.bz2 md5sum = e78c447bf1790552b644eca81b542742 configure-options = @@ -377,7 +377,7 @@ environment = LIBUUID_CFLAGS=-I${libuuid:location}/include [libXt] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://www.x.org/releases/X11R7.6/src/lib/libXt-1.0.9.tar.bz2 md5sum = 8a414f8f2327aaa616ca2dcac1f5d8c3 environment = @@ -386,7 +386,7 @@ environment = CPPFLAGS=-I${libSM:location}/include -I${kbproto:location}/include -I${libICE:location}/include -I${xproto:location}/include -I${libX11:location}/include [dri2proto] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://xorg.freedesktop.org/releases/individual/proto/dri2proto-2.6.tar.gz md5sum = 873142af5db695537cfe05e01d13541f configure-options = @@ -397,7 +397,7 @@ environment = [pciaccess] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://www.x.org/releases/X11R7.6/src/lib/libpciaccess-0.12.0.tar.bz2 md5sum = 285e07976274572e1f1e68edee09b70a configure-options = @@ -406,7 +406,7 @@ environment = PATH=${pkgconfig:location}/bin:%(PATH)s [makedepend] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://xorg.freedesktop.org/releases/individual/util/makedepend-1.0.3.tar.bz2 md5sum = 4e6cb97bbecfbb34f3f644a75e513093 configure-options = @@ -416,7 +416,7 @@ environment = PKG_CONFIG_PATH=${xproto:location}/lib/pkgconfig [glproto] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://xorg.freedesktop.org/releases/individual/proto/glproto-1.4.14.tar.bz2 md5sum = f48257daf0017f7a7667e5bf48ca3578 configure-options = @@ -426,7 +426,7 @@ environment = PKG_CONFIG_PATH=${xproto:location}/lib/pkgconfig [xfixes] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://xorg.freedesktop.org/releases/individual/lib/libXfixes-4.0.5.tar.bz2 md5sum = 1b4b8386bd5d1751b2c7177223ad4629 configure-options = @@ -437,7 +437,7 @@ environment = CPPFLAGS=-I${libX11:location}/include -I${xproto:location}/include -I${fixesproto:location}/include -I${xextproto:location}/include [xdamage] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://xorg.freedesktop.org/releases/individual/lib/libXdamage-1.1.3.tar.bz2 md5sum = 44774e1a065158b52f1a0da5100cebec configure-options = @@ -455,7 +455,7 @@ filename = tmp_env.patch md5sum = 8b60ab8121f0564a681fc00d03101696 [libxmu] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://www.x.org/releases/X11R7.6/src/lib/libXmu-1.1.0.tar.gz md5sum = 15e1cb9aaf97eae169bfe6944e0a541e environment = @@ -464,7 +464,7 @@ environment = CPPFLAGS=-I${libX11:location}/include -I${xextproto:location}/include [libXcursor] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://www.x.org/releases/X11R7.6/src/lib/libXcursor-1.1.11.tar.gz md5sum = 55558a41d0bcf9210636858844fa4d2f environment = @@ -473,7 +473,7 @@ environment = CPPFLAGS=-I${render:location}/include -I${xproto:location}/include -I${fixesproto:location}/include -I${libX11:location}/include -I${xfixes:location}/include -I${libXrender:location}/include [xwd] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://www.x.org/releases/X11R7.6/src/app/xwd-1.0.4.tar.gz md5sum = f8da771069756210833524b5afa1832c environment = @@ -484,7 +484,7 @@ environment = [xserver] # Adds Xvfb functionnality -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://www.x.org/releases/X11R7.6/src/xserver/xorg-server-1.9.3.tar.bz2 md5sum = 5bef6839a76d029204ab31aa2fcb5201 patches = diff --git a/component/xpdf/buildout.cfg b/component/xpdf/buildout.cfg index aaab39c7ae63333fb9b2590b54a4b86cc8299304..7da8489855b0d400176545db5032928e8f4ea3e9 100644 --- a/component/xpdf/buildout.cfg +++ b/component/xpdf/buildout.cfg @@ -35,7 +35,7 @@ filename = xpdf-3.02pl5.patch md5sum = 504902ca5e9d66c67eed03636ec6b163 [xpdf-3.02] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi md5sum = 599dc4cc65a07ee868cf92a667a913d2 url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02.tar.gz configure-options = diff --git a/component/xtrabackup/buildout.cfg b/component/xtrabackup/buildout.cfg index 440834645da313accf49fc95f4101997427ef6d7..a814ab18ea5a3696155fde2254185784e50d4ab2 100644 --- a/component/xtrabackup/buildout.cfg +++ b/component/xtrabackup/buildout.cfg @@ -46,7 +46,7 @@ download-only = true filename = libtar-${:version}.tar.gz [xtrabackup] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://www.percona.com/downloads/XtraBackup/XtraBackup-1.6.3/source/xtrabackup-1.6.3.tar.gz md5sum = d0b827fd18cd76416101eb7b7c56a311 make-binary = true diff --git a/component/xz-utils/buildout.cfg b/component/xz-utils/buildout.cfg index 561cdc25bf938ba0340c1c64d4d576132c41db22..76c0b927767bef6e41742377f96a9dc539023fd4 100644 --- a/component/xz-utils/buildout.cfg +++ b/component/xz-utils/buildout.cfg @@ -3,6 +3,6 @@ parts = xz-utils [xz-utils] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://tukaani.org/xz/xz-5.0.4.tar.gz md5sum = df3df690aef18384e1e031be7ec3a964 diff --git a/component/zabbix/buildout.cfg b/component/zabbix/buildout.cfg index cb67e7ab65161581787d91ff46783f2cfd45a978..c0d53bec522a046388ac05a92423bad68e7da03e 100644 --- a/component/zabbix/buildout.cfg +++ b/component/zabbix/buildout.cfg @@ -3,9 +3,9 @@ parts = zabbix-agent [zabbix-agent] -recipe = hexagonit.recipe.cmmi -url = http://prdownloads.sourceforge.net/zabbix/zabbix-2.0.1.tar.gz?download -md5sum = 3b301aa4f2b7cb5ede46884b9c7873e1 +recipe = slapos.recipe.cmmi +url = http://prdownloads.sourceforge.net/zabbix/zabbix-2.0.5.tar.gz?download +md5sum = 0c0721c31889b63bce9aa556bcb927e8 configure-options = --enable-agent --enable-ipv6 diff --git a/component/zip/buildout.cfg b/component/zip/buildout.cfg index dc01047901682142c0e6f3ada135d4a82faaa41f..26d2da2c8c0b7ba2c9bdb7d060f06dd50c0d0df3 100644 --- a/component/zip/buildout.cfg +++ b/component/zip/buildout.cfg @@ -2,7 +2,7 @@ parts = zip [zip] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://sourceforge.net/projects/infozip/files/Zip%203.x%20%28latest%29/3.0/zip30.tar.gz/download md5sum = 7b74551e63f8ee6aab6fbc86676c0d37 location = ${buildout:parts-directory}/${:_buildout_section_name_} diff --git a/component/zlib/buildout.cfg b/component/zlib/buildout.cfg index 830d92c8e43e4e58af9ab90fc69f1f2f7c074f6e..c49f108737d1baf36340d7f2000062d86380f782 100644 --- a/component/zlib/buildout.cfg +++ b/component/zlib/buildout.cfg @@ -3,6 +3,6 @@ parts = zlib [zlib] -recipe = hexagonit.recipe.cmmi +recipe = slapos.recipe.cmmi url = http://prdownloads.sourceforge.net/libpng/zlib-1.2.6.tar.bz2?download md5sum = dc2cfa0d2313ca77224b4d932b2911e9 diff --git a/setup.py b/setup.py index 848054b80459d093885eda07d2c03f687d6d4660..c44ea2228efa0039aa8680309c952b5666524efa 100755 --- a/setup.py +++ b/setup.py @@ -28,7 +28,7 @@ from setuptools import setup, find_packages import glob import os -version = '0.76.1.dev' +version = '0.77.2.dev' name = 'slapos.cookbook' long_description = open("README.txt").read() + "\n" + \ open("CHANGES.txt").read() + "\n" diff --git a/slapos/recipe/apache_frontend/__init__.py b/slapos/recipe/apache_frontend/__init__.py index b2731dc06a8b53d47f57c197519dc7099e2c6257..47641fd781189c3c6387192e21cda837ef4a13d0 100644 --- a/slapos/recipe/apache_frontend/__init__.py +++ b/slapos/recipe/apache_frontend/__init__.py @@ -36,6 +36,7 @@ import ConfigParser import re import traceback +TRUE_VALUES = ['y', 'yes', '1', 'true'] class Recipe(BaseSlapRecipe): @@ -65,13 +66,13 @@ class Recipe(BaseSlapRecipe): # self.cron_d is a directory, where cron jobs can be registered self.cron_d = self.installCrond() - self.logrotate_d, self.logrotate_backup = self.installLogrotate() self.killpidfromfile = zc.buildout.easy_install.scripts( - [('killpidfromfile', 'slapos.recipe.erp5.killpidfromfile', + [('killpidfromfile', 'slapos.toolbox.killpidfromfile', 'killpidfromfile')], self.ws, sys.executable, self.bin_directory)[0] self.path_list.append(self.killpidfromfile) rewrite_rule_list = [] + rewrite_rule_https_only_list = [] rewrite_rule_zope_list = [] rewrite_rule_zope_path_list = [] slave_dict = {} @@ -88,20 +89,16 @@ class Recipe(BaseSlapRecipe): # Sanitize inputs backend_url = slave_instance.get("url", None) reference = slave_instance.get("slave_reference") + enable_cache = slave_instance.get('enable_cache', '').lower() in TRUE_VALUES + slave_type = slave_instance.get('type', '').lower() or None - if slave_instance.haskey("enable_cache"): - enable_cache = slave_instance.get("enable_cache", "").upper() in ('1', 'TRUE') - else: - enable_cache = False - - if slave_instance.haskey("type"): - slave_type = slave_instance.get("type", "").lower() - else: - slave_type = None + https_only = slave_instance.get('https-only', '').lower() in TRUE_VALUES # Set scheme (http? https?) - # Future work may allow to choose between http and https (or both?) - scheme = 'http://' + if https_only: + scheme = 'https://' + else: + scheme = 'http://' self.logger.info('Processing slave instance: %s' % reference) @@ -143,6 +140,10 @@ class Recipe(BaseSlapRecipe): rewrite_rule = "%s %s" % (domain, backend_url) # Finally, if successful, we add the rewrite rule to our list of rules + # We have 4 RewriteMaps: + # - One for generic (non-zope) websites, accepting both HTTP and HTTPS + # - One for generic websites that only accept HTTPS + # - Two for Zope-based websites if rewrite_rule: # We check if we have a zope slave. It requires different rewrite # rule structure. @@ -154,7 +155,10 @@ class Recipe(BaseSlapRecipe): rewrite_rule_path = "%s %s" % (domain, slave_instance.get('path', '')) rewrite_rule_zope_path_list.append(rewrite_rule_path) else: - rewrite_rule_list.append(rewrite_rule) + if https_only: + rewrite_rule_https_only_list.append(rewrite_rule) + else: + rewrite_rule_list.append(rewrite_rule) # Certificate stuff valid_certificate_str = self.parameter_dict.get("domain_ssl_ca_cert") @@ -186,6 +190,7 @@ class Recipe(BaseSlapRecipe): plain_http_port=frontend_plain_http_port_number, name=frontend_domain_name, rewrite_rule_list=rewrite_rule_list, + rewrite_rule_https_only_list=rewrite_rule_https_only_list, rewrite_rule_zope_list=rewrite_rule_zope_list, rewrite_rule_zope_path_list=rewrite_rule_zope_path_list, key=key, certificate=certificate) @@ -279,29 +284,6 @@ class Recipe(BaseSlapRecipe): return "%s http://%s:%s" % \ (domain, varnish_ip, base_varnish_port) - def installLogrotate(self): - """Installs logortate main configuration file and registers its to cron""" - logrotate_d = os.path.abspath(os.path.join(self.etc_directory, - 'logrotate.d')) - self._createDirectory(logrotate_d) - logrotate_backup = self.createBackupDirectory('logrotate') - logrotate_conf = self.createConfigurationFile("logrotate.conf", - "include %s" % logrotate_d) - logrotate_cron = os.path.join(self.cron_d, 'logrotate') - state_file = os.path.join(self.data_root_directory, 'logrotate.status') - open(logrotate_cron, 'w').write('0 0 * * * %s -s %s %s' % - (self.options['logrotate_binary'], state_file, logrotate_conf)) - self.path_list.extend([logrotate_d, logrotate_conf, logrotate_cron]) - return logrotate_d, logrotate_backup - - def registerLogRotation(self, name, log_file_list, postrotate_script): - """Register new log rotation requirement""" - open(os.path.join(self.logrotate_d, name), 'w').write( - self.substituteTemplate(self.getTemplateFilename( - 'logrotate_entry.in'), - dict(file_list=' '.join(['"'+q+'"' for q in log_file_list]), - postrotate=postrotate_script, olddir=self.logrotate_backup))) - def requestCertificate(self, name): hash = hashlib.sha512(name).hexdigest() key = os.path.join(self.ca_private, hash + self.ca_key_ext) @@ -418,8 +400,7 @@ class Recipe(BaseSlapRecipe): def _getApacheConfigurationDict(self, name, ip_list, port): apache_conf = dict() apache_conf['server_name'] = name - apache_conf['pid_file'] = os.path.join(self.run_directory, - name + '.pid') + apache_conf['pid_file'] = self.options['pid-file'] apache_conf['lock_file'] = os.path.join(self.run_directory, name + '.lock') apache_conf['document_root'] = os.path.join(self.data_root_directory, @@ -429,13 +410,8 @@ class Recipe(BaseSlapRecipe): apache_conf['ip_list'] = ip_list apache_conf['port'] = port apache_conf['server_admin'] = 'admin@' - apache_conf['error_log'] = os.path.join(self.log_directory, - 'frontend-apache-error.log') - apache_conf['access_log'] = os.path.join(self.log_directory, - 'frontend-apache-access.log') - self.registerLogRotation(name, [apache_conf['error_log'], - apache_conf['access_log']], self.killpidfromfile + ' ' + - apache_conf['pid_file'] + ' SIGUSR1') + apache_conf['error_log'] = self.options['error-log'] + apache_conf['access_log'] = self.options['access-log'] return apache_conf def installVarnishCache(self, name, ip, port, control_port, backend_host, @@ -517,10 +493,13 @@ class Recipe(BaseSlapRecipe): port=4443, plain_http_port=8080, rewrite_rule_list=None, rewrite_rule_zope_list=None, + rewrite_rule_https_only_list=None, rewrite_rule_zope_path_list=None, access_control_string=None): if rewrite_rule_list is None: rewrite_rule_list = [] + if rewrite_rule_https_only_list is None: + rewrite_rule_zope_path_list = [] if rewrite_rule_zope_list is None: rewrite_rule_zope_list = [] if rewrite_rule_zope_path_list is None: @@ -571,15 +550,22 @@ class Recipe(BaseSlapRecipe): self.path_list.append(backup_cron) # Create configuration file and rewritemaps - apachemap_name = "apachemap.txt" - apachemapzope_name = "apachemapzope.txt" - apachemapzopepath_name = "apachemapzopepath.txt" - - self.createConfigurationFile(apachemap_name, "\n".join(rewrite_rule_list)) - self.createConfigurationFile(apachemapzope_name, - "\n".join(rewrite_rule_zope_list)) - self.createConfigurationFile(apachemapzopepath_name, - "\n".join(rewrite_rule_zope_path_list)) + apachemap_path = self.createConfigurationFile( + "apache_rewritemap_generic.txt", + "\n".join(rewrite_rule_list) + ) + apachemap_httpsonly_path = self.createConfigurationFile( + "apache_rewritemap_httpsonly.txt", + "\n".join(rewrite_rule_https_only_list) + ) + apachemap_zope_path = self.createConfigurationFile( + "apache_rewritemap_zope.txt", + "\n".join(rewrite_rule_zope_list) + ) + apachemap_zopepath_path = self.createConfigurationFile( + "apache_rewritemap_zopepath.txt", + "\n".join(rewrite_rule_zope_path_list) + ) apache_conf = self._getApacheConfigurationDict(name, ip_list, port) apache_conf['ssl_snippet'] = self.substituteTemplate( @@ -606,9 +592,10 @@ class Recipe(BaseSlapRecipe): apache_conf.update(**dict( path_enable=path, - apachemap_path=os.path.join(self.etc_directory, apachemap_name), - apachemapzope_path=os.path.join(self.etc_directory, apachemapzope_name), - apachemapzopepath_path=os.path.join(self.etc_directory, apachemapzopepath_name), + apachemap_path=apachemap_path, + apachemap_httpsonly_path=apachemap_httpsonly_path, + apachemapzope_path=apachemap_zope_path, + apachemapzopepath_path=apachemap_zopepath_path, apache_domain=name, https_port=port, plain_http_port=plain_http_port, diff --git a/slapos/recipe/apache_frontend/template/apache.conf.in b/slapos/recipe/apache_frontend/template/apache.conf.in index c0fb924791513b45d01c289c731803c2508fd0f2..69c5e334f0a8b1ea573a7552a8a5125424300d03 100644 --- a/slapos/recipe/apache_frontend/template/apache.conf.in +++ b/slapos/recipe/apache_frontend/template/apache.conf.in @@ -60,8 +60,8 @@ BrowserMatch "RealPlayer 4\.0" force-response-1.0 BrowserMatch "Java/1\.0" force-response-1.0 BrowserMatch "JDK/1\.0" force-response-1.0 # The following directive disables redirects on non-GET requests for -# a directory that does not include the trailing slash. This fixes a -# problem with Microsoft WebFolders which does not appropriately handle +# a directory that does not include the trailing slash. This fixes a +# problem with Microsoft WebFolders which does not appropriately handle # redirects for folders with DAV methods. # Same deal with Apple's DAV filesystem and Gnome VFS support for DAV. BrowserMatch "Microsoft Data Access Internet Publishing Provider" redirect-carefully @@ -84,7 +84,7 @@ MCacheRemovalAlgorithm LRU AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css text/javascript application/x-javascript application/javascript BrowserMatch ^Mozilla/4 gzip-only-text/html BrowserMatch ^Mozilla/4\.0[678] no-gzip -BrowserMatch \bMSIE !no-gzip !gzip-only-text/html +BrowserMatch \bMSIE !no-gzip !gzip-only-text/html # Make sure proxies don't deliver the wrong content Header append Vary User-Agent @@ -104,10 +104,12 @@ Header append Vary User-Agent # or changed when slapgrid is ran. It can be freely customized by node admin. Include %(custom_apache_virtualhost_conf)s - # Define the two RewriteMaps (key -> value store): one for Zope, one generic + # Define the 3 RewriteMaps (key -> value store): one for Zope, one generic, + # one generic https only, # containing: rewritten URL -> original URL (a.k.a VirtualHostBase in Zope) RewriteMap apachemapzope txt:%(apachemapzope_path)s RewriteMap apachemapgeneric txt:%(apachemap_path)s + RewriteMap apachemapgenerichttpsonly txt:%(apachemap_httpsonly_path)s # Define another RewriteMap for Zope, containing: # rewritten URL -> VirtualHostRoot @@ -123,21 +125,32 @@ Header append Vary User-Agent RewriteCond ${apachemapgeneric:%%{SERVER_NAME}} >"" # We suppose that Apache listens to 443 (even indirectly thanks to things like iptables) RewriteRule ^/(.*)$ ${apachemapgeneric:%%{SERVER_NAME}}/$1 [L,P] + # Same for https only server + RewriteCond ${apachemapgenerichttpsonly:%%{SERVER_NAME}} >"" + # We suppose that Apache listens to 443 (even indirectly thanks to things like iptables) + RewriteRule ^/(.*)$ ${apachemapgenerichttpsonly:%%{SERVER_NAME}}/$1 [L,P] # If nothing exist : put a nice error ErrorDocument 404 /notfound.html </VirtualHost> + +# Only accept generic (i.e not Zope) backends on http <VirtualHost *:%(plain_http_port)s> - RewriteEngine On SSLProxyEngine on + # Rewrite part + ProxyVia On ProxyPreserveHost On + ProxyTimeout 600 + RewriteEngine On + + # Remove "Secure" from cookies, as backend may be https + Header edit Set-Cookie "(?i)^(.+);secure$" "$1" # Include configuration file not operated by slapos. This file won't be erased # or changed when slapgrid is ran. It can be freely customized by node admin. Include %(custom_apache_virtualhost_conf)s - # We accept generic (i.e not lamp) backends on http RewriteMap apachemapgeneric txt:%(apachemap_path)s RewriteCond ${apachemapgeneric:%%{SERVER_NAME}} >"" RewriteRule ^/(.*)$ ${apachemapgeneric:%%{SERVER_NAME}}/$1 [L,P] @@ -148,6 +161,7 @@ Header append Vary User-Agent RewriteRule ^/(.*)$ https://%%{SERVER_NAME}%%{REQUEST_URI} </VirtualHost> + # Include configuration file not operated by slapos. This file won't be erased # or changed when slapgrid is ran. It can be freely customized by node admin. Include %(custom_apache_conf)s diff --git a/slapos/recipe/kvm_frontend/__init__.py b/slapos/recipe/kvm_frontend/__init__.py index 8d03b32e45a75e63b48b097673bea66fdb2c75c8..0510b537ae4864d9dcaaf6101856199c6c24717f 100644 --- a/slapos/recipe/kvm_frontend/__init__.py +++ b/slapos/recipe/kvm_frontend/__init__.py @@ -107,7 +107,8 @@ class Recipe(GenericSlapRecipe): http_redirect_server = '' config = dict( - ip=self.options['ip'], + ipv6=self.options['ipv6'], + ipv4=self.options['ipv4'], port=self.options['port'], key=self.options['ssl-key-path'], certificate=self.options['ssl-cert-path'], diff --git a/slapos/recipe/kvm_frontend/template/kvm-proxy.js b/slapos/recipe/kvm_frontend/template/kvm-proxy.js index 9c83d6930e1732ae9aa1efb75ecced8b93274004..edb9a88ee38d0813b18e534e5d8efb2bf1d46f35 100644 --- a/slapos/recipe/kvm_frontend/template/kvm-proxy.js +++ b/slapos/recipe/kvm_frontend/template/kvm-proxy.js @@ -37,12 +37,13 @@ var fs = require('fs'), httpProxy = require('http-proxy'), proxyByUrl = require('proxy-by-url'); -var listenInterface = process.argv[2], - port = process.argv[3], - sslKeyFile = process.argv[4], - sslCertFile = process.argv[5], - proxyTable = process.argv[6], - redirect = process.argv[7] || false, +var listenInterfacev6 = process.argv[2], + listenInterfacev4 = process.argv[3], + port = process.argv[4], + sslKeyFile = process.argv[5], + sslCertFile = process.argv[6], + proxyTable = process.argv[7], + redirect = process.argv[8] || false, isRawIPv6; if (process.argv.length < 7) { @@ -50,11 +51,6 @@ if (process.argv.length < 7) { process.exit(1); } -isRawIPv6 = function checkipv6(str) { - // Inspired by http://forums.intermapper.com/viewtopic.php?t=452 - return (/^\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(%.+)?\s*$/.test(str)); -}(listenInterface); - /** * Dummy middleware that throws 404 not found. Does not contain websocket * middleware. @@ -69,7 +65,7 @@ var middlewareNotFound = function(req, res, proxy) { /** * Create server */ -var proxyServer = httpProxy.createServer( +var proxyServerv6 = httpProxy.createServer( // We declare our proxyByUrl middleware proxyByUrl(proxyTable), // Then we add your dummy middleware, called when proxyByUrl doesn't find url. @@ -87,42 +83,70 @@ var proxyServer = httpProxy.createServer( ) }, source: { - host: listenInterface, + host: listenInterfacev6, port: port }} ); + +var proxyServerv4 = httpProxy.createServer( + // We declare our proxyByUrl middleware + proxyByUrl(proxyTable), + // Then we add your dummy middleware, called when proxyByUrl doesn't find url. + middlewareNotFound, + // And we set HTTPS options for server. HTTP will be forbidden. + { + https: { + key: fs.readFileSync( + sslKeyFile, + 'utf8' + ), + cert: fs.readFileSync( + sslCertFile, + 'utf8' + ) + }, + source: { + host: listenInterfacev4, + port: port + }} +); + + console.log('HTTPS server starting and trying to listen on ' + - listenInterface + ':' + port); + listenInterfacev4 + ':' + port); // Release the beast. -proxyServer.listen(port, listenInterface); +proxyServerv6.listen(port, listenInterfacev6); +proxyServerv4.listen(port, listenInterfacev4); // Dummy HTTP server redirecting to HTTPS. Only has sense if we can use port 80 if (redirect === '1') { console.log('HTTP redirect server starting and trying to listen on ' + listenInterface + ':' + httpPort); - try { - var httpPort = 80; - http.createServer(function(req, res) { - var url; - if (isRawIPv6 === true) { - url = 'https://[' + listenInterface + ']'; - } else { - url = 'https://' + listenInterface; - } - // If non standard port : need to specify it - if (port !== 443) { - url = url + ':' + port; - } - // Add last part of URL - url = url + req.url; - console.log(url); - // Anwser "permanently redirected" - res.statusCode = 301; - res.setHeader('Location', url); - res.end(); - }).listen(httpPort, listenInterface); - } catch (error) { - console.log('Couldn\'t start plain HTTP redirection server : ' + error) - } +/* +*try { +* var httpPort = 80; +* http.createServer(function(req, res) { +* var url; +* if (isRawIPv6 === true) { +* url = 'https://[' + listenInterface + ']'; +* } else { +* url = 'https://' + listenInterface; +* } +* // If non standard port : need to specify it +* if (port !== 443) { +* url = url + ':' + port; +* } +* // Add last part of URL +* url = url + req.url; +* console.log(url); +* // Anwser "permanently redirected" +* res.statusCode = 301; +* res.setHeader('Location', url); +* res.end(); +* }).listen(httpPort, listenInterface); +* } catch (error) { +* console.log('Couldn\'t start plain HTTP redirection server : ' + error) +* } +*/ } diff --git a/slapos/recipe/kvm_frontend/template/nodejs_run.in b/slapos/recipe/kvm_frontend/template/nodejs_run.in index 8384f05deba13f9e6be0a9417dd54a2b945a9eb9..9c49f2290a8a95a9ae0147fe5714b60fbaea8896 100644 --- a/slapos/recipe/kvm_frontend/template/nodejs_run.in +++ b/slapos/recipe/kvm_frontend/template/nodejs_run.in @@ -2,4 +2,4 @@ # BEWARE: This file is operated by slapgrid # BEWARE: It will be overwritten automatically export NODE_PATH=%(node_env)s -exec %(node_path)s %(conf_path)s %(ip)s %(port)s %(key)s %(certificate)s %(map_path)s %(plain_http)s +exec %(node_path)s %(conf_path)s %(ipv6)s %(ipv4)s %(port)s %(key)s %(certificate)s %(map_path)s %(plain_http)s diff --git a/slapos/recipe/wrapper.py b/slapos/recipe/wrapper.py index 9bf484e87fca0915b4c1dfaae3b0078cc9300f55..395e34a3546849215ce615aa30bb13f27a2467d4 100644 --- a/slapos/recipe/wrapper.py +++ b/slapos/recipe/wrapper.py @@ -35,6 +35,7 @@ class Recipe(GenericBaseRecipe): wrapper_path = self.options['wrapper-path'] wait_files = self.options.get('wait-for-files') environment = self.options.get('environment') + parameters_extra = self.options.get('parameters_extra') if not wait_files and not environment: # Create a simple wrapper as shell script @@ -42,6 +43,7 @@ class Recipe(GenericBaseRecipe): name=wrapper_path, command=command_line[0], parameters=command_line[1:], + parameters_extra=parameters_extra, )] # More complex needs: create a Python script as wrapper diff --git a/slapos/recipe/zabbixagent/__init__.py b/slapos/recipe/zabbixagent/__init__.py index 38b0c763400af72d9973621003966f88997665bc..e7c767e8906fd956cec772cdfd7fe9656666d7e7 100644 --- a/slapos/recipe/zabbixagent/__init__.py +++ b/slapos/recipe/zabbixagent/__init__.py @@ -119,10 +119,13 @@ class Recipe(BaseSlapRecipe): # self.cron_d is a directory, where cron jobs can be registered self.cron_d = self.installCrond() self.logrotate_d, self.logrotate_backup = self.installLogrotate() - zabbix_agentd_conf = self.installZabbixAgentd(self.getGlobalIPv6Address(), - 10050, - self.parameter_dict['hostname'], - self.parameter_dict['server']) + zabbix_agentd_conf = self.installZabbixAgentd( + self.getGlobalIPv6Address(), + 10050, + self.parameter_dict['hostname'], + self.parameter_dict['server'], + self.parameter_dict.get('custom-user-parameter', '') + ) self.setConnectionDict(dict(ip=zabbix_agentd_conf['ip'], name=zabbix_agentd_conf['hostname'], port=str(zabbix_agentd_conf['port']))) diff --git a/software/apache-frontend/README.apache_frontend.txt b/software/apache-frontend/README.apache_frontend.txt index b05aadf8fcb4f161d70ef99a2184d39c7c4101a8..d4126b61d09e6ad98fa7ac14495087e79d557fea 100644 --- a/software/apache-frontend/README.apache_frontend.txt +++ b/software/apache-frontend/README.apache_frontend.txt @@ -118,6 +118,13 @@ Domain name to use as frontend. The frontend will be accessible from this domain [instancereference].[masterdomain]. Example: www.mycustomdomain.com +https-only +~~~~~~~~~~ +Specify if website should be accessed using https only. If so, the frontend +will redirect the user to https if accessed from http. +Possible values: "true", "false". +This is an optional parameter. Defaults to false. + path ~~~~ Only used if type is "zope". diff --git a/software/apache-frontend/common.cfg b/software/apache-frontend/common.cfg index 265b5a2382a2357bd0ab1e83473dfb8d5693bfae..4bd2736f411fc3baaadb0a56fbd41957ca2b5803 100644 --- a/software/apache-frontend/common.cfg +++ b/software/apache-frontend/common.cfg @@ -3,6 +3,7 @@ extends = ../../component/binutils/buildout.cfg ../../component/lxml-python/buildout.cfg ../../component/apache/buildout.cfg + ../../component/gzip/buildout.cfg ../../component/stunnel/buildout.cfg ../../component/varnish/buildout.cfg ../../component/dcron/buildout.cfg @@ -38,14 +39,15 @@ recipe = zc.recipe.egg eggs = ${instance-recipe:egg} [eggs] -recipe = zc.recipe.egg +recipe = z3c.recipe.scripts eggs = ${lxml-python:egg} + slapos.toolbox [template] # Default template for apache instance. recipe = slapos.recipe.template url = ${:_profile_base_location_}/instance.cfg -md5sum = fea902a2b9dbf8c80ff201bcf73f9396 +md5sum = e7b9f57da7eb1450fc15789e239388d4 output = ${buildout:directory}/template.cfg -mode = 0644 \ No newline at end of file +mode = 0644 diff --git a/software/apache-frontend/instance.cfg b/software/apache-frontend/instance.cfg index 952aa3838108d27fe38f83a0724e52f5ed3660a5..1f788b445e8d8e7b3a6ff52493e861164ea07f27 100644 --- a/software/apache-frontend/instance.cfg +++ b/software/apache-frontend/instance.cfg @@ -1,8 +1,10 @@ [buildout] parts = directory - instance + apache configtest + logrotate + logrotate-entry-apache eggs-directory = ${buildout:eggs-directory} develop-eggs-directory = ${buildout:develop-eggs-directory} @@ -10,15 +12,23 @@ develop-eggs-directory = ${buildout:develop-eggs-directory} # Create all needed directories [directory] recipe = slapos.cookbook:mkdirectory + +bin = $${buildout:directory}/bin/ etc = $${buildout:directory}/etc/ -var = $${buildout:directory}/var/ srv = $${buildout:directory}/srv/ -bin = $${buildout:directory}/bin/ +var = $${buildout:directory}/var/ + +backup = $${:srv}/backup +log = $${:var}/log +run = $${:var}/run service = $${:etc}/service +logrotate-backup = $${:backup}/logrotate +logrotate-entries = $${:etc}/logrotate.d + # Deploy Apache (old way, with monolithic recipe) -[instance] +[apache] recipe = ${instance-recipe:egg}:${instance-recipe:module} httpd_home = ${apache-2.2:location} httpd_binary = ${apache-2.2:location}/bin/httpd @@ -31,9 +41,40 @@ rdiff_backup_binary = ${buildout:bin-directory}/rdiff-backup gcc_binary = gcc binutils_directory = ${binutils:location}/bin/ +access-log = $${directory:log}/frontend-apache-access.log +error-log = $${directory:log}/frontend-apache-error.log +pid-file = $${directory:run}/httpd.pid + # Create wrapper for "apachectl conftest" in bin [configtest] recipe = slapos.cookbook:wrapper -command-line = $${instance:httpd_binary} -f $${directory:etc}/apache_frontend.conf -t -output = $${directory:bin}/apache-configtest +command-line = $${apache:httpd_binary} -f $${directory:etc}/apache_frontend.conf -t +wrapper-path = $${directory:bin}/apache-configtest + + +# Deploy Logrotate +[logrotate] +recipe = slapos.cookbook:logrotate +# Binaries +logrotate-binary = ${logrotate:location}/usr/sbin/logrotate +gzip-binary = ${gzip:location}/bin/gzip +gunzip-binary = ${gzip:location}/bin/gunzip +# Directories +wrapper = $${directory:bin}/logrotate +conf = $${directory:etc}/logrotate.conf +logrotate-entries = $${directory:logrotate-entries} +backup = $${directory:logrotate-backup} +state-file = $${directory:srv}/logrotate.status + +[logrotate-entry-apache] +<= logrotate +recipe = slapos.cookbook:logrotate.d +name = apache +log = $${apache:error-log} $${apache:access-log} +frequency = daily +rotate-num = 30 +post = ${buildout:bin-directory}/killpidfromfile $${apache:pid-file} SIGUSR1 +sharedscripts = true +notifempty = true +create = true diff --git a/software/apache-frontend/software.cfg b/software/apache-frontend/software.cfg index 7c6d2704c643c163710d26d78e5dd91641ed1b66..a4928ffda62f3dd2641a5fea8b4c1fbc7dcdcd27 100644 --- a/software/apache-frontend/software.cfg +++ b/software/apache-frontend/software.cfg @@ -4,67 +4,101 @@ extends = common.cfg [versions] Jinja2 = 2.6 Werkzeug = 0.8.3 +apache-libcloud = 0.12.3 +async = 0.6.1 buildout-versions = 1.7 -hexagonit.recipe.cmmi = 1.6 +gitdb = 0.5.4 +hexagonit.recipe.cmmi = 2.0 meld3 = 0.6.10 +pycrypto = 2.6 rdiff-backup = 1.0.5 -slapos.cookbook = 0.71.1 -slapos.recipe.build = 0.11.5 +slapos.recipe.build = 0.11.6 +slapos.recipe.cmmi = 0.1 slapos.recipe.template = 2.4.2 +slapos.toolbox = 0.34.0 +smmap = 0.8.2 +z3c.recipe.scripts = 1.0.1 # Required by: -# slapos.core==0.33.1 +# slapos.core==0.35.1 +# slapos.toolbox==0.34.0 Flask = 0.9 # Required by: -# hexagonit.recipe.cmmi==1.6 -hexagonit.recipe.download = 1.6nxd002 +# slapos.toolbox==0.34.0 +GitPython = 0.3.2.RC1 # Required by: -# slapos.cookbook==0.71.1 +# slapos.toolbox==0.34.0 +atomize = 0.1.1 + +# Required by: +# slapos.toolbox==0.34.0 +feedparser = 5.1.3 + +# Required by: +# slapos.cookbook==0.77.1 inotifyx = 0.2.0 # Required by: -# slapos.cookbook==0.71.1 -# slapos.core==0.33.1 +# slapos.cookbook==0.77.1 +# slapos.core==0.35.1 # xml-marshaller==0.9.7 -lxml = 3.0.2 +lxml = 3.1.2 # Required by: -# slapos.cookbook==0.71.1 +# slapos.cookbook==0.77.1 netaddr = 0.7.10 # Required by: -# slapos.core==0.33.1 +# slapos.core==0.35.1 netifaces = 0.8 # Required by: -# slapos.cookbook==0.71.1 -pytz = 2012j +# slapos.toolbox==0.34.0 +paramiko = 1.10.1 # Required by: -# slapos.cookbook==0.71.1 -# slapos.core==0.33.1 +# slapos.toolbox==0.34.0 +psutil = 0.7.0 + +# Required by: +# slapos.core==0.35.1 +pyflakes = 0.7 + +# Required by: +# slapos.cookbook==0.77.1 +pytz = 2013b + +# Required by: +# slapos.cookbook==0.77.1 +# slapos.core==0.35.1 +# slapos.toolbox==0.34.0 # zc.buildout==1.6.0-dev-SlapOS-010 # zc.recipe.egg==1.3.2 setuptools = 0.6c12dev-r88846 # Required by: -# slapos.cookbook==0.71.1 -slapos.core = 0.33.1 +# slapos.cookbook==0.77.1 +# slapos.toolbox==0.34.0 +slapos.core = 0.35.1 # Required by: -# slapos.core==0.33.1 +# slapos.core==0.35.1 supervisor = 3.0b1 # Required by: -# slapos.cookbook==0.71.1 -xml-marshaller = 0.9.7 +# slapos.core==0.35.1 +unittest2 = 0.5.1 # Required by: -# slapos.core==0.33.1 -zope.interface = 4.0.3 +# slapos.cookbook==0.77.1 +# slapos.toolbox==0.34.0 +xml-marshaller = 0.9.7 +# Required by: +# slapos.core==0.35.1 +zope.interface = 4.0.5 [networkcache] # signature certificates of the following uploaders. diff --git a/software/jio/instance.cfg.in b/software/jio/instance.cfg.in new file mode 100644 index 0000000000000000000000000000000000000000..d847dfdf028fa647a2af9e9f0763d8cf141db4cc --- /dev/null +++ b/software/jio/instance.cfg.in @@ -0,0 +1,52 @@ +############################# +# +# Deploy jio instance +# +############################# +[buildout] +parts = + test-runner + phantomjs-wrapper + +eggs-directory = ${buildout:eggs-directory} +develop-eggs-directory = ${buildout:develop-eggs-directory} +offline = true + +# Create all needed directories, depending on your needs +[directory] +recipe = slapos.cookbook:mkdirectory +etc = $${buildout:directory}/etc +script = $${:etc}/run/ +service = $${:etc}/service +promise = $${:etc}/promise/ +bin = $${buildout:directory}/bin/ + +[download-source] +recipe = slapos.recipe.build:gitclone +git-executable = ${git:location}/bin/git + +# Local development +[jio] +<= download-source +repository = ${jio-repository:location} + +[test-runner] +recipe = slapos.cookbook:egg_test +run-test-suite = $${directory:bin}/runTestSuite +run-test-suite-binary = ${buildout:bin-directory}/runTestSuite +test-list = + $${jio:location} +prepend-path = ${git:location}/bin:${libxslt:location}/bin:${python2.7:location}/bin:${buildout:bin-directory} +environment = environment + +[environment] +CPPFLAGS = -I${python2.7:location}/include/python2.7 -I${libxml2:location}/include -I${libxslt:location}/include +LDFLAGS = -L${python2.7:location}/lib -L${libxml2:location}/lib -L${libxslt:location}/lib -L${zlib:location}/lib -L${fontconfig:location}/lib -L${libexpat:location}/lib -L${freetype:location}/lib +PYTHONPATH = ${python-setuptools:location} +LD_LIBRARY_PATH = ${libxslt:location}/lib:${libxml2:location}/lib:${zlib:location}/lib:${fontconfig:location}/lib:${libexpat:location}/lib:${freetype:location}/lib + +[phantomjs-wrapper] +recipe = slapos.cookbook:wrapper +command-line = ${phantomjs:location}/bin/phantomjs +wrapper-path = $${directory:bin}/phantomjs +parameters_extra = true \ No newline at end of file diff --git a/software/jio/software.cfg b/software/jio/software.cfg new file mode 100644 index 0000000000000000000000000000000000000000..989501962ebf90eac1d94a1e68cf373e8d3d3a66 --- /dev/null +++ b/software/jio/software.cfg @@ -0,0 +1,124 @@ +[buildout] + +extends = + ../../stack/slapos.cfg + ../../component/git/buildout.cfg + ../../component/phantomjs/buildout.cfg + ../../component/git/buildout.cfg + ../../component/python-2.7/buildout.cfg + ../../component/python-setuptools/buildout.cfg + +# Local development +develop = + ${:parts-directory}/slapos.cookbook-repository +parts = + slapos.cookbook-repository + slapos-cookbook + template + phantomjs + eggs + +[eggs] +recipe = zc.recipe.egg +eggs = + ${lxml-python:egg} + slapos.cookbook + erp5.util + collective.recipe.template +entry-points = + runTestSuite=erp5.util.testsuite:runTestSuite +scripts = + runTestSuite + +# Local development until new egg is published (extra parameters to slapos.cookbook:wrapper +[slapos.cookbook-repository] +recipe = slapos.recipe.build:gitclone +git-executable = ${git:location}/bin/git +forbid-download-cache = true +repository = http://git.erp5.org/repos/slapos.git +branch = master + +[template] +recipe = slapos.recipe.template +url = ${:_profile_base_location_}/instance.cfg.in +output = ${buildout:directory}/instance.cfg +# MD5 checksum can be skipped for development, but must be filled for production +md5sum = 1ef1bc6a3fb81300ce7139c512af96d7 +mode = 0644 + +[jio-repository] +recipe = slapos.recipe.build:gitclone +git-executable = ${git:location}/bin/git +forbid-download-cache = true +repository = http://git.erp5.org/repos/jio.git +branch = master + +[versions] +Jinja2 = 2.6 +Werkzeug = 0.8.3 +buildout-versions = 1.7 +collective.recipe.template = 1.10 +erp5.util = 0.4.34 +hexagonit.recipe.cmmi = 2.0 +lxml = 3.1.1 +meld3 = 0.6.10 +plone.recipe.command = 1.1 +psutil = 0.6.1 +slapos.cookbook = 0.76.0 +slapos.recipe.build = 0.11.6 +slapos.recipe.template = 2.4.2 + +# Required by: +# slapos.core==0.35.1 +Flask = 0.9 + +# Required by: +# slapos.cookbook==0.76.0 +inotifyx = 0.2.0 + +# Required by: +# slapos.cookbook==0.76.0 +netaddr = 0.7.10 + +# Required by: +# slapos.core==0.35.1 +netifaces = 0.8 + +# Required by: +# slapos.core==0.35.1 +pyflakes = 0.6.1 + +# Required by: +# slapos.cookbook==0.76.0 +pytz = 2013b + +# Required by: +# collective.recipe.template==1.10 +# erp5.util==0.4.33 +# hexagonit.recipe.download==1.6nxd002 +# slapos.cookbook==0.76.0 +# slapos.core==0.35.1 +# supervisor==3.0b1 +# zc.buildout==1.6.0-dev-SlapOS-010 +# zope.interface==4.0.5 +setuptools = 0.6c12dev-r88846 + +# Required by: +# slapos.cookbook==0.76.0 +slapos.core = 0.35.1 + +# Required by: +# slapos.core==0.35.1 +supervisor = 3.0b1 + +# Required by: +# slapos.core==0.35.1 +unittest2 = 0.5.1 + +# Required by: +# slapos.cookbook==0.76.0 +xml-marshaller = 0.9.7 + +# Required by: +# slapos.core==0.35.1 +zope.interface = 4.0.5 diff --git a/software/kvm/common.cfg b/software/kvm/common.cfg index dfc7873690b27e0c1558eff88429f5ba67a1f995..e10f8a7a38fbdb9280fbbbb24d35b4bde884f76d 100644 --- a/software/kvm/common.cfg +++ b/software/kvm/common.cfg @@ -56,6 +56,7 @@ recipe = plone.recipe.command destination = ${buildout:parts-directory}/${:_buildout_section_name_} location = ${buildout:parts-directory}/${:_buildout_section_name_} command = + export HOME=${:location}; rm -fr ${:destination} && mkdir -p ${:destination} && cd ${:destination} && @@ -69,17 +70,10 @@ command = [template-kvm] recipe = slapos.recipe.template url = ${:_profile_base_location_}/instance-kvm.cfg.in -md5sum = c0320447308299ec9caaeece4187bc1f +md5sum = 87197471aa93863c310204e8865b5ac1 output = ${buildout:directory}/template-kvm.cfg mode = 0644 -[template-kvmplus] -recipe = slapos.recipe.template -url = ${:_profile_base_location_}/instance-kvmplus.cfg.in -md5sum = c8e92237eeda93caca1132b5202c3a02 -output = ${buildout:directory}/template-kvmplus.cfg -mode = 0644 - [template-nbd] recipe = slapos.recipe.template url = ${:_profile_base_location_}/instance-nbd.cfg.in @@ -90,13 +84,13 @@ mode = 0644 [template-frontend] recipe = slapos.recipe.template url = ${:_profile_base_location_}/instance-frontend.cfg.in -md5sum = 73359b52013b1b65f75005e8698ed180 +md5sum = cdb690495e9eb007d2b7d2f8e12f5c59 output = ${buildout:directory}/template-frontend.cfg mode = 0644 [template] recipe = slapos.recipe.template url = ${:_profile_base_location_}/instance.cfg.in -md5sum = 68788763d23f70f24b9e575871c903a8 +md5sum = 0a98e34aaec7097a84066c0665e3a49a output = ${buildout:directory}/template.cfg mode = 0644 diff --git a/software/kvm/development.cfg b/software/kvm/development.cfg index 6ebe3c31f72bbf26395e3c7663490a650b2bcc36..f47846f74271f03fc1633a9661802d8acacd5206 100644 --- a/software/kvm/development.cfg +++ b/software/kvm/development.cfg @@ -1,21 +1,27 @@ [buildout] extends = - ../../git/buildout.cfg + ../../component/git/buildout.cfg common.cfg parts += slapos.cookbook-repository - slapos.core-repository slapos.toolbox-repository check-recipe develop = ${:parts-directory}/slapos.cookbook-repository + ${:parts-directory}/slapos.toolbox-repository [slapos.cookbook-repository] recipe = slapos.recipe.build:gitclone repository = http://git.erp5.org/repos/slapos.git -branch = slaprunner +branch = kvm +git-executable = ${git:location}/bin/git + +[slapos.toolbox-repository] +recipe = slapos.recipe.build:gitclone +repository = http://git.erp5.org/repos/slapos.toolbox.git +branch = master git-executable = ${git:location}/bin/git [check-recipe] @@ -24,3 +30,4 @@ stop-on-error = true update-command = ${:command} command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link && + grep parts ${buildout:develop-eggs-directory}/slapos.toolbox.egg-link diff --git a/software/kvm/instance-frontend.cfg.in b/software/kvm/instance-frontend.cfg.in index 230d361fca1a488097ec627348ece090be880fa7..6f338cdc830f7836ef97886e1f11bab857888cfb 100644 --- a/software/kvm/instance-frontend.cfg.in +++ b/software/kvm/instance-frontend.cfg.in @@ -11,7 +11,8 @@ parts = cron-entry-logrotate ca-frontend certificate-authority - frontend-promise + frontend-promise-ipv6 + frontend-promise-ipv4 eggs-directory = ${buildout:eggs-directory} develop-eggs-directory = ${buildout:develop-eggs-directory} @@ -47,7 +48,8 @@ logrotate-entries = $${rootdirectory:etc}/logrotate.d recipe = slapos.cookbook:kvm.frontend domain = $${ca-frontend:name} # port = $${slap-parameter:port} -ip = $${slap-network-information:local-ipv4} +ipv6 = $${slap-network-information:global-ipv6} +ipv4 = $${slap-network-information:local-ipv4} port = $${slap-parameter:port} http-redirection = $${slap-parameter:http-redirection} ssl-key-path = $${ca-frontend:key-file} @@ -60,10 +62,16 @@ node-binary = ${nodejs:location}/bin/node node-env = ${buildout:parts-directory}:${npm-modules:location}/node_modules shell-path = ${dash:location}/bin/dash -[frontend-promise] +[frontend-promise-ipv6] recipe = slapos.cookbook:check_port_listening path = $${basedirectory:promises}/frontend_promise -hostname = $${frontend-instance:ip} +hostname = $${frontend-instance:ipv6} +port = $${frontend-instance:port} + +[frontend-promise-ipv4] +recipe = slapos.cookbook:check_port_listening +path = $${basedirectory:promises}/frontend_promise +hostname = $${frontend-instance:ipv4} port = $${frontend-instance:port} [certificate-authority] @@ -133,6 +141,7 @@ state-file = $${rootdirectory:srv}/logrotate.status # Default value if no port is specified port = 4443 http-redirection = 0 +slave_instance_list = # [logrotate-entry-frontend] # <= logrotate diff --git a/software/kvm/instance-kvm.cfg.in b/software/kvm/instance-kvm.cfg.in index a87b050651aff0e2cbfc46643e4b8f532b549ddb..85305ce650ae8936d3a7405688899a7e28cb632d 100644 --- a/software/kvm/instance-kvm.cfg.in +++ b/software/kvm/instance-kvm.cfg.in @@ -36,7 +36,7 @@ storage-path = $${directory:srv}/mac [gen-passwd] recipe = slapos.cookbook:generate.password storage-path = $${directory:srv}/passwd -bytes = 4 +bytes = 8 [kvm-instance] # XXX-Cedric: change "KVM" recipe to simple "create wrappers". No need for this @@ -135,7 +135,7 @@ key-file = $${slap-connection:key-file} cert-file = $${slap-connection:cert-file} computer-id = $${slap-connection:computer-id} partition-id = $${slap-connection:partition-id} -name = SlaveFrontend +name = VNC Frontend software-type = $${slap-parameter:frontend-software-type} slave = true config = host port @@ -162,7 +162,6 @@ curl_path = ${curl:location}/bin/curl [slap-parameter] # Default values if not specified -frontend-instance-guid = SOFTINST-11031 frontend-software-type = frontend frontend-software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.92:/software/kvm/software.cfg @@ -175,4 +174,4 @@ ram-size = 1024 disk-size = 10 disk-type = virtio -cpu-count = 1 \ No newline at end of file +cpu-count = 1 diff --git a/software/kvm/instance-kvmplus.cfg.in b/software/kvm/instance-kvmplus.cfg.in deleted file mode 100644 index a9daa22adc22aa7c2670b37767626c7f45533304..0000000000000000000000000000000000000000 --- a/software/kvm/instance-kvmplus.cfg.in +++ /dev/null @@ -1,14 +0,0 @@ -############################# -# -# Instanciate kvm+ -# -############################# - -# Deprecated. Just specify amount of RAM / disk you want in instance parameter. - -[buildout] -extends = ${template-kvm:output} - -[slap-parameter] -ram-size = 2048 -disk-size = 20 \ No newline at end of file diff --git a/software/kvm/instance.cfg.in b/software/kvm/instance.cfg.in index 8d44ea5663dd9c71d101a97d0a149a16602a6964..512ac6895d1645f9fc0576c3345f94458e8fb9e0 100644 --- a/software/kvm/instance.cfg.in +++ b/software/kvm/instance.cfg.in @@ -10,7 +10,6 @@ offline = true recipe = slapos.cookbook:softwaretype default = ${template-kvm:output} kvm = ${template-kvm:output} -kvm+ = ${template-kvmplus:output} nbd = ${template-nbd:output} frontend = ${template-frontend:output} diff --git a/software/kvm/software.cfg b/software/kvm/software.cfg index ea462f76d9f89360da24befe666944a68c5e845a..c6fcefc47a829b7569775296b1e9054ee8920acd 100644 --- a/software/kvm/software.cfg +++ b/software/kvm/software.cfg @@ -143,4 +143,4 @@ xml-marshaller = 0.9.7 # Required by: # slapos.core==0.35.1 -zope.interface = 4.0.5 \ No newline at end of file +zope.interface = 4.0.5 diff --git a/stack/erp5/buildout.cfg b/stack/erp5/buildout.cfg index 1c967417829d8c31a294ea53e9e2c75b549c93c4..902ab05201410ce127ae12793e378789f5d310ab 100644 --- a/stack/erp5/buildout.cfg +++ b/stack/erp5/buildout.cfg @@ -392,6 +392,7 @@ initialization = sys.path[:0] = sum(( glob.glob(os.path.join(x, 'Products', '*', 'tests')) for x in os.getenv('INSERT_PRODUCTS_PATH', '').split(os.pathsep)), []) + os.environ['CGI_PATH'] = '${w3-validator:location}/httpd/cgi-bin' [test_suite_runner] # XXX: Workaround for fact ERP5Type is not an distribution and does not diff --git a/stack/slapos.cfg b/stack/slapos.cfg index 2786b5677c0509c35b57a1bb084b42ba66036e51..1dbb3fce20f894360a694b3f2bc5a78ab0d01fbb 100644 --- a/stack/slapos.cfg +++ b/stack/slapos.cfg @@ -3,7 +3,7 @@ [buildout] # Developers need to add explicitely this part in their software profile -parts = slapos-cookbook +# parts = slapos-cookbook # Generate list of automatically chosen eggs version extensions += @@ -72,8 +72,10 @@ eggs = zc.buildout = 1.6.0-dev-SlapOS-010 # Use xz-friendly hexagonit.recipe.download hexagonit.recipe.download = 1.6nxd002 -# zc.recipe.egg 2.0.0a is buggy +# zc.recipe.egg 2.x is for Buildout 2 zc.recipe.egg = 1.3.2 +# Use own version of h.r.download to be able to open xz-like archives +hexagonit.recipe.download = 1.6nxd002 [networkcache] download-cache-url = http://www.shacache.org/shacache