upgrading package: sslh 1.17 -> 1.18

sslh/sslh.patch

@@ -1,32 +1,34 @@
 Index: Makefile
---- Makefile.orig	2015-03-09 21:51:39.000000000 +0100
-+++ Makefile	2015-05-16 09:42:59.895726620 +0200
-@@ -1,13 +1,13 @@
- # Configuration
+--- 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)
++USELIBCONFIG= 	# Use libconfig? (necessary to use configuration files)
+ USELIBPCRE=	# Use libpcre? (needed for regex on musl)
  USELIBWRAP?=	# Use libwrap?
  USELIBCAP=	# Use libcap?
- COV_TEST= 	# Perform test coverage?
- PREFIX=/usr/local
+@@ -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
-@@ -18,6 +18,7 @@
+@@ -23,6 +23,7 @@
  
  CC ?= gcc
  CFLAGS ?=-Wall -g $(CFLAGS_COV)
 +LDFLAGS=
  
  LIBS=
- OBJS=common.o sslh-main.o probe.o
-@@ -59,7 +60,7 @@
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o echosrv echosrv.o probe.o common.o $(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)
@@ -35,8 +37,8 @@ Index: Makefile
  # Create release: export clean tree and tag current
  # configuration
 Index: genver.sh
---- genver.sh.orig	2015-05-16 09:41:02.025108000 +0200
-+++ genver.sh	2015-05-16 09:43:42.785150276 +0200
+--- 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
@@ -75,4 +77,4 @@ Index: genver.sh
 +release="1.17"
  
  if [ $QUIET -ne 1 ]; then
- 	printf "#ifndef _VERSION_H_ \n"
+ 	printf "#ifndef VERSION_H \n"

sslh/sslh.spec

@@ -22,9 +22,9 @@
 ##
 
 #   package version
-%define       V_opkg   1.17
-%define       V_dist   v1.17
-%define       V_subdir v1.17
+%define       V_opkg   1.18
+%define       V_dist   v1.18
+%define       V_subdir v1.18
 
 #   package information
 Name:         sslh
@@ -37,13 +37,13 @@ Class:        EVAL
 Group:        Networking
 License:      GPL
 Version:      %{V_opkg}
-Release:      20160305
+Release:      20160405
 
 #   package options
 %option       with_fsl  yes
 
 #   list of sources
-Source0:      http://www.rutschle.net/tech/sslh-%{V_dist}.tar.gz
+Source0:      http://www.rutschle.net/tech/sslh/sslh-%{V_dist}.tar.gz
 Source1:      rc.sslh
 Source2:      fsl.sslh
 Patch0:       sslh.patch
@@ -75,9 +75,6 @@ PreReq:       fsl
     %patch -p0
 
 %build
-    %{l_shtool} subst \
-        -e 's;/bin/bash;%{l_bash};g' \
-        genver.sh
     %{l_make} %{l_mflags} \
         CC="%{l_cc}" \
         CFLAGS="%{l_cflags -O} %{l_cppflags}" \