[SCM] GNU Mailutils branch, master, updated. release-2.2-724-ge57318e

[Sergey Poznyakoff]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Mailutils".

http://git.savannah.gnu.org/cgit/mailutils.git/commit/?id=e57318e7d47f944c420e6bfd931b44185d776cfc

The branch, master has been updated
       via  e57318e7d47f944c420e6bfd931b44185d776cfc (commit)
       via  2c419ba0d194b5b00e6c2e3deae15cb593c8569d (commit)
      from  18bc359935ed01c93d7082b74c833115835ec16c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e57318e7d47f944c420e6bfd931b44185d776cfc
Author: Sergey Poznyakoff <address@hidden>
Date:   Thu Jul 9 17:52:40 2015 +0300

    Fix make check if MU_DEFAULT_SCHEME value is other than mbox
    
    * testsuite/testsuite.inc (MUT_DEFAULT_OPTIONS): New define.
    * maidag/tests/testsuite.at: Add MUT_DEFAULT_OPTIONS to the
    options passed to maidag
    * mail/tests/cols00.at: Use MUT_MAIL_CMD
    * mail/tests/cols01.at: Likewise.
    * mail/tests/copy00.at: Likewise.
    * mail/tests/nohome.at: Likewise.
    * mail/tests/testsuite.at (MUT_MAIL_CMD): New define.  Pass
    MUT_DEFAULT_OPTIONS to mail.
    * sieve/tests/testsuite.at: Pass MUT_DEFAULT_OPTIONS to sieve.

commit 2c419ba0d194b5b00e6c2e3deae15cb593c8569d
Author: Sergey Poznyakoff <address@hidden>
Date:   Thu Jul 9 17:52:05 2015 +0300

    Compatibility fix.
    
    * libmailutils/mailbox/mbx_default.c (mu_normalize_mailbox_url):
    Append ${user} if URL ends with user=$user.  Fixes 131ddb25a.

-----------------------------------------------------------------------

Summary of changes:
 libmailutils/mailbox/mbx_default.c |    4 +---
 maidag/tests/testsuite.at          |    3 +--
 mail/tests/cols00.at               |    4 ++--
 mail/tests/cols01.at               |    4 ++--
 mail/tests/copy00.at               |    2 +-
 mail/tests/nohome.at               |    2 +-
 mail/tests/testsuite.at            |    2 ++
 sieve/tests/testsuite.at           |    5 +----
 testsuite/testsuite.inc            |    9 +++++++++
 9 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/libmailutils/mailbox/mbx_default.c 
b/libmailutils/mailbox/mbx_default.c
index ab93fff..4024208 100644
--- a/libmailutils/mailbox/mbx_default.c
+++ b/libmailutils/mailbox/mbx_default.c
@@ -62,9 +62,7 @@ mu_normalize_mailbox_url (char **pout, const char *dir)
   len = strlen (dir);
   if (dir[len-1] == '=')
     {
-      if (len > 5 && strcmp (dir + len - 5, "user=") == 0)
-       *pout = strdup (dir);
-      else
+      if (!(len > 5 && strcmp (dir + len - 5, "user=") == 0))
        return MU_ERR_BAD_FILENAME;
     }
   else
diff --git a/maidag/tests/testsuite.at b/maidag/tests/testsuite.at
index 43cc1e7..77115bd 100644
--- a/maidag/tests/testsuite.at
+++ b/maidag/tests/testsuite.at
@@ -17,8 +17,7 @@
 m4_include([testsuite.inc])
 
 m4_define([MAIDAG_OPTIONS],[dnl
---no-site-config dnl
---no-user-config dnl
+MUT_DEFAULT_OPTIONS dnl
 --set '|mailbox|mailbox-pattern='`pwd`/spool/'${user}' dnl
 --set .auth.authorization=system dnl
 --stderr])
diff --git a/mail/tests/cols00.at b/mail/tests/cols00.at
index 9f36f3a..2eab6c9 100644
--- a/mail/tests/cols00.at
+++ b/mail/tests/cols00.at
@@ -25,8 +25,8 @@ AT_KEYWORDS([columns cols00])
 AT_CHECK([
 MUT_MBCOPY($abs_top_srcdir/testsuite/spool/mbox)
 unset MAILRC
-COLUMNS=26 mail -nH -E 'set columns=26' -f ./mbox
-COLUMNS=31 mail -nH -f ./mbox
+COLUMNS=26 MUT_MAIL_CMD -nH -E 'set columns=26' -f ./mbox
+COLUMNS=31 MUT_MAIL_CMD -nH -f ./mbox
 ],
 [0],
 [>N   1 Sergey Poznyakoff
diff --git a/mail/tests/cols01.at b/mail/tests/cols01.at
index dbeeadc..8283923 100644
--- a/mail/tests/cols01.at
+++ b/mail/tests/cols01.at
@@ -25,8 +25,8 @@ AT_KEYWORDS([columns cols01])
 AT_CHECK([
 MUT_MBCOPY($abs_top_srcdir/testsuite/spool/mbox)
 unset MAILRC
-mail -nH -E 'set columns=26' -f ./mbox
-mail -nH -E 'set columns=31' -f ./mbox
+MUT_MAIL_CMD -nH -E 'set columns=26' -f ./mbox
+MUT_MAIL_CMD -nH -E 'set columns=31' -f ./mbox
 ],
 [0],
 [>N   1 Sergey Poznyakoff
diff --git a/mail/tests/copy00.at b/mail/tests/copy00.at
index bd793a7..760dacc 100644
--- a/mail/tests/copy00.at
+++ b/mail/tests/copy00.at
@@ -26,7 +26,7 @@ AT_CHECK([
 test -f /dev/stdout || AT_SKIP_TEST
 MUT_MBCOPY($abs_top_srcdir/testsuite/spool/mbox)
 unset MAILRC
-echo 'copy 1 /dev/stdout' | mail -N -E 'set readonly' -f ./mbox | sed 's/  
*$//;/^Held 1 message/d';
+echo 'copy 1 /dev/stdout' | MUT_MAIL_CMD -N -E 'set readonly' -f ./mbox | sed 
's/  *$//;/^Held 1 message/d';
 ],
 [0],
 [From address@hidden Tue Jul 16 12:11:35 2002
diff --git a/mail/tests/nohome.at b/mail/tests/nohome.at
index 692c327..a724977 100644
--- a/mail/tests/nohome.at
+++ b/mail/tests/nohome.at
@@ -26,7 +26,7 @@ AT_CHECK([
 MUT_MBCOPY($abs_top_srcdir/testsuite/spool/mbox)
 unset MAILRC
 unset HOME
-MAIL=./mbox mail -nH
+MAIL=./mbox MUT_MAIL_CMD -nH
 ],
 [0],
 [>N   1 Sergey Poznyakoff  Tue Jul 16 12:11  12/390   MBOX
diff --git a/mail/tests/testsuite.at b/mail/tests/testsuite.at
index 9254a2c..b5ec273 100644
--- a/mail/tests/testsuite.at
+++ b/mail/tests/testsuite.at
@@ -16,6 +16,8 @@
 
 m4_include([testsuite.inc])
 
+m4_define([MUT_MAIL_CMD],[mail MUT_DEFAULT_OPTIONS])
+
 AT_INIT
 AT_TESTED([mail])
 
diff --git a/sieve/tests/testsuite.at b/sieve/tests/testsuite.at
index c4f7910..c7c7c2c 100644
--- a/sieve/tests/testsuite.at
+++ b/sieve/tests/testsuite.at
@@ -27,10 +27,7 @@ AT_CLEANUP
 ])
 
 dnl ------------------------------------------------------------
-m4_define([MUT_SIEVE_DEFAULT_OPTIONS],[dnl
- --no-site-config dnl
- --no-user-config dnl
-])
+m4_define([MUT_SIEVE_DEFAULT_OPTIONS],MUT_DEFAULT_OPTIONS)
 
 dnl ------------------------------------------------------------
 dnl MUT_SIEVE_OPTIONS  -- additional command line options for Sieve
diff --git a/testsuite/testsuite.inc b/testsuite/testsuite.inc
index 47e6da7..3f1b0d4 100644
--- a/testsuite/testsuite.inc
+++ b/testsuite/testsuite.inc
@@ -21,6 +21,15 @@ m4_version_prereq([2.52g])
 m4_define([AT_SKIP_TEST],[exit 77])
 
 dnl ------------------------------------------------------------
+dnl MUT_DEFAULT_OPTIONS -- produce default command line options
+dnl ------------------------------------------------------------
+m4_define([MUT_DEFAULT_OPTIONS],[dnl
+ --no-site-config dnl
+ --no-user-config dnl
+ --set '.mailbox.mailbox-type=mbox' dnl
+])
+
+dnl ------------------------------------------------------------
 dnl MUT_VERSION(TOOL)  -- checks the version output from TOOL
 dnl
 m4_define([MUT_VERSION],[


hooks/post-receive
-- 
GNU Mailutils