Merge remote-tracking branch 'origin/master' into erp5-cluster

component/dbus/buildout.cfg

@@ -3,6 +3,7 @@ extends =
   ../libxml2/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../libexpat/buildout.cfg
+  ../zlib/buildout.cfg
 
 parts =
   dbus
@@ -33,4 +34,4 @@ 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
+  LDFLAGS=-L${libexpat:location}/lib -L${gettext:location}/lib -Wl,-rpath=${zlib:location}/lib

component/ghostscript/buildout.cfg

@@ -35,8 +35,8 @@ environment =
 
 [ghostscript-9]
 <= ghostscript-common
-url = http://downloads.ghostscript.com/public/ghostscript-9.10.tar.bz2
-md5sum = 7179bb1ed4f6f453147e6f7e1f210ce8
+url = http://downloads.ghostscript.com/public/ghostscript-9.14.tar.bz2
+md5sum = 75f2e8ab8891d052ade9b64eb4eb5294
 
 [ghostscript-fonts]
 recipe = hexagonit.recipe.download

component/gtk-2/buildout.cfg

@@ -5,6 +5,7 @@ extends =
   ../freetype/buildout.cfg
   ../gettext/buildout.cfg
   ../glib/buildout.cfg
+  ../jbigkit/buildout.cfg
   ../libjpeg/buildout.cfg
   ../libpng/buildout.cfg
   ../libtiff/buildout.cfg
@@ -73,18 +74,19 @@ environment =
 
 [gdk-pixbuf]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.30/gdk-pixbuf-2.30.3.tar.xz
-md5sum = 81161cc895eb43afd9ae7354b87e2261
+url = http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.30/gdk-pixbuf-2.30.7.tar.xz
+md5sum = 1195d26f14adfe99ff0878d37678a70a
 pkg_config_depends = ${glib:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libX11:pkg_config_depends}
 configure-options =
   --disable-static
+  --disable-gtk-doc-html
   --without-libintl-prefix
   --with-x11
 environment =
   PATH=${glib:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${:pkg_config_depends}
   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
+  LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${glib:location}/lib -Wl,-rpath=${glib:location}/lib -Wl,-rpath=${jbigkit: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]

component/imagemagick/buildout.cfg

@@ -24,9 +24,9 @@ extends =
 
 [imagemagick]
 recipe = slapos.recipe.cmmi
-version = 6.8.8-9
+version = 6.8.9-1
 url = http://ftp.vim.org/ImageMagick/ImageMagick-${:version}.tar.xz
-md5sum = d4a7ac7400622a325580e52cf9a562c7
+md5sum = bde038ae05fb20d29cebf88ab9cbdce5
 depends =
   ${libtiff:version}
   ${libpng:so_version}

component/mariadb/buildout.cfg

@@ -19,10 +19,10 @@ parts =
 
 [mariadb]
 recipe = slapos.recipe.cmmi
-version = 10.0.10
-revision = 2
-url = http://downloads.askmonty.org/f/mariadb-${:version}/kvm-tarbake-jaunty-x86/mariadb-${:version}.tar.gz/from/http://ftp.osuosl.org/pub/mariadb
-md5sum = 14ce22b8197d4eae88d237776d47220f
+version = 10.0.11
+revision = 1
+url = https://downloads.mariadb.org/f/mariadb-${:version}/source/mariadb-${:version}.tar.gz/from/http:/ftp.osuosl.org/pub/mariadb
+md5sum = faa2ea3f9c6f7bc5f021d299367a7a8d
 # compile directory is required to build mysql plugins.
 keep-compile-dir = true
 patch-options = -p0

component/perl-XML-SAX-Base/buildout.cfg

+[buildout]
+extends =
+  ../perl/buildout.cfg
+parts =
+  perl-XML-SAX-Base
+
+[perl-XML-SAX-Base]
+recipe = slapos.recipe.cmmi
+depends =
+  ${perl:version}
+url = http://www.cpan.org/modules/by-module/XML/XML-SAX-Base-1.08.tar.gz
+md5sum = 38c8c3247dfd080712596118d70dbe32
+configure-command =
+  ${perl:location}/bin/perl Makefile.PL

component/perl-XML-SAX/buildout.cfg

@@ -2,6 +2,7 @@
 extends =
   ../perl/buildout.cfg
   ../perl-XML-NamespaceSupport/buildout.cfg
+  ../perl-XML-SAX-Base/buildout.cfg
 parts =
   perl-XML-SAX
 
@@ -10,6 +11,7 @@ recipe = slapos.recipe.cmmi
 depends =
   ${perl:version}
   ${perl-XML-NamespaceSupport:location}
+  ${perl-XML-SAX-Base:location}
 url = http://www.cpan.org/modules/by-module/XML/XML-SAX-0.99.tar.gz
 md5sum = 290f5375ae87fdebfdb5bc3854019f24
 # say 'y' for 'Do you want XML::SAX to alter ParserDetails.ini? [Y]' question.

component/stunnel/buildout.cfg

@@ -5,14 +5,9 @@ parts =
   stunnel
 
 [stunnel]
-<= stunnel-4
 recipe = slapos.recipe.cmmi
-
-[stunnel-4]
-recipe = slapos.recipe.cmmi
-url = https://www.stunnel.org/downloads/stunnel-5.00.tar.gz
-md5sum = 4f00fd0faf99e3c9cf258a19dd83d14a
-pre-configure-hook = ${:_profile_base_location_}/stunnel-4-hooks.py#5b099b386c34c5b8d0664c0292ba322a:pre_configure_hook
+url = https://www.stunnel.org/downloads/stunnel-5.01.tar.gz
+md5sum = 7b63266b6fa05da696729e245100da65
 configure-options =
   --enable-ipv6
   --disable-libwrap

component/stunnel/stunnel-4-hooks.py

-import os
-def pre_configure_hook(options, buildout):
-  # remove certificate generation
-  # based on Gentoo: http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-misc/stunnel/stunnel-4.33.ebuild
-  name = os.path.join('tools','Makefile.in')
-  f = file(name, 'r')
-  d = f.read().replace('install-data-local:', 'do-not-run-this:')
-  f.close()
-  file(name, 'w').write(d)

stack/erp5/buildout.cfg

@@ -519,6 +519,7 @@ eggs =
   httplib2
   suds
   pprofile
+  pycountry
 # Needed for checking ZODB Components source code
   pylint
 
@@ -733,6 +734,7 @@ ply = 3.4
 polib = 1.0.4
 pprofile = 1.7.2
 psutil = 2.1.1
+pycountry = 1.6
 pyflakes = 0.8.1
 pylint = 1.2.1
 pyparsing = 2.0.2