CVS commit: pkgsrc/net/sslh

["Olaf Seibert" <rhialto%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rhialto
Date:           Sun Jun 13 12:04:22 UTC 2021

Modified Files:
        pkgsrc/net/sslh: Makefile PLIST distinfo
        pkgsrc/net/sslh/patches: patch-common.c patch-common.h
Removed Files:
        pkgsrc/net/sslh/patches: patch-sslh-main.c

Log Message:
net/sslh: update to 1.21

v1.21

Added TCP_FASTOPEN support for client sockets (if tfo_ok is
specified in their configuration) and for listenint socket,
if all client protocols support it.  (Craig Andrews)

Added 'minlength' option to skip a probe if less
than that many bytes have been received (mostly for
regex)

Moved configuration and command-line management to
use conf2struct. Hopefully this should be transparent
to users.

Update Let's Encrypt entry in example.cfg for tls-alpn-01
challenges; tls-sni-* challenges are now deprecated.

Log to syslog even if in foreground (for people who
use fail2ban)

Use syslog_facility: "none" to disable syslog
output.

v1.21b

Added TCP_FASTOPEN support for client sockets (if tfo_ok is specified
in their configuration) and for listenint socket, if all client
protocols support it.  (Craig Andrews)

Added 'minlength' option to skip a probe if less than that many bytes
have been received (mostly for regex)

Moved configuration and command-line management to use conf2struct.
Changes are:
* command line option <-F|--config> no longer defaults to /etc/sslh.cfg,
so you have to specify it explicitly.
* command line option <-v|--verbose> takes a mandatory integer parameter

Update Let's Encrypt entry in example.cfg for tls-alpn-01 challenges;
tls-sni-* challenges are now deprecated.

Log to syslog even if in foreground (for people who use fail2ban)

Use syslog_facility: "none" to disable syslog output.

Changed exit code for illegal command line parameter from 1 to 6 (for
testing purposes)

v1.21c

Removed support for 'ssl' and fix a related segfault bug.
(use tls instead of ssl)


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/net/sslh/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/sslh/PLIST
cvs rdiff -u -r1.10 -r1.11 pkgsrc/net/sslh/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/sslh/patches/patch-common.c
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/sslh/patches/patch-common.h
cvs rdiff -u -r1.6 -r0 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.14 pkgsrc/net/sslh/Makefile:1.15
--- pkgsrc/net/sslh/Makefile:1.14       Sun Jan 26 17:31:55 2020
+++ pkgsrc/net/sslh/Makefile    Sun Jun 13 12:04:21 2021
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.14 2020/01/26 17:31:55 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2021/06/13 12:04:21 rhialto Exp $
 
-DISTNAME=      sslh-1.20
+DISTNAME=      sslh-1.21c
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=yrutschle/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
 
 MAINTAINER=    nils%NetBSD.org@localhost
-HOMEPAGE=      https://www.rutschle.net/tech/sslh.shtml
+HOMEPAGE=      https://www.rutschle.net/tech/sslh/README.html
 COMMENT=       Multiplex ssl, ssh, and other connections on the same port
 LICENSE=       gnu-gpl-v2
 
@@ -36,7 +36,6 @@ do-install:
        ${INSTALL_DATA} ${WRKSRC}/example.cfg ${DESTDIR}${EGDIR}
        ${INSTALL_DATA} ${WRKSRC}/basic.cfg ${DESTDIR}${EGDIR}
        ${INSTALL_DATA} ${WRKSRC}/README.md ${DESTDIR}${PREFIX}/${DOCDIR}
-       ${INSTALL_DATA} ${WRKSRC}/README.MacOSX ${DESTDIR}${PREFIX}/${DOCDIR}
        ${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DESTDIR}${PREFIX}/${DOCDIR}
 
 .include "../../devel/libconfig/buildlink3.mk"

Index: pkgsrc/net/sslh/PLIST
diff -u pkgsrc/net/sslh/PLIST:1.5 pkgsrc/net/sslh/PLIST:1.6
--- pkgsrc/net/sslh/PLIST:1.5   Mon May 11 10:39:26 2015
+++ pkgsrc/net/sslh/PLIST       Sun Jun 13 12:04:21 2021
@@ -1,9 +1,8 @@
-@comment $NetBSD: PLIST,v 1.5 2015/05/11 10:39:26 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2021/06/13 12:04:21 rhialto Exp $
 man/man8/sslh.8
 sbin/sslh
 sbin/sslh-select
 share/doc/sslh/ChangeLog
-share/doc/sslh/README.MacOSX
 share/doc/sslh/README.md
 share/examples/sslh/basic.cfg
 share/examples/sslh/example.cfg

Index: pkgsrc/net/sslh/distinfo
diff -u pkgsrc/net/sslh/distinfo:1.10 pkgsrc/net/sslh/distinfo:1.11
--- pkgsrc/net/sslh/distinfo:1.10       Wed Dec  5 21:20:32 2018
+++ pkgsrc/net/sslh/distinfo    Sun Jun 13 12:04:21 2021
@@ -1,11 +1,13 @@
-$NetBSD: distinfo,v 1.10 2018/12/05 21:20:32 wiz Exp $
+$NetBSD: distinfo,v 1.11 2021/06/13 12:04:21 rhialto Exp $
 
-SHA1 (sslh-1.20.tar.gz) = d39b68a537ed1385f1c801a1e10ccdb7b31e555a
-RMD160 (sslh-1.20.tar.gz) = 3745768e1de8c5a154cfd98ea6f215ac349a3b17
-SHA512 (sslh-1.20.tar.gz) = 403b8b59565e6835418c39bc5db6567a593dbdda86197186b1cd4f441009a52a039047254e674e6264492c02816c1cffdd3155e161837e3b78230d5f37ac7883
-Size (sslh-1.20.tar.gz) = 60466 bytes
-SHA1 (patch-common.c) = d889ef166776ff6d6808733d668636bd3a8fb239
-SHA1 (patch-common.h) = 376a7d4d9ef28707d3dfc3df763a2a577f020772
+SHA1 (sslh-1.21c.tar.gz) = f9d190b07fa9b72ab7d750bdfc1adaf23917649e
+RMD160 (sslh-1.21c.tar.gz) = dca5001a1bde50c08c6bfe40ff9cdb923cd1682c
+SHA512 (sslh-1.21c.tar.gz) = 9446c6afe965684c5d6406ac8917338f57d95f8fbfacd7a51193dd5dbac77e1ed5e39eb8e2575e7025a8612b25e9fba7e64832a48c999f366875217b9328da22
+Size (sslh-1.21c.tar.gz) = 111895 bytes
+SHA1 (patch-argtable3.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-common.c) = e5aa0cc38e9c62a765400b08ed700e9d2f08f2db
+SHA1 (patch-common.h) = 3e4cc77aeedf9fa4e94329dcf1c1c65099d3ae68
 SHA1 (patch-echosrv.c) = 611044fd7ed1fd52c44e2d8ff393091c35478e17
-SHA1 (patch-sslh-main.c) = 0f790b0fb93104d6e963c29aee41dc5c11d6fa45
+SHA1 (patch-sslh-conf.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-sslh-main.c) = 059fd93a7412fc2ca38b29ae0c65783f4213e77c
 SHA1 (patch-sslh-select.c) = d470e6dc803164fbdfa77ddc189cdb4dd7672bd4

Index: pkgsrc/net/sslh/patches/patch-common.c
diff -u pkgsrc/net/sslh/patches/patch-common.c:1.2 pkgsrc/net/sslh/patches/patch-common.c:1.3
--- pkgsrc/net/sslh/patches/patch-common.c:1.2  Sun Apr 29 09:41:16 2018
+++ pkgsrc/net/sslh/patches/patch-common.c      Sun Jun 13 12:04:21 2021
@@ -1,10 +1,10 @@
-$NetBSD: patch-common.c,v 1.2 2018/04/29 09:41:16 wiz Exp $
+$NetBSD: patch-common.c,v 1.3 2021/06/13 12:04:21 rhialto Exp $
 
 Avoid queue variable conflict.
 
---- common.c.orig      2018-02-11 17:42:21.000000000 +0000
+--- common.c.orig      2020-07-30 07:45:50.000000000 +0000
 +++ common.c
-@@ -287,7 +287,7 @@ int connect_addr(struct connection *cnx,
+@@ -338,7 +338,7 @@ int connect_addr(struct connection *cnx,
  }
  
  /* Store some data to write to the queue later */
@@ -13,7 +13,7 @@ Avoid queue variable conflict.
  {
      char *p;
      ptrdiff_t data_offset = q->deferred_data - q->begin_deferred_data;
-@@ -313,7 +313,7 @@ int defer_write(struct queue *q, void* d
+@@ -361,7 +361,7 @@ int defer_write(struct queue *q, void* d
   * Upon success, the number of bytes written is returned.
   * Upon failure, -1 returned (e.g. connexion closed)
   * */
@@ -22,7 +22,7 @@ Avoid queue variable conflict.
  {
      int n;
  
-@@ -365,7 +365,7 @@ void dump_connection(struct connection *
+@@ -413,7 +413,7 @@ void dump_connection(struct connection *
   * returns FD_STALLED if data was read, could not be written, and has been
   * stored in temporary buffer.
   */
@@ -31,8 +31,8 @@ Avoid queue variable conflict.
  {
     char buffer[BUFSIZ];
     int target, from, size_r, size_w;
-@@ -658,7 +658,7 @@ void setup_syslog(const char* bin_name) 
-     int res, fn;
+@@ -738,7 +738,7 @@ void setup_syslog(const char* bin_name) 
+     }
  
      name1 = strdup(bin_name);
 -    res = asprintf(&name2, "%s[%d]", basename(name1), getpid());
@@ -40,7 +40,7 @@ Avoid queue variable conflict.
      CHECK_RES_DIE(res, "asprintf");
  
      for (fn = 0; facilitynames[fn].c_val != -1; fn++)
-@@ -781,7 +781,7 @@ void write_pid_file(const char* pidfile)
+@@ -861,7 +861,7 @@ void write_pid_file(const char* pidfile)
          exit(3);
      }
  

Index: pkgsrc/net/sslh/patches/patch-common.h
diff -u pkgsrc/net/sslh/patches/patch-common.h:1.1 pkgsrc/net/sslh/patches/patch-common.h:1.2
--- pkgsrc/net/sslh/patches/patch-common.h:1.1  Tue Aug 15 13:13:36 2017
+++ pkgsrc/net/sslh/patches/patch-common.h      Sun Jun 13 12:04:21 2021
@@ -1,10 +1,10 @@
-$NetBSD: patch-common.h,v 1.1 2017/08/15 13:13:36 jperkin Exp $
+$NetBSD: patch-common.h,v 1.2 2021/06/13 12:04:21 rhialto Exp $
 
 Avoid queue variable conflict.
 
---- common.h.orig      2016-03-29 19:19:05.000000000 +0000
+--- common.h.orig      2020-07-30 07:45:50.000000000 +0000
 +++ common.h
-@@ -69,7 +69,7 @@ enum connection_state {
+@@ -85,7 +85,7 @@ enum connection_state {
  
  /* A 'queue' is composed of a file descriptor (which can be read from or
   * written to), and a queue for deferred write data */
@@ -13,7 +13,7 @@ Avoid queue variable conflict.
      int fd;
      void *begin_deferred_data;
      void *deferred_data;
-@@ -84,7 +84,7 @@ struct connection {
+@@ -100,7 +100,7 @@ struct connection {
      /* q[0]: queue for external connection (client);
       * q[1]: queue for internal connection (httpd or sshd);
       * */
@@ -22,7 +22,7 @@ Avoid queue variable conflict.
  };
  
  #define FD_CNXCLOSED    0
-@@ -95,7 +95,7 @@ struct connection {
+@@ -118,7 +118,7 @@ struct connection_desc {
  /* common.c */
  void init_cnx(struct connection *cnx);
  int connect_addr(struct connection *cnx, int fd_from);
@@ -30,8 +30,8 @@ Avoid queue variable conflict.
 +int fd2fd(struct sslhqueue *target, struct sslhqueue *from);
  char* sprintaddr(char* buf, size_t size, struct addrinfo *a);
  void resolve_name(struct addrinfo **out, char* fullname);
- void log_connection(struct connection *cnx);
-@@ -110,8 +110,8 @@ int resolve_split_name(struct addrinfo *
+ int get_connection_desc(struct connection_desc* desc, const struct connection *cnx);
+@@ -135,8 +135,8 @@ int resolve_split_name(struct addrinfo *
  
  int start_listen_sockets(int *sockfd[], struct addrinfo *addr_list);
  
@@ -40,5 +40,5 @@ Avoid queue variable conflict.
 +int defer_write(struct sslhqueue *q, void* data, int data_size);
 +int flush_deferred(struct sslhqueue *q);
  
- extern int probing_timeout, verbose, inetd, foreground, 
-        background, transparent, numeric;
+ extern struct sslhcfg_item cfg;
+ extern struct addrinfo *addr_listen;