Sun Mar 13 18:31:11 2016 UTC ()
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.


(schnoebe)
diff -r1.17 -r1.18 pkgsrc/comms/conserver8/Makefile
diff -r1.9 -r1.10 pkgsrc/comms/conserver8/distinfo
diff -r1.1 -r1.2 pkgsrc/comms/conserver8/options.mk
diff -r0 -r1.1 pkgsrc/comms/conserver8/patches/patch-conserver_readcfg.c
cvs diff -r1.17 -r1.18 pkgsrc/comms/conserver8/Makefile (expand / switch to unified diff)

--- pkgsrc/comms/conserver8/Makefile 2016/03/05 11:28:10 1.17
+++ pkgsrc/comms/conserver8/Makefile 2016/03/13 18:31:11 1.18
@@ -1,54 +1,55 @@ @@ -1,54 +1,55 @@
1# $NetBSD: Makefile,v 1.17 2016/03/05 11:28:10 jperkin Exp $ 1# $NetBSD: Makefile,v 1.18 2016/03/13 18:31:11 schnoebe Exp $
2# 2#
3 3
4PKGVER= 8.2.0 4PKGVER= 8.2.1
5DISTNAME= conserver-${PKGVER} 5DISTNAME= conserver-${PKGVER}
6PKGNAME= conserver8-${PKGVER} 6PKGNAME= conserver8-${PKGVER}
7PKGREVISION= 1 
8CATEGORIES= comms 7CATEGORIES= comms
9MASTER_SITES= http://www.conserver.com/ 8MASTER_SITES= http://www.conserver.com/
10 9
11MAINTAINER= awrede@users.sourceforge.net 10MAINTAINER= pkgsrc-users@netbsd.org
12HOMEPAGE= http://www.conserver.com/ 11HOMEPAGE= http://www.conserver.com/
13COMMENT= Application that allows multiple users to watch serial consoles 12COMMENT= Application that allows multiple users to watch serial consoles
14#LICENSE= # modified-bsd and more (see LICENSE file) 13#LICENSE= # modified-bsd and more (see LICENSE file)
15 14
16CONFLICTS= conserver-[0-9]* 15CONFLICTS= conserver-[0-9]*
17 16
18INSTALLATION_DIRS= ${EGDIR} ${DOCDIR} 17INSTALLATION_DIRS= ${EGDIR} ${DOCDIR}
19 18
20GNU_CONFIGURE= YES 19GNU_CONFIGURE= YES
21 20
22CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} 21CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
23CONFIGURE_ARGS+= --with-master=${CONSERVER_DEFAULTHOST:Q} 22CONFIGURE_ARGS+= --with-master=${CONSERVER_DEFAULTHOST:Q}
24CONFIGURE_ARGS+= --with-port=${CONSERVER_DEFAULTPORT:Q} 23CONFIGURE_ARGS+= --with-port=${CONSERVER_DEFAULTPORT:Q}
25CONFIGURE_ARGS+= --with-regex 
26CONFIGURE_ARGS+= --with-libwrap=${BUILDLINK_PREFIX.tcp_wrappers} 24CONFIGURE_ARGS+= --with-libwrap=${BUILDLINK_PREFIX.tcp_wrappers}
27CONFIGURE_ARGS+= --with-logfile=${VARBASE:Q}/log/conserver 25CONFIGURE_ARGS+= --with-logfile=${VARBASE:Q}/log/conserver
28 26
29.include "options.mk" 27.include "options.mk"
30 28
31BUILD_DEFS+= CONSERVER_DEFAULTPORT CONSERVER_DEFAULTHOST VARBASE 29BUILD_DEFS+= CONSERVER_DEFAULTPORT CONSERVER_DEFAULTHOST VARBASE
32 30
33RCD_SCRIPTS= conserver8 31RCD_SCRIPTS= conserver8
34 32
35TEST_TARGET= test 33TEST_TARGET= test
36 34
37DOCDIR= ${PREFIX}/share/doc/conserver 35DOCDIR= ${PREFIX}/share/doc/conserver
38EGDIR= ${PREFIX}/share/examples/conserver 36EGDIR= ${PREFIX}/share/examples/conserver
39CONF_FILES= ${EGDIR}/conserver.cf ${PKG_SYSCONFDIR}/conserver.cf 37CONF_FILES= ${EGDIR}/conserver.cf ${PKG_SYSCONFDIR}/conserver.cf
40CONF_FILES+= ${EGDIR}/conserver.passwd ${PKG_SYSCONFDIR}/conserver.passwd 38CONF_FILES+= ${EGDIR}/conserver.passwd ${PKG_SYSCONFDIR}/conserver.passwd
41OWN_DIRS= ${VARBASE}/consoles 39OWN_DIRS= ${VARBASE}/consoles
42 40
43SUBST_CLASSES+= conf 41SUBST_CLASSES+= conf
44SUBST_STAGE.conf= post-patch 42SUBST_STAGE.conf= post-patch
45SUBST_FILES.conf= conserver.cf/conserver.cf 43SUBST_FILES.conf= conserver.cf/conserver.cf
46SUBST_SED.conf= -e "s,/var/consoles,${VARBASE}/consoles," 44SUBST_SED.conf= -e "s,/var/consoles,${VARBASE}/consoles,"
47 45
48post-install: 46post-install:
49 set -e; for File in INSTALL README PROTOCOL; do \ 47 set -e; for File in INSTALL README PROTOCOL; do \
50 ${INSTALL_DATA} ${WRKSRC}/$${File} ${DESTDIR}${DOCDIR}/$${File}; \ 48 ${INSTALL_DATA} ${WRKSRC}/$${File} ${DESTDIR}${DOCDIR}/$${File};\
 49 done
 50 set -e; for F in ${WRKSRC}/conserver.cf/samples/* ; do \
 51 ${INSTALL_DATA} $$F ${DESTDIR}$EGDIR}; \
51 done 52 done
52 53
53.include "../../security/tcp_wrappers/buildlink3.mk" 54.include "../../security/tcp_wrappers/buildlink3.mk"
54.include "../../mk/bsd.pkg.mk" 55.include "../../mk/bsd.pkg.mk"
cvs diff -r1.9 -r1.10 pkgsrc/comms/conserver8/distinfo (expand / switch to unified diff)

--- pkgsrc/comms/conserver8/distinfo 2015/11/03 01:34:53 1.9
+++ pkgsrc/comms/conserver8/distinfo 2016/03/13 18:31:11 1.10
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1$NetBSD: distinfo,v 1.9 2015/11/03 01:34:53 agc Exp $ 1$NetBSD: distinfo,v 1.10 2016/03/13 18:31:11 schnoebe Exp $
2 2
3SHA1 (conserver-8.2.0.tar.gz) = acbb7f282cea94eb044860c35ddd9f31a0299888 3SHA1 (conserver-8.2.1.tar.gz) = 357eea46c0189280b0ab66776b01ce3ba02f1847
4RMD160 (conserver-8.2.0.tar.gz) = fde2c8626f097d2e7f6eb10850a858dfc7d77a19 4RMD160 (conserver-8.2.1.tar.gz) = 39f08facffc9b462c8257fa21c24785eb1e2bb5a
5SHA512 (conserver-8.2.0.tar.gz) = adda3f473a50d931ce4cce6daa710385857324884157a78b90a5bae4dd8d5dd491b6e404e0fd7fb7eb657a48912ca24f0a1574f435e824ae608454e9c3dc2a09 5SHA512 (conserver-8.2.1.tar.gz) = caf519b8295fc142cf1cb5b141854aede07b3613653f417e9c3ebee75b30a12fa785c248806758f60afbc155cc048418635d514a9848e0fa06992f1e4f930fb6
6Size (conserver-8.2.0.tar.gz) = 334326 bytes 6Size (conserver-8.2.1.tar.gz) = 335241 bytes
7SHA1 (patch-aa) = d0eebea0d126c611f6f60035730a0c2f97280b01 7SHA1 (patch-aa) = d0eebea0d126c611f6f60035730a0c2f97280b01
8SHA1 (patch-ab) = 7a507e428277cc6ccf14b961c44d4e6fd3abcde3 8SHA1 (patch-ab) = 7a507e428277cc6ccf14b961c44d4e6fd3abcde3
 9SHA1 (patch-conserver_readcfg.c) = c39e1d50829658cb77e4c943e631da4b3cdd31ee
cvs diff -r1.1 -r1.2 pkgsrc/comms/conserver8/options.mk (expand / switch to unified diff)

--- pkgsrc/comms/conserver8/options.mk 2009/06/14 07:52:51 1.1
+++ pkgsrc/comms/conserver8/options.mk 2016/03/13 18:31:11 1.2
@@ -1,23 +1,32 @@ @@ -1,23 +1,32 @@
1# $NetBSD: options.mk,v 1.1 2009/06/14 07:52:51 wiz Exp $ 1# $NetBSD: options.mk,v 1.2 2016/03/13 18:31:11 schnoebe Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.conserver8 3PKG_OPTIONS_VAR= PKG_OPTIONS.conserver8
4PKG_SUPPORTED_OPTIONS= pam ssl uds 4
5PKG_SUGGESTED_OPTIONS= ssl 5PKG_OPTIONS_REQUIRED_GROUPS= connectivity
 6PKG_OPTIONS_GROUP.connectivity=inet6 uds
 7
 8PKG_SUPPORTED_OPTIONS= pam ssl
 9
 10PKG_SUGGESTED_OPTIONS= ssl inet6
6 11
7.include "../../mk/bsd.options.mk" 12.include "../../mk/bsd.options.mk"
8 13
9.if !empty(PKG_OPTIONS:Mpam) 14.if !empty(PKG_OPTIONS:Mpam)
10. include "../../mk/pam.buildlink3.mk" 15. include "../../mk/pam.buildlink3.mk"
11CONFIGURE_ARGS+= --with-pam 16CONFIGURE_ARGS+= --with-pam
12.endif 17.endif
13 18
14.if !empty(PKG_OPTIONS:Muds) 19.if !empty(PKG_OPTIONS:Muds)
15CONFIGURE_ARGS+= --with-uds 20CONFIGURE_ARGS+= --with-uds
16.endif 21.endif
17 22
 23.if !empty(PKG_OPTIONS:Minet6)
 24CONFIGURE_ARGS+= --with-ipv6
 25.endif
 26
18.if !empty(PKG_OPTIONS:Mssl) 27.if !empty(PKG_OPTIONS:Mssl)
19CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} 28CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q}
20. include "../../security/openssl/buildlink3.mk" 29. include "../../security/openssl/buildlink3.mk"
21.else 30.else
22CONFIGURE_ARGS+= --without-openssl 31CONFIGURE_ARGS+= --without-openssl
23.endif 32.endif
File Added: pkgsrc/comms/conserver8/patches/patch-conserver_readcfg.c
$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,