merge master into cloudooo branch

.gitignore

@@ -8,3 +8,4 @@ downloads/
 eggs/
 parts/
 slapos.cookbook.egg-info
+.*.swp

CHANGES.txt

 Changes
 =======
 
-0.21 (unreleased)
+0.41 (Unreleased)
 -----------------
 
- * No change yet.
+ * No change yet
+
+0.40 (2012-03-01)
+-----------------
+
+ * apache_frontend initial release. [Cedric de Saint Martin]
+ 
+0.39 (2012-02-20)
+-----------------
+
+ * seleniumrunner initial release. [Cedric de Saint Martin]
+
+0.38 (2011-12-05)
+-----------------
+
+ * erp5: Swtich to percona, as maatkit is obsoleted. [Sebastien Robin]
+ * erp5: Improve haproxy configuration. [Sebastien Robin]
+ * erp5: Support sphinxd. [Kazuhiko Shiozaki]
+ * erp5: Improve and make logging more usual. [Sebastien Robin]
+ * erp5: Allow mysql connection from localhost. [Romain Courteaud]
+ * erp5: Allow to control Zope/Zeo cache [Arnaud Fontaine]
+ * erp5: Increase precision in logs [Julien Muchembled]
+ * erp5: Improve erp5 update [Arnaud Fontaine, Rafael Monnerat]
+
+0.37 (2011-11-24)
+-----------------
+
+ * KVM : allow access to several KVM instances without SSL certificate duplicate
+   problem. [Cedric de Saint Martin]
+
+0.36 (2011-11-16)
+-----------------
+
+ * erp5testnode : the code of testnode is not in slapos repository anymore
+
+0.35 (2011-11-10)
+-----------------
+
+ * KVM : Promise are now working properly. [Łukasz Nowak]
+ * KVM : Use NoVNC with automatic login. [Cedric de Saint Martin]
+ * KVM : Use websockify egg and remove numpy hack. [Cedric de Saint Martin]
+
+0.34 (2011-11-08)
+-----------------
+
+  * Any LAMP software can specify its own php.ini [Alain Takoudjou]
+  * LAMP : Fix bug where buildout does not has sufficient rights to update
+    application parts. [Alain Takoudjou]
+  * LAMP : Update formatting when returning list of renamed files.
+    [Alain Takoudjou]
+
+0.33 (2011-10-31)
+-----------------
+
+  * erp5 : use percona toolkit instead of maatkit [Sebastien Robin]
+
+0.32 (2011-10-28)
+-----------------
+
+  * LAMP : Recipe can now call lampconfigure from slapos.toolbox which will 
+   configure PHP application instance when needed. [Alain Takoudjou Kamdem]
+
+0.31 (2011-10-16)
+-----------------
+
+ * Split big redundant recipes into small ones. In order to factorize the code
+   and have everything in the buildout file. [Antoine Catton, Romain Courteaud,
+   Łukasz Nowak]
+ * LAMP : Update apache and php configuration files to work with a lot of different
+   PHP software. [Alain Takoudjou Kamdem]
+ * LAMP : Recipe can launch scripts, move or remove files or directories
+   when a given condition is filled. Useful when PHP apps require you to
+   remove "admin" directory after configuration for example.
+   [Alain Takoudjou Kamdem]
+
+0.30 (2011-10-06)
+-----------------
+
+ * LAMP : Update apache and php configuration files to work with a lot of different
+   PHP software. [Alain Takoudjou Kamdem]
+
+0.29 (2011-09-28)
+-----------------
+
+ * mysql: bug fix on database recovering (avoid importing dump two times). [Antoine Catton]
+
+0.28 (2011-09-27)
+-----------------
+
+ * lamp.request: requesting the mariadb software release instead of itself. [Antoine Catton]
+ * lamp.request: adding support of remote backup repo (using a different
+   software type). The default remote backup is a davstorage. [Antoine Catton]
+
+0.27 (2011-09-27)
+-----------------
+
+ * mysql: add backup and backup recovering using different software type. [Antoine Catton]
+
+0.26 (2011-09-27)
+-----------------
+
+ * Davstorage: returning more explicit url (using webdav scheme). [Antoine Catton]
+ * Other mysql minor fixes. [Antoine Catton]
+
+0.25 (2011-09-21)
+-----------------
+
+ * mysql: Restore to default behaviour. [Antoine Catton]
+ * mysql: Use mysqldump instead of non trustable backup system. [Antoine Catton]
+
+0.24 (2011-09-19)
+-----------------
+
+ * mysql: Unhardcode the requested url. [Antoine Catton]
+
+0.23 (2011-09-19)
+-----------------
+
+ * Clean code in mysql recipe [Cedric de Saint Martin]
+ * librecipe: Provide createPromiseWrapper method. [Antoine Catton]
+ * kvm: Expose promisee checks to slapgrid. [Antoine Catton]
+ * davstorage: Initial version. [Antoine Catton]
+ * mysql: Support DAV backup. [Antoine Catton]
+
+0.22 (2011-09-12)
+-----------------
+
+ * Fix haproxy setup for erp5 [Sebastien Robin]
+
+0.21 (2011-09-12)
+-----------------
+
+ * Update PHP configuration to set session and date options.
+   [Alain Takoudjou Kamdem]
+ * Improve logrotate policy and haproxy config for erp5
+   [Sebastien Robin]
 
 0.20 (2011-09-07)
 -----------------
@@ -23,10 +158,16 @@ Changes
 
  * Repackage egg to include needed .bin files. [Cedric de Saint Martin]
 
-0.17 (unreleased)
+0.17 (2011-08-25)
 -----------------
 
- * No changes yet.
+ * Add XWiki software release [Cedric de Saint Martin]
+
+0.16 (2011-07-15)
+-----------------
+
+ * Improve Vifib and pure ERP5 instantiation [Rafael Monnerat]
+ * Use configurator for Vifib [Rafael Monnerat]
 
 0.16 (2011-07-15)
 -----------------
@@ -65,9 +206,10 @@ Changes
 -----------------
 
  * Add PHPMyAdmin software release used in SlapOS tutorials
-   [Cedric de Saint Martin]
+ [Cedric de Saint Martin]
  * Add slaprunner software release [Cedric de Saint Martin]
 
+
 0.9 (2011-06-24)
 ----------------
 

MANIFEST.in

 include CHANGES.txt
-include slapos/recipe/erp5/template/site.zcml
+include slapos/recipe/generic_zope/template/site.zcml
 recursive-include slapos/recipe *.in
+recursive-include slapos/recipe *.bin
 recursive-include slapos/recipe README.*.txt

component/alsa/buildout.cfg

+[buildout]
+parts =
+  alsa
+
+[alsa]
+# Contains libasound
+recipe = hexagonit.recipe.cmmi
+url = ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.0.24.1.tar.bz2
+#md5sum = d55a9d7d2a79d738a1b7a511cffda4b6
+configure-options =
+  --disable-static
+  --disable-aload
+  --disable-mixer
+  --disable-pcm
+  --disable-rawmidi
+  --disable-hwdep
+  --disable-seq
+  --disable-ucm
+  --disable-alisp
+  --disable-old-symbols
+  --disable-python
\ No newline at end of file

component/apache/buildout.cfg

@@ -13,23 +13,13 @@ extends =
   ../sqlite3/buildout.cfg
   ../zlib/buildout.cfg
 
-[apache-CVE-2011-3368.patch]
-recipe = hexagonit.recipe.download
-md5sum = 1ad598213480ddfc239ce6359b7b2c0b
-url = http://www.apache.org/dist/httpd/patches/apply_to_2.2.21/CVE-2011-3368.patch
-filename = ${:_buildout_section_name_}
-download-only = true
-
 [apache]
 # inspired on http://old.aclark.net/team/aclark/blog/a-lamp-buildout-for-wordpress-and-other-php-apps/
 recipe = hexagonit.recipe.cmmi
 depends =
   ${gdbm:version}
-url = http://mir2.ovh.net/ftp.apache.org/dist//httpd/httpd-2.2.21.tar.bz2
-md5sum = 1696ae62cd879ab1d4dd9ff021a470f2
-patches =
-  ${apache-CVE-2011-3368.patch:location}/${apache-CVE-2011-3368.patch:filename}
-patch-options = -p1
+url = http://mir2.ovh.net/ftp.apache.org/dist//httpd/httpd-2.2.22.tar.bz2
+md5sum = 9fe3093194c8a57f085ff7c3fc43715f
 configure-options = --disable-static
                     --enable-authn-alias
                     --enable-bucketeer

component/binutils/buildout.cfg

+[buildout]
+parts =
+  binutils
+
+[binutils]
+recipe = hexagonit.recipe.cmmi
+url = http://ftp.gnu.org/gnu/binutils/binutils-2.21.1.tar.bz2
+md5sum = bde820eac53fa3a8d8696667418557ad

component/boa/buildout.cfg

+[buildout]
+
+parts = boa
+
+[boa-patch-ENOSYS]
+recipe = hexagonit.recipe.download
+url = http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/www-servers/boa/files/boa-0.94.14_rc21-ENOSYS.patch?revision=1.1
+filename = boa-0.94.14_rc21-ENOSYS.patch
+md5sum = 7206b342195961501ed1eae38486e5db
+download-only = true
+
+
+[boa]
+recipe = slapos.recipe.build
+url = http://www.boa.org/boa-0.94.14rc21.tar.gz
+md5sum = e24b570bd767a124fcfb40a34d148ba9
+patches =
+    ${boa-patch-ENOSYS:location}/${boa-patch-ENOSYS:filename}
+slapos_promise =
+    directory:bin/
+    file:bin/boa
+    file:bin/boa_indexer
+script = 
+    import shutil
+    import os
+    url = self.download(self.options['url'], self.options['md5sum'])
+    extract_dir = self.extract(url)
+    workdir = guessworkdir(extract_dir)
+    self.applyPatchList(self.options.get('patches'), '-p1', cwd=workdir)
+    call(['./configure'], cwd=workdir)
+    call(['make'], cwd=workdir)
+    # Installation of boa. Manually, no make install
+    os.makedirs('%(location)s/bin/')
+    shutil.copyfile(workdir + '/src/boa', '%(location)s/bin/boa')
+    os.chmod('%(location)s/bin/boa', 0755)
+    shutil.copyfile(workdir + '/src/boa_indexer', '%(location)s/bin/boa_indexer')
+    os.chmod('%(location)s/bin/boa_indexer', 0755)

component/busybox/buildout.cfg

+[buildout]
+
+parts = busybox
+
+[busybox]
+recipe = slapos.recipe.build
+url = http://busybox.net/downloads/busybox-1.19.3.tar.bz2
+md5sum = c3938e1ac59602387009bbf1dd1af7f6
+script =
+    extract_dir = self.extract(self.download(%(url)r, %(md5sum)r))
+    workdir = guessworkdir(extract_dir)
+    self.logger.info("Creating default configuration")
+    call(['make', 'defconfig'], cwd=workdir, env=env)
+    self.logger.info("Building")
+    call(['make'], cwd=workdir, env=env)
+    self.logger.info("Installing")
+    call(['make', 'CONFIG_PREFIX=%(location)s', 'install'], cwd=workdir, env=env)
+    self.logger.info("Installation finished")

component/ca-certificates/buildout.cfg

+# CA certificates
+
+[buildout]
+parts =
+  ca-certificates
+
+
+[ca-certificates-sbin-dir.patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+md5sum = 0b4e7d82ce768823c01954ee41ef177b
+filename = ${:_buildout_section_name_}
+download-only = true
+
+[ca-certificates]
+recipe = hexagonit.recipe.cmmi
+version = 20120212
+url = ftp://ftp.free.fr/mirrors/ftp.debian.org/pool/main/c/ca-certificates/ca-certificates_${:version}.tar.gz
+patches =
+  ${ca-certificates-sbin-dir.patch:location}/${ca-certificates-sbin-dir.patch:filename}
+patch-options = -p0
+configure-command = true
+make-targets = install DESTDIR=${buildout:parts-directory}/${:_buildout_section_name_} CERTSDIR=certs SBINDIR=sbin

component/ca-certificates/ca-certificates-sbin-dir.patch

+--- Makefile.orig	2011-12-11 20:54:02.000000000 +0100
++++ Makefile	2012-01-09 17:36:55.059392824 +0100
+@@ -17,7 +17,7 @@
+ 
+ install:
+ 	for dir in $(SUBDIRS); do \
+-	  mkdir $(DESTDIR)/$(CERTSDIR)/$$dir; \
++	  mkdir -p $(DESTDIR)/$(CERTSDIR)/$$dir; \
+ 	  $(MAKE) -C $$dir install CERTSDIR=$(DESTDIR)/$(CERTSDIR)/$$dir; \
+ 	done
+ 	for dir in sbin; do \
+--- sbin/Makefile.orig	2011-12-11 20:54:02.000000000 +0100
++++ sbin/Makefile	2012-01-09 17:31:45.207387898 +0100
+@@ -3,9 +3,12 @@
+ #
+ #
+ 
++SBINDIR=/usr/sbin
++
+ all:
+ 
+ clean:
+ 
+ install:
+-	install -m755 update-ca-certificates $(DESTDIR)/usr/sbin/
++	mkdir -p $(DESTDIR)/$(SBINDIR)
++	install -m755 update-ca-certificates $(DESTDIR)/$(SBINDIR)

component/cclient/buildout.cfg

@@ -12,16 +12,15 @@ parts =
 [cclient-patch]
 recipe = slapos.recipe.download
 url = ${:_profile_base_location_}/imap-2007f.patch
-#md5sum = Student may put here md5sum of this file, this is good idea
-download-only = True
+md5sum = 42c77fdd5d7a976fc302b93aadb3da98
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 filename = imap-2007f.patch
 
 [cclient]
 recipe = hexagonit.recipe.cmmi
 url = ftp://ftp.cac.washington.edu/imap/imap-2007f.tar.gz
+md5sum = 2126fd125ea26b73b20f01fcd5940369
 configure-command = true
-keep-compile-dir = true
 # cclient does not support parallel compilation
 make-options = 
   slx

component/cclient/imap-2007f.patch

 --- old/Makefile	2011-09-22 13:19:53.000000000 +0100
-+++ new/Makefile	2011-09-23 11:29:12.405271442 +0100
-@@ -580,7 +580,6 @@
++++ new/Makefile	2011-11-09 15:02:54.038306922 +0100
+@@ -280,7 +280,11 @@
+ SYSTEM=unix
+ TOOLS=tools
+ TOUCH=touch
+-
++IMAPDIR=$(CCLIENT)/cclient
++COMPILEDIR = $(CCLIENT)/cclient__compile__/imap-2007f
++CP=cp -r
++INSTALL=install
++FOR=for
+ 
+ # Primary build command
+ 
+@@ -580,7 +584,6 @@
  	@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  	@echo
  	@echo Do you want to continue this build anyway?  Type y or n please:
@@ -8,7 +21,7 @@
  
  nounenc:
  	@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-@@ -639,7 +638,7 @@
+@@ -639,7 +642,7 @@
  	@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  	@echo
  	@echo Do you want to build with IPv6 anyway?  Type y or n please:
@@ -17,15 +30,27 @@
  	@echo OK, I will remember that you really want to build with IPv6.
  	@echo You will not see this message again.
  	@$(TOUCH) ip6
-@@ -731,6 +730,12 @@
+@@ -731,6 +734,24 @@
  	$(SH) -c '$(RM) an ua OSTYPE SPECIALS c-client mtest imapd ipopd mailutil mlock dmail tmail || true'
  	$(CD) tools;$(MAKE) clean
  
-+install:
-+	install -v -d $(CCLIENT)/cclient/include
-+	ln -svf $(CCLIENT)/cclient__compile__/imap-2007f/c-client $(CCLIENT)/cclient/include
-+	install -v -d $(CCLIENT)/cclient/lib
-+	ln -svf $(CCLIENT)/cclient__compile__/imap-2007f/c-client/c-client.a $(CCLIENT)/cclient/lib/libc-client.a
++install:	
++	$(INSTALL) -v -d $(IMAPDIR)/include
++	$(INSTALL) -v -d $(IMAPDIR)/lib
++	$(INSTALL) -v -m 644 $(COMPILEDIR)/c-client/*.h $(IMAPDIR)/include
++	$(INSTALL) -v -m 644 $(COMPILEDIR)/c-client/c-client.a $(IMAPDIR)/lib
++	$(CP) $(COMPILEDIR)/ipopd $(COMPILEDIR)/mailutil $(COMPILEDIR)/imapd \
++	$(COMPILEDIR)/dmail $(COMPILEDIR)/mlock $(COMPILEDIR)/mtest $(COMPILEDIR)/tmail $(IMAPDIR)
++	$(RM) $(IMAPDIR)/ipopd/*.h $(IMAPDIR)/ipopd/*.c $(IMAPDIR)/ipopd/Makefile;
++	$(RM) $(IMAPDIR)/mailutil/*.h $(IMAPDIR)/mailutil/*.c $(IMAPDIR)/mailutil/Makefile;
++	$(RM) $(IMAPDIR)/imapd/*.h $(IMAPDIR)/imapd/*.c $(IMAPDIR)/imapd/Makefile;
++	$(RM) $(IMAPDIR)/tmail/*.h $(IMAPDIR)/tmail/*.c $(IMAPDIR)/tmail/Makefile;
++	$(RM) $(IMAPDIR)/mlock/*.h $(IMAPDIR)/mlock/*.c $(IMAPDIR)/mlock/Makefile;
++	$(RM) $(IMAPDIR)/mtest/*.h $(IMAPDIR)/mtest/*.c $(IMAPDIR)/mtest/Makefile;
++	$(RM) $(IMAPDIR)/dmail/*.h $(IMAPDIR)/dmail/*.c $(IMAPDIR)/dmail/Makefile;
++	$(INSTALL) -v -m 644 $(COMPILEDIR)/ip6 $(IMAPDIR)
++	$(INSTALL) -v -m 644 $(COMPILEDIR)/OSTYPE $(IMAPDIR)
++	$(INSTALL) -v -m 644 $(COMPILEDIR)/SPECIALS $(IMAPDIR)
 +
  
  # A monument to a hack of long ago and far away...

component/chromium/buildout.cfg

+[buildout]
+extends =
+  ../dbus/buildout.cfg
+  ../fontconfig/buildout.cfg
+  ../glib/buildout.cfg
+  ../gtk-2/buildout.cfg
+  ../libpng/buildout.cfg
+  ../xorg/buildout.cfg
+
+parts = 
+  chromium
+  
+[chromium]
+recipe = slapos.recipe.build
+slapos_promise =
+  file:chrome
+  file:chrome-wrapper
+  file:chrome-slapos
+
+#chromium zip files for linux seem to be corrupted : rights are not correctly
+#set (+x) when unzipping using python, but it works when doing "unzip chromium.zip"
+#AND it works when unzipping any other archive with python.
+#Conclusion : Google, please, learn how to make zip files.
+linux_x86 = http://commondatastorage.googleapis.com/chromium-browser-continuous/Linux/109696/chrome-linux.zip 8ba6c022849b2a882b6e65163c147eb9
+linux_x86-64 = http://commondatastorage.googleapis.com/chromium-browser-snapshots/Linux_x64/109696/chrome-linux.zip a3ed3feb285ecfe7c722576db80d5099
+mac_x86-64 = http://commondatastorage.googleapis.com/chromium-browser-continuous/Mac/100142/chrome-mac.zip cb3a76b8a1a93be94df2f500fb621131
+
+script =
+  #If part directory already exist, will just throw an error.
+  import sys
+  platform = '%%s_%%s' %% (guessOperatingSystem(), guessPlatform())
+  if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[platform].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", "chrome-slapos")
+  wrapper = open(wrapper_location, 'w')
+  wrapper.write("""#!/bin/sh
+  export LD_LIBRARY_PATH=${libXrender:location}/lib/:${fontconfig:location}/lib/:${dbus:location}/lib/:${dbus-glib:location}/lib/:${pango:location}/lib:${cairo:location}/lib:${glib:location}/lib:${gtk-2:location}/lib:${atk:location}/lib:${gdk-pixbuf:location}/lib:${libXt:location}/lib:${gtk-2:location}/lib:${libpng:location}/lib:%(location)s
+  %(location)s/chrome""")
+  wrapper.flush()
+  wrapper.close()
+  os.chmod(wrapper_location, 0766)
+  os.chmod(os.path.join("%(location)s", 'chrome'), 0766)
+  os.chmod(os.path.join("%(location)s", 'chrome-wrapper'), 0766)
+
+# requirements : libXrender1 libxss1 x11-common
\ No newline at end of file

component/cmake/buildout.cfg

@@ -4,5 +4,5 @@ parts =
 
 [cmake]
 recipe = hexagonit.recipe.cmmi
-url = http://www.cmake.org/files/v2.8/cmake-2.8.3.tar.gz
-md5sum = a76a44b93acf5e3badda9de111385921
+url = http://www.cmake.org/files/v2.8/cmake-2.8.6.tar.gz
+md5sum = 2147da452fd9212bb9b4542a9eee9d5b

component/corosync/buildout.cfg

+[buildout]
+extends =
+  nss.cfg
+parts =
+  corocosync
+
+[corosync]
+recipe = hexagonit.recipe.cmmi
+url = ftp://ftp:downloads@corosync.org/downloads/corosync-1.3.1/corosync-1.3.1.tar.gz
+md5sum = c58459a009a3a9d0b9c00e276a190d90
+environment =
+  CPPFLAGS=-I${nspr:location}/include/nspr -I${nss:location}/include/nss
+  PKG_CONFIG_PATH=${nss:location}/lib/pkgconfig:${nspr:location}/lib/pkgconfig
+  LDFLAGS =-L${nspr:location}/lib -Wl,-rpath=${nspr:location}/lib -L${nss:location}/lib -Wl,-rpath=${nss:location}/lib -Wl,-rpath=${buildout:parts-directory}/${:_buildout_section_name_}/lib

component/curl/buildout.cfg

@@ -11,8 +11,8 @@ parts =
 
 [curl]
 recipe = hexagonit.recipe.cmmi
-url = http://curl.haxx.se/download/curl-7.21.7.tar.bz2
-md5sum = 5f6d50c4d4ee38c57fe37e3cff75adbd
+url = http://curl.haxx.se/download/curl-7.24.0.tar.bz2
+#md5sum = 5f6d50c4d4ee38c57fe37e3cff75adbd
 configure-options =
   --disable-static
   --disable-ldap

component/cyrus-sasl/cyrus-sasl-prototype-declaration.patch

---- cyrus-sasl-2.1.23/include/sasl.h	2010-11-25 18:15:05.000000000 +0100
-+++ cyrus-sasl-2.1.23/include/sasl.h	2010-11-25 18:15:34.000000000 +0100
-@@ -346,7 +346,7 @@
-      * Mechanisms must ignore callbacks with id's they don't recognize.
-      */
-     unsigned long id;
--    int (*proc)();   /* Callback function.  Types of arguments vary by 'id' */
-+    int (*proc);   /* Callback function.  Types of arguments vary by 'id' */
-     void *context;
- } sasl_callback_t;
- 

component/dash/buildout.cfg

+[buildout]
+
+parts = dash
+
+[dash]
+recipe = hexagonit.recipe.cmmi
+url = http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.7.tar.gz
+md5sum = f6cedb10ae7258adb5ab17a10ae80d51
+configure-options =
+  --disable-static
+  --disable-fnmatch
+  --disable-glob

component/dbus/buildout.cfg

+[buildout]
+extends =
+  ../libxml2/buildout.cfg
+  ../pkgconfig/buildout.cfg
+  ../libexpat/buildout.cfg
+
+parts =
+  dbus
+
+[dbus]
+recipe = hexagonit.recipe.cmmi
+url = http://dbus.freedesktop.org/releases/dbus/dbus-1.4.10.tar.gz
+md5sum = 402a2f8102bedbe236e2891b2b0f31c2
+configure-options = 
+  --disable-static
+environment =
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${libxml2:location}/lib/pkgconfig
+  CPPFLAGS=-I${libexpat:location}/include
+  LDFLAGS=-L${libexpat:location}/lib
+
+[dbus-glib]
+recipe = hexagonit.recipe.cmmi
+url = http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.94.tar.gz
+md5sum = e1f1506a6f4941e67bffd614b1ad5af6
+environment =
+  PATH=${pkgconfig:location}/bin:${glib:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${dbus:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig
+  CPPFLAGS=-I${libexpat:location}/include
+  LDFLAGS=-L${libexpat:location}/lib -L${gettext:location}/lib

component/dropbear/buildout.cfg

@@ -13,7 +13,7 @@ parts =
 
 [dropbear-userspace-patch]
 recipe = hexagonit.recipe.download
-md5sum = 89f575b9a9586b04ef9073c9c3af13ae
+md5sum = 3d934c2c90e8c57536a4fa2cf8ad216d
 url = ${:_profile_base_location_}/${:filename}
 filename = userspace.patch
 download-only = true
@@ -25,15 +25,31 @@ url = ${:_profile_base_location_}/${:filename}
 filename = ipv6-support.patch
 download-only = true
 
+[dropbear-no-shell-check-patch]
+recipe = hexagonit.recipe.download
+md5sum = bb2ac410bd4cb2b07c23bfcc712e45f7
+url = ${:_profile_base_location_}/${:filename}
+filename = no-shell-checking.patch
+download-only = true
+
+[dropbear-static_build_fix.patch]
+recipe = hexagonit.recipe.download
+md5sum = 6e0ccc1949dfa31b4bc3951b9bb6472e
+url = ${:_profile_base_location_}/${:filename}
+filename = dropbear-0.53.1-static_build_fix.patch
+download-only = true
+
 [dropbear]
 recipe = hexagonit.recipe.cmmi
 md5sum = 0284ea239083f04c8b874e08e1aca243
-url = http://matt.ucc.asn.au/dropbear/dropbear-0.53.1.tar.bz2
+# XXX: We still use an old version of dropbear instead of the last one
+#      in order have all patches working.
+url = http://matt.ucc.asn.au/dropbear/releases/dropbear-0.53.1.tar.bz2
 
 configure-options =
   --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
   --with-zlib=${zlib:location}
-  CFLAGS="-DENABLE_SINGLEUSER "
+  CFLAGS="-DENABLE_SINGLEUSER -D__DIRTY_NO_SHELL_CHECKING"
 
 environment =
   CPPFLAGS =-I${zlib:location}/include
@@ -42,6 +58,8 @@ environment =
 patches=
   ${dropbear-userspace-patch:location}/${dropbear-userspace-patch:filename}
   ${dropbear-ipv6-patch:location}/${dropbear-ipv6-patch:filename}
+  ${dropbear-no-shell-check-patch:location}/${dropbear-no-shell-check-patch:filename}
+  ${dropbear-static_build_fix.patch:location}/${dropbear-static_build_fix.patch:filename}
 
 patch-options=
   -p1

component/dropbear/dropbear-0.53.1-static_build_fix.patch

+--- a/Makefile.in	2012-02-13 18:01:23.505279581 +0100
++++ b/Makefile.in	2012-02-13 18:04:17.070140233 +0100
+@@ -77,7 +77,7 @@
+ INSTALL=@INSTALL@
+ CPPFLAGS=@CPPFLAGS@
+ CFLAGS+=-I. -I$(srcdir) $(CPPFLAGS) @CFLAGS@
+-LIBS+=@LIBS@
++LIBS+=@CRYPTLIB@ @LIBS@
+ LDFLAGS=@LDFLAGS@
+ 
+ EXEEXT=@EXEEXT@

component/dropbear/no-shell-checking.patch

+diff --git a/svr-auth.c b/svr-auth.c
+index 87e3c5e..8b93a22 100644
+--- a/svr-auth.c
++++ b/svr-auth.c
+@@ -267,6 +267,7 @@ static int checkusername(unsigned char *username, unsigned int userlen) {
+ 		usershell = "/bin/sh";
+ 	}
+ 
++#ifndef __DIRTY_NO_SHELL_CHECKING
+ 	/* check the shell is valid. If /etc/shells doesn't exist, getusershell()
+ 	 * should return some standard shells like "/bin/sh" and "/bin/csh" (this
+ 	 * is platform-specific) */
+@@ -288,6 +289,7 @@ static int checkusername(unsigned char *username, unsigned int userlen) {
+ 	
+ goodshell:
+ 	endusershell();
++#endif
+ 	TRACE(("matching shell"))
+ 
+ 	TRACE(("uid = %d", ses.authstate.pw_uid))

component/dropbear/userspace.patch

@@ -48,7 +48,7 @@ index 87e3c5e..adb2e8b 100644
 +	if (svr_opts.singleuser) {
 +		m_free(username);
 +		/* Get the current login of the user running dropbear */
-+		username = m_strdup(getlogin());
++		username = m_strdup(getpwuid(getuid())->pw_name);
 +	}
 +#endif /* ifdef ENABLE_SINGLEUSER */
  	servicename = buf_getstring(ses.payload, &servicelen);

component/erlang/buildout.cfg

+[buildout]
+parts =
+  erlang
+
+[erlang]
+recipe = hexagonit.recipe.cmmi
+url = http://www.erlang.org/download/otp_src_R14B03.tar.gz
+md5sum = 7979e662d11476b97c462feb7c132fb7

component/file/buildout.cfg

+# File - Determines file type using "magic" numbers
+# http://www.darwinsys.com/file/
+
 [buildout]
 parts = file
 extends =
   ../zlib/buildout.cfg
 
-
 [file]
 recipe = hexagonit.recipe.cmmi
-url = ftp://ftp.astron.com/pub/file/file-5.07.tar.gz
-md5sum = b8d1f9a8a644067bd0a703cebf3f4858
+url = ftp://ftp.astron.com/pub/file/file-5.10.tar.gz
+md5sum = 4cea34b087b060772511e066e2038196
 configure-options =
   --disable-static
 environment =

component/firefox/buildout.cfg

+[buildout]
+extends =
+  ../alsa/buildout.cfg
+  ../xorg/buildout.cfg
+  ../fontconfig/buildout.cfg
+  ../dbus/buildout.cfg
+  ../gtk-2/buildout.cfg
+  ../libpng/buildout.cfg
+
+parts =
+  firefox
+
+[firefox]
+recipe = slapos.recipe.build
+slapos_promise =
+  file:firefox
+  file:firefox-bin
+
+depends =
+  ${liberation-fonts:location}
+  ${ipaex-fonts:location}
+
+x86 = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/7.0.1/linux-i686/fr/firefox-7.0.1.tar.bz2 42c2559892f26ed2a0563faaf693a00f
+x86-64 = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/7.0.1/linux-x86_64/en-US/firefox-7.0.1.tar.bz2 20d6c8e3dfc97d08d1dec7d0479f924f
+
+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", "firefox-slapos")
+  wrapper = open(wrapper_location, 'w')
+  wrapper.write("""#!/bin/sh
+  cd %(location)s
+  export LD_LIBRARY_PATH=${libXrender:location}/lib/:${fontconfig:location}/lib/:${dbus:location}/lib/:${dbus-glib:location}/lib/:${pango:location}/lib:${cairo:location}/lib:${glib:location}/lib:${gtk-2:location}/lib:${atk:location}/lib:${gdk-pixbuf:location}/lib:${libXt:location}/lib:${libpng:location}/lib:${libSM:location}/lib:${libICE:location}/lib:${alsa:location}/lib:%(location)s
+  export PATH=${fontconfig:location}/bin:$PATH
+  %(location)s/firefox $*""")
+  wrapper.close()
+  os.chmod(wrapper_location, 0777)
+

component/fontconfig/buildout.cfg

@@ -13,6 +13,7 @@ parts =
 recipe = hexagonit.recipe.cmmi
 url = http://fontconfig.org/release/fontconfig-2.8.0.tar.gz
 md5sum = 77e15a92006ddc2adbb06f840d591c0e
+# XXX-Cedric : should we use --with-add-fonts={somefont:location}/share,{someotherfont:location}/share?
 configure-options =
   --disable-static
   --disable-docs

component/fonts/buildout.cfg

@@ -2,6 +2,7 @@
 parts =
   liberation-fonts
   ipaex-fonts
+  ipa-fonts
 
 [fonts]
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
@@ -16,7 +17,7 @@ url = https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-tt
 md5sum = 8150db1c6e27cacdfd524b563b85b69e
 destination = ${fonts:location}/${:_buildout_section_name_}
 
-# IPAex Font - Japanese fonts provided by IPA
+# IPAex and IPA Font - Japanese fonts provided by IPA
 # http://ossipedia.ipa.go.jp/ipafont/index.html
 [ipaex-fonts]
 recipe = hexagonit.recipe.download
@@ -24,3 +25,10 @@ strip-top-level-dir = true
 url = http://info.openlab.ipa.go.jp/ipafont/fontdata/IPAexfont00103.zip
 md5sum = ac67b2fc3aab7f683d89f0070df284e7
 destination = ${fonts:location}/${:_buildout_section_name_}
+
+[ipa-fonts]
+recipe = hexagonit.recipe.download
+strip-top-level-dir = true
+url = http://info.openlab.ipa.go.jp/ipafont/fontdata/IPAfont00303.zip
+md5sum = 39a828acf27790adbe4944dfb4d94bb1
+destination = ${fonts:location}/${:_buildout_section_name_}

component/freetype/buildout.cfg

@@ -10,8 +10,8 @@ parts =
 
 [freetype]
 recipe = hexagonit.recipe.cmmi
-url = http://download.savannah.gnu.org/releases/freetype/freetype-2.4.6.tar.bz2
-md5sum = 5e6510613f612809d2d7862592b92ab7
+url = http://download.savannah.gnu.org/releases/freetype/freetype-2.4.8.tar.bz2
+md5sum = dbf2caca1d3afd410a29217a9809d397
 configure-options =
   --disable-static
 environment =

component/gcc/buildout.cfg

@@ -63,6 +63,7 @@ md5sum = d7cd6a27c8801e66cbaa964a039ecfdb
 filename = ecj.jar
 
 [gcc-download]
+hack-revision = ${gcc-interconnection-workaround:hack-revision}
 recipe = hexagonit.recipe.download
 url = http://www.mirrorservice.org/sites/sourceware.org/pub/gcc/releases/gcc-4.5.3/gcc-4.5.3.tar.bz2
 md5sum = 8e0b5c12212e185f3e4383106bfa9cc6
@@ -70,6 +71,7 @@ strip-top-level-dir = True
 destination = ${gcc-source:location}
 
 [gcc-java-download]
+hack-revision = ${gcc-interconnection-workaround:hack-revision}
 recipe = hexagonit.recipe.download
 url = http://www.mirrorservice.org/sites/sourceware.org/pub/gcc/releases/gcc-4.5.3/gcc-java-4.5.3.tar.bz2
 md5sum = 08e045fdbdc22ac9af3aec3b8d16dbab
@@ -78,6 +80,7 @@ destination = ${gcc-source:location}
 ignore-existing = true
 
 [gcc-source]
+hack-revision = ${gcc-interconnection-workaround:hack-revision}
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 
 [gcc-multiarch.patch]
@@ -87,7 +90,15 @@ url = ${:_profile_base_location_}/${:filename}
 filename = ${:_buildout_section_name_}
 download-only = true
 
+[gcc-java-pre-4.4.patch]
+recipe = hexagonit.recipe.download
+md5sum = 9a563576126d9fcf234ef29c2fc7df76
+url = ${:_profile_base_location_}/${:filename}
+filename = ${:_buildout_section_name_}
+download-only = true
+
 [gcc-java-minimal]
+hack-revision = ${gcc-interconnection-workaround:hack-revision}
 depends =
   ${gcc-download:location}
   ${gcc-java-download:location}
@@ -96,6 +107,7 @@ path = ${gcc-source:location}
 md5sum = bb3265edf0fa7543e50cedb93e04e427
 patches =
   ${gcc-multiarch.patch:location}/${gcc-multiarch.patch:filename}
+  ${gcc-java-pre-4.4.patch:location}/${gcc-java-pre-4.4.patch:filename}
 patch-options = -p2
 configure-command = make clean \\; make distclean \\; ./configure
 # GMP does not correctly detect achitecture so it have to be given
@@ -121,6 +133,7 @@ environment =
 make-targets = install -j1
 
 [gcc]
+hack-revision = ${gcc-interconnection-workaround:hack-revision}
 depends =
   ${gcc-download:location}
   ${gcc-java-download:location}
@@ -151,3 +164,11 @@ environment =
   PATH=${zip:location}/bin:%(PATH)s
 # make install does not work when several core are used
 make-targets = install -j1
+
+[gcc-interconnection-workaround]
+# gcc parts are interconnected, so buildout is not capable to clean them up
+# until gcc will be simplified by using more robust build recipe (like
+# slapos.recipe.build) each time any of parts which reuses this one gets updated
+# the hack-revision have to be increased
+hack-revision = 1
+>>>>>>> master

component/gcc/gcc-java-pre-4.4.patch

+Patch for http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50888
+
+--- a/src/libjava/libjava/prims.cc.orig	2012-01-20 11:30:18.586157610 +0100
++++ b/src/libjava/libjava/prims.cc	2012-01-20 11:30:58.192770947 +0100
+@@ -38,6 +38,14 @@
+ #endif
+ 
+ #ifndef DISABLE_GETENV_PROPERTIES
++#ifdef __GLIBC__
++/* glibc 2.15+ provides even for C++ inline optimized ::isspace etc.
++   Unfortunately those inlines are throw (), and call a function pointer
++   (which is throw () too, but with -fnon-call-exceptions this results
++   in a __cxa_call_unexpected call.  This macro disables the optimized
++   version.  */
++#define __NO_CTYPE 1
++#endif
+ #include <ctype.h>
+ #include <java-props.h>
+ #define PROCESS_GCJ_PROPERTIES process_gcj_properties()
+--- a/src/libjava/prims.cc.orig	2012-01-20 11:30:23.042818341 +0100
++++ b/src/libjava/prims.cc	2012-01-20 11:31:01.389433254 +0100
+@@ -38,6 +38,14 @@
+ #endif
+ 
+ #ifndef DISABLE_GETENV_PROPERTIES
++#ifdef __GLIBC__
++/* glibc 2.15+ provides even for C++ inline optimized ::isspace etc.
++   Unfortunately those inlines are throw (), and call a function pointer
++   (which is throw () too, but with -fnon-call-exceptions this results
++   in a __cxa_call_unexpected call.  This macro disables the optimized
++   version.  */
++#define __NO_CTYPE 1
++#endif
+ #include <ctype.h>
+ #include <java-props.h>
+ #define PROCESS_GCJ_PROPERTIES process_gcj_properties()

component/gdbm/buildout.cfg

@@ -2,25 +2,18 @@
 parts =
   gdbm
 
-[gdbm-nochange-patch-download]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-md5sum = fafa6cae0afbf2b5afb9ef3b8e3035a4
-download-only = true
-filename = gdbm-Makefile.in-nochange.patch
-
 [gdbm]
 recipe = hexagonit.recipe.cmmi
-url = ftp://ftp.gnu.org/gnu/gdbm/gdbm-1.8.3.tar.gz
-md5sum = 1d1b1d5c0245b1c00aff92da751e9aa1
-patches = ${gdbm-nochange-patch-download:location}/${gdbm-nochange-patch-download:filename}
+version = 1.10
+url = ftp://ftp.gnu.org/gnu/gdbm/gdbm-${:version}.tar.gz
+md5sum = 88770493c2559dc80b561293e39d3570
 configure-options =
   --disable-static
 # install as parts/gdbm/include/gdbm/*.h etc. because some softwares
 # (eg. python's dbmmodule.c extension) assume the location like this.
 includedir = ${buildout:parts-directory}/${:_buildout_section_name_}/include
 make-targets =
-  install install-compat includedir=${:includedir}/gdbm && rm -f ${:includedir}/*.h && ln -sf gdbm/gdbm.h ${:includedir}/gdbm.h
+  install includedir=${:includedir}/gdbm && rm -f ${:includedir}/*.h && ln -sf gdbm/gdbm.h ${:includedir}/gdbm.h
 # it seems that parallel build sometimes fails for gdbm.
 make-options =
   -j1

component/gdbm/gdbm-Makefile.in-nochange.patch

---- Makefile.in	2002-10-08 16:09:12.000000000 +0000
-+++ Makefile.in.nochange	2010-11-03 21:17:38.579435530 +0000
-@@ -14,10 +14,6 @@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA = @INSTALL_DATA@
- 
--# File ownership and group
--BINOWN = bin
--BINGRP = bin
--
- MAKEINFO = makeinfo
- TEXI2DVI = texi2dvi
- 
-@@ -131,11 +127,11 @@
- 		$(INSTALL_ROOT)$(includedir) $(INSTALL_ROOT)$(man3dir) \
- 		$(INSTALL_ROOT)$(infodir)
- 	$(LIBTOOL) $(INSTALL) -c libgdbm.la $(INSTALL_ROOT)$(libdir)/libgdbm.la
--	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) gdbm.h \
-+	$(INSTALL_DATA) gdbm.h \
- 		$(INSTALL_ROOT)$(includedir)/gdbm.h
--	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.3 \
-+	$(INSTALL_DATA) $(srcdir)/gdbm.3 \
- 		$(INSTALL_ROOT)$(man3dir)/gdbm.3
--	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.info \
-+	$(INSTALL_DATA) $(srcdir)/gdbm.info \
- 		$(INSTALL_ROOT)$(infodir)/gdbm.info
- 
- install-compat:
-@@ -143,9 +139,9 @@
- 		$(INSTALL_ROOT)$(includedir)
- 	$(LIBTOOL) $(INSTALL) -c libgdbm_compat.la \
- 		$(INSTALL_ROOT)$(libdir)/libgdbm_compat.la
--	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/dbm.h \
-+	$(INSTALL_DATA) $(srcdir)/dbm.h \
- 		$(INSTALL_ROOT)$(includedir)/dbm.h
--	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/ndbm.h \
-+	$(INSTALL_DATA) $(srcdir)/ndbm.h \
- 		$(INSTALL_ROOT)$(includedir)/ndbm.h
- 
- #libgdbm.a: $(OBJS) gdbm.h

component/ghostscript/buildout.cfg

@@ -7,16 +7,8 @@ extends =
 
 parts = ghostscript
 
-[ghostscript-hooks-download]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-filename = ghostscript-hooks.py
-md5sum = 731475648c91507bd1dfe2a61ee84552
-download-only = true
-
 [ghostscript-common]
 recipe = hexagonit.recipe.cmmi
-pre-configure-hook = ${ghostscript-hooks-download:location}/${ghostscript-hooks-download:filename}:pre_configure_hook
 configure-options =
   --disable-cups
   --disable-cairo
@@ -32,17 +24,9 @@ environment =
   LD_LIBRARY_PATH=${fontconfig:location}/lib
 
 [ghostscript]
-# we prefer ghostscript-8 for now, because ghostscript-9.00 seems to have a
-# problem with Japanese fonts if -dTextAlphaBits=4 is specified by
-# imagemagick.
-<= ghostscript-8
+<= ghostscript-9
 
 [ghostscript-9]
 <= ghostscript-common
-url = http://ghostscript.com/releases/ghostscript-9.00.tar.gz
-md5sum = a402462478b4cdda3e1816899227b845
-
-[ghostscript-8]
-<= ghostscript-common
-url = http://www.nexedi.org/static/tarballs/ghostscript/ghostscript-8.71-no-looping-symlink.tar.bz2
-md5sum = 34639af3ffe8594f2c5ea944dfbe1d78
+url = http://downloads.ghostscript.com/public/ghostscript-9.04.tar.bz2
+md5sum = 9f6899e821ab6d78ab2c856f10fa3023

component/ghostscript/ghostscript-hooks.py

-import os
-def pre_configure_hook(oprtions, buildout):
-  # fixes python bug related to not creating symlink contained in tarfiles
-  for missing in 'configure.ac', 'Makefile.in':
-    if not os.path.exists(os.path.join(os.path.curdir, missing)):
-      os.symlink(os.path.join(os.path.curdir, 'base', missing),
-          os.path.join(os.path.curdir, missing))

component/git/buildout.cfg

@@ -13,10 +13,8 @@ parts =
 
 [git]
 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.3.tar.gz
+md5sum = 7a4bc5160166537d4da5eb48a7670dff
 configure-options =
   --with-curl=${curl:location}
   --with-openssl=${openssl:location}

component/gnutls/buildout.cfg

+[buildout]
+extends = 
+  ../readline/buildout.cfg
+  ../ncurses/buildout.cfg
+  ../zlib/buildout.cfg
+
+parts = gnutls
+
+[gpg-error]
+recipe = hexagonit.recipe.cmmi
+url = ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.10.tar.gz
+md5sum = 7c2710ef439f82ac429b88fec88e9a4c
+
+[gcrypt]
+recipe = hexagonit.recipe.cmmi
+url = ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.4.6.tar.gz
+md5sum = bfd45922eefb8a24d598af77366220d4
+configure-options =
+  --with-gpg-error-prefix=${gpg-error:location}
+environment =
+  CPPFLAGS=-I${gpg-error:location}/include
+  LDFLAGS=-Wl,-rpath -Wl,${gpg-error:location}/lib -Wl,${gpg-error:location}/lib/libgpg-error.so.0
+
+[gnutls]
+# XXX-Cedric : update to latest gnutls
+recipe = hexagonit.recipe.cmmi
+url = ftp://ftp.gnupg.org/gcrypt/gnutls/gnutls-2.8.6.tar.bz2
+md5sum = eb0a6d7d3cb9ac684d971c14f9f6d3ba
+configure-options =
+  --with-libgcrypt-prefix=${gcrypt:location}
+environment =
+  CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${gcrypt:location}/include -I${gpg-error:location}/include
+  LDFLAGS=-L${readline:location}/lib -L${ncurses:location}/lib -L${gcrypt:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${readline:location}/lib -Wl,-rpath -Wl,${ncurses:location}/lib -Wl,-rpath -Wl,${gcrypt:location}/lib -Wl,-rpath -Wl,${gpg-error:location}/lib -Wl,${gcrypt:location}/lib/libgcrypt.so.11
+  PKG_CONFIG=${zlib:location}/lib/pkgconfig

component/graphviz/buildout.cfg

@@ -8,17 +8,15 @@ extends =
   ../fontconfig/buildout.cfg
   ../freetype/buildout.cfg
   ../libpng/buildout.cfg
-  ../libtool/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../zlib/buildout.cfg
 
 [graphviz]
 recipe = hexagonit.recipe.cmmi
-url = http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.26.3.tar.gz
-md5sum = 6f45946fa622770c45609778c0a982ee
+url = http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.28.0.tar.gz
+md5sum = 8d26c1171f30ca3b1dc1b429f7937e58
 configure-options =
-  --with-ltdl-include=${libtool:location}/include
-  --with-ltdl-lib=${libtool:location}/lib
+  --with-included-ltdl
   --with-pngincludedir=${libpng:location}/include
   --with-pnglibdir=${libpng:location}/lib
   --with-zincludedir=${zlib:location}/include

component/grep/buildout.cfg

@@ -6,8 +6,8 @@ parts =
 
 [grep]
 recipe = hexagonit.recipe.cmmi
-url = http://ftp.gnu.org/gnu/grep/grep-2.8.tar.gz
-md5sum = cb2dfc502c5afc7a4a6e5f6cefd6850e
+url = http://ftp.gnu.org/gnu/grep/grep-2.9.tar.gz
+md5sum = 03e3451a38b0d615cb113cbeaf252dc0
 environment =
-  PKG_CONFIG_PATH=${pcre:location}/lib/pkgconfig
-  LDFLAGS =-Wl,--as-needed -Wl,-rpath=${pcre:location}/lib
+  CPPFLAGS=-I${pcre:location}/include
+  LDFLAGS=-L${pcre:location}/lib -Wl,-rpath=${pcre:location}/lib

component/groonga/buildout.cfg

-# mroonga - a MySQL storage engine using full-text search engine groonga
-# http://mroonga.github.com/
+# groonga - an open-source fulltext search engine and column store
 # http://groonga.org/
 
 [buildout]
@@ -8,9 +7,10 @@ parts =
 
 [groonga]
 recipe = hexagonit.recipe.cmmi
-url = http://packages.groonga.org/source/groonga/groonga-1.2.5.tar.gz
-md5sum = 7e608406677b7a3f91e287acc0c718c0
+url = http://packages.groonga.org/source/groonga/groonga-1.2.9.tar.gz
+md5sum = 47117baa401a3db08362e00f94fced12
 configure-options =
   --disable-static
   --disable-glibtest
+  --disable-benchmark
   --without-mecab

component/gtk-2/buildout.cfg

+[buildout]
+extends = 
+  ../glib/buildout.cfg
+  ../pkgconfig/buildout.cfg
+  ../libpng/buildout.cfg
+  ../xorg/buildout.cfg
+  ../zlib/buildout.cfg
+  ../freetype/buildout.cfg
+  ../fontconfig/buildout.cfg
+  ../gettext/buildout.cfg
+  ../libtiff/buildout.cfg
+  ../libjpeg/buildout.cfg
+    
+parts =
+  gtk-2
+
+[cairo]
+recipe = hexagonit.recipe.cmmi
+url = http://cairographics.org/releases/cairo-1.10.2.tar.gz
+md5sum = f101a9e88b783337b20b2e26dfd26d5f
+configure-options = 
+  --enable-tee=yes
+environment = 
+  PATH=${freetype:location}/bin:${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libXrender:location}/lib/pkgconfig
+  CPPFLAGS=-I${libpng:location}/include/ -I${zlib:location}/include -I${libX11:location}/include/ -I${xproto:location}/include -I${kbproto:location}/include -I${libXrender:location}/include -I${render:location}/include
+  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${libXrender:location}/lib -Wl,-rpath=${libXrender:location}/lib
+  LD_LIBRARY_PATH=${render:location}/lib:${libX11:location}/lib:${libXrender:location}/lib
+
+[pango]
+recipe = hexagonit.recipe.cmmi
+url = http://ftp.gnome.org/pub/gnome/sources/pango/1.29/pango-1.29.3.tar.bz2
+md5sum = be4e3891353fae6b62a6f8d7689c4266
+configure-options = 
+  --disable-static
+# XXX-Cedric : Why, god, why do I have to supply the -lXrender option to linker?
+environment = 
+  PATH=${glib:location}/bin:${freetype:location}/bin:${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${cairo:location}/lib/pkgconfig::${libXrender:location}/lib/pkgconfig
+  CPPFLAGS=-I${cairo:location}/include/cairo
+  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${libXrender:location}/lib -Wl,-rpath=${libXrender:location}/lib -lXrender
+  LD_LIBRARY_PATH=${render:location}/lib:${libX11:location}/lib:${libXrender:location}/lib
+
+[gdk-pixbuf]
+recipe = hexagonit.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 = 
+  --disable-static
+  --without-libintl-prefix
+environment = 
+  PATH=${glib:location}/bin:${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${gettext:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${cairo:location}/lib/pkgconfig
+  CPPFLAGS=-I${libtiff:location}/include -I${libjpeg:location}/include -I${libpng:location}/include
+  LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${glib:location}/lib -Wl,-rpath=${glib:location}/lib -L${libtiff:location}/lib -Wl,-rpath=${libtiff:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${libpng:location}/lib -Wl,-rpath=${libpng:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+  LD_LIBRARY_PATH=${glib:location}/lib:${gettext:location}/lib
+  
+[atk]
+recipe = hexagonit.recipe.cmmi
+url = http://ftp.gnome.org/pub/gnome/sources/atk/2.0/atk-2.0.1.tar.bz2
+md5sum = 87f20b78deaedef858ac54358c0786b1
+environment = 
+  PATH=${glib:location}/bin:${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig
+  LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${glib:location}/lib -Wl,-rpath=${gettext:location}/lib
+  LD_LIBRARY_PATH=${glib:location}/lib:${gettext:location}/lib
+
+[gtk-2]
+recipe = hexagonit.recipe.cmmi
+url = http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-2.24.6.tar.bz2
+md5sum = 421100f6597e613234f8dead6091a9fe
+configure-options = 
+  --disable-static
+  --disable-cups
+  --disable-papi
+  --enable-explicit-deps
+environment = 
+  PATH=${gdk-pixbuf:location}/bin:${glib:location}/bin:${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${gettext:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${cairo:location}/lib/pkgconfig:${atk:location}/lib/pkgconfig:${gdk-pixbuf:location}/lib/pkgconfig:${pango:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libXext:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libXrender:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xcbproto:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig
+  CPPFLAGS=-I${libtiff:location}/include -I${libjpeg:location}/include -I${libpng:location}/include -I${libX11:location}/include/ -I${xproto:location}/include -I${kbproto:location}/include -I${libXrender:location}/include -I${render:location}/include -I${libXext:location}/include -I${cairo:location}/include/cairo
+  LDFLAGS=-L${gettext:location}/lib -L${glib:location}/lib -L${libtiff:location}/lib -L${libjpeg:location}/lib -L${libpng:location}/lib -L${zlib:location}/lib -L${libXrender:location}/lib -L${libX11:location}/lib -L${libXext:location}/lib -L${pango:location}/lib
+  LD_LIBRARY_PATH=${glib:location}/lib:${gettext:location}/lib:${libX11:location}/lib

component/handlersocket/HandlerSocket-Plugin-for-MySQL-1.0.6-mariadb.patch

---- a/configure.ac
-+++ b/configure.ac
-@@ -28,7 +28,7 @@
-         MYSQL_INC="$MYSQL_INC -I$ac_mysql_source_dir/regex"
-         MYSQL_INC="$MYSQL_INC -I$ac_mysql_source_dir"
-         AC_SUBST(MYSQL_INC)
--        MYSQL_SOURCE_VERSION=`cat $ac_mysql_source_dir/configure.in | grep "\[[MySQL Server\]]" | sed -e "s|.*\([[0-9]]\+\.[[0-9]]\+\.[[0-9]]\+[[0-9a-zA-Z\_\-]]*\).*|\1|"`
-+        MYSQL_SOURCE_VERSION=`cat $ac_mysql_source_dir/configure.in | grep "\[[MariaDB Server\]]" | sed -e "s|.*\([[0-9]]\+\.[[0-9]]\+\.[[0-9]]\+[[0-9a-zA-Z\_\-]]*\).*|\1|"`
-         AC_MSG_RESULT([yes: Using $ac_mysql_source_dir, version $MYSQL_SOURCE_VERSION])
-       else
-         AC_MSG_ERROR([invalid MySQL source directory: $ac_mysql_source_dir])
---- a/handlersocket/database.cpp
-+++ b/handlersocket/database.cpp
-@@ -686,19 +686,19 @@
-   for (uint32_t i = 0; i < limit + skip; ++i) {
-     if (i == 0) {
-       const key_part_map kpm = (1U << args.kvalslen) - 1;
--      r = hnd->index_read_map(table->record[0], key_buf, kpm, find_flag);
-+      r = hnd->ha_index_read_map(table->record[0], key_buf, kpm, find_flag);
-     } else {
-       switch (find_flag) {
-       case HA_READ_BEFORE_KEY:
-       case HA_READ_KEY_OR_PREV:
--	r = hnd->index_prev(table->record[0]);
-+	r = hnd->ha_index_prev(table->record[0]);
- 	break;
-       case HA_READ_AFTER_KEY:
-       case HA_READ_KEY_OR_NEXT:
--	r = hnd->index_next(table->record[0]);
-+	r = hnd->ha_index_next(table->record[0]);
- 	break;
-       case HA_READ_KEY_EXACT:
--	r = hnd->index_next_same(table->record[0], key_buf, kplen_sum);
-+	r = hnd->ha_index_next_same(table->record[0], key_buf, kplen_sum);
- 	break;
-       default:
- 	r = HA_ERR_END_OF_FILE; /* to finish the loop */

component/handlersocket/buildout.cfg

-# Handlersocket - a NoSQL plugin for MySQL.
-# http://github.com/ahiguti/HandlerSocket-Plugin-for-MySQL
-
-[buildout]
-extends =
-  ../autoconf/buildout.cfg
-  ../automake/buildout.cfg
-  ../libtool/buildout.cfg
-  ../mariadb/buildout.cfg
-
-parts =
-  handlersocket
-
-[handlersocket-mariadb-patch]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-md5sum = 2654feea2e867c898b741ac0f0aa8e14
-filename = HandlerSocket-Plugin-for-MySQL-1.0.6-mariadb.patch
-download-only = true
-
-[handlersocket]
-recipe = hexagonit.recipe.cmmi
-url = http://github.com/ahiguti/HandlerSocket-Plugin-for-MySQL/tarball/1.0.6
-md5sum = 57f5c131e3d29701b01dd92c35ed25fd
-patch-options = -p1
-patches =
-  ${handlersocket-mariadb-patch:location}/${handlersocket-mariadb-patch:filename}
-configure-command =
-  ACLOCAL_ARGS=-I${libtool:location}/share/aclocal ./autogen.sh && ./configure
-configure-options =
-  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
-  --with-mysql-source=${mariadb:location}__compile__/mariadb-${mariadb:version}
-  --with-mysql-bindir=${mariadb:location}/bin
-  --with-mysql-plugindir=${mariadb:location}/lib/mysql/plugin
-environment =
-  PATH =${autoconf:location}/bin:${automake-1.11:location}/bin:${libtool:location}/bin:%(PATH)s

component/haproxy/buildout.cfg

@@ -3,8 +3,8 @@ parts = haproxy
 
 [haproxy]
 recipe = hexagonit.recipe.cmmi
-url = http://haproxy.1wt.eu/download/1.4/src/haproxy-1.4.18.tar.gz
-md5sum = 4ac88bb1a76c4b84ed4f6131183bedbe
+url = http://haproxy.1wt.eu/download/1.4/src/haproxy-1.4.19.tar.gz
+md5sum = 41392d738460dbf99295fd928031c6a4
 configure-command = true
 # If the system is running on Linux 2.6, we use "linux26" as the TARGET,
 # otherwise use "generic".

component/intltool/buildout.cfg

+[buildout]
+extends =
+  ../gettext/buildout.cfg
+  ../perl/buildout.cfg
+  ../perl-XML-Parser/buildout.cfg
+
+parts = 
+  intltool
+
+[intltool]
+recipe = hexagonit.recipe.cmmi
+url = http://edge.launchpad.net/intltool/trunk/0.41.1/+download/intltool-0.41.1.tar.gz
+md5sum = d6c91bf06681919ccfdf3624035b75dc
+depends =
+  ${perl:version}
+  ${perl-XML-Parser:location}
+environment =
+  PATH=${perl:location}/bin:${gettext:location}/bin:${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${perl:location}/lib/pkgconfig

component/libaio/buildout.cfg

+[buildout]
+parts =
+  libaio
+
+[libaio]
+recipe = hexagonit.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
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+configure-command = echo
+make-options = prefix=${:location}

component/libmemcached/buildout.cfg

+[buildout]
+
+parts =
+  libmemcached
+
+[libmemcached]
+<= libmemcached-0.50
+
+[libmemcached-0.50]
+<= libmemcached-common
+url = http://launchpad.net/libmemcached/1.0/0.50/+download/libmemcached-0.50.tar.gz
+md5sum = c8627014a37cd821cf93317b8de6f9f8
+
+[libmemcached-0.44]
+<= libmemcached-common
+url = http://launchpad.net/libmemcached/1.0/0.44/+download/libmemcached-0.44.tar.gz
+md5sum = e6bd825c46fa080b550f90f9001cba8c
+
+[libmemcached-common]
+recipe = hexagonit.recipe.cmmi
+configure-options =
+  --without-docs
+  --without-memcached
+  --without-libgtest-prefix
+  --without-libevent-prefix
+  --without-libinnodb-prefix
+  --without-libsasl-prefix
+  --without-libsasl2-prefix
+
+

component/libpng/buildout.cfg

@@ -15,5 +15,5 @@ environment =
 
 [libpng]
 <= libpng-common
-url = http://download.sourceforge.net/libpng/libpng-1.5.4.tar.bz2
-md5sum = b43afe39237b69859522455b215f9e85
+url = http://download.sourceforge.net/libpng/libpng-1.5.5.tar.bz2
+md5sum = 3270bf2990c3174ae939388398de751e

component/libtool/buildout.cfg

@@ -3,7 +3,7 @@ parts = libtool
 
 [libtool]
 recipe = hexagonit.recipe.cmmi
-md5sum = b32b04148ecdd7344abc6fe8bd1bb021
-url = http://ftp.gnu.org/gnu/libtool/libtool-2.4.tar.gz
+md5sum = d2f3b7d4627e69e13514a40e72a24d50
+url = http://ftp.gnu.org/gnu/libtool/libtool-2.4.2.tar.gz
 configure-options =
   --disable-static

component/mariadb/buildout.cfg

@@ -5,6 +5,7 @@
 extends =
   ../zlib/buildout.cfg
   ../groonga/buildout.cfg
+  ../libevent/buildout.cfg
   ../ncurses/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../readline/buildout.cfg
@@ -12,11 +13,18 @@ extends =
 parts =
   mariadb
 
+[mariadb-no_test-patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+md5sum = d65f61829cfbcd5062f49db2b00bd6fe
+filename = mysql_create_system_tables__no_test.patch
+download-only = true
+
 [mariadb]
 recipe = hexagonit.recipe.cmmi
-version = 5.3.1-beta
-url = http://downloads.askmonty.org/f/mariadb-${:version}/kvm-tarbake-jaunty-x86/mariadb-${:version}.tar.gz/from/http://mirror.layerjet.com/mariadb
-md5sum = 5b3a94de1c1fcaa193edbbc8d7f8ffe4
+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 = 715c61bb101acc7d37e893f6a9de9267
 # compile directory is required to build mysql plugins.
 keep-compile-dir = true
 # configure: how to avoid searching for my.cnf?
@@ -31,19 +39,30 @@ configure-options =
   --with-pic
   --with-fast-mutexes
   --with-charset=utf8
+  --with-extra-charsets=complex
   --with-collation=utf8_unicode_ci
+  --with-big-tables
+  --with-embedded-server
+  --with-plugins=max-no-ndb
+  --with-aria-tmp-tables
+  --without-plugin-innodb_plugin
+  --without-plugin-oqgraph
   --without-readline
   --with-ssl
+  --with-libevent=${libevent:location}
   --with-zlib-dir=${zlib:location}
 
+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 =-L${readline:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${readline: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
 
-[groonga-storage-engine-mariadb]
+[mroonga-mariadb]
 recipe = hexagonit.recipe.cmmi
-url = http://github.com/downloads/mroonga/mroonga/groonga-storage-engine-0.5.tar.gz
-md5sum = 52fed75d97a91f239750a1011ea9e468
+url = https://github.com/downloads/mroonga/mroonga/mroonga-1.11.tar.gz
+md5sum = 69e56246226e0b9969ee7f99e08aa7da
 configure-options =
   --with-mysql-source=${mariadb:location}__compile__/mariadb-${mariadb:version}
   --with-mysql-config=${mariadb:location}/bin/mysql_config

component/mariadb/mysql_create_system_tables__no_test.patch

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

component/membase/buildout.cfg

+[buildout]
+extends =
+  ../curl/buildout.cfg
+  ../libevent/buildout.cfg
+  ../erlang/buildout.cfg
+
+parts =
+  membase-source
+  membase-memcached
+  membase-libmemcached
+  membase-libconflate
+  membase-libvbucket
+  membase-moxi
+  membase-bucket_engine
+  membase-ep-engine
+  membase-membase-cli
+  membase-memcachetest
+  membase-ns_server
+  membase-vbucketmigrator
+
+[membase]
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+
+[membase-source]
+<= membase-1.7.0-source
+
+[membase-1.7.0-source]
+<= membase-source-common
+url = http://files.couchbase.com/source/membase-server_src-1.7.0.tar.gz
+md5sum = c933fffea299d00e43b002cb65738663
+
+[membase-source-common]
+recipe = hexagonit.recipe.download
+strip-top-level-dir = true
+
+[membase-component-common]
+recipe = hexagonit.recipe.cmmi
+path = ${membase-source:location}/${:component}
+prefix = ${membase:location}
+configure-options =
+  --prefix=${:prefix}
+  ${:component-configure-options}
+
+[membase-libmemcached]
+<= membase-component-common
+component = libmemcached
+component-configure-options =
+  --disable-static
+  --enable-shared
+  --disable-dtrace
+  --without-docs
+  --disable-sasl
+  --with-memcached=${membase:location}/bin/memcached
+
+[membase-memcached]
+<= membase-component-common
+component = memcached
+patches =
+configure-command =
+  ./configure
+component-configure-options =
+  --enable-isasl
+
+[membase-libconflate]
+<= membase-component-common
+component = libconflate
+component-configure-options =
+  --disable-static
+  --enable-shared
+  --without-check
+  --with-libcurl-prefix=${curl:location}
+
+[membase-libvbucket]
+<= membase-component-common
+component = libvbucket
+component-configure-options =
+  --disable-static
+  --enable-shared
+  --without-docs
+  --with-libhashkit-prefix=${membase:location}
+
+[membase-moxi]
+<= membase-component-common
+component = moxi
+component-configure-options =
+  --enable-moxi-libvbucket
+  --enable-moxi-libmemcached
+  --without-check
+  --with-libevent-prefix=${libevent:location}
+  --with-libmemcached-prefix=${membase:location}
+  --with-memcached=${membase:location}/bin/memcached
+  --with-libhashkit-prefix=${membase:location}
+  --with-libconflate-prefix=${membase:location}
+  --with-libvbucket-prefix=${membase:location}
+
+[membase-bucket_engine]
+<= membase-component-common
+component = bucket_engine
+component-configure-options =
+  --with-memcached=${membase-source:location}/memcached
+
+[membase-ep-engine]
+<= membase-component-common
+component = ep-engine
+component-configure-options =
+  --with-memcached=${membase-source:location}/memcached
+
+[membase-membase-cli]
+<= membase-component-common
+component = membase-cli
+patches =
+configure-command =
+  ./configure
+component-configure-options =
+
+[membase-memcachetest]
+<= membase-component-common
+component = memcachetest
+component-configure-options =
+  --with-memcached=${membase:location}/bin/memcached
+
+[membase-ns_server]
+<= membase-component-common
+component = ns_server
+patches =
+configure-command =
+  ./configure
+component-configure-options =
+environment =
+  PATH=${erlang:location}/bin:%(PATH)s
+
+[membase-vbucketmigrator]
+<= membase-component-common
+component = vbucketmigrator
+component-configure-options =
+  --without-sasl
+  --with-isasl
+

component/memcached/buildout.cfg

 [buildout]
 parts = memcached
-extends = ../libevent/buildout.cfg
-
-[memcached-strict-aliasing-patch]
-# on some platforms original memcached refuses to build:
-#  * http://code.google.com/p/memcached/issues/detail?id=60
-#  * http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=565033
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-md5sum = c03b3bfc237b77667b0e90442b0980e8
-download-only = true
-filename = memcached-fix-strict-aliasing.patch
+extends =
+  ../autoconf/buildout.cfg
+  ../automake/buildout.cfg
+  ../libevent/buildout.cfg
 
 [memcached-fix-array-subscript-is-above-array-bounds]
 recipe = hexagonit.recipe.download
@@ -19,45 +12,30 @@ filename = memcached-1.4-fix-array-subscript-is-above-array-bounds.patch
 download-only = true
 md5sum = 472508b9a4b6c0b9f5d6f2abce3444e3
 
-[memcached-gcc4.6.patch]
+[memcached-gcc-4.4.patch]
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/${:filename}
-filename = memcached-gcc4.6.patch
+filename = memcached-gcc-4.4.patch
 download-only = true
-md5sum = 3418477f64500cd2a8dce046f5d72fec
+md5sum = fd98d0cbfc4d3a25ac9808472fbe62f8
 
 [memcached]
-<= memcached-1.4.6
-
-[memcached-1.4.6]
-<= memcached-common
-url = http://memcached.googlecode.com/files/memcached-1.4.6.tar.gz
-md5sum = 243e5d82de27e6e45caf0ebfd400e41a
-patches =
-  ${memcached-fix-array-subscript-is-above-array-bounds:location}/${memcached-fix-array-subscript-is-above-array-bounds:filename}
-
-[memcached-1.4.5]
-<= memcached-common
-url = http://memcached.googlecode.com/files/memcached-1.4.5.tar.gz
-md5sum = 583441a25f937360624024f2881e5ea8
-patches =
-  ${memcached-strict-aliasing-patch:location}/${memcached-strict-aliasing-patch:filename}
-  ${memcached-fix-array-subscript-is-above-array-bounds:location}/${memcached-fix-array-subscript-is-above-array-bounds:filename}
-  ${memcached-gcc4.6.patch:location}/${memcached-gcc4.6.patch:filename}
-
-[memcached-1.4.4]
-<= memcached-common
-url = http://memcached.googlecode.com/files/memcached-1.4.4.tar.gz
-md5sum = 5ca5b24de347e97ac1f48f3785b4178a
-patches =
-  ${memcached-strict-aliasing-patch:location}/${memcached-strict-aliasing-patch:filename}
-  ${memcached-fix-array-subscript-is-above-array-bounds:location}/${memcached-fix-array-subscript-is-above-array-bounds:filename}
-  ${memcached-gcc4.6.patch:location}/${memcached-gcc4.6.patch:filename}
-
-[memcached-common]
 recipe = hexagonit.recipe.cmmi
+url = http://memcached.googlecode.com/files/memcached-1.4.8.tar.gz
+md5sum = b7104e269511621c2777367d6d6315fe
+patches =
+  ${memcached-fix-array-subscript-is-above-array-bounds:location}/${memcached-fix-array-subscript-is-above-array-bounds:filename} ${memcached-gcc-4.4.patch:location}/${memcached-gcc-4.4.patch:filename}
+patch-options = -p1
+configure-command =
+  aclocal-1.11
+  autoheader
+  automake-1.11 --foreign
+  autoconf
+  ./configure
 configure-options =
+  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
   --with-libevent=${libevent:location}
-patch-options = -p1
+  --disable-docs
 environment =
-    LDFLAGS =-Wl,-rpath=${libevent:location}/lib
+  PATH=${autoconf:location}/bin:${automake-1.11:location}/bin:%(PATH)s
+  LDFLAGS =-Wl,-rpath=${libevent:location}/lib

component/memcached/memcached-fix-strict-aliasing.patch

-diff -rdBu memcached-1.4.0-rc1/memcached.h memcached-1.4.0-my/memcached.h
---- memcached-1.4.0-rc1/memcached.h	2009-05-29 00:51:56.000000000 +0400
-+++ memcached-1.4.0-my/memcached.h	2009-06-07 22:32:52.000000000 +0400
-@@ -75,21 +75,21 @@
- 
- /* warning: don't use these macros with a function, as it evals its arg twice */
- #define ITEM_get_cas(i) ((uint64_t)(((i)->it_flags & ITEM_CAS) ? \
--                                    *(uint64_t*)&((i)->end[0]) : 0x0))
-+                                    *(uint64_t*)((char*)(i) + sizeof(*i)) : 0x0))
- #define ITEM_set_cas(i,v) { if ((i)->it_flags & ITEM_CAS) { \
--                          *(uint64_t*)&((i)->end[0]) = v; } }
-+                          *(uint64_t*)((char*)(i) + sizeof(*i)) = v; } }
- 
--#define ITEM_key(item) (((char*)&((item)->end[0])) \
-+#define ITEM_key(item) ((char*)(item) + sizeof(*item) \
-          + (((item)->it_flags & ITEM_CAS) ? sizeof(uint64_t) : 0))
- 
--#define ITEM_suffix(item) ((char*) &((item)->end[0]) + (item)->nkey + 1 \
-+#define ITEM_suffix(item) ((char*)(item) + sizeof(*item) + (item)->nkey + 1 \
-          + (((item)->it_flags & ITEM_CAS) ? sizeof(uint64_t) : 0))
- 
--#define ITEM_data(item) ((char*) &((item)->end[0]) + (item)->nkey + 1 \
-+#define ITEM_data(item) ((char*)(item) + sizeof(*item) + (item)->nkey + 1 \
-          + (item)->nsuffix \
-          + (((item)->it_flags & ITEM_CAS) ? sizeof(uint64_t) : 0))
- 
--#define ITEM_ntotal(item) (sizeof(struct _stritem) + (item)->nkey + 1 \
-+#define ITEM_ntotal(item) (sizeof(*item) + (item)->nkey + 1 \
-          + (item)->nsuffix + (item)->nbytes \
-          + (((item)->it_flags & ITEM_CAS) ? sizeof(uint64_t) : 0))
- 
-@@ -285,7 +285,6 @@
-     uint8_t         it_flags;   /* ITEM_* above */
-     uint8_t         slabs_clsid;/* which slab class we're in */
-     uint8_t         nkey;       /* key length, w/terminating null and padding */
--    void * end[];
-     /* if it_flags & ITEM_CAS we have 8 bytes CAS */
-     /* then null-terminated key */
-     /* then " flags length\r\n" (no terminating null) */
-

component/memcached/memcached-gcc-4.4.patch

+# In OpenSuse 11.2, 'gcc -dumpversion' returns '4.4', not '4.4.*'.
+--- memcached-1.4.8/configure.ac.orig
++++ memcached-1.4.8/configure.ac
+@@ -502,7 +502,7 @@
+   GCC_VERSION=`$CC -dumpversion`
+   CFLAGS="$CFLAGS -Wall -Werror -pedantic -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls"
+   case $GCC_VERSION in
+-    4.4.*)
++    4.4 | 4.4.*)
+     CFLAGS="$CFLAGS -fno-strict-aliasing"
+     ;;
+   esac

component/memcached/memcached-gcc4.6.patch

-diff --git a/items.c b/items.c
-index e7f01ea..9fc6704 100644
---- a/items.c
-+++ b/items.c
-@@ -450,9 +450,7 @@ void do_item_stats_sizes(ADD_STAT add_stats, void *c) {
-         for (i = 0; i < num_buckets; i++) {
-             if (histogram[i] != 0) {
-                 char key[8];
--                int klen = 0;
--                klen = snprintf(key, sizeof(key), "%d", i * 32);
--                assert(klen < sizeof(key));
-+                assert(snprintf(key, sizeof(key), "%d", i * 32) < sizeof(key));
-                 APPEND_STAT(key, "%u", histogram[i]);
-             }
-         }
-diff --git a/memcached.c b/memcached.c
-index 750c8b3..0913b77 100644
---- a/memcached.c
-+++ b/memcached.c
-@@ -4627,8 +4627,6 @@ int main (int argc, char **argv) {
- 
-     /* create the listening socket, bind it, and init */
-     if (settings.socketpath == NULL) {
--        int udp_port;
--
-         const char *portnumber_filename = getenv("MEMCACHED_PORT_FILENAME");
-         char temp_portnumber_filename[PATH_MAX];
-         FILE *portnumber_file = NULL;
-@@ -4658,7 +4656,6 @@ int main (int argc, char **argv) {
-          * then daemonise if needed, then init libevent (in some cases
-          * descriptors created by libevent wouldn't survive forking).
-          */
--        udp_port = settings.udpport ? settings.udpport : settings.port;
- 
-         /* create the UDP listening socket and bind it */
-         errno = 0;

component/memstrike/buildout.cfg

+[buildout]
+extends =
+  ../libmemcached/buildout.cfg
+  ../git/buildout.cfg
+  ../autoconf/buildout.cfg
+  ../automake/buildout.cfg
+  ../libtool/buildout.cfg
+
+parts =
+  memstrike
+
+[memstrike]
+recipe = hexagonit.recipe.cmmi
+path = ${memstrikesource:location}
+configure-command =
+  ./bootstrap
+  ./configure
+configure-options =
+  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
+  --with-libmemcached=${libmemcached:location}
+environment =
+  PATH =${autoconf:location}/bin:${automake-1.11:location}/bin:${libtool:location}/bin:%(PATH)s
+  LDFLAGS =-Wl,-rpath=${libmemcached:location}/lib
+
+[memstrikesource]
+recipe=plone.recipe.command
+location = ${buildout:parts-directory}/${:_buildout_section_name_} 
+stop-on-error = true
+revision = 39d7a99e8bb7eea6df8b
+command =
+  rm -rf ${:location} &&
+  ${git:location}/bin/git clone --quiet git://github.com/frsyuki/memstrike.git ${:location} &&
+  cd ${:location} &&
+  ${git:location}/bin/git checkout --quiet ${:revision}

component/mesa/buildout.cfg

+[buildout]
+extends = 
+  ../xorg/buildout.cfg
+
+parts = 
+  mesa
+
+[libdrm]
+#does not seem to compile with -jX
+recipe = hexagonit.recipe.cmmi
+url = http://dri.freedesktop.org/libdrm/libdrm-2.4.26.tar.bz2
+md5sum = 062569426773f69b11a47a7712bba770
+configure-options = 
+  --enable-nouveau-experimental-api
+environment =
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${xorg-libpthread-stubs:location}/lib/pkgconfig:${pciaccess:location}/lib/pkgconfig
+
+
+[mesa]
+recipe = hexagonit.recipe.cmmi
+url = ftp://ftp.freedesktop.org//pub/mesa/7.11/MesaLib-7.11.tar.bz2
+md5sum = ff03aca82d0560009a076a87c888cf13
+configure-options = 
+  --disable-static
+  --disable-driglx-direct
+  --disable-glu
+  --disable-glw
+  --disable-glut
+  --disable-egl
+  --disable-gallium-llvm
+  --with-gallium-drivers=
+  --with-dri-drivers=
+  --with-expat=${libexpat:location}
+  --with-driver=xlib
+environment =
+  PATH=${pkgconfig:location}/bin:${makedepend:location}/bin:${flex:location}/bin:${bison:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${libdrm:location}/lib/pkgconfig:${dri2proto:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${pciaccess:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${glproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libXext:location}/lib/pkgconfig:${xfixes:location}/lib/pkgconfig:${xdamage:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig
+  CPPFLAGS=-I${libexpat:location}/include -I${libdrm:location}/include/libdrm -I${libdrm:location}/include -I${xproto:location}/include -I${libX11:location}/include -I${libXext:location}/include/ -I${xextproto:location}/include
+  LDFLAGS=-L${libexpat:location}/lib
+  PYTHON=${buildout:executable}

component/mroonga/buildout.cfg

-# mroonga - a MySQL storage engine using full-text search engine groonga
-# http://mroonga.github.com/
-# http://groonga.org/
-
-[buildout]
-parts =
-  mroonga
-extends =
-  ../mariadb/buildout.cfg
-  ../pkgconfig/buildout.cfg
-
-[groonga]
-recipe = hexagonit.recipe.cmmi
-url = http://groonga.org/files/groonga/groonga-1.1.0.tar.gz
-md5sum = a5a381db446e017f172bf6b003a4fed9
-configure-options =
-  --without-mecab
-
-[mroonga-mariadb-patch]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-md5sum = da2457b9f8006cddb279a165128479e5
-filename = groonga-storage-engine-0.4.mariadb.patch
-download-only = true
-
-[mroonga]
-recipe = hexagonit.recipe.cmmi
-url = http://github.com/downloads/mroonga/mroonga/groonga-storage-engine-0.4.tar.gz
-md5sum = eb39ddaebb5a295f103bb1f66d5b33da
-patch-options = -p1
-patches =
-  ${mroonga-mariadb-patch:location}/${mroonga-mariadb-patch:filename}
-configure-options =
-  --with-mysql-source=${mariadb:location}__compile__/mariadb-${mariadb:version}
-  --with-mysql-config=${mariadb:location}/bin/mysql_config
-environment =
-  PATH=${groonga:location}/bin:${pkgconfig:location}/bin:%(PATH)s
-  CPPFLAGS=-I${groonga:location}/include/groonga
-  LDFLAGS=-L${groonga:location}/lib
-  PKG_CONFIG_PATH=${groonga:location}/lib/pkgconfig

component/mroonga/groonga-storage-engine-0.4.mariadb.patch

-diff -ur groonga-storage-engine-0.4.orig/configure groonga-storage-engine-0.4/configure
---- groonga-storage-engine-0.4.orig/configure	2010-11-24 06:23:50.000000000 +0100
-+++ groonga-storage-engine-0.4/configure	2011-01-01 16:01:07.000000000 +0100
-@@ -13925,8 +13925,8 @@
-     as_fn_error "failed to run \"$ac_mysql_config\": $plugindir" "$LINENO" 5
-   fi
-   MYSQL_INC="$MYSQL_INC $($ac_mysql_config --include)"
--  ac_mysql_major_version="`$ac_mysql_config --version | cut -b 1-3`"
--  if test "$ac_mysql_major_version" = "5.1"; then
-+  ac_mysql_major_version="`$ac_mysql_config --version | cut -b 1,3`"
-+  if test $ac_mysql_major_version -lt 55; then
-     MYSQL51="-DMYSQL51"
- 
-   fi

component/mydumper/buildout.cfg

+[buildout]
+
+extends =
+    ../cmake/buildout.cfg
+    ../glib/buildout.cfg
+    ../pcre/buildout.cfg
+    ../mariadb/buildout.cfg
+
+parts = mydumper
+
+# XXX-Antoine:
+# This is really dirty, but it's the only way to install
+# mydumper that works
+[mydumper]
+recipe = slapos.recipe.build
+url = http://launchpad.net/mydumper/0.2/0.2.3/+download/mydumper-0.2.3.tar.gz
+md5sum = 36e6a1c97a9634a6882ddaac5e2697d5
+buildout-bin-dir = ${buildout:bin-directory}
+cmake-command = ${cmake:location}/bin/cmake
+mysql-config = ${mariadb:location}/bin/mysql_config
+doc-dependency = ${mydumper-doc:eggs}
+mysqllib = ${mariadb:location}/lib
+pkg-config-path = ${glib:location}/lib/pkgconfig/:${pcre:location}/lib/pkgconfig/
+libraries = ${zlib:location}/lib/:${glib:location}/lib/:${pcre:location}/lib/:${mariadb:location}/lib/mysql/
+includes = ${zlib:location}/include/:${glib:location}/include/:${pcre:location}/include/:${mariadb:location}/include/mysql/
+cflags = -I${zlib:location}/include/ -I${glib:location}/include/ -I${pcre:location}/include/ -I${mariadb:location}/include/mysql/
+mydumper-patches =
+   ${:_profile_base_location_}/mydumper-remove-warnings-errors.patch 917fea16b5ddea195cfa33fbd9827f57 -p1
+slapos_promise =
+    directory:bin
+    file:bin/mydumper
+    file:bin/myloader
+script =
+    import os
+    url = self.download(self.options['url'], self.options.get('md5sum'))
+    extract_dir = self.extract(url)
+    workdir = guessworkdir(extract_dir)
+    self.applyPatchList(self.options['mydumper-patches'], cwd=workdir)
+    env['PATH'] = self.options['buildout-bin-dir'] + ':' + env.get('PATH', '')
+    env['PKG_CONFIG_PATH'] = self.options['pkg-config-path'] + ':' + \
+                             env.get('PKG_CONFIG_PATH', '')
+    env['CMAKE_INCLUDE_PATH'] = self.options['includes']
+    env['CMAKE_LIBRARY_PATH'] = self.options['libraries']
+    env['CFLAGS'] = self.options['cflags']
+    command_line = [self.options['cmake-command'],
+                    '-DCMAKE_INSTALL_PREFIX=%%s' %% self.options['location'],
+                    '-DMYSQL_CONFIG=%%s' %% self.options['mysql-config'],
+                    '-DCMAKE_C_FLAGS=%%s' %% self.options['cflags'],
+                    '-DCMAKE_INSTALL_RPATH=%%s' %% self.options['libraries'],
+                    '.']
+    call(command_line, cwd=workdir, env=env)
+    call(['make'], cwd=workdir, env=env)
+    call(['make', 'install'], cwd=workdir, env=env)
+
+[mydumper-doc]
+recipe = zc.recipe.egg
+eggs =
+    Sphinx
+dependent-scripts = true
+
+# XXX-Antoine: here's what I did using hexagonit.recipe.cmmi.
+# and it wasn't working !
+#[mydumper]
+#recipe = hexagonit.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
+#location = ${buildout:parts-directory}/${:_buildout_section_name_}
+#configure-command =
+#    ${cmake:location}/bin/cmake \
+#    -DCMAKE_INSTALL_PREFIX=${:location} \
+#    -DMYSQL_CONFIG=${mariadb:location}/bin/mysql_config \
+#    -DCMAKE_INCLUDE_PATH=${zlib:location}/include \
+#    -DCMAKE_LIBRARY_PATH=${zlib:location}/lib \
+#    .
+#environment=
+#    PATH=$PATH:${buildout:bin-directory}
+#    PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig/:${pcre:location}/lib/pkgconfig/
+

component/mydumper/mydumper-remove-warnings-errors.patch

+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -12,7 +12,7 @@
+ 
+ add_subdirectory(docs)
+ 
+-set(CMAKE_C_FLAGS "-Wall -Wunused -Wwrite-strings -Wno-strict-aliasing -Wextra -Wshadow -Werror -O3 -g ${MYSQL_CFLAGS}")
++set(CMAKE_C_FLAGS "-Wall -Wunused -Wwrite-strings -Wno-strict-aliasing -Wextra -Wshadow -O3 -g ${MYSQL_CFLAGS}")
+ 
+ include_directories(${MYDUMPER_SOURCE_DIR} ${MYSQL_INCLUDE_DIR} ${GLIB2_INCLUDE_DIR} ${PCRE_INCLUDE_DIR} ${ZLIB_INCLUDE_DIRS})
+ 

component/mysql-5.1/buildout.cfg

@@ -21,6 +21,13 @@ md5sum = eefcd08c400c58d3e89542ab482a8429
 filename = mysql-5.1-sphinx-2.0.1-beta.diff
 download-only = true
 
+[mysql-5.1-no_test-patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+md5sum = 22b0ef8baec5efc182e10d233c6f14ca
+filename = mysql_create_system_tables__no_test.patch
+download-only = true
+
 [mysql-5.1]
 recipe = hexagonit.recipe.cmmi
 version = 5.1.58
@@ -60,6 +67,7 @@ make-options =
 patch-options = -p0
 patches =
   ${mysql-5.1-sphinx-patch:location}/${mysql-5.1-sphinx-patch:filename}
+  ${mysql-5.1-no_test-patch:location}/${mysql-5.1-no_test-patch:filename}
 environment =
   PATH =${autoconf:location}/bin:${automake-1.11:location}/bin:${libtool:location}/bin:${bison:location}/bin:${flex:location}/bin:%(PATH)s
   CPPFLAGS =-I${ncurses:location}/include -I${readline:location}/include
@@ -67,8 +75,8 @@ environment =
 
 [groonga-storage-engine-mysql-5.1]
 recipe = hexagonit.recipe.cmmi
-url = http://github.com/downloads/mroonga/mroonga/groonga-storage-engine-0.9.tar.gz
-md5sum = 78fe07122dc376796a5aede476f50cfd
+url = http://github.com/downloads/mroonga/mroonga/groonga-storage-engine-1.0.0.tar.gz
+md5sum = 289b8b7919e790599ea79b6fe9270e04
 configure-options =
   --with-mysql-source=${mysql-5.1:location}__compile__/mysql-${mysql-5.1:version}
   --with-mysql-config=${mysql-5.1:location}/bin/mysql_config

component/mysql-5.1/mysql_create_system_tables__no_test.patch

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

component/mysql-5.5/buildout.cfg

+[buildout]
+extends =
+  ../autoconf/buildout.cfg
+  ../automake/buildout.cfg
+  ../bison/buildout.cfg
+  ../cmake/buildout.cfg
+  ../groonga/buildout.cfg
+  ../libaio/buildout.cfg
+  ../libtool/buildout.cfg
+  ../ncurses/buildout.cfg
+  ../pkgconfig/buildout.cfg
+  ../zlib/buildout.cfg
+
+parts =
+    mysql-5.5
+
+[mysql-5.5-sphinx-patch]
+# this patch comes from sphinx-2.0.1-beta including changes for
+# MySQL-5.5 in
+# http://code.google.com/p/sphinxsearch/source/detail?r=2921
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+md5sum = 04549822ebfa91b5f84025ff49ef24c2
+filename = mysql-5.5-sphinx-2.0.1-beta.diff
+download-only = true
+
+[mysql-5.5-no_test-patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+md5sum = bb7ee34b9a98da1f913566c63ffbc6f5
+filename = mysql_create_system_tables__no_test.patch
+download-only = true
+
+[mysql-5.5]
+recipe = hexagonit.recipe.cmmi
+version = 5.5.16
+url = http://mysql.he.net/Downloads/MySQL-5.5/mysql-${:version}.tar.gz
+md5sum = 462ab3752dd666ec06ca32f92673b59e
+# compile directory is required to build mysql plugins.
+keep-compile-dir = true
+patch-options = -p0
+patches =
+  ${mysql-5.5-sphinx-patch:location}/${mysql-5.5-sphinx-patch:filename}
+  ${mysql-5.5-no_test-patch:location}/${mysql-5.5-no_test-patch:filename}
+configure-command = ${cmake:location}/bin/cmake
+# we use embeded yassl instead of openssl to avoid compilation errors on sphinx search engine.
+configure-options =
+  -DCMAKE_INSTALL_PREFIX=${buildout:parts-directory}/${:_buildout_section_name_}
+  -DBUILD_CONFIG=mysql_release
+  -DDEFAULT_CHARSET=utf8
+  -DDEFAULT_COLLATION=utf8_unicode_ci
+  -DWITH_SSL=bundled
+  -DWITH_ZLIB=system
+  -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1
+  -DWITHOUT_DAEMON_EXAMPLE=1
+  -DWITH_SPHINX_STORAGE_ENGINE=1
+  -DCMAKE_C_FLAGS="-I${libaio:location}/include -I${ncurses:location}/include -I${zlib:location}/include"
+  -DCMAKE_INSTALL_RPATH=${libaio:location}/lib:${ncurses:location}/lib:${zlib:location}/lib
+environment =
+  CMAKE_PROGRAM_PATH=${autoconf:location}/bin:${automake-1.11:location}/bin:${cmake:location}/bin:${libtool:location}/bin:${bison:location}/bin:${flex:location}/bin
+  CMAKE_INCLUDE_PATH=${libaio:location}/include:${ncurses:location}/include:${zlib:location}/include
+  CMAKE_LIBRARY_PATH=${libaio:location}/lib:${ncurses:location}/lib:${zlib:location}/lib
+  LDFLAGS=-L${libaio:location}/lib
+
+[groonga-storage-engine-mysql-5.5]
+recipe = hexagonit.recipe.cmmi
+url = http://github.com/downloads/mroonga/mroonga/groonga-storage-engine-1.0.0.tar.gz
+md5sum = 289b8b7919e790599ea79b6fe9270e04
+configure-options =
+  --with-mysql-source=${mysql-5.5:location}__compile__/mysql-${mysql-5.5:version}
+  --with-mysql-config=${mysql-5.5:location}/bin/mysql_config
+environment =
+  PATH=${groonga:location}/bin:${pkgconfig:location}/bin:%(PATH)s
+  CPPFLAGS=-I${groonga:location}/include/groonga
+  LDFLAGS=-L${groonga:location}/lib
+  PKG_CONFIG_PATH=${groonga:location}/lib/pkgconfig

component/mysql-5.5/mysql_create_system_tables__no_test.patch

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

component/mysql-tritonn-5.0/buildout.cfg

@@ -76,7 +76,6 @@ configure-options =
   --enable-assembler
   --without-readline
   --with-sphinx-storage-engine
-  --with-named-curses-libs=${ncurses:location}/lib/libncurses.so
   --with-zlib-dir=${zlib:location}
 
 make-options =
@@ -89,5 +88,5 @@ patches =
   ${mysql-5.0-sphinx-patch:location}/${mysql-5.0-sphinx-patch:filename}
 environment =
     PATH=${senna:location}/bin:${autoconf:location}/bin:${automake-1.11:location}/bin:${libtool:location}/bin:${bison:location}/bin:${flex:location}/bin:%(PATH)s
-    CPPFLAGS=-I${senna:location}/include/senna -I${ncurses:location}/include -I${readline:location}/include
-    LDFLAGS=-L${senna:location}/lib -L${readline:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${readline:location}/lib
+    CPPFLAGS=-I${senna:location}/include/senna -I${ncurses:location}/include -I${readline5:location}/include
+    LDFLAGS=-L${senna:location}/lib -L${readline5:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${readline5:location}/lib

component/ncurses/buildout.cfg

@@ -15,10 +15,9 @@ configure-options =
   --enable-rpath
 # tricky way to rerun with --enable-widec
 make-targets =
-  install && (for i in curses unctrl eti form menu panel term; do ln -sf ncurses/$i.h ${buildout:parts-directory}/${:_buildout_section_name_}/include/$i.h; done) && ./configure ${:configure-options} --enable-widec && make install
+  install && (for i in curses unctrl eti form menu panel term; do ln -sf ncurses/$i.h ${buildout:parts-directory}/${:_buildout_section_name_}/include/$i.h; done; ln -sf libncurses.so ${buildout:parts-directory}/${:_buildout_section_name_}/lib/libcurses.so) && ./configure ${:configure-options} --enable-widec && make ${:make-options} install
 # pass dummy LDCONFIG to skip needless calling of ldconfig by non-root user
 environment =
-  LDFLAGS =-Wl,--as-needed
   LDCONFIG=/bin/echo
 make-options =
   -j1

component/nspr/buildout.cfg

+[buildout]
+parts = nspr
+
+[nspr-pkgconfig-patch-download]
+recipe = hexagonit.recipe.download
+filename = nspr-4.8.6-pkgconfig-1.patch
+url = http://www.linuxfromscratch.org/patches/blfs/svn/${:filename}
+md5sum = 7c00beff0475314f59214842509e407f
+download-only = true
+
+[nspr]
+recipe = hexagonit.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}
+patch-options = -p1
+configure-command =
+  cd mozilla/nsprpub
+  ./configure
+configure-options =
+  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
+  --with-mozilla
+  --enable-64bit
+make-options =
+  -C mozilla/nsprpub

component/nss/buildout.cfg

+[buildout]
+extends =
+  https://svn.erp5.org/repos/public/erp5/trunk/buildout/software-profiles/zlib.cfg
+  nspr.cfg
+  sed.cfg
+parts =
+  nss
+
+[nss-patch]
+recipe = hexagonit.recipe.download
+filename = nss-3.12.9-with-nspr-4.8.7-1.patch
+url = http://www.linuxfromscratch.org/patches/blfs/svn/nss-3.12.8-standalone-1.patch
+md5sum = ee7b5966961bef16ca896435e78652d3
+download-only = true
+
+[nss-download]
+recipe = hexagonit.recipe.download
+url = ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_9_RTM/src/nss-3.12.9.tar.gz
+md5sum = bd32f183ca28440c1744650be31a9ccc
+strip-top-level-dir = true
+
+[nss]
+recipe = plone.recipe.command
+source = ${nss-download:location}
+destination = ${buildout:parts-directory}/${:_buildout_section_name_}
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+compile-location = ${buildout:parts-directory}/${:_buildout_section_name_}_compile_
+stop-on-error = true
+command =
+  rm -rf ${:destination} &&
+  mkdir -p ${:destination} &&
+  rm -rf ${:compile-location} &&
+  cp -R ${:source} ${:compile-location} &&
+  cd ${:compile-location} &&
+  patch -Np1 -i ${nss-patch:location}/${nss-patch:filename} &&
+  ${sed:location}/bin/sed -i "s/ZLIB_LIBS = -lz//g" ${:compile-location}/mozilla/security/coreconf/Linux.mk &&
+  ${sed:location}/bin/sed -i "s/# INCLUDES += -I\/usr\/include -Y\/usr\/include\/linux/INCLUDES += \$(ZLIB_INCLUDE_DIR)/g" ${:compile-location}/mozilla/security/coreconf/Linux.mk &&
+  gmake -C mozilla/security/nss \
+        USE_64=1 \
+        BUILD_OPT=1 \
+        ZLIB_INCLUDE_DIR=-I${zlib:location}/include \
+        ZLIB_LIBS="-lz -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib" \
+        NSPR_INCLUDE_DIR=${nspr:location}/include/nspr \
+        NSPR_LIB_DIR="${nspr:location}/lib -Wl,-rpath=${nspr:location}/lib" \
+        NSSUTIL_LIB_DIR="${:location}/lib -Wl,-rpath=${:location}/lib" \
+        nss_build_all &&
+  mkdir -p ${:destination}/bin &&
+  mkdir -p ${:destination}/include/nss3 &&
+  mkdir -p ${:destination}/lib/pkgconfig &&
+  install -v -m755 ${:compile-location}/mozilla/dist/*.OBJ/lib/*.so ${:destination}/lib &&
+  install -v -m644 ${:compile-location}/mozilla/dist/*.OBJ/lib/{*.chk,libcrmf.a} ${:destination}/lib &&
+  install -v -m755 -d ${:destination}/include/nss &&
+  install -v -m755 ${:compile-location}/mozilla/dist/*.OBJ/bin/{certutil,nss-config,pk12util} ${:destination}/bin &&
+  install -v -m644 ${:compile-location}/mozilla/dist/*.OBJ/lib/pkgconfig/nss.pc ${:destination}/lib/pkgconfig &&
+  cp -v -RL ${:compile-location}/mozilla/dist/{public,private}/nss/* ${:destination}/include/nss &&
+  chmod 644 ${:destination}/include/nss/* &&
+  cd ${buildout:parts-directory} &&
+  rm -rf ${:compile-location}
+
+[nss-cmmi]
+recipe = hexagonit.recipe.cmmi
+path = ${nss-download:location}/mozilla/security/nss
+configure-command = echo "No need to configure"
+make-binary = gmake
+make-options = USE_64=1
+make-targets = nss_build_all
+

component/openldap/buildout.cfg

@@ -7,8 +7,8 @@ extends =
 
 [openldap]
 recipe = hexagonit.recipe.cmmi
-url = ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.4.25.tgz
-md5sum = ec63f9c2add59f323a0459128846905b
+url = ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.4.26.tgz
+md5sum = f36f3086031dd56ae94f722ffae8df5e
 configure-options =
   --disable-static
   --disable-slapd

component/openssl/buildout.cfg

@@ -5,15 +5,27 @@
 
 [buildout]
 extends =
+  ../ca-certificates/buildout.cfg
   ../zlib/buildout.cfg
 
 parts =
   openssl
 
+[openssl-nodoc.patch]
+# Disable doc generation part in Makefile 
+recipe = hexagonit.recipe.download
+md5sum = b4887a7b4e18402447bc6227d2493b92
+url = ${:_profile_base_location_}/${:filename}
+filename = ${:_buildout_section_name_}
+download-only = true
+
 [openssl]
 recipe = hexagonit.recipe.cmmi
-url = https://www.openssl.org/source/openssl-1.0.0e.tar.gz
-md5sum = 7040b89c4c58c7a1016c0dfa6e821c86
+url = https://www.openssl.org/source/openssl-1.0.0g.tar.gz
+md5sum = 07ecbe4324f140d157478637d6beccf1
+patches =
+  ${openssl-nodoc.patch:location}/${openssl-nodoc.patch:filename}
+patch-options = -p0
 configure-command = ./config
 configure-options =
   -I${zlib:location}/include
@@ -27,5 +39,7 @@ configure-options =
 # it seems that parallel build sometimes fails for openssl.
 make-options =
   -j1
+make-targets =
+  install && rm -f ${buildout:parts-directory}/${:_buildout_section_name_}/etc/ssl/certs/* && for i in ${ca-certificates:location}/certs/*/*.crt; do ln -sv $i ${buildout:parts-directory}/${:_buildout_section_name_}/etc/ssl/certs/`${buildout:parts-directory}/${:_buildout_section_name_}/bin/openssl x509 -hash -noout -in $i`.0; done; true
   LDFLAGS="-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${buildout:parts-directory}/${:_buildout_section_name_}/lib"
   SHARED_LDFLAGS="-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${buildout:parts-directory}/${:_buildout_section_name_}/lib"

component/openssl/openssl-nodoc.patch

+--- Makefile	2012-01-18 14:42:28.000000000 +0100
++++ Makefile	2012-01-24 17:43:40.000000000 +0100
+@@ -494,7 +494,7 @@
+ dist_pem_h:
+ 	(cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
+ 
+-install: all install_docs install_sw
++install: all install_sw
+ 
+ install_sw:
+ 	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \

component/opera/buildout.cfg

+[buildout]
+# Work in progress
+extends = 
+  ../xorg/buildout.cfg
+  ../fontconfig/buildout.cfg
+  ../dbus/buildout.cfg
+  ../gtk-2/buildout.cfg
+  ../libpng/buildout.cfg
+
+parts = 
+  opera
+  
+[opera]
+recipe = slapos.recipe.build
+slapos_promise =
+  file:opera
+
+depends = 
+  ${liberation-fonts:location}
+  ${ipaex-fonts:location}
+
+x86 = http://arc.opera.com/pub/opera/linux/1151/opera-11.51-1087.i386.linux.tar.bz2 91db21fc001e736a6432627fbf93062f
+x86-64 = todohttp://arc.opera.com/pub/opera/linux/1151/opera-11.51-1087.i386.linux.tar.bz2 91db21fc001e736a6432627fbf93062f
+
+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", "opera-slapos")
+  wrapper = open(wrapper_location, 'w')
+  wrapper.write("""#!/bin/sh
+  cd %(location)s
+  export LD_LIBRARY_PATH=${libXrender:location}/lib/:${fontconfig:location}/lib/:${dbus:location}/lib/:${dbus-glib:location}/lib/:${pango:location}/lib:${cairo:location}/lib:${glib:location}/lib:${gtk-2:location}/lib:${atk:location}/lib:${gdk-pixbuf:location}/lib:${libXt:location}/lib:${libpng:location}/lib:${libSM:location}/lib:${libICE:location}/lib:%(location)s
+  export PATH=${fontconfig:location}/bin:$PATH
+  %(location)s/opera $*""")
+  wrapper.close()
+  profile_directory = os.path.join("%(location)s", "profile")
+  os.mkdir(profile_directory)
+  opera_config = open(os.path.join(profile_directory, "opera6.ini"), "w")
+  opera_config.write("""[State]
+  Reading Plugins=0
+  Accept License=1
+  Run=0""")
+  opera_config.close()
+  os.chmod(wrapper_location, 0766)
+

component/percona-toolkit/buildout.cfg

+[buildout]
+extends =
+  ../perl/buildout.cfg
+  ../perl-DBI/buildout.cfg
+  ../perl-DBD-mariadb/buildout.cfg
+parts =
+  percona-toolkit
+
+[percona-toolkit]
+recipe = hexagonit.recipe.cmmi
+depends =
+  ${perl:version}
+url = http://www.percona.com/redir/downloads/percona-toolkit/percona-toolkit-2.0.1.tar.gz
+md5sum = 3a78c78672cb7c634bda35dfb2f817bf
+configure-command =
+  ${perl:location}/bin/perl Makefile.PL

component/perl-DBD-MySQL/buildout.cfg

 [buildout]
 extends =
-  ../perl/buildout.cfg
-  ../perl-DBI/buildout.cfg
   ../mysql-tritonn-5.0/buildout.cfg
-  ../zlib/buildout.cfg
-  ../openssl/buildout.cfg
+  ../perl-DBD-common/buildout.cfg
+
 parts =
   perl-DBD-MySQL
 
-[perl-DBD-MySQL-patch]
-recipe = hexagonit.recipe.download
-md5sum = e12e9233f20b0370cfcf5228ea767fbc
-url = ${:_profile_base_location_}/${:filename}
-filename = DBD-mysql-4.019.rpathsupport.patch
-download-only = true
-
 [perl-DBD-MySQL]
 recipe = hexagonit.recipe.cmmi
 version = 4.019

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

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

component/perl-DBD-common/buildout.cfg

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

component/perl-DBD-mariadb/buildout.cfg

+[buildout]
+extends =
+  ../mariadb/buildout.cfg
+  ../perl-DBD-common/buildout.cfg
+
+parts =
+  perl-DBD-mariadb
+
+[perl-DBD-mariadb]
+recipe = hexagonit.recipe.cmmi
+version = 4.019
+depends =
+  ${perl:version}
+  ${perl-DBI:version}
+url = http://search.cpan.org/CPAN/authors/id/C/CA/CAPTTOFU/DBD-mysql-4.019.tar.gz
+md5sum = 566d98ab8ffac9626a31f6f6d455558e
+patches =
+  ${perl-DBD-MySQL-patch:location}/${perl-DBD-MySQL-patch:filename}
+patch-options = -p1
+configure-command =
+  ${perl:location}/bin/perl Makefile.PL --mysql_config=${mariadb:location}/bin/mysql_config
+environment =
+  OTHERLDFLAGS=-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${mariadb:location}/lib/mysql -Wl,-rpath=${openssl:location}/lib
\ No newline at end of file

component/perl-XML-Parser/buildout.cfg

+[buildout]
+extends =
+  ../libexpat/buildout.cfg
+  ../libxml2/buildout.cfg
+  ../perl/buildout.cfg
+  ../perl-libwww-perl/buildout.cfg
+  ../zlib/buildout.cfg
+parts =
+  perl-XML-Parser
+
+[perl-XML-Parser]
+recipe = hexagonit.recipe.cmmi
+depends =
+  ${perl:version}
+  ${perl-libwww-perl:location}
+url = http://search.cpan.org/CPAN/authors/id/M/MS/MSERGEANT/XML-Parser-2.36.tar.gz
+md5sum = 1b868962b658bd87e1563ecd56498ded
+configure-command =
+  ${perl:location}/bin/perl Makefile.PL \
+    EXPATINCPATH=${libexpat:location}/include \
+    EXPATLIBPATH=${libexpat:location}/lib \
+    INC="-I${libxml2:location}/include/libxml2" \
+    LIBS="-L${libxml2:location}/lib -L${zlib:location}/lib"
+# Parallel make does not work for this package on fast machines
+# with many cores
+make-options =
+  OTHERLDFLAGS=" -Wl,-rpath=${libxml2:location}/lib -Wl,-rpath=${zlib:location}/lib" -j1
+environment =
+  LD_LIBRARY_PATH=${libxml2:location}/lib:${zlib:location}/lib
+  PERLLIB=blib/lib

component/perl/buildout.cfg

@@ -14,9 +14,11 @@ filename = ${:_buildout_section_name_}
 
 [perl]
 recipe = hexagonit.recipe.cmmi
-version = 5.14.1
+depends =
+  ${gdbm:version}
+version = 5.14.2
 url = http://www.cpan.org/src/5.0/perl-${:version}.tar.bz2
-md5sum = 97cd306a2c22929cc141a09568f43bb0
+md5sum = 04a4c5d3c1f9f19d77daff8e8cd19a26
 siteprefix = ${buildout:parts-directory}/site_${:_buildout_section_name_}
 patch-options = -p1
 patches =

component/pkgconfig/buildout.cfg

@@ -11,8 +11,8 @@ extends =
 
 [pkgconfig]
 recipe = hexagonit.recipe.cmmi
-url = http://pkgconfig.freedesktop.org/releases/pkg-config-0.25.tar.gz
-md5sum = a3270bab3f4b69b7dc6dbdacbcae9745
+url = http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz
+md5sum = 47525c26a9ba7ba14bf85e01509a7234
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 # build pkg-config twice so that second configure can use pkg-config
 # to compute GLIB_CFLAGS and GLIB_LIBS.
@@ -27,3 +27,5 @@ environment =
   PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig
   CPPFLAGS=-I${glib:location}/include -I${popt:location}/include
   LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${glib:location}/lib -Wl,-rpath=${glib:location}/lib -L${popt:location}/lib -Wl,-rpath=${popt:location}/lib
+  GLIB_CFLAGS=-I${glib:location}/include/glib-2.0 -I${glib:location}/lib/glib-2.0/include
+  GLIB_LIBS=-L${glib:location}/lib -lglib-2.0 -lintl

component/pwgen/buildout.cfg

+[buildout]
+parts =
+  pwgen
+
+[pwgen]
+recipe = hexagonit.recipe.cmmi
+url = http://downloads.sourceforge.net/project/pwgen/pwgen/2.06/pwgen-2.06.tar.gz
+md5sum = 935aebcbe610fbc9de8125e7b7d71297

component/python-2.6/buildout.cfg

@@ -24,6 +24,8 @@ filename = python-2.6.6-no_system_inc_dirs.patch
 
 [python2.6]
 recipe = hexagonit.recipe.cmmi
+depends =
+  ${gdbm:version}
 # 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_}

component/python-2.7/buildout.cfg

@@ -38,6 +38,8 @@ python = python2.7
 
 [python2.7common]
 recipe = hexagonit.recipe.cmmi
+depends =
+  ${gdbm:version}
 # 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_}

component/qt/buildout.cfg

+[buildout]
+
+parts = 
+  qt
+  
+[qt]
+recipe = slapos.recipe.build
+slapos_promisee =
+  file:plop
+
+# Online installer
+x86 = http://get.qt.nokia.com/qtsdk/Qt_SDK_Lin32_online_v1_1_3_en.run eae2e2a1396fec1369b66c71d7df6eab
+x86-64 =  http://get.qt.nokia.com/qtsdk/Qt_SDK_Lin64_online_v1_1_3_en.run a4d929bc4d6511290c07c3745477b77b
+# Offline installer
+#x86 = http://get.qt.nokia.com/qtsdk/Qt_SDK_Lin32_offline_v1_1_3_en.run 106fdae4ec8947c491ab0a827a02da12
+#x86-64 = http://get.qt.nokia.com/qtsdk/Qt_SDK_Lin64_offline_v1_1_3_en.run 8c280beb11ee763840464572ed80e8b8
+
+# Needs many dependencies.
+
+script =
+  if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ')
+  download_file = self.download(self.options['url'], self.options.get('md5sum'))
+  extract_dir = tempfile.mkdtemp(self.name)
+  os.chdir(extract_dir)
+  (download_dir, filename) = os.path.split(download_file)
+  auto_extract_bin = os.path.join(extract_dir, filename)
+  shutil.move(download_file, auto_extract_bin)
+  os.chmod(auto_extract_bin, 0777)
+  subprocess.call([auto_extract_bin])
+  self.cleanup_dir_list.append(extract_dir)
+  workdir = guessworkdir(extract_dir)
+  import pdb; pdb.set_trace()
+  self.copyTree(os.path.join(workdir, "jre1.6.0_27"), "%(location)s")
+
+
+
+#ldd qt.run
+#	linux-gate.so.1 =>  (0xb7827000)
+#	libutil.so.1 => /lib/i686/cmov/libutil.so.1 (0xb781c000)
+#	libgobject-2.0.so.0 => not found
+#	libSM.so.6 => not found
+#	libICE.so.6 => not found
+#	libXrender.so.1 => not found
+#	libfontconfig.so.1 => not found
+#	libfreetype.so.6 => /usr/lib/libfreetype.so.6 (0xb77a4000)
+#	libz.so.1 => /usr/lib/libz.so.1 (0xb778f000)
+#	libXext.so.6 => /usr/lib/libXext.so.6 (0xb7780000)
+#	libX11.so.6 => /usr/lib/libX11.so.6 (0xb7663000)
+#	libdl.so.2 => /lib/i686/cmov/libdl.so.2 (0xb765f000)
+#	libgthread-2.0.so.0 => not found
+#	librt.so.1 => /lib/i686/cmov/librt.so.1 (0xb7655000)
+#	libglib-2.0.so.0 => not found
+#	libpthread.so.0 => /lib/i686/cmov/libpthread.so.0 (0xb763c000)
+#	libstdc++.so.6 => /usr/lib/libstdc++.so.6 (0xb754d000)
+#	libm.so.6 => /lib/i686/cmov/libm.so.6 (0xb7527000)
+#	libgcc_s.so.1 => /lib/libgcc_s.so.1 (0xb7508000)
+#	libc.so.6 => /lib/i686/cmov/libc.so.6 (0xb73c2000)
+#	libxcb.so.1 => /usr/lib/libxcb.so.1 (0xb73a9000)
+#	/lib/ld-linux.so.2 (0xb7828000)
+#	libXau.so.6 => /usr/lib/libXau.so.6 (0xb73a6000)
+#	libXdmcp.so.6 => /usr/lib/libXdmcp.so.6 (0xb73a1000)
\ No newline at end of file

component/rdiff-backup/buildout.cfg

@@ -13,7 +13,7 @@ library-dirs =
   ${librsync:location}/lib/
 rpath =
   ${librsync:location}/lib/
-find-links = http://download.savannah.nongnu.org/releases/rdiff-backup/rdiff-backup-1.0.5.tar.gz
+find-links = http://pkgs.fedoraproject.org/repo/pkgs/rdiff-backup/rdiff-backup-1.0.5.tar.gz/fa2a165fa07a94be52c52e3545bc7758/rdiff-backup-1.0.5.tar.gz
 
 [rdiff-backup]
 # Scripts only generation part for rdiff-backup

component/readline/buildout.cfg

 [buildout]
 parts =
+  readline5
   readline
-extends =
-  ../ncurses/buildout.cfg
 
-[readline]
+# readline-5.x is still used for GPL2 only softwares.
+[readline5]
 recipe = hexagonit.recipe.cmmi
-url = http://ftp.gnu.org/gnu/readline/readline-6.2.tar.gz
-md5sum = 67948acb2ca081f23359d0256e9a271c
+url = http://ftp.gnu.org/gnu/readline/readline-5.2.tar.gz
+md5sum = e39331f32ad14009b9ff49cc10c5e751
+configure-options =
+  --enable-multibyte
+  --disable-static
+
+# 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
+md5sum = 67948acb2ca081f23359d0256e9a271c
+configure-options =
+  --enable-multibyte
+  --disable-static

component/sed/buildout.cfg

@@ -6,7 +6,5 @@ parts =
 recipe = hexagonit.recipe.cmmi
 url = ftp://ftp.gnu.org/gnu/sed/sed-4.2.1.tar.gz
 md5sum = f0fd4d7da574d4707e442285fd2d3b86
-configure-options =
-  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
 environment =
   LDFLAGS =-Wl,--as-needed

component/sheepstrike/buildout.cfg

+[buildout]
+parts = sheepstrike
+
+[sheepstrike]
+recipe = hexagonit.recipe.cmmi
+url = https://gitorious.org/sheepstrike/sheepstrike/archive-tarball/0.1
+md5sum = 2c5009eb7c32d7ba5d270d0b88d7e5ab
+prefix = ${buildout:parts-directory}/${:_buildout_section_name_}
+configure-options = --prefix=${:prefix}
+configure-command =
+  ./bootstrap
+  ./configure

component/shellinabox/0001-Switch-to-IPv6.patch

+From 50ec7439e80bd6a77346dc6482895e481d8cd43a Mon Sep 17 00:00:00 2001
+From: Antoine Catton <acatton@tiolive.com>
+Date: Tue, 10 Jan 2012 18:30:20 +0100
+Subject: [PATCH] Switch to IPv6
+
+---
+ libhttp/http.h             |    4 ++--
+ libhttp/httpconnection.c   |   11 ++++++++++-
+ libhttp/server.c           |   33 +++++++++++++++++++--------------
+ libhttp/server.h           |    6 +++---
+ shellinabox/shellinaboxd.c |   14 +++++++-------
+ 5 files changed, 41 insertions(+), 27 deletions(-)
+
+diff --git a/libhttp/http.h b/libhttp/http.h
+index e7840fa..5cd61e3 100644
+--- a/libhttp/http.h
++++ b/libhttp/http.h
+@@ -66,8 +66,8 @@ typedef struct ServerConnection ServerConnection;
+ typedef struct Server Server;
+ typedef struct URL URL;
+ 
+-Server *newCGIServer(int localhostOnly, int portMin, int portMax, int timeout);
+-Server *newServer(int localhostOnly, int port);
++Server *newCGIServer(char *ipv6, int portMin, int portMax, int timeout);
++Server *newServer(char *ipv6, int port);
+ void deleteServer(Server *server);
+ int  serverGetListeningPort(Server *server);
+ int  serverGetFd(Server *server);
+diff --git a/libhttp/httpconnection.c b/libhttp/httpconnection.c
+index c8e69f6..cae467f 100644
+--- a/libhttp/httpconnection.c
++++ b/libhttp/httpconnection.c
+@@ -823,8 +823,17 @@ static int httpHandleCommand(struct HttpConnection *http,
+   const char *host                         = getFromHashMap(&http->header,
+                                                             "host");
+   if (host) {
++    int brackets = 0; // For IPv6 hosts
+     for (char ch; (ch = *host) != '\000'; host++) {
+-      if (ch == ':') {
++      if (ch == '[') {
++          brackets = 1;
++          break;
++      }
++      if (ch == ']') {
++          brackets = 0;
++          break;
++      }
++      if (!brackets && ch == ':') {
+         *(char *)host                      = '\000';
+         break;
+       }
+diff --git a/libhttp/server.c b/libhttp/server.c
+index f52a269..2c30bd8 100644
+--- a/libhttp/server.c
++++ b/libhttp/server.c
+@@ -170,19 +170,19 @@ static int serverQuitHandler(struct HttpConnection *http, void *arg) {
+   return HTTP_DONE;
+ }
+ 
+-struct Server *newCGIServer(int localhostOnly, int portMin, int portMax,
++struct Server *newCGIServer(char *ipv6, int portMin, int portMax,
+                             int timeout) {
+   struct Server *server;
+   check(server = malloc(sizeof(struct Server)));
+-  initServer(server, localhostOnly, portMin, portMax, timeout);
++  initServer(server, ipv6, portMin, portMax, timeout);
+   return server;
+ }
+ 
+-struct Server *newServer(int localhostOnly, int port) {
+-  return newCGIServer(localhostOnly, port, port, -1);
++struct Server *newServer(char *ipv6, int port) {
++  return newCGIServer(ipv6, port, port, -1);
+ }
+ 
+-void initServer(struct Server *server, int localhostOnly, int portMin,
++void initServer(struct Server *server, char *ipv6, int portMin,
+                 int portMax, int timeout) {
+   server->looping               = 0;
+   server->exitAll               = 0;
+@@ -192,14 +192,19 @@ void initServer(struct Server *server, int localhostOnly, int portMin,
+   server->numConnections        = 0;
+ 
+   int true                      = 1;
+-  server->serverFd              = socket(PF_INET, SOCK_STREAM, 0);
++  server->serverFd              = socket(PF_INET6, SOCK_STREAM, 0);
+   check(server->serverFd >= 0);
+   check(!setsockopt(server->serverFd, SOL_SOCKET, SO_REUSEADDR,
+                     &true, sizeof(true)));
+-  struct sockaddr_in serverAddr = { 0 };
+-  serverAddr.sin_family         = AF_INET;
+-  serverAddr.sin_addr.s_addr    = htonl(localhostOnly
+-                                        ? INADDR_LOOPBACK : INADDR_ANY);
++  struct sockaddr_in6 serverAddr = { 0 };
++  serverAddr.sin6_family         = AF_INET6;
++  if (ipv6 != NULL) {
++    if (!inet_pton(AF_INET6, ipv6, serverAddr.sin6_addr.s6_addr)) {
++        fatal("Bad ipv6 address");
++    }
++  } else {
++    serverAddr.sin6_addr = in6addr_any;
++  }
+ 
+   // Linux unlike BSD does not have support for picking a local port range.
+   // So, we have to randomly pick a port from our allowed port range, and then
+@@ -214,14 +219,14 @@ void initServer(struct Server *server, int localhostOnly, int portMin,
+     int portStart               = rand() % (portMax - portMin + 1) + portMin;
+     for (int p = 0; p <= portMax-portMin; p++) {
+       int port                  = (p+portStart)%(portMax-portMin+1)+ portMin;
+-      serverAddr.sin_port       = htons(port);
++      serverAddr.sin6_port       = htons(port);
+       if (!bind(server->serverFd, (struct sockaddr *)&serverAddr,
+                 sizeof(serverAddr))) {
+         break;
+       }
+-      serverAddr.sin_port       = 0;
++      serverAddr.sin6_port       = 0;
+     }
+-    if (!serverAddr.sin_port) {
++    if (!serverAddr.sin6_port) {
+       fatal("Failed to find any available port");
+     }
+   }
+@@ -231,7 +236,7 @@ void initServer(struct Server *server, int localhostOnly, int portMin,
+   check(!getsockname(server->serverFd, (struct sockaddr *)&serverAddr,
+                      &socklen));
+   check(socklen == sizeof(serverAddr));
+-  server->port                  = ntohs(serverAddr.sin_port);
++  server->port                  = ntohs(serverAddr.sin6_port);
+   info("Listening on port %d", server->port);
+ 
+   check(server->pollFds         = malloc(sizeof(struct pollfd)));
+diff --git a/libhttp/server.h b/libhttp/server.h
+index bb879fb..5ffb698 100644
+--- a/libhttp/server.h
++++ b/libhttp/server.h
+@@ -78,10 +78,10 @@ struct Server {
+   struct SSLSupport       ssl;
+ };
+ 
+-struct Server *newCGIServer(int localhostOnly, int portMin, int portMax,
++struct Server *newCGIServer(char *ipv6, int portMin, int portMax,
+                             int timeout);
+-struct Server *newServer(int localhostOnly, int port);
+-void initServer(struct Server *server, int localhostOnly, int portMin,
++struct Server *newServer(char *ipv6, int port);
++void initServer(struct Server *server, char *ipv6, int portMin,
+                 int portMax, int timeout);
+ void destroyServer(struct Server *server);
+ void deleteServer(struct Server *server);
+diff --git a/shellinabox/shellinaboxd.c b/shellinabox/shellinaboxd.c
+index dcf05ff..2d1d758 100644
+--- a/shellinabox/shellinaboxd.c
++++ b/shellinabox/shellinaboxd.c
+@@ -80,7 +80,7 @@
+ static int            port;
+ static int            portMin;
+ static int            portMax;
+-static int            localhostOnly = 0;
++static char           *ipv6 = NULL;
+ static int            noBeep        = 0;
+ static int            numericHosts  = 0;
+ static int            enableSSL     = 1;
+@@ -747,7 +747,7 @@ static void usage(void) {
+           "  -g, --group=GID             switch to this group (default: %s)\n"
+           "  -h, --help                  print this message\n"
+           "      --linkify=[none|normal|agressive] default is \"normal\"\n"
+-          "      --localhost-only        only listen on 127.0.0.1\n"
++          "      --ipv6                  listen on a specific ipv6\n"
+           "      --no-beep               suppress all audio output\n"
+           "  -n, --numeric               do not resolve hostnames\n"
+           "  -p, --port=PORT             select a port (default: %d)\n"
+@@ -839,7 +839,7 @@ static void parseArgs(int argc, char * const argv[]) {
+       { "static-file",      1, 0, 'f' },
+       { "group",            1, 0, 'g' },
+       { "linkify",          1, 0,  0  },
+-      { "localhost-only",   0, 0,  0  },
++      { "ipv6",             1, 0,  0  },
+       { "no-beep",          0, 0,  0  },
+       { "numeric",          0, 0, 'n' },
+       { "port",             1, 0, 'p' },
+@@ -1001,8 +1001,8 @@ static void parseArgs(int argc, char * const argv[]) {
+               "\"none\", \"normal\", or \"aggressive\".");
+       }
+     } else if (!idx--) {
+-      // Localhost Only
+-      localhostOnly        = 1;
++      // IPv6
++      ipv6 = optarg;
+     } else if (!idx--) {
+       // No Beep
+       noBeep               = 1;
+@@ -1197,7 +1197,7 @@ int main(int argc, char * const argv[]) {
+   // Create a new web server
+   Server *server;
+   if (port) {
+-    check(server  = newServer(localhostOnly, port));
++    check(server  = newServer(ipv6, port));
+     dropPrivileges();
+     setUpSSL(server);
+   } else {
+@@ -1217,7 +1217,7 @@ int main(int argc, char * const argv[]) {
+       _exit(0);
+     }
+     check(!NOINTR(close(fds[0])));
+-    check(server  = newCGIServer(localhostOnly, portMin, portMax,
++    check(server  = newCGIServer(ipv6, portMin, portMax,
+                                  AJAX_TIMEOUT));
+     cgiServer     = server;
+     setUpSSL(server);
+-- 
+1.7.6.5
+

component/shellinabox/0002-Allow-to-run-entire-command-path.patch

+From eee6f7180dc5dd4523264e7ce0721945ab2b78a1 Mon Sep 17 00:00:00 2001
+From: Antoine Catton <acatton@tiolive.com>
+Date: Wed, 11 Jan 2012 17:32:15 +0100
+Subject: [PATCH 2/2] Allow to run entire command path.
+
+---
+ shellinabox/launcher.c |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/shellinabox/launcher.c b/shellinabox/launcher.c
+index fb8a133..e116a75 100644
+--- a/shellinabox/launcher.c
++++ b/shellinabox/launcher.c
+@@ -1226,8 +1226,7 @@ static void execService(int width, int height, struct Service *service,
+ 
+   extern char **environ;
+   environ                     = environment;
+-  char *cmd                   = strrchr(argv[0], '/');
+-  execvp(cmd ? cmd + 1: argv[0], argv);
++  execvp(argv[0], argv);
+ }
+ 
+ void setWindowSize(int pty, int width, int height) {
+-- 
+1.7.6.5
+

component/shellinabox/buildout.cfg

+[buildout]
+extends =
+  ../zlib/buildout.cfg
+  ../openssl/buildout.cfg
+  ../patch/buildout.cfg
+
+parts = shellinabox
+
+[shellinabox-full-path-patch]
+recipe = hexagonit.recipe.download
+filename = 0002-Allow-to-run-entire-command-path.patch
+url = ${:_profile_base_location_}/${:filename}
+download-only = true
+
+
+[shellinabox-ipv6-patch]
+recipe = hexagonit.recipe.download
+filename = 0001-Switch-to-IPv6.patch
+url = ${:_profile_base_location_}/${:filename}
+download-only = true
+
+[shellinabox]
+recipe = hexagonit.recipe.cmmi
+url = http://shellinabox.googlecode.com/files/shellinabox-2.10.tar.gz
+md5sum = 0e144910d85d92edc54702ab9c46f032
+environment =
+    CFLAGS = -I${zlib:location}/include -I${openssl:location}/include
+    LDFLAGS = -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib
+    PKG_CONFIG_PATH = ${openssl:location}/lib/pkgconfig/
+patch-binary = ${patch:location}/bin/patch
+patch-options = -p1
+patches =
+    ${shellinabox-ipv6-patch:location}/${shellinabox-ipv6-patch:filename}
+    ${shellinabox-full-path-patch:location}/${shellinabox-full-path-patch:filename}

component/slapos/buildout.cfg

@@ -112,24 +112,25 @@ scripts =
   slapproxy = slapos.proxy:main
 
 [versions]
-zc.buildout = 1.6.0-dev-SlapOS-002
+zc.buildout = 1.6.0-dev-SlapOS-004
+
+# Generated by buildout-versions
 Jinja2 = 2.6
-Werkzeug = 0.8.1
+Werkzeug = 0.8.3
+buildout-versions = 1.7
 collective.recipe.template = 1.9
 hexagonit.recipe.cmmi = 1.5.0
-ipython = 0.11
-lxml = 2.3.1
-meld3 = 0.6.7
+lxml = 2.3.3
+meld3 = 0.6.8
 netaddr = 0.7.6
-setuptools = 0.6c12dev-r88846
-slapos.core = 0.19
-slapos.libnetworkcache = 0.10
+slapos.core = 0.23
+slapos.libnetworkcache = 0.12
 xml-marshaller = 0.9.7
-z3c.recipe.scripts = 1.0.1
+z3c.recipe.scripts = 1.0.1 
 zc.recipe.egg = 1.3.2
 
 # Required by:
-# slapos.core==0.19
+# slapos.core==0.23
 Flask = 0.8
 
 # Required by:
@@ -137,13 +138,22 @@ Flask = 0.8
 hexagonit.recipe.download = 1.5.0
 
 # Required by:
-# slapos.core==0.19
-netifaces = 0.6
+# slapos.core==0.23
+netifaces = 0.8
+
+# Required by:
+# slapos.core==0.23
+# slapos.libnetworkcache==0.12
+# supervisor==3.0a12
+# zc.buildout==1.6.0-dev-SlapOS-004
+# zope.interface==3.8.0
+setuptools = 0.6c12dev-r88846
 
 # Required by:
-# slapos.core==0.19
-supervisor = 3.0a10
+# slapos.core==0.23
+supervisor = 3.0a12
 
 # Required by:
-# slapos.core==0.19
+# slapos.core==0.23
+>>>>>>> master
 zope.interface = 3.8.0

component/sphinx/buildout.cfg

@@ -18,8 +18,8 @@ filename = sphinx-1.10-beta-snowball.patch
 
 [sphinx]
 recipe = hexagonit.recipe.cmmi
-url = http://sphinxsearch.com/files/sphinx-2.0.1-beta.tar.gz
-md5sum = 95c217d81d0b7a4ff73d5297318c3481
+url = http://sphinxsearch.com/files/sphinx-2.0.2-beta.tar.gz
+md5sum = fafe0f1a71d0ded32404c067eba7d0b3
 configure-options =
   --with-mysql
   --with-mysql-includes=${mariadb:location}/include/mysql

component/sphinx/sphinx-1.10-fix_nosigpipe.patch

-# http://www.sphinxsearch.com/bugs/view.php?id=550
-# 0000550: Can not make libsphinxclient
-
---- sphinx-1.10-beta/api/libsphinxclient/sphinxclient.c	2010-07-15 13:05:40.000000000 +0200
-+++ sphinx-1.10-beta/api/libsphinxclient/sphinxclient.c	2010-07-21 20:43:26.760024489 +0200
-@@ -1355,11 +1355,13 @@
- 
- 	optval = 1;
- #ifndef _WIN32
-+  #ifdef SO_NOSIGPIPE
- 	if ( setsockopt ( sock, SOL_SOCKET, SO_NOSIGPIPE, (void *)&optval, (socklen_t)sizeof(optval) ) < 0 )
- 	{
- 		set_error ( client, "setsockopt() failed: %s", sock_error() );
- 		return -1;
- 	}
-+  #endif
- #endif
- 
- 	res = connect ( sock, (struct sockaddr*)&sa, sizeof(sa) );

component/sqlite3/buildout.cfg

@@ -5,8 +5,8 @@ parts =
 
 [sqlite3]
 recipe = hexagonit.recipe.cmmi
-url = http://www.sqlite.org/sqlite-autoconf-3070800.tar.gz
-md5sum = 6bfb46d73caaa1bbbcd2b52184b6c542
+url = http://www.sqlite.org/sqlite-autoconf-3071000.tar.gz
+md5sum = 9ed2ca93577b58cfa0d01f64b9312ab9
 configure-options =
   --disable-static
   --enable-readline