Hello community,
here is the log from the commit of package yast2-mail for openSUSE:Factory
checked in at Thu Jul 23 18:00:52 CEST 2009.
--------
--- yast2-mail/yast2-mail.changes 2009-04-14 13:04:43.000000000 +0200
+++ yast2-mail/yast2-mail.changes 2009-07-20 12:52:28.000000000 +0200
@@ -1,0 +2,12 @@
+Mon Jul 20 12:31:04 CEST 2009 - varkoly@suse.de
+
+- bnc#491113 - fetchmail demon is started though disabled in runlevel
+ editor when configuring email via network services
+
+-------------------------------------------------------------------
+Mon Jul 20 10:41:06 CEST 2009 - varkoly@suse.de
+
+- bnc#488677 - yast2-mail "Advanced config" overwrites mailman settings
+- alias map ldap search must be sub
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-mail.spec ++++++
--- /var/tmp/diff_new_pack.svh7o5/_old 2009-07-23 17:55:44.000000000 +0200
+++ /var/tmp/diff_new_pack.svh7o5/_new 2009-07-23 17:55:44.000000000 +0200
@@ -20,12 +20,12 @@
Name: yast2-mail
Version: 2.18.0
-Release: 1
-License: GPL v2 or later
-Group: System/YaST
+Release: 2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-mail-2.18.0.tar.bz2
Prefix: /usr
+Group: System/YaST
+License: GPL v2 or later
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite
BuildRequires: yast2-ldap-server yast2-network yast2-perl-bindings yast2-users
BuildRequires: perl-NetxAP
@@ -54,15 +54,9 @@
The YaST2 component for mail configuration. It handles Postfix, Cyrus,
Amavis and Fetchmail.
-
-
-Authors:
---------
- Peter Varkoly
-
%package plugins
License: GPL v2 or later
-Summary: YaST2-Users/Group Plugins for the mail delivery configuration
+Summary: YaST2 - Users/Group Plugins for the mail delivery configuration
Group: System/YaST
Requires: perl-NetxAP
@@ -70,12 +64,6 @@
Plugins for the YaST2 users modul for enterprise mail server
configuration.
-
-
-Authors:
---------
- Peter Varkoly
-
%prep
%setup -n yast2-mail-2.18.0
@@ -87,7 +75,9 @@
export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
%{?suse_update_config:%{suse_update_config -f}}
./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir}
-make %{?jobs:-j%jobs}
+# V=1: verbose build in case we used AM_SILENT_RULES(yes)
+# so that RPM_OPT_FLAGS check works
+make %{?jobs:-j%jobs} V=1
%install
make install DESTDIR="$RPM_BUILD_ROOT"
++++++ yast2-mail-2.18.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-mail-2.18.0/aclocal.m4 new/yast2-mail-2.18.0/aclocal.m4
--- old/yast2-mail-2.18.0/aclocal.m4 2008-09-10 13:34:24.000000000 +0200
+++ new/yast2-mail-2.18.0/aclocal.m4 2009-07-20 10:42:58.000000000 +0200
@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(AC_AUTOCONF_VERSION, [2.62],,
-[m4_warning([this file was generated for autoconf 2.62.
+m4_if(AC_AUTOCONF_VERSION, [2.63],,
+[m4_warning([this file was generated for autoconf 2.63.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-mail-2.18.0/configure new/yast2-mail-2.18.0/configure
--- old/yast2-mail-2.18.0/configure 2008-09-10 13:34:28.000000000 +0200
+++ new/yast2-mail-2.18.0/configure 2009-07-20 10:43:00.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.62 for yast2-mail 2.16.7.
+# Generated by GNU Autoconf 2.63 for yast2-mail 2.18.0.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -596,125 +596,125 @@
# Identity of this package.
PACKAGE_NAME='yast2-mail'
PACKAGE_TARNAME='yast2-mail'
-PACKAGE_VERSION='2.16.7'
-PACKAGE_STRING='yast2-mail 2.16.7'
+PACKAGE_VERSION='2.18.0'
+PACKAGE_STRING='yast2-mail 2.18.0'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
ac_default_prefix=/usr
-ac_subst_vars='SHELL
-PATH_SEPARATOR
-PACKAGE_NAME
-PACKAGE_TARNAME
-PACKAGE_VERSION
-PACKAGE_STRING
-PACKAGE_BUGREPORT
-exec_prefix
-prefix
-program_transform_name
-bindir
-sbindir
-libexecdir
-datarootdir
-datadir
-sysconfdir
-sharedstatedir
-localstatedir
-includedir
-oldincludedir
-docdir
-infodir
-htmldir
-dvidir
-pdfdir
-psdir
-libdir
-localedir
-mandir
-DEFS
-ECHO_C
-ECHO_N
-ECHO_T
-LIBS
-build_alias
-host_alias
-target_alias
-build
-build_cpu
-build_vendor
-build_os
-host
-host_cpu
-host_vendor
-host_os
-target
-target_cpu
-target_vendor
-target_os
-INSTALL_PROGRAM
-INSTALL_SCRIPT
-INSTALL_DATA
-am__isrc
-CYGPATH_W
-PACKAGE
-VERSION
-ACLOCAL
-AUTOCONF
-AUTOMAKE
-AUTOHEADER
-MAKEINFO
-install_sh
-STRIP
-INSTALL_STRIP_PROGRAM
-MKDIR_P
-mkdir_p
-AWK
-SET_MAKE
-am__leading_dot
-AMTAR
-am__tar
-am__untar
-RPMNAME
-MAINTAINER
-pkgconfigdir
-pkgconfigdatadir
-yast2dir
-ybindir
-ystartupdir
-plugindir
-potdir
-execcompdir
-ydatadir
-imagedir
-themedir
-clientdir
-moduledir
-yncludedir
-schemadir
-scrconfdir
-agentdir
-desktopdir
-fillupdir
-LN_S
-PKG_CONFIG_PATH
-XGETTEXT
-Y2DEVTOOLS_PREFIX
-CREATE_PKGCONFIG_TRUE
-CREATE_PKGCONFIG_FALSE
-CREATE_PKGCONFIG_NOARCH_TRUE
-CREATE_PKGCONFIG_NOARCH_FALSE
-STYLESHEET_HTML
-STYLESHEET_PDF
-STYLESHEET_CSS
-STYLESHEET_YDOC
-STYLESHEET_YCPDOC
-YCPDOC
-YCPMAKEDEP
-YCPC
-MYEXPECT
-MYRUNTEST
+ac_subst_vars='LTLIBOBJS
LIBOBJS
-LTLIBOBJS'
+MYRUNTEST
+MYEXPECT
+YCPC
+YCPMAKEDEP
+YCPDOC
+STYLESHEET_YCPDOC
+STYLESHEET_YDOC
+STYLESHEET_CSS
+STYLESHEET_PDF
+STYLESHEET_HTML
+CREATE_PKGCONFIG_NOARCH_FALSE
+CREATE_PKGCONFIG_NOARCH_TRUE
+CREATE_PKGCONFIG_FALSE
+CREATE_PKGCONFIG_TRUE
+Y2DEVTOOLS_PREFIX
+XGETTEXT
+PKG_CONFIG_PATH
+LN_S
+fillupdir
+desktopdir
+agentdir
+scrconfdir
+schemadir
+yncludedir
+moduledir
+clientdir
+themedir
+imagedir
+ydatadir
+execcompdir
+potdir
+plugindir
+ystartupdir
+ybindir
+yast2dir
+pkgconfigdatadir
+pkgconfigdir
+MAINTAINER
+RPMNAME
+am__untar
+am__tar
+AMTAR
+am__leading_dot
+SET_MAKE
+AWK
+mkdir_p
+MKDIR_P
+INSTALL_STRIP_PROGRAM
+STRIP
+install_sh
+MAKEINFO
+AUTOHEADER
+AUTOMAKE
+AUTOCONF
+ACLOCAL
+VERSION
+PACKAGE
+CYGPATH_W
+am__isrc
+INSTALL_DATA
+INSTALL_SCRIPT
+INSTALL_PROGRAM
+target_os
+target_vendor
+target_cpu
+target
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
+target_alias
+host_alias
+build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
+PATH_SEPARATOR
+SHELL'
ac_subst_files=''
ac_user_opts='
enable_option_checking
@@ -1146,9 +1146,9 @@
if test -n "$ac_unrecognized_opts"; then
case $enable_option_checking in
no) ;;
- fatal) { $as_echo "$as_me: error: Unrecognized options: $ac_unrecognized_opts" >&2
+ fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
{ (exit 1); exit 1; }; } ;;
- *) $as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2 ;;
+ *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
@@ -1201,7 +1201,7 @@
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
- { $as_echo "$as_me: error: Working directory cannot be determined" >&2
+ { $as_echo "$as_me: error: working directory cannot be determined" >&2
{ (exit 1); exit 1; }; }
test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
{ $as_echo "$as_me: error: pwd does not report name of working directory" >&2
@@ -1276,7 +1276,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-mail 2.16.7 to adapt to many kinds of systems.
+\`configure' configures yast2-mail 2.18.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1347,7 +1347,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-mail 2.16.7:";;
+ short | recursive ) echo "Configuration of yast2-mail 2.18.0:";;
esac
cat <<\_ACEOF
@@ -1427,8 +1427,8 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-mail configure 2.16.7
-generated by GNU Autoconf 2.62
+yast2-mail configure 2.18.0
+generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -1441,8 +1441,8 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-mail $as_me 2.16.7, which was
-generated by GNU Autoconf 2.62. Invocation command line was
+It was created by yast2-mail $as_me 2.18.0, which was
+generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -1565,8 +1565,8 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+ *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
esac
case $ac_var in #(
_ | IFS | as_nl) ;; #(
@@ -1769,6 +1769,8 @@
fi
done
if $ac_cache_corrupted; then
+ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
{ $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
{ { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
@@ -2286,7 +2288,7 @@
# Define the identity of the package.
PACKAGE='yast2-mail'
- VERSION='2.16.7'
+ VERSION='2.18.0'
cat >>confdefs.h <<_ACEOF
@@ -2403,12 +2405,8 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
STRIP=$ac_ct_STRIP
@@ -2514,7 +2512,7 @@
-VERSION="2.16.7"
+VERSION="2.18.0"
RPMNAME="yast2-mail"
MAINTAINER="Peter Varkoly "
@@ -2971,8 +2969,9 @@
$as_echo "$as_val"'`
{ $as_echo "$as_me:$LINENO: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
-if test `eval 'as_val=${'$as_ac_File'}
- $as_echo "$as_val"'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_File'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
:
else
@@ -3105,8 +3104,8 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+ *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
esac
case $ac_var in #(
_ | IFS | as_nl) ;; #(
@@ -3547,8 +3546,8 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-mail $as_me 2.16.7, which was
-generated by GNU Autoconf 2.62. Invocation command line was
+This file was extended by yast2-mail $as_me 2.18.0, which was
+generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -3561,6 +3560,12 @@
_ACEOF
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
+
+
+
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
# Files that config.status was made for.
config_files="$ac_config_files"
@@ -3572,14 +3577,15 @@
\`$as_me' instantiates files from templates according to the
current configuration.
-Usage: $0 [OPTIONS] [FILE]...
+Usage: $0 [OPTION]... [FILE]...
-h, --help print this help, then exit
-V, --version print version number and configuration settings, then exit
- -q, --quiet do not print progress messages
+ -q, --quiet, --silent
+ do not print progress messages
-d, --debug don't remove temporary files
--recheck update $as_me by reconfiguring in the same conditions
- --file=FILE[:TEMPLATE]
+ --file=FILE[:TEMPLATE]
instantiate the configuration file FILE
Configuration files:
@@ -3590,8 +3596,8 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-yast2-mail config.status 2.16.7
-configured by $0, generated by GNU Autoconf 2.62,
+yast2-mail config.status 2.18.0
+configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
Copyright (C) 2008 Free Software Foundation, Inc.
@@ -3783,7 +3789,8 @@
$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
{ (exit 1); exit 1; }; }
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` = $ac_delim_num; then
+ ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+ if test $ac_delim_n = $ac_delim_num; then
break
elif $ac_last_try; then
{ { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -3910,8 +3917,8 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
- :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-$as_echo "$as_me: error: Invalid tag $ac_tag." >&2;}
+ :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
+$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
{ (exit 1); exit 1; }; };;
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
@@ -4211,8 +4218,8 @@
$ac_cs_success || { (exit 1); exit 1; }
fi
if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
- { $as_echo "$as_me:$LINENO: WARNING: Unrecognized options: $ac_unrecognized_opts" >&5
-$as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-mail-2.18.0/configure.in new/yast2-mail-2.18.0/configure.in
--- old/yast2-mail-2.18.0/configure.in 2008-09-10 13:34:18.000000000 +0200
+++ new/yast2-mail-2.18.0/configure.in 2009-07-20 10:42:55.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-mail, 2.16.7, http://bugs.opensuse.org/, yast2-mail)
+AC_INIT(yast2-mail, 2.18.0, http://bugs.opensuse.org/, yast2-mail)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.16.7"
+VERSION="2.18.0"
RPMNAME="yast2-mail"
MAINTAINER="Peter Varkoly "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-mail-2.18.0/src/Mail.ycp new/yast2-mail-2.18.0/src/Mail.ycp
--- old/yast2-mail-2.18.0/src/Mail.ycp 2008-11-16 16:18:20.000000000 +0100
+++ new/yast2-mail-2.18.0/src/Mail.ycp 2009-07-20 12:49:00.000000000 +0200
@@ -11,7 +11,7 @@
* Authors:
* Martin Vidner
*
- * $Id: Mail.ycp 53350 2008-11-16 15:18:19Z varkoly $
+ * $Id: Mail.ycp 58118 2009-07-20 10:49:00Z varkoly $
*
* Representation of the configuration of mail.
* Input and output routines.
@@ -133,16 +133,10 @@
/**
* When should fetchmail run:
* <dl>
- * <dt> `manual <dd>
- * <dt> `ppp <dd> for a ppp conection, /etc/ppp/ip-{up,down}.d
- * <dt> `network <dd> for any network connection,
- * /etc/sysconfig/network/if-{up,down}.d
- * </dl>
- * #22903
- * Unused yet!
- * #37139, just enable rcfetchmail.
+ * <dt> "manual" <dd>
+ * <dt> "daemon" <dd>
*/
- global symbol fetchmail_mode = `manual;
+ global string fetchmail_mode = "manual";
/**
*List of maps:
@@ -333,7 +327,7 @@
* @return Whether rcfetchmail should run
*/
define boolean RunFetchmailGlobally () ``{
- return size (fetchmail) > 0;
+ return ( fetchmail_mode == "daemon" && size (fetchmail) > 0 );
}
/**
@@ -544,9 +538,10 @@
{
return false;
}
- // read 4
- // TODO
- fetchmail_mode = `manual;
+ if( Service::Enabled ("fetchmail") )
+ {
+ fetchmail_mode = "daemon";
+ }
// if we are testing as non-root, it will fail, that's OK
map out = (map) SCR::Execute (.target.bash_output, "/usr/bin/id --user");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-mail-2.18.0/src/MailServerLDAP.pm new/yast2-mail-2.18.0/src/MailServerLDAP.pm
--- old/yast2-mail-2.18.0/src/MailServerLDAP.pm 2008-09-10 18:49:32.000000000 +0200
+++ new/yast2-mail-2.18.0/src/MailServerLDAP.pm 2009-05-28 12:47:12.000000000 +0200
@@ -55,7 +55,8 @@
my $indices = YaPI::LdapServer->ReadIndex( $ldapMap->[2]->{'suffix'} );
my @attrs = ( "SuSEMailClient", "SUSEMailAcceptAddress", "zoneName",
"SuSEMailDomainMasquerading", "relativeDomainName", "suseMailDomainType",
- "suseTLSPerSitePeer", "SuSEMailTransportDestination" );
+ "suseTLSPerSitePeer", "SuSEMailTransportDestination",
+ "suseDeliveryToFolder", "suseDeliveryToMember" );
foreach my $attr (@attrs){
my $curindex;
if (! defined $indices->{$attr} ) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-mail-2.18.0/src/YaPI/MailServer.pm new/yast2-mail-2.18.0/src/YaPI/MailServer.pm
--- old/yast2-mail-2.18.0/src/YaPI/MailServer.pm 2009-03-31 10:39:40.000000000 +0200
+++ new/yast2-mail-2.18.0/src/YaPI/MailServer.pm 2009-07-16 11:27:45.000000000 +0200
@@ -2960,7 +2960,16 @@
write_attribute($MainCf,'mydestination','$myhostname, localhost.$mydomain, $mydomain, ldap:/etc/postfix/ldapmydestination.cf');
write_attribute($MainCf,'virtual_alias_maps', 'ldap:/etc/postfix/ldaplocal_recipient_maps.cf, ldap:/etc/postfix/ldapvirtual_alias_maps_member.cf, ldap:/etc/postfix/ldapvirtual_alias_maps.cf');
write_attribute($MainCf,'virtual_alias_domains','ldap:/etc/postfix/ldapvirtual_alias_domains.cf');
- write_attribute($MainCf,'alias_maps','hash:/etc/aliases, ldap:/etc/postfix/ldapalias_maps_folder.cf, ldap:/etc/postfix/ldapalias_maps.cf');
+ my $alias_maps = read_attribute($MainCf,'alias_maps');
+ if($alias_maps !~ /ldap:\/etc\/postfix\/ldapalias_maps_folder.cf/)
+ {
+ $alias_maps .= ', ldap:/etc/postfix/ldapalias_maps_folder.cf';
+ }
+ if($alias_maps !~ /ldap:\/etc\/postfix\/ldapalias_maps.cf/)
+ {
+ $alias_maps .= ', ldap:/etc/postfix/ldapalias_maps.cf';
+ }
+ write_attribute($MainCf,'alias_maps',$alias_maps);
check_ldap_configuration('transport_maps',$ldapMap);
check_ldap_configuration('smtp_tls_per_site',$ldapMap);
check_ldap_configuration('masquerade_domains',$ldapMap);
@@ -3123,6 +3132,19 @@
return 1;
}
+sub read_attribute {
+ my $config = shift;
+ my $attribute = shift;
+ foreach(@{$config})
+ {
+ if($_->{"key"} eq $attribute)
+ {
+ return $_->{"value"} if defined $_->{"value"};
+ }
+ }
+ return undef;
+}
+
# Internal helper Funktion to check if a needed ldap table is correctly defined
# in the main.cf. If not so the neccesary entries will be created.
sub check_ldap_configuration {
@@ -3169,7 +3191,7 @@
'smtp_tls_per_site' => 'one',
'access' => 'one',
'local_recipient_maps'=> 'one',
- 'alias_maps' => 'one',
+ 'alias_maps' => 'sub',
'alias_maps_folder' => 'one',
'mynetworks' => 'one',
'masquerade_domains' => 'sub',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-mail-2.18.0/src/ui.ycp new/yast2-mail-2.18.0/src/ui.ycp
--- old/yast2-mail-2.18.0/src/ui.ycp 2008-11-16 16:18:20.000000000 +0100
+++ new/yast2-mail-2.18.0/src/ui.ycp 2009-07-20 12:49:01.000000000 +0200
@@ -11,7 +11,7 @@
* Authors:
* Martin Vidner
*
- * $Id: ui.ycp 53350 2008-11-16 15:18:19Z varkoly $
+ * $Id: ui.ycp 58118 2009-07-20 10:49:00Z varkoly $
*
* All user interface functions.
*
@@ -479,6 +479,9 @@
`HSpacing (1),
// pushbutton
`Bottom (`PushButton (`id (`downloading), `opt (`key_F7), _("&Details...")))
+ ),
+ `HBox (
+ `Left(`ComboBox (`id (`fm_start),_("Start &fetchmail"),["manual","daemon"]))
)
);
// frame label: mail downloading (fetchmail)
@@ -533,6 +536,7 @@
WJ_GetWidget (`delivery_mode);
// initialize the widget (set the current value)
CWMFirewallInterfaces::OpenFirewallInit (fw_cwm_widget, "");
+ UI::ChangeWidget(`id(`fm_start),`Value, Mail::fetchmail_mode);
// nothing entered in the dowloading items - don't save them
boolean fm_empty = true;
@@ -557,9 +561,9 @@
}
else if (ret == `next || contains (buttons, ret))
{
+ Mail::fetchmail_mode = (string) UI::QueryWidget(`id (`fm_start), `Value);
// input validation
// For consistency, all querywidgets are done here
-
if (WJ_Validate (widgets))
{
fm_empty =
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org