Hello community,
here is the log from the commit of package yast2-mail
checked in at Mon Aug 13 00:16:53 CEST 2007.
--------
--- yast2-mail/yast2-mail.changes 2007-05-30 21:02:06.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-mail/yast2-mail.changes 2007-08-12 15:11:23.119945000 +0200
@@ -1,0 +2,5 @@
+Fri Aug 10 12:48:46 CEST 2007 - jsrain@suse.cz
+
+- conflict pre-10.3 aaa_base (#294054)
+
+-------------------------------------------------------------------
Old:
----
yast2-mail-2.15.9.tar.bz2
New:
----
yast2-mail-2.15.20.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-mail.spec ++++++
--- /var/tmp/diff_new_pack.h18308/_old 2007-08-13 00:16:31.000000000 +0200
+++ /var/tmp/diff_new_pack.h18308/_new 2007-08-13 00:16:31.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-mail (Version 2.15.9)
+# spec file for package yast2-mail (Version 2.15.20)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-mail
-Version: 2.15.9
-Release: 12
-License: GNU General Public License (GPL)
+Version: 2.15.20
+Release: 1
+License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-mail-2.15.9.tar.bz2
+Source0: yast2-mail-2.15.20.tar.bz2
prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite
BuildRequires: yast2-ldap-server yast2-network yast2-perl-bindings yast2-users
@@ -38,6 +38,7 @@
Obsoletes: yast2-mail-server
Provides: yast2-mail-aliases
Obsoletes: yast2-mail-aliases
+Conflicts: aaa_base < 10.3
BuildArchitectures: noarch
Summary: YaST2 - Mail Configuration
@@ -67,7 +68,7 @@
Peter Varkoly
%prep
-%setup -n yast2-mail-2.15.9
+%setup -n yast2-mail-2.15.20
%build
%{prefix}/bin/y2tool y2autoconf
@@ -161,6 +162,8 @@
/usr/share/YaST2/clients/users*
%changelog
+* Fri Aug 10 2007 - jsrain@suse.cz
+- conflict pre-10.3 aaa_base (#294054)
* Wed May 30 2007 - varkoly@suse.de
- move sysconfig.mail from aaa_base
- include first version of the wizard to decide wich kind of
++++++ yast2-mail-2.15.9.tar.bz2 -> yast2-mail-2.15.20.tar.bz2 ++++++
++++ 9230 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.15.9/agents/Makefile.am new/yast2-mail-2.15.20/agents/Makefile.am
--- old/yast2-mail-2.15.9/agents/Makefile.am 2007-05-30 20:17:31.000000000 +0200
+++ new/yast2-mail-2.15.20/agents/Makefile.am 2007-07-18 15:39:06.000000000 +0200
@@ -1,7 +1,7 @@
#
# Makefile.am for y2c_mail/agents
#
-# $Id: Makefile.am 37610 2007-04-19 15:22:10Z varkoly $
+# $Id: Makefile.am 38214 2007-05-30 18:57:59Z varkoly $
#
agent_SCRIPTS = ag_fetchmailrc \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.15.9/agents/sysconfig.mail new/yast2-mail-2.15.20/agents/sysconfig.mail
--- old/yast2-mail-2.15.9/agents/sysconfig.mail 2007-05-30 19:56:25.000000000 +0200
+++ new/yast2-mail-2.15.20/agents/sysconfig.mail 2007-07-18 15:39:06.000000000 +0200
@@ -39,11 +39,11 @@
# start with the with the vizard for asking the
# configuration type of the mail server.
#
-MAIL_SKIP_ASK="no"
+SKIP_ASK="no"
## Type: string(standard,advanced,undef)
## Default: undef
#
# This variable contains the type of the mail server configuration.
#
-MAIL_CONF_TYPE="undef"
+CONF_TYPE="undef"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.15.9/configure.in new/yast2-mail-2.15.20/configure.in
--- old/yast2-mail-2.15.9/configure.in 2007-05-30 20:20:59.000000000 +0200
+++ new/yast2-mail-2.15.20/configure.in 2007-08-12 12:02:36.000000000 +0200
@@ -1,6 +1,6 @@
dnl configure.in for yast2-mail
dnl
-dnl -- This file is generated by y2autoconf 2.15.0 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.13.29 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
AC_INIT(yast2-mail, 2.15.9, http://bugs.opensuse.org/, yast2-mail)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.15.9/missing new/yast2-mail-2.15.20/missing
--- old/yast2-mail-2.15.9/missing 2007-05-30 20:26:13.000000000 +0200
+++ new/yast2-mail-2.15.20/missing 2007-08-12 12:02:40.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2006-05-10.23
+scriptversion=2005-06-08.21
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,8 +33,6 @@
fi
run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -46,7 +44,7 @@
msg="missing on your system"
-case $1 in
+case "$1" in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -79,7 +77,6 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
- autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -109,7 +106,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case $1 in
+case "$1" in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -138,7 +135,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case $1 in
+case "$1" in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -167,7 +164,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case $f in
+ case "$f" in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -195,8 +192,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
+ test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
if test -f "$file"; then
touch $file
else
@@ -217,25 +214,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if test $# -ne 1; then
+ if [ $# -ne 1 ]; then
eval LASTARG="\${$#}"
- case $LASTARG in
+ case "$LASTARG" in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if test -f "$SRCFILE"; then
+ if [ -f "$SRCFILE" ]; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if test -f "$SRCFILE"; then
+ if [ -f "$SRCFILE" ]; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if test ! -f y.tab.h; then
+ if [ ! -f y.tab.h ]; then
echo >y.tab.h
fi
- if test ! -f y.tab.c; then
+ if [ ! -f y.tab.c ]; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -247,18 +244,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if test $# -ne 1; then
+ if [ $# -ne 1 ]; then
eval LASTARG="\${$#}"
- case $LASTARG in
+ case "$LASTARG" in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if test -f "$SRCFILE"; then
+ if [ -f "$SRCFILE" ]; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if test ! -f lex.yy.c; then
+ if [ ! -f lex.yy.c ]; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -270,9 +267,11 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
+ file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ if test -z "$file"; then
+ file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
+ fi
+ if [ -f "$file" ]; then
touch $file
else
test -z "$file" || exec >$file
@@ -290,17 +289,11 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '
- /^@setfilename/{
- s/.* \([^ ]*\) *$/\1/
- p
- q
- }' $infile`
+ file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -324,13 +317,13 @@
fi
firstarg="$1"
if shift; then
- case $firstarg in
+ case "$firstarg" in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case $firstarg in
+ case "$firstarg" in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.15.9/src/mail-advanced.ycp new/yast2-mail-2.15.20/src/mail-advanced.ycp
--- old/yast2-mail-2.15.9/src/mail-advanced.ycp 2007-05-30 19:54:14.000000000 +0200
+++ new/yast2-mail-2.15.20/src/mail-advanced.ycp 2007-07-18 15:40:38.000000000 +0200
@@ -15,7 +15,7 @@
* <h3>Configuration of mail-server</h3>
*/
-textdomain "MailServer";
+textdomain "mail";
/* The main () */
y2milestone ("----------------------------------------");
@@ -30,16 +30,28 @@
import "CommandLine";
include "mail/mail-server_wizards.ycp";
+/**
+ * Command line "setup" commands handler.
+ *
+ * @param options map of options from command line
+ * @return boolean true on success
+ */
+boolean SetupMailServer(map options)
+{
+ any ret = SetupSequence();
+ return true;
+}
+
map cmdline_description = $[
- "id" : "mail-server",
+ "id" : "mail-server",
/* Command line help text for the mail-server module */
"help" : _("Configuration of mail server"),
"guihandler" : MailServerSequence,
- "initialize" : MailServer::Read,
- "finish" : MailServer::Write,
+ // "initialize" : MailServer::CheckPackages,
+ // "finish" : MailServer::Write,
"actions" : $[
"setup" : $[
- "handler" : MailServerSequence,
+ "handler" : SetupMailServer,
"help" : _("Advanced Mail Server setup with LDAP backend"),
],
],
@@ -92,8 +104,15 @@
/* main ui function */
any ret = nil;
-if(propose) ret = MailServerAutoSequence();
-else ret = CommandLine::Run(cmdline_description);
+if(propose)
+{
+ ret = MailServerAutoSequence();
+}
+else
+{
+ ret = CommandLine::Run(cmdline_description);
+}
+
y2debug("ret=%1", ret);
/* Finish */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.15.9/src/mail-server_auto.ycp new/yast2-mail-2.15.20/src/mail-server_auto.ycp
--- old/yast2-mail-2.15.9/src/mail-server_auto.ycp 2007-05-30 18:21:23.000000000 +0200
+++ new/yast2-mail-2.15.20/src/mail-server_auto.ycp 2007-07-18 15:40:51.000000000 +0200
@@ -21,7 +21,7 @@
{
-textdomain "MailServer";
+textdomain "mail";
y2milestone("----------------------------------------");
y2milestone("MailServer auto started");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.15.9/src/mail-server_complex.ycp new/yast2-mail-2.15.20/src/mail-server_complex.ycp
--- old/yast2-mail-2.15.9/src/mail-server_complex.ycp 2007-05-30 18:21:23.000000000 +0200
+++ new/yast2-mail-2.15.20/src/mail-server_complex.ycp 2007-08-12 11:53:10.000000000 +0200
@@ -9,15 +9,17 @@
{
-textdomain "MailServer";
+textdomain "mail";
import "Label";
import "Popup";
import "Wizard";
import "Wizard_hw";
import "MailServer";
+import "Progress";
include "mail/mail-server_helps.ycp";
+include "mail/mail-server_dialogs.ycp";
/**
* Return a modification status
@@ -27,10 +29,6 @@
return MailServer::Modified();
}
-boolean ReallyAbort() {
- return !MailServer::Modified() || Popup::ReallyAbort(true);
-}
-
boolean PollAbort() {
return UI::PollInput() == `abort;
}
@@ -39,9 +37,62 @@
* Read settings dialog
* @return `abort if aborted and `next otherwise
*/
+boolean SetupDialog() {
+ Wizard::RestoreHelp(HELPS["setup"]:"");
+ string caption = _("Setup the Mail Server");
+ integer steps = 3;
+ integer sl = 3;
+
+ y2milestone("----- Start MailServer::Setup -----");
+
+ // We do not set help text here, because it was set outside
+ Progress::New( caption, "", steps, [
+ /* Progress stage 0/3 */
+ _("Read needed packages"),
+ /* Progress stage 1/3 */
+ _("Read LDAP Settings"),
+ /* Progress stage 2/3 */
+ _("Choose LDAP/CA Settings"),
+ /* Progress stage 3/3 */
+ _("Setup/Configure LDAP-Server and CA managemant")
+ ], [
+ /* Progress stage 0/7 */
+ _("Reading packages..."),
+ /* Progress stage 1/3 */
+ _("Reading LDAP Settings..."),
+ /* Progress stage 2/3 */
+ _("Choosing LDAP/CA Settings..."),
+ /* Progress stage 3/3 */
+ _("Seting up /Configuring LDAP-Server and CA managemant..."),
+ /* Progress finished */
+ _("Finished")
+ ]
+ , ""
+ );
+
+ // read packages
+ Progress::NextStage();
+ if( ! MailServer::CheckPackages() )
+ {
+ return false;
+ }
+ sleep(sl);
+ // read packages
+ Progress::NextStage();
+ if( CheckLDAPDialog() != `ok )
+ {
+ return false;
+ }
+ sleep(sl);
+ return true;
+}
+
+/**
+ * Read settings dialog
+ * @return `abort if aborted and `next otherwise
+ */
symbol ReadDialog() {
Wizard::RestoreHelp(HELPS["read"]:"");
- // MailServer::AbortFunction = PollAbort;
boolean ret = MailServer::Read();
return ret ? `next : `abort;
}
@@ -52,7 +103,6 @@
*/
symbol WriteDialog() {
Wizard::RestoreHelp(HELPS["write"]:"");
- // MailServer::AbortFunction = PollAbort;
boolean ret = MailServer::Write();
return ret ? `next : `abort;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.15.9/src/mail-server_dialogs.ycp new/yast2-mail-2.15.20/src/mail-server_dialogs.ycp
--- old/yast2-mail-2.15.9/src/mail-server_dialogs.ycp 2007-05-30 19:54:42.000000000 +0200
+++ new/yast2-mail-2.15.20/src/mail-server_dialogs.ycp 2007-07-23 16:21:45.000000000 +0200
@@ -9,7 +9,7 @@
{
-textdomain "MailServer";
+textdomain "mail";
import "Label";
import "Ldap";
@@ -21,19 +21,115 @@
include "mail/helps.ycp";
+boolean ReallyAbort() {
+ return !MailServer::Modified() || Popup::ReallyAbort(true);
+}
+
+/**
+ * CheckLDAPDialog
+ * Checking the LDAP Configuration
+ * @return dialog result
+ */
+define any CheckLDAPDialog ()
+{
+ boolean ca_mgm = false;
+ boolean conf_ldap_server = false;
+ boolean setup_ldap_server = false;
+ string comment = "";
+ Ldap::Read();
+ Ldap::LDAPInit();
+ map LDAPSettings = (map ) Ldap::Export();
+ list args = [];
+ if(LDAPSettings["bind_dn"]:"" == "" )
+ { //No LDAP-Client configuration
+ setup_ldap_server = true;
+ ca_mgm = true;
+ comment = _("Your computer is not configured as LDAP-client.") + "<br>" +
+ _("We suggest to setup a local LDAP-server for the mail server.") + "<br>" +
+ _("To secure your system we suggest to create certificates for the LDAP and Mail Server.") + "<br>";
+ }
+ else
+ { //The computer is configured as LDAP-Client
+ if( LDAPSettings["ldap_server"]:"" == "127.0.0.1" )
+ { // The LDAP-Server is local
+ comment = _("Your computer is configured as LDAP-client and the LDAP-Server is local.") + "<br>" +
+ _("We suggest to adapt the LDAP-server configuration for the mail server.") + "<br>" +
+ _("For this reason you have to know the password of the LDAP-administrator account:") + "<br>" +
+ "<B>" + LDAPSettings["bind_dn"]:"" + ".</B><BR>";
+ }
+ else
+ { // The LDAP-Server is not local
+ comment = _("Your computer is configured as LDAP-client and the LDAP-Server is not local.") + "<br>" +
+ _("We suggest to configure the LDAP-server for the mail server.") + "<br>" +
+ _("For this reason you have to know the password of the LDAP-administrator account:") + "<br>" +
+ "<B>" + LDAPSettings["bind_dn"]:"" + ".</B><BR>" +
+ _("Furthermore the LDAP-Server have to contain the <B>suse-mailserver.schema</B> and the correspondig index entries.");
+ }
+ }
+
+ // Now we create the dialog:
+ term d = `HBox (
+ `VBox (
+ `HSpacing (60),
+ `VSpacing(0.2),
+ `RichText(comment),
+ `VSpacing(0.2),
+ `Left(`CheckBox(`id(`setup_ldap_server),_("Setup an local LDAP-Server."), setup_ldap_server)),
+ `VSpacing(0.2),
+ `Left(`CheckBox(`id(`ca_mgm), _("Create certificates."), ca_mgm)),
+ `VSpacing(0.2),
+ `Left(`CheckBox(`id(`conf_ldap_server), _("Configure dedicated LDAP-Server."), conf_ldap_server)),
+ `HBox (
+ `PushButton (`id (`abort),Label::AbortButton()),
+ `PushButton (`id (`next),Label::NextButton())
+ )
+ )
+ );
+ UI::OpenDialog (`opt (`decorated), d);
+ any ui = UI::UserInput ();
+ setup_ldap_server = (boolean)UI::QueryWidget(`id(`setup_ldap_server),`Value);
+ ca_mgm = (boolean)UI::QueryWidget(`id(`ca_mgm),`Value);
+ conf_ldap_server = (boolean)UI::QueryWidget(`id(`conf_ldap_server),`Value);
+ UI::CloseDialog();
+ if( ui == `abort )
+ {
+ return ui;
+ }
+
+ if( ca_mgm )
+ { // Now we setup the ca managemant
+ args = add(args, "ca_mgm");
+ }
+ if( setup_ldap_server )
+ { // Now we setup the LDAP Server
+ args = add(args, "setup");
+ WFM::CallFunction("mail-server_ldap-setup",args);
+ Ldap::Read();
+ Ldap::LDAPInit();
+ LDAPSettings = (map ) Ldap::Export();
+ }
+ string adminpw = Ldap::LDAPAskAndBind(false);
+ if( adminpw != nil )
+ {
+ YaPI::MailServer::ResetMailServer(adminpw,LDAPSettings);
+ }
+ return `ok;
+}
+
/**
* AuthorizingDialog
* The adminstrator user will be authorized
* @return dialog result
*/
-define any AuthorizingDialog () {
+define any AuthorizingDialog ()
+{
- string ERROR = _("You must configure LDAP to use the mail server.");
Ldap::Read();
map LDAPSettings = Ldap::Export();
- if(LDAPSettings["ldap_server"]:"" == "" )
+ if(LDAPSettings["bind_dn"]:"" == "" )
{
- ERROR = ERROR + "\n" + _("Now we will start the LDAP-Server setup vizard.");
+ string ERROR = _("You must configure LDAP to use the mail server.") +
+ "\n" + _("Now we will start the LDAP configuration.");
if(Popup::YesNo(ERROR))
{
return `ldapsetup;
@@ -44,33 +140,7 @@
}
Ldap::Read();
}
- if(LDAPSettings["base_config_dn"]:"" == "" )
- {
- ERROR = ERROR + "\n";
- }
- Ldap::LDAPInit();
- SCR::Execute (.ldap.bind);
- map searchmap = $[
- "base_dn" : LDAPSettings["base_config_dn"]:"",
- "filter" : "objectclass=suseUserConfiguration",
- "attrs" : [],
- "not_found_ok": false,
- "scope" : 2
- ];
- list modulesUser = (list)SCR::Read (.ldap.search, searchmap);
- searchmap["filter"] = "objectclass=suseGroupConfiguration";
- list modulesGroups = (list)SCR::Read (.ldap.search, searchmap);
- if (modulesUser == nil || modulesGroups == nil ||
- modulesUser == [] || modulesGroups == [] )
- {
- ERROR = ERROR + _("You must enable \"Create Default Configuration Objects\" in\n\"Advanced Configuration\" of the \"YaST2 LDAP-Client\" module.\n") ;
- }
- if ( ERROR != "" ) {
- ERROR = _("Missing LDAP features !\n\n") + ERROR;
- Popup::Error(ERROR);
- return `abort;
- }
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) {
@@ -1126,7 +1196,8 @@
UI::CloseDialog();
}
-boolean CheckMainDomain() {
+boolean CheckMainDomain()
+{
integer maindomain = 0;
integer domains = 0;
@@ -1153,7 +1224,8 @@
return true;
}
-any ComplexDialog() {
+any ComplexDialog()
+{
Wizard::CreateTreeDialog();
list<map> Tree = GenerateTree([], "", MailServer::ModulesTreeContent) ;
@@ -1168,7 +1240,7 @@
string CIDRBL = ""; //CurrentItem
Wizard::SetContents(title, content ,helptext, true, true);
- Wizard::SetDesktopIcon("mailserver");
+ Wizard::SetDesktopIcon("mail");
UI::WizardCommand(`SetBackButtonLabel( "" ) );
UI::WizardCommand(`SetNextButtonLabel( _("OK") ) );
Wizard::SelectTreeItem(FocusedContent);
@@ -1482,7 +1554,7 @@
y2milestone("FocusedContent %1",FocusedContent);
if(ret != `cancel && ret != `abort && ret != `next ) {
Wizard::SetContents(title, content ,helptext, false, true);
- Wizard::SetDesktopIcon("mailserver");
+ Wizard::SetDesktopIcon("mail");
UI::WizardCommand(`SetBackButtonLabel( "" ) );
UI::WizardCommand(`SetNextButtonLabel( _("OK") ) );
if(UI::WidgetExists(`id(`table))) UI::ChangeWidget(`id(`table), `CurrentItem, CID);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.15.9/src/mail-server_helps.ycp new/yast2-mail-2.15.20/src/mail-server_helps.ycp
--- old/yast2-mail-2.15.9/src/mail-server_helps.ycp 2007-05-30 18:21:23.000000000 +0200
+++ new/yast2-mail-2.15.20/src/mail-server_helps.ycp 2007-07-18 15:40:15.000000000 +0200
@@ -9,7 +9,7 @@
{
-textdomain "MailServer";
+textdomain "mail";
/**
* All helps are here
@@ -23,6 +23,10 @@
Some of the mail server settings will be stored in the LDAP repository, too.<br></p>
"),
+ /* Setup dialog help 1/1 */
+ "setup" : _("<p><b><big>Setup Mail Server Configuration</big></b><br>
+Please wait...<br></p>
+") ,
/* Read dialog help 1/2 */
"read" : _("<p><b><big>Initializing Mail Server Configuration</big></b><br>
Please wait...<br></p>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.15.9/src/MailServerLDAP.pm new/yast2-mail-2.15.20/src/MailServerLDAP.pm
--- old/yast2-mail-2.15.9/src/MailServerLDAP.pm 2007-05-30 19:54:54.000000000 +0200
+++ new/yast2-mail-2.15.20/src/MailServerLDAP.pm 2007-08-12 14:56:27.000000000 +0200
@@ -1,3 +1,5 @@
+#!/usr/bin/perl -w
+
=head1 NAME
MailServerLDAP
@@ -20,26 +22,27 @@
=cut
-package MailServerLDAP;
-
use strict;
-use YaST::YCP;
+package MailServerLDAP;
-textdomain("MailServer");
+use YaST::YCP;
our %TYPEINFO;
YaST::YCP::Import ("Ldap");
YaST::YCP::Import ("YaPI::LdapServer");
+YaST::YCP::Import ("Service");
-
+BEGIN {$TYPEINFO{ConfigureLDAPServer} = ["function", "any", [ "map","string","any"]];}
sub ConfigureLDAPServer()
{
# don't configure if using eDirectory server
Ldap->CheckNDS ();
if (! Ldap->nds())
{
+ Ldap->Read();
+ my $ldapMap = Ldap->Export();
# Now we configure the LDAP-Server to be able store the mail server configuration
my $schemas = YaPI::LdapServer->ReadSchemaIncludeList();
my $SCHEMA = join "",@{$schemas};
@@ -93,5 +96,6 @@
}
YaPI::LdapServer->RecreateIndex($ldapMap->{ldap_domain});
}
+ Service->Restart("ldap");
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.15.9/src/mail-server_ldap-setup.ycp new/yast2-mail-2.15.20/src/mail-server_ldap-setup.ycp
--- old/yast2-mail-2.15.9/src/mail-server_ldap-setup.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-mail-2.15.20/src/mail-server_ldap-setup.ycp 2007-08-12 14:35:28.000000000 +0200
@@ -0,0 +1,88 @@
+/**
+ * File:
+ * clients/mail-server-ldap-setup.ycp
+ *
+ * Package:
+ * Configuration of mail
+ *
+ * Summary:
+ * Setup of a LDAP server to be able store the mail server datas
+ *
+ * Authors:
+ * Peter Varkoly
+ *
+ * $Id: mail.ycp 37642 2007-04-20 19:06:52Z varkoly $
+ *
+ *
+ */
+
+{
+textdomain "mail";
+import "Ldap";
+import "MailServerLDAP";
+import "YaPI::MailServer";
+import "Package";
+import "Report";
+import "Label";
+
+ string ERROR = "";
+ list args = WFM::Args();
+ string to_install = "";
+ list<string> l_to_install = [];
+
+
+ y2milestone("--- mail-server-ldap-setup ---");
+ // First we check if all requested modules are installed
+ if( !Package::Installed ( "ldap-server" ) )
+ {
+ l_to_install = add( l_to_install, "yast2-ldap-server" );
+ to_install = to_install + "yast2-ldap-server\n";
+ }
+ if(contains(args,"ca_mgm") )
+ {
+ if( !Package::Installed ( "yast2-ca-management" ) )
+ {
+ l_to_install = add( l_to_install, "yast2-ca-management" );
+ to_install = to_install + "yast2-ca-management\n";
+ }
+ }
+ if(to_install != "")
+ {
+ if ( Report::AnyQuestion ("",_("You have not installed all needed packages.") +
+ "\n"+to_install+"\n",
+ Label::InstallButton(),
+ Label::AbortButton(),
+ `focus_yes))
+ {
+ Package::DoInstall(l_to_install);
+ }
+ else
+ {
+ return false;
+ }
+ }
+
+ //Now we start the requested modules
+ if(contains(args,"ca_mgm") )
+ {
+ WFM::CallFunction("ca_mgm",[]);
+ }
+ if(contains(args,"setup") )
+ {
+ WFM::CallFunction("ldap-server",[]);
+ }
+ Ldap::Read();
+ Ldap::LDAPInit();
+ map LDAPSettings = (map)Ldap::Export();
+ string adminpw = Ldap::LDAPAskAndBind(false);
+ MailServerLDAP::ConfigureLDAPServer(LDAPSettings);
+ if( adminpw != nil )
+ {
+ YaPI::MailServer::ResetMailServer(adminpw,LDAPSettings);
+ }
+ else
+ {
+ return false;
+ }
+ return true;
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.15.9/src/mail-server_proposal.ycp new/yast2-mail-2.15.20/src/mail-server_proposal.ycp
--- old/yast2-mail-2.15.9/src/mail-server_proposal.ycp 2007-05-30 18:21:23.000000000 +0200
+++ new/yast2-mail-2.15.20/src/mail-server_proposal.ycp 2007-07-18 15:41:04.000000000 +0200
@@ -12,7 +12,7 @@
{
-textdomain "MailServer";
+textdomain "mail";
import "MailServer";
import "Progress";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.15.9/src/mail-server_wizards.ycp new/yast2-mail-2.15.20/src/mail-server_wizards.ycp
--- old/yast2-mail-2.15.9/src/mail-server_wizards.ycp 2007-05-30 19:55:17.000000000 +0200
+++ new/yast2-mail-2.15.20/src/mail-server_wizards.ycp 2007-07-18 15:40:28.000000000 +0200
@@ -9,7 +9,7 @@
{
-textdomain "MailServer";
+textdomain "mail";
import "Sequencer";
import "Wizard";
@@ -17,37 +17,12 @@
include "mail/mail-server_complex.ycp";
include "mail/mail-server_dialogs.ycp";
-
-/**
- * Workflow of the LDAP Server/Client setup
- * @return sequence result
- */
-any LdapSetupSequence() {
-
- /* FIXME: adapt to your needs */
- map aliases = $[
- "complex" : ``( ComplexDialog() )
- ];
-
- /* FIXME: adapt to your needs */
- map sequence = $[
- "ws_start" : "complex",
- "complex" : $[
- `abort : `abort,
- `next : `next
- ]
- ];
-
- any ret = Sequencer::Run(aliases, sequence);
-
- return ret;
-}
-
/**
* Main workflow of the mail-server configuration
* @return sequence result
*/
-any MainSequence() {
+any MainSequence()
+{
/* FIXME: adapt to your needs */
map aliases = $[
@@ -63,9 +38,7 @@
]
];
- any ret = Sequencer::Run(aliases, sequence);
-
- return ret;
+ return Sequencer::Run(aliases, sequence);
}
/**
@@ -75,16 +48,21 @@
any MailServerSequence() {
map aliases = $[
- "read" : [ ``( ReadDialog() ), true ],
"auth" : [ ``( AuthorizingDialog() ), true ],
+ "read" : [ ``( ReadDialog() ), true ],
"main" : ``( MainSequence() ),
- "ldapsetup" : ``( LdapSetupSequence() ),
+ "ldapsetup" : [ ``( SetupDialog() ), true ],
"write" : [ ``( WriteDialog() ), true ]
];
map sequence = $[
"ws_start" : "auth",
+ "ldapsetup" : $[
+ `abort : `abort,
+ `next : "auth"
+ ],
"auth" : $[
+ `ldapsetup : "ldapsetup",
`abort : `abort,
`next : "read"
],
@@ -103,7 +81,7 @@
];
Wizard::CreateDialog();
- Wizard::SetDesktopIcon("mailserver");
+ Wizard::SetDesktopIcon("mail");
any ret = Sequencer::Run(aliases, sequence);
@@ -112,6 +90,38 @@
}
/**
+ * Workflow of the LDAP Server/Client setup
+ * @return sequence result
+ */
+any SetupSequence()
+{
+
+ /* FIXME: adapt to your needs */
+ map aliases = $[
+ "setup" : [ ``( SetupDialog() ), true ],
+ "main" : ``( MailServerSequence() )
+ ];
+
+ /* FIXME: adapt to your needs */
+ map sequence = $[
+ "ws_start" : "setup",
+ "setup" : $[
+ `abort : `abort,
+ `next : "main"
+ ],
+ ];
+
+ Wizard::CreateDialog();
+ Wizard::SetDesktopIcon("mail");
+
+ any ret = Sequencer::Run(aliases, sequence);
+
+ UI::CloseDialog();
+ return ret;
+
+}
+
+/**
* Whole configuration of mail-server but without reading and writing.
* For use with autoinstallation.
* @return sequence result
@@ -124,7 +134,7 @@
term contents = `Label(_("Initializing..."));
Wizard::CreateDialog();
- Wizard::SetDesktopIcon("mailserver");
+ Wizard::SetDesktopIcon("mail");
Wizard::SetContentsButtons(caption, contents, "",
Label::BackButton(), Label::NextButton());
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.15.9/src/MailServer.ycp new/yast2-mail-2.15.20/src/MailServer.ycp
--- old/yast2-mail-2.15.9/src/MailServer.ycp 2007-05-30 19:55:52.000000000 +0200
+++ new/yast2-mail-2.15.20/src/MailServer.ycp 2007-07-18 15:40:57.000000000 +0200
@@ -13,7 +13,7 @@
{
module "MailServer";
-textdomain "MailServer";
+textdomain "mail";
import "Ldap";
import "Label";
@@ -167,7 +167,8 @@
* Help funktion to check the DNS Settings
*/
-void Check_Mail_Domain() {
+void Check_Mail_Domain()
+{
map LDAPSettings = Ldap::Export();
string DNSWarning = _("There is no main mail domain defined. Please fix it!");
@@ -247,10 +248,66 @@
}
/**
+ * Check if all needed packages are installed
+ * @return true on success
+ */
+global boolean CheckPackages()
+{
+ procmail_installed = Installed("procmail");
+ cyrus_installed = Installed("cyrus-imapd");
+ postfix_installed = Installed("postfix");
+ fetchmail_installed = Installed("fetchmail");
+ ldap_installed = Installed("yast2-ldap-client");
+ amavis_installed = Installed("amavisd-new");
+ sasl_installed = Installed("cyrus-sasl-plain");
+ plugins_installed = Installed("yast2-mail-plugins");
+ string to_install = "";
+ list<string> l_to_install = [];
+
+ if (!ldap_installed)
+ {
+ l_to_install = add( l_to_install, "yast2-ldap-client" );
+ to_install = to_install + "yast2-ldap-client\n";
+ }
+ if (!postfix_installed)
+ {
+ l_to_install = add( l_to_install, "postfix" );
+ to_install = to_install + "postfix\n";
+ }
+ if(!sasl_installed)
+ {
+ l_to_install = add( l_to_install, "cyrus-sasl-plain" );
+ to_install = to_install + "cyrus-sasl-plain\n";
+ }
+ if(!plugins_installed)
+ {
+ l_to_install = add( l_to_install, "yast2-mail-plugins" );
+ to_install = to_install + "yast2-mail-plugins\n";
+ }
+ if(to_install != "")
+ {
+ if ( Report::AnyQuestion ("",_("You have not installed all needed packages.") +
+ "\n"+to_install+"\n",
+ Label::InstallButton(),
+ Label::AbortButton(),
+ `focus_yes))
+ {
+ Package::DoInstall(l_to_install);
+ }
+ else
+ {
+ return false;
+ }
+ }
+ return true;
+}
+
+/**
* Read all mail-server settings
* @return true on success
*/
-global boolean Read() {
+global boolean Read()
+{
/* MailServer read dialog caption */
string caption = _("Reading the Mail Server Settings");
@@ -258,7 +315,8 @@
integer steps = 8;
integer sl = 10;
- sleep(sl);
+
+ y2milestone("----- Start MailServer::Read -----");
// We do not set help text here, because it was set outside
Progress::New( caption, "", steps, [
@@ -274,7 +332,7 @@
_("Read mail server relaying settings"),
/* Progress stage 5/7 */
_("Read mail server local delivery settings"),
- /* Progress stage 6/3 */
+ /* Progress stage 6/7 */
_("Read mail fetching jobs"),
/* Progress stage 7/7 */
_("Read mail server domains")
@@ -302,70 +360,14 @@
""
);
- // read global settings
+ // read packages
if(Abort()) return false;
Progress::NextStage();
- procmail_installed = Installed("procmail");
- cyrus_installed = Installed("cyrus-imapd");
- postfix_installed = Installed("postfix");
- fetchmail_installed = Installed("fetchmail");
- ldap_installed = Installed("yast2-ldap-client");
- amavis_installed = Installed("amavisd-new");
- sasl_installed = Installed("cyrus-sasl-plain");
- plugins_installed = Installed("yast2-mail-plugins");
-
- if(!ldap_installed) {
- Report::Error(_("You have not installed all needed packages.") +
- "\n" +
- _("You must configure LDAP to use the mail server."));
- return false;
- }
-
- if (!postfix_installed)
+ if( ! CheckPackages() )
{
- if ( Report::AnyQuestion ("",_("You have not installed all needed packages.") +
- "\n postfix \n",
- Label::InstallButton(),
- Label::AbortButton(),
- `focus_yes))
- {
- Package::DoInstall(["postfix"]);
- }
- else
- {
- return false;
- }
- }
- if(!sasl_installed)
- {
- if ( Report::AnyQuestion ("",_("You have not installed all needed packages.") +
- "\n cyrus-sasl-plain \n",
- Label::InstallButton(),
- Label::AbortButton(),
- `focus_yes))
- {
- Package::DoInstall(["cyrus-sasl-plain"]);
- }
- else
- {
- return false;
- }
- }
- if(!plugins_installed)
- {
- if ( Report::AnyQuestion ("",_("You have not installed all needed packages.") +
- "\n yast2-mail-plugins \n",
- Label::InstallButton(),
- Label::AbortButton(),
- `focus_yes))
- {
- Package::DoInstall(["yast2-mail-plugins"]);
- }
- else
- {
- return false;
- }
+ return false;
}
+ sleep(sl);
NetworkDevices::Read();
map TMP = NetworkDevices::Export("modem");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.15.9/src/mail.ycp new/yast2-mail-2.15.20/src/mail.ycp
--- old/yast2-mail-2.15.9/src/mail.ycp 2007-05-30 20:07:47.000000000 +0200
+++ new/yast2-mail-2.15.20/src/mail.ycp 2007-07-23 16:19:56.000000000 +0200
@@ -12,7 +12,7 @@
* Martin Vidner
* Peter Varkoly
*
- * $Id: mail.ycp 38213 2007-05-30 18:07:53Z varkoly $
+ * $Id: mail.ycp 39536 2007-07-19 12:45:57Z jsrain $
*
* Main file for mail configuration. Uses all other files.
*
@@ -51,7 +51,8 @@
// Translators: start dialog help, part 2 of 4
_("<P>This module will configure and start Postfix and if necessary the Cyrus IMAP Server.</P>")+
// Translators: start dialog help, part 3 of 4
- _("<P>Be aware:\nMost home users can use the build-in
+ _("<P><B>Be aware:</B><BR>
+Most home users can use the build-in
features of their email application to send and
get email. They do not need this module.</P>")+
// Translators: start dialog help, part 4 of 4
@@ -59,28 +60,31 @@
the email on your local system, or in some other special cases.</P>");
}
-define string StartDialog (string type) ``{
+define string StartDialog (string type, boolean first ) ``{
y2milestone ("Mail configuration type %1", type);
Wizard::SetScreenShotName ("mail-0-start");
- string caption = _("Email Server Configuration");
+ string caption = _("Email Server Configuration");
term tskip_ask = `Left(`CheckBox(`id(`skip_ask), _("Skip this page in the future")));
- string status = _("Mail Server is not configured.
-Select configuration type according your personal needs");
- if( type == "standard" )
+ string status = _("Mail Server is not configured.")+"\n"+
+ _("Select configuration type according your personal needs");
+ if( first )
{
- status = _("The running Mail Server configuration is based on type “Standard”.
-It's possible to change to “Advanced”, but this will overwrite all existing settings.");
- }
- else if( type == "advanced" )
- {
- status = _("The running Mail Server configuration is based on type “Advanced”.
-It's possible to change to “Standard”, but this will overwrite all existing settings.");
+ tskip_ask = `VSpacing(1);
}
- if( type != "standard" && type != "advanced" )
+ else
{
- tskip_ask = `VSpacing(1);
+ if( type == "standard" )
+ {
+ status = _("The running Mail Server configuration is based on type \"Standard\".")+ "\n"+
+ _("It's possible to change to \"Advanced\", but this will overwrite all existing settings.");
+ }
+ else if( type == "advanced" )
+ {
+ status = _("The running Mail Server configuration is based on type \"Advanced\".")+"\n"+
+ _("It's possible to change to \"Standard\", but this will overwrite all existing settings.");
+ }
}
term contents =
`Frame(
@@ -101,7 +105,7 @@
)
);
Wizard::CreateDialog();
- Wizard::SetContentsButtons (caption, contents, StartDialogHelp (), Label::BackButton (), Label::NextButton ());
+ Wizard::SetContentsButtons (caption, contents, StartDialogHelp(), Label::BackButton (), Label::NextButton ());
any ret = nil;
string sret = nil;
@@ -144,6 +148,9 @@
}
+/****************/
+/* MAIN ROUTINE */
+/****************/
/* parse arguments */
list args = WFM::Args ();
@@ -158,7 +165,6 @@
if( conf_type != "advanced" && conf_type != "standard" )
{ // First start of mail modul or update from < 10.3
- y2milestone ("Warum bin i here Mail configuration type %1", conf_type);
if( local_recipient_maps != nil )
{ // Postfix configured using LDAP
conf_type = "advanced";
@@ -172,7 +178,7 @@
if( skip_ask == "no" || skip_ask == nil )
{
string old_conf = conf_type;
- conf_type = StartDialog(conf_type);
+ conf_type = StartDialog(conf_type,first_start);
if( conf_type == nil )
{
y2milestone("no mail server configuration type");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.15.9/src/Makefile.am new/yast2-mail-2.15.20/src/Makefile.am
--- old/yast2-mail-2.15.9/src/Makefile.am 2007-05-30 20:16:43.000000000 +0200
+++ new/yast2-mail-2.15.20/src/Makefile.am 2007-07-18 15:39:07.000000000 +0200
@@ -1,7 +1,7 @@
#
# Makefile.am for y2c_mail/src
#
-# $Id: Makefile.am 38213 2007-05-30 18:07:53Z varkoly $
+# $Id: Makefile.am 38981 2007-06-25 06:15:11Z varkoly $
#
SUBDIRS = YaPI
@@ -15,7 +15,8 @@
mail-standard.ycp \
mail-advanced.ycp \
mail-server_auto.ycp \
- mail-server_proposal.ycp
+ mail-server_proposal.ycp \
+ mail-server_ldap-setup.ycp
myynclude_DATA = \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.15.9/src/YaPI/MailServer.pm new/yast2-mail-2.15.20/src/YaPI/MailServer.pm
--- old/yast2-mail-2.15.9/src/YaPI/MailServer.pm 2007-05-30 19:56:38.000000000 +0200
+++ new/yast2-mail-2.15.20/src/YaPI/MailServer.pm 2007-08-12 14:23:42.000000000 +0200
@@ -38,7 +38,7 @@
use POSIX; # Needed for setlocale()
use Data::Dumper;
-textdomain("MailServer");
+textdomain("mail");
our %TYPEINFO;
our @CAPABILITIES = (
'SLES10'
@@ -2558,7 +2558,7 @@
masquerade_exceptions
=cut
-BEGIN { $TYPEINFO{ResetMailServer} = ["function", "boolean" ,"string", ["map", "string", "any"]]; }
+BEGIN { $TYPEINFO{ResetMailServer} = ["function", "boolean" ,"string", ["map", "string","any"]]; }
sub ResetMailServer {
my $self = shift;
my $AdminPassword = shift;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.15.9/users-plugin/users_plugin_mail_groups.ycp new/yast2-mail-2.15.20/users-plugin/users_plugin_mail_groups.ycp
--- old/yast2-mail-2.15.9/users-plugin/users_plugin_mail_groups.ycp 2007-05-30 18:21:24.000000000 +0200
+++ new/yast2-mail-2.15.20/users-plugin/users_plugin_mail_groups.ycp 2007-07-18 15:41:20.000000000 +0200
@@ -14,7 +14,7 @@
{
- textdomain "MailServer"; // use own textdomain for new plugins
+ textdomain "mail"; // use own textdomain for new plugins
import "Label";
import "Popup";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.15.9/users-plugin/UsersPluginMail.pm new/yast2-mail-2.15.20/users-plugin/UsersPluginMail.pm
--- old/yast2-mail-2.15.9/users-plugin/UsersPluginMail.pm 2007-05-30 18:21:24.000000000 +0200
+++ new/yast2-mail-2.15.20/users-plugin/UsersPluginMail.pm 2007-07-18 15:41:15.000000000 +0200
@@ -20,7 +20,7 @@
use Data::Dumper;
use YaPI::MailServer;
-textdomain("MailServer");
+textdomain("mail");
##--------------------------------------
##--------------------- global imports
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.15.9/users-plugin/users_plugin_mail.ycp new/yast2-mail-2.15.20/users-plugin/users_plugin_mail.ycp
--- old/yast2-mail-2.15.9/users-plugin/users_plugin_mail.ycp 2007-05-30 18:21:24.000000000 +0200
+++ new/yast2-mail-2.15.20/users-plugin/users_plugin_mail.ycp 2007-07-18 15:41:25.000000000 +0200
@@ -14,7 +14,7 @@
{
- textdomain "MailServer"; // use own textdomain for new plugins
+ textdomain "mail"; // use own textdomain for new plugins
import "Label";
import "Popup";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-mail-2.15.9/VERSION new/yast2-mail-2.15.20/VERSION
--- old/yast2-mail-2.15.9/VERSION 2007-05-30 18:21:23.000000000 +0200
+++ new/yast2-mail-2.15.20/VERSION 2007-08-12 12:03:08.000000000 +0200
@@ -1 +1 @@
-2.15.9
+2.15.20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org