Enclosed a diff for bringing net/sslh to the latest version. From the release
announcement:
- Added 'syslog_facility' configuration option to specify where to log
- TLS now supports SNI and ALPN, including support for Let's Encrypt
challenges
- ADB probe
- Added per-protocol 'fork' option
- Added chroot option
- A truckload of bug fixes and documentation improvements
I'm running this version, in an existing sslh setup, without any issues.
Comments?
--
Björn Ketelaars
GPG key: 0x4F0E5F21
diff --git net/sslh/Makefile net/sslh/Makefile
index 5196ad1f3f6..d0aa1621bdd 100644
--- net/sslh/Makefile
+++ net/sslh/Makefile
@@ -2,20 +2,20 @@
COMMENT = SSL/SSH multiplexer
-GH_ACCOUNT = yrutschle
-GH_PROJECT = sslh
-V = 1.18
-GH_TAGNAME = v$V
+V = 1.19
+DISTNAME = sslh-v${V}
+PKGNAME = ${DISTNAME:S/-v/-/}
CATEGORIES = security net
-REVISION = 0
-HOMEPAGE = http://www.rutschle.net/tech/sslh.shtml
+HOMEPAGE = https://www.rutschle.net/tech/sslh.shtml
MAINTAINER = Bjorn Ketelaars <bjorn.ketela...@hydroxide.nl>
# GPLv2+
PERMIT_PACKAGE_CDROM = Yes
+MASTER_SITES = https://www.rutschle.net/tech/sslh/
+
WANTLIB = c config pcre
LIB_DEPENDS = devel/libconfig \
devel/pcre
diff --git net/sslh/distinfo net/sslh/distinfo
index c18daca89f9..e4dae567aea 100644
--- net/sslh/distinfo
+++ net/sslh/distinfo
@@ -1,2 +1,2 @@
-SHA256 (sslh-1.18.tar.gz) = 9sq/DgxXWu0g0d4j09aT85IcIeJw2F/suhrSpI86/O8=
-SIZE (sslh-1.18.tar.gz) = 53175
+SHA256 (sslh-v1.19.tar.gz) = 75yxg5baQEu3BbLEzUViql/rVU3m+b0HSyTnrEcTZpw=
+SIZE (sslh-v1.19.tar.gz) = 57352
diff --git net/sslh/patches/patch-Makefile net/sslh/patches/patch-Makefile
index 452232e7c77..6cef706941c 100644
--- net/sslh/patches/patch-Makefile
+++ net/sslh/patches/patch-Makefile
@@ -1,7 +1,8 @@
$OpenBSD: patch-Makefile,v 1.5 2016/04/17 09:14:26 landry Exp $
---- Makefile.orig Fri Feb 5 16:46:47 2016
-+++ Makefile Sat Mar 19 20:27:50 2016
-@@ -12,58 +12,23 @@ PREFIX?=/usr
+Index: Makefile
+--- Makefile.orig
++++ Makefile
+@@ -12,15 +12,11 @@ PREFIX?=/usr
BINDIR?=$(PREFIX)/sbin
MANDIR?=$(PREFIX)/share/man/man8
@@ -18,8 +19,9 @@ $OpenBSD: patch-Makefile,v 1.5 2016/04/17 09:14:26 landry Exp
$
CC ?= gcc
CFLAGS ?=-Wall -g $(CFLAGS_COV)
- LIBS=
- OBJS=common.o sslh-main.o probe.o tls.o
+@@ -29,44 +25,12 @@ OBJS=common.o sslh-main.o probe.o tls.o
+
+ CONDITIONAL_TARGETS=
-ifneq ($(strip $(USELIBWRAP)),)
- LIBS:=$(LIBS) -lwrap
@@ -32,7 +34,7 @@ $OpenBSD: patch-Makefile,v 1.5 2016/04/17 09:14:26 landry Exp
$
-
-ifneq ($(strip $(USELIBPCRE)),)
- CPPFLAGS+=-DLIBPCRE
-- LIBS:=$(LIBS) -lpcre
+- LIBS:=$(LIBS) -lpcreposix
-endif
-
-ifneq ($(strip $(USELIBCONFIG)),)
@@ -48,12 +50,13 @@ $OpenBSD: patch-Makefile,v 1.5 2016/04/17 09:14:26 landry
Exp $
-ifneq ($(strip $(USESYSTEMD)),)
- LIBS:=$(LIBS) -lsystemd
- CPPFLAGS+=-DSYSTEMD
+- CONDITIONAL_TARGETS+=systemd-sslh-generator
-endif
-
-
- all: sslh $(MAN) echosrv
+ all: sslh $(MAN) echosrv $(CONDITIONAL_TARGETS)
- .c.o: *.h
+ .c.o: *.h version.h
$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
version.h:
@@ -61,7 +64,7 @@ $OpenBSD: patch-Makefile,v 1.5 2016/04/17 09:14:26 landry Exp
$
sslh: sslh-fork sslh-select
-@@ -82,7 +47,7 @@ echosrv: $(OBJS) echosrv.o
+@@ -87,7 +51,7 @@ echosrv: version.h $(OBJS) echosrv.o
$(CC) $(CFLAGS) $(LDFLAGS) -o echosrv echosrv.o probe.o common.o tls.o
$(LIBS)
$(MAN): sslh.pod Makefile
diff --git net/sslh/patches/patch-basic_cfg net/sslh/patches/patch-basic_cfg
index b2971871443..bd0f31b1bad 100644
--- net/sslh/patches/patch-basic_cfg
+++ net/sslh/patches/patch-basic_cfg
@@ -1,6 +1,7 @@
$OpenBSD: patch-basic_cfg,v 1.4 2016/04/17 09:14:26 landry Exp $
---- basic.cfg.orig Fri Feb 5 16:46:47 2016
-+++ basic.cfg Sat Mar 19 20:28:39 2016
+Index: basic.cfg
+--- basic.cfg.orig
++++ basic.cfg
@@ -7,7 +7,7 @@ inetd: false;
numeric: false;
transparent: false;
@@ -8,5 +9,5 @@ $OpenBSD: patch-basic_cfg,v 1.4 2016/04/17 09:14:26 landry Exp $
-user: "nobody";
+user: "_sslh";
pidfile: "/var/run/sslh.pid";
-
+ chroot: "/var/empty";
diff --git net/sslh/patches/patch-example_cfg net/sslh/patches/patch-example_cfg
index 6598c8a75e4..9c21b041f55 100644
--- net/sslh/patches/patch-example_cfg
+++ net/sslh/patches/patch-example_cfg
@@ -1,6 +1,7 @@
$OpenBSD: patch-example_cfg,v 1.4 2016/04/17 09:14:26 landry Exp $
---- example.cfg.orig Fri Feb 5 16:46:47 2016
-+++ example.cfg Sat Mar 19 20:28:56 2016
+Index: example.cfg
+--- example.cfg.orig
++++ example.cfg
@@ -9,7 +9,7 @@ inetd: false;
numeric: false;
transparent: false;
@@ -8,5 +9,5 @@ $OpenBSD: patch-example_cfg,v 1.4 2016/04/17 09:14:26 landry
Exp $
-user: "nobody";
+user: "_sslh";
pidfile: "/var/run/sslh.pid";
-
+ chroot: "/var/empty";
diff --git net/sslh/patches/patch-sslh_pod net/sslh/patches/patch-sslh_pod
index 5a84aba561d..97c97bc746e 100644
--- net/sslh/patches/patch-sslh_pod
+++ net/sslh/patches/patch-sslh_pod
@@ -1,6 +1,7 @@
$OpenBSD: patch-sslh_pod,v 1.6 2016/04/17 09:14:26 landry Exp $
---- sslh.pod.orig Tue Jul 28 15:14:21 2015
-+++ sslh.pod Mon Sep 21 12:15:48 2015
+Index: sslh.pod
+--- sslh.pod.orig
++++ sslh.pod
@@ -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 +27,7 @@ $OpenBSD: patch-sslh_pod,v 1.6 2016/04/17 09:14:26 landry Exp
$
=head2 Configuration file
A configuration file can be supplied to B<sslh>. Command
-@@ -203,24 +200,6 @@ Runs in background. This overrides B<foreground> if se
+@@ -210,24 +207,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).
