Hello community, here is the log from the commit of package yast2-mail for openSUSE:Factory checked in at Fri Apr 16 02:00:32 CEST 2010. -------- --- yast2-mail/yast2-mail.changes 2010-03-25 09:50:20.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-mail/yast2-mail.changes 2010-04-07 14:58:35.000000000 +0200 @@ -1,0 +2,9 @@ +Wed Apr 7 12:52:37 UTC 2010 - varkoly@novell.com + +- Initial version of daemonless postfix solution: A new script + /usr/sbin/check_mail_queue can check the queue if there are some + messages to deliver. If so postfix will be started, mails will + be delivered, and postfix will be stoped it queue is empty. +- Add missed requirement for yast2-mail-plugins + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-mail-2.18.4.tar.bz2 New: ---- yast2-mail-2.18.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-mail.spec ++++++ --- /var/tmp/diff_new_pack.WiMtgr/_old 2010-04-16 02:00:01.000000000 +0200 +++ /var/tmp/diff_new_pack.WiMtgr/_new 2010-04-16 02:00:01.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-mail (Version 2.18.4) +# spec file for package yast2-mail (Version 2.18.5) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,11 +19,11 @@ Name: yast2-mail -Version: 2.18.4 +Version: 2.18.5 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-mail-2.18.4.tar.bz2 +Source0: yast2-mail-2.18.5.tar.bz2 Prefix: /usr @@ -63,14 +63,14 @@ License: GPLv2+ Summary: YaST2 - Users/Group Plugins for the mail delivery configuration Group: System/YaST -Requires: perl-NetxAP +Requires: perl-NetxAP acl %description plugins Plugins for the YaST2 users modul for enterprise mail server configuration. %prep -%setup -n yast2-mail-2.18.4 +%setup -n yast2-mail-2.18.5 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-mail-2.18.4.tar.bz2 -> yast2-mail-2.18.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-mail-2.18.4/VERSION new/yast2-mail-2.18.5/VERSION --- old/yast2-mail-2.18.4/VERSION 2010-03-25 09:40:11.000000000 +0100 +++ new/yast2-mail-2.18.5/VERSION 2010-04-07 14:55:50.000000000 +0200 @@ -1 +1 @@ -2.18.4 +2.18.5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-mail-2.18.4/src/Mail.ycp new/yast2-mail-2.18.5/src/Mail.ycp --- old/yast2-mail-2.18.4/src/Mail.ycp 2010-01-27 13:12:35.000000000 +0100 +++ new/yast2-mail-2.18.5/src/Mail.ycp 2010-04-07 14:52:03.000000000 +0200 @@ -11,7 +11,7 @@ * Authors: * Martin Vidner <mvidner@suse.cz> * - * $Id: Mail.ycp 60548 2010-01-27 11:51:43Z varkoly $ + * $Id: Mail.ycp 61601 2010-04-07 12:52:02Z varkoly $ * * Representation of the configuration of mail. * Input and output routines. @@ -237,6 +237,16 @@ boolean amavis_service = true; /** + * The cron file name for the queue checking. + */ + global string cron_file = "/etc/cron.d/novell.postfix-check-mail-queue"; + + /** + * The cron interval for the queue checking. + */ + global integer check_interval = 15; + + /** * Detect which packages have to be installed * and return a descriptive string for a plain text pop-up. * @return "" or "Foo will be installed.\nBar will be installed.\n" @@ -391,6 +401,7 @@ // connection_type: boolean nc = false; boolean ex = false; + boolean nd = false; // the service must be always running //boolean service = false; if (mta == `sendmail) @@ -400,14 +411,19 @@ } else if (mta == `postfix) { - nc = SCR::Read (.sysconfig.postfix.POSTFIX_NODNS) == "yes"; - ex = SCR::Read (.sysconfig.postfix.POSTFIX_DIALUP) == "yes"; + nc = SCR::Read (.sysconfig.postfix.POSTFIX_NODNS) == "yes"; + ex = SCR::Read (.sysconfig.postfix.POSTFIX_DIALUP) == "yes"; + nd = SCR::Read (.sysconfig.postfix.POSTFIX_NODAEMON) == "yes"; } else { return false; } - if (nc) + if (nd) + { + connection_type = `nodaemon; + } + else if (nc) { connection_type = (ex)? `dialup : `none; } @@ -718,7 +734,13 @@ return false; } - if (connection_type == `permanent) + if (connection_type == `nodaemon) + { + SCR::Write (.sysconfig.postfix.POSTFIX_NODAEMON, "yes"); + SCR::Write (nc_nd, "yes"); + SCR::Write (ex_di, "no"); + } + else if (connection_type == `permanent) { SCR::Write (nc_nd, "no"); SCR::Write (ex_di, "no"); @@ -738,13 +760,22 @@ y2internal("Unrecognized connection_type: %1", connection_type); return false; } - Service::Enable (service); - + if (connection_type == `nodaemon) + { + Service::Disable (service); + SCR::Write (.sysconfig.amavis.USE_AMAVIS, "no"); + SCR::Write (.target.string,cron_file,"-*/"+check_interval+" * * * * root /usr/sbin/check_mail_queue &>/dev/null"); + } + else + { + SCR::Execute (.target.bash,"test -e "+cron_file+" && rm "+cron_file+";"); + Service::Enable (service); + Service::Adjust ("amavis", use_amavis? "enable":"disable"); + } // amavis SCR::Write (.sysconfig.amavis.USE_AMAVIS, use_amavis? "yes":"no"); // used also in WriteServices amavis_service = true; - Service::Adjust ("amavis", use_amavis? "enable":"disable"); // SENDMAIL_ARGS // by default they contain -q30m, not good for dial-up diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-mail-2.18.4/src/mail.ycp new/yast2-mail-2.18.5/src/mail.ycp --- old/yast2-mail-2.18.4/src/mail.ycp 2010-01-27 13:12:35.000000000 +0100 +++ new/yast2-mail-2.18.5/src/mail.ycp 2010-04-07 14:52:03.000000000 +0200 @@ -12,22 +12,12 @@ * Peter Varkoly <varkoly@novell.com> * Martin Vidner <mvidner@suse.cz> * - * $Id: mail.ycp 51613 2008-09-28 08:27:20Z varkoly $ + * $Id: mail.ycp 61601 2010-04-07 12:52:02Z varkoly $ * * Main file for mail configuration. Uses all other files. * */ -/** - * @param flag "<b>permanent</b>", "<b>dialup</b>", or "<b>screenshots</b>"<br> - * <dl> - * <dt>permanent<dd>preselects permanent connnection - * <dt>dialup<dd>preselects dial-up connnection - * <dt>screenshots - * <dd>uses faked data (see Mail::Fake), enables running the module - * as non-root. (Uses Mode::screen_shot().) - * </dl> - */ { /*** * <h3>Configuration of the mail</h3> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-mail-2.18.4/src/ui.ycp new/yast2-mail-2.18.5/src/ui.ycp --- old/yast2-mail-2.18.4/src/ui.ycp 2010-03-25 09:40:22.000000000 +0100 +++ new/yast2-mail-2.18.5/src/ui.ycp 2010-04-07 14:52:03.000000000 +0200 @@ -11,7 +11,7 @@ * Authors: * Martin Vidner <mvidner@suse.cz> * - * $Id: ui.ycp 61486 2010-03-25 08:40:21Z varkoly $ + * $Id: ui.ycp 61601 2010-04-07 12:52:02Z varkoly $ * * All user interface functions. * @@ -251,6 +251,8 @@ `RadioButton (`id (`dialup), `opt (`notify), _("&Dial-up"), ct == `dialup), // Translators: radio button label `RadioButton (`id (`none), `opt (`notify), _("No &connection"), ct == `none), + // Translators: radio button label + `RadioButton (`id (`nodaemon), `opt (`notify), _("Do not start Postfix as Daemon"), ct == `nodaemon), ] ) ); @@ -292,6 +294,11 @@ //argh, slow //Wizard::RestoreNextButton (); } + else if (ct == `nodaemon) + { + UI::ChangeWidget (`id (`use_amavis), `Value, false); + UI::ChangeWidget (`id (`use_amavis), `Enabled, false); + } else if (ct == `none) { UI::ChangeWidget (`id (`use_amavis), `Value, false); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org