Upgrade conserver8 to version 8.2.4.

Pkgsrc changes: * Adapt to re-location to github * Fix patching of the conserver.cf man page * Adapt to README -> README.md change * Enable LICENSE setting (even though there's more to it, see comment) Upstream changes: version 8.2.4 (March 26, 2019): - Correct man page typo (Ed Maste <emaste@freebsd.org>) - Remove autotools generated files from repo and create with release - Better integration of Cirrus CI - FreeBSD, Linux, and MacOS - Moving README to markdown - Fix #12 - Remote infomation flags (i.e. "-x") cannot be filtered by console - Fix #8 - defaultaccess appears broken - Rename configure.in and use autoreconf - Better use of version.h and letting configure build things with versions version 8.2.3 (March 17, 2019): - Correct 'impi' typo (Ed Maste <emaste@freebsd.org>) - Correct argument type passed to time() (Ed Maste <emaste@freebsd.org>) - Fix compilation without deprecated OpenSSL APIs (Rosen Penev <rosenp@gmail.com>) - Fix compilation without deprecated OpenSSL 1.1 APIs (Rosen Penev <rosenp@gmail.com>) - Fix #6 - clang "-Wstring-plus-int" warning (Bryan Stansell <bryan@conserver.com>) - configure.in: Add test for closefrom (Ed Maste <emaste@freebsd.org>) - regenerate autoconf files (Ed Maste <emaste@freebsd.org>) - Use closefrom if available (Ed Maste <emaste@freebsd.org>) - Correct typo (Ed Maste <emaste@freebsd.org>) - Add Cirrus-CI FreeBSD CI build config (Ed Maste <emaste@freebsd.org>) - off by one found by Ed Maste (Bryan Stansell <bryan@conserver.com>) version 8.2.2 (May 28, 2018): - fixes for OpenSSL 1.1+ - patch by Eneas U de Queiroz <cote2004-github@yahoo.com> - adjustments to documentation after move to github - removal of old RCS/CVS tags since we have git
NetBSD · May 23, 2019 · d4d0886 · d4d0886
1 parent 26c1269
commit d4d0886
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 51 deletions.
diff --git a/comms/conserver8/Makefile b/comms/conserver8/Makefile
@@ -1,17 +1,19 @@
-# $NetBSD: Makefile,v 1.25 2018/07/04 13:40:12 jperkin Exp $
+# $NetBSD: Makefile,v 1.26 2019/05/23 15:14:51 he Exp $
 #
 
-PKGVER=		8.2.1
-PKGREVISION=	4
+PKGVER=		8.2.4
 DISTNAME=	conserver-${PKGVER}
 PKGNAME=	conserver8-${PKGVER}
 CATEGORIES=	comms
-MASTER_SITES=	http://www.conserver.com/
+GITHUB_PROJECT=	conserver
+GITHUB_TYPE=	release
+GITHUB_RELEASE=	v${PKGVER}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=conserver/}
 
 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)
+LICENSE=	modified-bsd # and more (see LICENSE and LICENSES file)
 
 CONFLICTS=	conserver-[0-9]*
 
@@ -46,7 +48,7 @@ SUBST_FILES.conf=	conserver.cf/conserver.cf
 SUBST_SED.conf=		-e "s,/var/consoles,${VARBASE}/consoles,"
 
 post-install:
-	set -e; for File in INSTALL README PROTOCOL; do			\
+	set -e; for File in INSTALL README.md PROTOCOL; do		\
 	    ${INSTALL_DATA} ${WRKSRC}/$${File} ${DESTDIR}${DOCDIR}/$${File};\
 	done
 	set -e; for F in ${WRKSRC}/conserver.cf/samples/* ; do \

diff --git a/comms/conserver8/PLIST b/comms/conserver8/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2016/06/15 23:02:10 schnoebe Exp $
+@comment $NetBSD: PLIST,v 1.7 2019/05/23 15:14:51 he Exp $
 bin/console
 lib/conserver/convert
 man/man1/console.1
@@ -8,7 +8,7 @@ man/man8/conserver.8
 sbin/conserver
 share/doc/conserver/INSTALL
 share/doc/conserver/PROTOCOL
-share/doc/conserver/README
+share/doc/conserver/README.md
 share/examples/conserver/README
 share/examples/conserver/average-distributed.cf
 share/examples/conserver/average.cf

diff --git a/comms/conserver8/distinfo b/comms/conserver8/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.11 2017/01/18 09:54:51 he Exp $
+$NetBSD: distinfo,v 1.12 2019/05/23 15:14:51 he Exp $
 
-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 (conserver-8.2.4.tar.gz) = 1aa679abaa0e2e1f654a65f6ab1af254518e3407
+RMD160 (conserver-8.2.4.tar.gz) = a911377a5821d6a9129ce875c1d6d5bada620b24
+SHA512 (conserver-8.2.4.tar.gz) = c59b9bcf582209f8450a8189c1af536951e15ff3aa97994ea99f9de5c6028237a9fa3ca8ba0f7d63ec33b96e45adf76be755181c4199621debfed9feaf1659ad
+Size (conserver-8.2.4.tar.gz) = 432854 bytes
 SHA1 (patch-aa) = e7dea78d62c4e879c0741b0c9992811410737178
-SHA1 (patch-ab) = ec5b849cad7662a3e14a834d63840a306e89bdf2
+SHA1 (patch-conserver.cf_conserver.cf.man.in) = d175b593a0352c0d9ede6f2d54c23faddc0262d9
 SHA1 (patch-conserver_access.c) = a7956022bbdbbf2dc97ee474e8815d48d6adfadd
 SHA1 (patch-conserver_consent.c) = aa868cdacfe8a8e294ba8dcf74e2460ddf34ef3a
 SHA1 (patch-conserver_readcfg.c) = c39e1d50829658cb77e4c943e631da4b3cdd31ee
diff --git a/comms/conserver8/patches/patch-ab b/comms/conserver8/patches/patch-ab
diff --git a/comms/conserver8/patches/patch-conserver.cf_conserver.cf.man.in b/comms/conserver8/patches/patch-conserver.cf_conserver.cf.man.in
@@ -0,0 +1,37 @@
+$NetBSD: patch-conserver.cf_conserver.cf.man.in,v 1.1 2019/05/23 15:14:51 he Exp $
+
+Document what escape sequence converts to "telnet break" when using telnet.
+
+--- conserver.cf/conserver.cf.man.in.orig	2019-03-27 05:30:44.000000000 +0000
++++ conserver.cf/conserver.cf.man.in
+@@ -303,7 +303,30 @@ is ``and''ed with 0x1f)
+ .PD
+ .RE
+ .RE
+++.sp
+++For consoles accessed using the telnet protocol, the \f3\ez\fP
+++sequence will be translated to the telnet protocol's ``send break''
+++protocol sequence.
+++.sp
+++Conserver provides the following predefined default break strings:
+++.RS
+++.sp
+++.PD 0
+++.TP
+++\f30\fP
+++\ez
+++.TP
+++\f31\fP
+++\er~^b
+++.TP
+++\f32\fP
+++#.
+++.TP
+++\f33\fP
+++\er\ed~\ed^b    (with 600ms delay)
+ .RE
++.RE
++.sp
+ .TP
+ \f3config\fP \f2hostname\fP|\f2ipaddr\fP
+ .br