commit yast2-mail

29 Sep 2008

Hello community,

here is the log from the commit of package yast2-mail
checked in at Mon Sep 29 18:28:05 CEST 2008.


--------

--- yast2-mail/yast2-mail.changes	2008-09-11 11:13:20.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-mail/yast2-mail.changes	2008-09-28 10:48:39.515136000 +0200
@@ -1,0 +2,5 @@
+Sun Sep 28 10:28:17 CEST 2008 - varkoly@suse.de
+
+- Fixing (bnc#422022) - HTML markup shows in YAST dialogue 
+
+-------------------------------------------------------------------



Old:
----
  yast2-mail-2.16.8.tar.bz2

New:
----
  yast2-mail-2.16.9.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-mail.spec ++++++
--- /var/tmp/diff_new_pack.Rn7479/_old	2008-09-29 18:27:49.000000000 +0200
+++ /var/tmp/diff_new_pack.Rn7479/_new	2008-09-29 18:27:49.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package yast2-mail (Version 2.16.8)
+# spec file for package yast2-mail (Version 2.16.9)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -19,12 +19,12 @@
 
 
 Name:           yast2-mail
-Version:        2.16.8
+Version:        2.16.9
 Release:        1
 License:        GPL v2 or later
 Group:          System/YaST
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-mail-2.16.8.tar.bz2
+Source0:        yast2-mail-2.16.9.tar.bz2
 Prefix:         /usr
 BuildRequires:  perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite
 BuildRequires:  yast2-ldap-server yast2-network yast2-perl-bindings yast2-users
@@ -77,7 +77,7 @@
     Peter Varkoly <varkoly@novell.com>
 
 %prep
-%setup -n yast2-mail-2.16.8
+%setup -n yast2-mail-2.16.9
 
 %build
 %{prefix}/bin/y2tool y2autoconf
@@ -171,6 +171,8 @@
 %dir /usr/share/YaST2/clients
 /usr/share/YaST2/clients/users*
 %changelog
+* Sun Sep 28 2008 varkoly@suse.de
+- Fixing (bnc#422022) - HTML markup shows in YAST dialogue
 * Thu Sep 11 2008 varkoly@suse.de
 - (bnc#425343) - string in mail.po not written well
 * Thu Sep 11 2008 jsrain@suse.cz

++++++ yast2-mail-2.16.8.tar.bz2 -> yast2-mail-2.16.9.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-mail-2.16.8/src/mail-server_dialogs.ycp new/yast2-mail-2.16.9/src/mail-server_dialogs.ycp
--- old/yast2-mail-2.16.8/src/mail-server_dialogs.ycp	2008-09-11 10:53:27.000000000 +0200
+++ new/yast2-mail-2.16.9/src/mail-server_dialogs.ycp	2008-09-23 18:05:39.000000000 +0200
@@ -43,12 +43,17 @@
     Ldap::LDAPInit();
     map<string, any>  LDAPSettings = (map <string, any>) Ldap::Export();
     list args = [];
+    integer size1 = (integer)SCR::Read(.target.size, "/etc/ssl/servercerts/servercert.pem");
+    integer size2 = (integer)SCR::Read(.target.size, "/etc/ssl/servercerts/serverkey.pem");
+    if( size1 <= 0 || size2 <= 0)
+    {
+		ca_mgm		  = true;
+    }
     y2milestone(" LDAPSettings %1", LDAPSettings);
     //if( ! LDAPSettings["start_ldap"]:false )
     if( LDAPSettings["bind_dn"]:"" == "" )
     { //No LDAP-Client configuration
 	setup_ldap_server = true;
-	ca_mgm		  = true;
 	conf_ldap_client  = true;
 	ldap_server_local = true;
         comment = _("Your computer is not configured as an LDAP client.") + "<br>" +
@@ -57,7 +62,7 @@
     }
     else
     { //The computer is configured as LDAP-Client
-	if( LDAPSettings["ldap_server"]:"" == "127.0.0.1" )
+	if( LDAPSettings["ldap_server"]:"" == "127.0.0.1" ||  LDAPSettings["ldap_server"]:"" == "localhost" )
 	{ // The LDAP-Server is local
           comment = _("Your computer is configured as an LDAP client and the LDAP server is local.") + "<br>" +
                   _("We suggest you adapt the LDAP server configuration for the mail server.") + "<br>" +
@@ -661,11 +666,14 @@
   list<map<string,string> > AccessList = (list<map<string,string> >) MailServer::MailPrevention["AccessList"]:[];
   boolean VirusScanning     = (boolean)MailServer::MailPrevention["VirusScanning"]:false;
   boolean SpamLearning      = (boolean)MailServer::MailPrevention["SpamLearning"]:false;
-  integer VSCount           = (integer)MailServer::MailPrevention["VSCount "]:10;
+  integer VSCount           = (integer)MailServer::MailPrevention["VSCount"]:10;
   boolean BasicProtectionOff    = false;
   boolean BasicProtectionMedium = false;
   boolean BasicProtectionHard   = true;
 
+y2milestone("---- MailPrevention %1",MailServer::MailPrevention);
+y2milestone("---- VSCount %1",VSCount);
+
   if(BasicProtection == "off"){
      BasicProtectionOff     = true;
      BasicProtectionHard    = false;
@@ -696,7 +704,7 @@
 	`HBox(
 	        `Left(`CheckBox (`id(`VirusScanning),     `opt(`notify), _("Start Virus Scanner AMAVIS"), VirusScanning)),
 		`HSpacing (1),
-	        `Left(`TextEntry (`id(`VSCount), `opt(`notify), _("Count of Virsus Scanner Process"), sformat("%1",VSCount)))
+	        `Left(`TextEntry (`id(`VSCount), _("Count of Virsus Scanner Process"), sformat("%1",VSCount)))
 	),
 	`VSpacing (1),
 	SpamL,
@@ -1461,7 +1469,7 @@
           MailServer::MailPrevention["BasicProtection"] = (string) UI::QueryWidget(`id(`BasicProtection), `CurrentButton);
           MailServer::MailPrevention["VirusScanning"]   = (boolean)UI::QueryWidget(`id(`VirusScanning), `Value);
           MailServer::MailPrevention["SpamLearning"]    = (boolean)UI::QueryWidget(`id(`SpamLearning), `Value);
-          MailServer::MailPrevention["VSCount"]         = (boolean)UI::QueryWidget(`id(`VSCount), `Value);
+          MailServer::MailPrevention["VSCount"]         = (integer)UI::QueryWidget(`id(`VSCount), `Value);
           title    = _("Mail Server SPAM Basic Prevention Configuration");
           content  = MailPreventionDialog(CID,CIDRBL);
           helptext = HELPS["MailPrevention"]:"Bla Bla Bla";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-mail-2.16.8/src/mail.ycp new/yast2-mail-2.16.9/src/mail.ycp
--- old/yast2-mail-2.16.8/src/mail.ycp	2008-09-11 10:38:32.000000000 +0200
+++ new/yast2-mail-2.16.9/src/mail.ycp	2008-09-28 10:27:21.000000000 +0200
@@ -9,10 +9,10 @@
  *   Main file
  *
  * Authors:
- *   Martin Vidner <mvidner@suse.cz>
  *   Peter Varkoly <varkoly@novell.com>
+ *   Martin Vidner <mvidner@suse.cz>
  *
- * $Id: mail.ycp 51003 2008-09-11 06:30:20Z jsrain $
+ * $Id: mail.ycp 51613 2008-09-28 08:27:20Z varkoly $
  *
  * Main file for mail configuration. Uses all other files.
  *
@@ -81,13 +81,13 @@
     {
 	    if( type == "standard" )
 	    {
-		status = _("The running mail server configuration is based on the <b>Standard</b> type.")+ "\n"+
-			 _("It is possible to change to <b>Advanced</b> settings. This will overwrite all existing settings.");
+		status = _("The running mail server configuration is based on the \"Standard\" type.")+ "\n"+
+			 _("It is possible to change to \"Advanced\" settings. This will overwrite all existing settings.");
 	    }
 	    else if( type == "advanced" )
 	    {
-		status = _("The running mail server configuration is based on the <b>Advanced</b> type.")+"\n"+
-			 _("It is possible to change to <b>Standard</b> settings. This will overwrite all existing settings.");
+		status = _("The running mail server configuration is based on the \"Advanced\" type.")+"\n"+
+			 _("It is possible to change to \"Standard\" settings. This will overwrite all existing settings.");
 	    }
     }
     term   contents =
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-mail-2.16.8/src/YaPI/MailServer.pm new/yast2-mail-2.16.9/src/YaPI/MailServer.pm
--- old/yast2-mail-2.16.8/src/YaPI/MailServer.pm	2008-08-06 10:00:06.000000000 +0200
+++ new/yast2-mail-2.16.9/src/YaPI/MailServer.pm	2008-09-28 10:46:32.000000000 +0200
@@ -1161,12 +1161,16 @@
     }
 
     # Now we looking for if vscan (virusscanning) is started.
-    my $smtp = SCR->Execute('.mail.postfix.mastercf.findService',
-		{ 'service' => 'smtp',
-		  'command' => 'smtpd'});
     my $vscan = SCR->Execute('.mail.postfix.mastercf.findService',
 		{ 'service' => 'localhost:10025',
 		  'command' => 'smtpd'} );
+    my $smtp = SCR->Execute('.mail.postfix.mastercf.findService',
+		{ 'service' => 'smtp',
+		  'command' => 'smtpd'});
+print "SMTP";
+print Dumper ($smtp);
+print "VSCAN";
+print Dumper ($vscan);
     if( defined $smtp->[0] && defined $smtp->[0]->{'options'} )
     { 
 	if( $smtp->[0]->{'options'}->{'content_filter'} eq 'smtp:[localhost]:10024' && $vscan )
@@ -1186,6 +1190,7 @@
 		{
 	  	    $MailPrevention{'VSCount'} = $1;
 		}
+		$ismax = 1;
 	    }
 	    if( !$ismax )
 	    {
@@ -1200,7 +1205,7 @@
     {
         $ret = $imap->login($imapadm, $AdminPassword);
 	if($$ret{Status} eq "ok") {
-	    $ret = $imap->select('NEWSPAM'); 
+	    $ret = $imap->select('NewSpam'); 
 	    if( $ret->{Status} eq 'ok' )
 	    {
 	        $MailPrevention{'SpamLearning'} = YaST::YCP::Boolean(1);
@@ -1358,6 +1363,7 @@
     SCR->Read('.mail.postfix.mastercf');
     if( $MailPrevention->{'VirusScanning'} )
     {
+	$MailPrevention->{'VSCount'} = 5 if( ! defined $MailPrevention->{'VSCount'});
 	my $err = activate_virus_scanner($MailPrevention->{'VSCount'});
 	if( $err ne "" )
 	{
@@ -1450,8 +1456,51 @@
 		$ret = $imap->setacl('NoSpam',  $imapadm, "lrswipkxtea");
 		$ret = $imap->setacl('NewSpam', 'anyone', "lrswi");
 		$ret = $imap->setacl('NoSpam',  'anyone', "lsi");
+		my $lernspam = '#!/bin/bash
+LOG=/var/log/lern-spam
+/usr/share/oss/tools/oss_date.sh >> $LOG
+if [ ! -d /var/spool/imap/NewSpam ]
+then
+  exit
+fi
+
+setfacl -m u:vscan:rx /var/spool/imap /var/spool/imap/{NoSpam,NewSpam}
+setfacl -m m::rx /var/spool/imap /var/spool/imap/{NoSpam,NewSpam}
+
+su - vscan -c "/usr/bin/sa-learn --sync"
+(
+for i in `ls /var/spool/imap/NewSpam/[0-9]* 2> /dev/null`
+do
+   setfacl -m user:vscan:r-x $i
+   echo $i 
+   su - vscan -c "/usr/bin/sa-learn --spam $i"
+   rm $i
+done
+) >> $LOG  2>&1
+su - cyrus -c "reconstruct NewSpam" &>/dev/null
+
+(
+for i in `ls /var/spool/imap/NoSpam/[0-9]* 2> /dev/null`
+do
+   setfacl -m user:vscan:r-x $i
+   echo $i 
+   su - vscan -c "/usr/bin/sa-learn --ham $i"
+   rm $i
+done
+) >> $LOG  2>&1
+su - cyrus -c "reconstruct NoSpam" &>/dev/null
+
+setfacl -b /var/spool/imap /var/spool/imap/{NoSpam,NewSpam}
+';
+		SCR->Write(".target.string","/etc/cron.hourly/lern-spam",$lernspam);
+		SCR->Write(".target.bash","chmod 755 /etc/cron.hourly/lern-spam");
 	    }
 	}
+	else
+	{
+		SCR->Write(".target.bash","test -e /etc/cron.hourly/lern-spam && rm /etc/cron.hourly/lern-spam");
+	        $ret = $imap->delete('NewSpam'); 
+	}
     }
     return  1;
 }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-mail-2.16.8/VERSION new/yast2-mail-2.16.9/VERSION
--- old/yast2-mail-2.16.8/VERSION	2008-09-10 14:53:45.000000000 +0200
+++ new/yast2-mail-2.16.9/VERSION	2008-09-28 10:27:42.000000000 +0200
@@ -1 +1 @@
-2.16.8
+2.16.9


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠Hilbert.suse.de

tags

participants (1)