Bug 1315326 - Add dependencies for Amazon S3 storage to Makefile.PL and META.*

diff --git a/Bugzilla/Install/Requirements.pm b/Bugzilla/Install/Requirements.pm
index 22cf146c5752bce682f3235d399a4861f4ca7588..da06ab70c195d2d6bb8ead8eaddbbed720b423a9 100644 (file)
--- 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 {

diff --git a/META.json b/META.json
index edb1dcb3db773b1e50f12ca96697ad8f04a790d5..7c10d9a31fff8772b2e0cf14128124cd831eae21 100644 (file)
--- a/META.json
+++ b/META.json
@@ -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" : {

diff --git a/META.yml b/META.yml
index 9443ded724106b73ddf77365f6549cc17724debe..1ce538a3aea657457bc05b45f137f1b237dec87e 100644 (file)
--- a/META.yml
+++ b/META.yml
@@ -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 2f2400e00de5625db036e63e8a8155e469edb828..704a896b246c4901dd88a549dd992fef96c75745 100644 (file)
--- 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 => {