Skip to content

slapos
slapos
Commit 46124557 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki
Browse files
Options

component/perl: version up 5.26.0 including security fixes. also update some components : 

* component/automake: version up 1.15.1 for perl 5.26.
* component/perl-Encode-HanExtra: fix for perl 5.26.0 that no longer contains . in @INC.
* component/perl-XML-NamespaceSupport: fix for perl 5.26.0 that no longer contains . in @INC.
* component/intltool: version up 0.51.0 and add a patch for perl 5.26.
* component/perl-CGI: added for w3-validator because Perl 5.26 no longer includes it.
* component/perl-URI: version up 1.71.
parent 9ab73c7f
Show whitespace changes
Inline Side-by-side
Showing with 72 additions and 11 deletions
component/automake/buildout.cfg
View file @ 46124557
...@@ -9,8 +9,8 @@ parts = ...@@ -9,8 +9,8 @@ parts =
[automake] [automake]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
md5sum = 9a1ddb0e053474d9d1105cfe39b0c48d md5sum = 24cd3501b6ad8cd4d7e2546f07e8b4d4
url = http://ftp.gnu.org/gnu/automake/automake-1.15.tar.xz url = http://ftp.gnu.org/gnu/automake/automake-1.15.1.tar.xz
patch-options = -p1 patch-options = -p1
patches = patches =
${:_profile_base_location_}/automake-1.15-shebang_workaround.patch#203f9199b0e629de3630b5959f8cf73e ${:_profile_base_location_}/automake-1.15-shebang_workaround.patch#203f9199b0e629de3630b5959f8cf73e
......
component/intltool/buildout.cfg
View file @ 46124557
[buildout] [buildout]
extends = extends =
../gettext/buildout.cfg ../gettext/buildout.cfg
../patch/buildout.cfg
../perl/buildout.cfg ../perl/buildout.cfg
../perl-XML-Parser/buildout.cfg ../perl-XML-Parser/buildout.cfg
...@@ -9,10 +10,13 @@ parts = ...@@ -9,10 +10,13 @@ parts =
[intltool] [intltool]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://edge.launchpad.net/intltool/trunk/0.41.1/+download/intltool-0.41.1.tar.gz url = http://edge.launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz
md5sum = d6c91bf06681919ccfdf3624035b75dc md5sum = 12e517cac2b57a0121cda351570f1e63
patch-options = -p1
patches =
${:_profile_base_location_}/intltool-0.51.0.regexp.patch#3e7736d5ce7876e9a8d078c35e7f327b
depends = depends =
${perl-XML-Parser:location} ${perl-XML-Parser:location}
environment = 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 PKG_CONFIG_PATH=${perl:location}/lib/pkgconfig
component/intltool/intltool-0.51.0.regexp.patch 0 → 100644
View file @ 46124557
--- 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?
component/perl-CGI/buildout.cfg 0 → 100644
View file @ 46124557
[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
component/perl-Encode-HanExtra/buildout.cfg
View file @ 46124557
...@@ -10,7 +10,7 @@ recipe = slapos.recipe.cmmi ...@@ -10,7 +10,7 @@ recipe = slapos.recipe.cmmi
url = http://www.cpan.org/modules/by-module/Encode/Encode-HanExtra-0.23.tar.gz url = http://www.cpan.org/modules/by-module/Encode/Encode-HanExtra-0.23.tar.gz
md5sum = e1d3bc32c1c8ee304235a06fbcd5d5a4 md5sum = e1d3bc32c1c8ee304235a06fbcd5d5a4
configure-command = configure-command =
${perl:location}/bin/perl Makefile.PL ${perl:location}/bin/perl -I. Makefile.PL
patch-options = -p1 patch-options = -p1
patches = patches =
${:_profile_base_location_}/Encode-HanExtra-0.23_use_shebang.patch#4ac804013a68a3e6b7c3bc4115d25a5e ${:_profile_base_location_}/Encode-HanExtra-0.23_use_shebang.patch#4ac804013a68a3e6b7c3bc4115d25a5e
......
component/perl-URI/buildout.cfg
View file @ 46124557
...@@ -6,7 +6,7 @@ parts = ...@@ -6,7 +6,7 @@ parts =
[perl-URI] [perl-URI]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.cpan.org/modules/by-module/URI/URI-1.60.tar.gz url = http://www.cpan.org/modules/by-module/URI/URI-1.71.tar.gz
md5sum = 70f739be8ce28b8baba7c5920ffee4dc md5sum = 247c3da29a794f72730e01aa5a715daf
configure-command = configure-command =
${perl:location}/bin/perl Makefile.PL ${perl:location}/bin/perl Makefile.PL
component/perl-XML-NamespaceSupport/buildout.cfg
View file @ 46124557
...@@ -9,4 +9,4 @@ recipe = slapos.recipe.cmmi ...@@ -9,4 +9,4 @@ recipe = slapos.recipe.cmmi
url = http://www.cpan.org/modules/by-module/XML/XML-NamespaceSupport-1.11.tar.gz url = http://www.cpan.org/modules/by-module/XML/XML-NamespaceSupport-1.11.tar.gz
md5sum = 222cca76161cd956d724286d36b607da md5sum = 222cca76161cd956d724286d36b607da
configure-command = configure-command =
${perl:location}/bin/perl Makefile.PL ${perl:location}/bin/perl -I. Makefile.PL
component/perl/buildout.cfg
View file @ 46124557
...@@ -7,9 +7,9 @@ parts = ...@@ -7,9 +7,9 @@ parts =
[perl] [perl]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
version = 5.20.2 version = 5.26.0
url = http://www.cpan.org/src/5.0/perl-${:version}.tar.bz2 url = http://www.cpan.org/src/5.0/perl-${:version}.tar.bz2
md5sum = 21062666f1c627aeb6dbff3c6952738b md5sum = 8d34cb5a4eccd66e7a6a80e62b7b4aec
siteprefix = ${buildout:parts-directory}/site_${:_buildout_section_name_} siteprefix = ${buildout:parts-directory}/site_${:_buildout_section_name_}
patch-options = -p1 patch-options = -p1
patches = patches =
......
component/w3-validator/buildout.cfg
View file @ 46124557
[buildout] [buildout]
extends = extends =
../perl/buildout.cfg ../perl/buildout.cfg
../perl-CGI/buildout.cfg
../perl-Config-General/buildout.cfg ../perl-Config-General/buildout.cfg
../perl-Encode-HanExtra/buildout.cfg ../perl-Encode-HanExtra/buildout.cfg
../perl-HTML-Encoding/buildout.cfg ../perl-HTML-Encoding/buildout.cfg
...@@ -23,6 +24,7 @@ erp5.recipe.w3validator = 1.0.2 ...@@ -23,6 +24,7 @@ erp5.recipe.w3validator = 1.0.2
[w3-validator] [w3-validator]
recipe = erp5.recipe.w3validator recipe = erp5.recipe.w3validator
depends = depends =
${perl-CGI:location}
${perl-Config-General:location} ${perl-Config-General:location}
${perl-Encode-HanExtra:location} ${perl-Encode-HanExtra:location}
${perl-HTML-Encoding:location} ${perl-HTML-Encoding:location}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7