--- rpms/smeserver-ezmlm-web/contribs8/smeserver-ezmlm-web-1.1.2-configurable.patch	2016/04/20 16:52:27	1.1
+++ rpms/smeserver-ezmlm-web/contribs8/smeserver-ezmlm-web-1.1.2-configurable.patch	2016/04/21 05:13:17	1.4
@@ -26,52 +26,6 @@ diff -Nur smeserver-ezmlm-web-1.1.2.old/
 diff -Nur smeserver-ezmlm-web-1.1.2.old/root/etc/e-smith/templates/etc/ezmlm/ezmlmwebrc/BODY smeserver-ezmlm-web-1.1.2/root/etc/e-smith/templates/etc/ezmlm/ezmlmwebrc/BODY
 --- smeserver-ezmlm-web-1.1.2.old/root/etc/e-smith/templates/etc/ezmlm/ezmlmwebrc/BODY	2016-04-20 07:35:06.363000000 -0400
 +++ smeserver-ezmlm-web-1.1.2/root/etc/e-smith/templates/etc/ezmlm/ezmlmwebrc/BODY	2016-04-20 12:48:20.128000000 -0400
-@@ -2,30 +2,31 @@
- 
- $OUT = <<'EOF';
- 
--# $Id: ezmlmwebrc,v 1.5 2000/09/25 18:25:26 guy Exp $
--# Configuration file for ezmlm-web 2.1
-+# Minimal configuration file for ezmlm-web 3.3
- # ===========================================================================
- 
- # This file is not just an ordinary configuration file - it contains valid
- # perl statements that are executed just like any other perl script. When
- # editing this file, be careful that it is still valid perl when you have
- # finished (perl -w ezmlmwebrc ;-)
--
--# It is divided into to logical parts. The first part configures the way
--# ezmlm-web runs, and the second changes the language, etc of ezmlm-web. You
--# can not arbitarilly exclude any statement, since the script doesn't define
--# any defaults of its own. You could, however, always split this file up and
--# include the parts with
--#
--#   require('/path/to/other/part'); 
--
--$opt_c = 1;	 # No list creation or deletion
-+#.
-+# See the manpage of ezmlmwebrc(5) for a list of all available configuration
-+# settings.
- 
- # ---------------------------------------------------------------------------
- 
--# Path to the ezmlm-web 3.3.1 template and laguage files
-+# Where do we store lists on this server ... Try "$HOME_DIR/lists"..
-+# This directory will automatically be created if needed.
-+# BEWARE: the (resulting) path MUST be absolute (starting with a slash)!
-+$LIST_DIR = "$HOME_DIR/lists";
-+
-+# Where are the language files
-+# usually something like /usr/local/share/ezmlm-web/lang
- $LANGUAGE_DIR = "/usr/local/share/ezmlm-web/lang";
--$TEMPLATE_DIR ="/usr/local/share/ezmlm-web/template";
-+
-+# Where are the template files
-+# usually something like /usr/local/share/ezmlm-web/template
-+$TEMPLATE_DIR = "/usr/local/share/ezmlm-web/template";
- 
- # Where do we store lists on this server ... Try "$HOME_DIR/lists". 
- # This directory will automatically be created if needed.
 @@ -43,12 +44,6 @@
  # Where do the qmail control files live on this system ...
  $QMAIL_BASE = $Mail::Ezmlm::QMAIL_BASE . '/control';
@@ -142,13 +96,13 @@ diff -Nur smeserver-ezmlm-web-1.1.2.old/
 -# What is the title of this document?
 -# $HTML_TITLE = 'E Z Mailing List Manager';
 -$HTML_TITLE = 'Mailing Lists';
-+my $options= ($ezmlm->{options} || 'aBDFGHiJkLMNOpQRSTUWx';
-+$OUT .= "\$DEFAULT_OPTIONS = '$options'";
++my $options= $ezmlm{options} || 'aBDFGHiJkLMNOpQRSTUWx';
++$OUT .= "\$DEFAULT_OPTIONS = '$options';\n";
  
 -# ---------------------------------------------------------------------------
-+my $title= ($ezmlm->{title} || 'Koozali SME Server Mailing List Manager';
-+$OUT .= "# What is the title of this document?
-+\$HTML_TITLE = '$title';";
++my $title= $ezmlm{title} || 'Koozali SME Server Mailing List Manager';
++$OUT .= "# What is the title of this document?\n";
++$OUT .= "\$HTML_TITLE = '$title';\n";
 +
 +
 +$OUT .= <<'EOF';
@@ -375,8 +329,8 @@ diff -Nur smeserver-ezmlm-web-1.1.2.old/
 +EOF
  
 -);
-+my $interface=$ezmlm->{interface} || 'normal';
-+$OUT .= "\$DEFAULT_INTERFACE_TYPE = '$interface';"
++my $interface=$ezmlm{interface} || 'normal';
++$OUT .= "\$DEFAULT_INTERFACE_TYPE = '$interface';";
  
 -#                      === Configuration file ends ===
 +$OUT .= <<'EOF';
@@ -412,8 +366,8 @@ diff -Nur smeserver-ezmlm-web-1.1.2.old/
 +# This include keyring management and mailing list handling in general.
  EOF
  
-+my $encryption= ($ezmlm->{encryption} eq 'enabled' )? 1 : 0;
-+$OUT .="\$ENCRYPTION_SUPPORT = $encryption;";
++my $encryption= ($ezmlm{encryption} eq 'enabled' )? 1 : 0;
++$OUT .="\$ENCRYPTION_SUPPORT = $encryption;\n";
 +
 +$OUT .= <<'EOF';
 +# Define the default location of gnupg keyrings used for mailing list
@@ -430,7 +384,47 @@ diff -Nur smeserver-ezmlm-web-1.1.2.old/
 +# defaults to 0
 +EOF
 +
-+my $debug= ($ezmlm->{debug} eq 'enabled' )? 1 : 0;
++my $debug= ($ezmlm{debug} eq 'enabled' )? 1 : 0;
 +$OUT .="\$DEBUG = $debug;";
 +
  }
+--- smeserver-ezmlm-web-1.1.2/root/etc/e-smith/templates/etc/ezmlm/ezmlmwebrc/BODY.ori	2016-04-20 23:45:57.677000000 -0400
++++ smeserver-ezmlm-web-1.1.2/root/etc/e-smith/templates/etc/ezmlm/ezmlmwebrc/BODY	2016-04-20 23:50:42.586000000 -0400
+@@ -2,29 +2,25 @@
+ 
+ $OUT = <<'EOF';
+ 
+-# $Id: ezmlmwebrc,v 1.5 2000/09/25 18:25:26 guy Exp $
+-# Configuration file for ezmlm-web 2.1
++# Configuration file for ezmlm-web 3.3
+ # ===========================================================================
+ 
+ # This file is not just an ordinary configuration file - it contains valid
+ # perl statements that are executed just like any other perl script. When
+ # editing this file, be careful that it is still valid perl when you have
+ # finished (perl -w ezmlmwebrc ;-)
+-
+-# It is divided into to logical parts. The first part configures the way
+-# ezmlm-web runs, and the second changes the language, etc of ezmlm-web. You
+-# can not arbitarilly exclude any statement, since the script doesn't define
+-# any defaults of its own. You could, however, always split this file up and
+-# include the parts with
+ #
+-#   require('/path/to/other/part'); 
+-
+-$opt_c = 1;	 # No list creation or deletion
++# See the manpage of ezmlmwebrc(5) for a list of all available configuration
++# settings.
+ 
+ # ---------------------------------------------------------------------------
+ 
+-# Path to the ezmlm-web 3.3.1 template and laguage files
++# Where are the language files
++# usually something like /usr/local/share/ezmlm-web/lang
+ $LANGUAGE_DIR = "/usr/local/share/ezmlm-web/lang";
++
++# Where are the template files
++# usually something like /usr/local/share/ezmlm-web/template
+ $TEMPLATE_DIR ="/usr/local/share/ezmlm-web/template";
+ 
+ # Where do we store lists on this server ... Try "$HOME_DIR/lists".