CVS commit: pkgsrc/net/sslh

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue Aug 15 14:23:50 UTC 2017

Modified Files:
        pkgsrc/net/sslh: Makefile distinfo
        pkgsrc/net/sslh/patches: patch-sslh-main.c

Log Message:
Support documented command line options.  Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/net/sslh/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/sslh/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/sslh/patches/patch-sslh-main.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/sslh/Makefile
diff -u pkgsrc/net/sslh/Makefile:1.10 pkgsrc/net/sslh/Makefile:1.11
--- pkgsrc/net/sslh/Makefile:1.10       Sun Aug  7 13:19:24 2016
+++ pkgsrc/net/sslh/Makefile    Tue Aug 15 14:23:50 2017
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2016/08/07 13:19:24 nils Exp $
+# $NetBSD: Makefile,v 1.11 2017/08/15 14:23:50 jperkin Exp $
 
 DISTNAME=      sslh-1.18
+PKGREVISION=   1
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=yrutschle/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}

Index: pkgsrc/net/sslh/distinfo
diff -u pkgsrc/net/sslh/distinfo:1.7 pkgsrc/net/sslh/distinfo:1.8
--- pkgsrc/net/sslh/distinfo:1.7        Tue Aug 15 13:13:36 2017
+++ pkgsrc/net/sslh/distinfo    Tue Aug 15 14:23:50 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2017/08/15 13:13:36 jperkin Exp $
+$NetBSD: distinfo,v 1.8 2017/08/15 14:23:50 jperkin Exp $
 
 SHA1 (sslh-1.18.tar.gz) = dacf6250e26250513deeaa310c78591d5b3e77f4
 RMD160 (sslh-1.18.tar.gz) = 49e83f975f7e8df8358bdd1d7afeabdbe6269a82
@@ -7,5 +7,5 @@ Size (sslh-1.18.tar.gz) = 53175 bytes
 SHA1 (patch-common.c) = fb812e7aca2216c6b6577c9d33e37dd837e26fe7
 SHA1 (patch-common.h) = 376a7d4d9ef28707d3dfc3df763a2a577f020772
 SHA1 (patch-echosrv.c) = 611044fd7ed1fd52c44e2d8ff393091c35478e17
-SHA1 (patch-sslh-main.c) = a74502a087b11c4d8f32791ac86c45c7a38923d9
+SHA1 (patch-sslh-main.c) = 3345b4477b4f927deebc485bcf7d656fe0f584d8
 SHA1 (patch-sslh-select.c) = d470e6dc803164fbdfa77ddc189cdb4dd7672bd4

Index: pkgsrc/net/sslh/patches/patch-sslh-main.c
diff -u pkgsrc/net/sslh/patches/patch-sslh-main.c:1.4 pkgsrc/net/sslh/patches/patch-sslh-main.c:1.5
--- pkgsrc/net/sslh/patches/patch-sslh-main.c:1.4       Sun Aug  7 13:19:24 2016
+++ pkgsrc/net/sslh/patches/patch-sslh-main.c   Tue Aug 15 14:23:50 2017
@@ -1,9 +1,19 @@
-$NetBSD: patch-sslh-main.c,v 1.4 2016/08/07 13:19:24 nils Exp $
+$NetBSD: patch-sslh-main.c,v 1.5 2017/08/15 14:23:50 jperkin Exp $
 
 * getopt_long_only does not exist on NetBSD getopt.
+* Support documented command line options.
 
 --- sslh-main.c.orig   2016-03-29 19:19:05.000000000 +0000
 +++ sslh-main.c
+@@ -78,7 +78,7 @@ static struct option const_options[] = {
+ };
+ static struct option* all_options;
+ static struct proto* builtins;
+-static const char *optstr = "vt:T:p:VP:F::";
++static const char *optstr = "finvt:T:p:VP:F::";
+ 
+ 
+ 
 @@ -443,7 +443,7 @@ static void cmdline_config(int argc, cha
  #ifdef LIBCONFIG
      optind = 1;
@@ -22,3 +32,22 @@ $NetBSD: patch-sslh-main.c,v 1.4 2016/08
          if (c == 0) continue;
  
          if (c >= PROT_SHIFT) {
+@@ -510,6 +510,18 @@ next_arg:
+ 
+         switch (c) {
+ 
++        case 'f':
++            foreground = 1;
++            break;
++
++        case 'i':
++            inetd = 1;
++            break;
++
++        case 'n':
++            numeric = 1;
++            break;
++
+         case 'F':
+             /* Legal option, but do nothing, it was already processed in
+              * cmdline_config() */