diff options
author | David Lawrence <dkl@mozilla.com> | 2016-11-07 22:26:58 +0100 |
---|---|---|
committer | Dylan William Hardison <dylan@hardison.net> | 2016-11-11 20:24:54 +0100 |
commit | 085878323cb82810bc2cd3f00ce925bb49c70156 (patch) | |
tree | 9a26386c90384b75d6b8eebab1f209ffb7759d35 | |
parent | 04e3d20ef470de50b17a6cdb4df13f990a27e11d (diff) | |
download | bugzilla-085878323cb82810bc2cd3f00ce925bb49c70156.tar.gz bugzilla-085878323cb82810bc2cd3f00ce925bb49c70156.tar.xz |
Bug 1315326 - Add dependencies for Amazon S3 storage to Makefile.PL and META.*
-rw-r--r-- | Bugzilla/Install/Requirements.pm | 1 | ||||
-rw-r--r-- | META.json | 14 | ||||
-rw-r--r-- | META.yml | 8 | ||||
-rw-r--r-- | Makefile.PL | 12 |
4 files changed, 35 insertions, 0 deletions
diff --git a/Bugzilla/Install/Requirements.pm b/Bugzilla/Install/Requirements.pm index 22cf146c5..da06ab70c 100644 --- a/Bugzilla/Install/Requirements.pm +++ b/Bugzilla/Install/Requirements.pm @@ -101,6 +101,7 @@ use constant FEATURE_FILES => ( markdown => ['Bugzilla/Markdown.pm'], memcached => ['Bugzilla/Memcache.pm'], auth_delegation => ['auth.cgi'], + s3 => ['Bugzilla/S3.pm', 'Bugzilla/S3/Bucket.pm', 'Bugzilla/Attachment/S3.pm'] ); sub load_cpan_meta { @@ -58,6 +58,7 @@ "Auth::GoogleAuth" : "1.01", "Cache::Memcached::Fast" : "0.17", "Chart::Lines" : "v2.4.10", + "Class::Accessor::Fast" : "0", "DBD::mysql" : "4.037", "Daemon::Generic" : "0", "Email::MIME::Attachment::Stripper" : "0", @@ -86,6 +87,7 @@ "Test::Taint" : "1.06", "TheSchwartz" : "1.10", "Type::Tiny" : "1", + "URI::Escape" : "0", "XML::Simple" : "0", "XML::Twig" : "0", "XMLRPC::Lite" : "0.712" @@ -328,6 +330,18 @@ } } }, + "s3" : { + "description" : "Amazon S3 Attachment Storage", + "prereqs" : { + "runtime" : { + "requires" : { + "Class::Accessor::Fast" : "0", + "URI::Escape" : "0", + "XML::Simple" : "0" + } + } + } + }, "smtp_auth" : { "description" : "SMTP Authentication", "prereqs" : { @@ -39,6 +39,7 @@ optional_features: Auth::GoogleAuth: '1.01' Cache::Memcached::Fast: '0.17' Chart::Lines: v2.4.10 + Class::Accessor::Fast: '0' DBD::mysql: '4.037' Daemon::Generic: '0' Email::MIME::Attachment::Stripper: '0' @@ -67,6 +68,7 @@ optional_features: Test::Taint: '1.06' TheSchwartz: '1.10' Type::Tiny: '1' + URI::Escape: '0' XML::Simple: '0' XML::Twig: '0' XMLRPC::Lite: '0.712' @@ -173,6 +175,12 @@ optional_features: requires: JSON::RPC: '== 1.01' Test::Taint: '1.06' + s3: + description: 'Amazon S3 Attachment Storage' + requires: + Class::Accessor::Fast: '0' + URI::Escape: '0' + XML::Simple: '0' smtp_auth: description: 'SMTP Authentication' requires: diff --git a/Makefile.PL b/Makefile.PL index 2f2400e00..704a896b2 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -189,6 +189,18 @@ my %optional_features = ( description => 'Oracle database support', prereqs => { runtime => { requires => { 'DBD::Oracle' => '1.19' } } } }, + s3 => { + description => 'Amazon S3 Attachment Storage', + prereqs => { + runtime => { + requires => { + 'Class::Accessor::Fast' => 0, + 'XML::Simple' => 0, + 'URI::Escape' => 0, + } + } + } + }, typesniffer => { prereqs => { runtime => { |