diff options
Diffstat (limited to 'www/rt36/files')
-rw-r--r-- | www/rt36/files/multiple-bin-webmux_pl_in | 15 | ||||
-rw-r--r-- | www/rt36/files/multiple-lib-RT_pm_in | 63 | ||||
-rw-r--r-- | www/rt36/files/multiple-sbin-rt-setup-database_in | 21 | ||||
-rw-r--r-- | www/rt36/files/patch-Makefile_in | 51 |
4 files changed, 0 insertions, 150 deletions
diff --git a/www/rt36/files/multiple-bin-webmux_pl_in b/www/rt36/files/multiple-bin-webmux_pl_in deleted file mode 100644 index 0797718ee9a5..000000000000 --- a/www/rt36/files/multiple-bin-webmux_pl_in +++ /dev/null @@ -1,15 +0,0 @@ ---- bin/webmux.pl.in.orig Tue Sep 26 18:06:31 2006 -+++ bin/webmux.pl.in Mon Apr 30 23:04:45 2007 -@@ -63,6 +63,12 @@ - } - - use lib ( "@LOCAL_LIB_PATH@", "@RT_LIB_PATH@" ); -+if ($ENV{RT_INSTANCE_PATH}) { -+ lib->import("$ENV{RT_INSTANCE_PATH}/local/lib"); -+} -+if ($ENV{RT_VENDOR_PATH}) { -+ lib->import($ENV{RT_VENDOR_PATH}); -+} - use RT; - - package RT::Mason; diff --git a/www/rt36/files/multiple-lib-RT_pm_in b/www/rt36/files/multiple-lib-RT_pm_in deleted file mode 100644 index 0cbeb31f238c..000000000000 --- a/www/rt36/files/multiple-lib-RT_pm_in +++ /dev/null @@ -1,63 +0,0 @@ ---- lib/RT.pm.in.orig Mon Nov 6 21:09:32 2006 -+++ lib/RT.pm.in Mon Apr 30 23:04:45 2007 -@@ -98,6 +98,60 @@ - # via the web interface) - $MasonSessionDir = '@MASON_SESSION_PATH@'; - -+=item import -+ -+Allow override of various internal paths. -+ -+ RT->import ( -+ RT_INSTANCE_PATH => '/usr/local/rt/stuff', -+ SITE_CONFIG_FILE => '/etc/stuff.pm', -+ ... -+ ); -+ -+If RT_INSTANCE_PATH is set in the arguments (or in %ENV) -+then it replaces the old value of $BasePath in the following -+variables: -+ $SITE_CONFIG_FILE -+ $LocalPath -+ $LocalEtcPath -+ $LocalLexiconPath -+ $MasonLocalComponentRoot -+ $MasonDataDir -+ $MasonSessionDir -+ -+Beyond that, those individual values can be set explicitly -+by arguments. -+ -+=cut -+ -+sub import { -+no strict 'refs'; -+ shift; -+ my %args = @_; -+ return unless ( scalar (keys %args) || $ENV{RT_INSTANCE_PATH} ); -+ -+ my @variables = qw ( -+ SITE_CONFIG_FILE -+ LocalPath -+ LocalEtcPath -+ LocalLexiconPath -+ MasonLocalComponentRoot -+ MasonDataDir -+ MasonSessionDir -+ ); -+ -+ my $RT_INSTANCE_PATH = $args{RT_INSTANCE_PATH} || $ENV{RT_INSTANCE_PATH}; -+ if ($RT_INSTANCE_PATH) { -+ foreach my $vref (@variables) { -+ $$vref =~ s/^\Q$BasePath\E/$RT_INSTANCE_PATH/; -+ } -+ } -+ foreach my $vref (@variables) { -+ $$vref = $args{$vref} if defined ( $args{$vref} ); -+ } -+ -+use strict 'refs'; -+} - - - =head1 NAME diff --git a/www/rt36/files/multiple-sbin-rt-setup-database_in b/www/rt36/files/multiple-sbin-rt-setup-database_in deleted file mode 100644 index a4c38d484d2a..000000000000 --- a/www/rt36/files/multiple-sbin-rt-setup-database_in +++ /dev/null @@ -1,21 +0,0 @@ ---- sbin/rt-setup-database.in.orig Fri Dec 1 20:59:26 2006 -+++ sbin/rt-setup-database.in Mon Apr 30 23:04:45 2007 -@@ -51,11 +51,17 @@ - - use lib "@LOCAL_LIB_PATH@"; - use lib "@RT_LIB_PATH@"; -+## RT_INSTANCE_PATH can be passed in environment. -+## Can change where RT_SiteConfig is read from. -+my $RT_INSTANCE_PATH; -+BEGIN { -+ $RT_INSTANCE_PATH = $ENV{RT_INSTANCE_PATH}; -+} - - #This drags in RT's config.pm - # We do it in a begin block because RT::Handle needs to know the type to do its - # inheritance --use RT; -+use RT (RT_INSTANCE_PATH => $RT_INSTANCE_PATH); - use Carp; - use RT::User; - use RT::CurrentUser; diff --git a/www/rt36/files/patch-Makefile_in b/www/rt36/files/patch-Makefile_in deleted file mode 100644 index 70b5b72f0237..000000000000 --- a/www/rt36/files/patch-Makefile_in +++ /dev/null @@ -1,51 +0,0 @@ ---- Makefile.in.orig Mon Jun 19 18:44:04 2006 -+++ Makefile.in Tue Dec 19 15:42:41 2006 -@@ -224,9 +224,6 @@ - @echo "very dangerous. Note that you do not have to manually add a " - @echo "database user or set up a database for RT. These actions will be " - @echo "taken care of in the next step.)" -- @echo "" -- @echo "After that, you need to initialize RT's database by running" -- @echo " 'make initialize-database'" - - # @echo " or by executing " - # @echo " '$(RT_SBIN_PATH)/rt-setup-database --action init \ " -@@ -276,15 +273,18 @@ - chmod $(RT_READABLE_DIR_MODE) $(DESTDIR)/$(RT_BIN_PATH) - - chmod 0755 $(DESTDIR)/$(RT_ETC_PATH) -- chmod 0500 $(DESTDIR)/$(RT_ETC_PATH)/* -+ chmod 0400 $(DESTDIR)/$(RT_ETC_PATH)/* - - #TODO: the config file should probably be able to have its - # owner set separately from the binaries. - chown -R $(BIN_OWNER) $(DESTDIR)/$(RT_ETC_PATH) - chgrp -R $(RTGROUP) $(DESTDIR)/$(RT_ETC_PATH) - -- chmod 0550 $(DESTDIR)/$(CONFIG_FILE) -- chmod 0550 $(DESTDIR)/$(SITE_CONFIG_FILE) -+ chmod 0440 $(DESTDIR)/$(CONFIG_FILE) -+ chmod 0440 $(DESTDIR)/$(SITE_CONFIG_FILE)-dist -+ -chmod 0640 $(DESTDIR)/$(SITE_CONFIG_FILE) -+ chgrp $(WEB_GROUP) $(DESTDIR)/$(CONFIG_FILE) -+ -chgrp $(WEB_GROUP) $(DESTDIR)/$(SITE_CONFIG_FILE) - - # Make the interfaces executable - chown $(BIN_OWNER) $(BINARIES) -@@ -331,13 +331,13 @@ - config-install: - mkdir -p $(DESTDIR)/$(CONFIG_FILE_PATH) - -cp etc/RT_Config.pm $(DESTDIR)/$(CONFIG_FILE) -- [ -f $(DESTDIR)/$(SITE_CONFIG_FILE) ] || cp etc/RT_SiteConfig.pm $(DESTDIR)/$(SITE_CONFIG_FILE) -+ -cp etc/RT_SiteConfig.pm $(DESTDIR)/$(SITE_CONFIG_FILE)-dist - - chgrp $(RTGROUP) $(DESTDIR)/$(CONFIG_FILE) - chown $(BIN_OWNER) $(DESTDIR)/$(CONFIG_FILE) - -- chgrp $(RTGROUP) $(DESTDIR)/$(SITE_CONFIG_FILE) -- chown $(BIN_OWNER) $(DESTDIR)/$(SITE_CONFIG_FILE) -+ chgrp $(RTGROUP) $(DESTDIR)/$(SITE_CONFIG_FILE)-dist -+ chown $(BIN_OWNER) $(DESTDIR)/$(SITE_CONFIG_FILE)-dist - - @echo "Installed configuration. about to install rt in $(RT_PATH)" - |