summaryrefslogtreecommitdiff
path: root/net/sslh
diff options
context:
space:
mode:
authorbsiegert <bsiegert@pkgsrc.org>2014-11-28 10:45:27 +0000
committerbsiegert <bsiegert@pkgsrc.org>2014-11-28 10:45:27 +0000
commit56f2c17ae9fc32e6ffccdfc4305f58eaba2d3eca (patch)
tree13d33875d6d7af807b94d70c680569827b19090a /net/sslh
parentb66311383b4b2e510a62332ba9c90089114ba771 (diff)
downloadpkgsrc-56f2c17ae9fc32e6ffccdfc4305f58eaba2d3eca.tar.gz
Update sslh to 1.16. Patch provided by Nils Ratusznik in PR pkg/49257.
Changelog for sslh is the following : v1.16: 11FEB2014 Probes made more resilient, to incoming data containing NULLs. Also made them behave properly when receiving too short packets to probe on the first incoming packet. (Ondrej Kuzník) Libcap support: Keep only CAP_NET_ADMIN if started as root with transparent proxying and dropping priviledges (enable USELIBCAP in Makefile). This avoids having to mess with filesystem capabilities. (Sebastian Schmidt/yath) Fixed bugs related to getpeername that would cause sslh to quit erroneously (getpeername can return actual errors if connections are dropped before getting to getpeername). Set IP_FREEDBIND if available to bind to addresses that don't yet exist. Changelog for pkgsrc : - now uses Github for fetching source, ${HOMEPAGE} says : "sslh is managed in Git and pushed to Github" ; - replaced #!/bin/bash with #!/bin/sh in genver.sh, choice of sh instead of bash is because of a commit in sslh github : https://github.com/yrutschle/sslh/commit/62cbb55b8e9c9b0bc878b094c5be815d58276b39
Diffstat (limited to 'net/sslh')
-rw-r--r--net/sslh/Makefile13
-rw-r--r--net/sslh/PLIST5
-rw-r--r--net/sslh/distinfo12
-rw-r--r--net/sslh/patches/patch-echosrv.c4
-rw-r--r--net/sslh/patches/patch-sslh-main.c8
5 files changed, 23 insertions, 19 deletions
diff --git a/net/sslh/Makefile b/net/sslh/Makefile
index 69294a3beba..262305aedf9 100644
--- a/net/sslh/Makefile
+++ b/net/sslh/Makefile
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.4 2013/11/14 08:01:01 apb Exp $
+# $NetBSD: Makefile,v 1.5 2014/11/28 10:45:27 bsiegert Exp $
#
-DISTNAME= sslh-1.15
-PKGREVISION= 1
+DISTNAME= v1.16
+PKGNAME= sslh-1.16
CATEGORIES= net
-MASTER_SITES= http://www.rutschle.net/tech/
+MASTER_SITES= https://github.com/yrutschle/sslh/archive/
+EXTRACT_SUFX= .zip
+WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.rutschle.net/tech/sslh.shtml
@@ -23,6 +25,7 @@ CONF_FILES= ${EGDIR}/basic.cfg ${PKG_SYSCONFDIR}/sslh.cfg
RCD_SCRIPTS= sslh
AUTO_MKDIRS= yes
+REPLACE_SH+= genver.sh
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/sslh-fork ${DESTDIR}${PREFIX}/sbin/sslh
@@ -31,7 +34,7 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/scripts/* ${DESTDIR}${EGDIR}/scripts
${INSTALL_DATA} ${WRKSRC}/example.cfg ${DESTDIR}${EGDIR}
${INSTALL_DATA} ${WRKSRC}/basic.cfg ${DESTDIR}${EGDIR}
- ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/${DOCDIR}
+ ${INSTALL_DATA} ${WRKSRC}/README.md ${DESTDIR}${PREFIX}/${DOCDIR}
${INSTALL_DATA} ${WRKSRC}/README.MacOSX ${DESTDIR}${PREFIX}/${DOCDIR}
${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DESTDIR}${PREFIX}/${DOCDIR}
diff --git a/net/sslh/PLIST b/net/sslh/PLIST
index ef00b632461..6f7f9013918 100644
--- a/net/sslh/PLIST
+++ b/net/sslh/PLIST
@@ -1,13 +1,14 @@
-@comment $NetBSD: PLIST,v 1.3 2014/03/11 14:05:11 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.4 2014/11/28 10:45:27 bsiegert Exp $
man/man8/sslh.8
sbin/sslh
sbin/sslh-select
share/doc/sslh/ChangeLog
-share/doc/sslh/README
share/doc/sslh/README.MacOSX
+share/doc/sslh/README.md
share/examples/sslh/basic.cfg
share/examples/sslh/example.cfg
share/examples/sslh/scripts/etc.default.sslh
share/examples/sslh/scripts/etc.init.d.sslh
share/examples/sslh/scripts/etc.rc.d.init.d.sslh.centos
+share/examples/sslh/scripts/etc.sysconfig.sslh
share/examples/sslh/scripts/systemd.sslh.service
diff --git a/net/sslh/distinfo b/net/sslh/distinfo
index f3f401666e7..2cd1de836f8 100644
--- a/net/sslh/distinfo
+++ b/net/sslh/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2013/11/08 13:33:55 obache Exp $
+$NetBSD: distinfo,v 1.3 2014/11/28 10:45:27 bsiegert Exp $
-SHA1 (sslh-1.15.tar.gz) = eaf255fcbc0aa35f1274240e619636ad3af2e3b2
-RMD160 (sslh-1.15.tar.gz) = 03fb637fe06c5b1e4010547017ef39d7265ae503
-Size (sslh-1.15.tar.gz) = 33241 bytes
-SHA1 (patch-echosrv.c) = d235b5053aa597746f4cc8d1b13b8fc20ffa9c4f
-SHA1 (patch-sslh-main.c) = 39e9de71028c28de3e6bc5510b395409c99b73d1
+SHA1 (v1.16.zip) = 19f3931ce8d98895e85b2da2d6995b489f123bd2
+RMD160 (v1.16.zip) = 29da00f88db489c88f8ec76e14ce1131f0766ee7
+Size (v1.16.zip) = 46395 bytes
+SHA1 (patch-echosrv.c) = 611044fd7ed1fd52c44e2d8ff393091c35478e17
+SHA1 (patch-sslh-main.c) = 996bbec53dbb3c92c3485b1f210853c7ed368519
diff --git a/net/sslh/patches/patch-echosrv.c b/net/sslh/patches/patch-echosrv.c
index 52669f00ae3..92083153226 100644
--- a/net/sslh/patches/patch-echosrv.c
+++ b/net/sslh/patches/patch-echosrv.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-echosrv.c,v 1.1 2013/11/08 13:33:55 obache Exp $
+$NetBSD: patch-echosrv.c,v 1.2 2014/11/28 10:45:28 bsiegert Exp $
* getopt_long_only does not exist on NetBSD getopt.
---- echosrv.c.orig 2013-07-27 14:25:04.000000000 +0000
+--- echosrv.c.orig 2014-02-11 21:06:01.000000000 +0000
+++ echosrv.c
@@ -64,7 +64,7 @@ void parse_cmdline(int argc, char* argv[
};
diff --git a/net/sslh/patches/patch-sslh-main.c b/net/sslh/patches/patch-sslh-main.c
index 35fb27fd8f8..d0d6995787f 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.1 2013/11/08 13:33:55 obache Exp $
+$NetBSD: patch-sslh-main.c,v 1.2 2014/11/28 10:45:28 bsiegert Exp $
* getopt_long_only does not exist on NetBSD getopt.
---- sslh-main.c.orig 2013-07-27 14:25:04.000000000 +0000
+--- sslh-main.c.orig 2014-02-11 21:06:01.000000000 +0000
+++ sslh-main.c
-@@ -337,7 +337,7 @@ static void cmdline_config(int argc, cha
+@@ -358,7 +358,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 */
@@ -13,7 +13,7 @@ $NetBSD: patch-sslh-main.c,v 1.1 2013/11/08 13:33:55 obache Exp $
if (c == 'F') {
config_filename = optarg;
/* find the end of the listen list */
-@@ -362,7 +362,7 @@ static void parse_cmdline(int argc, char
+@@ -383,7 +383,7 @@ static void parse_cmdline(int argc, char
optind = 1;
opterr = 1;
next_arg: