Hello community, here is the log from the commit of package autossh for openSUSE:Factory checked in at 2015-09-30 05:52:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/autossh (Old) and /work/SRC/openSUSE:Factory/.autossh.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "autossh" Changes: -------- --- /work/SRC/openSUSE:Factory/autossh/autossh.changes 2015-05-15 07:44:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.autossh.new/autossh.changes 2015-09-30 05:52:29.000000000 +0200 @@ -1,0 +2,9 @@ +Tue Sep 15 08:40:56 UTC 2015 - [email protected] + +- Update to version 1.4e + + By default, changing the poll time should change the first poll + time to match. Only have different times if AUTOSSH_FIRST_POLL + is explicitly set. Jerry Xie forwarded on change request from + Ubuntu bug forums. + +------------------------------------------------------------------- Old: ---- autossh-1.4d.tgz New: ---- autossh-1.4e.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autossh.spec ++++++ --- /var/tmp/diff_new_pack.7T8034/_old 2015-09-30 05:52:30.000000000 +0200 +++ /var/tmp/diff_new_pack.7T8034/_new 2015-09-30 05:52:30.000000000 +0200 @@ -27,7 +27,7 @@ Group: Productivity/Networking/SSH Name: autossh -Version: 1.4d +Version: 1.4e Release: 0 Url: http://www.harding.motd.ca/autossh/ Source: http://www.harding.motd.ca/autossh/%{name}-%{version}.tgz ++++++ autossh-1.4d.tgz -> autossh-1.4e.tgz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autossh-1.4d/CHANGES new/autossh-1.4e/CHANGES --- old/autossh-1.4d/CHANGES 2014-09-10 03:59:17.000000000 +0200 +++ new/autossh-1.4e/CHANGES 2015-02-10 05:41:58.000000000 +0100 @@ -1,4 +1,10 @@ +Version 1.4e +- By default, changing the poll time should change the first poll + time to match. Only have different times if AUTOSSH_FIRST_POLL + is explicitly set. Jerry Xie forwarded on change request from + Ubuntu bug forums. + Version 1.4d - call daemon() before opening any sockets. Problem discovered and diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autossh-1.4d/Makefile.in new/autossh-1.4e/Makefile.in --- old/autossh-1.4d/Makefile.in 2014-09-10 03:59:17.000000000 +0200 +++ new/autossh-1.4e/Makefile.in 2015-02-10 05:41:58.000000000 +0100 @@ -1,8 +1,8 @@ -# $Id: Makefile.in,v 1.6 2014/09/10 01:59:01 harding Exp $ +# $Id: Makefile.in,v 1.7 2015/02/10 04:31:16 harding Exp $ # # @configure_input@ -VER= 1.4d +VER= 1.4e SSH= @path_ssh@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autossh-1.4d/README new/autossh-1.4e/README --- old/autossh-1.4d/README 2014-09-10 03:59:17.000000000 +0200 +++ new/autossh-1.4e/README 2015-02-10 05:41:58.000000000 +0100 @@ -194,6 +194,9 @@ it is different than that compiled in. AUTOSSH_PIDFILE - write autossh pid to specified file. AUTOSSH_POLL - poll time in seconds; default is 600. + Changing this will also change the first + poll time, unless AUTOSSH_FIRST_POLL is + used to set it to something different. If the poll time is less than twice the network timeouts (default 15 seconds) the network timeouts will be adjusted downward diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autossh-1.4d/autossh.1 new/autossh-1.4e/autossh.1 --- old/autossh-1.4d/autossh.1 2014-09-10 03:59:17.000000000 +0200 +++ new/autossh-1.4e/autossh.1 2015-02-10 05:41:58.000000000 +0100 @@ -17,7 +17,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $Id: autossh.1,v 1.22 2011/10/12 20:29:22 harding Exp $ +.\" $Id: autossh.1,v 1.23 2015/02/10 04:31:16 harding Exp $ .\" .Dd Jul 20, 2004 .Dt AUTOSSH 1 @@ -256,9 +256,10 @@ Write autossh pid to specified file. .It Ev AUTOSSH_POLL Specifies the connection poll time in seconds; default is 600 seconds. -If the poll time is less than twice the network timeouts (default 15 -seconds) the network timeouts will be adjusted downward to 1/2 the -poll time. +Unless AUTOSSH_FIRST_POLL is used, the first poll time will +set to match the poll time. If the poll time is less than twice the +network timeouts (default 15 seconds) the network timeouts will be +adjusted downward to 1/2 the poll time. .It Ev AUTOSSH_PORT Sets the connection monitoring port. Mostly in case ssh appropriates -M at some time. But because of this possible use, AUTOSSH_PORT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autossh-1.4d/autossh.c new/autossh-1.4e/autossh.c --- old/autossh-1.4d/autossh.c 2014-09-10 03:59:17.000000000 +0200 +++ new/autossh-1.4e/autossh.c 2015-02-10 05:41:58.000000000 +0100 @@ -81,7 +81,7 @@ char *__progname; #endif -const char *rcsid = "$Id: autossh.c,v 1.83 2014/09/10 01:59:01 harding Exp $"; +const char *rcsid = "$Id: autossh.c,v 1.84 2015/02/10 04:31:16 harding Exp $"; #ifndef SSH_PATH # define SSH_PATH "/usr/bin/ssh" @@ -592,15 +592,6 @@ xerrlog(LOG_ERR, "invalid log level \"%s\"", s); } - if ((s = getenv("AUTOSSH_FIRST_POLL")) != NULL) { - first_poll_time = strtoul(s, &t, 0); - if (*s == '\0' || first_poll_time == 0 || *t != '\0' ) - xerrlog(LOG_ERR, - "invalid first poll time \"%s\"", s); - if (first_poll_time <= 0) - first_poll_time = POLL_TIME; - } - if ((s = getenv("AUTOSSH_POLL")) != NULL) { poll_time = strtoul(s, &t, 0); if (*s == '\0' || poll_time == 0 || *t != '\0' ) @@ -610,6 +601,21 @@ poll_time = POLL_TIME; } + if ((s = getenv("AUTOSSH_FIRST_POLL")) != NULL) { + first_poll_time = strtoul(s, &t, 0); + if (*s == '\0' || first_poll_time == 0 || *t != '\0' ) + xerrlog(LOG_ERR, + "invalid first poll time \"%s\"", s); + if (first_poll_time <= 0) + first_poll_time = POLL_TIME; + } else { + /* + * If first poll time not explicitly set, first + * poll time should equal poll time. + */ + first_poll_time = poll_time; + } + if ((s = getenv("AUTOSSH_GATETIME")) != NULL) { gate_time = (double)strtol(s, &t, 0); if (*s == '\0' || gate_time < 0 || *t != '\0' )
