sslh: update to 1.19c.

v1.19: 20JAN2018
	Added 'syslog_facility' configuration option to
	specify where to log.

	TLS now supports SNI and ALPN (Travis Burtrum),
	including support for Let's Encrypt challenges
	(Jonathan McCrohan)

	ADB probe. (Mike Frysinger)

	Added per-protocol 'fork' option. (Oleg Oshmyan)

	Added chroot option. (Mike Frysinger)

	A truckload of bug fixes and documentation
	improvements (Various contributors)

4 files changed, 29 insertions, 29 deletions

diff --git a/net/sslh/Makefile b/net/sslh/Makefile
index bb87aa47644..9cf46a91495 100644
--- a/net/sslh/Makefile
+++ b/net/sslh/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2017/08/15 14:23:50 jperkin Exp $
+# $NetBSD: Makefile,v 1.12 2018/04/29 09:41:15 wiz Exp $
 
-DISTNAME=	sslh-1.18
-PKGREVISION=	1
+DISTNAME=	sslh-1.19c
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GITHUB:=yrutschle/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
@@ -42,5 +41,6 @@ do-install:
 
 .include "../../devel/libconfig/buildlink3.mk"
 .include "../../devel/libgetopt/buildlink3.mk"
+.include "../../devel/pcre/buildlink3.mk"
 .include "../../security/tcp_wrappers/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/sslh/distinfo b/net/sslh/distinfo
index fda0bf525e7..dd326fedb57 100644
--- a/net/sslh/distinfo
+++ b/net/sslh/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.8 2017/08/15 14:23:50 jperkin Exp $
+$NetBSD: distinfo,v 1.9 2018/04/29 09:41:15 wiz Exp $
 
-SHA1 (sslh-1.18.tar.gz) = dacf6250e26250513deeaa310c78591d5b3e77f4
-RMD160 (sslh-1.18.tar.gz) = 49e83f975f7e8df8358bdd1d7afeabdbe6269a82
-SHA512 (sslh-1.18.tar.gz) = 859ad65a258534fde68295a2880c077a00205d96a6aafeb525abce836850b9deea7b39daa2dc74a0dc18d2b198884958a39fbe758d61c93b257676f3a7d4f7bc
-Size (sslh-1.18.tar.gz) = 53175 bytes
-SHA1 (patch-common.c) = fb812e7aca2216c6b6577c9d33e37dd837e26fe7
+SHA1 (sslh-1.19c.tar.gz) = 970a9ee983dc05efa4f1b85aa30270d8c2755c91
+RMD160 (sslh-1.19c.tar.gz) = e77777a8747f9809c9c7f0ec87d42de7b1d86382
+SHA512 (sslh-1.19c.tar.gz) = a90b8c8892e595d43dcbc5ccf77136f5ced3815f95da54093fb548e7a0af573b13a25695cf4b0a2820664b4a5f029b250485bcc67806de8e309e0f8dc4bf81e9
+Size (sslh-1.19c.tar.gz) = 57426 bytes
+SHA1 (patch-common.c) = d889ef166776ff6d6808733d668636bd3a8fb239
 SHA1 (patch-common.h) = 376a7d4d9ef28707d3dfc3df763a2a577f020772
 SHA1 (patch-echosrv.c) = 611044fd7ed1fd52c44e2d8ff393091c35478e17
-SHA1 (patch-sslh-main.c) = 3345b4477b4f927deebc485bcf7d656fe0f584d8
+SHA1 (patch-sslh-main.c) = 0f790b0fb93104d6e963c29aee41dc5c11d6fa45
 SHA1 (patch-sslh-select.c) = d470e6dc803164fbdfa77ddc189cdb4dd7672bd4
diff --git a/net/sslh/patches/patch-common.c b/net/sslh/patches/patch-common.c
index 574f4f4e2ce..524c24a2d3a 100644
--- a/net/sslh/patches/patch-common.c
+++ b/net/sslh/patches/patch-common.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-common.c,v 1.1 2017/08/15 13:13:36 jperkin Exp $
+$NetBSD: patch-common.c,v 1.2 2018/04/29 09:41:16 wiz Exp $
 
 Avoid queue variable conflict.
 
---- common.c.orig	2016-03-29 19:19:05.000000000 +0000
+--- common.c.orig	2018-02-11 17:42:21.000000000 +0000
 +++ common.c
-@@ -237,7 +237,7 @@ int connect_addr(struct connection *cnx,
+@@ -287,7 +287,7 @@ int connect_addr(struct connection *cnx,
  }
  
  /* Store some data to write to the queue later */
@@ -12,8 +12,8 @@ Avoid queue variable conflict.
 +int defer_write(struct sslhqueue *q, void* data, int data_size)
  {
      char *p;
-     if (verbose)
-@@ -261,7 +261,7 @@ int defer_write(struct queue *q, void* d
+     ptrdiff_t data_offset = q->deferred_data - q->begin_deferred_data;
+@@ -313,7 +313,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;
  
-@@ -313,7 +313,7 @@ void dump_connection(struct connection *
+@@ -365,7 +365,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,16 +31,16 @@ Avoid queue variable conflict.
  {
     char buffer[BUFSIZ];
     int target, from, size_r, size_w;
-@@ -594,7 +594,7 @@ void setup_syslog(const char* bin_name)
-     int res;
+@@ -658,7 +658,7 @@ void setup_syslog(const char* bin_name) 
+     int res, fn;
  
      name1 = strdup(bin_name);
 -    res = asprintf(&name2, "%s[%d]", basename(name1), getpid());
 +    res = asprintf(&name2, "%s[%d]", basename(name1), (int)getpid());
      CHECK_RES_DIE(res, "asprintf");
-     openlog(name2, LOG_CONS, LOG_AUTH);
-     free(name1);
-@@ -694,7 +694,7 @@ void write_pid_file(const char* pidfile)
+ 
+     for (fn = 0; facilitynames[fn].c_val != -1; fn++)
+@@ -781,7 +781,7 @@ void write_pid_file(const char* pidfile)
          exit(3);
      }
  
diff --git a/net/sslh/patches/patch-sslh-main.c b/net/sslh/patches/patch-sslh-main.c
index a56db7c6d5b..d5eaed7faa1 100644
--- a/net/sslh/patches/patch-sslh-main.c
+++ b/net/sslh/patches/patch-sslh-main.c
@@ -1,20 +1,20 @@
-$NetBSD: patch-sslh-main.c,v 1.5 2017/08/15 14:23:50 jperkin Exp $
+$NetBSD: patch-sslh-main.c,v 1.6 2018/04/29 09:41:16 wiz 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.orig	2018-02-11 17:42:21.000000000 +0000
 +++ sslh-main.c
-@@ -78,7 +78,7 @@ static struct option const_options[] = {
+@@ -80,7 +80,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::";
+-static const char *optstr = "vt:T:p:VP:C:F::";
++static const char *optstr = "finvt:T:p:VP:C:F::";
  
  
  
-@@ -443,7 +443,7 @@ static void cmdline_config(int argc, cha
+@@ -460,7 +460,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 */
@@ -23,7 +23,7 @@ $NetBSD: patch-sslh-main.c,v 1.5 2017/08/15 14:23:50 jperkin Exp $
          if (c == 'v') {
              verbose++;
          }
-@@ -480,7 +480,7 @@ static void parse_cmdline(int argc, char
+@@ -497,7 +497,7 @@ static void parse_cmdline(int argc, char
      optind = 1;
      opterr = 1;
  next_arg:
@@ -32,7 +32,7 @@ $NetBSD: patch-sslh-main.c,v 1.5 2017/08/15 14:23:50 jperkin Exp $
          if (c == 0) continue;
  
          if (c >= PROT_SHIFT) {
-@@ -510,6 +510,18 @@ next_arg:
+@@ -527,6 +527,18 @@ next_arg:
  
          switch (c) {