net/sslh has been updated to 1.18. This version fixes a couple of issues and adds support for RFC4366 SNI and RFC7301 ALPN. Changelog can be found at https://github.com/yrutschle/sslh/blob/master/ChangeLog
OK? Kind regards, -- Björn Ketelaars GPG key: 0x4F0E5F21 diff --git net/sslh/Makefile net/sslh/Makefile index bf8cfdd..5e8eed3 100644 --- net/sslh/Makefile +++ net/sslh/Makefile @@ -4,23 +4,24 @@ COMMENT = SSL/SSH multiplexer GH_ACCOUNT = yrutschle GH_PROJECT = sslh -V = 1.17 +V = 1.18 GH_TAGNAME = v$V CATEGORIES = security net -REVISION = 0 HOMEPAGE = http://www.rutschle.net/tech/sslh.shtml MAINTAINER = Bjorn Ketelaars <bjorn.ketela...@hydroxide.nl> # GPLv2+ -PERMIT_PACKAGE_CDROM = Yes +PERMIT_PACKAGE_CDROM = Yes -WANTLIB = c config -LIB_DEPENDS = devel/libconfig +WANTLIB = c config pcre +LIB_DEPENDS = devel/libconfig \ + devel/pcre -MAKE_FLAGS = CFLAGS="${CFLAGS} -I${LOCALBASE}/include -DLIBCONFIG" \ - LIBS="-L${LOCALBASE}/lib -lconfig" VERSION=$V +MAKE_FLAGS = CFLAGS="${CFLAGS} -I${LOCALBASE}/include \ + -DENABLE_REGEX -DLIBCONFIG -DLIBPCRE" \ + LIBS="-L${LOCALBASE}/lib -lconfig -lpcre" VERSION=$V NO_TEST = Yes do-configure: diff --git net/sslh/distinfo net/sslh/distinfo index bfdc7d2..c18daca 100644 --- net/sslh/distinfo +++ net/sslh/distinfo @@ -1,2 +1,2 @@ -SHA256 (sslh-1.17.tar.gz) = tVfDv3UonSAzU8JdkuNFSaIvZFEMSPd0jBwCd0jVGtE= -SIZE (sslh-1.17.tar.gz) = 45451 +SHA256 (sslh-1.18.tar.gz) = 9sq/DgxXWu0g0d4j09aT85IcIeJw2F/suhrSpI86/O8= +SIZE (sslh-1.18.tar.gz) = 53175 diff --git net/sslh/patches/patch-Makefile net/sslh/patches/patch-Makefile index 9f738c0..3d5e3f5 100644 --- net/sslh/patches/patch-Makefile +++ net/sslh/patches/patch-Makefile @@ -1,9 +1,9 @@ $OpenBSD: patch-Makefile,v 1.4 2015/01/13 11:15:04 sthen Exp $ ---- Makefile.orig Tue Feb 11 21:06:01 2014 -+++ Makefile Mon Jan 12 23:29:39 2015 -@@ -7,43 +7,23 @@ USELIBCAP= # Use libcap? - COV_TEST= # Perform test coverage? - PREFIX=/usr/local +--- Makefile.orig Fri Feb 5 16:46:47 2016 ++++ Makefile Sat Mar 19 20:27:50 2016 +@@ -12,58 +12,23 @@ PREFIX?=/usr + BINDIR?=$(PREFIX)/sbin + MANDIR?=$(PREFIX)/share/man/man8 -MAN=sslh.8.gz # man page name +MAN=sslh.8 # man page name @@ -19,13 +19,22 @@ $OpenBSD: patch-Makefile,v 1.4 2015/01/13 11:15:04 sthen Exp $ CFLAGS ?=-Wall -g $(CFLAGS_COV) LIBS= - OBJS=common.o sslh-main.o probe.o + OBJS=common.o sslh-main.o probe.o tls.o -ifneq ($(strip $(USELIBWRAP)),) - LIBS:=$(LIBS) -lwrap - CPPFLAGS+=-DLIBWRAP -endif - +-ifneq ($(strip $(ENABLE_REGEX)),) +- CPPFLAGS+=-DENABLE_REGEX +-endif +- +-ifneq ($(strip $(USELIBPCRE)),) +- CPPFLAGS+=-DLIBPCRE +- LIBS:=$(LIBS) -lpcre +-endif +- -ifneq ($(strip $(USELIBCONFIG)),) - LIBS:=$(LIBS) -lconfig - CPPFLAGS+=-DLIBCONFIG @@ -36,6 +45,12 @@ $OpenBSD: patch-Makefile,v 1.4 2015/01/13 11:15:04 sthen Exp $ - CPPFLAGS+=-DLIBCAP -endif - +-ifneq ($(strip $(USESYSTEMD)),) +- LIBS:=$(LIBS) -lsystemd +- CPPFLAGS+=-DSYSTEMD +-endif +- +- all: sslh $(MAN) echosrv .c.o: *.h @@ -46,8 +61,8 @@ $OpenBSD: patch-Makefile,v 1.4 2015/01/13 11:15:04 sthen Exp $ sslh: sslh-fork sslh-select -@@ -59,7 +39,7 @@ echosrv: $(OBJS) echosrv.o - $(CC) $(CFLAGS) $(LDFLAGS) -o echosrv echosrv.o probe.o common.o $(LIBS) +@@ -82,7 +47,7 @@ echosrv: $(OBJS) echosrv.o + $(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) diff --git net/sslh/patches/patch-basic_cfg net/sslh/patches/patch-basic_cfg index 102136b..ae28645 100644 --- net/sslh/patches/patch-basic_cfg +++ net/sslh/patches/patch-basic_cfg @@ -1,10 +1,10 @@ $OpenBSD: patch-basic_cfg,v 1.3 2015/03/15 12:26:16 sthen Exp $ ---- basic.cfg.orig Mon Mar 9 21:51:39 2015 -+++ basic.cfg Wed Mar 11 15:30:07 2015 +--- basic.cfg.orig Fri Feb 5 16:46:47 2016 ++++ basic.cfg Sat Mar 19 20:28:39 2016 @@ -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 net/sslh/patches/patch-example_cfg net/sslh/patches/patch-example_cfg index fd4038e..a45b7de 100644 --- net/sslh/patches/patch-example_cfg +++ net/sslh/patches/patch-example_cfg @@ -1,10 +1,10 @@ $OpenBSD: patch-example_cfg,v 1.3 2015/03/15 12:26:16 sthen Exp $ ---- example.cfg.orig Mon Mar 9 21:51:39 2015 -+++ example.cfg Wed Mar 11 15:30:43 2015 +--- example.cfg.orig Fri Feb 5 16:46:47 2016 ++++ example.cfg Sat Mar 19 20:28:56 2016 @@ -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 net/sslh/patches/patch-sslh_pod net/sslh/patches/patch-sslh_pod index 26dc72f..410f760 100644 --- net/sslh/patches/patch-sslh_pod +++ net/sslh/patches/patch-sslh_pod @@ -1,6 +1,6 @@ $OpenBSD: patch-sslh_pod,v 1.5 2015/03/15 12:26:16 sthen Exp $ ---- sslh.pod.orig Mon Mar 9 21:51:39 2015 -+++ sslh.pod Wed Mar 11 15:29:21 2015 +--- sslh.pod.orig Tue Jul 28 15:14:21 2015 ++++ sslh.pod Mon Sep 21 12:15:48 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.5 2015/03/15 12:26:16 sthen Exp $ =head2 Configuration file A configuration file can be supplied to B<sslh>. Command -@@ -207,24 +204,6 @@ Runs in background. This overrides B<foreground> if se +@@ -203,24 +200,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).
