New format for exim_message_id

5 files changed, 124 insertions, 80 deletions

diff --git a/test/scripts/0000-Basic/0699 b/test/scripts/0000-Basic/0699
new file mode 100644
index 000000000..20389ff53
--- /dev/null
+++ b/test/scripts/0000-Basic/0699
@@ -0,0 +1,40 @@
+# message ID format manipulation
+# This testcase is for the 4.97 message-id format changeover
+# should can be dropped after a few further releases.
+#
+# Ensure spooldir exists
+sudo mkdir -p DIR/spool/input
+#
+# Check that delivery of old-format spoolfiles works
+sudo cp DIR/aux-fixed/TESTNUM/* DIR/spool/input/
+sudo chown -R EXIMUSER:EXIMGROUP DIR/spool/input/
+sudo chmod -R 640 DIR/spool/input/*
+exim -q
+****
+#
+# Check that the format-mangler utility can downgrade spoolfiles
+exim -odq nulldeliver@test.ex
+Subject: originally-new id format spoolfile
+
+This is the only body content line
+****
+exim -bp
+****
+exim_id_update -d
+exim -bp
+****
+exim -q
+****
+#
+# Check that the format-mangler utility can upgrade spoolfiles
+sudo cp DIR/aux-fixed/TESTNUM/* DIR/spool/input/
+sudo chown -R EXIMUSER:EXIMGROUP DIR/spool/input/
+sudo chmod -R 640 DIR/spool/input/*
+exim_id_update -u
+exim -bp
+****
+exim -q
+****
+#
+#
+no_msglog_check
diff --git a/test/scripts/0000-Basic/0700 b/test/scripts/0000-Basic/0700
index 255e8e209..af5fd600c 100644
--- a/test/scripts/0000-Basic/0700
+++ b/test/scripts/0000-Basic/0700
@@ -13,6 +13,10 @@ exim_msgdate E1pAnS3-003fPj-Tw
 0 TZ=GB
 exim_msgdate 1pEPHo-005xgk-2e
 ****
+### New-format log message ID
+0 TZ=GB
+exim_msgdate 1ptUlY-00000000PfG-46ri
+****
 ### Just the date part of the Message ID:
 ###    The Epoch ...
 0 TZ=GB
@@ -40,7 +44,7 @@ exim_msgdate E000000-005XGK-00 1pAnS3-003fPj-Tw zzzzzz
 exim_msgdate --base36 000000-005XGK-00
 ****
 0 TZ=GB
-exim_msgdate --base36 ZZZZZZ-005XGK-ZZ
+exim_msgdate --base36 ZZZZZZ-005XGK-RR
 ****
 255 TZ=GB
 exim_msgdate --base36 zzzzzz-005xgk-zz
@@ -55,10 +59,10 @@ exim_msgdate --base 32 ZZZZZZ
 exim_msgdate --base62 000000-005XGK-00
 ****
 0 TZ=GB
-exim_msgdate --base62 ZZZZZZ-005XGK-ZZ
+exim_msgdate --base62 ZZZZZZ-005XGK-WF
 ****
 0 TZ=GB
-exim_msgdate --base62 zzzzzz-005xgk-zz
+exim_msgdate --base62 zzzzzz-005xgk-WF
 ****
 ### Some strings that are similar to, but not Exim Message IDs:
 0 TZ=GB
@@ -78,7 +82,7 @@ exim_msgdate -local 000000
 exim_msgdate -local E1pAnS3-003fPj-Tw
 ****
 0 TZ=GB
-exim_msgdate -local zzzzzz-003fPj-zz
+exim_msgdate -local zzzzzz-003fPj-WF
 ****
 ### Print date with timezone GMT/Zulu
 0 TZ=GB
@@ -91,49 +95,49 @@ exim_msgdate -GMT E1pAnS3-003fPj-Tw
 exim_msgdate -zulu E1pAnS3-003fPj-Tw
 ****
 0 TZ=GB
-exim_msgdate -zulu EZZZZZZ-003fPj-ZZ
+exim_msgdate -zulu EZZZZZZ-003fPj-WF
 ****
 ### Print date as seconds since the UNIX epoch.
 0 TZ=GB
 exim_msgdate -unix E000000-003fPj-00
 ****
 0 TZ=GB
-exim_msgdate -unix E1pAnS3-003fPj-tw
+exim_msgdate -unix E1pAnS3-003fPj-WF
 ****
 0 TZ=GB
-exim_msgdate -unix Ezzzzzz-003fpj-zz
+exim_msgdate -unix Ezzzzzz-003fpj-WF
 ****
 ### Show the process id too
 0 TZ=GB
-exim_msgdate -unix --pid EZZZZZZ-003fPj-ZZ
+exim_msgdate -unix --pid EZZZZZZ-003fPj-WF
 ****
 0 TZ=GB
-exim_msgdate -pid EZZZZZZ-003fPj-ZZ
+exim_msgdate -pid EZZZZZZ-003fPj-WF
 ****
 0 TZ=GB
-exim_msgdate -local --pid EZZZZZZ-003fPj-ZZ
+exim_msgdate -local --pid EZZZZZZ-003fPj-WF
 ****
 ### Override the value of localhost_number set in the exim configuation file
 0 TZ=GB
-exim_msgdate -local --localhost_number 11 -base 62 EZZZZZZ-003FPJ-ZZ
+exim_msgdate -local --localhost_number 11 -base 62 EZZZZZZ-003FPJ-WF
 ****
 0 TZ=GB
-exim_msgdate --localhost_number 11 -base 62 EZZZZZZ-003FPJ-ZZ
+exim_msgdate --localhost_number 11 -base 62 EZZZZZZ-003FPJ-WF
 ****
 0 TZ=GB
-exim_msgdate --localhost_number 9 -base 36 EZZZZZZ-003FPJ-ZZ
+exim_msgdate --localhost_number 9 -base 36 EZZZZZZ-003FPJ-Q0
 ****
 255 TZ=GB
-exim_msgdate --localhost_number 11 -base 36 EZZZZZZ-003FPJ-ZZ
+exim_msgdate --localhost_number 11 -base 36 EZZZZZZ-003FPJ-WF
 ****
 0 TZ=GB
-exim_msgdate -localhost_number 11 --local -base 62 EZZZZZZ-003FPJ-ZZ
+exim_msgdate -localhost_number 11 --local -base 62 EZZZZZZ-003FPJ-WF
 ****
 255 TZ=GB
-exim_msgdate --localhost_number -1 -base 36 EZZZZZZ-003FPJ-ZZ
+exim_msgdate --localhost_number -1 -base 36 EZZZZZZ-003FPJ-WF
 ****
 255 TZ=GB
-exim_msgdate --localhost_number 19 -base 62 EZZZZZZ-003FPJ-ZZ
+exim_msgdate --localhost_number 19 -base 62 EZZZZZZ-003FPJ-WF
 ****
 #
 #
@@ -145,7 +149,7 @@ exim_msgdate --localhost_number 19 -base 62 EZZZZZZ-003FPJ-ZZ
 exim_msgdate -l -u -z -pid E000000-005XGK-00
 ****
 0 TZ=GB
-exim_msgdate -l -u -z -pid 000000-005XGK-00 ZZZZZZ-005XGK-zz 1PANS3-003FPJ-TW
+exim_msgdate -l -u -z -pid 000000-005XGK-00 ZZZZZZ-005XGK-WF 1PANS3-003FPJ-TW
 ****
 0 TZ=GB
 exim_msgdate -l -u -z -pid 000000 1PANS3 zzzzzz
@@ -158,7 +162,7 @@ exim_msgdate -l -u -z -pid 000000 1PANS3 ZZZZZZ
 exim_msgdate -l -u -z -localhost_number=3 E000000-005XGK-00
 ****
 0 TZ=GB
-exim_msgdate -l -u -z -localhost_number=3 000000-005XGK-00 ZZZZZZ-005XGK-zz 1PANS3-003FPJ-TW
+exim_msgdate -l -u -z -localhost_number=3 000000-005XGK-00 ZZZZZZ-005XGK-WF 1PANS3-003FPJ-TW
 ****
 0 TZ=GB
 exim_msgdate -l -u -z -localhost_number=3 000000 1PANS3 zzzzzz
@@ -171,7 +175,7 @@ exim_msgdate -l -u -z -localhost_number=3 000000 1PANS3 ZZZZZZ
 exim_msgdate -l -u -z -localhost_number=13 E000000-005XGK-00
 ****
 0 TZ=GB
-exim_msgdate -l -u -z -localhost_number=13 000000-005XGK-00 ZZZZZZ-005XGK-zz 1PANS3-003FPJ-TW
+exim_msgdate -l -u -z -localhost_number=13 000000-005XGK-00 ZZZZZZ-005XGK-WF 1PANS3-003FPJ-TW
 ****
 0 TZ=GB
 exim_msgdate -l -u -z -localhost_number=13 000000 1PANS3 zzzzzz
@@ -184,7 +188,7 @@ exim_msgdate -l -u -z -localhost_number=13 000000 1PANS3 ZZZZZZ
 exim_msgdate -l -u -z -localhost_number=20 E000000-005XGK-00
 ****
 255 TZ=GB
-exim_msgdate -l -u -z -localhost_number=20 000000-005XGK-00 ZZZZZZ-005XGK-zz 1PANS3-003FPJ-TW
+exim_msgdate -l -u -z -localhost_number=20 000000-005XGK-00 ZZZZZZ-005XGK-WF 1PANS3-003FPJ-TW
 ****
 255 TZ=GB
 exim_msgdate -l -u -z -localhost_number=20 000000 1PANS3 zzzzzz
@@ -196,8 +200,8 @@ exim_msgdate -l -u -z -localhost_number=20 000000 1PANS3 ZZZZZZ
 0 TZ=GB
 exim_msgdate -l -u -z --b36 E000000-005XGK-00
 ****
-255 TZ=GB
-exim_msgdate -l -u -z --b36 000000-005XGK-00 ZZZZZZ-005XGK-zz 1PANS3-003FPJ-TW
+0 TZ=GB
+exim_msgdate -l -u -z --b36 000000-005XGK-00 ZZZZZZ-005XGK-R0 1PANS3-003FPJ-RR
 ****
 255 TZ=GB
 exim_msgdate -l -u -z --b36 000000 1PANS3 zzzzzz
@@ -210,7 +214,7 @@ exim_msgdate -l -u -z --b36 000000 1PANS3 ZZZZZZ
 exim_msgdate -l -u -z --b62 E000000-005XGK-00
 ****
 0 TZ=GB
-exim_msgdate -l -u -z --b62 000000-005XGK-00 ZZZZZZ-005XGK-zz 1PANS3-003FPJ-TW
+exim_msgdate -l -u -z --b62 000000-005XGK-00 ZZZZZZ-005XGK-WF 1PANS3-003FPJ-TW
 ****
 0 TZ=GB
 exim_msgdate -l -u -z --b62 000000 1PANS3 zzzzzz
diff --git a/test/scripts/0000-Basic/0904 b/test/scripts/0000-Basic/0904
index 270a1167c..b505836d3 100644
--- a/test/scripts/0000-Basic/0904
+++ b/test/scripts/0000-Basic/0904
@@ -12,8 +12,8 @@ MAIL FROM
 250 OK
 RCPT TO
 250 OK
-BDAT 331 LAST
-*data 331
+BDAT 345 LAST
+*data 345
 250 OK
 QUIT
 225 OK
@@ -41,8 +41,8 @@ MAIL FROM
 250 good mail cmd
 RCPT TO
 250 acceptable rcpt cmd
-BDAT 331 LAST
-*data 332
+BDAT 345 LAST
+*data 346
 250 OK got that data
 QUIT
 225 OK quitting
@@ -71,8 +71,8 @@ MAIL FROM
 250 OK
 RCPT TO
 250 OK
-BDAT 331 LAST
-*data 330
+BDAT 345 LAST
+*data 344
 250 OK
 QUIT
 225 OK
@@ -99,8 +99,8 @@ MAIL FROM
 250 OK
 RCPT TO
 250 OK
-BDAT 331 LAST
-*data 331
+BDAT 345 LAST
+*data 345
 500 oops
 QUIT
 225 OK
@@ -127,8 +127,8 @@ MAIL FROM
 250 OK
 RCPT TO
 250 OK
-BDAT 331 LAST
-*data 331
+BDAT 345 LAST
+*data 345
 400 not right now
 QUIT
 225 OK
@@ -184,8 +184,8 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 331 LAST
-*data 331
+BDAT 345 LAST
+*data 345
 250 OK mail
 250 OK rcpt
 250 OK bdat
@@ -219,8 +219,8 @@ QUIT
 #250 CHUNKING
 #MAIL FROM
 #RCPT TO
-#BDAT 331 LAST
-#*data 332
+#BDAT 345 LAST
+#*data 346
 #250 good mail cmd
 #****
 #sudo exim -odf -bS
@@ -246,8 +246,8 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 331 LAST
-*data 330
+BDAT 345 LAST
+*data 344
 250 OK mail
 250 OK rcpt
 250 OK bdat
@@ -277,8 +277,8 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 331 LAST
-*data 331
+BDAT 345 LAST
+*data 345
 550 unacceptable mail-from
 550 rcpt ungood lacking mail-from
 500 bdat ungood lacking mail-from
@@ -306,8 +306,8 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 332 LAST
-*data 332
+BDAT 346 LAST
+*data 346
 450 greylisted mail-from
 550 rcpt ungood lacking mail-from
 500 bdat ungood lacking mail-from
@@ -335,8 +335,8 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 331 LAST
-*data 331
+BDAT 345 LAST
+*data 345
 250 OK mail
 550 no such recipient
 500 oops bdat
@@ -364,8 +364,8 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 331 LAST
-*data 331
+BDAT 345 LAST
+*data 345
 250 OK mail
 250 OK rcpt
 500 oops bdat
@@ -393,8 +393,8 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 331 LAST
-*data 331
+BDAT 345 LAST
+*data 345
 250 OK mail
 250 OK rcpt
 400 not right now bdat
diff --git a/test/scripts/0000-Basic/0905 b/test/scripts/0000-Basic/0905
index 5ec145e1a..a8c08eaaa 100644
--- a/test/scripts/0000-Basic/0905
+++ b/test/scripts/0000-Basic/0905
@@ -12,8 +12,8 @@ MAIL FROM
 250 OK
 RCPT TO
 250 OK
-BDAT 297
-*data 297
+BDAT 311
+*data 311
 250 OK nonlast bdat
 BDAT 8380 LAST
 *data 8380
@@ -134,8 +134,8 @@ MAIL FROM
 250 OK
 RCPT TO
 250 OK
-BDAT 297
-*data 297
+BDAT 311
+*data 311
 500 oops bdat-nonlast
 QUIT
 225 OK
@@ -255,10 +255,10 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 297
+BDAT 311
 250 OK mail
 250 OK rcpt
-*data 297
+*data 311
 250 OK nonlast bdat
 BDAT 8380 LAST
 *data 8380
@@ -380,8 +380,8 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 297
-*data 297
+BDAT 311
+*data 311
 550 unacceptable mail-from
 550 rcpt ungood lacking mail-from
 500 bdat (nonlast) ungood lacking mail-from
@@ -498,8 +498,8 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 297
-*data 297
+BDAT 311
+*data 311
 250 OK mail
 550 no such recipient
 500 oops nonlast bdat - no rcpt
@@ -617,8 +617,8 @@ EHLO
 MAIL FROM
 RCPT TO
 RCPT TO
-BDAT 281
-*data 281
+BDAT 295
+*data 295
 250 OK mail
 550 no such recipient
 250 good recipient
@@ -740,8 +740,8 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 297
-*data 297
+BDAT 311
+*data 311
 250 OK mail
 250 OK rcpt
 500 oops nonlast bdat
@@ -858,8 +858,8 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 297
-*data 297
+BDAT 311
+*data 311
 250 OK mail
 250 OK rcpt
 250 OK nonlast bdat
@@ -979,8 +979,8 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 297
-*data 297
+BDAT 311
+*data 311
 250 OK mail
 250 OK rcpt
 400 oops nonlast bdat
@@ -1103,8 +1103,8 @@ BDAT 8191
 250 OK rcpt
 *data 8191
 250 OK nonlast bdat
-BDAT 809 LAST
-*data 809
+BDAT 823 LAST
+*data 823
 250 OK bdat
 QUIT
 225 OK
diff --git a/test/scripts/0000-Basic/0911 b/test/scripts/0000-Basic/0911
index 39b7f0092..522e06cb0 100644
--- a/test/scripts/0000-Basic/0911
+++ b/test/scripts/0000-Basic/0911
@@ -11,10 +11,10 @@ EHLO
 250 OK
 MAIL FROM
 RCPT TO
-BDAT 315 LAST
+BDAT 329 LAST
 250 OK mail
 250 OK rcpt
-*data 315
+*data 329
 QUIT
 250 OK chunked message data
 221 Closing connection
@@ -39,8 +39,8 @@ MAIL FROM
 250 OK mail
 RCPT TO
 250 OK rcpt
-BDAT 317 LAST
-*data 317
+BDAT 331 LAST
+*data 331
 250 OK chunked message data
 QUIT
 221 Closing connection
@@ -68,8 +68,8 @@ MAIL FROM
 250 OK mail
 RCPT TO
 250 OK rcpt
-BDAT 321 LAST
-*data 321
+BDAT 335 LAST
+*data 335
 QUIT
 451 Service not available
 221 Closing connection
@@ -98,8 +98,8 @@ MAIL FROM
 250 OK mail
 RCPT TO
 250 OK rcpt
-BDAT 321 LAST
-*data 321
+BDAT 335 LAST
+*data 335
 QUIT
 550 content rejected
 221 Closing connection
@@ -126,8 +126,8 @@ MAIL FROM
 250 OK mail
 RCPT TO
 250 OK rcpt
-BDAT 319 LAST
-*data 319
+BDAT 333 LAST
+*data 333
 >*eof
 ****
 sudo exim -d-all+transport -odi -bs