Update to sslh 1.18, from MAINTAINER Bjorn Ketelaars
This commit is contained in:
landry
parent
b65c93263f
commit
d514f13502
@ -1,26 +1,27 @@
|
||||
# $OpenBSD: Makefile,v 1.13 2016/01/06 20:02:19 jasper Exp $
|
||||
# $OpenBSD: Makefile,v 1.14 2016/04/17 09:14:26 landry Exp $
|
||||
|
||||
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.ketelaars@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:
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
$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
|
||||
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
|
||||
@ -35,6 +44,12 @@ $OpenBSD: patch-Makefile,v 1.4 2015/01/13 11:15:04 sthen Exp $
|
||||
- LIBS:=$(LIBS) -lcap
|
||||
- CPPFLAGS+=-DLIBCAP
|
||||
-endif
|
||||
-
|
||||
-ifneq ($(strip $(USESYSTEMD)),)
|
||||
- LIBS:=$(LIBS) -lsystemd
|
||||
- CPPFLAGS+=-DSYSTEMD
|
||||
-endif
|
||||
-
|
||||
-
|
||||
all: sslh $(MAN) echosrv
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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
|
||||
$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
|
||||
@@ -7,7 +7,7 @@ inetd: false;
|
||||
numeric: false;
|
||||
transparent: false;
|
||||
timeout: "2";
|
||||
timeout: 2;
|
||||
-user: "nobody";
|
||||
+user: "_sslh";
|
||||
pidfile: "/var/run/sslh.pid";
|
||||
|
||||
@ -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
|
||||
$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
|
||||
@@ -9,7 +9,7 @@ inetd: false;
|
||||
numeric: false;
|
||||
transparent: false;
|
||||
timeout: "2";
|
||||
timeout: 2;
|
||||
-user: "nobody";
|
||||
+user: "_sslh";
|
||||
pidfile: "/var/run/sslh.pid";
|
||||
|
||||
@ -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
|
||||
$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
|
||||
@@ -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).
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user