Łukasz Nowak [Thu, 10 Nov 2011 16:23:33 +0000 (17:23 +0100)]
Merge branch 'master' into erp5
Conflicts:
software/erp5/software.cfg
Cédric de Saint Martin [Thu, 10 Nov 2011 15:43:17 +0000 (16:43 +0100)]
Release slapos.cookbook-0.35
Cédric de Saint Martin [Thu, 10 Nov 2011 15:18:29 +0000 (16:18 +0100)]
Merge branch 'kvm'. Lot of conflicts.
Some branch must have badly used squash commit. Maybe me.
I hate me.
Conflicts:
CHANGES.txt
component/apache-php/buildout.cfg
component/gcc/buildout.cfg
component/java/buildout.cfg
component/slapos/buildout.cfg
component/stunnel/buildout.cfg
setup.py
slapos/recipe/kvm/__init__.py
slapos/recipe/lamp/__init__.py
slapos/recipe/lamp/template/apache.in
slapos/recipe/lamp/template/php.ini.in
slapos/recipe/librecipe/__init__.py
slapos/recipe/mysql/__init__.py
software/davstorage/instance.cfg
software/davstorage/software.cfg
software/erp5/software.cfg
software/kvm/software.cfg
software/lamp-template/instance.cfg
software/lamp-template/software.cfg
software/mariadb/instance.cfg
software/mariadb/software.cfg
software/phpmyadmin/software.cfg
software/slaprunner/software.cfg
software/wordpress/instance.cfg
software/wordpress/software.cfg
Cédric de Saint Martin [Thu, 10 Nov 2011 14:29:21 +0000 (15:29 +0100)]
Revert "KVM : Pin versions"
This reverts commit
8839941b73592ab1471d27b9431c65bd2c5bb7f7.
Cédric de Saint Martin [Thu, 10 Nov 2011 14:08:36 +0000 (15:08 +0100)]
KVM : Pin versions
Cédric de Saint Martin [Thu, 10 Nov 2011 13:59:10 +0000 (14:59 +0100)]
Add comments about future work
Cédric de Saint Martin [Thu, 10 Nov 2011 13:55:02 +0000 (14:55 +0100)]
Remove old commented parts about kvm-source
Cédric de Saint Martin [Thu, 10 Nov 2011 13:54:07 +0000 (14:54 +0100)]
Do not use magic
use explicit parts list
Cédric de Saint Martin [Thu, 10 Nov 2011 13:53:30 +0000 (14:53 +0100)]
Put comments about kvm in kvm profile, not stack
Łukasz Nowak [Thu, 10 Nov 2011 12:42:07 +0000 (13:42 +0100)]
Fix module location.
__name__ resolves to slapos.recipe, but module relative class is required.
Cédric de Saint Martin [Thu, 10 Nov 2011 11:08:48 +0000 (12:08 +0100)]
Typo
Cédric de Saint Martin [Thu, 10 Nov 2011 10:56:34 +0000 (11:56 +0100)]
KVM : Use official stable tarball
Cédric de Saint Martin [Thu, 10 Nov 2011 10:55:59 +0000 (11:55 +0100)]
KVM : Add missing glib library to ldflags
Łukasz Nowak [Thu, 10 Nov 2011 11:00:39 +0000 (12:00 +0100)]
websockify is needed only for kvm software, not stack.
Łukasz Nowak [Thu, 10 Nov 2011 10:52:01 +0000 (11:52 +0100)]
Download and build websockify from git.
Kazuhiko Shiozaki [Thu, 10 Nov 2011 08:37:54 +0000 (09:37 +0100)]
version up : LibreOffice 3.4.4
Alain Takoudjou [Thu, 10 Nov 2011 08:32:12 +0000 (09:32 +0100)]
Merge branch 'lamp' into master
Alain Takoudjou [Wed, 9 Nov 2011 15:58:34 +0000 (16:58 +0100)]
Set correct certificate for Alain and Sebastian
Sebastien Robin [Wed, 9 Nov 2011 15:24:14 +0000 (16:24 +0100)]
seb certificate was not correct, set correct one
Alain Takoudjou [Wed, 9 Nov 2011 14:56:37 +0000 (15:56 +0100)]
Update Netifaces version from 0.5 to 0.6
Alain Takoudjou [Wed, 9 Nov 2011 14:55:22 +0000 (15:55 +0100)]
Clean cclient__compile__ directory
Cédric de Saint Martin [Wed, 9 Nov 2011 14:48:48 +0000 (09:48 -0500)]
Use KVM 0.15, checkout from official git repo
Cédric de Saint Martin [Wed, 9 Nov 2011 14:18:28 +0000 (09:18 -0500)]
gnutls part is not needed
Cédric de Saint Martin [Wed, 9 Nov 2011 14:17:53 +0000 (09:17 -0500)]
Update dependencies of KVM
Cédric de Saint Martin [Wed, 9 Nov 2011 14:16:10 +0000 (15:16 +0100)]
Use 0.15 release of kvm
Cédric de Saint Martin [Wed, 9 Nov 2011 13:56:54 +0000 (08:56 -0500)]
Update kvm source code, add missing pkgconfig binary path
Kazuhiko Shiozaki [Wed, 9 Nov 2011 10:13:41 +0000 (11:13 +0100)]
make build options more similar to official MariaDB build, i.e. enable XtraDB by default etc.
Alain Takoudjou [Tue, 8 Nov 2011 16:49:12 +0000 (17:49 +0100)]
Merge branch 'master' of https://git.erp5.org/repos/slapos
Alain Takoudjou [Tue, 8 Nov 2011 16:48:03 +0000 (17:48 +0100)]
Merge branch 'lamp' into master
Alain Takoudjou [Tue, 8 Nov 2011 16:40:42 +0000 (17:40 +0100)]
Add update versions and application parts of software.cfg
Alain Takoudjou [Tue, 8 Nov 2011 16:39:05 +0000 (17:39 +0100)]
clean MySQL compile dir + add my shacache certificate
Kazuhiko Shiozaki [Tue, 8 Nov 2011 12:56:45 +0000 (13:56 +0100)]
initialise user-defined functions in mysql_update.
Kazuhiko Shiozaki [Tue, 8 Nov 2011 12:17:12 +0000 (13:17 +0100)]
use XtraDB instead of the original InnoDB plugin, and enable Sphinx and groonga storage engines.
Cédric de Saint Martin [Tue, 8 Nov 2011 11:26:35 +0000 (12:26 +0100)]
Advertise development of new version
Cédric de Saint Martin [Tue, 8 Nov 2011 11:23:19 +0000 (12:23 +0100)]
Release slapos.cookbook-0.34
Alain Takoudjou [Tue, 8 Nov 2011 10:40:59 +0000 (11:40 +0100)]
Merge branch 'lamp' into master
Alain Takoudjou [Tue, 8 Nov 2011 10:22:46 +0000 (11:22 +0100)]
Add the default php.ini.in for lamp-template
Alain Takoudjou [Tue, 8 Nov 2011 10:20:27 +0000 (11:20 +0100)]
integratation of slapos.recipe.build:download-unpacked into software.cfg
Alain Takoudjou [Tue, 8 Nov 2011 10:15:49 +0000 (11:15 +0100)]
Any software can specify its own php.ini
Łukasz Nowak [Mon, 7 Nov 2011 13:22:16 +0000 (14:22 +0100)]
Merge branch 'master' into slapos
Conflicts:
setup.py
Łukasz Nowak [Mon, 5 Sep 2011 14:33:29 +0000 (16:33 +0200)]
Download functionality was moved to slapos.recipe.build
Conflicts:
setup.py
Łukasz Nowak [Mon, 7 Nov 2011 13:16:17 +0000 (14:16 +0100)]
Stabilise versions.
Łukasz Nowak [Mon, 7 Nov 2011 12:39:52 +0000 (13:39 +0100)]
Install bang executable.
Łukasz Nowak [Mon, 3 Oct 2011 09:20:26 +0000 (11:20 +0200)]
Now this problem shall be solved by networkcache.
Additionaly this selects different lxml egg, and "disables" lxml building hack.
Signed-off-by: Cédric de Saint Martin <cedric.dsm@tiolive.com>
Antoine Catton [Mon, 7 Nov 2011 09:48:52 +0000 (10:48 +0100)]
stunnel: version up 4.45 to 4.46
ChangeLog entry :
* New features
- Added Unix socket support (e.g. "connect = /var/run/stunnel/socket").
- Added "verify = 4" mode to ignore CA chain and only verify peer certificate.
- Removed the limit of 16 IP addresses for a single 'connect' option.
- Removed the limit of 256 stunnel.conf sections in PTHREAD threading model.
It is still not possible have more than 63 sections on WIN32 platform.
* Optimizations
- Reduced per-connection memory usage.
- Performed a major refactoring of internal data structures. Extensive
internal testing was performed, but some regression bugs are expected.
* Bugfixes
- Fixed WIN32 compilation with Mingw32.
- Fixed non-blocking API emulation layer in UCONTEXT threading model.
- Fixed signal handling in UCONTEXT threading model.
Cédric de Saint Martin [Mon, 7 Nov 2011 09:28:26 +0000 (10:28 +0100)]
Add allow-hosts to kvm stack
Guillaume Bottex [Wed, 28 Sep 2011 16:01:06 +0000 (18:01 +0200)]
Whitespace.
Signed-off-by: Cédric de Saint Martin <cedric.dsm@tiolive.com>
Guillaume Bottex [Tue, 27 Sep 2011 11:36:06 +0000 (13:36 +0200)]
Resetting java jre 1.6.0, adding java sdk 1.6.0.
The pacth allows the jdk to be installed without user
interaction.
The jdk 1.6.0 is required to build cubrid.
Signed-off-by: Cédric de Saint Martin <cedric.dsm@tiolive.com>
Guillaume Bottex [Wed, 31 Aug 2011 12:47:09 +0000 (14:47 +0200)]
Update java software release to install a JDK.
Signed-off-by: Cédric de Saint Martin <cedric.dsm@tiolive.com>
Gabriel Monnerat [Fri, 4 Nov 2011 12:48:22 +0000 (13:48 +0100)]
increase version of package netifaces because the version 0.4 is not provided anymore. I used the networkcache configuration to upload the package in the new version
Kazuhiko Shiozaki [Wed, 2 Nov 2011 14:12:08 +0000 (15:12 +0100)]
update groonga-storage-engine-1.0.1-mariadb.patch to fix more bugs.
Kazuhiko Shiozaki [Tue, 1 Nov 2011 18:19:11 +0000 (19:19 +0100)]
build groonga-storage-engine-mariadb in ERP5 stack.
Arnaud Fontaine [Tue, 1 Nov 2011 11:56:15 +0000 (20:56 +0900)]
Add IPA fonts for Japanese.
Kazuhiko Shiozaki [Mon, 31 Oct 2011 17:08:57 +0000 (18:08 +0100)]
version up : groonga storage engine 1.0.1.
Sebastien Robin [Mon, 31 Oct 2011 14:14:10 +0000 (15:14 +0100)]
Advertise development of new version
Sebastien Robin [Mon, 31 Oct 2011 14:09:05 +0000 (15:09 +0100)]
Release slapos.cookbook-0.33
Sebastien Robin [Mon, 31 Oct 2011 14:03:57 +0000 (15:03 +0100)]
use percona toolkit instead of maatkit when instanciating erp5
Maatkit is not maintained any more and is replaced by Percona
Toolkit (http://www.percona.com/software/percona-toolkit/).
hostname symlink was added in bin folder of partition since
it is used by some of the percona toolkit tools.
Sebastien Robin [Mon, 31 Oct 2011 14:03:57 +0000 (15:03 +0100)]
use percona toolkit instead of maatkit when instanciating erp5
Maatkit is not maintained any more and is replaced by Percona
Toolkit (http://www.percona.com/software/percona-toolkit/).
hostname symlink was added in bin folder of partition since
it is used by some of the percona toolkit tools.
Sebastien Robin [Mon, 31 Oct 2011 14:03:38 +0000 (15:03 +0100)]
use percona toolkit instead of maatkit
Maatkit is not maintained any more and is replaced by Percona
Toolkit (http://www.percona.com/software/percona-toolkit/).
hostname symlink was added in bin folder of partition since
it is used by some of the percona toolkit tools.
Alain Takoudjou [Mon, 31 Oct 2011 13:38:02 +0000 (14:38 +0100)]
Remove useless part and update application part.
Alain Takoudjou [Mon, 31 Oct 2011 13:34:14 +0000 (14:34 +0100)]
fix some details in lamp recipe
Cédric de Saint Martin [Fri, 28 Oct 2011 12:34:51 +0000 (14:34 +0200)]
Advertise development of new version
Cédric de Saint Martin [Fri, 28 Oct 2011 12:33:29 +0000 (14:33 +0200)]
Release slapos.cookbook-0.32
Alain Takoudjou [Thu, 27 Oct 2011 17:06:21 +0000 (18:06 +0100)]
Update CHANGES.txt
Alain Takoudjou [Thu, 27 Oct 2011 16:50:15 +0000 (17:50 +0100)]
Merge branch 'master' of https://git.erp5.org/repos/slapos
Alain Takoudjou [Thu, 27 Oct 2011 16:29:09 +0000 (17:29 +0100)]
fix some bugs in recipe LAMP
Alain Takoudjou [Thu, 27 Oct 2011 12:59:53 +0000 (13:59 +0100)]
Update php application and remove useless parts
Alain Takoudjou [Thu, 27 Oct 2011 10:36:38 +0000 (11:36 +0100)]
Update lamp: resolution of some inconsistency
Alain Takoudjou [Thu, 27 Oct 2011 08:44:12 +0000 (09:44 +0100)]
Update lamp recipe and remove MySQLdb dependance
Łukasz Nowak [Wed, 26 Oct 2011 13:23:15 +0000 (15:23 +0200)]
Honour make-options in self make call.
Łukasz Nowak [Tue, 25 Oct 2011 14:26:57 +0000 (16:26 +0200)]
Pick up the newest slapos patched buildout.
Łukasz Nowak [Tue, 25 Oct 2011 08:45:35 +0000 (10:45 +0200)]
Build pycrypto with local gmp.
So put out gmp as self component.
Alain Takoudjou [Tue, 25 Oct 2011 13:45:27 +0000 (14:45 +0100)]
Merge branch 'lamp' of https://git.erp5.org/repos/slapos into lamp
Alain Takoudjou [Tue, 25 Oct 2011 13:35:42 +0000 (14:35 +0100)]
Remove useless part
Alain Takoudjou [Tue, 25 Oct 2011 13:32:57 +0000 (14:32 +0100)]
[application-template] is now optional into PHP application
Antoine Catton [Tue, 25 Oct 2011 12:12:00 +0000 (14:12 +0200)]
Upgrade stunnel from 4.44 to 4.45
Łukasz Nowak [Tue, 25 Oct 2011 08:46:28 +0000 (10:46 +0200)]
Install pycrypto as develop egg.
Drop ERP5's stack workaround, as pycrypto component is now responsible
for delivering correctly configured egg.
Łukasz Nowak [Tue, 25 Oct 2011 08:45:35 +0000 (10:45 +0200)]
Build pycrypto with local gmp.
So put out gmp as self component.
Łukasz Nowak [Tue, 25 Oct 2011 07:50:36 +0000 (09:50 +0200)]
Pin pycrypto to non autotools version.
This allow to install erp5 until proper solution will be found.
Cédric de Saint Martin [Mon, 24 Oct 2011 14:39:57 +0000 (16:39 +0200)]
Pin versions
Łukasz Nowak [Mon, 3 Oct 2011 09:20:26 +0000 (11:20 +0200)]
Now this problem shall be solved by networkcache.
Additionaly this selects different lxml egg, and "disables" lxml building hack.
Signed-off-by: Cédric de Saint Martin <cedric.dsm@tiolive.com>
Cédric de Saint Martin [Mon, 24 Oct 2011 14:06:13 +0000 (16:06 +0200)]
Merge branch 'master' into webrunner
Cédric de Saint Martin [Fri, 21 Oct 2011 15:44:47 +0000 (17:44 +0200)]
Typo
Cédric de Saint Martin [Fri, 21 Oct 2011 15:42:23 +0000 (17:42 +0200)]
Add shacache signatures
Łukasz Nowak [Mon, 3 Oct 2011 09:20:26 +0000 (11:20 +0200)]
Now this problem shall be solved by networkcache.
Additionaly this selects different lxml egg, and "disables" lxml building hack.
Signed-off-by: Cédric de Saint Martin <cedric.dsm@tiolive.com>
Cédric de Saint Martin [Fri, 21 Oct 2011 14:53:23 +0000 (16:53 +0200)]
Remove unused part
Cédric de Saint Martin [Fri, 21 Oct 2011 14:53:02 +0000 (16:53 +0200)]
Add workaround to h.r.cmmi unrespectful behavior
Kazuhiko Shiozaki [Fri, 21 Oct 2011 13:57:17 +0000 (15:57 +0200)]
version up : FreeType 2.4.7 including CVE-2011-3256 fix.
Cédric de Saint Martin [Fri, 21 Oct 2011 12:45:29 +0000 (14:45 +0200)]
Allow buildout to fetch netifaces from its origin site
Signed-off-by: Cédric de Saint Martin <cedric.dsm@tiolive.com>
Cédric de Saint Martin [Fri, 21 Oct 2011 12:45:29 +0000 (14:45 +0200)]
Allow buildout to fetch netifaces from its origin site
Łukasz Nowak [Mon, 17 Oct 2011 11:46:20 +0000 (13:46 +0200)]
Allow to fetch netifaces from original site.
They are not available on pypi.
Signed-off-by: Cédric de Saint Martin <cedric.dsm@tiolive.com>
Kazuhiko Shiozaki [Fri, 21 Oct 2011 08:21:05 +0000 (10:21 +0200)]
version up : Grep 2.9
Kazuhiko Shiozaki [Thu, 20 Oct 2011 20:05:15 +0000 (22:05 +0200)]
version up : Gnu DBM 1.9.1
Kazuhiko Shiozaki [Thu, 20 Oct 2011 20:04:28 +0000 (22:04 +0200)]
version up : ImageMagick 6.7.3-1
Kazuhiko Shiozaki [Thu, 20 Oct 2011 20:03:43 +0000 (22:03 +0200)]
version up : MariaDB 5.3.2-beta
Alain Takoudjou [Thu, 20 Oct 2011 14:29:00 +0000 (15:29 +0100)]
Merge branch 'lamp' into master:
commit
9486fa3d33ed70722df0ab78cf0d60f4b1bcab4b
Author: Alain Takoudjou <talino@tiolive.com>
Date: Thu Oct 20 12:51:52 2011 +0100
Add documentation for lamp recipe
commit
cb684d1170c04ff6ad193b25fb181c71ccded042
Author: Alain Takoudjou <talino@tiolive.com>
Date: Thu Oct 20 11:07:40 2011 +0100
Add PunBB [Forum] software release
commit
1b2209ee64fea3854c4a8d0f9c7be1badaf2addb
Author: Alain Takoudjou <talino@tiolive.com>
Date: Thu Oct 20 10:24:25 2011 +0100
Add B2evolution [blog] software release
commit
adf2972b4678b47ef8b4debdeecaf08536d131d3
Author: Alain Takoudjou <talino@tiolive.com>
Date: Thu Oct 20 10:19:01 2011 +0100
Restore lamp-template/software.cfg after the merge of lamp with master
commit
9b07d7c1a64b6ff346bfe444664787ff60886033
Author: Alain Takoudjou <talino@tiolive.com>
Date: Wed Oct 19 15:35:46 2011 +0100
Restore lamp.cfg
commit
4804e7aa0c1f99aad61732955f9da4a486f6aed0
Author: Alain Takoudjou <talino@tiolive.com>
Date: Wed Oct 19 15:31:37 2011 +0100
Add comment and fix indentation
Kazuhiko Shiozaki [Thu, 20 Oct 2011 12:47:06 +0000 (14:47 +0200)]
cleanup.
Kazuhiko Shiozaki [Thu, 20 Oct 2011 09:40:43 +0000 (11:40 +0200)]
add a patch to detect gcc version correctly for OpenSuse's gcc-4.4.
Cédric de Saint Martin [Tue, 18 Oct 2011 17:13:59 +0000 (19:13 +0200)]
Advertise development of new version
Cédric de Saint Martin [Tue, 18 Oct 2011 17:12:04 +0000 (19:12 +0200)]
Release slapos.cookbook-0.31