Merge remote-tracking branch 'origin/master' into erp5-z2.12

component/apache/buildout.cfg

@@ -113,9 +113,9 @@ make-targets =
 [apache-2.2]
 # inspired on http://old.aclark.net/team/aclark/blog/a-lamp-buildout-for-wordpress-and-other-php-apps/
 recipe = slapos.recipe.cmmi
-version = 2.2.26
+version = 2.2.27
 url = http://mir2.ovh.net/ftp.apache.org/dist/httpd/httpd-${:version}.tar.bz2
-md5sum = 254eda547f8d624604e4bf403241e617
+md5sum = 8faef0decf3fa7e69b2568eb2105a3d8
 patch-options = -p1
 configure-options = --disable-static
                     --enable-authn-alias

component/ca-certificates/buildout.cfg

@@ -4,18 +4,21 @@
 
 extends =
   ../patch/buildout.cfg
+  ../xz-utils/buildout.cfg
 
 parts =
   ca-certificates
 
 [ca-certificates]
 recipe = slapos.recipe.cmmi
-version = 20130906
-url = ftp://ftp.free.fr/mirrors/ftp.debian.org/pool/main/c/ca-certificates/ca-certificates_${:version}.tar.gz
+version = 20140325
+url = ftp://ftp.free.fr/mirrors/ftp.debian.org/pool/main/c/ca-certificates/ca-certificates_${:version}.tar.xz
 patch-binary = ${patch:location}/bin/patch
-md5sum = 67d42b6be21c616a8b7d3d85d95ae912
+md5sum = 0436aba482091da310bd762e1deca8b4
 patches =
   ${:_profile_base_location_}/ca-certificates-sbin-dir.patch#0b4e7d82ce768823c01954ee41ef177b
 patch-options = -p0
 configure-command = true
 make-targets = install DESTDIR=${buildout:parts-directory}/${:_buildout_section_name_} CERTSDIR=certs SBINDIR=sbin
+environment =
+  PATH=${xz-utils:location}/bin:%(PATH)s

component/fonts/buildout.cfg

@@ -4,39 +4,42 @@ parts =
   ipaex-fonts
   ipa-fonts
   ocrb-fonts
+  android-fonts
 
 [fonts]
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 
+[fonts-base]
+destination = ${fonts:location}/${:_buildout_section_name_}
+recipe = hexagonit.recipe.download
+strip-top-level-dir = true
+
 # Liberation(tm) Fonts - a font family which aims at metric
 # compatibility with Arial, Times New Roman, and Courier New.
 # https://fedorahosted.org/liberation-fonts/
 [liberation-fonts]
-recipe = hexagonit.recipe.download
-strip-top-level-dir = true
+<= fonts-base
 url = https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-2.00.1.tar.gz
 md5sum = 5c781723a0d9ed6188960defba8e91cf
-destination = ${fonts:location}/${:_buildout_section_name_}
 
 # IPAex and IPA Font - Japanese fonts provided by IPA
 # http://ipafont.ipa.go.jp/
 [ipaex-fonts]
-recipe = hexagonit.recipe.download
-strip-top-level-dir = true
+<= fonts-base
 url = http://ipafont.ipa.go.jp/ipaexfont/IPAexfont00201.php
 md5sum = 7bf84182a04a9632268dbcb03f100d05
-destination = ${fonts:location}/${:_buildout_section_name_}
 
 [ipa-fonts]
-recipe = hexagonit.recipe.download
-strip-top-level-dir = true
+<= fonts-base
 url = http://ipafont.ipa.go.jp/ipafont/IPAfont00303.php
 md5sum = 39a828acf27790adbe4944dfb4d94bb1
-destination = ${fonts:location}/${:_buildout_section_name_}
 
 [ocrb-fonts]
-recipe = hexagonit.recipe.download
-strip-top-level-dir = true
+<= fonts-base
 url = http://sourceforge.jp/frs/redir.php?m=jaist&f=%2Ftsukurimashou%2F56948%2Focr-0.2.zip
 md5sum = 9f2acd83291a31dbe053912f4115db75
-destination = ${fonts:location}/${:_buildout_section_name_}
+
+[android-fonts]
+<= fonts-base
+url = ftp://ftp.free.fr/mirrors/ftp.debian.org/pool/main/f/fonts-android/fonts-android_4.3.orig.tar.xz
+md5sum = 2d41d5342eb5f61591ddeec5b80da74d

component/garbage-collector/buildout.cfg

+# A garbage collector for C and C++
+# http://www.hboehm.info/gc/
+
 [buildout]
 parts = garbage-collector
 
 [garbage-collector]
 recipe = slapos.recipe.cmmi
-md5sum = 2ff9924c7249ef7f736ecfe6f08f3f9b
-url = http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc-7.1.tar.gz
+md5sum = 5e230029f802d0ac633b1d9b3d4934c9
+url = http://www.hboehm.info/gc/gc_source/gc-7.2e.tar.gz
 configure-options =
+  --enable-cplusplus
+  --disable-gcj-support
   --disable-static
+  --disable-dependency-tracking

component/glib/buildout.cfg

@@ -9,8 +9,8 @@ parts =
 
 [glib]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnome.org/pub/gnome/sources/glib/2.39/glib-2.39.3.tar.xz
-md5sum = c8ddc045e12cfafdea607c138f3f8429
+url = http://ftp.gnome.org/pub/gnome/sources/glib/2.38/glib-2.38.2.tar.xz
+md5sum = 26d1d08e478fc48c181ca8be44f5b69f
 configure-options =
   --disable-static
   --disable-selinux

component/groonga/buildout.cfg

@@ -11,9 +11,9 @@ extends =
 
 [groonga]
 recipe = slapos.recipe.cmmi
-version = 4.0.0
+version = 4.0.1
 url = http://packages.groonga.org/source/groonga/groonga-${:version}.tar.gz
-md5sum = 63d1ae3453719f7bef06a30f8966e886
+md5sum = 7bfd1c78fe6506424d3f6e4a689a4619
 configure-options =
   --disable-static
   --disable-glibtest

component/imagemagick/buildout.cfg

@@ -8,8 +8,8 @@ extends =
   ../fontconfig/buildout.cfg
   ../freetype/buildout.cfg
   ../ghostscript/buildout.cfg
+  ../inkscape/buildout.cfg
   ../lcms/buildout.cfg
-  ../librsvg/buildout.cfg
   ../libjpeg/buildout.cfg
   ../libpng/buildout.cfg
   ../libtiff/buildout.cfg
@@ -64,7 +64,7 @@ patch-options = -p1
 patches =
   ${:_profile_base_location_}/imagemagick-6.6.6-1-no-gsx-gsc-probe.patch#3f28ecd9f6722cf2c3238ce6ec3d7a68
 environment =
-  PATH=${freetype:location}/bin:${ghostscript:location}/bin:${librsvg:location}/bin:${libxml2:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PATH=${freetype:location}/bin:${ghostscript:location}/bin:${inkscape:location}/bin:${libxml2:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${:pkg_config_depends}
   CPPFLAGS=-I${bzip2:location}/include -I${zlib:location}/include -I${jbigkit:location}/include -I${libjpeg:location}/include -I${libtiff:location}/include -I${libpng:location}/include -I${jasper:location}/include -I${freetype:location}/include -I${webp:location}/include -I${lcms2:location}/include
   LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${jbigkit:location}/lib -Wl,-rpath=${jbigkit:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${libtiff:location}/lib -Wl,-rpath=${libtiff:location}/lib -L${libpng:location}/lib -Wl,-rpath=${libpng:location}/lib -L${jasper:location}/lib -Wl,-rpath=${jasper:location}/lib -L${freetype:location}/lib -Wl,-rpath=${freetype:location}/lib -L${webp:location}/lib -Wl,-rpath=${webp:location}/lib -L${lcms2:location}/lib -Wl,-rpath=${lcms2:location}/lib

component/mariadb/buildout.cfg

@@ -56,11 +56,8 @@ environment =
 # mroonga - a storage engine for MySQL. It provides fast fulltext search feature to all MySQL users.
 # http://mroonga.github.com/
 recipe = slapos.recipe.cmmi
-url = http://packages.groonga.org/source/mroonga/mroonga-4.00.tar.gz
-md5sum = f54c44c1ab0a98bea9f6ea6c4a8b2787
-patch-options = -p1
-patches =
-  ${:_profile_base_location_}/mroonga-4.00-mariadb-10.0.9.patch#1ad028d2d5701eecc7cb5b40b78abdc0
+url = http://packages.groonga.org/source/mroonga/mroonga-4.01.tar.gz
+md5sum = 7081aed69e715fb4b0b8f65b0d8d99f1
 configure-options =
   --with-mysql-source=${mariadb:location}__compile__/mariadb-${mariadb:version}
   --with-mysql-config=${mariadb:location}/bin/mysql_config

component/openssl/buildout.cfg

@@ -15,8 +15,8 @@ parts =
 
 [openssl]
 recipe = slapos.recipe.cmmi
-url = https://www.openssl.org/source/openssl-1.0.1f.tar.gz
-md5sum = f26b09c028a0541cab33da697d522b25
+url = https://www.openssl.org/source/openssl-1.0.1g.tar.gz
+md5sum = de62b43dfcd858e66a74bee1c834e959
 depends =
   ${ca-certificates:version}
 patch-binary = ${patch:location}/bin/patch

component/w3m/buildout.cfg

@@ -30,8 +30,11 @@ configure-options =
 patch-options =
   -p1
 
+# http://lists.opensuse.org/opensuse-commit/2011-09/msg00222.html
+# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/www-client/w3m/files/w3m-0.5.2-gc72.patch
 patches =
   ${:_profile_base_location_}/w3m.gcc.forward.compat.patch#75422a6f7f671b3a6d9add6724cc0945
+  ${:_profile_base_location_}/w3m-0.5.2-gc72.patch#5a74b6379240c8dd1372efa7926c8bdc
 
 environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s

component/w3m/w3m-0.5.2-gc72.patch

+diff -Naurb w3m-0.5.2.orig/main.c w3m-0.5.2/main.c
+--- w3m-0.5.2.orig/main.c	2007-05-31 10:19:50.000000000 +0900
++++ w3m-0.5.2/main.c	2009-11-09 08:20:02.184953443 +0900
+@@ -312,7 +312,11 @@
+ 	    lock = 0;
+ 	}
+     }
++#if GC_VERSION_MAJOR >= 7 && GC_VERSION_MINOR >= 2
++    else if (orig_GC_warn_proc = GC_get_warn_proc())
++#else
+     else if (orig_GC_warn_proc)
++#endif
+ 	orig_GC_warn_proc(msg, arg);
+     else
+ 	fprintf(stderr, msg, (unsigned long)arg);
+@@ -842,7 +846,11 @@
+     mySignal(SIGPIPE, SigPipe);
+ #endif
+ 
++#if GC_VERSION_MAJOR >= 7 && GC_VERSION_MINOR >= 2
++    GC_set_warn_proc(wrap_GC_warn_proc);
++#else
+     orig_GC_warn_proc = GC_set_warn_proc(wrap_GC_warn_proc);
++#endif
+     err_msg = Strnew();
+     if (load_argc == 0) {
+ 	/* no URL specified */

stack/cloudooo.cfg

@@ -72,7 +72,9 @@ parts =
 # fonts
   liberation-fonts
   ipaex-fonts
+  ipa-fonts
   ocrb-fonts
+  android-fonts
 
 # Dependencies
   cups

stack/erp5/buildout.cfg

@@ -121,7 +121,9 @@ parts =
 # fonts
   liberation-fonts
   ipaex-fonts
+  ipa-fonts
   ocrb-fonts
+  android-fonts
 
 # Cloudooo specific part
   cloudooo
@@ -563,7 +565,7 @@ PasteDeploy = 1.5.2
 Pygments = 1.6
 argparse = 1.2.1
 coverage = 3.7.1
-lxml = 3.3.3
+lxml = 3.3.4
 mr.developer = 1.30
 setuptools = 2.2
 
@@ -629,13 +631,13 @@ astroid = 1.0.1
 async = 0.6.1
 atomize = 0.2.0
 chardet = 2.2.1
-cliff = 1.5.2
+cliff = 1.6.0
 cmd2 = 0.6.7
 csp-eventlet = 0.7.0
 ecdsa = 0.11
 elementtree = 1.2.7-20070827-preview
 erp5.recipe.cmmiforcei686 = 0.1.3
-erp5.util = 0.4.36
+erp5.util = 0.4.37
 erp5diff = 0.8.1.5
 eventlet = 0.14.0
 feedparser = 5.1.3
@@ -650,8 +652,8 @@ httplib2 = 0.8
 iniparse = 0.4
 inotifyx = 0.2.0-1
 ipdb = 0.8
-ipython = 1.2.1
-itsdangerous = 0.23
+ipython = 2.0.0
+itsdangerous = 0.24
 lock-file = 2.0
 logilab-common = 0.61.0
 meld3 = 0.6.10
@@ -660,7 +662,7 @@ minitage.core = 2.0.57
 minitage.paste = 1.4.6
 minitage.recipe.common = 1.90
 minitage.recipe.egg = 1.107
-netaddr = 0.7.10
+netaddr = 0.7.11
 netifaces = 0.8-1
 ordereddict = 1.1
 paramiko = 1.13.0
@@ -670,10 +672,10 @@ polib = 1.0.4
 pprofile = 1.7.1
 prettytable = 0.7.3-nxd001
 psutil = 2.0.0
-pyflakes = 0.7.3
+pyflakes = 0.8.1
 pylint = 1.1.0
 pyparsing = 2.0.1
-python-ldap = 2.4.14
+python-ldap = 2.4.15
 python-magic = 0.4.6
 python-memcached = 1.53
 qrcode = 4.0.4
@@ -688,7 +690,7 @@ slapos.toolbox = 0.39
 smmap = 0.8.2
 socketpool = 0.5.3
 spyne = 2.10.10
-stevedore = 0.14.1
+stevedore = 0.15
 suds = 0.4
 supervisor = 3.0
 threadframe = 0.2