diff -Nru ser2net-4.3.11/configure.ac ser2net-4.3.12/configure.ac --- ser2net-4.3.11/configure.ac 2022-12-21 15:29:36.000000000 +0000 +++ ser2net-4.3.12/configure.ac 2023-04-14 19:48:11.000000000 +0000 @@ -1,4 +1,4 @@ -AC_INIT([ser2net], [4.3.11], [minyard@acm.org]) +AC_INIT([ser2net], [4.3.12], [minyard@acm.org]) AM_INIT_AUTOMAKE([-Wall]) AC_PROG_CC AM_PROG_AR diff -Nru ser2net-4.3.11/controller.c ser2net-4.3.12/controller.c --- ser2net-4.3.11/controller.c 2022-12-21 15:29:36.000000000 +0000 +++ ser2net-4.3.12/controller.c 2023-04-14 19:48:11.000000000 +0000 @@ -1000,6 +1000,14 @@ case GENSIO_EVENT_WRITE_READY: controller_write_ready(net); return 0; + +#ifdef GENSIO_EVENT_PARMLOG + case GENSIO_EVENT_PARMLOG: { + struct gensio_parmlog_data *d = (struct gensio_parmlog_data *) buf; + vsyslog(LOG_ERR, d->log, d->args); + return 0; + } +#endif } return ENOTSUP; @@ -1074,6 +1082,14 @@ case GENSIO_ACC_EVENT_NEW_CONNECTION: return controller_acc_new_child(data); +#ifdef GENSIO_ACC_EVENT_PARMLOG + case GENSIO_ACC_EVENT_PARMLOG: { + struct gensio_parmlog_data *d = (struct gensio_parmlog_data *) data; + vsyslog(LOG_ERR, d->log, d->args); + return 0; + } +#endif + default: return handle_acc_auth_event( controller_authdir, controller_pamauth, diff -Nru ser2net-4.3.11/dataxfer.c ser2net-4.3.12/dataxfer.c --- ser2net-4.3.11/dataxfer.c 2022-12-21 15:29:36.000000000 +0000 +++ ser2net-4.3.12/dataxfer.c 2023-04-14 19:48:11.000000000 +0000 @@ -434,6 +434,14 @@ so->unlock(port->lock); return 0; +#ifdef GENSIO_EVENT_PARMLOG + case GENSIO_EVENT_PARMLOG: { + struct gensio_parmlog_data *d = (struct gensio_parmlog_data *) buf; + vsyslog(LOG_ERR, d->log, d->args); + return 0; + } +#endif + default: return GE_NOTSUP; } @@ -957,10 +965,12 @@ s2n_sync(net_info_t *netcon, struct sergensio *sio) { struct sergensio *rsio = gensio_to_sergensio(netcon->port->io); + port_info_t *port = netcon->port; if (!rsio) return; - sergensio_send_break(rsio); + if (port->telnet_brk_on_sync) + sergensio_send_break(rsio); } static void @@ -1060,6 +1070,14 @@ s2n_rts(netcon, gensio_to_sergensio(net), *((int *) buf)); return 0; +#ifdef GENSIO_EVENT_PARMLOG + case GENSIO_EVENT_PARMLOG: { + struct gensio_parmlog_data *d = (struct gensio_parmlog_data *) buf; + vsyslog(LOG_ERR, d->log, d->args); + return 0; + } +#endif + default: return GE_NOTSUP; } diff -Nru ser2net-4.3.11/debian/changelog ser2net-4.3.12/debian/changelog --- ser2net-4.3.11/debian/changelog 2023-01-27 07:04:10.000000000 +0000 +++ ser2net-4.3.12/debian/changelog 2023-07-06 16:42:07.000000000 +0000 @@ -1,3 +1,27 @@ +ser2net (4.3.12-1) unstable; urgency=medium + + [ Marc Haber ] + * New upstream version 4.3.12 + * update changelog (forgotten in the past, duh) + * update debian/copyright + * add Rules-Requires-Root + * Standards-Version: 4.6.2 (no changes necessary) + * systemd unit: + * set Restart=no to not hide error messages + * listen on localhost only by default + * start ser2net after network-online.target. + Thanks to Mario Volterra (Closes: #1000622) + * Suggest telnet | telnet-client. + Thanks to Guillem Jover (Closes: #1016854) + * remove boilerplate from debian/watch + * remove Dependency on lsb-base + + [ Debian Janitor ] + * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository-Browse. + * Avoid explicitly specifying -Wl,--as-needed linker flag. + + -- Marc Haber Thu, 06 Jul 2023 18:42:07 +0200 + ser2net (4.3.11-1) unstable; urgency=medium * New upstream version 4.3.11 diff -Nru ser2net-4.3.11/debian/patches/ser2net8manpage ser2net-4.3.12/debian/patches/ser2net8manpage --- ser2net-4.3.11/debian/patches/ser2net8manpage 2023-01-27 07:04:10.000000000 +0000 +++ ser2net-4.3.12/debian/patches/ser2net8manpage 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -Subject: fix spelling error in ser2net.8 manpage -Autor: Marc Haber -Forwarded: https://github.com/cminyard/ser2net/pull/87 ---- a/ser2net.8 -+++ b/ser2net.8 -@@ -234,7 +234,7 @@ form: - parms: [ parm1 [, parm2 [...]]] - ... - --The id is optional and will just be returned in the reponse. The -+The id is optional and will just be returned in the response. The - parms are optional, too, unless the command requires them. Extra - parms are ignored, along with unknown keys in the main mapping. - diff -Nru ser2net-4.3.11/debian/patches/series ser2net-4.3.12/debian/patches/series --- ser2net-4.3.11/debian/patches/series 2023-01-27 07:04:10.000000000 +0000 +++ ser2net-4.3.12/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -ser2net8manpage diff -Nru ser2net-4.3.11/port.c ser2net-4.3.12/port.c --- ser2net-4.3.11/port.c 2022-12-21 15:29:36.000000000 +0000 +++ ser2net-4.3.12/port.c 2023-04-14 19:48:11.000000000 +0000 @@ -281,6 +281,14 @@ case GENSIO_ACC_EVENT_NEW_CONNECTION: return port_new_con(port, data); +#ifdef GENSIO_ACC_EVENT_PARMLOG + case GENSIO_ACC_EVENT_PARMLOG: { + struct gensio_parmlog_data *d = (struct gensio_parmlog_data *) data; + vsyslog(LOG_ERR, d->log, d->args); + return 0; + } +#endif + default: return handle_acc_auth_event(port->authdir, port->pamauth, port->allowed_users, event, data); diff -Nru ser2net-4.3.11/rotator.c ser2net-4.3.12/rotator.c --- ser2net-4.3.11/rotator.c 2022-12-21 15:29:36.000000000 +0000 +++ ser2net-4.3.12/rotator.c 2023-04-14 19:48:11.000000000 +0000 @@ -150,6 +150,14 @@ case GENSIO_ACC_EVENT_NEW_CONNECTION: return rot_new_con(rot, data); +#ifdef GENSIO_ACC_EVENT_PARMLOG + case GENSIO_ACC_EVENT_PARMLOG: { + struct gensio_parmlog_data *d = (struct gensio_parmlog_data *) data; + vsyslog(LOG_ERR, d->log, d->args); + return 0; + } +#endif + default: return handle_acc_auth_event(rot->authdir, rot->pamauth, rot->allowed_users, event, data); diff -Nru ser2net-4.3.11/ser2net.8 ser2net-4.3.12/ser2net.8 --- ser2net-4.3.11/ser2net.8 2022-12-21 15:29:36.000000000 +0000 +++ ser2net-4.3.12/ser2net.8 2023-04-14 19:48:11.000000000 +0000 @@ -234,7 +234,7 @@ parms: [ parm1 [, parm2 [...]]] ... -The id is optional and will just be returned in the reponse. The +The id is optional and will just be returned in the response. The parms are optional, too, unless the command requires them. Extra parms are ignored, along with unknown keys in the main mapping. diff -Nru ser2net-4.3.11/ser2net.yaml.5 ser2net-4.3.12/ser2net.yaml.5 --- ser2net-4.3.11/ser2net.yaml.5 2022-12-21 15:29:36.000000000 +0000 +++ ser2net-4.3.12/ser2net.yaml.5 2023-04-14 19:48:11.000000000 +0000 @@ -978,8 +978,10 @@ input from all network connections. .I kickolduser -will kick off all connections if a connection comes in on a port that already -has a maximum number of connections. +will kick off an existing connection if a connection comes in on a +port that already has a maximum number of connections. The connection +kicked off is arbitrarily chosen and the algorithm is subject to +change. .I tracing will trace data from all network connections.