diff --git a/component/gdbm/buildout.cfg b/component/gdbm/buildout.cfg index f44aabd4b693cfd7098bb15bb880b8283f2ab095..d8d9105cd5f88e4bcb108f78b713d1f0e8c0b1a3 100644 --- a/component/gdbm/buildout.cfg +++ b/component/gdbm/buildout.cfg @@ -4,9 +4,9 @@ parts = [gdbm] recipe = hexagonit.recipe.cmmi -version = 1.9.1 +version = 1.10 url = ftp://ftp.gnu.org/gnu/gdbm/gdbm-${:version}.tar.gz -md5sum = 59f6e4c4193cb875964ffbe8aa384b58 +md5sum = 88770493c2559dc80b561293e39d3570 configure-options = --disable-static # install as parts/gdbm/include/gdbm/*.h etc. because some softwares diff --git a/component/git/buildout.cfg b/component/git/buildout.cfg index 9ff6bc1e69df7d302cd9b69298f1c36264f03874..bd82432e50ecc4990041cb24b88316ac0b3077df 100644 --- a/component/git/buildout.cfg +++ b/component/git/buildout.cfg @@ -15,8 +15,8 @@ parts = recipe = hexagonit.recipe.cmmi # url = http://kernel.org/pub/software/scm/git/git-1.7.4.5.tar.bz2 # Circumvent kernel.org downtime -url = http://ftp.free.fr/mirrors/ftp.kernel.org/software/scm/git/git-1.7.4.5.tar.bz2 -md5sum = 2fa6c4c847ed87523cf55de54af457eb +url = http://git-core.googlecode.com/files/git-1.7.8.tar.gz +md5sum = 4a3c03a04dbb857ecc875dae1278b76e configure-options = --with-curl=${curl:location} --with-openssl=${openssl:location} diff --git a/component/mariadb/buildout.cfg b/component/mariadb/buildout.cfg index 56195197cc77792b0e307078f8cd3993e30fbb3a..919e032cb3c3c6b88262b729a8315b429025e533 100644 --- a/component/mariadb/buildout.cfg +++ b/component/mariadb/buildout.cfg @@ -22,9 +22,9 @@ download-only = true [mariadb] recipe = hexagonit.recipe.cmmi -version = 5.3.2-beta +version = 5.3.3-rc url = http://downloads.askmonty.org/f/mariadb-${:version}/kvm-tarbake-jaunty-x86/mariadb-${:version}.tar.gz/from/http:/ftp.osuosl.org/pub/mariadb -md5sum = d8199454059ab2c98313aaad0c1bc318 +md5sum = 715c61bb101acc7d37e893f6a9de9267 # compile directory is required to build mysql plugins. keep-compile-dir = true # configure: how to avoid searching for my.cnf? @@ -56,8 +56,8 @@ patch-options = -p0 patches = ${mariadb-no_test-patch:location}/${mariadb-no_test-patch:filename} environment = - CPPFLAGS=-I${ncurses:location}/include -I${readline:location}/include - LDFLAGS=-Wl,-rpath=${libevent:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${zlib:location}/lib + CPPFLAGS=-I${ncurses:location}/include -I${readline5:location}/include + LDFLAGS=-Wl,-rpath=${libevent:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${readline5:location}/lib -Wl,-rpath=${readline5:location}/lib -Wl,-rpath=${zlib:location}/lib [mroonga-mariadb] recipe = hexagonit.recipe.cmmi diff --git a/component/readline/buildout.cfg b/component/readline/buildout.cfg index d023f5fa7d3f2620cf044f071aa137f300d3f59f..ba6dde560ffbb978ff3e1fca77186a2c1fca56a9 100644 --- a/component/readline/buildout.cfg +++ b/component/readline/buildout.cfg @@ -1,9 +1,22 @@ [buildout] parts = + readline5 readline extends = ../ncurses/buildout.cfg +# readline-5.x is still used for GPL2 only softwares. +[readline5] +recipe = hexagonit.recipe.cmmi +url = http://ftp.gnu.org/gnu/readline/readline-5.2.tar.gz +md5sum = e39331f32ad14009b9ff49cc10c5e751 +configure-options = + --enable-multibyte + --disable-static + --with-ncurses=${ncurses:location} +environment = + LDFLAGS =-Wl,-rpath=${ncurses:location}/lib + [readline] recipe = hexagonit.recipe.cmmi url = http://ftp.gnu.org/gnu/readline/readline-6.2.tar.gz diff --git a/slapos/recipe/erp5/template/apache.ssl-snippet.conf.in b/slapos/recipe/erp5/template/apache.ssl-snippet.conf.in index f85a164cb87fee8995a4ee4bfe8f99a18906cc80..8da5b7b1982c372c4efee8e083cde9460e93cff7 100644 --- a/slapos/recipe/erp5/template/apache.ssl-snippet.conf.in +++ b/slapos/recipe/erp5/template/apache.ssl-snippet.conf.in @@ -3,5 +3,7 @@ SSLCertificateFile %(login_certificate)s SSLCertificateKeyFile %(login_key)s SSLRandomSeed startup builtin SSLRandomSeed connect builtin +SSLProtocol -ALL +SSLv3 +TLSv1 +SSLCipherSuite ALL:!aNULL:!ADH:!eNULL:!LOW:!EXP:RC4+RSA:+HIGH:+MEDIUM SSLProxyEngine On diff --git a/slapos/recipe/erp5/template/apache.zope.conf.in b/slapos/recipe/erp5/template/apache.zope.conf.in index f24a5327b68651531f1f7e25832dfd36d85cded3..a63d292996d3842c9883126a7ba44b2da1b16564 100644 --- a/slapos/recipe/erp5/template/apache.zope.conf.in +++ b/slapos/recipe/erp5/template/apache.zope.conf.in @@ -26,6 +26,10 @@ TypesConfig conf/mime.types AddType application/x-compress .Z AddType application/x-gzip .gz .tgz +ServerTokens Prod +ServerSignature Off +TraceEnable Off + # As backend is trusting REMOTE_USER header unset it always RequestHeader unset REMOTE_USER diff --git a/slapos/recipe/generic_zope_zeo_client/template/zope.conf.in b/slapos/recipe/generic_zope_zeo_client/template/zope.conf.in index 645371c3aa35d13819b2737e131b55a85ca8a609..9f64fff798c1af0a03901b565e825229ff5ff521 100644 --- a/slapos/recipe/generic_zope_zeo_client/template/zope.conf.in +++ b/slapos/recipe/generic_zope_zeo_client/template/zope.conf.in @@ -31,12 +31,14 @@ lock-filename %(lock-filename)s # Logging configuration <eventlog> + level info <logfile> dateformat path %(event_log)s </logfile> </eventlog> <logger access> + level WARN <logfile> dateformat path %(z2_log)s diff --git a/software/erp5/instance-erp5-development.cfg b/software/erp5/instance-erp5-development.cfg index bcd2a1d810f486999e84cb97c5d8f5e74ede571e..605342eb6a45dfb5b150b347c8fb7bdc7fcb1a6b 100644 --- a/software/erp5/instance-erp5-development.cfg +++ b/software/erp5/instance-erp5-development.cfg @@ -77,7 +77,7 @@ cadir-path = $${erp5-certificate-authority:ca-dir} update-wrapper = $${basedirectory:services}/erp5-update # Defaults -configurator-bt5-list = erp5_core_proxy_field_legacy erp5_full_text_myisam_catalog erp5_base erp5_workflow erp5_configurator erp5_configurator_standard erp5_configurator_maxma_demo erp5_configurator_ung +configurator-bt5-list = erp5_full_text_myisam_catalog erp5_configurator_standard erp5_configurator_maxma_demo erp5_configurator_ung erp5_configurator_ung erp5_configurator_run_my_doc bt5-repository-list = $${zope-instance:bt5-repository-list} [request-common] diff --git a/software/erp5/snippet-master.cfg b/software/erp5/snippet-master.cfg index 880c836dde1e8d04addf85253eac8436b7f15b47..8c44deb8e0524939becf088938fe65884654530d 100644 --- a/software/erp5/snippet-master.cfg +++ b/software/erp5/snippet-master.cfg @@ -231,5 +231,5 @@ cadir-path = $${erp5-certificate-authority:ca-dir} update-wrapper = $${basedirectory:services}/erp5-update # Defaults -configurator-bt5-list = erp5_core_proxy_field_legacy erp5_full_text_myisam_catalog erp5_base erp5_workflow erp5_configurator erp5_configurator_standard erp5_configurator_maxma_demo erp5_configurator_ung +configurator-bt5-list = erp5_full_text_myisam_catalog erp5_configurator_standard erp5_configurator_maxma_demo erp5_configurator_ung erp5_configurator_ung erp5_configurator_run_my_doc bt5-repository-list = $${%(zope_section)s:bt5-repository-list} diff --git a/stack/erp5.cfg b/stack/erp5.cfg index 27b96efa5acebc5b652835ba93ae3a1c7f34f833..7fc434591027e2a2a67bc4ef3d342ea37e6cdbea 100644 --- a/stack/erp5.cfg +++ b/stack/erp5.cfg @@ -31,7 +31,7 @@ allow-hosts = extends = # Exact version of Zope - http://svn.zope.org/repos/main/Zope/tags/2.12.20/versions.cfg + http://svn.zope.org/repos/main/Zope/tags/2.12.21/versions.cfg ../component/logrotate/buildout.cfg ../component/dcron/buildout.cfg ../component/file/buildout.cfg @@ -309,6 +309,7 @@ eggs = SOAPpy cElementTree chardet + coverage elementtree erp5diff ipdb