[Rt-commit] rt branch, master, updated. rt-4.1.8-589-gce5f72f

[Thomas Sibley]

The branch, master has been updated
       via  ce5f72fbdc8bf043d45a1c09fa1c2af807a08695 (commit)
       via  fa380654e2182145eb363b8b45f446579fd5e40d (commit)
       via  0f84aa8b441b92c25ce56d436fa976ebb077bfe6 (commit)
       via  2a6a7377a7d571c19f5cfec72e9f3e85ba253cdd (commit)
       via  e13d8bf9ca44bcbb99d6b57bba55782f55785970 (commit)
       via  327de24f9ef34fd87ae9cf4be0ada7be113c774d (commit)
       via  286cfa18b8f19da34e769cf1a0687d17cdec5c30 (commit)
       via  ec4267f2ff67044b222d361e632305a9b44b980c (commit)
       via  8c08da5913c75c21010bfc47d99a944435f821a4 (commit)
       via  18720e12589da546627baef67079609143941454 (commit)
       via  20044d4f4cb0f9d5270c8816be5077125b4582cf (commit)
       via  87648298858ddf40a03f17934f9e6692f69ab310 (commit)
       via  5154856f8d35889789732b666d71c6ef6cd7aecf (commit)
       via  6a3007a87c1c176d76aed8a44067f6df9020c5d8 (commit)
       via  e883787b682287a6da845c63402df088f3832b2a (commit)
       via  143fddb586bdbb4483f755520edadb9fa6fdd323 (commit)
       via  79a039f9d2a9006d5a61e9732224a41e27ba06de (commit)
      from  34697a857b95154a39ae7b91f1a5c1b4cc753a4e (commit)

Summary of changes:
 devel/tools/rt-apache     |  7 +++++++
 docs/UPGRADING-4.0        | 16 ++++++++++++++++
 etc/RT_Config.pm.in       | 15 +++++++++++++++
 lib/RT/Classes.pm         |  9 +++++++++
 lib/RT/Interface/Email.pm | 15 +++++++++------
 lib/RT/Pod/HTML.pm        |  4 ++--
 lib/RT/Principals.pm      |  1 +
 lib/RT/URI.pm             |  2 ++
 sbin/rt-setup-database.in |  7 ++++---
 9 files changed, 65 insertions(+), 11 deletions(-)

- Log -----------------------------------------------------------------
commit ce5f72fbdc8bf043d45a1c09fa1c2af807a08695
Merge: 34697a8 fa38065
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Thu Jun 13 16:11:25 2013 -0700

    Merge branch '4.0-trunk'
    
    Conflicts:
    	devel/tools/rt-apache
            "Alias" lines removed on master appeared in hunk context

diff --cc devel/tools/rt-apache
index 6c593a8,c2e2285..cd33246
--- a/devel/tools/rt-apache
+++ b/devel/tools/rt-apache
@@@ -330,6 -331,18 +331,12 @@@ DocumentRoot $RTHOME/share/htm
      Allow from all
  </Directory>
  
 -Alias $PATH/NoAuth/images/ $RTHOME/share/html/NoAuth/images/
 -<Directory $RTHOME/share/html/NoAuth/images>
 -    Order allow,deny
 -    Allow from all
 -</Directory>
 -
+ <IfDefine REDIRECT>
+     LoadModule rewrite_module $MODULES/mod_rewrite.so
+     RewriteEngine on
+     RewriteRule ^(?!\Q$PATH\E) - [R=404]
+ </IfDefine>
+ 
  <IfDefine !RT3>
  ########## 4.0 mod_perl
  <IfDefine PERL>
diff --cc sbin/rt-setup-database.in
index cacd7bd,ddb286b..585a88f
--- a/sbin/rt-setup-database.in
+++ b/sbin/rt-setup-database.in
@@@ -181,12 -191,9 +182,12 @@@ if ($args{'skip-create'}) 
  }
  
  print "Working with:\n"
-     ."Type:\t$db_type\nHost:\t$db_host\nName:\t$db_name\n"
+     ."Type:\t$db_type\nHost:\t$db_host\nPort:\t$db_port\nName:\t$db_name\n"
      ."User:\t$db_user\nDBA:\t$dba_user" . ($args{'skip-create'} ? ' (No DBA)' : '') . "\n";
  
 +my $package = $args{'package'} || 'RT';
 +my $ext_version = $args{'ext-version'};
 +
  foreach my $action ( @actions ) {
      no strict 'refs';
      my ($status, $msg) = *{ 'action_'. $action }{'CODE'}->( %args );

-----------------------------------------------------------------------