[Rt-commit] rt branch, 4.2/smime-gpg-defaults, created. rt-4.1.19-245-g1ecdff5

[Alex Vandiver]

The branch, 4.2/smime-gpg-defaults has been created
        at  1ecdff545b3935825e9006cf18ec596546d2047a (commit)

- Log -----------------------------------------------------------------
commit 1ecdff545b3935825e9006cf18ec596546d2047a
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Wed Sep 4 17:34:28 2013 -0400

    Detection of gpg/openssl should not auto-enable the RT configuration
    
    GnuPG and S/MIME integration is the exception rather than the rule in
    most deployments -- but the gpg and openssl binaries they depend on are
    ever-present.  Additionally, having enabled these two subsystems
    (automatically) without having configured them adds little value or
    functionality.
    
    Split each into two parts -- the perl dependencies, which are added
    whenever the relevant binaries are installed, and the explicit --enable
    or --disable, which set the default value in RT_Config.pm and _also_
    override the dependency checking.
    
    This allows casual users to later enable the configuration options in
    RT_SiteConfig.pm, whereupon the relevant dependencies will already be
    installed (assuming the binary existed at configure-time).  For installs
    on systems which demand the functionality at configure-time, --enable
    will suffice; and lastly, additional dependencies will not be installed
    if the binaries are lacking.

diff --git a/configure.ac b/configure.ac
index c647407..5517d7b 100755
--- a/configure.ac
+++ b/configure.ac
@@ -286,30 +286,54 @@ fi
 AC_SUBST(RT_GD)
 
 dnl RT's GPG support
-AC_CHECK_PROG([RT_GPG], [gpg], "yes", "no")
+AC_CHECK_PROG([RT_GPG_DEPS], [gpg], "yes", "no")
+if test "$RT_GPG_DEPS" = yes; then
+        RT_GPG_DEPS="1"
+else
+        RT_GPG_DEPS="0"
+fi
 AC_ARG_ENABLE(gpg,
             AC_HELP_STRING([--enable-gpg],
                            [Turns on GNU Privacy Guard (GPG) support]),
             RT_GPG=$enableval)
 if test "$RT_GPG" = yes; then
         RT_GPG="1"
+        RT_GPG_DEPS="1"
 else
-        RT_GPG="0"
+        if test "$RT_GPG" = no; then
+                RT_GPG="0"
+                RT_GPG_DEPS="0"
+        else
+                RT_GPG="0"
+        fi
 fi
+AC_SUBST(RT_GPG_DEPS)
 AC_SUBST(RT_GPG)
 
 
 dnl RT's SMIME support
-AC_CHECK_PROG([RT_SMIME], [openssl], "yes", "no")
+AC_CHECK_PROG([RT_SMIME_DEPS], [openssl], "yes", "no")
+if test "$RT_SMIME_DEPS" = yes; then
+        RT_SMIME_DEPS="1"
+else
+        RT_SMIME_DEPS="0"
+fi
 AC_ARG_ENABLE(smime,
             AC_HELP_STRING([--enable-smime],
                            [Turns on Secure MIME (SMIME) support]),
             RT_SMIME=$enableval)
 if test "$RT_SMIME" = yes; then
         RT_SMIME="1"
+        RT_SMIME_DEPS="1"
 else
-        RT_SMIME="0"
+        if test "$RT_SMIME" = no; then
+                RT_SMIME="0"
+                RT_SMIME_DEPS="0"
+        else
+                RT_SMIME="0"
+        fi
 fi
+AC_SUBST(RT_SMIME_DEPS)
 AC_SUBST(RT_SMIME)
 
 
diff --git a/docs/UPGRADING-4.2 b/docs/UPGRADING-4.2
index 93a6840..5e6f7c7 100644
--- a/docs/UPGRADING-4.2
+++ b/docs/UPGRADING-4.2
@@ -281,6 +281,14 @@ templates, e.g. "Forward" template could be updated to:
 
 { $ForwardTransaction->Content =~ /\S/ ? $ForwardTransaction->Content : "This is a forward of transaction #".$Transaction->id." of ticket #". $Ticket->id }
 
+=item *
+
+GnuPG and S/MIME are no longer enabled in F<RT_Config.pm> merely by the
+presence of the C<gpg> or C<openssl> binaries.  Systems which depended
+on C<configure> enabling these in F<RT_Config.pm> implicitly will need
+to pass C<--enable-gpg> to C<configure>, or alter their
+C<RT_SiteConfig.pm> to enable the functionality explicitly.
+
 =back
 
 =cut
diff --git a/sbin/rt-test-dependencies.in b/sbin/rt-test-dependencies.in
index f96fea2..80e1bed 100644
--- a/sbin/rt-test-dependencies.in
+++ b/sbin/rt-test-dependencies.in
@@ -90,8 +90,8 @@ my %default = (
     'with-CLI' => 1,
     'with-MAILGATE' => 1, 
     'with-DEVELOPER' => @RT_DEVELOPER@,
-    'with-GPG' => @RT_GPG@,
-    'with-SMIME' => @RT_SMIME@,
+    'with-GPG' => @RT_GPG_DEPS@,
+    'with-SMIME' => @RT_SMIME_DEPS@,
     'with-ICAL' => 1,
     'with-GRAPHVIZ' => @RT_GRAPHVIZ@,
     'with-GD' => @RT_GD@,

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