
Hello community, here is the log from the commit of package yast2-mail checked in at Fri May 4 11:35:09 CEST 2007. -------- --- yast2-mail/yast2-mail.changes 2007-05-02 19:36:42.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-mail/yast2-mail.changes 2007-05-04 10:39:12.678668000 +0200 @@ -1,0 +2,11 @@ +Fri May 4 10:34:08 CEST 2007 - varkoly@suse.de + +- drop package: yast2-mail-alias move modul file MailAlias.ycp to + the package yast2 (269867 - build cycle between yast2-users and yast2-mail) +- new package: yast2-mail-plugins + This package contains the plugins for the yast2 users modul. + This package is only requiered if postfix was configured to use + LDAP as backend. +- 2.15.8 + +------------------------------------------------------------------- Old: ---- yast2-mail-2.15.6.tar.bz2 New: ---- yast2-mail-2.15.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-mail.spec ++++++ --- /var/tmp/diff_new_pack.o26418/_old 2007-05-04 11:34:58.000000000 +0200 +++ /var/tmp/diff_new_pack.o26418/_new 2007-05-04 11:34:58.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-mail (Version 2.15.6) +# spec file for package yast2-mail (Version 2.15.8) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,24 +11,19 @@ # norootforbuild Name: yast2-mail -Version: 2.15.6 -Release: 8 +Version: 2.15.8 +Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-mail-2.15.6.tar.bz2 +Source0: yast2-mail-2.15.8.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 # new firewall interface Requires: yast2 >= 2.11.11 -Requires: yast2-mail-aliases -# for listing local users as alias destinations Requires: yast2-users -# because of listing users too. probably could be hidden in -# yast2-users easily Requires: yast2-ldap -Requires: perl-NetxAP Provides: yast2-config-network:/usr/lib/YaST2/clients/lan_sendmail.ycp Provides: yast2-config-sendmail yast2-config-sendmail-devel Obsoletes: yast2-config-sendmail yast2-config-sendmail-devel @@ -40,6 +35,8 @@ Obsoletes: yast2-trans-mail Provides: yast2-mail-server Obsoletes: yast2-mail-server +Provides: yast2-mail-aliases +Obsoletes: yast2-mail-aliases BuildArchitectures: noarch Summary: YaST2 - Mail Configuration @@ -51,24 +48,25 @@ Authors: -------- - Martin Vidner <mvidner@suse.cz> + Peter Varkoly <varkoly@novell.com> -%package aliases -Summary: YaST2 - Mail Configuration (Aliases) +%package plugins +Summary: YaST2 - Users / Group Plugins for the mail delivery configuration Group: System/YaST +Requires: perl-NetxAP -%description aliases -The YaST2 component for mail configuration. It handles Sendmail, -Postfix, and Fetchmail. +%description plugins +Plugins for the yast2 users modul for enterprise mail server +configuration. Authors: -------- - Martin Vidner <mvidner@suse.cz> + Peter Varkoly <varkoly@novell.com> %prep -%setup -n yast2-mail-2.15.6 +%setup -n yast2-mail-2.15.8 %build %{prefix}/bin/y2tool y2autoconf @@ -96,11 +94,10 @@ %dir /usr/share/YaST2/include/mail /usr/share/YaST2/include/mail/* %dir /usr/share/YaST2/clients -/usr/share/YaST2/clients/* +/usr/share/YaST2/clients/mail* %dir /usr/share/YaST2/modules /usr/share/YaST2/modules/Mail.ybc /usr/share/YaST2/modules/MailServer.ybc -/usr/share/YaST2/modules/UsersPluginMail.pm /usr/share/YaST2/modules/MailServer.ycp /usr/share/YaST2/modules/Mail.ycp %dir /usr/share/YaST2/modules/YaPI @@ -140,11 +137,9 @@ /etc/openldap/schema/suse-mailserver.schema /etc/permissions.d/mail-server* %doc %{prefix}/share/doc/packages/yast2-mail - -%files aliases +#%files aliases %defattr(-,root,root) %dir /usr/share/YaST2/modules -/usr/share/YaST2/modules/MailAliases.y* /usr/share/YaST2/modules/MailTable.pm /usr/share/YaST2/modules/MailTableInclude.pm %dir /usr/share/YaST2/scrconf @@ -155,7 +150,22 @@ /usr/lib/YaST2/servers_non_y2/ag_fetchmailrc /usr/lib/YaST2/servers_non_y2/ag_mailtable +%files plugins +%defattr(-,root,root) +%dir /usr/share/YaST2/modules +/usr/share/YaST2/modules/UsersPluginMail.pm +%dir /usr/share/YaST2/clients +/usr/share/YaST2/clients/users* + %changelog +* Fri May 04 2007 - varkoly@suse.de +- drop package: yast2-mail-alias move modul file MailAlias.ycp to + the package yast2 (269867 - build cycle between yast2-users and yast2-mail) +- new package: yast2-mail-plugins + This package contains the plugins for the yast2 users modul. + This package is only requiered if postfix was configured to use + LDAP as backend. +- 2.15.8 * Wed May 02 2007 - aj@suse.de - Require perl-NetxAP for Net::IMAP (#270647). * Mon Apr 23 2007 - varkoly@suse.de ++++++ yast2-mail-2.15.6.tar.bz2 -> yast2-mail-2.15.8.tar.bz2 ++++++ ++++ 1614 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.6/configure.in new/yast2-mail-2.15.8/configure.in --- old/yast2-mail-2.15.6/configure.in 2007-04-23 10:16:45.000000000 +0200 +++ new/yast2-mail-2.15.8/configure.in 2007-05-03 14:59:06.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-mail, 2.15.5, http://bugs.opensuse.org/, yast2-mail) +AC_INIT(yast2-mail, 2.15.7, http://bugs.opensuse.org/, yast2-mail) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.15.5" +VERSION="2.15.7" RPMNAME="yast2-mail" MAINTAINER="Peter Varkoly <varkoly@novell.com>" @@ -160,7 +160,6 @@ permissions/Makefile src/YaPI/Makefile src/Makefile -users-plugin/Makefile -testsuite/Makefile) +users-plugin/Makefile) AC_OUTPUT 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.6/Makefile.am new/yast2-mail-2.15.8/Makefile.am --- old/yast2-mail-2.15.6/Makefile.am 2007-04-23 10:16:45.000000000 +0200 +++ new/yast2-mail-2.15.8/Makefile.am 2007-05-03 14:59:06.000000000 +0200 @@ -215,4 +215,4 @@ # test ! -d $(srcdir)/po \ # || { $(MAKE) -C po checkpo && $(MAKE) -C po make-pox; } # Contents of ./SUBDIRS -SUBDIRS = agents doc permissions src users-plugin testsuite +SUBDIRS = agents doc permissions src users-plugin 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.6/src/MailAliases.ycp new/yast2-mail-2.15.8/src/MailAliases.ycp --- old/yast2-mail-2.15.6/src/MailAliases.ycp 2007-03-21 12:03:10.000000000 +0100 +++ new/yast2-mail-2.15.8/src/MailAliases.ycp 1970-01-01 01:00:00.000000000 +0100 @@ -1,211 +0,0 @@ -/** - * File: - * modules/Mail.ycp - * - * Package: - * Configuration of mail aliases - * - * Summary: - * Data for configuration of mail aliases, input and output functions. - * - * Authors: - * Martin Vidner <mvidner@suse.cz> - * - * $Id: MailAliases.ycp 35035 2007-01-02 14:35:30Z mvidner $ - * - * Representation of the configuration of mail aliases. - * Input and output routines. - * Separated from Mail.ycp because yast2-users need us. - * Virtusertable/virtual users are not included, arbitrarily. - * - */ - -{ - // Set the name of the module - module "MailAliases"; - - // no translatable strings, no textdomain. - import "MailTable"; - - /* ---------------------------------------------------------------- */ - - /** - * List of maps: $[comment:, alias:, destinations:] (all are strings) - * Except root. - */ - global list<map> aliases = []; - /** - * Separated/joined with aliases by read/write/set/export - */ - global string root_alias = ""; - /** - * Separated/joined with aliases by read/write/set/export - */ - string root_alias_comment = ""; - - /** - * Useful for autoinstall: the provided aliases will be (with - * higher priority) merged with existing ones (presumably system defaults). - */ -// global boolean merge_aliases = false; - - /* ---------------------------------------------------------------- */ - - /** - * Separates aliases into aliases, root_alias and root_alias_comment - */ - global define void FilterRootAlias () ``{ - root_alias = ""; - root_alias_comment = ""; - aliases = filter (map e, aliases, ``{ - if (e["alias"]:"" == "root" ) - { - root_alias = e["destinations"]:""; - root_alias_comment = e["comment"]:""; - return false; - } - return true; - }); - } - - /** - * Read the aliases table (and separate the root alias) - * @return success? - */ - global define boolean ReadAliases () ``{ - list<map> a_raw = MailTable::Read ("aliases"); - aliases = maplist (map e, a_raw, - ``($[ - "comment" : e["comment"]: "", - "alias" : e["key"]: "", - "destinations" : e["value"]: "", - ])); - FilterRootAlias (); - return true; - } - - /** - * @param aliases an alias table - * @return prepend root alias data to aliases, if set - */ - global define list<map> MergeRootAlias (list<map> aliases) ``{ - list<map> ret = aliases; - if (root_alias != "") - { - ret = prepend (ret, $[ - "alias": "root", - "destinations": root_alias, - "comment": root_alias_comment, - ]); - } - return ret; - } - - /* ---------------------------------------------------------------- */ - - /** - * Merges mail tables, which are order-preserving maps. - * First are the entries of the old map, with values updated - * from the new one, then the rest of the new map. - * @param new new table - * @param old old table - * @return merged table - */ - define list<map> mergeTables (list<map> new, list<map> old) ``{ - // make a true map - map new_m = listmap (map e, new, - ``($[ - e["key"]:"" : - [ e["comment"]:"", e["value"]:"" ] - ])); - // update old values - list<map> replaced = maplist (map e, old, ``{ - string k = e["key"]:""; - list cv = new_m[k]:[]; - if (size (cv) > 0) - { - new_m[k] = []; // ok, newly constructed - return $["key": k, "comment": cv[0]:"", "value": cv[1]:""]; - } - else - { - return $["key": k, "comment": e["comment"]:"", "value": e["value"]:""]; - } - }); - // remove already updated values - list<map> filtered = filter (map e, new, ``( - size (new_m[ e["key"]:"" ]:[]) > 0) - ); - return flatten ([replaced, filtered]); - } - - /** - * Part of Write. - * @return success - * @see SetRootAlias - */ - global define boolean WriteAliases () ``{ - // aliases - string alias_path = "aliases"; - list<map> a_raw = maplist (map e, MergeRootAlias (aliases), - ``($[ - "comment" : e["comment"]:"", - "key" : e["alias"]:"", - "value" : e["destinations"]:"", - ])); -// if (merge_aliases) -// { -// a_raw = mergeTables (a_raw, MailTable::Read (alias_path)); -// } - MailTable::Write ("aliases", a_raw); - return true; - } - - - /* ---------------------------------------------------------------- */ - - /** - * For use by the Users package. - * Does not rely on the internal state, first calls the agent. - * @return eg. "joe, \\root", "" if not defined - */ - global define string GetRootAlias () ``{ - if (!ReadAliases ()) - { - return ""; - } - return root_alias; - } - - - /** - * For use by the Users package. - * Does not use the internal state, just calls the agent. - * SuSEconfig or newaliases is NOT called! - * (TODO: what if it is called while the main module is running?) - * Errors are reported via Report::Error. - * @param destinations The new alias. If "", it is removed. - * @return true on success - */ - global define boolean SetRootAlias (string destinations) ``{ - if (!ReadAliases ()) - { - return false; - } - - root_alias = destinations; - root_alias_comment = ""; // TODO: "created by the ... yast2 module"? - - if (!WriteAliases ()) - { - return false; - } - - if (! MailTable::Flush ("aliases")) - { - 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.6/src/MailServer.ycp new/yast2-mail-2.15.8/src/MailServer.ycp --- old/yast2-mail-2.15.6/src/MailServer.ycp 2007-04-12 15:05:15.000000000 +0200 +++ new/yast2-mail-2.15.8/src/MailServer.ycp 2007-05-04 08:53:11.000000000 +0200 @@ -161,6 +161,7 @@ global boolean postfix_installed = false; global boolean fetchmail_installed = false; global boolean sasl_installed = false; +global boolean plugins_installed = false; /* * Help funktion to check the DNS Settings @@ -311,6 +312,7 @@ 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.") + @@ -334,9 +336,6 @@ return false; } } - if( SCR::Read(.target.size, "/var/adm/yast2-mail-server-used") < 0) { - YaPI::MailServer::ResetMailServer(MailServer::AdminPassword,MailServer::LDAPDefaults); - } if(!sasl_installed) { if ( Report::AnyQuestion ("",_("You have not installed all needed packages.") + @@ -352,6 +351,24 @@ 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; + } + } + if( SCR::Read(.target.size, "/var/adm/yast2-mail-server-used") < 0) { + YaPI::MailServer::ResetMailServer(MailServer::AdminPassword,MailServer::LDAPDefaults); + } NetworkDevices::Read(); map<string,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.6/src/Makefile.am new/yast2-mail-2.15.8/src/Makefile.am --- old/yast2-mail-2.15.6/src/Makefile.am 2007-04-20 21:58:45.000000000 +0200 +++ new/yast2-mail-2.15.8/src/Makefile.am 2007-05-03 14:52:18.000000000 +0200 @@ -1,7 +1,7 @@ # # Makefile.am for y2c_mail/src # -# $Id: Makefile.am 37642 2007-04-20 19:06:52Z varkoly $ +# $Id: Makefile.am 37805 2007-05-03 12:52:16Z varkoly $ # SUBDIRS = YaPI @@ -33,7 +33,6 @@ mail.desktop module_DATA = \ - MailAliases.ycp \ MailTable.pm \ MailTableInclude.pm \ Mail.ycp \ 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.6/SUBDIRS new/yast2-mail-2.15.8/SUBDIRS --- old/yast2-mail-2.15.6/SUBDIRS 2007-04-23 08:59:12.000000000 +0200 +++ new/yast2-mail-2.15.8/SUBDIRS 2007-05-03 14:59:03.000000000 +0200 @@ -1 +1 @@ -agents doc permissions src users-plugin testsuite +agents doc permissions src users-plugin 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.6/testsuite/lib/yast2_epag.exp new/yast2-mail-2.15.8/testsuite/lib/yast2_epag.exp --- old/yast2-mail-2.15.6/testsuite/lib/yast2_epag.exp 2007-03-21 12:03:10.000000000 +0100 +++ new/yast2-mail-2.15.8/testsuite/lib/yast2_epag.exp 1970-01-01 01:00:00.000000000 +0100 @@ -1,88 +0,0 @@ -# -# test library for External Parser AGents -# Martin Vidner <mvidner@suse.cz> -# adapted from testsuite-run of yast2-testsuite -# - - -proc run_epag_tests { agent_basename } { - global srcdir - - set test_cases [lsort [glob $srcdir/tests.epag/*.run]] - set agent "$srcdir/../agents/$agent_basename" - - foreach test_case $test_cases { - run_case $test_case $agent - } -} - -# helper -proc llast { alist } { - return [lindex $alist [expr [llength $alist]-1]] -} - -# $run - the test case control file -# $ag - agent executable -proc run_case { run ag } { - global srcdir - - # extract basename and check extension - set path [split $run "/"] - set filename [llast $path] - set filename_l [split $filename "."] - # setup filenames - set base_name [lindex $filename_l 0] - # TODO better path, using srcdir - set tests_ag "$srcdir/tests.epag" - # TODO better path, using srcdir - set tmpdir "./tmp" - # $run is the name of the original testfile with absolute path - # tests.ag/$filename is the name of the original testfile - # with relative path, relative to the testsuite directory - - set r_data_name "$tests_ag/$base_name.r.data" - set rw_ycp_name "$tests_ag/$base_name.rw.ycp" - set rw_ycp_tmp_name "$tmpdir/$base_name.rw.ycp.tmp" - set w_data_name "$tests_ag/$base_name.w.data" - set w_data_tmp_name "$tmpdir/$base_name.w.data.tmp" - - # indented by one space - puts " Running $run ..." - - if {[regexp ".*\.r\.run" $run]} { - if {[run-one "read" $r_data_name $rw_ycp_name $rw_ycp_tmp_name $run $ag] != 0 } { - return -1 - } - } elseif {[regexp ".*\.w\.run" $run]} { - if {[run-one "write" $rw_ycp_name $w_data_name $w_data_tmp_name $run $ag] != 0} { - return -1 - } - } else { - warning "Don't know how to run $run" - } - - return 0 -} - -proc run-one { mode in_f out_f out_tmp_f run ag } { - # run the test - - set result "" - set oops [catch { - set result [exec "run/runtest-epag.sh" "$mode" "$in_f" "$out_f" "$out_tmp_f" "$run" "$ag" ] - } catched] - - if {$oops != 0} { - fail "Test case failed for $run:\n$catched" - return -1 - } - - # check return code - ??? - if {$result != ""} { - warning "Compilation of $run results in '$result'" - return -1 - } - - pass $run - return 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.6/testsuite/Makefile.am new/yast2-mail-2.15.8/testsuite/Makefile.am --- old/yast2-mail-2.15.6/testsuite/Makefile.am 2007-03-21 12:03:11.000000000 +0100 +++ new/yast2-mail-2.15.8/testsuite/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,30 +0,0 @@ -# -# Makefile.am for .../testsuite -# - -AUTOMAKE_OPTIONS = dejagnu - -ycp_testfiles = $(wildcard tests/*.out) $(wildcard tests/*.err) $(wildcard tests/*.ycp) $(wildcard tests/*.yh) - -epag_misc = lib/yast2_epag.exp run/runtest-epag.sh -epag_testfiles = $(wildcard $(RPMNAME).test/ag_*.exp tests.epag/*.[rw].run tests.epag/*.[rw].data tests.epag/*.rw.ycp) -EXTRA_DIST = $(ycp_testfiles) $(epag_testfiles) $(epag_misc) - -testsuite_prepare = @ydatadir@/testsuite/Makefile.testsuite - -# explicitly list files we want for the ycp tests -# don't mess with: Makefile.am .cvsignore -all-local: $(testsuite_prepare) - make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) \ - dirs \ - config/default.exp config/unix.exp config/unknown.exp \ - run/runtest.sh $(RPMNAME).test/testsuite.exp - mkdir -p tmp - -clean-local: $(testsuite_prepare) - make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) clean - -check-local: $(testsuite_prepare) - make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) check - -# EOF 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.6/testsuite/run/runtest-epag.sh new/yast2-mail-2.15.8/testsuite/run/runtest-epag.sh --- old/yast2-mail-2.15.6/testsuite/run/runtest-epag.sh 2007-04-23 10:17:36.000000000 +0200 +++ new/yast2-mail-2.15.8/testsuite/run/runtest-epag.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,53 +0,0 @@ -#! /bin/bash -# $Id: runtest-epag.sh 13709 2004-01-30 16:08:25Z mvidner $ - -# params: -# $1 "read" or "write" -# $2 input file name -# $3 output file name (template, expected) -# $4 output file name (temporary, actual) -# $5 agent commands file -# $6 full path of the agent to run -set -o errexit - -# kludge: break up the output into lines -ADD_LF_BEFORE_MAP='s/\$\[/\ -\$\[/g' -ADD_LF_AFTER_LAST_COMMA='s/,\] $/,\ -\] /g' -ADD_LF_AFTER_COMMA_OR_COLON='s/\([:,]\)/\1\ -/g' - -NORMALIZE="ycpc -l - -E -" - -function run() { - IN=$2 - OUT=$3 - OUT_TMP=$4 - export IN OUT OUT_TMP - sh $5 \ - | $NORMALIZE \ - | $6 -l /dev/stderr \ - | $NORMALIZE \ - | sed -e 1d \ - | sed -e "$ADD_LF_BEFORE_MAP" -e "$ADD_LF_AFTER_LAST_COMMA" #-e "$ADD_LF_AFTER_COMMA_OR_COLON" -} - -# MAIN -case $1 in - read) - run ${1+"$@"} > "$4" - diff -u "$3" "$4" - ;; - write) - # test it twice - with the file existing and without it - rm -f "$4" - for i in 1 2; do - run ${1+"$@"} > /dev/null - diff -u "$3" "$4" - done - ;; - *) - echo "$0: Expecting 'read' or 'write' as \$1, got '$1'" - exit 1 -esac 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.6/testsuite/tests/aliases.out new/yast2-mail-2.15.8/testsuite/tests/aliases.out --- old/yast2-mail-2.15.6/testsuite/tests/aliases.out 2007-03-21 12:03:10.000000000 +0100 +++ new/yast2-mail-2.15.8/testsuite/tests/aliases.out 1970-01-01 01:00:00.000000000 +0100 @@ -1,7 +0,0 @@ -#baz -foo: bar -#kuk -root: leaf -#baz2 -foo2: bar2 -#trailing comment 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.6/testsuite/tests/MailServer.out new/yast2-mail-2.15.8/testsuite/tests/MailServer.out --- old/yast2-mail-2.15.6/testsuite/tests/MailServer.out 2007-04-12 15:05:15.000000000 +0200 +++ new/yast2-mail-2.15.8/testsuite/tests/MailServer.out 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -Dump MailServer::Modified -Return false 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.6/testsuite/tests/MailServer.ycp new/yast2-mail-2.15.8/testsuite/tests/MailServer.ycp --- old/yast2-mail-2.15.6/testsuite/tests/MailServer.ycp 2007-04-12 15:05:15.000000000 +0200 +++ new/yast2-mail-2.15.8/testsuite/tests/MailServer.ycp 1970-01-01 01:00:00.000000000 +0100 @@ -1,13 +0,0 @@ -{ - -// testedfiles: MailServer.ycp - -include "testsuite.ycp"; -TESTSUITE_INIT([], nil); - -import "MailServer"; - -DUMP("MailServer::Modified"); -TEST(``(MailServer::Modified()), [], nil); - -} 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.6/testsuite/tests/mergeTables.out new/yast2-mail-2.15.8/testsuite/tests/mergeTables.out --- old/yast2-mail-2.15.6/testsuite/tests/mergeTables.out 2007-03-21 12:03:10.000000000 +0100 +++ new/yast2-mail-2.15.8/testsuite/tests/mergeTables.out 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -Return [] -Return [$["comment":" I am r00t!", "key":"root", "value":"auser"], $["comment":" blah", "key":"B.User", "value":"buser"], $["comment":" direct", "key":"usenet", "value":"root"], $["comment":"", "key":"A.User", "value":"auser"], $["comment":" direct", "key":"newsadmin", "value":"root"]] -Return [$["comment":" Basic system aliases that MUST be present.\n", "key":"postmaster", "value":"root"], $["comment":"", "key":"mailer-daemon", "value":"postmaster"], $["comment":" amavis\n", "key":"virusalert", "value":"root"], $["comment":" General redirections for pseudo accounts in /etc/passwd.\n", "key":"administrator", "value":"root"], $["comment":"", "key":"daemon", "value":"root"], $["comment":"", "key":"nobody", "value":"root"], $["comment":" \"bin\" used to be in /etc/passwd\n", "key":"bin", "value":"root"], $["comment":" Further well-known aliases for dns/news/ftp/mail/fax/web/gnats.\n", "key":"newsadm", "value":"news"], $["comment":"", "key":"newsadmin", "value":"news"], $["comment":"", "key":"usenet", "value":"news"]] -Return [$["comment":" Basic system aliases that MUST be present.\n", "key":"postmaster", "value":"root"], $["comment":"", "key":"mailer-daemon", "value":"postmaster"], $["comment":" amavis\n", "key":"virusalert", "value":"root"], $["comment":" General redirections for pseudo accounts in /etc/passwd.\n", "key":"administrator", "value":"root"], $["comment":"", "key":"daemon", "value":"root"], $["comment":"", "key":"nobody", "value":"root"], $["comment":" \"bin\" used to be in /etc/passwd\n", "key":"bin", "value":"root"], $["comment":" Further well-known aliases for dns/news/ftp/mail/fax/web/gnats.\n", "key":"newsadm", "value":"news"], $["comment":" direct", "key":"newsadmin", "value":"root"], $["comment":" direct", "key":"usenet", "value":"root"], $["comment":" I am r00t!", "key":"root", "value":"auser"], $["comment":" blah", "key":"B.User", "value":"buser"], $["comment":"", "key":"A.User", "value":"auser"]] 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.6/testsuite/tests/mergeTables.ycp new/yast2-mail-2.15.8/testsuite/tests/mergeTables.ycp --- old/yast2-mail-2.15.6/testsuite/tests/mergeTables.ycp 2007-03-21 12:03:10.000000000 +0100 +++ new/yast2-mail-2.15.8/testsuite/tests/mergeTables.ycp 1970-01-01 01:00:00.000000000 +0100 @@ -1,47 +0,0 @@ -/** - * Module: - * Mail configuration - * - * Summary: - * Testsuite - * - * Authors: - * Martin Vidner <mvidner@suse.cz> - * - * $Id: mergeTables.ycp 13711 2004-01-30 16:53:07Z mvidner $ - */ -{ - include "testsuite.ycp"; - TESTSUITE_INIT ([ $[], $[], $[] ], nil); - import "MailAliases"; - - list<map> old1 = [ -$["comment":" Basic system aliases that MUST be present. -","value":"root","key":"postmaster",] , -$["comment":"","value":"postmaster","key":"mailer-daemon",] , -$["comment":" amavis -","value":"root","key":"virusalert",] , -$["comment":" General redirections for pseudo accounts in /etc/passwd. -","value":"root","key":"administrator",] , -$["comment":"","value":"root","key":"daemon",] , -$["comment":"","value":"root","key":"nobody",] , -$["comment":" \"bin\" used to be in /etc/passwd -","value":"root","key":"bin",] , -$["comment":" Further well-known aliases for dns/news/ftp/mail/fax/web/gnats. -","value":"news","key":"newsadm",] , -$["comment":"","value":"news","key":"newsadmin",] , -$["comment":"","value":"news","key":"usenet",] , -]; - list<map> new1 = [ - $[ "key": "root", "value": "auser", "comment": " I am r00t!",], - $[ "key": "B.User", "value": "buser", "comment": " blah",], - $[ "key": "usenet", "value": "root", "comment": " direct",], - $[ "key": "A.User", "value": "auser", "comment": "",], - $[ "key": "newsadmin", "value": "root", "comment": " direct",], - ]; - - TEST (``(MailAliases::mergeTables ([], [])), [], nil); - TEST (``(MailAliases::mergeTables (new1, [])), [], nil); - TEST (``(MailAliases::mergeTables ([], old1)), [], nil); - TEST (``(MailAliases::mergeTables (new1, old1)), [], nil); -} 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.6/testsuite/tests/readwrite.out new/yast2-mail-2.15.8/testsuite/tests/readwrite.out --- old/yast2-mail-2.15.6/testsuite/tests/readwrite.out 2007-03-21 12:03:10.000000000 +0100 +++ new/yast2-mail-2.15.8/testsuite/tests/readwrite.out 1970-01-01 01:00:00.000000000 +0100 @@ -1,66 +0,0 @@ -Execute .target.bash "rpm -q --whatprovides sendmail" 0 -Read .sysconfig.mail.MAIL_CREATE_CONFIG "yes" -Read .sysconfig.mail.SMTPD_LISTEN_REMOTE "yes" -Execute .target.bash "rpm -q --whatprovides SuSEfirewall2" 0 -Read .init.scripts.exists "SuSEfirewall2_init" true -Read .init.scripts.runlevel "SuSEfirewall2_init" $["SuSEfirewall2_final":$["start":[]], "SuSEfirewall2_init":$["start":[]], "SuSEfirewall2_setup":$["start":[]], "amavis":$["start":["3", "5"], "stop":["3", "5"]], "fetchmail":$["start":["3", "5"], "stop":["3", "5"]], "postfix":$["start":["3", "5"], "stop":["3", "5"]], "sendmail":$["start":["3", "5"], "stop":["3", "5"]]] -Read .init.scripts.exists "SuSEfirewall2_init" true -Execute .target.bash "/etc/init.d/SuSEfirewall2_init status" $["TERM":"raw"] 0 -Read .sysconfig.sendmail.SENDMAIL_NOCANONIFY "no" -Read .sysconfig.sendmail.SENDMAIL_EXPENSIVE "no" -Execute .target.bash "rpm -q --whatprovides amavisd-new" 0 -Read .sysconfig.amavis.USE_AMAVIS "yes" -Read .sysconfig.sendmail.SENDMAIL_LOCALHOST "" -Read .sysconfig.sendmail.SENDMAIL_SMARTHOST "" -Read .sysconfig.mail.FROM_HEADER "foo.test" -Read .sysconfig.sendmail.MASQUERADE_DOMAINS "" -Execute .target.bash_output "/usr/bin/id --user" $["exit":0, "stderr":"", "stdout":""] -Read .mail.fetchmail.accounts [] -Read .mail.sendmail.auth.accounts [$["more":1, "password":"p", "server":"s", "user":"u"]] -Read .sysconfig.sendmail.SMTP_AUTH_MECHANISMS "" -Return true -Write .sysconfig.mail.MAIL_CREATE_CONFIG "yes" true -Write .sysconfig.mail.SMTPD_LISTEN_REMOTE "yes" true -Write .sysconfig.sendmail.SENDMAIL_NOCANONIFY "no" true -Write .sysconfig.sendmail.SENDMAIL_EXPENSIVE "no" true -Read .init.scripts.exists "sendmail" true -Read .init.scripts.exists "sendmail" true -Read .init.scripts.exists "sendmail" true -Read .init.scripts.runlevel "sendmail" $["SuSEfirewall2_final":$["start":[]], "SuSEfirewall2_init":$["start":[]], "SuSEfirewall2_setup":$["start":[]], "amavis":$["start":["3", "5"], "stop":["3", "5"]], "fetchmail":$["start":["3", "5"], "stop":["3", "5"]], "postfix":$["start":["3", "5"], "stop":["3", "5"]], "sendmail":$["start":["3", "5"], "stop":["3", "5"]]] -Read .init.scripts.comment "sendmail" $["amavis":$[], "fetchmail":$[], "postfix":$[], "sendmail":$[]] -Write .sysconfig.amavis.USE_AMAVIS "yes" true -Read .init.scripts.exists "amavis" true -Read .init.scripts.exists "amavis" true -Read .init.scripts.runlevel "amavis" $["SuSEfirewall2_final":$["start":[]], "SuSEfirewall2_init":$["start":[]], "SuSEfirewall2_setup":$["start":[]], "amavis":$["start":["3", "5"], "stop":["3", "5"]], "fetchmail":$["start":["3", "5"], "stop":["3", "5"]], "postfix":$["start":["3", "5"], "stop":["3", "5"]], "sendmail":$["start":["3", "5"], "stop":["3", "5"]]] -Read .init.scripts.comment "amavis" $["amavis":$[], "fetchmail":$[], "postfix":$[], "sendmail":$[]] -Read .sysconfig.sendmail.SENDMAIL_ARGS "-L sendmail -Am -bd -q30m -om" -Write .sysconfig.sendmail.SENDMAIL_LOCALHOST "" true -Write .sysconfig.sendmail.SENDMAIL_SMARTHOST "" true -Write .sysconfig.mail.FROM_HEADER "foo.test" true -Write .sysconfig.sendmail.MASQUERADE_DOMAINS "" true -Write .mail.fetchmail.accounts [] true -Write .mail.fetchmail nil true -Read .init.scripts.exists "fetchmail" true -Read .init.scripts.exists "fetchmail" true -Read .init.scripts.exists "fetchmail" true -Read .init.scripts.runlevel "fetchmail" $["SuSEfirewall2_final":$["start":[]], "SuSEfirewall2_init":$["start":[]], "SuSEfirewall2_setup":$["start":[]], "amavis":$["start":["3", "5"], "stop":["3", "5"]], "fetchmail":$["start":["3", "5"], "stop":["3", "5"]], "postfix":$["start":["3", "5"], "stop":["3", "5"]], "sendmail":$["start":["3", "5"], "stop":["3", "5"]]] -Read .init.scripts.comment "fetchmail" $["amavis":$[], "fetchmail":$[], "postfix":$[], "sendmail":$[]] -Execute .target.bash_output "/sbin/insserv -r /etc/init.d/fetchmail" $["exit":0, "stderr":"", "stdout":""] -Write .mail.sendmail.auth.accounts [$["more":1, "password":"p", "server":"s", "user":"u"]] true -Write .sysconfig.sendmail.SMTP_AUTH_MECHANISMS "plain gssapi digest-md5 cram-md5" true -Write .mail.sendmail.auth nil true -Write .sysconfig.amavis nil true -Write .sysconfig.mail nil true -Write .sysconfig.sendmail nil true -Execute .target.bash "/sbin/SuSEconfig --module sendmail" 0 -Read .init.scripts.exists "amavis" true -Execute .target.bash "/etc/init.d/amavis stop" $["TERM":"raw"] 0 -Read .init.scripts.exists "amavis" true -Execute .target.bash "/etc/init.d/amavis start" $["TERM":"raw"] 0 -Read .init.scripts.exists "fetchmail" true -Execute .target.bash "/etc/init.d/fetchmail stop" $["TERM":"raw"] 0 -Read .init.scripts.exists "sendmail" true -Execute .target.bash "/etc/init.d/sendmail restart" $["TERM":"raw"] 0 -Read .init.scripts.exists "SuSEfirewall2_init" true -Execute .target.bash "/etc/init.d/SuSEfirewall2_init status" $["TERM":"raw"] 0 -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.6/testsuite/tests/readwrite.ycp new/yast2-mail-2.15.8/testsuite/tests/readwrite.ycp --- old/yast2-mail-2.15.6/testsuite/tests/readwrite.ycp 2007-03-21 12:03:10.000000000 +0100 +++ new/yast2-mail-2.15.8/testsuite/tests/readwrite.ycp 1970-01-01 01:00:00.000000000 +0100 @@ -1,179 +0,0 @@ -/** - * Module: - * Mail configuration - * Summary: - * Testsuite - * Authors: - * Martin Vidner <mvidner@suse.cz> - * - * $Id: readwrite.ycp 35039 2007-01-03 12:39:54Z mvidner $ - */ -{ - // testedfiles: Mail.ycp MailTable.pm MailTableInclude.pm MailAliases.ycp Package.ycp PackageSystem.ycp Report.ycp Require.ycp Service.ycp Testsuite.ycp - - include "testsuite.ycp"; - - map READ = $[ - // Runlevel: - "init": $[ - "scripts": $[ - "exists": true, - "runlevel": $[ - "sendmail": $[ - "start": [ "3", "5"], - "stop": [ "3", "5"], - ], - "postfix": $[ - "start": [ "3", "5"], - "stop": [ "3", "5"], - ], - "amavis": $[ - "start": [ "3", "5"], - "stop": [ "3", "5"], - ], - "fetchmail": $[ - "start": [ "3", "5"], - "stop": [ "3", "5"], - ], - "SuSEfirewall2_init": $[ - "start": [], - ], - "SuSEfirewall2_setup": $[ - "start": [], - ], - "SuSEfirewall2_final": $[ - "start": [], - ], - ], - // their contents is not important for ServiceAdjust - "comment": $[ - "sendmail": $[], - "postfix": $[], - "amavis": $[], - "fetchmail": $[], - ], - ], - ], - // Mail itself: - "sysconfig": $[ - "mail": $[ - "MAIL_CREATE_CONFIG": "yes", - "SMTPD_LISTEN_REMOTE": "yes", - "FROM_HEADER": "foo.test", - ], - "amavis": $[ - "USE_AMAVIS": "yes", - ], - "sendmail": $[ - "SENDMAIL_NOCANONIFY": "no", - "SENDMAIL_EXPENSIVE": "no", - "SENDMAIL_LOCALHOST": "", - "SENDMAIL_SMARTHOST": "", - "MASQUERADE_DOMAINS": "", - // TODO: check for a new default in the installed system? - // (evade the dummy agent, neededforbuild sendmail) - "SENDMAIL_ARGS": "-L sendmail -Am -bd -q30m -om", - "SMTP_AUTH_MECHANISMS": "", - ], - ], - "mail": $[ - "sendmail": $[ - "generics": $[ - "table": [ - ], - ], - "virtuser": $[ - "table": [ - ], - ], - "auth": $[ - "accounts": [ - $["server": "s", "user": "u", "password": "p", - "more": 1], - ], - ], - ], - "aliases": $[ - "table": [ - ], - ], - "fetchmail": $[ - "accounts": [ - ], - ], - ], - ]; - - map WRITE = $[ - ]; - - map EXECUTE_0 = $[ - "target": $[ - "bash": 0, - "bash_output": $[ - "exit": 0, - "stdout": "", - "stderr": "", - ], - ], - ]; - - map EXECUTE_1 = $[ - "target": $[ - "bash": 1, - "bash_output": $[ - "exit": 0, - "stdout": "", - "stderr": "", - ], - ], - ]; - - map EXECUTE_INIT = $[ - "target": $[ - "bash": 1, - "bash_output": $[ - "exit":0, "stderr":"", "stdout":"charmap=\"UTF-8\"\n"] - ], - ]; - - map READ_INIT = $[ - "console" : $[ - "CONSOLE_ENCODING" : "en_US.UTF-8" - ], - "target" : $[ - "size" : 1, - ], - ]; - - // added testsuite init, because of firewall - TESTSUITE_INIT ([READ_INIT, $[], EXECUTE_INIT], nil); - - import "Progress"; - import "Mail"; - import "MailTable"; - - MailTable::SetFileName ("aliases", "tests/aliases.out"); - MailTable::SetFileName ("sendmail.generics", "tests/generics.out"); - MailTable::SetFileName ("sendmail.virtuser", "tests/virtuser.out"); - - -// Pkg::FAKE (`IsProvided, $["sendmail": true, "amavis-sendmail": true, -// "amavis-postfix": false]); - - block<boolean> dont_abort = ``{return false;}; - Progress::off (); - TEST (``(Mail::Read (dont_abort)), [READ, WRITE, [ - EXECUTE_0, //rpm sendmail - EXECUTE_0, //rpm amavisd-new - ]], nil); - Mail::write_only = false; - TEST (``(Mail::Write (dont_abort)), [READ, WRITE, [ - //EXECUTE_1, //rpm amavis-postfix - EXECUTE_0, //SuSEconfig - EXECUTE_0, //amavis stop - EXECUTE_0, //amavis start - EXECUTE_0, //sendmail restart - ]], nil); - -} 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.6/testsuite/tests/rootalias.out new/yast2-mail-2.15.8/testsuite/tests/rootalias.out --- old/yast2-mail-2.15.6/testsuite/tests/rootalias.out 2007-03-21 12:03:10.000000000 +0100 +++ new/yast2-mail-2.15.8/testsuite/tests/rootalias.out 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -Dump sendmail -Return leaf -Return true -Return true -Dump postfix -Return -Return true -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.6/testsuite/tests/rootalias.ycp new/yast2-mail-2.15.8/testsuite/tests/rootalias.ycp --- old/yast2-mail-2.15.6/testsuite/tests/rootalias.ycp 2007-03-21 12:03:10.000000000 +0100 +++ new/yast2-mail-2.15.8/testsuite/tests/rootalias.ycp 1970-01-01 01:00:00.000000000 +0100 @@ -1,62 +0,0 @@ -/** - * Module: - * NIS client configuration - * - * Summary: - * Testsuite - * - * Authors: - * Martin Vidner <mvidner@suse.cz> - * - * $Id: rootalias.ycp 35039 2007-01-03 12:39:54Z mvidner $ - */ -{ - include "testsuite.ycp"; - TESTSUITE_INIT ([ $[], $[], $[] ], nil); - import "MailTable"; - import "MailAliases"; - - MailTable::SetFileName ("aliases", "tests/aliases.out"); - - // the test data is a bit convoluted because formerly - // the data was read from .mail.{sendmail,postfix}.aliases.table - - map READ_s = $[ - // targetpkg: - "targetpkg": $[ - // sendmail - "installed": true, - ], - ]; - - map READ_p1 = $[ - // targetpkg: - "targetpkg": $[ - // sendmail - "installed": false, - ], - ]; - - map READ_p2 = $[ - // targetpkg: - "targetpkg": $[ - // postfix - "installed": true, - ], - ]; - - map WRITE = $[ - ]; - - DUMP ("sendmail"); - TEST (``(MailAliases::GetRootAlias ()), [READ_s], nil); - TEST (``(MailAliases::SetRootAlias ("ruut")), [READ_s], nil); - TEST (``(MailAliases::SetRootAlias ("")), [READ_s], nil); - - DUMP ("postfix"); - TEST (``(MailAliases::GetRootAlias ()), [[ READ_p1, READ_p2]], nil); - // apparently the dumb^H^H^H^Hdummy aggent reads from the first map - // while there's input. - TEST (``(MailAliases::SetRootAlias ("ruut")), [[ READ_p1, READ_p2]], nil); - TEST (``(MailAliases::SetRootAlias ("")), [[ READ_p1, READ_p2]], nil); -} 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.6/testsuite/tests.epag/fm1.r.data new/yast2-mail-2.15.8/testsuite/tests.epag/fm1.r.data --- old/yast2-mail-2.15.6/testsuite/tests.epag/fm1.r.data 2007-03-21 12:03:10.000000000 +0100 +++ new/yast2-mail-2.15.8/testsuite/tests.epag/fm1.r.data 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -# Edit carefully, see /usr/share/doc/packages/yast2-config-mail/fetchmailrc.txt -# empty line - -# global option -set syslog; -# empty statement -; -# ordinary entry -poll "pop3.foo.com" protocol AUTO: - user "barbar" there with password "xxxxxx" is "bar" here; -# server option with a colon, protocol -poll "pop3.foo.com" protocol pop3 envelope "X-Envelope-To:" : - user "barbar" there with password "xxxxxx" is "bar" here; -# comment filtering -skip "pop3.foo.com" protocol AUTO: - user 'bar#bar' there with password "xxx#xxx" is "qux" here; # blah -# strings -# TODO: allow "foo\"bar" -poll 'pop3\056mail\46foo\x2ecom' protocol AUTO: - user "barbar" there with password "\\'\59xxxxx" is "bar" here; 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.6/testsuite/tests.epag/fm1.r.run new/yast2-mail-2.15.8/testsuite/tests.epag/fm1.r.run --- old/yast2-mail-2.15.6/testsuite/tests.epag/fm1.r.run 2007-03-21 12:03:10.000000000 +0100 +++ new/yast2-mail-2.15.8/testsuite/tests.epag/fm1.r.run 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -cat << END -\`Fetchmail (\$["filename": "$IN"]) -\`Read (.accounts) -END 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.6/testsuite/tests.epag/fm1.rw.ycp new/yast2-mail-2.15.8/testsuite/tests.epag/fm1.rw.ycp --- old/yast2-mail-2.15.6/testsuite/tests.epag/fm1.rw.ycp 2007-03-21 12:03:10.000000000 +0100 +++ new/yast2-mail-2.15.8/testsuite/tests.epag/fm1.rw.ycp 1970-01-01 01:00:00.000000000 +0100 @@ -1,5 +0,0 @@ -[ -$["enabled":true, "local_user":"bar", "other_server_options":"", "other_user_options":"", "password":"xxxxxx", "protocol":"AUTO", "remote_user":"barbar", "server":"pop3.foo.com"], -$["enabled":true, "local_user":"bar", "other_server_options":"envelope \"X-Envelope-To:\" ", "other_user_options":"", "password":"xxxxxx", "protocol":"POP3", "remote_user":"barbar", "server":"pop3.foo.com"], -$["enabled":false, "local_user":"qux", "other_server_options":"", "other_user_options":"", "password":"xxx#xxx", "protocol":"AUTO", "remote_user":"bar#bar", "server":"pop3.foo.com"], -$["enabled":true, "local_user":"bar", "other_server_options":"", "other_user_options":"", "password":"\\';xxxxx", "protocol":"AUTO", "remote_user":"barbar", "server":"pop3.mail.foo.com"]] 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.6/testsuite/tests.epag/fm1.w.data new/yast2-mail-2.15.8/testsuite/tests.epag/fm1.w.data --- old/yast2-mail-2.15.6/testsuite/tests.epag/fm1.w.data 2007-03-21 12:03:10.000000000 +0100 +++ new/yast2-mail-2.15.8/testsuite/tests.epag/fm1.w.data 1970-01-01 01:00:00.000000000 +0100 @@ -1,5 +0,0 @@ -# Edit carefully, see /usr/share/doc/packages/yast2-mail/fetchmailrc.txt -poll "pop3.foo.com" protocol AUTO : user "barbar" there with password "xxxxxx" is "bar" here ; -poll "pop3.foo.com" protocol POP3 envelope "X-Envelope-To:" : user "barbar" there with password "xxxxxx" is "bar" here ; -skip "pop3.foo.com" protocol AUTO : user "bar#bar" there with password "xxx#xxx" is "qux" here ; -poll "pop3.mail.foo.com" protocol AUTO : user "barbar" there with password "\\'\59xxxxx" is "bar" here ; 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.6/testsuite/tests.epag/fm1.w.run new/yast2-mail-2.15.8/testsuite/tests.epag/fm1.w.run --- old/yast2-mail-2.15.6/testsuite/tests.epag/fm1.w.run 2007-03-21 12:03:10.000000000 +0100 +++ new/yast2-mail-2.15.8/testsuite/tests.epag/fm1.w.run 1970-01-01 01:00:00.000000000 +0100 @@ -1,5 +0,0 @@ -cat << END -\`Fetchmail (\$["filename": "$OUT_TMP"]) -\`Write (.accounts, `cat $IN`) -\`Write (., nil) -END 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.6/testsuite/tests.epag/fm2.r.data new/yast2-mail-2.15.8/testsuite/tests.epag/fm2.r.data --- old/yast2-mail-2.15.6/testsuite/tests.epag/fm2.r.data 2007-03-21 12:03:10.000000000 +0100 +++ new/yast2-mail-2.15.8/testsuite/tests.epag/fm2.r.data 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -# strings looking as numbers/booleans, #21804 -poll "pop3.foo.com" protocol AUTO: - user "31337" there with password "true" is "eleet" here; 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.6/testsuite/tests.epag/fm2.r.run new/yast2-mail-2.15.8/testsuite/tests.epag/fm2.r.run --- old/yast2-mail-2.15.6/testsuite/tests.epag/fm2.r.run 2007-03-21 12:03:10.000000000 +0100 +++ new/yast2-mail-2.15.8/testsuite/tests.epag/fm2.r.run 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -cat << END -\`Fetchmail (\$["filename": "$IN"]) -\`Read (.accounts) -END 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.6/testsuite/tests.epag/fm2.rw.ycp new/yast2-mail-2.15.8/testsuite/tests.epag/fm2.rw.ycp --- old/yast2-mail-2.15.6/testsuite/tests.epag/fm2.rw.ycp 2007-03-21 12:03:10.000000000 +0100 +++ new/yast2-mail-2.15.8/testsuite/tests.epag/fm2.rw.ycp 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -[ -$["enabled":true, "local_user":"eleet", "other_server_options":"", "other_user_options":"", "password":"true", "protocol":"AUTO", "remote_user":"31337", "server":"pop3.foo.com"]] 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.6/testsuite/tests.epag/fm2.w.data new/yast2-mail-2.15.8/testsuite/tests.epag/fm2.w.data --- old/yast2-mail-2.15.6/testsuite/tests.epag/fm2.w.data 2007-03-21 12:03:10.000000000 +0100 +++ new/yast2-mail-2.15.8/testsuite/tests.epag/fm2.w.data 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -# Edit carefully, see /usr/share/doc/packages/yast2-mail/fetchmailrc.txt -poll "pop3.foo.com" protocol AUTO : user "31337" there with password "true" is "eleet" here ; 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.6/testsuite/tests.epag/fm2.w.run new/yast2-mail-2.15.8/testsuite/tests.epag/fm2.w.run --- old/yast2-mail-2.15.6/testsuite/tests.epag/fm2.w.run 2007-03-21 12:03:10.000000000 +0100 +++ new/yast2-mail-2.15.8/testsuite/tests.epag/fm2.w.run 1970-01-01 01:00:00.000000000 +0100 @@ -1,5 +0,0 @@ -cat << END -\`Fetchmail (\$["filename": "$OUT_TMP"]) -\`Write (.accounts, `cat $IN`) -\`Write (., nil) -END 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.6/testsuite/tests.epag/fm3.r.data new/yast2-mail-2.15.8/testsuite/tests.epag/fm3.r.data --- old/yast2-mail-2.15.6/testsuite/tests.epag/fm3.r.data 2007-03-21 12:03:10.000000000 +0100 +++ new/yast2-mail-2.15.8/testsuite/tests.epag/fm3.r.data 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -# multidrop: * for local user -poll "pop3.example.com" protocol AUTO: - user "common" there with password "secret" is * here; 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.6/testsuite/tests.epag/fm3.r.run new/yast2-mail-2.15.8/testsuite/tests.epag/fm3.r.run --- old/yast2-mail-2.15.6/testsuite/tests.epag/fm3.r.run 2007-03-21 12:03:10.000000000 +0100 +++ new/yast2-mail-2.15.8/testsuite/tests.epag/fm3.r.run 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -cat << END -\`Fetchmail (\$["filename": "$IN"]) -\`Read (.accounts) -END 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.6/testsuite/tests.epag/fm3.rw.ycp new/yast2-mail-2.15.8/testsuite/tests.epag/fm3.rw.ycp --- old/yast2-mail-2.15.6/testsuite/tests.epag/fm3.rw.ycp 2007-03-21 12:03:10.000000000 +0100 +++ new/yast2-mail-2.15.8/testsuite/tests.epag/fm3.rw.ycp 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -[ -$["enabled":true, "local_user":"*", "other_server_options":"", "other_user_options":"", "password":"secret", "protocol":"AUTO", "remote_user":"common", "server":"pop3.example.com"]] 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.6/testsuite/tests.epag/fm3.w.data new/yast2-mail-2.15.8/testsuite/tests.epag/fm3.w.data --- old/yast2-mail-2.15.6/testsuite/tests.epag/fm3.w.data 2007-03-21 12:03:10.000000000 +0100 +++ new/yast2-mail-2.15.8/testsuite/tests.epag/fm3.w.data 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -# Edit carefully, see /usr/share/doc/packages/yast2-mail/fetchmailrc.txt -poll "pop3.example.com" protocol AUTO : user "common" there with password "secret" is * here ; 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.6/testsuite/tests.epag/fm3.w.run new/yast2-mail-2.15.8/testsuite/tests.epag/fm3.w.run --- old/yast2-mail-2.15.6/testsuite/tests.epag/fm3.w.run 2007-03-21 12:03:10.000000000 +0100 +++ new/yast2-mail-2.15.8/testsuite/tests.epag/fm3.w.run 1970-01-01 01:00:00.000000000 +0100 @@ -1,5 +0,0 @@ -cat << END -\`Fetchmail (\$["filename": "$OUT_TMP"]) -\`Write (.accounts, `cat $IN`) -\`Write (., nil) -END 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.6/testsuite/yast2-mail.test/ag_fetchmailrc.exp new/yast2-mail-2.15.8/testsuite/yast2-mail.test/ag_fetchmailrc.exp --- old/yast2-mail-2.15.6/testsuite/yast2-mail.test/ag_fetchmailrc.exp 2007-04-23 10:17:36.000000000 +0200 +++ new/yast2-mail-2.15.8/testsuite/yast2-mail.test/ag_fetchmailrc.exp 1970-01-01 01:00:00.000000000 +0100 @@ -1,7 +0,0 @@ -# -# test driver for External Parser AGents -# - -load_lib "yast2_epag.exp" -# no normalization yet -#run_epag_tests "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.6/VERSION new/yast2-mail-2.15.8/VERSION --- old/yast2-mail-2.15.6/VERSION 2007-04-23 10:17:13.000000000 +0200 +++ new/yast2-mail-2.15.8/VERSION 2007-05-04 10:33:48.000000000 +0200 @@ -1 +1 @@ -2.15.6 +2.15.8 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de