Sun Apr 19 19:02:35 2015 UTC ()
Update to 1.17, switch to github framework:

v1.17: 	09MAR2015
	Support RFC5952-style IPv6 addresses, e.g. [::]:443.

	Transparant proxy support for FreeBSD.
	(Ruben van Staveren)

	Using -F with no argument will try
	/etc/sslh/sslh.cfg and then /etc/sslh.cfg as
	configuration files. (argument to -F can no longer
	be separated from the option by a space, e.g. must
	be -Ffoo.cfg)

	Call setgroups() before setgid() (fixes potential
	privilege escalation).
	(Lars Vogdt)

	Use portable way of getting modified time for OSX
	support.
	(Aaron Madlon-Kay)

	Example configuration for fail2ban.
	(Every Mouw)


(wiz)
diff -r1.6 -r1.7 pkgsrc/net/sslh/Makefile
diff -r1.3 -r1.4 pkgsrc/net/sslh/distinfo
diff -r1.2 -r1.3 pkgsrc/net/sslh/patches/patch-sslh-main.c
cvs diff -r1.6 -r1.7 pkgsrc/net/sslh/Makefile (expand / switch to unified diff)

--- pkgsrc/net/sslh/Makefile 2015/01/09 14:34:20 1.6
+++ pkgsrc/net/sslh/Makefile 2015/04/19 19:02:35 1.7
@@ -1,22 +1,19 @@ @@ -1,22 +1,19 @@
1# $NetBSD: Makefile,v 1.6 2015/01/09 14:34:20 joerg Exp $ 1# $NetBSD: Makefile,v 1.7 2015/04/19 19:02:35 wiz Exp $
2# 
3 2
4DISTNAME= v1.16 3DISTNAME= sslh-1.17
5PKGNAME= sslh-1.16 
6CATEGORIES= net 4CATEGORIES= net
7MASTER_SITES= https://github.com/yrutschle/sslh/archive/ 5MASTER_SITES= ${MASTER_SITE_GITHUB:=yrutschle/}
8EXTRACT_SUFX= .zip 6GITHUB_TAG= v${PKGVERSION}
9WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} 
10 7
11MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://www.rutschle.net/tech/sslh.shtml 9HOMEPAGE= http://www.rutschle.net/tech/sslh.shtml
13COMMENT= Multiplex ssl, ssh, and other connections on the same port 10COMMENT= Multiplex ssl, ssh, and other connections on the same port
14LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
15 12
16# version.h created too late 13# version.h created too late
17MAKE_JOBS_SAFE= no 14MAKE_JOBS_SAFE= no
18 15
19USE_TOOLS+= gmake gzip pod2man 16USE_TOOLS+= gmake gzip pod2man
20USE_LANGUAGES= c 17USE_LANGUAGES= c
21 18
22MAKE_FLAGS+= USELIBWRAP=1 19MAKE_FLAGS+= USELIBWRAP=1
cvs diff -r1.3 -r1.4 pkgsrc/net/sslh/distinfo (expand / switch to unified diff)

--- pkgsrc/net/sslh/distinfo 2014/11/28 10:45:27 1.3
+++ pkgsrc/net/sslh/distinfo 2015/04/19 19:02:35 1.4
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.3 2014/11/28 10:45:27 bsiegert Exp $ 1$NetBSD: distinfo,v 1.4 2015/04/19 19:02:35 wiz Exp $
2 2
3SHA1 (v1.16.zip) = 19f3931ce8d98895e85b2da2d6995b489f123bd2 3SHA1 (sslh-1.17.tar.gz) = d892e26204ec5b26f0f2a87eb388bbbf3f2bf91e
4RMD160 (v1.16.zip) = 29da00f88db489c88f8ec76e14ce1131f0766ee7 4RMD160 (sslh-1.17.tar.gz) = dec321368951b0c93d28595df806300adce07459
5Size (v1.16.zip) = 46395 bytes 5Size (sslh-1.17.tar.gz) = 45451 bytes
6SHA1 (patch-echosrv.c) = 611044fd7ed1fd52c44e2d8ff393091c35478e17 6SHA1 (patch-echosrv.c) = 611044fd7ed1fd52c44e2d8ff393091c35478e17
7SHA1 (patch-sslh-main.c) = 996bbec53dbb3c92c3485b1f210853c7ed368519 7SHA1 (patch-sslh-main.c) = 43c88799534a6562a92aa174eb6aff6de53865a2
cvs diff -r1.2 -r1.3 pkgsrc/net/sslh/patches/Attic/patch-sslh-main.c (expand / switch to unified diff)

--- pkgsrc/net/sslh/patches/Attic/patch-sslh-main.c 2014/11/28 10:45:28 1.2
+++ pkgsrc/net/sslh/patches/Attic/patch-sslh-main.c 2015/04/19 19:02:35 1.3
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1$NetBSD: patch-sslh-main.c,v 1.2 2014/11/28 10:45:28 bsiegert Exp $ 1$NetBSD: patch-sslh-main.c,v 1.3 2015/04/19 19:02:35 wiz Exp $
2 2
3* getopt_long_only does not exist on NetBSD getopt. 3* getopt_long_only does not exist on NetBSD getopt.
4 4
5--- sslh-main.c.orig 2014-02-11 21:06:01.000000000 +0000 5--- sslh-main.c.orig 2015-03-09 20:51:39.000000000 +0000
6+++ sslh-main.c 6+++ sslh-main.c
7@@ -358,7 +358,7 @@ static void cmdline_config(int argc, cha 7@@ -362,7 +362,7 @@ static void cmdline_config(int argc, cha
8 #ifdef LIBCONFIG 8 #ifdef LIBCONFIG
9 optind = 1; 9 optind = 1;
10 opterr = 0; /* we're missing protocol options at this stage so don't output errors */ 10 opterr = 0; /* we're missing protocol options at this stage so don't output errors */
11- while ((c = getopt_long_only(argc, argv, optstr, all_options, NULL)) != -1) { 11- while ((c = getopt_long_only(argc, argv, optstr, all_options, NULL)) != -1) {
12+ while ((c = getopt_long(argc, argv, optstr, all_options, NULL)) != -1) { 12+ while ((c = getopt_long(argc, argv, optstr, all_options, NULL)) != -1) {
13 if (c == 'F') { 13 if (c == 'F') {
14 config_filename = optarg; 14 config_filename = optarg;
15 /* find the end of the listen list */ 15 if (config_filename) {
16@@ -383,7 +383,7 @@ static void parse_cmdline(int argc, char 16@@ -397,7 +397,7 @@ static void parse_cmdline(int argc, char
17 optind = 1; 17 optind = 1;
18 opterr = 1; 18 opterr = 1;
19 next_arg: 19 next_arg:
20- while ((c = getopt_long_only(argc, argv, optstr, all_options, NULL)) != -1) { 20- while ((c = getopt_long_only(argc, argv, optstr, all_options, NULL)) != -1) {
21+ while ((c = getopt_long(argc, argv, optstr, all_options, NULL)) != -1) { 21+ while ((c = getopt_long(argc, argv, optstr, all_options, NULL)) != -1) {
22 if (c == 0) continue; 22 if (c == 0) continue;
23  23
24 if (c >= PROT_SHIFT) { 24 if (c >= PROT_SHIFT) {