Upstream: Update to 8.2.1

    version 8.2.1 (Jun 2, 2015):
	- added TCP keepalives between client and server - TCP-based consoles
	  already had the code - this was mostly an oversight
	- patch for SEGV and task execution - patch by Artem Savkov
	  <asavkov@redhat.com>
	- expanded break sequences from [1-9] to [1-9a-z] - based on patch by
	  Artem Savkov <asavkov@redhat.com>

pkgsrc:
    options.mk:
	add support inet6
	The way the conserver is coded, you get inet6 or you get uds
    patches/patch-conserver_readcfg.c:
	new patch, fixing a setproctitle() bug with inet6.
	This needs to be sent upstream.
    Makefile:
	install sample configurations
	Change maintainer to pkgsrc-users@netbsd.org
	    old maintainer address bounced.
	drop ``--with-regex'' option, it's no longer supported.

4 files changed, 47 insertions, 14 deletions

diff --git a/comms/conserver8/Makefile b/comms/conserver8/Makefile
index 5f7458b0399..efb24c01457 100644
--- a/comms/conserver8/Makefile
+++ b/comms/conserver8/Makefile
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.17 2016/03/05 11:28:10 jperkin Exp $
+# $NetBSD: Makefile,v 1.18 2016/03/13 18:31:11 schnoebe Exp $
 #
 
-PKGVER=		8.2.0
+PKGVER=		8.2.1
 DISTNAME=	conserver-${PKGVER}
 PKGNAME=	conserver8-${PKGVER}
-PKGREVISION=	1
 CATEGORIES=	comms
 MASTER_SITES=	http://www.conserver.com/
 
-MAINTAINER=	awrede@users.sourceforge.net
+MAINTAINER=	pkgsrc-users@netbsd.org
 HOMEPAGE=	http://www.conserver.com/
 COMMENT=	Application that allows multiple users to watch serial consoles
 #LICENSE=	# modified-bsd and more (see LICENSE file)
@@ -22,7 +21,6 @@ GNU_CONFIGURE=	YES
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=	--with-master=${CONSERVER_DEFAULTHOST:Q}
 CONFIGURE_ARGS+=	--with-port=${CONSERVER_DEFAULTPORT:Q}
-CONFIGURE_ARGS+=	--with-regex
 CONFIGURE_ARGS+=	--with-libwrap=${BUILDLINK_PREFIX.tcp_wrappers}
 CONFIGURE_ARGS+=	--with-logfile=${VARBASE:Q}/log/conserver
 
@@ -47,7 +45,10 @@ SUBST_SED.conf=		-e "s,/var/consoles,${VARBASE}/consoles,"
 
 post-install:
 	set -e; for File in INSTALL README PROTOCOL; do			\
-		${INSTALL_DATA} ${WRKSRC}/$${File} ${DESTDIR}${DOCDIR}/$${File};	\
+	    ${INSTALL_DATA} ${WRKSRC}/$${File} ${DESTDIR}${DOCDIR}/$${File};\
+	done
+	set -e; for F in ${WRKSRC}/conserver.cf/samples/* ; do \
+	    ${INSTALL_DATA} $$F ${DESTDIR}$EGDIR}; \
 	done
 
 .include "../../security/tcp_wrappers/buildlink3.mk"
diff --git a/comms/conserver8/distinfo b/comms/conserver8/distinfo
index f3fe2b63017..823fd5cef57 100644
--- a/comms/conserver8/distinfo
+++ b/comms/conserver8/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.9 2015/11/03 01:34:53 agc Exp $
+$NetBSD: distinfo,v 1.10 2016/03/13 18:31:11 schnoebe Exp $
 
-SHA1 (conserver-8.2.0.tar.gz) = acbb7f282cea94eb044860c35ddd9f31a0299888
-RMD160 (conserver-8.2.0.tar.gz) = fde2c8626f097d2e7f6eb10850a858dfc7d77a19
-SHA512 (conserver-8.2.0.tar.gz) = adda3f473a50d931ce4cce6daa710385857324884157a78b90a5bae4dd8d5dd491b6e404e0fd7fb7eb657a48912ca24f0a1574f435e824ae608454e9c3dc2a09
-Size (conserver-8.2.0.tar.gz) = 334326 bytes
+SHA1 (conserver-8.2.1.tar.gz) = 357eea46c0189280b0ab66776b01ce3ba02f1847
+RMD160 (conserver-8.2.1.tar.gz) = 39f08facffc9b462c8257fa21c24785eb1e2bb5a
+SHA512 (conserver-8.2.1.tar.gz) = caf519b8295fc142cf1cb5b141854aede07b3613653f417e9c3ebee75b30a12fa785c248806758f60afbc155cc048418635d514a9848e0fa06992f1e4f930fb6
+Size (conserver-8.2.1.tar.gz) = 335241 bytes
 SHA1 (patch-aa) = d0eebea0d126c611f6f60035730a0c2f97280b01
 SHA1 (patch-ab) = 7a507e428277cc6ccf14b961c44d4e6fd3abcde3
+SHA1 (patch-conserver_readcfg.c) = c39e1d50829658cb77e4c943e631da4b3cdd31ee
diff --git a/comms/conserver8/options.mk b/comms/conserver8/options.mk
index 20c9b980bb8..2bd53ef2436 100644
--- a/comms/conserver8/options.mk
+++ b/comms/conserver8/options.mk
@@ -1,8 +1,13 @@
-# $NetBSD: options.mk,v 1.1 2009/06/14 07:52:51 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2016/03/13 18:31:11 schnoebe Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.conserver8
-PKG_SUPPORTED_OPTIONS=	pam ssl uds
-PKG_SUGGESTED_OPTIONS=	ssl
+
+PKG_OPTIONS_REQUIRED_GROUPS= connectivity
+PKG_OPTIONS_GROUP.connectivity=inet6 uds
+
+PKG_SUPPORTED_OPTIONS=	pam ssl
+
+PKG_SUGGESTED_OPTIONS=	ssl inet6
 
 .include "../../mk/bsd.options.mk"
 
@@ -15,6 +20,10 @@ CONFIGURE_ARGS+=	--with-pam
 CONFIGURE_ARGS+=	--with-uds
 .endif
 
+.if !empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGS+=	--with-ipv6
+.endif
+
 .if !empty(PKG_OPTIONS:Mssl)
 CONFIGURE_ARGS+=	--with-openssl=${SSLBASE:Q}
 . include "../../security/openssl/buildlink3.mk"
diff --git a/comms/conserver8/patches/patch-conserver_readcfg.c b/comms/conserver8/patches/patch-conserver_readcfg.c
new file mode 100644
index 00000000000..b3459ed0b3e
--- /dev/null
+++ b/comms/conserver8/patches/patch-conserver_readcfg.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-conserver_readcfg.c,v 1.1 2016/03/13 18:31:11 schnoebe Exp $
+
+Have readcfg.c use the same logic as main.c uses for setproctitle.
+
+--- conserver/readcfg.c.orig	2015-06-02 17:19:31.000000000 +0000
++++ conserver/readcfg.c
+@@ -5376,7 +5376,14 @@ ReReadCfg(int fd, int msfd)
+ 		local += pGE->imembers;
+ 	    for (pRC = pRCList; (REMOTE *)0 != pRC; pRC = pRC->pRCnext)
+ 		remote++;
+-	    setproctitle("master: port %hu, %d local, %d remote", bindPort,
++	    setproctitle("master: port %hu, %d local, %d remote",
++#if USE_IPV6
++			 config->primaryport,
++#elif USE_UNIX_DOMAIN_SOCKETS
++			 0,
++#else
++			 bindPort,
++#endif
+ 			 local, remote);
+ 	} else
+ 	    setproctitle("group %u: port %hu, %d %s", pGroups->id,