net/sslh has been updated to 1.17. This update fixes a potential privilege
escalation.
Comments? OK?
diff --git a/Makefile b/Makefile
index 6c29d45..d7bc073 100644
--- a/Makefile
+++ b/Makefile
@@ -4,8 +4,8 @@ COMMENT = SSL/SSH multiplexer
GH_ACCOUNT = yrutschle
GH_PROJECT = sslh
-GH_COMMIT = 9d2deff6ad51622e2de1788af1d1465c5b37075e
-V = 1.16
+GH_COMMIT = 3550cbe77c3429d32f849c2a7074896719055a0c
+V = 1.17
GH_TAGNAME = v$V
DISTNAME = ${GH_PROJECT}-${GH_TAGNAME:S/v//}
CATEGORIES = security net
diff --git a/distinfo b/distinfo
index e7beafa..bfdc7d2 100644
--- a/distinfo
+++ b/distinfo
@@ -1,2 +1,2 @@
-SHA256 (sslh-1.16.tar.gz) = qw4z/5R6CM8ErykI7Rsfb0ogIOsEsShxhpfgTd0SkXc=
-SIZE (sslh-1.16.tar.gz) = 36485
+SHA256 (sslh-1.17.tar.gz) = tVfDv3UonSAzU8JdkuNFSaIvZFEMSPd0jBwCd0jVGtE=
+SIZE (sslh-1.17.tar.gz) = 45451
diff --git a/patches/patch-basic_cfg b/patches/patch-basic_cfg
index 681e724..e6ab1bc 100644
--- a/patches/patch-basic_cfg
+++ b/patches/patch-basic_cfg
@@ -1,10 +1,10 @@
$OpenBSD: patch-basic_cfg,v 1.2 2015/01/13 11:15:04 sthen Exp $
---- basic.cfg.orig Tue Feb 11 22:06:01 2014
-+++ basic.cfg Thu May 8 13:16:47 2014
+--- basic.cfg.orig Mon Mar 9 21:51:39 2015
++++ basic.cfg Wed Mar 11 15:30:07 2015
@@ -7,7 +7,7 @@ inetd: false;
numeric: false;
transparent: false;
- timeout: 2;
+ timeout: "2";
-user: "nobody";
+user: "_sslh";
pidfile: "/var/run/sslh.pid";
diff --git a/patches/patch-example_cfg b/patches/patch-example_cfg
index 0657cb1..72a9105 100644
--- a/patches/patch-example_cfg
+++ b/patches/patch-example_cfg
@@ -1,10 +1,10 @@
$OpenBSD: patch-example_cfg,v 1.2 2015/01/13 11:15:04 sthen Exp $
---- example.cfg.orig Tue Feb 11 22:06:01 2014
-+++ example.cfg Thu May 8 13:16:47 2014
+--- example.cfg.orig Mon Mar 9 21:51:39 2015
++++ example.cfg Wed Mar 11 15:30:43 2015
@@ -9,7 +9,7 @@ inetd: false;
numeric: false;
transparent: false;
- timeout: 2;
+ timeout: "2";
-user: "nobody";
+user: "_sslh";
pidfile: "/var/run/sslh.pid";
diff --git a/patches/patch-sslh_pod b/patches/patch-sslh_pod
index be908b7..949c073 100644
--- a/patches/patch-sslh_pod
+++ b/patches/patch-sslh_pod
@@ -1,6 +1,6 @@
$OpenBSD: patch-sslh_pod,v 1.4 2015/01/13 11:15:04 sthen Exp $
---- sslh.pod.orig Tue Feb 11 22:06:01 2014
-+++ sslh.pod Thu May 8 13:16:47 2014
+--- sslh.pod.orig Mon Mar 9 21:51:39 2015
++++ sslh.pod Wed Mar 11 15:29:21 2015
@@ -26,17 +26,14 @@ Hence B<sslh> acts as a protocol demultiplexer, or a
switchboard. Its name comes from its original function to
serve SSH and HTTPS on the same port.
@@ -26,7 +26,7 @@ $OpenBSD: patch-sslh_pod,v 1.4 2015/01/13 11:15:04 sthen Exp $
=head2 Configuration file
A configuration file can be supplied to B<sslh>. Command
-@@ -188,24 +185,6 @@ Runs in background. This overrides B<foreground> if se
+@@ -207,24 +204,6 @@ Runs in background. This overrides B<foreground> if se
the configuration file (or on the command line, but there is
no point setting both on the command line unless you have a
personality disorder).
