X-Git-Url: https://vcs.fsf.org/?p=exim.git;a=blobdiff_plain;f=test%2Fpatchexim;h=c2983e4d0b742cb449fbe0fe5cf53fe24196690f;hp=9659ba133cecd443e3ef5ac101d7dc544c3f5979;hb=bf624a64a4395692f94ad304126a81d35a6d95df;hpb=4fab92fbc2b63bac2d89c1dae69fa1845cb640b7

diff --git a/test/patchexim b/test/patchexim
index 9659ba133..c2983e4d0 100755
--- a/test/patchexim
+++ b/test/patchexim
@@ -19,7 +19,18 @@ open(OUT, '>eximdir/exim') || die "** Failed to open eximdir/exim: $!\n";
 while(<IN>)
   {
   s/>>>running<<</<<<testing>>>/;
-  s/(\d+\.\d+(?:[_.]\d+)?([_-]RC\d+|[_-]dev)?(?:[0-9a-fA-F-]*)(?:-XX)?\0<<eximversion>>)/"x.yz\0" . ("*" x (length($1) - 5))/e;
+  s{
+    (\d+\.\d+                         # major.minor
+    (?:[_.]\d+)?                      # optional security-patchlevel
+    (?:[_.]\d+)?                      # optional patchlevel
+    (?:[_-]RC\d+|[_-]?dev(?:start)?)? # optional RC or dev(start)
+    (?:(?:[_-]\d+)?                   # git tag distance
+       [-_][[:xdigit:]]+)?            # git id
+    (?:[-_]XX)?\0                     # git dirty bit
+    <<eximversion>>                   # marker
+    )
+   }
+   {"x.yz\0" . ("*" x (length($1) - 5))}xe;
   print OUT;
   }