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

Update to sslh-1.21b

Browse Source 
Fixes a couple of issues with 1.21, namely:
- use of uninitialised data, which caused a segfault
- missing --anyprot command line option
- some omissions in documentation
This commit is contained in:
bket 2020-07-21 14:25:09 +00:00
parent 40310f5d31
commit aaefc9cf1a
5 changed files with 11 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/sslh/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.23 2020/07/14 16:53:57 bket Exp $
# $OpenBSD: Makefile,v 1.24 2020/07/21 14:25:09 bket Exp $
COMMENT = SSL/SSH multiplexer
DISTNAME = sslh-v1.21
DISTNAME = sslh-v1.21b
PKGNAME = ${DISTNAME:S/-v/-/}
CATEGORIES = security net

4
net/sslh/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (sslh-v1.21.tar.gz) = p53kiaIEt6M8/XYz9K0O7zhDf3B3q57smj3tTbUdpqo=
SIZE (sslh-v1.21.tar.gz) = 111297
SHA256 (sslh-v1.21b.tar.gz) = IFjT1GPTOIb1cjD/yMsASGsFJSy9UF9JBLagGwvRbTg=
SIZE (sslh-v1.21b.tar.gz) = 111751

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

@ -1,24 +0,0 @@
$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);

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

@ -1,4 +1,4 @@
$OpenBSD: patch-sslh_pod,v 1.8 2018/11/21 13:12:37 bket Exp $
$OpenBSD: patch-sslh_pod,v 1.9 2020/07/21 14:25:09 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
@@ -214,24 +211,6 @@ Runs in background. This overrides B<foreground> if se
@@ -211,24 +208,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).

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

@ -1,19 +1,19 @@
$OpenBSD: patch-t,v 1.2 2020/07/14 16:53:57 bket Exp $
$OpenBSD: patch-t,v 1.3 2020/07/21 14:25:09 bket Exp $
Index: t
--- t.orig
+++ t
@@ -37,8 +37,6 @@ my $RB_WRONG_USERNAME = 1;
my $RB_OPEN_PID_FILE = 1;
@@ -38,8 +38,6 @@ my $RB_OPEN_PID_FILE = 1;
my $RB_RESOLVE_ADDRESS = 1;
my $RB_CL_PARAMS = 1;
-`lcov --directory . --zerocounters`;
-
sub verbose_exec
{
my ($cmd) = @_;
@@ -390,10 +388,7 @@ if ($RB_RESOLVE_ADDRESS) {
my_is($code, 4, "Exit status if can't resolve address");
@@ -440,10 +438,7 @@ if ($RB_CL_PARAMS) {
my_is($code, 6, "Bad command line parameters");
}
-`lcov --directory . --capture --output-file sslh_cov.info`;