Hello community, here is the log from the commit of package autossh for openSUSE:Factory checked in at 2014-12-21 12:04:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-07-27 18:47:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.autossh.new/autossh.changes 2014-12-21 12:04:21.000000000 +0100 @@ -1,0 +2,9 @@ +Thu Dec 18 11:23:53 UTC 2014 - [email protected] + +- Update to version 1.4d + + call daemon() before opening any sockets. Problem discovered and + diagnosed by Frank van der Aa when trying to start autossh at + system init. + + don't use malloc(n * size) idiom; use calloc() + +------------------------------------------------------------------- Old: ---- autossh-1.4c.tgz New: ---- autossh-1.4d.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autossh.spec ++++++ --- /var/tmp/diff_new_pack.rEwcpQ/_old 2014-12-21 12:04:21.000000000 +0100 +++ /var/tmp/diff_new_pack.rEwcpQ/_new 2014-12-21 12:04:21.000000000 +0100 @@ -26,10 +26,10 @@ Group: Productivity/Networking/SSH Name: autossh -Version: 1.4c +Version: 1.4d Release: 0 Url: http://www.harding.motd.ca/autossh/ -Source: http://www.harding.motd.ca/autossh/autossh-1.4c.tgz +Source: http://www.harding.motd.ca/autossh/%{name}-%{version}.tgz Source1: autossh.init Source2: autossh.conf Source3: autossh.service ++++++ autossh-1.4c.tgz -> autossh-1.4d.tgz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autossh-1.4c/CHANGES new/autossh-1.4d/CHANGES --- old/autossh-1.4c/CHANGES 2011-10-12 22:30:40.000000000 +0200 +++ new/autossh-1.4d/CHANGES 2014-09-10 03:59:17.000000000 +0200 @@ -1,4 +1,11 @@ +Version 1.4d + +- call daemon() before opening any sockets. Problem discovered and + diagnosed by Frank van der Aa when trying to start autossh at + system init. +- don't use malloc(n * size) idiom; use calloc() + Version 1.4c - updated option string up to OpenSSH 5.6 @@ -6,7 +13,7 @@ it is being used for infrastructure (i.e. in a system startup), has been tested, and bombing out just because the remote end is not up is not the desired behaviour. -- add patch from Thorsten Glazer for configure, fixes misplaced +- add patch from Thorsten Glaser for configure, fixes misplaced parenthesis and check for __progname. Version 1.4b diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autossh-1.4c/Makefile.in new/autossh-1.4d/Makefile.in --- old/autossh-1.4c/Makefile.in 2011-10-12 22:30:40.000000000 +0200 +++ new/autossh-1.4d/Makefile.in 2014-09-10 03:59:17.000000000 +0200 @@ -1,8 +1,8 @@ -# $Id: Makefile.in,v 1.5 2011/10/12 20:29:22 harding Exp $ +# $Id: Makefile.in,v 1.6 2014/09/10 01:59:01 harding Exp $ # # @configure_input@ -VER= 1.4c +VER= 1.4d SSH= @path_ssh@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autossh-1.4c/autossh.c new/autossh-1.4d/autossh.c --- old/autossh-1.4c/autossh.c 2011-10-12 22:30:40.000000000 +0200 +++ new/autossh-1.4d/autossh.c 2014-09-10 03:59:17.000000000 +0200 @@ -81,7 +81,7 @@ char *__progname; #endif -const char *rcsid = "$Id: autossh.c,v 1.82 2011/10/12 20:29:22 harding Exp $"; +const char *rcsid = "$Id: autossh.c,v 1.83 2014/09/10 01:59:01 harding Exp $"; #ifndef SSH_PATH # define SSH_PATH "/usr/bin/ssh" @@ -436,6 +436,19 @@ add_arg(argv[i]); } + if (runasdaemon) { + if (daemon(0, 0) == -1) { + xerrlog(LOG_ERR, "run as daemon failed: %s", + strerror(errno)); + } + /* + * If running as daemon, the user likely wants it + * to just run and not fail early (perhaps machines + * are coming up, etc.) + */ + gate_time = 0; + } + /* * Only if we're doing the network monitor thing. * Socket once opened stays open for listening for @@ -450,19 +463,6 @@ sock = NO_RD_SOCK; } - if (runasdaemon) { - if (daemon(0, 0) == -1) { - xerrlog(LOG_ERR, "run as daemon failed: %s", - strerror(errno)); - } - /* - * If running as daemon, the user likely wants it - * to just run and not fail early (perhaps machines - * are coming up, etc.) - */ - gate_time = 0; - } - if (pid_file_name) { pid_file = fopen(pid_file_name, "w"); if (!pid_file) { @@ -506,7 +506,7 @@ return; if (!newav) { - newav = malloc(START_AV_SZ * sizeof(char *)); + newav = calloc(START_AV_SZ, sizeof(char *)); if (!newav) xerrlog(LOG_ERR, "malloc: %s", strerror(errno)); } else if (newac >= newamax-1) { -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
