CVS commit: pkgsrc/comms/conserver

["Hauke Fath" <hauke%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   hauke
Date:           Sun Jul 30 11:49:48 UTC 2023

Modified Files:
        pkgsrc/comms/conserver: Makefile distinfo
        pkgsrc/comms/conserver/patches: patch-ac

Log Message:
Add faster serial connection rates from <termios.h>, if supported, to
keep up with newer hardware.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/comms/conserver/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/comms/conserver/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/comms/conserver/patches/patch-ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/comms/conserver/Makefile
diff -u pkgsrc/comms/conserver/Makefile:1.35 pkgsrc/comms/conserver/Makefile:1.36
--- pkgsrc/comms/conserver/Makefile:1.35        Sat Jun 10 01:57:47 2023
+++ pkgsrc/comms/conserver/Makefile     Sun Jul 30 11:49:48 2023
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2023/06/10 01:57:47 riastradh Exp $
+# $NetBSD: Makefile,v 1.36 2023/07/30 11:49:48 hauke Exp $
 #
 
 DISTNAME=      conserver-7.2.7
-PKGREVISION=   5
+PKGREVISION=   6
 CATEGORIES=    comms
 MASTER_SITES=  http://www.conserver.com/
 

Index: pkgsrc/comms/conserver/distinfo
diff -u pkgsrc/comms/conserver/distinfo:1.11 pkgsrc/comms/conserver/distinfo:1.12
--- pkgsrc/comms/conserver/distinfo:1.11        Tue Oct 26 10:05:58 2021
+++ pkgsrc/comms/conserver/distinfo     Sun Jul 30 11:49:48 2023
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.11 2021/10/26 10:05:58 nia Exp $
+$NetBSD: distinfo,v 1.12 2023/07/30 11:49:48 hauke Exp $
 
 BLAKE2s (conserver-7.2.7.tar.gz) = fb82185c1ec9b7e5f8534171871c920d24f7c81992280f92c9d378b36b454d83
 SHA512 (conserver-7.2.7.tar.gz) = c9257e9581e8bcced71f4ecd446bb7a2f799ca851a1d5a957e58345d7afd29a687a9c52c665658f1f357af7dd8262487085071af9bbff110611f0c9f4c41fa91
 Size (conserver-7.2.7.tar.gz) = 200861 bytes
 SHA1 (patch-aa) = 01ab5e3430137e72b786164026785f91295232d4
 SHA1 (patch-ab) = 79125fed0be843528dd208664b90323cb23b9e8d
-SHA1 (patch-ac) = 45fb5253032347961f123ad9a75b72f7c2f15a2b
+SHA1 (patch-ac) = 8b0ffc092ae577f8b902067477f0a3946481c6fa
 SHA1 (patch-conserver_util.c) = 9bca7aeaa0239017aa5386218abcc0dd8dfd1b31

Index: pkgsrc/comms/conserver/patches/patch-ac
diff -u pkgsrc/comms/conserver/patches/patch-ac:1.2 pkgsrc/comms/conserver/patches/patch-ac:1.3
--- pkgsrc/comms/conserver/patches/patch-ac:1.2 Mon Aug  2 07:05:09 2010
+++ pkgsrc/comms/conserver/patches/patch-ac     Sun Jul 30 11:49:48 2023
@@ -1,12 +1,64 @@
-$NetBSD: patch-ac,v 1.2 2010/08/02 07:05:09 wiz Exp $
+$NetBSD: patch-ac,v 1.3 2023/07/30 11:49:48 hauke Exp $
 
 Add patch from
 https://www.conserver.com/pipermail/users/2004-June/msg00001.html
 to make network consoles work on LP64 platforms.
 
---- conserver/consent.c.orig   2003-04-06 08:32:41.000000000 -0400
+Add faster connection rates, keeping up with newer hardware
+
+--- conserver/consent.c.orig   2003-04-06 12:32:41.000000000 +0000
 +++ conserver/consent.c
-@@ -788,7 +788,7 @@ ConsInit(pCE, pfdSet, useHostCache)
+@@ -52,6 +52,9 @@
+ #include <ctype.h>
+ #include <signal.h>
+ #include <pwd.h>
++#ifdef HAVE_TERMIOS_H
++#include <termios.h>
++#endif
+ 
+ #include <compat.h>
+ #include <util.h>
+@@ -67,6 +70,39 @@ struct hostcache *hostcachelist = NULL;
+ BAUD baud[] = {
+     {"Netwk", 0},
+     {"Local", 0},
++#if defined(B4000000)
++    {"4000000", B4000000},
++#endif
++#if defined(B3500000)
++    {"3500000", B3500000},
++#endif
++#if defined(B3000000)
++    {"3000000", B3000000},
++#endif
++#if defined(B2500000)
++    {"2500000", B2500000},
++#endif
++#if defined(B2000000)
++    {"2000000", B2000000},
++#endif
++#if defined(B1500000)
++    {"1500000", B1500000},
++#endif
++#if defined(B1000000)
++    {"1000000", B1000000},
++#endif
++#if defined(B921600)
++    {"921600", B921600},
++#endif
++#if defined(B500000)
++    {"500000", B500000},
++#endif
++#if defined(B460800)
++    {"460800", B460800},
++#endif
++#if defined(B230400)
++    {"230400", B230400},
++#endif
+ #if defined(B115200)
+     {"115200", B115200},
+ #endif
+@@ -788,7 +824,7 @@ ConsInit(pCE, pfdSet, useHostCache)
      } else if (pCE->isNetworkConsole) {
        struct sockaddr_in port;
        struct hostent *hp;