Bug 254209 - comms/conserver-con add B1500000 support
Summary: comms/conserver-con add B1500000 support
Status: Closed Overcome By Events
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Bjoern A. Zeeb
URL: https://reviews.freebsd.org/D29209
Keywords:
Depends on:
Blocks:
 
Reported: 2021-03-10 22:38 UTC by Bjoern A. Zeeb
Modified: 2021-07-15 17:05 UTC (History)
1 user (show)

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Bjoern A. Zeeb freebsd_committer 2021-03-10 22:38:48 UTC
Prepare conserver-con for B1500000 support.

Seems a 3-line change is all that's needed extending the already patched file.

Assigne to myself until https://reviews.freebsd.org/D29209 is resolved and then upload a proper diff.

diff --git a/comms/conserver-com/files/patch-conserver__consent.c b/comms/conserver-com/files/patch-conserver__consent.c
index 493f486f3391..c1a9b992dc77 100644
--- a/comms/conserver-com/files/patch-conserver__consent.c
+++ b/comms/conserver-com/files/patch-conserver__consent.c
@@ -1,13 +1,23 @@
---- conserver/consent.c.dist   2015-08-12 13:38:39.837321000 -0700
-+++ conserver/consent.c        2015-08-12 13:38:01.860668000 -0700
-@@ -687,6 +687,10 @@
+--- conserver/consent.c.orig   2019-03-27 05:30:44 UTC
++++ conserver/consent.c
+@@ -86,6 +86,9 @@ BAUD baud[] = {
+     {"3500000", 32},
+     {"4000000", 33},
+ #else /* FOR_CYCLADES_TS */
++#if defined(B1500000)
++    {"1500000", B1500000},
++# endif
+ # if defined(B115200)
+     {"115200", B115200},
+ # endif
+@@ -699,6 +702,10 @@ ConsState(CONSENT *pCE)
+           return "SSL_accept";
        case INSSLSHUTDOWN:
            return "SSL_shutdown";
- #endif
++#endif
 +#if HAVE_GSSAPI
 +      case INGSSACCEPT:
 +          return "GSSAPI_accept";
-+#endif
+ #endif
        case ISFLUSHING:
            return "flushing";
-     }
Comment 1 Bjoern A. Zeeb freebsd_committer 2021-07-15 17:05:22 UTC
The missing bits will be contributed upstream directly.