package cleanups and addition of 'username' module -- taken over from Michael Schloh's patch set

squirrelmail/squirrelmail.patch

@@ -1,7 +1,7 @@
 Index: functions/display_messages.php
 --- functions/display_messages.php.orig	2005-03-21 23:18:32 +0100
 +++ functions/display_messages.php	2005-07-30 21:15:29 +0200
-@@ -106,8 +106,8 @@
+@@ -88,8 +88,8 @@
               "\"$width_and_height /><br />\n";
      }
      echo ( $hide_sm_attributions ? '' :
@@ -15,7 +15,7 @@ Index: functions/display_messages.php
 Index: functions/imap_general.php
 --- functions/imap_general.php.orig	2005-05-20 12:37:34 +0200
 +++ functions/imap_general.php	2005-07-30 21:14:27 +0200
-@@ -569,6 +569,7 @@
+@@ -568,6 +568,7 @@
  
                  set_up_language($squirrelmail_language, true);
                  include_once(SM_PATH . 'functions/display_messages.php' );
@@ -26,7 +26,7 @@ Index: functions/imap_general.php
 Index: src/login.php
 --- src/login.php.orig	2005-06-22 15:45:35 +0200
 +++ src/login.php	2005-07-30 21:15:39 +0200
-@@ -117,8 +117,8 @@
+@@ -132,8 +132,8 @@
                  ' /><br />' . "\n"
                : '' ).
              ( (isset($hide_sm_attributions) && $hide_sm_attributions) ? '' :
@@ -40,7 +40,7 @@ Index: src/login.php
 Index: src/right_main.php
 --- src/right_main.php.orig	2005-06-15 23:12:05 +0200
 +++ src/right_main.php	2005-07-30 21:14:27 +0200
-@@ -185,6 +185,7 @@
+@@ -182,6 +182,7 @@
                               )
                          ) ,
                      'center', $color[9], 'width="70%" cellpadding="0" cellspacing="3" border="0"' );

squirrelmail/squirrelmail.patch.plugins

@@ -2,7 +2,7 @@ Index: etc/squirrelmail/config.php
 diff -Nau etc/squirrelmail/config.php.orig etc/squirrelmail/config.php
 --- etc/squirrelmail/config.php.orig	2005-03-16 13:02:25 +0100
 +++ etc/squirrelmail/config.php	2005-03-16 12:31:51 +0100
-@@ -89,6 +89,18 @@
+@@ -89,6 +89,19 @@
  $plugins[13] = 'squirrel_logger';
  $plugins[14] = 'translate';
  
@@ -17,6 +17,7 @@ diff -Nau etc/squirrelmail/config.php.orig etc/squirrelmail/config.php
 +$plugins[23] = 'show_user_and_ip';
 +$plugins[24] = 'smallcal';
 +$plugins[25] = 'vkeyboard';
++$plugins[26] = 'username';
 +
  /* NOP, for patch line placeholder (avoids fuzz) */
  $theme_css = '';

squirrelmail/squirrelmail.spec

@@ -28,7 +28,7 @@
 %define       V_plugin_compat       2.0.4
 %define       V_plugin_logger       1.4.0-1.0.6
 %define       V_plugin_addgraphics  2.3-1.0.3
-%define       V_plugin_avelsieve    1.0.1
+%define       V_plugin_avelsieve    1.9.7
 %define       V_plugin_saslpwd      1.4.1-1.4
 %define       V_plugin_checkquota   1.4-1.2.7
 %define       V_plugin_foldersize   1.5-1.4.0
@@ -38,6 +38,7 @@
 %define       V_plugin_userip       3.3-1.2.2
 %define       V_plugin_smallcal     0.8-1.2.3
 %define       V_plugin_vkeyboard    0.9
+%define       V_plugin_username     2.3-1.0.0
 
 #   package information
 Name:         squirrelmail
@@ -50,7 +51,7 @@ Class:        EVAL
 Group:        Mail
 License:      GPL
 Version:      %{V_sqmail}
-Release:      20061013
+Release:      20061015
 
 #   package options
 %option       with_plugins  no
@@ -61,7 +62,7 @@ Source1:      http://switch.dl.sourceforge.net/squirrelmail/all_locales-%{V_loca
 Source2:      http://www.squirrelmail.org/plugins/compatibility-%{V_plugin_compat}.tar.gz
 Source3:      http://www.squeaksoft.com/products/SquirrelLogger/squirrel_logger.%{V_plugin_logger}.tar.gz
 Source4:      http://www.squirrelmail.org/plugins/addgraphics-%{V_plugin_addgraphics}.tar.gz
-Source5:      http://email.uoa.gr/download/squirrelmail/avelsieve/avelsieve-%{V_plugin_avelsieve}.tar.gz
+Source5:      http://www.squirrelmail.org/plugins/avelsieve-%{V_plugin_avelsieve}.tar.gz
 Source6:      http://www.squirrelmail.org/plugins/chg_sasl_passwd-%{V_plugin_saslpwd}.tar.gz
 Source7:      http://www.squirrelmail.org/plugins/check_quota-%{V_plugin_checkquota}.tar.gz
 Source8:      http://www.squirrelmail.org/plugins/folder_sizes-%{V_plugin_foldersize}.tar.gz
@@ -71,11 +72,12 @@ Source11:     http://www.squirrelmail.org/plugins/pupdate.%{V_plugin_update}.tar
 Source12:     http://www.squirrelmail.org/plugins/show_user_and_ip-%{V_plugin_userip}.tar.gz
 Source13:     http://www.squirrelmail.org/plugins/smallcal-%{V_plugin_smallcal}.tar.gz
 Source14:     http://www.squirrelmail.org/plugins/vkeyboard-%{V_plugin_vkeyboard}.tar.gz
-Source15:     config.php
-Source16:     defprefs.txt
-Source17:     opkg_large.png
-Source18:     opkg_small.png
-Source19:     rc.squirrelmail
+Source15:     http://www.squirrelmail.org/plugins/username-%{V_plugin_username}.tar.gz
+Source16:     config.php
+Source17:     defprefs.txt
+Source18:     opkg_large.png
+Source19:     opkg_small.png
+Source20:     rc.squirrelmail
 Patch0:       squirrelmail.patch
 Patch1:       squirrelmail.patch.plugins
 
@@ -126,8 +128,8 @@ AutoReqProv:  no
     }
     prog squirrelmail:avelsieve = {
         version   = %{V_plugin_avelsieve}
-        url       = http://email.uoa.gr/download/squirrelmail/avelsieve/
-        regex     = avelsieve-(\d+\.[0-8]\.\d+)\.tar\.gz
+        url       = http://www.squirrelmail.org/plugins/
+        regex     = avelsieve-(\d+\.\d+\.\d+)\.tar\.gz
     }
     prog squirrelmail:saslpwd = {
         version   = %{V_plugin_saslpwd}
@@ -174,6 +176,11 @@ AutoReqProv:  no
         url       = http://www.squirrelmail.org/plugins/
         regex     = vkeyboard-(__VER__)\.tar\.gz
     }
+    prog squirrelmail:username = {
+        version   = %{V_plugin_username}
+        url       = http://www.squirrelmail.org/plugins/
+        regex     = username-(__VER__)\.tar\.gz
+    }
 
 %prep
     %setup -q -c -n squirrelmail
@@ -194,22 +201,23 @@ AutoReqProv:  no
     %setup -q -D -T -a 12 -n squirrelmail
     %setup -q -D -T -a 13 -n squirrelmail
     %setup -q -D -T -a 14 -n squirrelmail
+    %setup -q -D -T -a 15 -n squirrelmail
 
     #   move additional plugins where other are already placed
     for plug in addgraphics avelsieve check_quota chg_sasl_passwd \
                 folder_sizes gpg ldifimport pupdate show_user_and_ip \
-                smallcal vkeyboard; do
+                smallcal vkeyboard username; do
         mv $plug squirrelmail-%{V_sqmail}/plugins
     done
 %endif
 
     #   clean up login screen of distractions
-    ( cd %{l_tmpdir}/squirrelmail/squirrelmail-%{V_sqmail}
+    ( cd squirrelmail-%{V_sqmail}
       %patch -p0
     ) || exit $?
 
     #   rearrange documentation and remove archive script
-    ( cd %{l_tmpdir}/squirrelmail/squirrelmail-%{V_sqmail}
+    ( cd squirrelmail-%{V_sqmail}
       mv AUTHORS ChangeLog COPYING INSTALL README UPGRADE doc/
       mv ReleaseNotes doc/ReleaseNotes.txt
       mv themes/README.themes doc/
@@ -251,12 +259,12 @@ AutoReqProv:  no
         $RPM_BUILD_ROOT%{l_prefix}/var/squirrelmail/log
 
     #   install locales
-    ( cd %{l_tmpdir}/squirrelmail/all_locales-%{V_locale}
+    ( cd all_locales-%{V_locale}
       cp -rpf help images locale $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/
     ) || exit $?
 
     #   install program
-    ( cd %{l_tmpdir}/squirrelmail/squirrelmail-%{V_sqmail}
+    ( cd squirrelmail-%{V_sqmail}
 
       #   install default_pref
       %{l_shtool} install -c -m 644 \
@@ -317,10 +325,11 @@ AutoReqProv:  no
             addgraphics/config.php.typical.one.domain \
             addgraphics/config.php
         %{l_shtool} install -c -m 644 \
-            -e 's/^\(\$preferred_mech =\).*/\1 "PLAIN LOGIN CRAM-MD5 DIGEST-MD5";/' \
+            -e 's/^\(\$sieve_preferred_sasl_mech =\).*/\1 "PLAIN LOGIN CRAM-MD5 DIGEST-MD5";/' \
+            -e 's/^\(\$avelsieve_oldcyrus =\).*/\1 false;/' \
             -e 's/^\(\$startitems =\).*/\1 4;/' \
-            avelsieve/config_sample.php \
-            avelsieve/config.php
+            avelsieve/config/config_sample.php \
+            avelsieve/config/config.php
         %{l_shtool} subst \
             -e 's;\(path_to_gpg=\)/usr/bin/gpg.*;\1%{l_prefix}/bin/gpg;' \
             gpg/gpg_local_prefs.txt
@@ -335,6 +344,7 @@ AutoReqProv:  no
             -e "s;\(\$vkeyboard_height.*\)'250';\1'270';" \
             vkeyboard/config.php.sample \
             vkeyboard/config.php
+        cp -pf username/config.php.sample username/config.php
         %{l_shtool} install -c -m 644 \
             %{SOURCE opkg_small.png} \
             $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/images/
@@ -382,7 +392,7 @@ AutoReqProv:  no
         '%config %{l_prefix}/share/squirrelmail/plugins/squirrelspell/sqspell_config.php' \
 %if "%{with_plugins}" == "yes"
         '%config %{l_prefix}/share/squirrelmail/plugins/addgraphics/config.php' \
-        '%config %{l_prefix}/share/squirrelmail/plugins/avelsieve/config.php' \
+        '%config %{l_prefix}/share/squirrelmail/plugins/avelsieve/config/config.php' \
         '%config %{l_prefix}/share/squirrelmail/plugins/check_quota/config.php' \
         '%config %{l_prefix}/share/squirrelmail/plugins/chg_sasl_passwd/config.php' \
         '%config %{l_prefix}/share/squirrelmail/plugins/folder_sizes/folder_sizes_config.php' \
@@ -391,6 +401,7 @@ AutoReqProv:  no
         '%config %{l_prefix}/share/squirrelmail/plugins/pupdate/config.php' \
         '%config %{l_prefix}/share/squirrelmail/plugins/show_user_and_ip/config.php' \
         '%config %{l_prefix}/share/squirrelmail/plugins/vkeyboard/config.php' \
+        '%config %{l_prefix}/share/squirrelmail/plugins/username/config.php' \
 %endif
         '%attr(755,%{l_nusr},%{l_ngrp}) %{l_prefix}/share/squirrelmail/prefs' \
         '%attr(755,%{l_nusr},%{l_ngrp}) %{l_prefix}/var/squirrelmail/spool/attach' \