Hello community, here is the log from the commit of package conman for openSUSE:Factory checked in at 2018-08-24 17:11:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/conman (Old) and /work/SRC/openSUSE:Factory/.conman.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "conman" Fri Aug 24 17:11:01 2018 rev:10 rq:631086 version:0.2.9 Changes: -------- --- /work/SRC/openSUSE:Factory/conman/conman.changes 2018-07-21 10:25:00.862960475 +0200 +++ /work/SRC/openSUSE:Factory/.conman.new/conman.changes 2018-08-24 17:11:01.918565494 +0200 @@ -1,0 +2,16 @@ +Thu Aug 23 10:01:18 UTC 2018 - [email protected] + +- Update to version 0.2.9: + - Allowed IPMI defaults to be overridden via libipmiconsole.conf. (#27) + - Updated recognized strings for IPMI workaround-flags (FATE#326641). + +------------------------------------------------------------------- +Thu Aug 23 09:48:06 UTC 2018 - [email protected] + +- Replace + If-connect-fails-let-other-side-accept-connection-and-come-back.patch + by: + Reset-delay-for-unixsock-connect-from-inotify.patch: + Upstream chose to fix bsc#1101647 slightly differently. + +------------------------------------------------------------------- Old: ---- If-connect-fails-let-other-side-accept-connection-and-come-back.patch conman-0.2.8.tar.gz New: ---- Reset-delay-for-unixsock-connect-from-inotify.patch conman-0.2.9.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ conman.spec ++++++ --- /var/tmp/diff_new_pack.xIKFgB/_old 2018-08-24 17:11:02.450566127 +0200 +++ /var/tmp/diff_new_pack.xIKFgB/_new 2018-08-24 17:11:02.454566132 +0200 @@ -44,7 +44,7 @@ %endif Name: conman -Version: 0.2.8 +Version: 0.2.9 Release: 0 Summary: The Console Manager @@ -69,7 +69,7 @@ %endif Patch1: conman-suse-fix-expect-scripts.patch -Patch2: If-connect-fails-let-other-side-accept-connection-and-come-back.patch +Patch2: Reset-delay-for-unixsock-connect-from-inotify.patch # 8/15/14 [email protected] - include prereq %if 0%{?sles_version} || 0%{?suse_version} ++++++ Reset-delay-for-unixsock-connect-from-inotify.patch ++++++ From: Egbert Eich <[email protected]> Date: Wed Jul 18 11:26:07 2018 +0200 Subject: Reset delay for unixsock connect from inotify Patch-mainline: Not yet Git-repo: https://github.com/dun/conman Git-commit: 8f5bd09162307a23efb8532a95c4e4a562ce30fe References: bsc#1101647 Consoles over UNIX domain sockets use inotify to detect when their socket appears in the filesystem. This inotify event is triggered when the remote has successfully called bind(). However, the remote may not have called listen() before the inotify event is serviced by conmand. In such a case, connect() will fail with ECONNREFUSED, after which the connection delay will be increased before the next connection attempt. This can result in connection establishment taking up to UNIXSOCK_MAX_TIMEOUT seconds once the socket appears. To handle this case, reset the connection delay to UNIXSOCK_MIN_TIMEOUT when a connection attempt triggered by inotify fails. [[email protected]: Restructured to use isViaInotify flag] Signed-off-by: Egbert Eich <[email protected]> Signed-off-by: Chris Dunlap <[email protected]> Closes #28 Closes #29 Signed-off-by: Egbert Eich <[email protected]> --- server-unixsock.c | 36 ++++++++++++++++++++++++++++++++++-- server.h | 1 + 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/server-unixsock.c b/server-unixsock.c index e683ec7..b44adb4 100644 --- a/server-unixsock.c +++ b/server-unixsock.c @@ -45,6 +45,7 @@ #include "util-str.h" +static int open_unixsock_obj_via_inotify(obj_t *unixsock); static size_t max_unixsock_dev_strlen(void); static int connect_unixsock_obj(obj_t *unixsock); static int disconnect_unixsock_obj(obj_t *unixsock); @@ -140,6 +141,7 @@ obj_t * create_unixsock_obj(server_conf_t *conf, char *name, char *dev, unixsock->aux.unixsock.logfile = NULL; unixsock->aux.unixsock.timer = -1; unixsock->aux.unixsock.state = CONMAN_UNIXSOCK_DOWN; + unixsock->aux.unixsock.isViaInotify = 0; unixsock->aux.unixsock.delay = UNIXSOCK_MIN_TIMEOUT; /* * Add obj to the master conf->objs list. @@ -147,7 +149,7 @@ obj_t * create_unixsock_obj(server_conf_t *conf, char *name, char *dev, list_append(conf->objs, unixsock); rv = inevent_add(unixsock->aux.unixsock.dev, - (inevent_cb_f) open_unixsock_obj, unixsock); + (inevent_cb_f) open_unixsock_obj_via_inotify, unixsock); if (rv < 0) { log_msg(LOG_INFO, "Console [%s] unable to register device \"%s\" for inotify events", @@ -177,6 +179,23 @@ int open_unixsock_obj(obj_t *unixsock) } +static int open_unixsock_obj_via_inotify(obj_t *unixsock) +{ +/* Opens the specified 'unixsock' obj via an inotify callback. + * Returns 0 if the console is successfully opened; o/w, returns -1. + */ + unixsock_obj_t *auxp; + + assert(unixsock != NULL); + assert(is_unixsock_obj(unixsock)); + + auxp = &(unixsock->aux.unixsock); + auxp->isViaInotify = 1; + + return(open_unixsock_obj(unixsock)); +} + + static size_t max_unixsock_dev_strlen(void) { /* Returns the maximum string length allowed for a unix domain device. @@ -199,6 +218,7 @@ static int connect_unixsock_obj(obj_t *unixsock) * Returns 0 if the connection is successfully completed; o/w, returns -1. */ unixsock_obj_t *auxp; + int isViaInotify; struct stat st; struct sockaddr_un saddr; size_t n; @@ -210,6 +230,9 @@ static int connect_unixsock_obj(obj_t *unixsock) auxp = &(unixsock->aux.unixsock); + isViaInotify = auxp->isViaInotify; + auxp->isViaInotify = 0; + if (auxp->timer >= 0) { (void) tpoll_timeout_cancel(tp_global, auxp->timer); auxp->timer = -1; @@ -250,11 +273,20 @@ static int connect_unixsock_obj(obj_t *unixsock) set_fd_nonblocking(unixsock->fd); set_fd_closed_on_exec(unixsock->fd); - /* FIXME: Check to see if connect() on a nonblocking unix domain socket + /* If a connect() triggered via an inotify event fails, reset the + * reconnect delay to its minimum to quickly re-attempt the connection. + * This handles the case where the remote has successfully called bind() + * (triggering the inotify event) but has not yet called listen(). + * FIXME: Check to see if connect() on a nonblocking unix domain socket * can return EINPROGRESS. I don't think it can. */ if (connect(unixsock->fd, (struct sockaddr *) &saddr, sizeof(saddr)) < 0) { + if (isViaInotify) { + auxp->delay = UNIXSOCK_MIN_TIMEOUT; + DPRINTF((15, "Reset [%s] reconnect delay due to inotify event\n", + unixsock->name)); + } log_msg(LOG_INFO, "Console [%s] cannot connect to device \"%s\": %s", unixsock->name, auxp->dev, strerror(errno)); return(disconnect_unixsock_obj(unixsock)); diff --git a/server.h b/server.h index 8ccbcf9..6cc7c1b 100644 --- a/server.h +++ b/server.h @@ -180,6 +180,7 @@ typedef struct unixsock_obj { /* UNIXSOCK AUX OBJ DATA: */ int timer; /* timer id for reconnects */ int delay; /* secs 'til next reconnect attempt */ unsigned state:1; /* unixsock_state_t conn state */ + unsigned isViaInotify:1; /* true if triggered via inotify */ } unixsock_obj_t; /* Refer to struct ipmiconsole_ipmi_config in <ipmiconsole.h>. ++++++ conman-0.2.8.tar.gz -> conman-0.2.9.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/META new/conman-conman-0.2.9/META --- old/conman-conman-0.2.8/META 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/META 2017-12-14 02:01:32.000000000 +0100 @@ -1,5 +1,5 @@ Name: conman - Version: 0.2.8 + Version: 0.2.9 Release: 1 - Date: 2016-11-22 + Date: 2017-12-14 Author: Chris Dunlap <[email protected]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/NEWS new/conman-conman-0.2.9/NEWS --- old/conman-conman-0.2.8/NEWS 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/NEWS 2017-12-14 02:01:32.000000000 +0100 @@ -1,3 +1,7 @@ +conman-0.2.9 (2017-12-14): +- Allowed IPMI defaults to be overridden via libipmiconsole.conf. (#27) +- Updated recognized strings for IPMI workaround-flags. + conman-0.2.8 (2016-11-22): - Changed project homepage to <https://dun.github.io/conman/>. (#21) - Changed conman.conf default loopback setting to ON. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/PLATFORMS new/conman-conman-0.2.9/PLATFORMS --- old/conman-conman-0.2.8/PLATFORMS 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/PLATFORMS 2017-12-14 02:01:32.000000000 +0100 @@ -1,18 +1,17 @@ -ConMan 0.2.8 has been built on the following systems: +ConMan 0.2.9 has been built on the following systems: -- CentOS 7.2.1511 -- Debian 8.6 -- Fedora 25 -- FreeBSD 11.0 -- NetBSD 6.0 -- OpenBSD 6.0 -- RHEL 7.3 -- Ubuntu 16.04.1 LTS -- Ubuntu 16.10 +- CentOS 6.9 +- CentOS 7.4.1708 +- Debian 9.3 +- Fedora 27 +- FreeBSD 11.1 +- NetBSD 7.1 +- OpenBSD 6.2 +- Ubuntu 16.04.3 LTS +- Ubuntu 17.10 RPMs have been built and tested on the following systems: -- CentOS 7.2.1511 -- Fedora 25 -- RHEL 7.3 +- CentOS 7.4.1708 +- Fedora 27 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/README new/conman-conman-0.2.9/README --- old/conman-conman-0.2.8/README 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/README 2017-12-14 02:01:32.000000000 +0100 @@ -1,18 +1,21 @@ ConMan is a serial console management program designed to support a large number of console devices and simultaneous users. -It supports: - - local serial devices - - remote terminal servers (via the telnet protocol) - - IPMI Serial-Over-LAN (via FreeIPMI) - - Unix domain sockets - - external processes (eg, using Expect for telnet/ssh/ipmi-sol connections) +Supported console types: +- Local serial devices +- Remote terminal servers (via the telnet protocol) +- IPMI Serial-Over-LAN (via FreeIPMI's libipmiconsole) +- External processes (e.g., Expect) +- Unix domain sockets -Its features include: - - logging (and optionally timestamping) console device output to file - - connecting to consoles in monitor (R/O) or interactive (R/W) mode - - allowing clients to share or steal console write privileges - - broadcasting client output to multiple consoles +Features: +- Mapping symbolic names to console devices +- Logging (and optionally timestamping) console output to file +- Connecting to a console in monitor (R/O) or interactive (R/W) mode +- Connecting to multiple consoles for broadcasting (W/O) client output +- Sharing a console session amongst multiple simultaneous clients +- Allowing clients to share or steal console "write" privileges +- Executing Expect scripts across multiple consoles in parallel License: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/README.md new/conman-conman-0.2.9/README.md --- old/conman-conman-0.2.8/README.md 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/README.md 2017-12-14 02:01:32.000000000 +0100 @@ -1,3 +1,5 @@ +[](https://github.com/dun/conman/releases/latest) +[](https://repology.org/metapackage/conman) [](https://travis-ci.org/dun/conman) [](https://scan.coverity.com/projects/dun-conman) @@ -6,20 +8,24 @@ ConMan is a serial console management program designed to support a large number of console devices and simultaneous users. -It supports: -- local serial devices -- remote terminal servers (via the telnet protocol) -- IPMI Serial-Over-LAN (via [FreeIPMI](https://www.gnu.org/software/freeipmi/)) +Supported console types: +- Local serial devices +- Remote terminal servers (via the telnet protocol) +- IPMI Serial-Over-LAN (via [FreeIPMI's](https://www.gnu.org/software/freeipmi/) libipmiconsole) +- External processes (e.g., Expect) - Unix domain sockets -- external processes (e.g., using Expect for telnet/ssh/ipmi-sol connections) -Its features include: -- logging (and optionally timestamping) console device output to file -- connecting to consoles in monitor (R/O) or interactive (R/W) mode -- allowing clients to share or steal console write privileges -- broadcasting client output to multiple consoles +Features: +- Mapping symbolic names to console devices +- Logging (and optionally timestamping) console output to file +- Connecting to a console in monitor (R/O) or interactive (R/W) mode +- Connecting to multiple consoles for broadcasting (W/O) client output +- Sharing a console session amongst multiple simultaneous clients +- Allowing clients to share or steal console "write" privileges +- Executing Expect scripts across multiple consoles in parallel Links: - [Man Pages](../../wiki/Man-Pages) - [License Information](../../wiki/License-Info) +- [Verifying Releases](../../wiki/Verifying-Releases) - [Latest Release](../../releases/latest) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/THANKS new/conman-conman-0.2.9/THANKS --- old/conman-conman-0.2.8/THANKS 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/THANKS 2017-12-14 02:01:32.000000000 +0100 @@ -5,6 +5,7 @@ Christopher D. Maestas <[email protected]> Dave Love <[email protected]> Dmitry Monakhov <[email protected]> +Jesse Hathaway <[email protected]> Levi Pearson <[email protected]> Marc Girard <[email protected]> Mark Pettit <[email protected]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/bool.h new/conman-conman-0.2.9/bool.h --- old/conman-conman-0.2.8/bool.h 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/bool.h 2017-12-14 02:01:32.000000000 +0100 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/client-conf.c new/conman-conman-0.2.9/client-conf.c --- old/conman-conman-0.2.8/client-conf.c 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/client-conf.c 2017-12-14 02:01:32.000000000 +0100 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/client-sock.c new/conman-conman-0.2.9/client-sock.c --- old/conman-conman-0.2.8/client-sock.c 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/client-sock.c 2017-12-14 02:01:32.000000000 +0100 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/client-tty.c new/conman-conman-0.2.9/client-tty.c --- old/conman-conman-0.2.8/client-tty.c 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/client-tty.c 2017-12-14 02:01:32.000000000 +0100 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/client.c new/conman-conman-0.2.9/client.c --- old/conman-conman-0.2.8/client.c 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/client.c 2017-12-14 02:01:32.000000000 +0100 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/client.h new/conman-conman-0.2.9/client.h --- old/conman-conman-0.2.8/client.h 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/client.h 2017-12-14 02:01:32.000000000 +0100 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/common.c new/conman-conman-0.2.9/common.c --- old/conman-conman-0.2.8/common.c 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/common.c 2017-12-14 02:01:32.000000000 +0100 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * @@ -42,7 +42,7 @@ "https://dun.github.io/conman/\n"; \ "\n" \ "Written by Chris Dunlap <[email protected]>.\n" \ - "Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC.\n" \ + "Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC.\n" \ "Copyright (C) 2001-2007 The Regents of the University of California.\n" \ "\n" \ "ConMan is free software: you can redistribute it and/or modify it\n" \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/common.h new/conman-conman-0.2.9/common.h --- old/conman-conman-0.2.8/common.h 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/common.h 2017-12-14 02:01:32.000000000 +0100 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/configure new/conman-conman-0.2.9/configure --- old/conman-conman-0.2.8/configure 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/configure 2017-12-14 02:01:32.000000000 +0100 @@ -674,6 +674,7 @@ docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -750,6 +751,7 @@ sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE}' @@ -1002,6 +1004,15 @@ | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1139,7 +1150,7 @@ for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1292,6 +1303,7 @@ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/configure.ac new/conman-conman-0.2.9/configure.ac --- old/conman-conman-0.2.8/configure.ac 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/configure.ac 2017-12-14 02:01:32.000000000 +0100 @@ -3,7 +3,7 @@ # Process this file with autoconf to produce a configure script. ############################################################################### # Written by Chris Dunlap <[email protected]>. -# Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. # Copyright (C) 2001-2007 The Regents of the University of California. # UCRL-CODE-2002-009. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/conman.spec new/conman-conman-0.2.9/conman.spec --- old/conman-conman-0.2.8/conman.spec 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/conman.spec 2017-12-14 02:01:32.000000000 +0100 @@ -1,5 +1,5 @@ Name: conman -Version: 0.2.8 +Version: 0.2.9 Release: 1%{?dist} Summary: ConMan: The Console Manager @@ -18,18 +18,23 @@ %description ConMan is a serial console management program designed to support a large -number of console devices and simultaneous users. It supports: - - local serial devices - - remote terminal servers (via the telnet protocol) - - IPMI Serial-Over-LAN (via FreeIPMI) - - Unix domain sockets - - external processes (eg, using Expect for telnet/ssh/ipmi-sol connections) - -Its features include: - - logging (and optionally timestamping) console device output to file - - connecting to consoles in monitor (R/O) or interactive (R/W) mode - - allowing clients to share or steal console write privileges - - broadcasting client output to multiple consoles +number of console devices and simultaneous users. + +Supported console types: +- Local serial devices +- Remote terminal servers (via the telnet protocol) +- IPMI Serial-Over-LAN (via FreeIPMI's libipmiconsole) +- External processes (e.g., Expect) +- Unix domain sockets + +Features: +- Mapping symbolic names to console devices +- Logging (and optionally timestamping) console output to file +- Connecting to a console in monitor (R/O) or interactive (R/W) mode +- Connecting to multiple consoles for broadcasting (W/O) client output +- Sharing a console session amongst multiple simultaneous clients +- Allowing clients to share or steal console "write" privileges +- Executing Expect scripts across multiple consoles in parallel %prep %setup -q diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/conmen new/conman-conman-0.2.9/conmen --- old/conman-conman-0.2.8/conmen 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/conmen 2017-12-14 02:01:32.000000000 +0100 @@ -4,7 +4,7 @@ # ConMen: a wrapper to aid in ConMan broadcast sessions. ############################################################################### # Written by Chris Dunlap <[email protected]>. -# Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. # Copyright (C) 2001-2007 The Regents of the University of California. # UCRL-CODE-2002-009. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/etc/conman.conf new/conman-conman-0.2.9/etc/conman.conf --- old/conman-conman-0.2.8/etc/conman.conf 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/etc/conman.conf 2017-12-14 02:01:32.000000000 +0100 @@ -200,10 +200,11 @@ # - C:<cipher_suite> - an integer for the IPMI cipher suite ID. # - L:<privilege_level> - the string "user", "op", or "admin". # - W:<workaround_flag> - a string or integer for an IPMI workaround. -# The following strings are recognized: "authcap", "intel20", -# "supermicro20", "sun20", "opensesspriv", "integritycheckvalue", -# "solpayloadsize", "solport", and "solstatus". This substring may be -# repeated in order to specify multiple workarounds. +# The following strings are recognized: "authcap", "integritycheckvalue", +# "intel20", "nochecksumcheck", "opensesspriv", "serialalertsdeferred", +# "solchannelsupport", "solpacketseq", "solpayloadsize", "solport", +# "solstatus", "sun20", "supermicro20", "default", and "none". +# This substring may be repeated in order to specify multiple workarounds. # Both the <password> and <K_g> values can be specified in either ASCII or # hexadecimal; in the latter case, the string should begin with "0x" and # contain at most 40 hexadecimal digits. A <K_g> key entered in hexadecimal diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/etc/conman.init.in new/conman-conman-0.2.9/etc/conman.init.in --- old/conman-conman-0.2.8/etc/conman.init.in 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/etc/conman.init.in 2017-12-14 02:01:32.000000000 +0100 @@ -1,7 +1,7 @@ #!/bin/sh ############################################################################### # Written by Chris Dunlap <[email protected]>. -# Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. # Copyright (C) 2001-2007 The Regents of the University of California. # UCRL-CODE-2002-009. ############################################################################### diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/inevent.c new/conman-conman-0.2.9/inevent.c --- old/conman-conman-0.2.8/inevent.c 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/inevent.c 2017-12-14 02:01:32.000000000 +0100 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/inevent.h new/conman-conman-0.2.9/inevent.h --- old/conman-conman-0.2.8/inevent.h 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/inevent.h 2017-12-14 02:01:32.000000000 +0100 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/lex.c new/conman-conman-0.2.9/lex.c --- old/conman-conman-0.2.8/lex.c 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/lex.c 2017-12-14 02:01:32.000000000 +0100 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * @@ -122,7 +122,7 @@ l->prev = 0; l->line = 0; l->gotEOL = 1; - assert(l->magic = LEX_MAGIC); /* set magic via assert abuse */ + assert((l->magic = LEX_MAGIC)); /* set magic via assert abuse */ return(l); } @@ -132,7 +132,7 @@ assert(l != NULL); assert(l->magic == LEX_MAGIC); - assert(l->magic = 1); /* clear magic via assert abuse */ + assert((l->magic = 1)); /* clear magic via assert abuse */ free(l); return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/lex.h new/conman-conman-0.2.9/lex.h --- old/conman-conman-0.2.8/lex.h 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/lex.h 2017-12-14 02:01:32.000000000 +0100 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/lib/alpha.exp new/conman-conman-0.2.9/lib/alpha.exp --- old/conman-conman-0.2.8/lib/alpha.exp 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/lib/alpha.exp 2017-12-14 02:01:32.000000000 +0100 @@ -2,7 +2,7 @@ # Alpha Library Functions (ALF) ############################################################################### # Written by Chris Dunlap <[email protected]>. -# Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. # Copyright (C) 2001-2007 The Regents of the University of California. # UCRL-CODE-2002-009. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/lib/conman.exp new/conman-conman-0.2.9/lib/conman.exp --- old/conman-conman-0.2.8/lib/conman.exp 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/lib/conman.exp 2017-12-14 02:01:32.000000000 +0100 @@ -2,7 +2,7 @@ # ConMan Expect Language Library (CELL) ############################################################################### # Written by Chris Dunlap <[email protected]>. -# Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. # Copyright (C) 2001-2007 The Regents of the University of California. # UCRL-CODE-2002-009. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/lib/examples/boot_alpha.exp new/conman-conman-0.2.9/lib/examples/boot_alpha.exp --- old/conman-conman-0.2.8/lib/examples/boot_alpha.exp 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/lib/examples/boot_alpha.exp 2017-12-14 02:01:32.000000000 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/expect -- ############################################################################### # Written by Chris Dunlap <[email protected]>. -# Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. # Copyright (C) 2001-2007 The Regents of the University of California. # UCRL-CODE-2002-009. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/lib/examples/mac.exp new/conman-conman-0.2.9/lib/examples/mac.exp --- old/conman-conman-0.2.8/lib/examples/mac.exp 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/lib/examples/mac.exp 2017-12-14 02:01:32.000000000 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/expect -- ############################################################################### # Written by Chris Dunlap <[email protected]>. -# Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. # Copyright (C) 2001-2007 The Regents of the University of California. # UCRL-CODE-2002-009. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/lib/examples/rmc.exp new/conman-conman-0.2.9/lib/examples/rmc.exp --- old/conman-conman-0.2.8/lib/examples/rmc.exp 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/lib/examples/rmc.exp 2017-12-14 02:01:32.000000000 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/expect -- ############################################################################### # Written by Chris Dunlap <[email protected]>. -# Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. # Copyright (C) 2001-2007 The Regents of the University of California. # UCRL-CODE-2002-009. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/lib/examples/shell_cmd_1.exp new/conman-conman-0.2.9/lib/examples/shell_cmd_1.exp --- old/conman-conman-0.2.8/lib/examples/shell_cmd_1.exp 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/lib/examples/shell_cmd_1.exp 2017-12-14 02:01:32.000000000 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/expect -- ############################################################################### # Written by Chris Dunlap <[email protected]>. -# Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. # Copyright (C) 2001-2007 The Regents of the University of California. # UCRL-CODE-2002-009. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/lib/examples/shell_cmd_n.exp new/conman-conman-0.2.9/lib/examples/shell_cmd_n.exp --- old/conman-conman-0.2.8/lib/examples/shell_cmd_n.exp 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/lib/examples/shell_cmd_n.exp 2017-12-14 02:01:32.000000000 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/expect -- ############################################################################### # Written by Chris Dunlap <[email protected]>. -# Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. # Copyright (C) 2001-2007 The Regents of the University of California. # UCRL-CODE-2002-009. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/lib/examples/srm.exp new/conman-conman-0.2.9/lib/examples/srm.exp --- old/conman-conman-0.2.8/lib/examples/srm.exp 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/lib/examples/srm.exp 2017-12-14 02:01:32.000000000 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/expect -- ############################################################################### # Written by Chris Dunlap <[email protected]>. -# Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. # Copyright (C) 2001-2007 The Regents of the University of California. # UCRL-CODE-2002-009. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/lib/examples/wtf.exp new/conman-conman-0.2.9/lib/examples/wtf.exp --- old/conman-conman-0.2.8/lib/examples/wtf.exp 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/lib/examples/wtf.exp 2017-12-14 02:01:32.000000000 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/expect -- ############################################################################### # Written by Chris Dunlap <[email protected]>. -# Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. # Copyright (C) 2001-2007 The Regents of the University of California. # UCRL-CODE-2002-009. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/lib/exec/cyclades-ssh.exp new/conman-conman-0.2.9/lib/exec/cyclades-ssh.exp --- old/conman-conman-0.2.8/lib/exec/cyclades-ssh.exp 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/lib/exec/cyclades-ssh.exp 2017-12-14 02:01:32.000000000 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/expect -f ############################################################################### # Written by Chris Dunlap <[email protected]>. -# Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. # Copyright (C) 2001-2007 The Regents of the University of California. # UCRL-CODE-2002-009. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/lib/exec/cyclades-telnet.exp new/conman-conman-0.2.9/lib/exec/cyclades-telnet.exp --- old/conman-conman-0.2.8/lib/exec/cyclades-telnet.exp 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/lib/exec/cyclades-telnet.exp 2017-12-14 02:01:32.000000000 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/expect -f ############################################################################### # Written by Chris Dunlap <[email protected]>. -# Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. # Copyright (C) 2001-2007 The Regents of the University of California. # UCRL-CODE-2002-009. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/lib/exec/hp-ilo.exp new/conman-conman-0.2.9/lib/exec/hp-ilo.exp --- old/conman-conman-0.2.8/lib/exec/hp-ilo.exp 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/lib/exec/hp-ilo.exp 2017-12-14 02:01:32.000000000 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/expect -f ############################################################################### # Written by Chris Dunlap <[email protected]>. -# Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. # Copyright (C) 2001-2007 The Regents of the University of California. # UCRL-CODE-2002-009. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/lib/exec/hp-lo100.exp new/conman-conman-0.2.9/lib/exec/hp-lo100.exp --- old/conman-conman-0.2.8/lib/exec/hp-lo100.exp 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/lib/exec/hp-lo100.exp 2017-12-14 02:01:32.000000000 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/expect -f ############################################################################### # Written by Chris Dunlap <[email protected]>. -# Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. # Copyright (C) 2001-2007 The Regents of the University of California. # UCRL-CODE-2002-009. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/lib/exec/ibm-bc.exp new/conman-conman-0.2.9/lib/exec/ibm-bc.exp --- old/conman-conman-0.2.8/lib/exec/ibm-bc.exp 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/lib/exec/ibm-bc.exp 2017-12-14 02:01:32.000000000 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/expect -f ############################################################################### # Written by Chris Dunlap <[email protected]>. -# Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. # Copyright (C) 2001-2007 The Regents of the University of California. # UCRL-CODE-2002-009. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/lib/exec/ipmiconsole.exp new/conman-conman-0.2.9/lib/exec/ipmiconsole.exp --- old/conman-conman-0.2.8/lib/exec/ipmiconsole.exp 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/lib/exec/ipmiconsole.exp 2017-12-14 02:01:32.000000000 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/expect -f ############################################################################### # Written by Chris Dunlap <[email protected]>. -# Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. # Copyright (C) 2001-2007 The Regents of the University of California. # UCRL-CODE-2002-009. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/lib/exec/ipmitool.exp new/conman-conman-0.2.9/lib/exec/ipmitool.exp --- old/conman-conman-0.2.8/lib/exec/ipmitool.exp 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/lib/exec/ipmitool.exp 2017-12-14 02:01:32.000000000 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/expect -f ############################################################################### # Written by Chris Dunlap <[email protected]>. -# Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. # Copyright (C) 2001-2007 The Regents of the University of California. # UCRL-CODE-2002-009. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/lib/exec/ssh.exp new/conman-conman-0.2.9/lib/exec/ssh.exp --- old/conman-conman-0.2.8/lib/exec/ssh.exp 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/lib/exec/ssh.exp 2017-12-14 02:01:32.000000000 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/expect -f ############################################################################### # Written by Chris Dunlap <[email protected]>. -# Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. # Copyright (C) 2001-2007 The Regents of the University of California. # UCRL-CODE-2002-009. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/lib/exec/sun-elom.exp new/conman-conman-0.2.9/lib/exec/sun-elom.exp --- old/conman-conman-0.2.8/lib/exec/sun-elom.exp 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/lib/exec/sun-elom.exp 2017-12-14 02:01:32.000000000 +0100 @@ -5,7 +5,7 @@ # Works with ELOM 3.15, at least. # # Written by Chris Dunlap <[email protected]>. -# Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. # Copyright (C) 2001-2007 The Regents of the University of California. # UCRL-CODE-2002-009. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/lib/exec/sun-ilom.exp new/conman-conman-0.2.9/lib/exec/sun-ilom.exp --- old/conman-conman-0.2.8/lib/exec/sun-ilom.exp 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/lib/exec/sun-ilom.exp 2017-12-14 02:01:32.000000000 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/expect -f ############################################################################### # Written by Chris Dunlap <[email protected]>. -# Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. # Copyright (C) 2001-2007 The Regents of the University of California. # UCRL-CODE-2002-009. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/lib/exec/sun-v20z-v40z.exp new/conman-conman-0.2.9/lib/exec/sun-v20z-v40z.exp --- old/conman-conman-0.2.8/lib/exec/sun-v20z-v40z.exp 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/lib/exec/sun-v20z-v40z.exp 2017-12-14 02:01:32.000000000 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/expect -f ############################################################################### # Written by Chris Dunlap <[email protected]>. -# Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. # Copyright (C) 2001-2007 The Regents of the University of California. # UCRL-CODE-2002-009. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/list.c new/conman-conman-0.2.9/list.c --- old/conman-conman-0.2.8/list.c 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/list.c 2017-12-14 02:01:32.000000000 +0100 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * @@ -183,7 +183,7 @@ l->fDel = f; l->count = 0; list_mutex_init(&l->mutex); - assert(l->magic = LIST_MAGIC); /* set magic via assert abuse */ + assert((l->magic = LIST_MAGIC)); /* set magic via assert abuse */ return(l); } @@ -200,7 +200,7 @@ while (i) { assert(i->magic == LIST_MAGIC); iTmp = i->iNext; - assert(i->magic = 1); /* clear magic via assert abuse */ + assert((i->magic = 1)); /* clear magic via assert abuse */ list_iterator_free(i); i = iTmp; } @@ -212,7 +212,7 @@ list_node_free(p); p = pTmp; } - assert(l->magic = 1); /* clear magic via assert abuse */ + assert((l->magic = 1)); /* clear magic via assert abuse */ list_mutex_unlock(&l->mutex); list_mutex_destroy(&l->mutex); list_free(l); @@ -450,7 +450,7 @@ i->iNext = l->iNext; l->iNext = i; list_mutex_unlock(&l->mutex); - assert(i->magic = LIST_MAGIC); /* set magic via assert abuse */ + assert((i->magic = LIST_MAGIC)); /* set magic via assert abuse */ return(i); } @@ -484,7 +484,7 @@ } } list_mutex_unlock(&i->list->mutex); - assert(i->magic = 1); /* clear magic via assert abuse */ + assert((i->magic = 1)); /* clear magic via assert abuse */ list_iterator_free(i); return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/list.h new/conman-conman-0.2.9/list.h --- old/conman-conman-0.2.8/list.h 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/list.h 2017-12-14 02:01:32.000000000 +0100 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/log.c new/conman-conman-0.2.9/log.c --- old/conman-conman-0.2.8/log.c 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/log.c 2017-12-14 02:01:32.000000000 +0100 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/log.h new/conman-conman-0.2.9/log.h --- old/conman-conman-0.2.8/log.h 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/log.h 2017-12-14 02:01:32.000000000 +0100 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/man/conman.1.in new/conman-conman-0.2.9/man/conman.1.in --- old/conman-conman-0.2.8/man/conman.1.in 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/man/conman.1.in 2017-12-14 02:01:32.000000000 +0100 @@ -153,7 +153,7 @@ Chris Dunlap <[email protected]> .SH COPYRIGHT -Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. +Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. .br Copyright (C) 2001-2007 The Regents of the University of California. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/man/conman.conf.5.in new/conman-conman-0.2.9/man/conman.conf.5.in --- old/conman-conman-0.2.8/man/conman.conf.5.in 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/man/conman.conf.5.in 2017-12-14 02:01:32.000000000 +0100 @@ -193,11 +193,12 @@ .br .sp \fBW\fR:\fIworkaround_flag\fR - a string or integer for an IPMI workaround. -The following strings are recognized: "authcap", "intel20", "supermicro20", -"sun20", "opensesspriv", "integritycheckvalue", "solpayloadsize", "solport", -and "solstatus". Refer to \fBipmiconsole(8)\fR for more information on -these workarounds. This substring may be repeated in order to specify -multiple workarounds. +The following strings are recognized: "authcap", "integritycheckvalue", +"intel20", "nochecksumcheck", "opensesspriv", "serialalertsdeferred", +"solchannelsupport", "solpacketseq", "solpayloadsize", "solport", "solstatus", +"sun20", "supermicro20", "default", and "none". Refer to \fBipmiconsole(8)\fR +for more information on these workarounds. This substring may be repeated +in order to specify multiple workarounds. .br .sp Both the \fIpassword\fR and \fIK_g\fR values can be specified in either ASCII @@ -322,7 +323,7 @@ Chris Dunlap <[email protected]> .SH COPYRIGHT -Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. +Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. .br Copyright (C) 2001-2007 The Regents of the University of California. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/man/conmand.8.in new/conman-conman-0.2.9/man/conmand.8.in --- old/conman-conman-0.2.8/man/conmand.8.in 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/man/conmand.8.in 2017-12-14 02:01:32.000000000 +0100 @@ -97,7 +97,7 @@ Chris Dunlap <[email protected]> .SH COPYRIGHT -Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. +Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. .br Copyright (C) 2001-2007 The Regents of the University of California. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/server-conf.c new/conman-conman-0.2.9/server-conf.c --- old/conman-conman-0.2.8/server-conf.c 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/server-conf.c 2017-12-14 02:01:32.000000000 +0100 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/server-esc.c new/conman-conman-0.2.9/server-esc.c --- old/conman-conman-0.2.8/server-esc.c 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/server-esc.c 2017-12-14 02:01:32.000000000 +0100 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/server-ipmi.c new/conman-conman-0.2.9/server-ipmi.c --- old/conman-conman-0.2.8/server-ipmi.c 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/server-ipmi.c 2017-12-14 02:01:32.000000000 +0100 @@ -2,7 +2,7 @@ * Contributed by Levi Pearson <[email protected]>. * * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * @@ -164,7 +164,7 @@ memset(iopts, 0, sizeof(ipmiopt_t)); iopts->privilegeLevel = -1; iopts->cipherSuite = -1; - iopts->workaroundFlags = 0; + iopts->workaroundFlags = IPMICONSOLE_WORKAROUND_DEFAULT; return(0); } @@ -556,47 +556,63 @@ * Returns 0 and updates the 'iopts' struct on success; o/w, returns -1 * (writing an error message into buffer 'errbuf' of length 'errlen'). */ + unsigned int flag; + assert(iopts != NULL); assert(str != NULL); - if (str[0] == '\0') { - iopts->workaroundFlags = 0; + if ((str[0] == '\0') || !strcasecmp(str, "default")) { + flag = IPMICONSOLE_WORKAROUND_DEFAULT; } else if (!strcasecmp(str, "authcap")) { - iopts->workaroundFlags |= - IPMICONSOLE_WORKAROUND_AUTHENTICATION_CAPABILITIES; + flag = IPMICONSOLE_WORKAROUND_AUTHENTICATION_CAPABILITIES; } else if (!strcasecmp(str, "intel20")) { - iopts->workaroundFlags |= - IPMICONSOLE_WORKAROUND_INTEL_2_0_SESSION; + flag = IPMICONSOLE_WORKAROUND_INTEL_2_0_SESSION; } else if (!strcasecmp(str, "supermicro20")) { - iopts->workaroundFlags |= - IPMICONSOLE_WORKAROUND_SUPERMICRO_2_0_SESSION; + flag = IPMICONSOLE_WORKAROUND_SUPERMICRO_2_0_SESSION; } else if (!strcasecmp(str, "sun20")) { - iopts->workaroundFlags |= - IPMICONSOLE_WORKAROUND_SUN_2_0_SESSION; + flag = IPMICONSOLE_WORKAROUND_SUN_2_0_SESSION; } else if (!strcasecmp(str, "opensesspriv")) { - iopts->workaroundFlags |= - IPMICONSOLE_WORKAROUND_OPEN_SESSION_PRIVILEGE; + flag = IPMICONSOLE_WORKAROUND_OPEN_SESSION_PRIVILEGE; } else if (!strcasecmp(str, "integritycheckvalue")) { - iopts->workaroundFlags |= - IPMICONSOLE_WORKAROUND_NON_EMPTY_INTEGRITY_CHECK_VALUE; + flag = IPMICONSOLE_WORKAROUND_NON_EMPTY_INTEGRITY_CHECK_VALUE; + } +#ifdef IPMICONSOLE_WORKAROUND_NO_CHECKSUM_CHECK + else if (!strcasecmp(str, "nochecksumcheck")) { + flag = IPMICONSOLE_WORKAROUND_NO_CHECKSUM_CHECK; + } +#endif /* IPMICONSOLE_WORKAROUND_NO_CHECKSUM_CHECK */ +#ifdef IPMICONSOLE_WORKAROUND_SERIAL_ALERTS_DEFERRED + else if (!strcasecmp(str, "serialalertsdeferred")) { + flag = IPMICONSOLE_WORKAROUND_SERIAL_ALERTS_DEFERRED; + } +#endif /* IPMICONSOLE_WORKAROUND_SERIAL_ALERTS_DEFERRED */ +#ifdef IPMICONSOLE_WORKAROUND_INCREMENT_SOL_PACKET_SEQUENCE + else if (!strcasecmp(str, "solpacketseq")) { + flag = IPMICONSOLE_WORKAROUND_INCREMENT_SOL_PACKET_SEQUENCE; } +#endif /* IPMICONSOLE_WORKAROUND_INCREMENT_SOL_PACKET_SEQUENCE */ else if (!strcasecmp(str, "solpayloadsize")) { - iopts->workaroundFlags |= - IPMICONSOLE_WORKAROUND_IGNORE_SOL_PAYLOAD_SIZE; + flag = IPMICONSOLE_WORKAROUND_IGNORE_SOL_PAYLOAD_SIZE; } else if (!strcasecmp(str, "solport")) { - iopts->workaroundFlags |= - IPMICONSOLE_WORKAROUND_IGNORE_SOL_PORT; + flag = IPMICONSOLE_WORKAROUND_IGNORE_SOL_PORT; } else if (!strcasecmp(str, "solstatus")) { - iopts->workaroundFlags |= - IPMICONSOLE_WORKAROUND_SKIP_SOL_ACTIVATION_STATUS; + flag = IPMICONSOLE_WORKAROUND_SKIP_SOL_ACTIVATION_STATUS; + } +#ifdef IPMICONSOLE_WORKAROUND_SKIP_CHANNEL_PAYLOAD_SUPPORT + else if (!strcasecmp(str, "solchannelsupport")) { + flag = IPMICONSOLE_WORKAROUND_SKIP_CHANNEL_PAYLOAD_SUPPORT; + } +#endif /* IPMICONSOLE_WORKAROUND_SKIP_CHANNEL_PAYLOAD_SUPPORT */ + else if (!strcasecmp(str, "none")) { + flag = 0; } else { unsigned int u; @@ -619,13 +635,19 @@ } return(-1); } - else if (u == 0) { - iopts->workaroundFlags = 0; - } else { - iopts->workaroundFlags |= u; + flag = u; } } + + if ((flag == 0) || + (flag == IPMICONSOLE_WORKAROUND_DEFAULT) || + (iopts->workaroundFlags == IPMICONSOLE_WORKAROUND_DEFAULT)) { + iopts->workaroundFlags = flag; + } + else { + iopts->workaroundFlags |= flag; + } return(0); } @@ -927,9 +949,9 @@ protocol_config.acceptable_packet_errors_count = -1; protocol_config.maximum_retransmission_count = -1; - engine_config.engine_flags = 0; - engine_config.behavior_flags = 0; - engine_config.debug_flags = 0; + engine_config.engine_flags = IPMICONSOLE_ENGINE_DEFAULT; + engine_config.behavior_flags = IPMICONSOLE_BEHAVIOR_DEFAULT; + engine_config.debug_flags = IPMICONSOLE_DEBUG_DEFAULT; /* A context cannot be submitted to the ipmiconsole engine more than once, * so create a new context if one already exists. @@ -1007,8 +1029,9 @@ else { int e = ipmiconsole_ctx_errnum(ipmi->aux.ipmi.ctx); log_msg(LOG_INFO, - "Unable to connect to <%s> via IPMI for [%s]: %s", - ipmi->aux.ipmi.host, ipmi->name, ipmiconsole_ctx_strerror(e)); + "Unable to connect to <%s> via IPMI for [%s]%s%s", + ipmi->aux.ipmi.host, ipmi->name, (e ? ": " : ""), + (e ? ipmiconsole_ctx_strerror(e) : "")); } /* Set timer for establishing new connection attempt. * Any existing timer should have already been cancelled at the start of diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/server-logfile.c new/conman-conman-0.2.9/server-logfile.c --- old/conman-conman-0.2.8/server-logfile.c 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/server-logfile.c 2017-12-14 02:01:32.000000000 +0100 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/server-obj.c new/conman-conman-0.2.9/server-obj.c --- old/conman-conman-0.2.8/server-obj.c 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/server-obj.c 2017-12-14 02:01:32.000000000 +0100 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/server-process.c new/conman-conman-0.2.9/server-process.c --- old/conman-conman-0.2.8/server-process.c 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/server-process.c 2017-12-14 02:01:32.000000000 +0100 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/server-serial.c new/conman-conman-0.2.9/server-serial.c --- old/conman-conman-0.2.8/server-serial.c 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/server-serial.c 2017-12-14 02:01:32.000000000 +0100 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/server-sock.c new/conman-conman-0.2.9/server-sock.c --- old/conman-conman-0.2.8/server-sock.c 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/server-sock.c 2017-12-14 02:01:32.000000000 +0100 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/server-telnet.c new/conman-conman-0.2.9/server-telnet.c --- old/conman-conman-0.2.8/server-telnet.c 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/server-telnet.c 2017-12-14 02:01:32.000000000 +0100 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/server-test.c new/conman-conman-0.2.9/server-test.c --- old/conman-conman-0.2.8/server-test.c 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/server-test.c 2017-12-14 02:01:32.000000000 +0100 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/server-unixsock.c new/conman-conman-0.2.9/server-unixsock.c --- old/conman-conman-0.2.8/server-unixsock.c 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/server-unixsock.c 2017-12-14 02:01:32.000000000 +0100 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/server.c new/conman-conman-0.2.9/server.c --- old/conman-conman-0.2.8/server.c 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/server.c 2017-12-14 02:01:32.000000000 +0100 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/server.h new/conman-conman-0.2.9/server.h --- old/conman-conman-0.2.8/server.h 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/server.h 2017-12-14 02:01:32.000000000 +0100 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/tpoll.c new/conman-conman-0.2.9/tpoll.c --- old/conman-conman-0.2.8/tpoll.c 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/tpoll.c 2017-12-14 02:01:32.000000000 +0100 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/tpoll.h new/conman-conman-0.2.9/tpoll.h --- old/conman-conman-0.2.8/tpoll.h 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/tpoll.h 2017-12-14 02:01:32.000000000 +0100 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/util-file.c new/conman-conman-0.2.9/util-file.c --- old/conman-conman-0.2.8/util-file.c 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/util-file.c 2017-12-14 02:01:32.000000000 +0100 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/util-file.h new/conman-conman-0.2.9/util-file.h --- old/conman-conman-0.2.8/util-file.h 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/util-file.h 2017-12-14 02:01:32.000000000 +0100 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/util-net.c new/conman-conman-0.2.9/util-net.c --- old/conman-conman-0.2.8/util-net.c 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/util-net.c 2017-12-14 02:01:32.000000000 +0100 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/util-net.h new/conman-conman-0.2.9/util-net.h --- old/conman-conman-0.2.8/util-net.h 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/util-net.h 2017-12-14 02:01:32.000000000 +0100 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/util-str.c new/conman-conman-0.2.9/util-str.c --- old/conman-conman-0.2.8/util-str.c 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/util-str.c 2017-12-14 02:01:32.000000000 +0100 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/util-str.h new/conman-conman-0.2.9/util-str.h --- old/conman-conman-0.2.8/util-str.h 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/util-str.h 2017-12-14 02:01:32.000000000 +0100 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/util.c new/conman-conman-0.2.9/util.c --- old/conman-conman-0.2.8/util.c 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/util.c 2017-12-14 02:01:32.000000000 +0100 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/util.h new/conman-conman-0.2.9/util.h --- old/conman-conman-0.2.8/util.h 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/util.h 2017-12-14 02:01:32.000000000 +0100 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.8/wrapper.h new/conman-conman-0.2.9/wrapper.h --- old/conman-conman-0.2.8/wrapper.h 2016-11-22 22:31:04.000000000 +0100 +++ new/conman-conman-0.2.9/wrapper.h 2017-12-14 02:01:32.000000000 +0100 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2016 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. *
