Update to sslh-1.20.

Usage of 'ssl' setting is deprecated and will be removed. Instead 'tls'
is used in sslh-*.rc
This commit is contained in:
bket 2018-11-21 13:12:37 +00:00
parent 8730604019
commit fc4ff15fbf
6 changed files with 13 additions and 14 deletions

View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.19 2018/08/11 07:40:56 bket Exp $
# $OpenBSD: Makefile,v 1.20 2018/11/21 13:12:37 bket Exp $
COMMENT = SSL/SSH multiplexer
DISTNAME = sslh-v1.19c
REVISION = 0
DISTNAME = sslh-v1.20
PKGNAME = ${DISTNAME:S/-v/-/}
CATEGORIES = security net

View File

@ -1,2 +1,2 @@
SHA256 (sslh-v1.19c.tar.gz) = uxHfqIsnrh7IJaG4FWAAw/F/fo8EIxHxm3okkZPEe/M=
SIZE (sslh-v1.19c.tar.gz) = 57418
SHA256 (sslh-v1.20.tar.gz) = p/SbChz8t7udl/X/qTK/8RxfZdmpvY/hgSSB3uWFURY=
SIZE (sslh-v1.20.tar.gz) = 60459

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-sslh_pod,v 1.7 2018/01/28 16:31:48 sthen Exp $
$OpenBSD: patch-sslh_pod,v 1.8 2018/11/21 13:12:37 bket Exp $
Index: sslh.pod
--- sslh.pod.orig
+++ sslh.pod
@ -27,7 +27,7 @@ Index: sslh.pod
=head2 Configuration file
A configuration file can be supplied to B<sslh>. Command
@@ -210,24 +207,6 @@ Runs in background. This overrides B<foreground> if se
@@ -214,24 +211,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).

View File

@ -1,6 +1,8 @@
@comment $OpenBSD: PLIST,v 1.3 2015/01/13 11:15:04 sthen Exp $
@comment $OpenBSD: PLIST,v 1.4 2018/11/21 13:12:37 bket Exp $
@newgroup _sslh:696
@newuser _sslh:696:696:daemon:sslh:/nonexistent:/sbin/nologin
@rcscript ${RCDIR}/sslh_fork
@rcscript ${RCDIR}/sslh_select
@man man/man8/sslh.8
@bin sbin/sslh-fork
@bin sbin/sslh-select
@ -9,5 +11,3 @@ share/doc/sslh/README.md
share/examples/sslh/
share/examples/sslh/basic.cfg
share/examples/sslh/example.cfg
@rcscript ${RCDIR}/sslh_fork
@rcscript ${RCDIR}/sslh_select

View File

@ -1,9 +1,9 @@
#!/bin/ksh
#
# $OpenBSD: sslh_fork.rc,v 1.5 2018/01/11 19:27:08 rpe Exp $
# $OpenBSD: sslh_fork.rc,v 1.6 2018/11/21 13:12:37 bket Exp $
daemon="${TRUEPREFIX}/sbin/sslh-fork"
daemon_flags="--user=_sslh --listen 0.0.0.0:443 --ssh 127.0.0.1:22 --ssl 127.0.0.1:443"
daemon_flags="--user=_sslh --listen 0.0.0.0:443 --ssh 127.0.0.1:22 --tls 127.0.0.1:443"
. /etc/rc.d/rc.subr

View File

@ -1,9 +1,9 @@
#!/bin/ksh
#
# $OpenBSD: sslh_select.rc,v 1.5 2018/01/11 19:27:08 rpe Exp $
# $OpenBSD: sslh_select.rc,v 1.6 2018/11/21 13:12:37 bket Exp $
daemon="${TRUEPREFIX}/sbin/sslh-select"
daemon_flags="--user=_sslh --listen 0.0.0.0:443 --ssh 127.0.0.1:22 --ssl 127.0.0.1:443"
daemon_flags="--user=_sslh --listen 0.0.0.0:443 --ssh 127.0.0.1:22 --tls 127.0.0.1:443"
. /etc/rc.d/rc.subr