Handle Proxy Protocol v2 safely as well.

[exim.git] / src / scripts / reversion

diff --git a/src/scripts/reversion b/src/scripts/reversion
index 97b8874a55afffe3844524ddd8585de35c9a0fd6..9707b9c1c680911372d4b209d6132c28a5882f14 100755 (executable)
--- a/src/scripts/reversion
+++ b/src/scripts/reversion
@@ -1,4 +1,9 @@
 #!/bin/sh
 #!/bin/sh

+# Copyright (c) The Exim Maintainers 2016
+
+set -e
+LC_ALL=C
+export LC_ALL

 
 # Update Exim's version header file.
 
 
 # Update Exim's version header file.
 


@@ -37,8 +42,13 @@ then
        # Modify the output of git describe into separate parts for
        # the name "exim" and the release and variant versions.
        # Put a dot in the version number and remove a spurious g.
        # Modify the output of git describe into separate parts for
        # the name "exim" and the release and variant versions.
        # Put a dot in the version number and remove a spurious g.

-       set $(git describe --dirty=-XX --match 'exim-4*' |
-               sed 's|-| |;s|_|.|;s|[-_]| _|;s|-g|-|')
+       if [ "$2" ]
+       then
+           description=$(git describe "$2")
+       else
+           description=$(git describe --dirty=-XX --match 'exim-4*')
+       fi
+       set $(echo "$description" | sed 's|-| |;s|_|.|;s|[-_]| _|;s|-g|-|')

        # Only update if we need to
        if [ "$2 $3" != "$EXIM_RELEASE_VERSION $EXIM_VARIANT_VERSION" ]
        then
        # Only update if we need to
        if [ "$2 $3" != "$EXIM_RELEASE_VERSION $EXIM_VARIANT_VERSION" ]
        then


@@ -52,7 +62,7 @@ fi
 # create your own version.sh as part of your release process, or you
 # can modify EXIM_VARIANT_VERSION at this point in this script.
 
 # create your own version.sh as part of your release process, or you
 # can modify EXIM_VARIANT_VERSION at this point in this script.
 

-case $EXIM_RELEASE_VERSION in
+case "$EXIM_RELEASE_VERSION" in

 '')    echo "*** Your copy of Exim lacks any version information."
        exit 1
 esac
 '')    echo "*** Your copy of Exim lacks any version information."
        exit 1
 esac