Merge branch 'erp5-component' into erp5

component/apache-php/buildout.cfg

@@ -23,6 +23,7 @@ extends =
 recipe = slapos.recipe.cmmi
 depends =
   ${mariadb:version}
+  ${libpng:so_version}
 url = http://fr2.php.net/distributions/php-5.4.12.tar.bz2
 md5sum = 5c7b614242ae12e9cacca21c8ab84818
 configure-options =
@@ -71,6 +72,7 @@ environment =
 recipe = slapos.recipe.cmmi
 depends =
    ${postgresql:url}
+   ${libpng:so_version}
 url = http://fr2.php.net/distributions/php-5.4.12.tar.bz2
 md5sum = 5c7b614242ae12e9cacca21c8ab84818
 configure-options =

component/chromium/buildout.cfg

@@ -36,7 +36,7 @@ script =
   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
+  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:${libpng15:location}/lib:%(location)s
   %(location)s/chrome""")
   wrapper.flush()
   wrapper.close()

component/ffmpeg/buildout.cfg

@@ -32,6 +32,8 @@ environment =
 recipe = slapos.recipe.cmmi
 url = http://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.bz2
 md5sum = 292ab65cedd5021d6b7ddd117e07cd8e
+depends =
+  ${libpng:so_version}
 configure-options =
   --disable-static
 environment = 

component/firefox/buildout.cfg

@@ -34,7 +34,7 @@ script =
   wrapper = open(wrapper_location, 'w')
   wrapper.write("""#!${dash:location}/bin/dash
   cd %(location)s
-  export LD_LIBRARY_PATH=%(location)s:${libXrender:location}/lib/:{dbus:location}/lib/:${dbus-glib:location}/lib/:${freetype:location}/lib/:${fontconfig:location}/lib/:${libX11:location}/lib/:${bzip2:location}/lib/:${libXext:location}/lib/:${libXt:location}/lib/:${zlib:location}/lib/:${libXcursor:location}/lib/:${gtk-2:location}/lib/:${cairo:location}/lib/:${pango:location}/lib/:${glib:location}/lib/:${atk:location}/lib/:${gdk-pixbuf:location}/lib/:${alsa:location}/lib/:${libpng:location}/lib/:${libSM:location}/lib/:${libICE:location}/lib:${libxml2:location}/lib:${openssl:location}/lib
+  export LD_LIBRARY_PATH=%(location)s:${libXrender:location}/lib/:{dbus:location}/lib/:${dbus-glib:location}/lib/:${freetype:location}/lib/:${fontconfig:location}/lib/:${libX11:location}/lib/:${bzip2:location}/lib/:${libXext:location}/lib/:${libXt:location}/lib/:${zlib:location}/lib/:${libXcursor:location}/lib/:${gtk-2:location}/lib/:${cairo:location}/lib/:${pango:location}/lib/:${glib:location}/lib/:${atk:location}/lib/:${gdk-pixbuf:location}/lib/:${alsa:location}/lib/:${libpng15:location}/lib/:${libSM:location}/lib/:${libICE:location}/lib:${libxml2:location}/lib:${openssl:location}/lib
   export PATH=${fontconfig:location}/bin:$PATH
   exec %(location)s/firefox $*""")
   wrapper.close()

component/freetype/buildout.cfg

@@ -4,6 +4,7 @@
 [buildout]
 extends =
   ../bzip2/buildout.cfg
+  ../libpng/buildout.cfg
   ../zlib/buildout.cfg
 
 parts =
@@ -11,10 +12,13 @@ parts =
 
 [freetype]
 recipe = slapos.recipe.cmmi
-url = http://download.savannah.gnu.org/releases/freetype/freetype-2.4.11.tar.bz2
-md5sum = b93435488942486c8d0ca22e8f768034
+url = http://download.savannah.gnu.org/releases/freetype/freetype-2.5.0.1.tar.bz2
+md5sum = c72e9010b1d986d556fc0b2b5fcbf31a
+depends =
+  ${libpng:so_version}
 configure-options =
   --disable-static
 environment =
   CPPFLAGS=-I${bzip2:location}/include -I${zlib:location}/include
   LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+  PATH=${libpng:location}/bin:%(PATH)s

component/graphviz/buildout.cfg

@@ -16,6 +16,8 @@ extends =
 recipe = slapos.recipe.cmmi
 url = http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.28.0.tar.gz
 md5sum = 8d26c1171f30ca3b1dc1b429f7937e58
+depends =
+  ${libpng:so_version}
 configure-options =
   --with-included-ltdl
   --with-pngincludedir=${libpng:location}/include

component/gtk-2/buildout.cfg

@@ -18,6 +18,8 @@ parts =
 recipe = slapos.recipe.cmmi
 url = http://cairographics.org/releases/cairo-1.10.2.tar.gz
 md5sum = f101a9e88b783337b20b2e26dfd26d5f
+depends =
+  ${libpng:so_version}
 configure-options = 
   --enable-tee=yes
   --enable-xlib=no
@@ -32,6 +34,8 @@ environment =
 recipe = slapos.recipe.cmmi
 url = http://ftp.gnome.org/pub/gnome/sources/pango/1.29/pango-1.29.3.tar.bz2
 md5sum = be4e3891353fae6b62a6f8d7689c4266
+depends =
+  ${libpng:so_version}
 configure-options = 
   --disable-static
 # XXX-Cedric : Why, god, why do I have to supply the -lXrender option to linker?
@@ -70,6 +74,8 @@ environment =
 recipe = slapos.recipe.cmmi
 url = http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-2.24.6.tar.bz2
 md5sum = 421100f6597e613234f8dead6091a9fe
+depends =
+  ${libpng:so_version}
 configure-options = 
   --disable-static
   --disable-cups

component/imagemagick/buildout.cfg

@@ -35,6 +35,8 @@ url = http://ftp.vim.org/ImageMagick/ImageMagick-6.8.2-6.tar.xz
 md5sum = ee01558201041a9978dd14b1db946ce8
 depends =
   ${libtiff:version}
+  ${libpng:so_version}
+  ${webp:so_version}
 configure-options =
   --disable-static
   --without-x

component/leptonica/buildout.cfg

@@ -13,6 +13,9 @@ extends =
 recipe = slapos.recipe.cmmi
 url = http://leptonica.googlecode.com/files/leptonica-1.68.tar.gz
 md5sum = 5cd7092f9ff2ca7e3f3e73bfcd556403
+depends =
+  ${libpng:so_version}
+  ${webp:so_version}
 configure-command =
   ./autogen.sh
   ./configure --prefix=${buildout:parts-directory}/${:_buildout_section_name_} --disable-static

component/libdmtx/buildout.cfg

@@ -6,6 +6,7 @@ extends =
   ../bzip2/buildout.cfg
   ../imagemagick/buildout.cfg
   ../jbigkit/buildout.cfg
+  ../libpng/buildout.cfg
   ../zlib/buildout.cfg
 parts =
   libdmtx
@@ -22,6 +23,8 @@ configure-options =
 recipe = slapos.recipe.cmmi
 url = http://prdownloads.sourceforge.net/libdmtx/dmtx-utils-0.7.4.tar.bz2
 md5sum = b132ab9fb1d289869469b8bb4959a08a
+depends =
+  ${libpng:so_version}
 configure-options =
   --disable-static
 environment =

component/libpng/buildout.cfg

@@ -21,7 +21,13 @@ environment =
 url = http://download.sourceforge.net/libpng/libpng-1.2.50.tar.bz2
 md5sum = 717caa58e9c71a80820eb38c4f4d6ec3
 
+[libpng15]
+<= libpng-common
+url = http://download.sourceforge.net/libpng/libpng-1.5.16.tar.xz
+md5sum = fd85af68f84cbdf549147811006488c1
+
 [libpng]
 <= libpng-common
-url = http://download.sourceforge.net/libpng/libpng-1.5.14.tar.xz
-md5sum = 94284b01d62ca43c5eb3f6702db08ed8
+url = http://download.sourceforge.net/libpng/libpng-1.6.2.tar.xz
+md5sum = 9d838f6fca9948a9f360a0cc1b516d5f
+so_version = 16

component/librsvg/buildout.cfg

@@ -3,6 +3,7 @@ parts = librsvg
 extends =
   ../bzip2/buildout.cfg
   ../pkgconfig/buildout.cfg
+  ../libpng/buildout.cfg
   ../libxml2/buildout.cfg
   ../zlib/buildout.cfg
   ../gtk-2/buildout.cfg
@@ -23,6 +24,8 @@ recipe = slapos.recipe.cmmi
 version = 2.36.1
 url = http://ftp.gnome.org/pub/GNOME/sources/librsvg/2.36/librsvg-2.36.4.tar.xz
 md5sum = 3c94524c8ccf668e30b236f409239f54
+depends =
+  ${libpng:so_version}
 configure-options =
   --disable-static
   --disable-gtk-theme

component/opera/buildout.cfg

@@ -31,7 +31,7 @@ script =
   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 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:${libpng15:location}/lib:${libSM:location}/lib:${libICE:location}/lib:%(location)s
   export PATH=${fontconfig:location}/bin:$PATH
   %(location)s/opera $*""")
   wrapper.close()

component/poppler/buildout.cfg

@@ -13,10 +13,11 @@ extends =
 
 [poppler]
 recipe = slapos.recipe.cmmi
-md5sum = be915388eaad6865cee5a156c8119ec1
-url = http://poppler.freedesktop.org/poppler-0.22.3.tar.gz
+url = http://poppler.freedesktop.org/poppler-0.22.5.tar.gz
+md5sum = 1cd27460f7e3379d1eb109cfd7bcdb39
 depends =
   ${libtiff:version}
+  ${libpng:so_version}
 configure-options =
   --disable-cairo-output
   --disable-cms

component/qemu-kvm/buildout.cfg

@@ -15,6 +15,8 @@ recipe = slapos.recipe.cmmi
 # qemu-kvm and qemu are now the same since 1.3.
 url = http://wiki.qemu-project.org/download/qemu-1.4.1.tar.bz2
 md5sum = eb2d696956324722b5ecfa46e41f9a75
+depends =
+  ${libpng:so_version}
 configure-options =
   --target-list=""
   --disable-sdl

component/tesseract/buildout.cfg

 [buildout]
 extends =
   ../automake/buildout.cfg
+  ../libpng/buildout.cfg
   ../libtool/buildout.cfg
   ../leptonica/buildout.cfg
   ../jbigkit/buildout.cfg
+  ../webp/buildout.cfg
 
 parts =
   tesseract
@@ -26,6 +28,9 @@ md5sum = 2e691858cb492b7c17d23bf0912b3d24
 recipe = slapos.recipe.cmmi
 url = http://tesseract-ocr.googlecode.com/files/tesseract-3.01.tar.gz
 md5sum = 1ba496e51a42358fb9d3ffe781b2d20a
+depends =
+  ${libpng:so_version}
+  ${webp:so_version}
 patch-options =
   -p1
 patches =

component/webp/buildout.cfg

@@ -10,8 +10,11 @@ extends =
 
 [webp]
 recipe = slapos.recipe.cmmi
-url = https://webp.googlecode.com/files/libwebp-0.1.3.tar.gz
-md5sum = 254d4670e14e9ed881f0536b006ab336
+url = https://webp.googlecode.com/files/libwebp-0.3.0.tar.gz
+md5sum = 4183f4f51ada98976f14e7bd51f30938
+depends =
+  ${libpng:so_version}
+so_version = 4
 configure-options =
   --disable-static
   --with-jpegincludedir=${libjpeg:location}/include

component/wget/Makefile.patch

+--- a/Makefile.am	2012-05-13 16:44:48.000000000 +0200
++++ b/Makefile.am	2013-06-21 15:05:07.519274542 +0200
+@@ -41,7 +41,7 @@
+ ACLOCAL_AMFLAGS = -I m4
+ 
+ # subdirectories in the distribution
+-SUBDIRS = lib src doc po tests util
++SUBDIRS = lib src po tests util
+ 
+ EXTRA_DIST = ChangeLog.README MAILING-LIST \
+              msdos/ChangeLog msdos/config.h msdos/Makefile.DJ \
+--- a/Makefile.in	2012-08-05 22:17:17.000000000 +0200
++++ b/Makefile.in	2013-06-21 15:05:04.351269286 +0200
+@@ -1195,7 +1195,7 @@
+ ACLOCAL_AMFLAGS = -I m4
+ 
+ # subdirectories in the distribution
+-SUBDIRS = lib src doc po tests util
++SUBDIRS = lib src po tests util
+ EXTRA_DIST = ChangeLog.README MAILING-LIST \
+              msdos/ChangeLog msdos/config.h msdos/Makefile.DJ \
+              msdos/Makefile.WC ABOUT-NLS \

component/wget/buildout.cfg

@@ -8,6 +8,14 @@ extends =
 parts =
   wget
 
+[wget-doc.makefile.patch]
+recipe = hexagonit.recipe.download
+url =${:_profile_base_location_}/${:filename}
+filename = Makefile.patch
+download-only = true
+md5sum = 2b89644c63a0dfe96290471d28a554f2
+
+
 [wget]
 recipe = slapos.recipe.cmmi
 url = http://ftp.gnu.org/gnu/wget/wget-1.14.tar.xz
@@ -20,6 +28,13 @@ configure-options =
   --with-libssl-prefix=${openssl:location}
   --with-zlib-lib=${zlib:location}
 
+patch-options =
+  -p1
+
+patches =
+  ${wget-doc.makefile.patch:location}/${wget-doc.makefile.patch:filename}
+
+
 environment =
   PATH=${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig

software/erp5/software.cfg

@@ -12,6 +12,7 @@ extends =
 #   Gabriel Monnerat
 #   Łukasz Nowak
 #   Test Agent (Automatic update from tests)
+#   Aurélien Calonne
 signature-certificate-list =
   -----BEGIN CERTIFICATE-----
   MIIB4DCCAUkCADANBgkqhkiG9w0BAQsFADA5MQswCQYDVQQGEwJGUjEZMBcGA1UE
@@ -117,3 +118,16 @@ signature-certificate-list =
   5pW18Ry5Ie7iFK4cQMerZwWPxBodEbAteYlRsI6kePV7Gf735Y1RpuN8qZ2sYL6e
   x2IMeSwJ82BpdEI5niXxB+iT0HxhmR+XaMI=
   -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB+DCCAWGgAwIBAgIJAKGd0vpks6T/MA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
+  BAMMCUNPTVAtMTU4NDAgFw0xMzA2MjAxMjE5MjBaGA8yMTEzMDUyNzEyMTkyMFow
+  FDESMBAGA1UEAwwJQ09NUC0xNTg0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB
+  gQDZTH9etPUC+wMZQ3UIiOwyyCfHsJ+7duCFYjuo1uZrhtDt/fp8qb8qK9ob+df3
+  EEYgA0IgI2j/9jNUEnKbc5+OrfKznzXjrlrH7zU8lKBVNCLzQuqBKRNajZ+UvO8R
+  nlqK2jZCXP/p3HXDYUTEwIR5W3tVCEn/Vda4upTLcPVE5wIDAQABo1AwTjAdBgNV
+  HQ4EFgQU7KXaNDheQWoy5uOU01tn1M5vNkEwHwYDVR0jBBgwFoAU7KXaNDheQWoy
+  5uOU01tn1M5vNkEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQASmqCU
+  Znbvu6izdicvjuE3aKnBa7G++Fdp2bdne5VCwVbVLYCQWatB+n4crKqGdnVply/u
+  +uZ16u1DbO9rYoKgWqjLk1GfiLw5v86pd5+wZd5I9QJ0/Sbz2vZk5S4ciMIGwArc
+  m711+GzlW5xe6GyH9SZaGOPAdUbI6JTDwLzEgA==
+  -----END CERTIFICATE-----

stack/slapos.cfg

@@ -60,10 +60,14 @@ recipe = zc.recipe.egg
 eggs =
   ${lxml-python:egg}
   slapos.cookbook
+  cliff
   hexagonit.recipe.download
   inotifyx
   netaddr
+  netifaces
+  requests
   slapos.core
+  supervisor
   xml_marshaller
   pytz