cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to sslh-1.21

Browse Source 
Changelog: https://github.com/yrutschle/sslh/blob/v1.21/ChangeLog
This commit is contained in:
bket 2020-07-14 16:53:57 +00:00
parent fbb4dd3500
commit 336a821a5b
5 changed files with 38 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/sslh/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.22 2020/02/16 19:51:44 bket Exp $
# $OpenBSD: Makefile,v 1.23 2020/07/14 16:53:57 bket Exp $
COMMENT = SSL/SSH multiplexer
DISTNAME = sslh-v1.20
REVISION = 0
DISTNAME = sslh-v1.21
PKGNAME = ${DISTNAME:S/-v/-/}
CATEGORIES = security net
HOMEPAGE = https://www.rutschle.net/tech/sslh/README.html
@ -14,7 +14,7 @@ MAINTAINER = Bjorn Ketelaars <bket@openbsd.org>
# GPLv2+
PERMIT_PACKAGE = Yes
WANTLIB = c config pcre
WANTLIB = c config pcreposix
MASTER_SITES = https://www.rutschle.net/tech/sslh/
@ -24,7 +24,7 @@ TEST_DEPENDS = devel/p5-Conf-Libconfig \
net/p5-IO-Socket-INET6
MAKE_FLAGS = CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib -lconfig -lpcre" \
LIBS="-L${LOCALBASE}/lib -lconfig -lpcreposix" \
MAN=sslh.8
USE_GMAKE = Yes

4
net/sslh/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (sslh-v1.20.tar.gz) = p/SbChz8t7udl/X/qTK/8RxfZdmpvY/hgSSB3uWFURY=
SIZE (sslh-v1.20.tar.gz) = 60459
SHA256 (sslh-v1.21.tar.gz) = p53kiaIEt6M8/XYz9K0O7zhDf3B3q57smj3tTbUdpqo=
SIZE (sslh-v1.21.tar.gz) = 111297

4
net/sslh/patches/patch-Makefile
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-Makefile,v 1.7 2018/01/31 12:04:20 sthen Exp $
$OpenBSD: patch-Makefile,v 1.8 2020/07/14 16:53:57 bket Exp $
Index: Makefile
--- Makefile.orig
+++ Makefile
@@ -87,7 +87,7 @@ echosrv: version.h $(OBJS) echosrv.o
@@ -96,7 +96,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

24
net/sslh/patches/patch-sslh-conf_c Normal file
View File

@ -0,0 +1,24 @@
$OpenBSD: patch-sslh-conf_c,v 1.1 2020/07/14 16:53:57 bket Exp $
Fix segfault. Taken from https://github.com/yrutschle/sslh/pull/271
Index: sslh-conf.c
--- sslh-conf.c.orig
+++ sslh-conf.c
@@ -1432,7 +1432,6 @@ static int read_compounds(config_setting_t* cfg,
static int c2s_parse_file(const char* filename, config_t* c, char**errmsg)
{
/* Read config file */
- config_init(c);
if (config_read_file(c, filename) == CONFIG_FALSE) {
if (config_error_line(c) != 0) {
asprintf(errmsg, "%s:%d:%s",
@@ -1488,7 +1487,7 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct ss
return 0;
}
-
+ config_init(&c);
if (sslhcfg_conffile->count) {
if (!c2s_parse_file(sslhcfg_conffile->filename[0], &c, &errmsg)) {
fprintf(stderr, "%s\n", errmsg);

8
net/sslh/patches/patch-t
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-t,v 1.1 2020/02/16 19:51:44 bket Exp $
$OpenBSD: patch-t,v 1.2 2020/07/14 16:53:57 bket Exp $
Index: t
--- t.orig
@ -12,8 +12,8 @@ Index: t
sub verbose_exec
{
my ($cmd) = @_;
@@ -369,8 +367,5 @@ if ($RB_RESOLVE_ADDRESS) {
is($code, 4, "Exit status if can't resolve address");
@@ -390,10 +388,7 @@ if ($RB_RESOLVE_ADDRESS) {
my_is($code, 4, "Exit status if can't resolve address");
}
-`lcov --directory . --capture --output-file sslh_cov.info`;
@ -22,3 +22,5 @@ Index: t
-`killall echosrv`;
+`pkill -q echosrv`;
format test_results_top =