Index: Makefile --- Makefile.orig 2016-03-29 21:19:05.000000000 +0200 +++ Makefile 2016-04-05 22:42:27.237328656 +0200 @@ -2,7 +2,7 @@ VERSION=$(shell ./genver.sh -r) ENABLE_REGEX=1 # Enable regex probes -USELIBCONFIG=1 # Use libconfig? (necessary to use configuration files) +USELIBCONFIG= # Use libconfig? (necessary to use configuration files) USELIBPCRE= # Use libpcre? (needed for regex on musl) USELIBWRAP?= # Use libwrap? USELIBCAP= # Use libcap? @@ -12,7 +12,7 @@ BINDIR?=$(PREFIX)/sbin MANDIR?=$(PREFIX)/share/man/man8 -MAN=sslh.8.gz # man page name +MAN=sslh.8 # man page name # End of configuration -- the rest should take care of # itself @@ -23,6 +23,7 @@ CC ?= gcc CFLAGS ?=-Wall -g $(CFLAGS_COV) +LDFLAGS= LIBS= OBJS=common.o sslh-main.o probe.o tls.o @@ -82,7 +83,7 @@ $(CC) $(CFLAGS) $(LDFLAGS) -o echosrv echosrv.o probe.o common.o tls.o $(LIBS) $(MAN): sslh.pod Makefile - pod2man --section=8 --release=$(VERSION) --center=" " sslh.pod | gzip -9 - > $(MAN) + pod2man --section=8 --release=$(VERSION) --center=" " sslh.pod > $(MAN) # Create release: export clean tree and tag current # configuration Index: genver.sh --- genver.sh.orig 2016-03-29 21:19:05.000000000 +0200 +++ genver.sh 2016-04-05 22:42:09.207245923 +0200 @@ -7,37 +7,7 @@ QUIET=0 fi -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. - - # 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-`perl -MPOSIX -e 'print strftime "%Y-%m-%d",localtime((stat "Makefile")[9])'` - fi -fi - -if head=`git rev-parse --verify HEAD 2>/dev/null`; then - # generate the version info based on the tag - release=`(git describe --tags || git --describe || git describe --all --long) \ - 2>/dev/null | tr -d '\n'` - - # Are there uncommitted changes? - git update-index --refresh --unmerged > /dev/null - if git diff-index --name-only HEAD | grep -v "^scripts/package" \ - | read dummy; then - release="$release-dirty" - fi -fi - +release="1.17" if [ $QUIET -ne 1 ]; then printf "#ifndef VERSION_H \n"