DKIM: enforce limit of 20 on received DKIM-Signature: headers. Bug 2269

[exim.git] / src / scripts / reversion

diff --git a/src/scripts/reversion b/src/scripts/reversion
index 45755c0848944e53fe81438e98cdcb492ec46219..0ee2f8dc78a9568e86c50ed2baa6bbd10839d878 100755 (executable)
--- a/src/scripts/reversion
+++ b/src/scripts/reversion
@@ -1,5 +1,5 @@
 #!/bin/sh
 #!/bin/sh

-# Copyright (c) The Exim Maintainers 2016
+# Copyright (c) The Exim Maintainers 1995 - 2018

 
 set -e
 LC_ALL=C
 
 set -e
 LC_ALL=C


@@ -37,7 +37,7 @@ fi
 
 # If this tree is a git working directory, use that to get version information.
 
 
 # If this tree is a git working directory, use that to get version information.
 

-if [ -d ../../.git ] || [ "$1" = "release" ]
+if [ -d ../../.git ] || [ -f ../../.git ] || [ "$1" = "release" ]

 then
        # Modify the output of git describe into separate parts for
        # the name "exim" and the release and variant versions.
 then
        # Modify the output of git describe into separate parts for
        # the name "exim" and the release and variant versions.


@@ -96,7 +96,7 @@ if [ ".${SOURCE_DATE_EPOCH:-}" != "." ]; then
   # builds without it causing any problems: nothing really cares about timezone.
   # GNU date: "date -d @TS"
   # BSD date: "date -r TS"
   # builds without it causing any problems: nothing really cares about timezone.
   # GNU date: "date -d @TS"
   # BSD date: "date -r TS"

-  exim_build_date_override="$(date -u -d "@${SOURCE_DATE_EPOCH}" "$fmt" 2>/dev/null | date -u -r "${SOURCE_DATE_EPOCH}" "$fmt" 2>/dev/null)"
+  exim_build_date_override="$(date -u -d "@${SOURCE_DATE_EPOCH}" "$fmt" 2>/dev/null || date -u -r "${SOURCE_DATE_EPOCH}" "$fmt" 2>/dev/null)"

 fi
 
 ( echo '# automatically generated file - see ../scripts/reversion'
 fi
 
 ( echo '# automatically generated file - see ../scripts/reversion'