summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorwiz <wiz>2015-04-19 19:02:35 +0000
committerwiz <wiz>2015-04-19 19:02:35 +0000
commit7b09221c58079d42c780afa4dcb38537eeb90630 (patch)
tree4dfd7d99ca3d4791fb890d4d011910c0bd3e8795 /net
parentf1a65efd663f012776b00ad90b114bab497205f5 (diff)
downloadpkgsrc-7b09221c58079d42c780afa4dcb38537eeb90630.tar.gz
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)
Diffstat (limited to 'net')
-rw-r--r--net/sslh/Makefile11
-rw-r--r--net/sslh/distinfo10
-rw-r--r--net/sslh/patches/patch-sslh-main.c10
3 files changed, 14 insertions, 17 deletions
diff --git a/net/sslh/Makefile b/net/sslh/Makefile
index 884c95f9c3e..81690cd9e76 100644
--- a/net/sslh/Makefile
+++ b/net/sslh/Makefile
@@ -1,12 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2015/01/09 14:34:20 joerg Exp $
-#
+# $NetBSD: Makefile,v 1.7 2015/04/19 19:02:35 wiz Exp $
-DISTNAME= v1.16
-PKGNAME= sslh-1.16
+DISTNAME= sslh-1.17
CATEGORIES= net
-MASTER_SITES= https://github.com/yrutschle/sslh/archive/
-EXTRACT_SUFX= .zip
-WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
+MASTER_SITES= ${MASTER_SITE_GITHUB:=yrutschle/}
+GITHUB_TAG= v${PKGVERSION}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.rutschle.net/tech/sslh.shtml
diff --git a/net/sslh/distinfo b/net/sslh/distinfo
index 2cd1de836f8..7ff0c264a9b 100644
--- a/net/sslh/distinfo
+++ b/net/sslh/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2014/11/28 10:45:27 bsiegert Exp $
+$NetBSD: distinfo,v 1.4 2015/04/19 19:02:35 wiz Exp $
-SHA1 (v1.16.zip) = 19f3931ce8d98895e85b2da2d6995b489f123bd2
-RMD160 (v1.16.zip) = 29da00f88db489c88f8ec76e14ce1131f0766ee7
-Size (v1.16.zip) = 46395 bytes
+SHA1 (sslh-1.17.tar.gz) = d892e26204ec5b26f0f2a87eb388bbbf3f2bf91e
+RMD160 (sslh-1.17.tar.gz) = dec321368951b0c93d28595df806300adce07459
+Size (sslh-1.17.tar.gz) = 45451 bytes
SHA1 (patch-echosrv.c) = 611044fd7ed1fd52c44e2d8ff393091c35478e17
-SHA1 (patch-sslh-main.c) = 996bbec53dbb3c92c3485b1f210853c7ed368519
+SHA1 (patch-sslh-main.c) = 43c88799534a6562a92aa174eb6aff6de53865a2
diff --git a/net/sslh/patches/patch-sslh-main.c b/net/sslh/patches/patch-sslh-main.c
index d0d6995787f..0ae17af040d 100644
--- a/net/sslh/patches/patch-sslh-main.c
+++ b/net/sslh/patches/patch-sslh-main.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-sslh-main.c,v 1.2 2014/11/28 10:45:28 bsiegert Exp $
+$NetBSD: patch-sslh-main.c,v 1.3 2015/04/19 19:02:35 wiz Exp $
* getopt_long_only does not exist on NetBSD getopt.
---- sslh-main.c.orig 2014-02-11 21:06:01.000000000 +0000
+--- sslh-main.c.orig 2015-03-09 20:51:39.000000000 +0000
+++ sslh-main.c
-@@ -358,7 +358,7 @@ static void cmdline_config(int argc, cha
+@@ -362,7 +362,7 @@ static void cmdline_config(int argc, cha
#ifdef LIBCONFIG
optind = 1;
opterr = 0; /* we're missing protocol options at this stage so don't output errors */
@@ -12,8 +12,8 @@ $NetBSD: patch-sslh-main.c,v 1.2 2014/11/28 10:45:28 bsiegert Exp $
+ while ((c = getopt_long(argc, argv, optstr, all_options, NULL)) != -1) {
if (c == 'F') {
config_filename = optarg;
- /* find the end of the listen list */
-@@ -383,7 +383,7 @@ static void parse_cmdline(int argc, char
+ if (config_filename) {
+@@ -397,7 +397,7 @@ static void parse_cmdline(int argc, char
optind = 1;
opterr = 1;
next_arg: