From ab577dc1b2fbc1412e5d78e1eecb675e3973eaf6 Mon Sep 17 00:00:00 2001
From: "mkanat%bugzilla.org" <>
Date: Wed, 25 Nov 2009 06:19:13 +0000
Subject: Bug 530767: Allow for CPAN distribution of extensions Patch by Max
 Kanat-Alexander <mkanat@bugzilla.org> (module owner) a=mkanat

---
 Bugzilla/Install/Filesystem.pm |  6 +++++-
 Bugzilla/Install/Util.pm       | 29 ++++++++++++++++++++++++++---
 2 files changed, 31 insertions(+), 4 deletions(-)

(limited to 'Bugzilla/Install')

diff --git a/Bugzilla/Install/Filesystem.pm b/Bugzilla/Install/Filesystem.pm
index 819da24dd..12c0bc222 100644
--- a/Bugzilla/Install/Filesystem.pm
+++ b/Bugzilla/Install/Filesystem.pm
@@ -198,6 +198,7 @@ sub FILESYSTEM {
     my %create_dirs = (
         $datadir                => $ws_dir_full_control,
         "$datadir/mining"       => $ws_dir_readable,
+        "$datadir/extensions"   => $ws_dir_readable,
         $attachdir              => $ws_dir_writeable,
         $extensionsdir          => $ws_dir_readable,
         graphs                  => $ws_dir_writeable,
@@ -208,7 +209,10 @@ sub FILESYSTEM {
 
     # The name of each file, pointing at its default permissions and
     # default contents.
-    my %create_files = ();
+    my %create_files = (
+        "$datadir/extensions/additional" => { perms    => $ws_readable, 
+                                              contents => '' },
+    );
 
     # Each standard stylesheet has an associated custom stylesheet that
     # we create. Also, we create placeholders for standard stylesheets
diff --git a/Bugzilla/Install/Util.pm b/Bugzilla/Install/Util.pm
index 107f91a9b..c60e32afe 100644
--- a/Bugzilla/Install/Util.pm
+++ b/Bugzilla/Install/Util.pm
@@ -130,7 +130,16 @@ sub extension_code_files {
         trick_taint($_) foreach @load_files;
         push(@files, \@load_files);
     }
-    return \@files;
+
+    my @additional;
+    my $datadir = bz_locations()->{'datadir'};
+    my $addl_file = "$datadir/extensions/additional";
+    if (-e $addl_file) {
+        open(my $fh, '<', $addl_file) || die "$addl_file: $!";
+        @additional = map { trim($_) } <$fh>;
+        close($fh);
+    }
+    return (\@files, \@additional);
 }
 
 # Used by _get_extension_requirements in Bugzilla::Install::Requirements.
@@ -150,8 +159,8 @@ sub extension_requirement_packages {
     $packages = [];
     my %package_map;
     
-    my $extension_files = extension_code_files('requirements only');
-    foreach my $file_set (@$extension_files) {
+    my ($file_sets, $extra_packages) = extension_code_files('requirements only');
+    foreach my $file_set (@$file_sets) {
         my $file = shift @$file_set;
         my $name = require $file;
         if ($name =~ /^\d+$/) {
@@ -162,6 +171,11 @@ sub extension_requirement_packages {
         $package_map{$file} = $package;
         push(@$packages, $package);
     }
+    foreach my $package (@$extra_packages) {
+        eval("require $package") || die $@;
+        push(@$packages, $package);
+    }
+
     _cache()->{extension_requirement_packages} = $packages;
     # Used by Bugzilla::Extension->load if it's called after this method
     # (which only happens during checksetup.pl, currently).
@@ -495,6 +509,15 @@ sub trick_taint {
     return (defined($_[0]));
 }
 
+sub trim {
+    my ($str) = @_;
+    if ($str) {
+      $str =~ s/^\s+//g;
+      $str =~ s/\s+$//g;
+    }
+    return $str;
+}
+
 __END__
 
 =head1 NAME
-- 
cgit v1.2.3-24-g4f1b