Merge branch 'master' into slapos-master-cluster

d2178639 · Alain Takoudjou · a69aefe6 · 578f65bd · d2178639 · d2178639
Commit d2178639 authored Jul 04, 2017 by Alain Takoudjou
18 changed files
--- a/component/automake/buildout.cfg
+++ b/component/automake/buildout.cfg
@@ -9,8 +9,8 @@ parts =

 [automake]
 recipe = slapos.recipe.cmmi
-md5sum = 9a1ddb0e053474d9d1105cfe39b0c48d
-url = http://ftp.gnu.org/gnu/automake/automake-1.15.tar.xz
+md5sum = 24cd3501b6ad8cd4d7e2546f07e8b4d4
+url = http://ftp.gnu.org/gnu/automake/automake-1.15.1.tar.xz
 patch-options = -p1
 patches =
  ${:_profile_base_location_}/automake-1.15-shebang_workaround.patch#203f9199b0e629de3630b5959f8cf73e

--- a/component/ca-certificates/buildout.cfg
+++ b/component/ca-certificates/buildout.cfg
@@ -11,9 +11,9 @@ parts =

 [ca-certificates]
 recipe = slapos.recipe.cmmi
-url = http://http.debian.net/debian/pool/main/c/ca-certificates/ca-certificates_20161130.tar.xz
+url = http://http.debian.net/debian/pool/main/c/ca-certificates/ca-certificates_20161130+nmu1.tar.xz
 patch-binary = ${patch:location}/bin/patch
-md5sum = 1a0a3a1b3390dc83affed4b0c2ae1c05
+md5sum = a09e8b63126188fd0ed77f6fbaf5d35f
 patches =
  ${:_profile_base_location_}/ca-certificates-any-python.patch#087b5e860c7a4b8ff6656c95c5835ee2
  ${:_profile_base_location_}/ca-certificates-sbin-dir.patch#0b4e7d82ce768823c01954ee41ef177b

--- a/component/curl/buildout.cfg
+++ b/component/curl/buildout.cfg
@@ -12,8 +12,8 @@ parts =

 [curl]
 recipe = slapos.recipe.cmmi
-url = http://curl.haxx.se/download/curl-7.54.0.tar.bz2
-md5sum = 89bb7ba87384dfbf4f1a3f953da42458
+url = http://curl.haxx.se/download/curl-7.54.1.tar.bz2
+md5sum = 6b6eb722f512e7a24855ff084f54fe55
 configure-options =
  --disable-static
  --disable-ldap

--- a/component/intltool/buildout.cfg
+++ b/component/intltool/buildout.cfg
 [buildout]
 extends =
  ../gettext/buildout.cfg
+  ../patch/buildout.cfg
  ../perl/buildout.cfg
  ../perl-XML-Parser/buildout.cfg

@@ -9,10 +10,13 @@ parts =

 [intltool]
 recipe = slapos.recipe.cmmi
-url = http://edge.launchpad.net/intltool/trunk/0.41.1/+download/intltool-0.41.1.tar.gz
-md5sum = d6c91bf06681919ccfdf3624035b75dc
+url = http://edge.launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz
+md5sum = 12e517cac2b57a0121cda351570f1e63
+patch-options = -p1
+patches =
+  ${:_profile_base_location_}/intltool-0.51.0.regexp.patch#3e7736d5ce7876e9a8d078c35e7f327b
 depends =
  ${perl-XML-Parser:location}
 environment =
-  PATH=${perl:location}/bin:${gettext:location}/bin:${pkgconfig:location}/bin:%(PATH)s
+  PATH=${patch:location}/bin:${perl:location}/bin:${gettext:location}/bin:${pkgconfig:location}/bin:%(PATH)s
  PKG_CONFIG_PATH=${perl:location}/lib/pkgconfig
--- a/component/intltool/intltool-0.51.0.regexp.patch
+++ b/component/intltool/intltool-0.51.0.regexp.patch
+--- intltool-0.51.0.orig/intltool-update.in	2015-03-09 02:39:54.000000000 +0100
+++ intltool-0.51.0.orig/intltool-update.in	2015-06-19 01:52:07.171228154 +0200
+@@ -1062,7 +1062,7 @@
+ 	}
+     }
+ 
+-    if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/)
+    if ($str =~ /^(.*)\$\{?([A-Z_]+)}?(.*)$/)
+     {
+ 	my $rest = $3;
+ 	my $untouched = $1;
+@@ -1190,10 +1190,10 @@
+ 	$name    =~ s/\(+$//g;
+ 	$version =~ s/\(+$//g;
+ 
+-	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
+-	$varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
+-	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
+-	$varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
+	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/);
+	$varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/);
+	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/);
+	$varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/);
+     }
+ 
+     if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)[,]?([^,\)]+)?/m)
+@@ -1219,11 +1219,11 @@
+ 	$version =~ s/\(+$//g;
+         $bugurl  =~ s/\(+$//g if (defined $bugurl);
+ 
+-	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
+-	$varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
+-	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
+-	$varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
+-        $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\${?\w+}?/);
+	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/);
+	$varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/);
+	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/);
+	$varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/);
+        $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\$\{?\w+}?/);
+     }
+ 
+     # \s makes this not work, why?
--- a/component/perl-CGI/buildout.cfg
+++ b/component/perl-CGI/buildout.cfg
+[buildout]
+extends =
+  ../perl/buildout.cfg
+parts =
+  perl-CGI
+
+[perl-CGI]
+recipe = slapos.recipe.cmmi
+url = http://www.cpan.org/modules/by-module/CGI/CGI-4.36.tar.gz
+md5sum = 48566d81f430a7f755bb4d8f426ce35d
+configure-command =
+  ${perl:location}/bin/perl Makefile.PL
--- a/component/perl-Encode-HanExtra/buildout.cfg
+++ b/component/perl-Encode-HanExtra/buildout.cfg
@@ -10,7 +10,7 @@ recipe = slapos.recipe.cmmi
 url = http://www.cpan.org/modules/by-module/Encode/Encode-HanExtra-0.23.tar.gz
 md5sum = e1d3bc32c1c8ee304235a06fbcd5d5a4
 configure-command =
-  ${perl:location}/bin/perl Makefile.PL
+  ${perl:location}/bin/perl -I. Makefile.PL
 patch-options = -p1
 patches =
  ${:_profile_base_location_}/Encode-HanExtra-0.23_use_shebang.patch#4ac804013a68a3e6b7c3bc4115d25a5e

--- a/component/perl-URI/buildout.cfg
+++ b/component/perl-URI/buildout.cfg
@@ -6,7 +6,7 @@ parts =

 [perl-URI]
 recipe = slapos.recipe.cmmi
-url = http://www.cpan.org/modules/by-module/URI/URI-1.60.tar.gz
-md5sum = 70f739be8ce28b8baba7c5920ffee4dc
+url = http://www.cpan.org/modules/by-module/URI/URI-1.71.tar.gz
+md5sum = 247c3da29a794f72730e01aa5a715daf
 configure-command =
  ${perl:location}/bin/perl Makefile.PL
--- a/component/perl-XML-NamespaceSupport/buildout.cfg
+++ b/component/perl-XML-NamespaceSupport/buildout.cfg
@@ -9,4 +9,4 @@ recipe = slapos.recipe.cmmi
 url = http://www.cpan.org/modules/by-module/XML/XML-NamespaceSupport-1.11.tar.gz
 md5sum = 222cca76161cd956d724286d36b607da
 configure-command =
-  ${perl:location}/bin/perl Makefile.PL
+  ${perl:location}/bin/perl -I. Makefile.PL
--- a/component/perl/buildout.cfg
+++ b/component/perl/buildout.cfg
@@ -7,9 +7,9 @@ parts =

 [perl]
 recipe = slapos.recipe.cmmi
-version = 5.20.2
+version = 5.26.0
 url = http://www.cpan.org/src/5.0/perl-${:version}.tar.bz2
-md5sum = 21062666f1c627aeb6dbff3c6952738b
+md5sum = 8d34cb5a4eccd66e7a6a80e62b7b4aec
 siteprefix = ${buildout:parts-directory}/site_${:_buildout_section_name_}
 patch-options = -p1
 patches =

--- a/component/w3-validator/buildout.cfg
+++ b/component/w3-validator/buildout.cfg
 [buildout]
 extends =
  ../perl/buildout.cfg
+  ../perl-CGI/buildout.cfg
  ../perl-Config-General/buildout.cfg
  ../perl-Encode-HanExtra/buildout.cfg
  ../perl-HTML-Encoding/buildout.cfg
@@ -23,6 +24,7 @@ erp5.recipe.w3validator = 1.0.2
 [w3-validator]
 recipe = erp5.recipe.w3validator
 depends =
+  ${perl-CGI:location}
  ${perl-Config-General:location}
  ${perl-Encode-HanExtra:location}
  ${perl-HTML-Encoding:location}

--- a/software/cloudooo/instance-cloudooo.cfg.in
+++ b/software/cloudooo/instance-cloudooo.cfg.in
@@ -42,7 +42,7 @@
 {%   do apache_ip_list.append('[' ~ ipv6 ~ ']') -%}
 {% endif -%}
 {% set apache_dict = {} -%}
-{% do apache_dict.__setitem__(publish_url_name, (apache_port, "https", 'http://' ~ ipv4 ~ ':' ~ haproxy_port)) -%}
+{% do apache_dict.__setitem__(publish_url_name, (apache_port, "https", 'http://' ~ ipv4 ~ ':' ~ haproxy_port, False)) -%}

 {% set bin_directory = parameter_dict['buildout-bin-directory'] -%}
 {% set section_list = [] -%}

--- a/software/cloudooo/software-common.cfg
+++ b/software/cloudooo/software-common.cfg
@@ -83,5 +83,5 @@ template-logrotate-base = ${template-logrotate-base:rendered}
 [template-cloudooo-instance]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/instance-cloudooo.cfg.in
-md5sum = e1a4a73aeb8b978e953a3f4f39b98a4d
+md5sum = 0a260754586e2a44010f3303c58a927a
 mode = 640
--- a/software/slaprunner/buildout.hash.cfg
+++ b/software/slaprunner/buildout.hash.cfg
@@ -23,7 +23,7 @@ md5sum = 8f49df215a1596efcec94e2cca009711

 [template-runner-import-script]
 filename = template/runner-import.sh.jinja2
-md5sum = 3be3ff484a5aaa202f2ea72489a73285
+md5sum = 130193114cbbcd014af9704851410605

 [instance-runner-import]
 filename = instance-runner-import.cfg.in

--- a/software/slaprunner/template/runner-import.sh.jinja2
+++ b/software/slaprunner/template/runner-import.sh.jinja2
@@ -136,7 +136,7 @@ DATABASE="$HOME/srv/runner/proxy.db"
 # XXX hardcoded
 PARTITION=$(basename $HOME)
 OLD_SOFTWARE_RELEASE=$("$SQLITE3" "$DATABASE" "select software_release from partition11 where reference='slappart0';")
-SOFTWARE_RELEASE=$(echo $OLD_SOFTWARE_RELEASE | sed -e 's/\(.*\)\(slappart\|test0-\)[0-9][0-9]\?/\1'"$PARTITION"'/')
+SOFTWARE_RELEASE=$(echo $OLD_SOFTWARE_RELEASE | sed -e 's/\(.*\)\(slappart\|test0-\)[0-9][0-9][0-9]\?/\1'"$PARTITION"'/')
 "$SQLITE3" "$DATABASE" "update partition11 set software_release='$SOFTWARE_RELEASE' where software_release NOT NULL;"
 "$SQLITE3" "$DATABASE" "update software11 set url='$SOFTWARE_RELEASE' where url='$OLD_SOFTWARE_RELEASE';" || "$SQLITE3" "$DATABASE" "delete from software11 where url='$OLD_SOFTWARE_RELEASE';"
 # Change slapproxy database to have all instances stopped

--- a/stack/caucase/buildout.cfg
+++ b/stack/caucase/buildout.cfg
@@ -89,18 +89,17 @@ context =
 [versions]
 Flask-User = 0.6.11
 SQLAlchemy = 1.1.9
-caucase = 0.1.2
+caucase = 0.1.3
 futures = 3.1.1
 gunicorn = 19.7.1
 slapos.recipe.template = 3.0

-# Required by:
-# Flask-User==0.6.11
-passlib = 1.7.1
+APacheDEX = 1.6.2
+bcrypt = 3.1.3

 # Required by:
-# caucase==0.1.1
-pyasn1 = 0.2.3
+# caucase==0.1.3
+Flask-AlchemyDumps = 0.0.10

 # Required by:
 # Flask-User==0.6.11
@@ -111,33 +110,34 @@ Flask-Login = 0.4.0
 Flask-Mail = 0.9.1

 # Required by:
+# Flask-AlchemyDumps==0.0.10
 # Flask-User==0.6.11
 Flask-SQLAlchemy = 2.2

+# Required by:
+# Flask-AlchemyDumps==0.0.10
+Flask-Script = 2.0.5
+
 # Required by:
 # Flask-User==0.6.11
 Flask-WTF = 0.14.2

 # Required by:
-# Flask-WTF==0.14.2
-WTForms = 2.1
+# Flask-AlchemyDumps==0.0.10
+Unipath = 1.1

 # Required by:
-# Flask-User==0.6.11
-bcrypt = 3.1.3
+# Flask-WTF==0.14.2
+WTForms = 2.1

 # Required by:
 # Flask-Mail==0.9.1
 blinker = 1.4

 # Required by:
-# caucase==0.1.1
+# caucase==0.1.3
 pem = 16.1.0

-# Required by:
-# caucase==0.1.1
-pyasn1-modules = 0.0.8
-
 # Required by:
 # Flask-User==0.6.11
-pycryptodome = 3.4.5
+pycryptodome = 3.4.6
--- a/stack/erp5/buildout.cfg
+++ b/stack/erp5/buildout.cfg
@@ -661,6 +661,7 @@ zope.app.publication = 3.14.0
 zope.app.testing = 3.8.1

 # Pinned versions
+APacheDEX = 1.6.2
 Pillow = 4.0.0
 Products.CMFActionIcons = 2.1.3
 Products.DCWorkflowGraph = 0.4.1

--- a/stack/slapos.cfg
+++ b/stack/slapos.cfg
@@ -140,7 +140,7 @@ slapos.core = 1.3.18
 slapos.extension.strip = 0.4
 slapos.libnetworkcache = 0.15
 slapos.rebootstrap = 4.1
-slapos.recipe.build = 0.35
+slapos.recipe.build = 0.36
 slapos.recipe.cmmi = 0.7
 stevedore = 1.21.0
 unicodecsv = 0.14.1