[patch] sslh version fix

sslh_version.patch (text/plain), 1.61 KB, created by Anton Bolshakov on 2014-03-21 10:09:19 UTC

diff -urN sslh-v1.16.orig/genver.sh sslh-v1.16/genver.sh
--- sslh-v1.16.orig/genver.sh	2014-02-12 05:06:01.000000000 +0800
+++ sslh-v1.16/genver.sh	2014-03-21 18:07:15.000000000 +0800
@@ -10,10 +10,19 @@
 if ! `(git status | grep -q "On branch") 2> /dev/null`; then
         # If we don't have git, we can't work out what
         # version this is. It must have been downloaded as a
-        # zip file. Github creates the zip file with all
-        # files dated from the last change: use the
-        # Makefile's modification time as a release number
-	release=zip-`stat -c "%y" Makefile | sed 's/ .*//'`
+        # zip file. 
+        
+        # If downloaded from the release page, the directory
+        # has the version number.
+        release=`pwd | sed s/.*sslh-// | grep "[[:digit:]]"`
+        
+        if [ "x$release" = "x" ]; then
+            # If downloaded from the head, Github creates the
+            # zip file with all files dated from the last
+            # change: use the Makefile's modification time as a
+            # release number
+            release=head-`stat -c "%y" Makefile | sed 's/ .*//'`
+        fi
 fi
 
 if head=`git rev-parse --verify HEAD 2>/dev/null`; then
diff -urN sslh-v1.16.orig/Makefile sslh-v1.16/Makefile
--- sslh-v1.16.orig/Makefile	2014-02-12 05:06:01.000000000 +0800
+++ sslh-v1.16/Makefile	2014-03-21 18:05:31.000000000 +0800
@@ -3,7 +3,7 @@
 VERSION=$(shell ./genver.sh -r)
 USELIBCONFIG=1	# Use libconfig? (necessary to use configuration files)
 USELIBWRAP=	# Use libwrap?
-USELIBCAP=	# Use libcap?
+USELIBCAP=1	# Use libcap?
 COV_TEST= 	# Perform test coverage?
 PREFIX=/usr/local