diff options
| author | Sergey Poznyakoff <gray@gnu.org> | 2017-11-11 11:10:49 +0200 |
|---|---|---|
| committer | Sergey Poznyakoff <gray@gnu.org> | 2017-11-11 11:10:49 +0200 |
| commit | 499992bf3bbf7e7d3e1203563f856f6db229d73c (patch) | |
| tree | e34d7f1c16bef5ce978fe40a35f41abea5a3f49f /tests/etc | |
| parent | ba1c15e2290246d272037404c46f44abd9d98c0e (diff) | |
| download | wydawca-499992bf3bbf7e7d3e1203563f856f6db229d73c.tar.gz wydawca-499992bf3bbf7e7d3e1203563f856f6db229d73c.tar.bz2 | |
Fix build with mailutils 3.4
* Makefile.am (ACLOCAL_AMFLAGS): Add am.
* NEWS: Update.
* am/mailutils.m4: New file. A fixed version of upstream mailutils.m4
* configure.ac: Require mailutils 3.3. Raise patchlevel.
* tests/nullmail.c: New file.
* tests/.gitignore: Add nullmail
* tests/Makefile.am: Build nullmail
* tests/etc/nullmail: Remove
* tests/etc/Makefile.am: Remove nullmail script.
* tests/atlocal.in (WY_TESTDIR): New variable.
* tests/check-notify.at: Use new nullmail tool. Update expected
output.
* tests/mailstats.at: Likewise.
* tests/notify-upl.at: Likewise.
* tests/etc/mailstats.rcin: Fix mailer command line.
* tests/etc/notify.rcin: Likewise.
Diffstat (limited to 'tests/etc')
| -rw-r--r-- | tests/etc/Makefile.am | 1 | ||||
| -rw-r--r-- | tests/etc/mailstats.rcin | 2 | ||||
| -rw-r--r-- | tests/etc/notify.rcin | 2 | ||||
| -rwxr-xr-x | tests/etc/nullmail | 11 |
4 files changed, 2 insertions, 14 deletions
diff --git a/tests/etc/Makefile.am b/tests/etc/Makefile.am index ffb8f99..34d6024 100644 --- a/tests/etc/Makefile.am +++ b/tests/etc/Makefile.am @@ -22,7 +22,6 @@ EXTRA_DIST = \ secring.asc\ wydawca.rcin\ notify.rcin\ - nullmail\ mailstats.rcin GPG_FLAGS = --quiet --no-permission-warning --homedir . diff --git a/tests/etc/mailstats.rcin b/tests/etc/mailstats.rcin index 995cd65..ebe364c 100644 --- a/tests/etc/mailstats.rcin +++ b/tests/etc/mailstats.rcin @@ -20,7 +20,7 @@ module-init mailutils { admin-address "root@localhost"; from-address "wydawca-noreply@localhost"; - mailer "| @WY_CONFSRC@/nullmail @WY_DST@/mail.out -F ${sender} ${rcpt}"; + mailer "| @WY_TESTDIR@/nullmail -o @WY_DST@/mail.out -F ${sender} ${rcpt}"; mail-statistics { statistics all; diff --git a/tests/etc/notify.rcin b/tests/etc/notify.rcin index 3ae3783..b6630b8 100644 --- a/tests/etc/notify.rcin +++ b/tests/etc/notify.rcin @@ -20,7 +20,7 @@ module-init mailutils { admin-address "root@localhost"; from-address "wydawca-noreply@localhost"; - mailer "| @WY_CONFSRC@/nullmail @WY_DST@/mail.out -F ${sender} ${rcpt}"; + mailer "| @WY_TESTDIR@/nullmail -o @WY_DST@/mail.out -F ${sender} ${rcpt}"; } # Notify the user about successful uploads diff --git a/tests/etc/nullmail b/tests/etc/nullmail deleted file mode 100755 index 55220a6..0000000 --- a/tests/etc/nullmail +++ /dev/null @@ -1,11 +0,0 @@ -#! /bin/sh - -out=${1:-/dev/null} -shift - -echo $* >> $out -echo "=========" >> $out -cat - >> $out -echo "=========" -echo "" -exit 0
\ No newline at end of file |