From a108e3eae2841ec938041460bcb201e15131c17f Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Sat, 18 Apr 2015 18:03:51 +0100 Subject: Testsuite: split out tests requiring IPv6 --- test/confs/4010 | 1 + test/log/4009 | 2 +- test/log/4010 | 30 +-- test/log/4016 | 25 +++ test/mail/4010.userx | 340 ------------------------------- test/mail/4016.userx | 340 +++++++++++++++++++++++++++++++ test/rejectlog/4010 | 11 - test/rejectlog/4016 | 11 + test/scripts/4000-scanning/4009 | 2 +- test/scripts/4010-scan-external/4010 | 212 ------------------- test/scripts/4010-scan-external/REQUIRES | 3 - test/scripts/4010-scan-ipv6/4010 | 60 ++++++ test/scripts/4010-scan-ipv6/REQUIRES | 2 + test/scripts/4016-scan-external/4016 | 212 +++++++++++++++++++ test/scripts/4016-scan-external/REQUIRES | 3 + test/scripts/5800-DANE/REQUIRES | 2 +- test/stdout/4010 | 109 +++++----- test/stdout/4016 | 70 +++++++ 18 files changed, 780 insertions(+), 655 deletions(-) create mode 120000 test/confs/4010 create mode 100644 test/log/4016 delete mode 100644 test/mail/4010.userx create mode 100644 test/mail/4016.userx delete mode 100644 test/rejectlog/4010 create mode 100644 test/rejectlog/4016 delete mode 100644 test/scripts/4010-scan-external/4010 delete mode 100644 test/scripts/4010-scan-external/REQUIRES create mode 100644 test/scripts/4010-scan-ipv6/4010 create mode 100644 test/scripts/4010-scan-ipv6/REQUIRES create mode 100644 test/scripts/4016-scan-external/4016 create mode 100644 test/scripts/4016-scan-external/REQUIRES create mode 100644 test/stdout/4016 diff --git a/test/confs/4010 b/test/confs/4010 new file mode 120000 index 000000000..eb8888460 --- /dev/null +++ b/test/confs/4010 @@ -0,0 +1 @@ +4009 \ No newline at end of file diff --git a/test/log/4009 b/test/log/4009 index 612744e20..72d5e43ea 100644 --- a/test/log/4009 +++ b/test/log/4009 @@ -10,7 +10,7 @@ 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss 1999-03-02 09:44:33 10HmaZ-0005vi-00 => :blackhole: R=r 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed -1999-03-02 09:44:33 10HmbA-0005vi-00 spam acl condition: spamd: failed to connect to any address for ::1: Connection refused +1999-03-02 09:44:33 10HmbA-0005vi-00 spam acl condition: spamd: failed to connect to any address for 127.0.0.2: Connection refused 1999-03-02 09:44:33 10HmbA-0005vi-00 U=CALLER Warning: no action Spam detection software, running on the system "demo",\n has NOT identified this incoming email as spam. The original\n message has been attached to this so you can view it or label\n similar future email. If you have any questions, see\n @@CONTACT_ADDRESS@@ for details.\n \n Content preview: test [...]\n \n Content analysis details: (4.5 points, 5.0 required)\n \n pts rule name description\n ---- ---------------------- --------------------------------------------------\n -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP\n 1.2 MISSING_HEADERS Missing To: header\n 1.0 MISSING_FROM Missing From: header\n 1.8 MISSING_SUBJECT Missing Subject: header\n 1.4 MISSING_DATE Missing Date: header\n 0.1 MISSING_MID Missing Message-Id: header 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss 1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: R=r diff --git a/test/log/4010 b/test/log/4010 index b48693db9..68f706e28 100644 --- a/test/log/4010 +++ b/test/log/4010 @@ -1,25 +1,5 @@ -1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss -1999-03-02 09:44:33 10HmaY-0005vi-00 => userx R=r1 T=t1 -1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss id=41C2F849.3060203@projectile.test.ex -1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx R=r1 T=t1 -1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed -1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss id=abcde -1999-03-02 09:44:33 10HmbA-0005vi-00 => userx R=r1 T=t1 -1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss id=41C2F849.3060203@projectile.test.ex -1999-03-02 09:44:33 10HmbB-0005vi-00 => userx R=r1 T=t1 -1999-03-02 09:44:33 10HmbB-0005vi-00 Completed -1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss id=20041217133501.GA3058@test.ex -1999-03-02 09:44:33 10HmbC-0005vi-00 => userx R=r1 T=t1 -1999-03-02 09:44:33 10HmbC-0005vi-00 Completed -1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 10HmbD-0005vi-00 => userx R=r1 T=t1 -1999-03-02 09:44:33 10HmbD-0005vi-00 Completed -1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss id=20041217133501.GA3058@test.ex -1999-03-02 09:44:33 10HmbE-0005vi-00 => userx R=r1 T=t1 -1999-03-02 09:44:33 10HmbE-0005vi-00 Completed -1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss id=41C2F849.3060203@projectile.test.ex -1999-03-02 09:44:33 10HmbF-0005vi-00 => userx R=r1 T=t1 -1999-03-02 09:44:33 10HmbF-0005vi-00 Completed -1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F= rejected after DATA: Found Eicar-Test-Signature +1999-03-02 09:44:33 10HmaX-0005vi-00 spam acl condition: spamd: failed to connect to any address for ::1: Connection refused +1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER Warning: no action Spam detection software, running on the system "demo",\n has NOT identified this incoming email as spam. The original\n message has been attached to this so you can view it or label\n similar future email. If you have any questions, see\n @@CONTACT_ADDRESS@@ for details.\n \n Content preview: test [...]\n \n Content analysis details: (4.5 points, 5.0 required)\n \n pts rule name description\n ---- ---------------------- --------------------------------------------------\n -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP\n 1.2 MISSING_HEADERS Missing To: header\n 1.0 MISSING_FROM Missing From: header\n 1.8 MISSING_SUBJECT Missing Subject: header\n 1.4 MISSING_DATE Missing Date: header\n 0.1 MISSING_MID Missing Message-Id: header +1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss +1999-03-02 09:44:33 10HmaX-0005vi-00 => :blackhole: R=r +1999-03-02 09:44:33 10HmaX-0005vi-00 Completed diff --git a/test/log/4016 b/test/log/4016 new file mode 100644 index 000000000..b48693db9 --- /dev/null +++ b/test/log/4016 @@ -0,0 +1,25 @@ +1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss +1999-03-02 09:44:33 10HmaY-0005vi-00 => userx R=r1 T=t1 +1999-03-02 09:44:33 10HmaY-0005vi-00 Completed +1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss id=41C2F849.3060203@projectile.test.ex +1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx R=r1 T=t1 +1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed +1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss id=abcde +1999-03-02 09:44:33 10HmbA-0005vi-00 => userx R=r1 T=t1 +1999-03-02 09:44:33 10HmbA-0005vi-00 Completed +1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss id=41C2F849.3060203@projectile.test.ex +1999-03-02 09:44:33 10HmbB-0005vi-00 => userx R=r1 T=t1 +1999-03-02 09:44:33 10HmbB-0005vi-00 Completed +1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss id=20041217133501.GA3058@test.ex +1999-03-02 09:44:33 10HmbC-0005vi-00 => userx R=r1 T=t1 +1999-03-02 09:44:33 10HmbC-0005vi-00 Completed +1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss +1999-03-02 09:44:33 10HmbD-0005vi-00 => userx R=r1 T=t1 +1999-03-02 09:44:33 10HmbD-0005vi-00 Completed +1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss id=20041217133501.GA3058@test.ex +1999-03-02 09:44:33 10HmbE-0005vi-00 => userx R=r1 T=t1 +1999-03-02 09:44:33 10HmbE-0005vi-00 Completed +1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss id=41C2F849.3060203@projectile.test.ex +1999-03-02 09:44:33 10HmbF-0005vi-00 => userx R=r1 T=t1 +1999-03-02 09:44:33 10HmbF-0005vi-00 Completed +1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F= rejected after DATA: Found Eicar-Test-Signature diff --git a/test/mail/4010.userx b/test/mail/4010.userx deleted file mode 100644 index 34c51ccfc..000000000 --- a/test/mail/4010.userx +++ /dev/null @@ -1,340 +0,0 @@ -From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 -Received: from CALLER (helo=test.ex) - by myhost.test.ex with local-esmtp (Exim x.yz) - (envelope-from ) - id 10HmaY-0005vi-00 - for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: -From: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 -X-Router-SSint: was preserved - -A message without any headers. - -From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 -Received: from CALLER (helo=test.ex) - by myhost.test.ex with local-esmtp (Exim x.yz) - (envelope-from ) - id 10HmaZ-0005vi-00 - for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -From: Test person -To: Me -Subject: A real test message -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-ID: <41C2F849.3060203@projectile.test.ex> -Sender: CALLER_NAME -X-Router-SSint: was preserved - -OK, this should look like a genuine message. - -From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 -Received: from CALLER (helo=test.ex) - by myhost.test.ex with local-esmtp (Exim x.yz) - (envelope-from ) - id 10HmbA-0005vi-00 - for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -From: 99Junk99@somewhere.com -To: -Subject: MAKE MONEY FAST!!!! -Message-id: abcde -Sender: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 -X-Router-SSint: was preserved - -This should be enough to trip the threshold. - -From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 -Received: from CALLER (helo=test.ex) - by myhost.test.ex with local-esmtp (Exim x.yz) - (envelope-from ) - id 10HmbB-0005vi-00 - for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -From: Test person -To: Me -Subject: A real test message -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-ID: <41C2F849.3060203@projectile.test.ex> -FakeReject: test fakereject -Sender: CALLER_NAME -X-Regex: Regex matched -X-Router-SSint: was preserved - -OK, this should look like a genuine message, but -it will trip on THIS REGEX. - -From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 -Received: from CALLER (helo=test.ex) - by myhost.test.ex with local-esmtp (Exim x.yz) - (envelope-from ) - id 10HmbC-0005vi-00 - for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -From: J Caesar -To: a-list00@exim.org -Message-ID: <20041217133501.GA3058@test.ex> -Mime-Version: 1.0 -Content-Type: multipart/mixed; boundary="T4sUOijqQbZv57TR" -Content-Disposition: inline -Subject: [exim] Re: Bug#286074: eximstats: uses message count as data for - the "volume" charts -X-BeenThere: a-list00@exim.org -X-Mailman-Version: 2.1.5 -Precedence: list -Sender: CALLER_NAME -X-0-content-type: multipart/mixed -X-0-filename: -X-0-charset: -X-0-boundary: T4sUOijqQbZv57TR -X-0-content-disposition: inline -X-0-content-transfer-encoding: -X-0-content-id: -X-0-content-description: -X-0-is-multipart: 1 -X-0-is-coverletter: 1 -X-0-is-rfc822: 0 -X-0-decode-filename: TESTSUITE/spool/scan/10HmbC-0005vi-00/10HmbC-0005vi-00-00000 -X-0-content-size: 2 -X-1-content-type: text/plain -X-1-filename: -X-1-charset: US-ASCII -X-1-boundary: -X-1-content-disposition: inline -X-1-content-transfer-encoding: quoted-printable -X-1-content-id: -X-1-content-description: -X-1-is-multipart: 0 -X-1-is-coverletter: 1 -X-1-is-rfc822: 0 -X-1-decode-filename: TESTSUITE/spool/scan/10HmbC-0005vi-00/10HmbC-0005vi-00-00001 -X-1-content-size: 1 -X-mime-regex: matched -X-2-content-type: text/plain -X-2-filename: -X-2-charset: us-ascii -X-2-boundary: -X-2-content-disposition: inline -X-2-content-transfer-encoding: -X-2-content-id: -X-2-content-description: -X-2-is-multipart: 0 -X-2-is-coverletter: 0 -X-2-is-rfc822: 0 -X-2-decode-filename: TESTSUITE/spool/scan/10HmbC-0005vi-00/10HmbC-0005vi-00-00002 -X-2-content-size: 1 -X-3-content-type: text/plain -X-3-filename: working-patch -X-3-charset: us-ascii -X-3-boundary: -X-3-content-disposition: attachment -X-3-content-transfer-encoding: -X-3-content-id: -X-3-content-description: -X-3-is-multipart: 0 -X-3-is-coverletter: 0 -X-3-is-rfc822: 0 -X-3-decode-filename: TESTSUITE/spool/scan/10HmbC-0005vi-00/10HmbC-0005vi-00-00003 -X-3-content-size: 1 -X-4-content-type: text/plain -X-4-filename: -X-4-charset: us-ascii -X-4-boundary: -X-4-content-disposition: inline -X-4-content-transfer-encoding: 7bit -X-4-content-id: -X-4-content-description: -X-4-is-multipart: 0 -X-4-is-coverletter: 0 -X-4-is-rfc822: 0 -X-4-decode-filename: TESTSUITE/spool/scan/10HmbC-0005vi-00/10HmbC-0005vi-00-00004 -X-4-content-size: 1 -X-Router-SSint: was preserved - ---T4sUOijqQbZv57TR -Content-Type: text/plain; charset=US-ASCII -Content-Transfer-Encoding: quoted-printable -Content-Disposition: inline - -Test quoted-printable =3D -Space at end of line=40 -Continued line = -with this text. - ---T4sUOijqQbZv57TR -Content-Type: text/plain; charset=us-ascii -Content-Disposition: inline - -There was a part of the patch missing, complete one is attached. - sorry for wasting your time - ---T4sUOijqQbZv57TR -Content-Type: text/plain; charset=us-ascii -Content-Disposition: attachment; filename=working-patch - ---- /usr/sbin/eximstats 2004-12-17 13:36:44.381983753 +0100 -+++ eximstats 2004-12-17 13:47:37.763185260 +0100 -@@ -1107,11 +1107,11 @@ - if (scalar @chartdatanames < $ntopchart) - { - push(@chartdatanames, $key); -- push(@chartdatavals, $$m_count{$key}); -+ push(@chartdatavals, $$m_data{$key}); - } - else - { -- $chartotherval += $$m_count{$key}; -+ $chartotherval += $$m_data{$key}; - } - } - push(@chartdatanames, "Other"); - ---T4sUOijqQbZv57TR -Content-Type: text/plain; charset="us-ascii" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Content-Disposition: inline - --- - ---T4sUOijqQbZv57TR-- - -From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 -Received: from CALLER by myhost.test.ex with local (Exim x.yz) - (envelope-from ) - id 10HmbD-0005vi-00 - for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: -From: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 -X-Router-SSint: was preserved - -A message without any headers. - -From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 -Received: from CALLER by myhost.test.ex with local (Exim x.yz) - (envelope-from ) - id 10HmbE-0005vi-00 - for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Date: Tue, 2 Mar 1999 09:44:33 +0000 -From: J Caesar -To: a-list00@exim.org -Message-ID: <20041217133501.GA3058@test.ex> -Mime-Version: 1.0 -Content-Type: multipart/mixed; boundary="T4sUOijqQbZv57TR" -Content-Disposition: inline -Subject: [exim] Re: Bug#286074: eximstats: uses message count as data for - the "volume" charts -X-BeenThere: a-list00@exim.org -X-Mailman-Version: 2.1.5 -Precedence: list -Sender: CALLER_NAME -X-0-content-type: multipart/mixed -X-0-filename: -X-0-charset: -X-0-boundary: T4sUOijqQbZv57TR -X-0-content-disposition: inline -X-0-content-transfer-encoding: -X-0-content-id: -X-0-content-description: -X-0-is-multipart: 1 -X-0-is-coverletter: 1 -X-0-is-rfc822: 0 -X-0-decode-filename: TESTSUITE/spool/scan/10HmbE-0005vi-00/10HmbE-0005vi-00-00000 -X-0-content-size: 1 -X-1-content-type: text/plain -X-1-filename: -X-1-charset: us-ascii -X-1-boundary: -X-1-content-disposition: inline -X-1-content-transfer-encoding: -X-1-content-id: -X-1-content-description: -X-1-is-multipart: 0 -X-1-is-coverletter: 1 -X-1-is-rfc822: 0 -X-1-decode-filename: TESTSUITE/spool/scan/10HmbE-0005vi-00/10HmbE-0005vi-00-00001 -X-1-content-size: 1 -X-2-content-type: text/plain -X-2-filename: working-patch -X-2-charset: us-ascii -X-2-boundary: -X-2-content-disposition: attachment -X-2-content-transfer-encoding: -X-2-content-id: -X-2-content-description: -X-2-is-multipart: 0 -X-2-is-coverletter: 0 -X-2-is-rfc822: 0 -X-2-decode-filename: TESTSUITE/spool/scan/10HmbE-0005vi-00/10HmbE-0005vi-00-00002 -X-2-content-size: 1 -X-3-content-type: text/plain -X-3-filename: -X-3-charset: us-ascii -X-3-boundary: -X-3-content-disposition: inline -X-3-content-transfer-encoding: 7bit -X-3-content-id: -X-3-content-description: -X-3-is-multipart: 0 -X-3-is-coverletter: 0 -X-3-is-rfc822: 0 -X-3-decode-filename: TESTSUITE/spool/scan/10HmbE-0005vi-00/10HmbE-0005vi-00-00003 -X-3-content-size: 1 -X-Router-SSint: was preserved - ---T4sUOijqQbZv57TR -Content-Type: text/plain; charset=us-ascii -Content-Disposition: inline - -There was a part of the patch missing, complete one is attached. - sorry for wasting your time - ---T4sUOijqQbZv57TR -Content-Type: text/plain; charset=us-ascii -Content-Disposition: attachment; filename=working-patch - ---- /usr/sbin/eximstats 2004-12-17 13:36:44.381983753 +0100 -+++ eximstats 2004-12-17 13:47:37.763185260 +0100 -@@ -1107,11 +1107,11 @@ - if (scalar @chartdatanames < $ntopchart) - { - push(@chartdatanames, $key); -- push(@chartdatavals, $$m_count{$key}); -+ push(@chartdatavals, $$m_data{$key}); - } - else - { -- $chartotherval += $$m_count{$key}; -+ $chartotherval += $$m_data{$key}; - } - } - push(@chartdatanames, "Other"); - ---T4sUOijqQbZv57TR -Content-Type: text/plain; charset="us-ascii" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Content-Disposition: inline - --- - ---T4sUOijqQbZv57TR-- - -From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 -Received: from CALLER (helo=test.ex) - by myhost.test.ex with local-esmtp (Exim x.yz) - (envelope-from ) - id 10HmbF-0005vi-00 - for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -From: Test person -To: Me -Subject: A real test message -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-ID: <41C2F849.3060203@projectile.test.ex> -FakeDefer: test fakedefer -Sender: CALLER_NAME -X-Regex: Regex matched -X-Router-SSint: was preserved - -OK, this should look like a genuine message, but -it will trip on THIS REGEX. - diff --git a/test/mail/4016.userx b/test/mail/4016.userx new file mode 100644 index 000000000..34c51ccfc --- /dev/null +++ b/test/mail/4016.userx @@ -0,0 +1,340 @@ +From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 +Received: from CALLER (helo=test.ex) + by myhost.test.ex with local-esmtp (Exim x.yz) + (envelope-from ) + id 10HmaY-0005vi-00 + for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: +From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 +X-Router-SSint: was preserved + +A message without any headers. + +From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 +Received: from CALLER (helo=test.ex) + by myhost.test.ex with local-esmtp (Exim x.yz) + (envelope-from ) + id 10HmaZ-0005vi-00 + for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 +From: Test person +To: Me +Subject: A real test message +Date: Tue, 2 Mar 1999 09:44:33 +0000 +Message-ID: <41C2F849.3060203@projectile.test.ex> +Sender: CALLER_NAME +X-Router-SSint: was preserved + +OK, this should look like a genuine message. + +From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 +Received: from CALLER (helo=test.ex) + by myhost.test.ex with local-esmtp (Exim x.yz) + (envelope-from ) + id 10HmbA-0005vi-00 + for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 +From: 99Junk99@somewhere.com +To: +Subject: MAKE MONEY FAST!!!! +Message-id: abcde +Sender: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 +X-Router-SSint: was preserved + +This should be enough to trip the threshold. + +From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 +Received: from CALLER (helo=test.ex) + by myhost.test.ex with local-esmtp (Exim x.yz) + (envelope-from ) + id 10HmbB-0005vi-00 + for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 +From: Test person +To: Me +Subject: A real test message +Date: Tue, 2 Mar 1999 09:44:33 +0000 +Message-ID: <41C2F849.3060203@projectile.test.ex> +FakeReject: test fakereject +Sender: CALLER_NAME +X-Regex: Regex matched +X-Router-SSint: was preserved + +OK, this should look like a genuine message, but +it will trip on THIS REGEX. + +From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 +Received: from CALLER (helo=test.ex) + by myhost.test.ex with local-esmtp (Exim x.yz) + (envelope-from ) + id 10HmbC-0005vi-00 + for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 +Date: Tue, 2 Mar 1999 09:44:33 +0000 +From: J Caesar +To: a-list00@exim.org +Message-ID: <20041217133501.GA3058@test.ex> +Mime-Version: 1.0 +Content-Type: multipart/mixed; boundary="T4sUOijqQbZv57TR" +Content-Disposition: inline +Subject: [exim] Re: Bug#286074: eximstats: uses message count as data for + the "volume" charts +X-BeenThere: a-list00@exim.org +X-Mailman-Version: 2.1.5 +Precedence: list +Sender: CALLER_NAME +X-0-content-type: multipart/mixed +X-0-filename: +X-0-charset: +X-0-boundary: T4sUOijqQbZv57TR +X-0-content-disposition: inline +X-0-content-transfer-encoding: +X-0-content-id: +X-0-content-description: +X-0-is-multipart: 1 +X-0-is-coverletter: 1 +X-0-is-rfc822: 0 +X-0-decode-filename: TESTSUITE/spool/scan/10HmbC-0005vi-00/10HmbC-0005vi-00-00000 +X-0-content-size: 2 +X-1-content-type: text/plain +X-1-filename: +X-1-charset: US-ASCII +X-1-boundary: +X-1-content-disposition: inline +X-1-content-transfer-encoding: quoted-printable +X-1-content-id: +X-1-content-description: +X-1-is-multipart: 0 +X-1-is-coverletter: 1 +X-1-is-rfc822: 0 +X-1-decode-filename: TESTSUITE/spool/scan/10HmbC-0005vi-00/10HmbC-0005vi-00-00001 +X-1-content-size: 1 +X-mime-regex: matched +X-2-content-type: text/plain +X-2-filename: +X-2-charset: us-ascii +X-2-boundary: +X-2-content-disposition: inline +X-2-content-transfer-encoding: +X-2-content-id: +X-2-content-description: +X-2-is-multipart: 0 +X-2-is-coverletter: 0 +X-2-is-rfc822: 0 +X-2-decode-filename: TESTSUITE/spool/scan/10HmbC-0005vi-00/10HmbC-0005vi-00-00002 +X-2-content-size: 1 +X-3-content-type: text/plain +X-3-filename: working-patch +X-3-charset: us-ascii +X-3-boundary: +X-3-content-disposition: attachment +X-3-content-transfer-encoding: +X-3-content-id: +X-3-content-description: +X-3-is-multipart: 0 +X-3-is-coverletter: 0 +X-3-is-rfc822: 0 +X-3-decode-filename: TESTSUITE/spool/scan/10HmbC-0005vi-00/10HmbC-0005vi-00-00003 +X-3-content-size: 1 +X-4-content-type: text/plain +X-4-filename: +X-4-charset: us-ascii +X-4-boundary: +X-4-content-disposition: inline +X-4-content-transfer-encoding: 7bit +X-4-content-id: +X-4-content-description: +X-4-is-multipart: 0 +X-4-is-coverletter: 0 +X-4-is-rfc822: 0 +X-4-decode-filename: TESTSUITE/spool/scan/10HmbC-0005vi-00/10HmbC-0005vi-00-00004 +X-4-content-size: 1 +X-Router-SSint: was preserved + +--T4sUOijqQbZv57TR +Content-Type: text/plain; charset=US-ASCII +Content-Transfer-Encoding: quoted-printable +Content-Disposition: inline + +Test quoted-printable =3D +Space at end of line=40 +Continued line = +with this text. + +--T4sUOijqQbZv57TR +Content-Type: text/plain; charset=us-ascii +Content-Disposition: inline + +There was a part of the patch missing, complete one is attached. + sorry for wasting your time + +--T4sUOijqQbZv57TR +Content-Type: text/plain; charset=us-ascii +Content-Disposition: attachment; filename=working-patch + +--- /usr/sbin/eximstats 2004-12-17 13:36:44.381983753 +0100 ++++ eximstats 2004-12-17 13:47:37.763185260 +0100 +@@ -1107,11 +1107,11 @@ + if (scalar @chartdatanames < $ntopchart) + { + push(@chartdatanames, $key); +- push(@chartdatavals, $$m_count{$key}); ++ push(@chartdatavals, $$m_data{$key}); + } + else + { +- $chartotherval += $$m_count{$key}; ++ $chartotherval += $$m_data{$key}; + } + } + push(@chartdatanames, "Other"); + +--T4sUOijqQbZv57TR +Content-Type: text/plain; charset="us-ascii" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Content-Disposition: inline + +-- + +--T4sUOijqQbZv57TR-- + +From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 +Received: from CALLER by myhost.test.ex with local (Exim x.yz) + (envelope-from ) + id 10HmbD-0005vi-00 + for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: +From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 +X-Router-SSint: was preserved + +A message without any headers. + +From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 +Received: from CALLER by myhost.test.ex with local (Exim x.yz) + (envelope-from ) + id 10HmbE-0005vi-00 + for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 +Date: Tue, 2 Mar 1999 09:44:33 +0000 +From: J Caesar +To: a-list00@exim.org +Message-ID: <20041217133501.GA3058@test.ex> +Mime-Version: 1.0 +Content-Type: multipart/mixed; boundary="T4sUOijqQbZv57TR" +Content-Disposition: inline +Subject: [exim] Re: Bug#286074: eximstats: uses message count as data for + the "volume" charts +X-BeenThere: a-list00@exim.org +X-Mailman-Version: 2.1.5 +Precedence: list +Sender: CALLER_NAME +X-0-content-type: multipart/mixed +X-0-filename: +X-0-charset: +X-0-boundary: T4sUOijqQbZv57TR +X-0-content-disposition: inline +X-0-content-transfer-encoding: +X-0-content-id: +X-0-content-description: +X-0-is-multipart: 1 +X-0-is-coverletter: 1 +X-0-is-rfc822: 0 +X-0-decode-filename: TESTSUITE/spool/scan/10HmbE-0005vi-00/10HmbE-0005vi-00-00000 +X-0-content-size: 1 +X-1-content-type: text/plain +X-1-filename: +X-1-charset: us-ascii +X-1-boundary: +X-1-content-disposition: inline +X-1-content-transfer-encoding: +X-1-content-id: +X-1-content-description: +X-1-is-multipart: 0 +X-1-is-coverletter: 1 +X-1-is-rfc822: 0 +X-1-decode-filename: TESTSUITE/spool/scan/10HmbE-0005vi-00/10HmbE-0005vi-00-00001 +X-1-content-size: 1 +X-2-content-type: text/plain +X-2-filename: working-patch +X-2-charset: us-ascii +X-2-boundary: +X-2-content-disposition: attachment +X-2-content-transfer-encoding: +X-2-content-id: +X-2-content-description: +X-2-is-multipart: 0 +X-2-is-coverletter: 0 +X-2-is-rfc822: 0 +X-2-decode-filename: TESTSUITE/spool/scan/10HmbE-0005vi-00/10HmbE-0005vi-00-00002 +X-2-content-size: 1 +X-3-content-type: text/plain +X-3-filename: +X-3-charset: us-ascii +X-3-boundary: +X-3-content-disposition: inline +X-3-content-transfer-encoding: 7bit +X-3-content-id: +X-3-content-description: +X-3-is-multipart: 0 +X-3-is-coverletter: 0 +X-3-is-rfc822: 0 +X-3-decode-filename: TESTSUITE/spool/scan/10HmbE-0005vi-00/10HmbE-0005vi-00-00003 +X-3-content-size: 1 +X-Router-SSint: was preserved + +--T4sUOijqQbZv57TR +Content-Type: text/plain; charset=us-ascii +Content-Disposition: inline + +There was a part of the patch missing, complete one is attached. + sorry for wasting your time + +--T4sUOijqQbZv57TR +Content-Type: text/plain; charset=us-ascii +Content-Disposition: attachment; filename=working-patch + +--- /usr/sbin/eximstats 2004-12-17 13:36:44.381983753 +0100 ++++ eximstats 2004-12-17 13:47:37.763185260 +0100 +@@ -1107,11 +1107,11 @@ + if (scalar @chartdatanames < $ntopchart) + { + push(@chartdatanames, $key); +- push(@chartdatavals, $$m_count{$key}); ++ push(@chartdatavals, $$m_data{$key}); + } + else + { +- $chartotherval += $$m_count{$key}; ++ $chartotherval += $$m_data{$key}; + } + } + push(@chartdatanames, "Other"); + +--T4sUOijqQbZv57TR +Content-Type: text/plain; charset="us-ascii" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Content-Disposition: inline + +-- + +--T4sUOijqQbZv57TR-- + +From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 +Received: from CALLER (helo=test.ex) + by myhost.test.ex with local-esmtp (Exim x.yz) + (envelope-from ) + id 10HmbF-0005vi-00 + for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 +From: Test person +To: Me +Subject: A real test message +Date: Tue, 2 Mar 1999 09:44:33 +0000 +Message-ID: <41C2F849.3060203@projectile.test.ex> +FakeDefer: test fakedefer +Sender: CALLER_NAME +X-Regex: Regex matched +X-Router-SSint: was preserved + +OK, this should look like a genuine message, but +it will trip on THIS REGEX. + diff --git a/test/rejectlog/4010 b/test/rejectlog/4010 deleted file mode 100644 index c477c0534..000000000 --- a/test/rejectlog/4010 +++ /dev/null @@ -1,11 +0,0 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F= rejected after DATA: Found Eicar-Test-Signature -Envelope-from: -Envelope-to: -P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) - (envelope-from ) - id 10HmaX-0005vi-00 - for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 - Subject: a virus test -I Message-Id: -F From: CALLER_NAME - Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/rejectlog/4016 b/test/rejectlog/4016 new file mode 100644 index 000000000..c477c0534 --- /dev/null +++ b/test/rejectlog/4016 @@ -0,0 +1,11 @@ +1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F= rejected after DATA: Found Eicar-Test-Signature +Envelope-from: +Envelope-to: +P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) + (envelope-from ) + id 10HmaX-0005vi-00 + for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 + Subject: a virus test +I Message-Id: +F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/scripts/4000-scanning/4009 b/test/scripts/4000-scanning/4009 index 50f5ff990..9c72a8222 100644 --- a/test/scripts/4000-scanning/4009 +++ b/test/scripts/4000-scanning/4009 @@ -222,7 +222,7 @@ server 7833 > *eof **** -exim -odi -bs -DOPT='<; 127.0.0.1 7833 ; ::1 7834 pri=2 tmo=2s' +exim -odi -bs -DOPT='<; 127.0.0.1 7833 ; 127.0.0.2 7834 pri=2 tmo=2s' ehlo test.ex mail from:<> rcpt to: diff --git a/test/scripts/4010-scan-external/4010 b/test/scripts/4010-scan-external/4010 deleted file mode 100644 index 6f66b27ae..000000000 --- a/test/scripts/4010-scan-external/4010 +++ /dev/null @@ -1,212 +0,0 @@ -# Basic exiscan feature tests -echo ==> This test may take a bit of time, depending on exactly -echo ==> how your SpamAssassin is configured. -exim -odi -bs -ehlo test.ex -mail from:<> -rcpt to: -data -A message without any headers. -. -quit -**** -exim -odi -bs -ehlo test.ex -mail from:<> -rcpt to: -data -From: Test person -To: Me -Subject: A real test message -Date: Fri, 17 Dec 2004 16:13:04 +0100 -Message-ID: <41C2F849.3060203@projectile.test.ex> - -OK, this should look like a genuine message. -. -quit -**** -exim -odi -bs -ehlo test.ex -mail from:<> -rcpt to: -data -From: 99Junk99@somewhere.com -To: -Subject: MAKE MONEY FAST!!!! -Message-id: abcde - -This should be enough to trip the threshold. -. -quit -**** -exim -odi -bs -ehlo test.ex -mail from:<> -rcpt to: -data -From: Test person -To: Me -Subject: A real test message -Date: Fri, 17 Dec 2004 16:13:04 +0100 -Message-ID: <41C2F849.3060203@projectile.test.ex> -FakeReject: test fakereject - -OK, this should look like a genuine message, but -it will trip on THIS REGEX. -. -quit -**** -exim -odi -bs -ehlo test.ex -mail from:<> -rcpt to: -data -Date: Fri, 17 Dec 2004 14:35:01 +0100 -From: J Caesar -To: a-list00@exim.org -Message-ID: <20041217133501.GA3058@test.ex> -Mime-Version: 1.0 -Content-Type: multipart/mixed; boundary="T4sUOijqQbZv57TR" -Content-Disposition: inline -Subject: [exim] Re: Bug#286074: eximstats: uses message count as data for - the "volume" charts -X-BeenThere: a-list00@exim.org -X-Mailman-Version: 2.1.5 -Precedence: list - ---T4sUOijqQbZv57TR -Content-Type: text/plain; charset=US-ASCII -Content-Transfer-Encoding: quoted-printable -Content-Disposition: inline - -Test quoted-printable =3D -Space at end of line=40 -Continued line = -with this text. - ---T4sUOijqQbZv57TR -Content-Type: text/plain; charset=us-ascii -Content-Disposition: inline - -There was a part of the patch missing, complete one is attached. - sorry for wasting your time - ---T4sUOijqQbZv57TR -Content-Type: text/plain; charset=us-ascii -Content-Disposition: attachment; filename=working-patch - ---- /usr/sbin/eximstats 2004-12-17 13:36:44.381983753 +0100 -+++ eximstats 2004-12-17 13:47:37.763185260 +0100 -@@ -1107,11 +1107,11 @@ - if (scalar @chartdatanames < $ntopchart) - { - push(@chartdatanames, $key); -- push(@chartdatavals, $$m_count{$key}); -+ push(@chartdatavals, $$m_data{$key}); - } - else - { -- $chartotherval += $$m_count{$key}; -+ $chartotherval += $$m_data{$key}; - } - } - push(@chartdatanames, "Other"); - ---T4sUOijqQbZv57TR -Content-Type: text/plain; charset="us-ascii" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Content-Disposition: inline - --- - ---T4sUOijqQbZv57TR-- -. -quit -**** -# Non-smtp message -exim -odi userx@test.ex -A message without any headers. -. -**** -# Non-smtp MIME message -exim -odi userx@test.ex -Date: Fri, 17 Dec 2004 14:35:01 +0100 -From: J Caesar -To: a-list00@exim.org -Message-ID: <20041217133501.GA3058@test.ex> -Mime-Version: 1.0 -Content-Type: multipart/mixed; boundary="T4sUOijqQbZv57TR" -Content-Disposition: inline -Subject: [exim] Re: Bug#286074: eximstats: uses message count as data for - the "volume" charts -X-BeenThere: a-list00@exim.org -X-Mailman-Version: 2.1.5 -Precedence: list - ---T4sUOijqQbZv57TR -Content-Type: text/plain; charset=us-ascii -Content-Disposition: inline - -There was a part of the patch missing, complete one is attached. - sorry for wasting your time - ---T4sUOijqQbZv57TR -Content-Type: text/plain; charset=us-ascii -Content-Disposition: attachment; filename=working-patch - ---- /usr/sbin/eximstats 2004-12-17 13:36:44.381983753 +0100 -+++ eximstats 2004-12-17 13:47:37.763185260 +0100 -@@ -1107,11 +1107,11 @@ - if (scalar @chartdatanames < $ntopchart) - { - push(@chartdatanames, $key); -- push(@chartdatavals, $$m_count{$key}); -+ push(@chartdatavals, $$m_data{$key}); - } - else - { -- $chartotherval += $$m_count{$key}; -+ $chartotherval += $$m_data{$key}; - } - } - push(@chartdatanames, "Other"); - ---T4sUOijqQbZv57TR -Content-Type: text/plain; charset="us-ascii" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Content-Disposition: inline - --- - ---T4sUOijqQbZv57TR-- -**** -exim -odi -bs -ehlo test.ex -mail from:<> -rcpt to: -data -From: Test person -To: Me -Subject: A real test message -Date: Fri, 17 Dec 2004 16:13:04 +0100 -Message-ID: <41C2F849.3060203@projectile.test.ex> -FakeDefer: test fakedefer - -OK, this should look like a genuine message, but -it will trip on THIS REGEX. -. -quit -**** -# Very simple virus test -exim -odi -bs -mail from:<> -rcpt to: -data -Subject: a virus test - -X5O!P%@AP[4\PZX54(P^)7CC)7}$EICAR-STANDARD-ANTIVIRUS-TEST-FILE!$H+H* -. -quit -**** diff --git a/test/scripts/4010-scan-external/REQUIRES b/test/scripts/4010-scan-external/REQUIRES deleted file mode 100644 index 3f002958c..000000000 --- a/test/scripts/4010-scan-external/REQUIRES +++ /dev/null @@ -1,3 +0,0 @@ -support Content_Scanning -running SpamAssassin -running ClamAV diff --git a/test/scripts/4010-scan-ipv6/4010 b/test/scripts/4010-scan-ipv6/4010 new file mode 100644 index 000000000..66db933e6 --- /dev/null +++ b/test/scripts/4010-scan-ipv6/4010 @@ -0,0 +1,60 @@ +# content scan interface: spamassassin / ipv6 +# +# Multiple servers, prioritised, with timeout spec; first one fails +# List separator changed +server 7833 +SPAMD/1.1 0 EX_OK +>Spam: False ; 4.5 / 5.0 +> +>Spam detection software, running on the system "demo", +>has NOT identified this incoming email as spam. The original +>message has been attached to this so you can view it or label +>similar future email. If you have any questions, see +>@@CONTACT_ADDRESS@@ for details. +> +>Content preview: test [...] +> +>Content analysis details: (4.5 points, 5.0 required) +> +> pts rule name description +>---- ---------------------- -------------------------------------------------- +>-1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP +> 1.2 MISSING_HEADERS Missing To: header +> 1.0 MISSING_FROM Missing From: header +> 1.8 MISSING_SUBJECT Missing Subject: header +> 1.4 MISSING_DATE Missing Date: header +> 0.1 MISSING_MID Missing Message-Id: header +> +*eof +**** +exim -odi -bs -DOPT='<; 127.0.0.1 7833 ; ::1 7834 pri=2 tmo=2s' +ehlo test.ex +mail from:<> +rcpt to: +data +Content-type: text/plain + +test +. +quit +**** +# +# diff --git a/test/scripts/4010-scan-ipv6/REQUIRES b/test/scripts/4010-scan-ipv6/REQUIRES new file mode 100644 index 000000000..927190137 --- /dev/null +++ b/test/scripts/4010-scan-ipv6/REQUIRES @@ -0,0 +1,2 @@ +support Content_Scanning +support IPv6 diff --git a/test/scripts/4016-scan-external/4016 b/test/scripts/4016-scan-external/4016 new file mode 100644 index 000000000..6f66b27ae --- /dev/null +++ b/test/scripts/4016-scan-external/4016 @@ -0,0 +1,212 @@ +# Basic exiscan feature tests +echo ==> This test may take a bit of time, depending on exactly +echo ==> how your SpamAssassin is configured. +exim -odi -bs +ehlo test.ex +mail from:<> +rcpt to: +data +A message without any headers. +. +quit +**** +exim -odi -bs +ehlo test.ex +mail from:<> +rcpt to: +data +From: Test person +To: Me +Subject: A real test message +Date: Fri, 17 Dec 2004 16:13:04 +0100 +Message-ID: <41C2F849.3060203@projectile.test.ex> + +OK, this should look like a genuine message. +. +quit +**** +exim -odi -bs +ehlo test.ex +mail from:<> +rcpt to: +data +From: 99Junk99@somewhere.com +To: +Subject: MAKE MONEY FAST!!!! +Message-id: abcde + +This should be enough to trip the threshold. +. +quit +**** +exim -odi -bs +ehlo test.ex +mail from:<> +rcpt to: +data +From: Test person +To: Me +Subject: A real test message +Date: Fri, 17 Dec 2004 16:13:04 +0100 +Message-ID: <41C2F849.3060203@projectile.test.ex> +FakeReject: test fakereject + +OK, this should look like a genuine message, but +it will trip on THIS REGEX. +. +quit +**** +exim -odi -bs +ehlo test.ex +mail from:<> +rcpt to: +data +Date: Fri, 17 Dec 2004 14:35:01 +0100 +From: J Caesar +To: a-list00@exim.org +Message-ID: <20041217133501.GA3058@test.ex> +Mime-Version: 1.0 +Content-Type: multipart/mixed; boundary="T4sUOijqQbZv57TR" +Content-Disposition: inline +Subject: [exim] Re: Bug#286074: eximstats: uses message count as data for + the "volume" charts +X-BeenThere: a-list00@exim.org +X-Mailman-Version: 2.1.5 +Precedence: list + +--T4sUOijqQbZv57TR +Content-Type: text/plain; charset=US-ASCII +Content-Transfer-Encoding: quoted-printable +Content-Disposition: inline + +Test quoted-printable =3D +Space at end of line=40 +Continued line = +with this text. + +--T4sUOijqQbZv57TR +Content-Type: text/plain; charset=us-ascii +Content-Disposition: inline + +There was a part of the patch missing, complete one is attached. + sorry for wasting your time + +--T4sUOijqQbZv57TR +Content-Type: text/plain; charset=us-ascii +Content-Disposition: attachment; filename=working-patch + +--- /usr/sbin/eximstats 2004-12-17 13:36:44.381983753 +0100 ++++ eximstats 2004-12-17 13:47:37.763185260 +0100 +@@ -1107,11 +1107,11 @@ + if (scalar @chartdatanames < $ntopchart) + { + push(@chartdatanames, $key); +- push(@chartdatavals, $$m_count{$key}); ++ push(@chartdatavals, $$m_data{$key}); + } + else + { +- $chartotherval += $$m_count{$key}; ++ $chartotherval += $$m_data{$key}; + } + } + push(@chartdatanames, "Other"); + +--T4sUOijqQbZv57TR +Content-Type: text/plain; charset="us-ascii" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Content-Disposition: inline + +-- + +--T4sUOijqQbZv57TR-- +. +quit +**** +# Non-smtp message +exim -odi userx@test.ex +A message without any headers. +. +**** +# Non-smtp MIME message +exim -odi userx@test.ex +Date: Fri, 17 Dec 2004 14:35:01 +0100 +From: J Caesar +To: a-list00@exim.org +Message-ID: <20041217133501.GA3058@test.ex> +Mime-Version: 1.0 +Content-Type: multipart/mixed; boundary="T4sUOijqQbZv57TR" +Content-Disposition: inline +Subject: [exim] Re: Bug#286074: eximstats: uses message count as data for + the "volume" charts +X-BeenThere: a-list00@exim.org +X-Mailman-Version: 2.1.5 +Precedence: list + +--T4sUOijqQbZv57TR +Content-Type: text/plain; charset=us-ascii +Content-Disposition: inline + +There was a part of the patch missing, complete one is attached. + sorry for wasting your time + +--T4sUOijqQbZv57TR +Content-Type: text/plain; charset=us-ascii +Content-Disposition: attachment; filename=working-patch + +--- /usr/sbin/eximstats 2004-12-17 13:36:44.381983753 +0100 ++++ eximstats 2004-12-17 13:47:37.763185260 +0100 +@@ -1107,11 +1107,11 @@ + if (scalar @chartdatanames < $ntopchart) + { + push(@chartdatanames, $key); +- push(@chartdatavals, $$m_count{$key}); ++ push(@chartdatavals, $$m_data{$key}); + } + else + { +- $chartotherval += $$m_count{$key}; ++ $chartotherval += $$m_data{$key}; + } + } + push(@chartdatanames, "Other"); + +--T4sUOijqQbZv57TR +Content-Type: text/plain; charset="us-ascii" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Content-Disposition: inline + +-- + +--T4sUOijqQbZv57TR-- +**** +exim -odi -bs +ehlo test.ex +mail from:<> +rcpt to: +data +From: Test person +To: Me +Subject: A real test message +Date: Fri, 17 Dec 2004 16:13:04 +0100 +Message-ID: <41C2F849.3060203@projectile.test.ex> +FakeDefer: test fakedefer + +OK, this should look like a genuine message, but +it will trip on THIS REGEX. +. +quit +**** +# Very simple virus test +exim -odi -bs +mail from:<> +rcpt to: +data +Subject: a virus test + +X5O!P%@AP[4\PZX54(P^)7CC)7}$EICAR-STANDARD-ANTIVIRUS-TEST-FILE!$H+H* +. +quit +**** diff --git a/test/scripts/4016-scan-external/REQUIRES b/test/scripts/4016-scan-external/REQUIRES new file mode 100644 index 000000000..3f002958c --- /dev/null +++ b/test/scripts/4016-scan-external/REQUIRES @@ -0,0 +1,3 @@ +support Content_Scanning +running SpamAssassin +running ClamAV diff --git a/test/scripts/5800-DANE/REQUIRES b/test/scripts/5800-DANE/REQUIRES index 2314a3236..e6a22bec3 100644 --- a/test/scripts/5800-DANE/REQUIRES +++ b/test/scripts/5800-DANE/REQUIRES @@ -1,2 +1,2 @@ support Experimental_DANE -running IPv4 +lookup dnsdb diff --git a/test/stdout/4010 b/test/stdout/4010 index 819f449ef..a1d7f2ea7 100644 --- a/test/stdout/4010 +++ b/test/stdout/4010 @@ -1,70 +1,57 @@ 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 250-myhost.test.ex Hello CALLER at test.ex 250-SIZE 52428800 +250-8BITMIME 250-PIPELINING 250 HELP 250 OK 250 Accepted 354 Enter message, ending with "." on a line by itself -250 OK id=10HmaY-0005vi-00 -221 myhost.test.ex closing connection -220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 -250-myhost.test.ex Hello CALLER at test.ex -250-SIZE 52428800 -250-PIPELINING -250 HELP -250 OK -250 Accepted -354 Enter message, ending with "." on a line by itself -250 OK id=10HmaZ-0005vi-00 -221 myhost.test.ex closing connection -220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 -250-myhost.test.ex Hello CALLER at test.ex -250-SIZE 52428800 -250-PIPELINING -250 HELP -250 OK -250 Accepted -354 Enter message, ending with "." on a line by itself -250 OK id=10HmbA-0005vi-00 -221 myhost.test.ex closing connection -220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 -250-myhost.test.ex Hello CALLER at test.ex -250-SIZE 52428800 -250-PIPELINING -250 HELP -250 OK -250 Accepted -354 Enter message, ending with "." on a line by itself -550-Your message has been rejected but is being kept for evaluation. -550-If it was a legitimate message, it may still be delivered to the target -550 recipient(s). -221 myhost.test.ex closing connection -220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 -250-myhost.test.ex Hello CALLER at test.ex -250-SIZE 52428800 -250-PIPELINING -250 HELP -250 OK -250 Accepted -354 Enter message, ending with "." on a line by itself -250 OK id=10HmbC-0005vi-00 -221 myhost.test.ex closing connection -220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 -250-myhost.test.ex Hello CALLER at test.ex -250-SIZE 52428800 -250-PIPELINING -250 HELP -250 OK -250 Accepted -354 Enter message, ending with "." on a line by itself -450-Your message has been rejected but is being kept for evaluation. -450-If it was a legitimate message, it may still be delivered to the target -450 recipient(s). -221 myhost.test.ex closing connection -220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 -250 OK -250 Accepted -354 Enter message, ending with "." on a line by itself -550 Found Eicar-Test-Signature +250 OK id=10HmaX-0005vi-00 221 myhost.test.ex closing connection + +******** SERVER ******** +Listening on port 7833 ... +Connection request from [127.0.0.1] + +) +< id 10HmaX-0005vi-00 +< for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 + + +SPAMD/1.1 0 EX_OK +>Spam: False ; 4.5 / 5.0 +> +>Spam detection software, running on the system "demo", +>has NOT identified this incoming email as spam. The original +>message has been attached to this so you can view it or label +>similar future email. If you have any questions, see +>@@CONTACT_ADDRESS@@ for details. +> +>Content preview: test [...] +> +>Content analysis details: (4.5 points, 5.0 required) +> +> pts rule name description +>---- ---------------------- -------------------------------------------------- +>-1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP +> 1.2 MISSING_HEADERS Missing To: header +> 1.0 MISSING_FROM Missing From: header +> 1.8 MISSING_SUBJECT Missing Subject: header +> 1.4 MISSING_DATE Missing Date: header +> 0.1 MISSING_MID Missing Message-Id: header +> +Expected EOF read from client +End of script diff --git a/test/stdout/4016 b/test/stdout/4016 new file mode 100644 index 000000000..819f449ef --- /dev/null +++ b/test/stdout/4016 @@ -0,0 +1,70 @@ +220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +250-myhost.test.ex Hello CALLER at test.ex +250-SIZE 52428800 +250-PIPELINING +250 HELP +250 OK +250 Accepted +354 Enter message, ending with "." on a line by itself +250 OK id=10HmaY-0005vi-00 +221 myhost.test.ex closing connection +220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +250-myhost.test.ex Hello CALLER at test.ex +250-SIZE 52428800 +250-PIPELINING +250 HELP +250 OK +250 Accepted +354 Enter message, ending with "." on a line by itself +250 OK id=10HmaZ-0005vi-00 +221 myhost.test.ex closing connection +220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +250-myhost.test.ex Hello CALLER at test.ex +250-SIZE 52428800 +250-PIPELINING +250 HELP +250 OK +250 Accepted +354 Enter message, ending with "." on a line by itself +250 OK id=10HmbA-0005vi-00 +221 myhost.test.ex closing connection +220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +250-myhost.test.ex Hello CALLER at test.ex +250-SIZE 52428800 +250-PIPELINING +250 HELP +250 OK +250 Accepted +354 Enter message, ending with "." on a line by itself +550-Your message has been rejected but is being kept for evaluation. +550-If it was a legitimate message, it may still be delivered to the target +550 recipient(s). +221 myhost.test.ex closing connection +220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +250-myhost.test.ex Hello CALLER at test.ex +250-SIZE 52428800 +250-PIPELINING +250 HELP +250 OK +250 Accepted +354 Enter message, ending with "." on a line by itself +250 OK id=10HmbC-0005vi-00 +221 myhost.test.ex closing connection +220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +250-myhost.test.ex Hello CALLER at test.ex +250-SIZE 52428800 +250-PIPELINING +250 HELP +250 OK +250 Accepted +354 Enter message, ending with "." on a line by itself +450-Your message has been rejected but is being kept for evaluation. +450-If it was a legitimate message, it may still be delivered to the target +450 recipient(s). +221 myhost.test.ex closing connection +220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +250 OK +250 Accepted +354 Enter message, ending with "." on a line by itself +550 Found Eicar-Test-Signature +221 myhost.test.ex closing connection -- cgit v1.2.3