Hello community, here is the log from the commit of package conman for openSUSE:Factory checked in at 2018-09-25 15:44:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/conman (Old) and /work/SRC/openSUSE:Factory/.conman.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "conman" Tue Sep 25 15:44:12 2018 rev:12 rq:637874 version:0.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/conman/conman.changes 2018-09-24 13:13:49.309648326 +0200 +++ /work/SRC/openSUSE:Factory/.conman.new/conman.changes 2018-09-25 15:44:15.913172408 +0200 @@ -1,0 +2,8 @@ +Tue Sep 25 07:40:26 UTC 2018 - [email protected] + +- Update to conman-0.3.0 (2018-09-15): + * Fixed slow connects to Unix socket consoles triggered from + inotify. (#28,#29). + * Obsoletes: Reset-delay-for-unixsock-connect-from-inotify.patch + +------------------------------------------------------------------- Old: ---- Reset-delay-for-unixsock-connect-from-inotify.patch conman-0.2.9.tar.gz New: ---- conman-0.3.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ conman.spec ++++++ --- /var/tmp/diff_new_pack.xw917A/_old 2018-09-25 15:44:16.445171840 +0200 +++ /var/tmp/diff_new_pack.xw917A/_new 2018-09-25 15:44:16.449171836 +0200 @@ -44,7 +44,7 @@ %endif Name: conman -Version: 0.2.9 +Version: 0.3.0 Release: 0 Summary: The Console Manager @@ -71,7 +71,6 @@ %endif Patch1: conman-suse-fix-expect-scripts.patch -Patch2: Reset-delay-for-unixsock-connect-from-inotify.patch # 8/15/14 [email protected] - include prereq %if 0%{?sles_version} || 0%{?suse_version} @@ -96,7 +95,6 @@ %prep %setup -q -n %{name}-%{name}-%{version} %patch1 -p1 -%patch2 -p1 %build %configure --with-tcp-wrappers \ ++++++ conman-0.2.9.tar.gz -> conman-0.3.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/META new/conman-conman-0.3.0/META --- old/conman-conman-0.2.9/META 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/META 2018-09-15 17:51:34.000000000 +0200 @@ -1,5 +1,5 @@ Name: conman - Version: 0.2.9 + Version: 0.3.0 Release: 1 - Date: 2017-12-14 + Date: 2018-09-15 Author: Chris Dunlap <[email protected]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/NEWS new/conman-conman-0.3.0/NEWS --- old/conman-conman-0.2.9/NEWS 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/NEWS 2018-09-15 17:51:34.000000000 +0200 @@ -1,3 +1,6 @@ +conman-0.3.0 (2018-09-15): +- Fixed slow connects to Unix socket consoles triggered from inotify. (#28,#29) + conman-0.2.9 (2017-12-14): - Allowed IPMI defaults to be overridden via libipmiconsole.conf. (#27) - Updated recognized strings for IPMI workaround-flags. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/PLATFORMS new/conman-conman-0.3.0/PLATFORMS --- old/conman-conman-0.2.9/PLATFORMS 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/PLATFORMS 2018-09-15 17:51:34.000000000 +0200 @@ -1,17 +1,15 @@ -ConMan 0.2.9 has been built on the following systems: +ConMan 0.3.0 has been built on the following systems: -- 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 +- CentOS 6.10 +- CentOS 7.5.1804 +- Debian 9.5 +- Fedora 28 +- FreeBSD 11.2 +- NetBSD 7.1.2 +- OpenBSD 6.3 +- Ubuntu 18.04.1 LTS RPMs have been built and tested on the following systems: -- CentOS 7.4.1708 -- Fedora 27 +- CentOS 7.5.1804 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/THANKS new/conman-conman-0.3.0/THANKS --- old/conman-conman-0.2.9/THANKS 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/THANKS 2018-09-15 17:51:34.000000000 +0200 @@ -5,6 +5,7 @@ Christopher D. Maestas <[email protected]> Dave Love <[email protected]> Dmitry Monakhov <[email protected]> +Egbert Eich <[email protected]> Jesse Hathaway <[email protected]> Levi Pearson <[email protected]> Marc Girard <[email protected]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/bool.h new/conman-conman-0.3.0/bool.h --- old/conman-conman-0.2.9/bool.h 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/bool.h 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 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.9/client-conf.c new/conman-conman-0.3.0/client-conf.c --- old/conman-conman-0.2.9/client-conf.c 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/client-conf.c 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 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.9/client-sock.c new/conman-conman-0.3.0/client-sock.c --- old/conman-conman-0.2.9/client-sock.c 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/client-sock.c 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 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.9/client-tty.c new/conman-conman-0.3.0/client-tty.c --- old/conman-conman-0.2.9/client-tty.c 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/client-tty.c 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 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.9/client.c new/conman-conman-0.3.0/client.c --- old/conman-conman-0.2.9/client.c 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/client.c 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 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.9/client.h new/conman-conman-0.3.0/client.h --- old/conman-conman-0.2.9/client.h 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/client.h 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 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.9/common.c new/conman-conman-0.3.0/common.c --- old/conman-conman-0.2.9/common.c 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/common.c 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 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-2017 Lawrence Livermore National Security, LLC.\n" \ + "Copyright (C) 2007-2018 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.9/common.h new/conman-conman-0.3.0/common.h --- old/conman-conman-0.2.9/common.h 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/common.h 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 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.9/configure.ac new/conman-conman-0.3.0/configure.ac --- old/conman-conman-0.2.9/configure.ac 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/configure.ac 2018-09-15 17:51:34.000000000 +0200 @@ -3,7 +3,7 @@ # Process this file with autoconf to produce a configure script. ############################################################################### # Written by Chris Dunlap <[email protected]>. -# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2018 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.9/conman.spec new/conman-conman-0.3.0/conman.spec --- old/conman-conman-0.2.9/conman.spec 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/conman.spec 2018-09-15 17:51:34.000000000 +0200 @@ -1,5 +1,5 @@ Name: conman -Version: 0.2.9 +Version: 0.3.0 Release: 1%{?dist} Summary: ConMan: The Console Manager diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/conmen new/conman-conman-0.3.0/conmen --- old/conman-conman-0.2.9/conmen 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/conmen 2018-09-15 17:51:34.000000000 +0200 @@ -4,7 +4,7 @@ # ConMen: a wrapper to aid in ConMan broadcast sessions. ############################################################################### # Written by Chris Dunlap <[email protected]>. -# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2018 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.9/etc/conman.init.in new/conman-conman-0.3.0/etc/conman.init.in --- old/conman-conman-0.2.9/etc/conman.init.in 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/etc/conman.init.in 2018-09-15 17:51:34.000000000 +0200 @@ -1,7 +1,7 @@ #!/bin/sh ############################################################################### # Written by Chris Dunlap <[email protected]>. -# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2018 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.9/inevent.c new/conman-conman-0.3.0/inevent.c --- old/conman-conman-0.2.9/inevent.c 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/inevent.c 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 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.9/inevent.h new/conman-conman-0.3.0/inevent.h --- old/conman-conman-0.2.9/inevent.h 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/inevent.h 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 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.9/lex.c new/conman-conman-0.3.0/lex.c --- old/conman-conman-0.2.9/lex.c 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/lex.c 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 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.9/lex.h new/conman-conman-0.3.0/lex.h --- old/conman-conman-0.2.9/lex.h 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/lex.h 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 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.9/lib/alpha.exp new/conman-conman-0.3.0/lib/alpha.exp --- old/conman-conman-0.2.9/lib/alpha.exp 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/lib/alpha.exp 2018-09-15 17:51:34.000000000 +0200 @@ -2,7 +2,7 @@ # Alpha Library Functions (ALF) ############################################################################### # Written by Chris Dunlap <[email protected]>. -# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2018 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.9/lib/conman.exp new/conman-conman-0.3.0/lib/conman.exp --- old/conman-conman-0.2.9/lib/conman.exp 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/lib/conman.exp 2018-09-15 17:51:34.000000000 +0200 @@ -2,7 +2,7 @@ # ConMan Expect Language Library (CELL) ############################################################################### # Written by Chris Dunlap <[email protected]>. -# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2018 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.9/lib/examples/boot_alpha.exp new/conman-conman-0.3.0/lib/examples/boot_alpha.exp --- old/conman-conman-0.2.9/lib/examples/boot_alpha.exp 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/lib/examples/boot_alpha.exp 2018-09-15 17:51:34.000000000 +0200 @@ -1,7 +1,7 @@ #!/usr/bin/expect -- ############################################################################### # Written by Chris Dunlap <[email protected]>. -# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2018 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.9/lib/examples/mac.exp new/conman-conman-0.3.0/lib/examples/mac.exp --- old/conman-conman-0.2.9/lib/examples/mac.exp 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/lib/examples/mac.exp 2018-09-15 17:51:34.000000000 +0200 @@ -1,7 +1,7 @@ #!/usr/bin/expect -- ############################################################################### # Written by Chris Dunlap <[email protected]>. -# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2018 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.9/lib/examples/rmc.exp new/conman-conman-0.3.0/lib/examples/rmc.exp --- old/conman-conman-0.2.9/lib/examples/rmc.exp 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/lib/examples/rmc.exp 2018-09-15 17:51:34.000000000 +0200 @@ -1,7 +1,7 @@ #!/usr/bin/expect -- ############################################################################### # Written by Chris Dunlap <[email protected]>. -# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2018 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.9/lib/examples/shell_cmd_1.exp new/conman-conman-0.3.0/lib/examples/shell_cmd_1.exp --- old/conman-conman-0.2.9/lib/examples/shell_cmd_1.exp 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/lib/examples/shell_cmd_1.exp 2018-09-15 17:51:34.000000000 +0200 @@ -1,7 +1,7 @@ #!/usr/bin/expect -- ############################################################################### # Written by Chris Dunlap <[email protected]>. -# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2018 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.9/lib/examples/shell_cmd_n.exp new/conman-conman-0.3.0/lib/examples/shell_cmd_n.exp --- old/conman-conman-0.2.9/lib/examples/shell_cmd_n.exp 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/lib/examples/shell_cmd_n.exp 2018-09-15 17:51:34.000000000 +0200 @@ -1,7 +1,7 @@ #!/usr/bin/expect -- ############################################################################### # Written by Chris Dunlap <[email protected]>. -# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2018 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.9/lib/examples/srm.exp new/conman-conman-0.3.0/lib/examples/srm.exp --- old/conman-conman-0.2.9/lib/examples/srm.exp 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/lib/examples/srm.exp 2018-09-15 17:51:34.000000000 +0200 @@ -1,7 +1,7 @@ #!/usr/bin/expect -- ############################################################################### # Written by Chris Dunlap <[email protected]>. -# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2018 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.9/lib/examples/wtf.exp new/conman-conman-0.3.0/lib/examples/wtf.exp --- old/conman-conman-0.2.9/lib/examples/wtf.exp 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/lib/examples/wtf.exp 2018-09-15 17:51:34.000000000 +0200 @@ -1,7 +1,7 @@ #!/usr/bin/expect -- ############################################################################### # Written by Chris Dunlap <[email protected]>. -# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2018 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.9/lib/exec/cyclades-ssh.exp new/conman-conman-0.3.0/lib/exec/cyclades-ssh.exp --- old/conman-conman-0.2.9/lib/exec/cyclades-ssh.exp 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/lib/exec/cyclades-ssh.exp 2018-09-15 17:51:34.000000000 +0200 @@ -1,7 +1,7 @@ #!/usr/bin/expect -f ############################################################################### # Written by Chris Dunlap <[email protected]>. -# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2018 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.9/lib/exec/cyclades-telnet.exp new/conman-conman-0.3.0/lib/exec/cyclades-telnet.exp --- old/conman-conman-0.2.9/lib/exec/cyclades-telnet.exp 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/lib/exec/cyclades-telnet.exp 2018-09-15 17:51:34.000000000 +0200 @@ -1,7 +1,7 @@ #!/usr/bin/expect -f ############################################################################### # Written by Chris Dunlap <[email protected]>. -# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2018 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.9/lib/exec/hp-ilo.exp new/conman-conman-0.3.0/lib/exec/hp-ilo.exp --- old/conman-conman-0.2.9/lib/exec/hp-ilo.exp 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/lib/exec/hp-ilo.exp 2018-09-15 17:51:34.000000000 +0200 @@ -1,7 +1,7 @@ #!/usr/bin/expect -f ############################################################################### # Written by Chris Dunlap <[email protected]>. -# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2018 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.9/lib/exec/hp-lo100.exp new/conman-conman-0.3.0/lib/exec/hp-lo100.exp --- old/conman-conman-0.2.9/lib/exec/hp-lo100.exp 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/lib/exec/hp-lo100.exp 2018-09-15 17:51:34.000000000 +0200 @@ -1,7 +1,7 @@ #!/usr/bin/expect -f ############################################################################### # Written by Chris Dunlap <[email protected]>. -# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2018 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.9/lib/exec/ibm-bc.exp new/conman-conman-0.3.0/lib/exec/ibm-bc.exp --- old/conman-conman-0.2.9/lib/exec/ibm-bc.exp 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/lib/exec/ibm-bc.exp 2018-09-15 17:51:34.000000000 +0200 @@ -1,7 +1,7 @@ #!/usr/bin/expect -f ############################################################################### # Written by Chris Dunlap <[email protected]>. -# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2018 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.9/lib/exec/ipmiconsole.exp new/conman-conman-0.3.0/lib/exec/ipmiconsole.exp --- old/conman-conman-0.2.9/lib/exec/ipmiconsole.exp 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/lib/exec/ipmiconsole.exp 2018-09-15 17:51:34.000000000 +0200 @@ -1,7 +1,7 @@ #!/usr/bin/expect -f ############################################################################### # Written by Chris Dunlap <[email protected]>. -# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2018 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.9/lib/exec/ipmitool.exp new/conman-conman-0.3.0/lib/exec/ipmitool.exp --- old/conman-conman-0.2.9/lib/exec/ipmitool.exp 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/lib/exec/ipmitool.exp 2018-09-15 17:51:34.000000000 +0200 @@ -1,7 +1,7 @@ #!/usr/bin/expect -f ############################################################################### # Written by Chris Dunlap <[email protected]>. -# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2018 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.9/lib/exec/ssh.exp new/conman-conman-0.3.0/lib/exec/ssh.exp --- old/conman-conman-0.2.9/lib/exec/ssh.exp 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/lib/exec/ssh.exp 2018-09-15 17:51:34.000000000 +0200 @@ -1,7 +1,7 @@ #!/usr/bin/expect -f ############################################################################### # Written by Chris Dunlap <[email protected]>. -# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2018 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.9/lib/exec/sun-elom.exp new/conman-conman-0.3.0/lib/exec/sun-elom.exp --- old/conman-conman-0.2.9/lib/exec/sun-elom.exp 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/lib/exec/sun-elom.exp 2018-09-15 17:51:34.000000000 +0200 @@ -5,7 +5,7 @@ # Works with ELOM 3.15, at least. # # Written by Chris Dunlap <[email protected]>. -# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2018 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.9/lib/exec/sun-ilom.exp new/conman-conman-0.3.0/lib/exec/sun-ilom.exp --- old/conman-conman-0.2.9/lib/exec/sun-ilom.exp 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/lib/exec/sun-ilom.exp 2018-09-15 17:51:34.000000000 +0200 @@ -1,7 +1,7 @@ #!/usr/bin/expect -f ############################################################################### # Written by Chris Dunlap <[email protected]>. -# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2018 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.9/lib/exec/sun-v20z-v40z.exp new/conman-conman-0.3.0/lib/exec/sun-v20z-v40z.exp --- old/conman-conman-0.2.9/lib/exec/sun-v20z-v40z.exp 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/lib/exec/sun-v20z-v40z.exp 2018-09-15 17:51:34.000000000 +0200 @@ -1,7 +1,7 @@ #!/usr/bin/expect -f ############################################################################### # Written by Chris Dunlap <[email protected]>. -# Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. +# Copyright (C) 2007-2018 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.9/list.c new/conman-conman-0.3.0/list.c --- old/conman-conman-0.2.9/list.c 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/list.c 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 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.9/list.h new/conman-conman-0.3.0/list.h --- old/conman-conman-0.2.9/list.h 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/list.h 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 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.9/log.c new/conman-conman-0.3.0/log.c --- old/conman-conman-0.2.9/log.c 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/log.c 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 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.9/log.h new/conman-conman-0.3.0/log.h --- old/conman-conman-0.2.9/log.h 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/log.h 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 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.9/man/conman.1.in new/conman-conman-0.3.0/man/conman.1.in --- old/conman-conman-0.2.9/man/conman.1.in 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/man/conman.1.in 2018-09-15 17:51:34.000000000 +0200 @@ -153,7 +153,7 @@ Chris Dunlap <[email protected]> .SH COPYRIGHT -Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. +Copyright (C) 2007-2018 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.9/man/conman.conf.5.in new/conman-conman-0.3.0/man/conman.conf.5.in --- old/conman-conman-0.2.9/man/conman.conf.5.in 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/man/conman.conf.5.in 2018-09-15 17:51:34.000000000 +0200 @@ -323,7 +323,7 @@ Chris Dunlap <[email protected]> .SH COPYRIGHT -Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. +Copyright (C) 2007-2018 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.9/man/conmand.8.in new/conman-conman-0.3.0/man/conmand.8.in --- old/conman-conman-0.2.9/man/conmand.8.in 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/man/conmand.8.in 2018-09-15 17:51:34.000000000 +0200 @@ -97,7 +97,7 @@ Chris Dunlap <[email protected]> .SH COPYRIGHT -Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. +Copyright (C) 2007-2018 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.9/server-conf.c new/conman-conman-0.3.0/server-conf.c --- old/conman-conman-0.2.9/server-conf.c 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/server-conf.c 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 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.9/server-esc.c new/conman-conman-0.3.0/server-esc.c --- old/conman-conman-0.2.9/server-esc.c 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/server-esc.c 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 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.9/server-ipmi.c new/conman-conman-0.3.0/server-ipmi.c --- old/conman-conman-0.2.9/server-ipmi.c 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/server-ipmi.c 2018-09-15 17:51:34.000000000 +0200 @@ -2,7 +2,7 @@ * Contributed by Levi Pearson <[email protected]>. * * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 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.9/server-logfile.c new/conman-conman-0.3.0/server-logfile.c --- old/conman-conman-0.2.9/server-logfile.c 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/server-logfile.c 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 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.9/server-obj.c new/conman-conman-0.3.0/server-obj.c --- old/conman-conman-0.2.9/server-obj.c 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/server-obj.c 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 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.9/server-process.c new/conman-conman-0.3.0/server-process.c --- old/conman-conman-0.2.9/server-process.c 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/server-process.c 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 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.9/server-serial.c new/conman-conman-0.3.0/server-serial.c --- old/conman-conman-0.2.9/server-serial.c 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/server-serial.c 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 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.9/server-sock.c new/conman-conman-0.3.0/server-sock.c --- old/conman-conman-0.2.9/server-sock.c 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/server-sock.c 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 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.9/server-telnet.c new/conman-conman-0.3.0/server-telnet.c --- old/conman-conman-0.2.9/server-telnet.c 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/server-telnet.c 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 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.9/server-test.c new/conman-conman-0.3.0/server-test.c --- old/conman-conman-0.2.9/server-test.c 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/server-test.c 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 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.9/server-unixsock.c new/conman-conman-0.3.0/server-unixsock.c --- old/conman-conman-0.2.9/server-unixsock.c 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/server-unixsock.c 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * @@ -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 @@ 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 @@ 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 @@ } +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 @@ * 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 @@ 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 @@ 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/server.c new/conman-conman-0.3.0/server.c --- old/conman-conman-0.2.9/server.c 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/server.c 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 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.9/server.h new/conman-conman-0.3.0/server.h --- old/conman-conman-0.2.9/server.h 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/server.h 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. * @@ -180,6 +180,7 @@ 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>. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conman-conman-0.2.9/tpoll.c new/conman-conman-0.3.0/tpoll.c --- old/conman-conman-0.2.9/tpoll.c 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/tpoll.c 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 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.9/tpoll.h new/conman-conman-0.3.0/tpoll.h --- old/conman-conman-0.2.9/tpoll.h 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/tpoll.h 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 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.9/util-file.c new/conman-conman-0.3.0/util-file.c --- old/conman-conman-0.2.9/util-file.c 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/util-file.c 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 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.9/util-file.h new/conman-conman-0.3.0/util-file.h --- old/conman-conman-0.2.9/util-file.h 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/util-file.h 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 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.9/util-net.c new/conman-conman-0.3.0/util-net.c --- old/conman-conman-0.2.9/util-net.c 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/util-net.c 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 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.9/util-net.h new/conman-conman-0.3.0/util-net.h --- old/conman-conman-0.2.9/util-net.h 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/util-net.h 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 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.9/util-str.c new/conman-conman-0.3.0/util-str.c --- old/conman-conman-0.2.9/util-str.c 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/util-str.c 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 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.9/util-str.h new/conman-conman-0.3.0/util-str.h --- old/conman-conman-0.2.9/util-str.h 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/util-str.h 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 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.9/util.c new/conman-conman-0.3.0/util.c --- old/conman-conman-0.2.9/util.c 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/util.c 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 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.9/util.h new/conman-conman-0.3.0/util.h --- old/conman-conman-0.2.9/util.h 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/util.h 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 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.9/wrapper.h new/conman-conman-0.3.0/wrapper.h --- old/conman-conman-0.2.9/wrapper.h 2017-12-14 02:01:32.000000000 +0100 +++ new/conman-conman-0.3.0/wrapper.h 2018-09-15 17:51:34.000000000 +0200 @@ -1,6 +1,6 @@ /***************************************************************************** * Written by Chris Dunlap <[email protected]>. - * Copyright (C) 2007-2017 Lawrence Livermore National Security, LLC. + * Copyright (C) 2007-2018 Lawrence Livermore National Security, LLC. * Copyright (C) 2001-2007 The Regents of the University of California. * UCRL-CODE-2002-009. *
