diff options
author | Vanilla I. Shu <vanilla@FreeBSD.org> | 2015-03-12 08:43:18 +0000 |
---|---|---|
committer | Vanilla I. Shu <vanilla@FreeBSD.org> | 2015-03-12 08:43:18 +0000 |
commit | 28b6189d0051d31712b8d4830cd6cc36df137b31 (patch) | |
tree | 673ed74aec19d50918b6b2ecb919df16adb63343 /net | |
parent | a3f9fd4d1c759851061b6b6f4ad097faff31cd4f (diff) | |
download | ports-28b6189d0051d31712b8d4830cd6cc36df137b31.tar.gz ports-28b6189d0051d31712b8d4830cd6cc36df137b31.zip |
Upgrade to 1.17.
PR: 198493
Submitted by: maintainer
Notes
Notes:
svn path=/head/; revision=381066
Diffstat (limited to 'net')
-rw-r--r-- | net/sslh/Makefile | 3 | ||||
-rw-r--r-- | net/sslh/distinfo | 4 | ||||
-rw-r--r-- | net/sslh/files/patch-Makefile | 11 | ||||
-rw-r--r-- | net/sslh/files/patch-genver.sh | 38 | ||||
-rw-r--r-- | net/sslh/files/sslh.in | 2 |
5 files changed, 4 insertions, 54 deletions
diff --git a/net/sslh/Makefile b/net/sslh/Makefile index cfa5280fa7ae..69a288ec6f96 100644 --- a/net/sslh/Makefile +++ b/net/sslh/Makefile @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= sslh -PORTVERSION= 1.16 +PORTVERSION= 1.17 DISTVERSIONPREFIX= v -PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://www.rutschle.net/tech/ diff --git a/net/sslh/distinfo b/net/sslh/distinfo index 78712f70ca82..8ba369156214 100644 --- a/net/sslh/distinfo +++ b/net/sslh/distinfo @@ -1,2 +1,2 @@ -SHA256 (sslh-v1.16.tar.gz) = a610beb878ee5c73aa505e5d526589edcf7060d09e4fedfe82e732f2138f8434 -SIZE (sslh-v1.16.tar.gz) = 43836 +SHA256 (sslh-v1.17.tar.gz) = 4f3589ed36d8a21581268d53055240eee5e5adf02894a2ca7a6c9022f24b582a +SIZE (sslh-v1.17.tar.gz) = 45447 diff --git a/net/sslh/files/patch-Makefile b/net/sslh/files/patch-Makefile deleted file mode 100644 index e90eddf04eab..000000000000 --- a/net/sslh/files/patch-Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.orig 2014-02-11 22:06:01.000000000 +0100 -+++ Makefile 2014-05-01 01:58:43.000000000 +0200 -@@ -2,7 +2,7 @@ - - VERSION=$(shell ./genver.sh -r) - USELIBCONFIG=1 # Use libconfig? (necessary to use configuration files) --USELIBWRAP= # Use libwrap? -+USELIBWRAP?= # Use libwrap? - USELIBCAP= # Use libcap? - COV_TEST= # Perform test coverage? - PREFIX=/usr/local diff --git a/net/sslh/files/patch-genver.sh b/net/sslh/files/patch-genver.sh deleted file mode 100644 index 5b2f31cad8f6..000000000000 --- a/net/sslh/files/patch-genver.sh +++ /dev/null @@ -1,38 +0,0 @@ ---- genver.sh.orig 2014-02-11 22:06:01.000000000 +0100 -+++ genver.sh 2014-04-30 17:06:00.000000000 +0200 -@@ -1,4 +1,4 @@ --#! /bin/bash -+#! /bin/sh - - if [ ${#} -eq 1 ] && [ "x$1" = "x-r" ]; then - # release text only -@@ -7,28 +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. 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/ .*//'` --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= - - if [ $QUIET -ne 1 ]; then - printf "#ifndef _VERSION_H_ \n" diff --git a/net/sslh/files/sslh.in b/net/sslh/files/sslh.in index 65ae36515053..76b44c60fc53 100644 --- a/net/sslh/files/sslh.in +++ b/net/sslh/files/sslh.in @@ -53,6 +53,6 @@ for value in listening openvpntarget sshtarget sshtimeout ssltarget \ done command="%%PREFIX%%/sbin/${name}-${sslh_mode}" -command_args="-F %%PREFIX%%/etc/${name}.conf" +command_args="-F%%PREFIX%%/etc/${name}.conf" run_rc_command "$1" |