Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package sshpass for openSUSE:Factory checked in at 2021-03-30 21:00:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sshpass (Old) and /work/SRC/openSUSE:Factory/.sshpass.new.2401 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sshpass" Tue Mar 30 21:00:15 2021 rev:4 rq:869793 version:1.09 Changes: -------- --- /work/SRC/openSUSE:Factory/sshpass/sshpass.changes 2016-12-08 00:31:22.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.sshpass.new.2401/sshpass.changes 2021-03-30 21:00:19.032712461 +0200 @@ -1,0 +2,13 @@ +Wed Feb 3 18:53:08 UTC 2021 - Dirk M??ller <[email protected]> + +- update to 1.0.9: + * Explicitly set the controlling TTY (SF patch #7) + * Report when IP key has changed (Closes Debian bug #730101) + * Scrub the environment variable for -e (Closes Ubuntu bug #1649374) + * Pass signals that should terminate to ssh + * Fix race around signal handling + * Report IPC errors to stderr + * Report if can't open -f password file (closes #3) +- remove sshpass-1.05-f_option_check.patch (upstream) + +------------------------------------------------------------------- Old: ---- sshpass-1.05-f_option_check.patch sshpass-1.06.tar.gz New: ---- sshpass-1.09.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sshpass.spec ++++++ --- /var/tmp/diff_new_pack.yMK79Z/_old 2021-03-30 21:00:19.892713406 +0200 +++ /var/tmp/diff_new_pack.yMK79Z/_new 2021-03-30 21:00:19.892713406 +0200 @@ -1,7 +1,7 @@ # # spec file for package sshpass # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,21 +12,18 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: sshpass -Version: 1.06 +Version: 1.09 Release: 0 Summary: Non-interactive SSH authentication utility -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/Management -Url: http://sshpass.sourceforge.net/ -Source0: http://downloads.sourceforge.net/sshpass/sshpass-%{version}.tar.gz -# PATCH-FIX-UPSTREAM -- http://sourceforge.net/p/sshpass/patches/5/ -Patch0: sshpass-1.05-f_option_check.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +URL: http://sshpass.sourceforge.net/ +Source0: https://downloads.sourceforge.net/sshpass/sshpass-%{version}.tar.gz %description Tool for non-interactively performing password authentication with so called @@ -35,7 +32,6 @@ %prep %setup -q -%patch0 -p1 %build %configure @@ -45,9 +41,9 @@ make %{?_smp_mflags} DESTDIR=%{buildroot} install %files -%defattr(-,root,root) +%license COPYING +%doc AUTHORS ChangeLog NEWS %{_bindir}/sshpass %{_mandir}/man1/sshpass.1%{ext_man} -%doc AUTHORS COPYING ChangeLog NEWS %changelog ++++++ sshpass-1.06.tar.gz -> sshpass-1.09.tar.gz ++++++ ++++ 2148 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sshpass-1.06/ChangeLog new/sshpass-1.09/ChangeLog --- old/sshpass-1.06/ChangeLog 2016-06-30 21:27:43.000000000 +0200 +++ new/sshpass-1.09/ChangeLog 2021-01-29 17:21:07.000000000 +0100 @@ -1,3 +1,16 @@ +Version 1.09 + * Explicitly set the controlling TTY (SF patch #7) + +Version 1.08 + * Report when IP key has changed (Closes Debian bug #730101) + * Scrub the environment variable for -e (Closes Ubuntu bug #1649374) + +Version 1.07 + * Pass signals that should terminate to ssh + * Fix race around signal handling + * Report IPC errors to stderr + * Report if can't open -f password file (closes #3) + Version 1.06 * Add -P for overriding the password prompt we search for * Add -v for verbose logging of the prompt detection prompt. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sshpass-1.06/INSTALL new/sshpass-1.09/INSTALL --- old/sshpass-1.06/INSTALL 2015-04-26 05:52:02.000000000 +0200 +++ new/sshpass-1.09/INSTALL 2020-02-07 08:55:40.000000000 +0100 @@ -1,8 +1,8 @@ Installation Instructions ************************* -Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, -Inc. + Copyright (C) 1994-1996, 1999-2002, 2004-2016 Free Software +Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright @@ -12,97 +12,96 @@ Basic Installation ================== - Briefly, the shell command `./configure && make && make install' + Briefly, the shell command './configure && make && make install' should configure, build, and install this package. The following -more-detailed instructions are generic; see the `README' file for +more-detailed instructions are generic; see the 'README' file for instructions specific to this package. Some packages provide this -`INSTALL' file but do not implement all of the features documented +'INSTALL' file but do not implement all of the features documented below. The lack of an optional feature in a given package is not necessarily a bug. More recommendations for GNU packages can be found in *note Makefile Conventions: (standards)Makefile Conventions. - The `configure' shell script attempts to guess correct values for + The 'configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that +those values to create a 'Makefile' in each directory of the package. +It may also create one or more '.h' files containing system-dependent +definitions. Finally, it creates a shell script 'config.status' that you can run in the future to recreate the current configuration, and a -file `config.log' containing compiler output (useful mainly for -debugging `configure'). +file 'config.log' containing compiler output (useful mainly for +debugging 'configure'). - It can also use an optional file (typically called `config.cache' -and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. Caching is -disabled by default to prevent problems with accidental use of stale -cache files. + It can also use an optional file (typically called 'config.cache' and +enabled with '--cache-file=config.cache' or simply '-C') that saves the +results of its tests to speed up reconfiguring. Caching is disabled by +default to prevent problems with accidental use of stale cache files. If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can +to figure out how 'configure' could check whether to do them, and mail +diffs or instructions to the address given in the 'README' so they can be considered for the next release. If you are using the cache, and at -some point `config.cache' contains results you don't want to keep, you +some point 'config.cache' contains results you don't want to keep, you may remove or edit it. - The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You need `configure.ac' if -you want to change it or regenerate `configure' using a newer version -of `autoconf'. + The file 'configure.ac' (or 'configure.in') is used to create +'configure' by a program called 'autoconf'. You need 'configure.ac' if +you want to change it or regenerate 'configure' using a newer version of +'autoconf'. The simplest way to compile this package is: - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. + 1. 'cd' to the directory containing the package's source code and type + './configure' to configure the package for your system. - Running `configure' might take a while. While running, it prints + Running 'configure' might take a while. While running, it prints some messages telling which features it is checking for. - 2. Type `make' to compile the package. + 2. Type 'make' to compile the package. - 3. Optionally, type `make check' to run any self-tests that come with + 3. Optionally, type 'make check' to run any self-tests that come with the package, generally using the just-built uninstalled binaries. - 4. Type `make install' to install the programs and any data files and + 4. Type 'make install' to install the programs and any data files and documentation. When installing into a prefix owned by root, it is recommended that the package be configured and built as a regular - user, and only the `make install' phase executed with root + user, and only the 'make install' phase executed with root privileges. - 5. Optionally, type `make installcheck' to repeat any self-tests, but + 5. Optionally, type 'make installcheck' to repeat any self-tests, but this time using the binaries in their final installed location. This target does not install anything. Running this target as a - regular user, particularly if the prior `make install' required + regular user, particularly if the prior 'make install' required root privileges, verifies that the installation completed correctly. 6. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly + source code directory by typing 'make clean'. To also remove the + files that 'configure' created (so you can compile the package for + a different kind of computer), type 'make distclean'. There is + also a 'make maintainer-clean' target, but that is intended mainly for the package's developers. If you use it, you may have to get all sorts of other programs in order to regenerate files that came with the distribution. - 7. Often, you can also type `make uninstall' to remove the installed + 7. Often, you can also type 'make uninstall' to remove the installed files again. In practice, not all packages have tested that uninstallation works correctly, even though it is required by the GNU Coding Standards. - 8. Some packages, particularly those that use Automake, provide `make + 8. Some packages, particularly those that use Automake, provide 'make distcheck', which can by used by developers to test that all other - targets like `make install' and `make uninstall' work correctly. + targets like 'make install' and 'make uninstall' work correctly. This target is generally not run by end users. Compilers and Options ===================== Some systems require unusual options for compilation or linking that -the `configure' script does not know about. Run `./configure --help' +the 'configure' script does not know about. Run './configure --help' for details on some of the pertinent environment variables. - You can give `configure' initial values for configuration parameters -by setting variables in the command line or in the environment. Here -is an example: + You can give 'configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here is +an example: ./configure CC=c99 CFLAGS=-g LIBS=-lposix @@ -113,21 +112,21 @@ You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their -own directory. To do this, you can use GNU `make'. `cd' to the +own directory. To do this, you can use GNU 'make'. 'cd' to the directory where you want the object files and executables to go and run -the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. This -is known as a "VPATH" build. +the 'configure' script. 'configure' automatically checks for the source +code in the directory that 'configure' is in and in '..'. This is known +as a "VPATH" build. - With a non-GNU `make', it is safer to compile the package for one + With a non-GNU 'make', it is safer to compile the package for one architecture at a time in the source code directory. After you have -installed the package for one architecture, use `make distclean' before +installed the package for one architecture, use 'make distclean' before reconfiguring for another architecture. On MacOS X 10.5 and later systems, you can create libraries and executables that work on multiple system types--known as "fat" or -"universal" binaries--by specifying multiple `-arch' options to the -compiler but only a single `-arch' option to the preprocessor. Like +"universal" binaries--by specifying multiple '-arch' options to the +compiler but only a single '-arch' option to the preprocessor. Like this: ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ @@ -136,105 +135,104 @@ This is not guaranteed to produce working output in all cases, you may have to build one architecture at a time and combine the results -using the `lipo' tool if you have problems. +using the 'lipo' tool if you have problems. Installation Names ================== - By default, `make install' installs the package's commands under -`/usr/local/bin', include files under `/usr/local/include', etc. You -can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX', where PREFIX must be an + By default, 'make install' installs the package's commands under +'/usr/local/bin', include files under '/usr/local/include', etc. You +can specify an installation prefix other than '/usr/local' by giving +'configure' the option '--prefix=PREFIX', where PREFIX must be an absolute file name. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you -pass the option `--exec-prefix=PREFIX' to `configure', the package uses +pass the option '--exec-prefix=PREFIX' to 'configure', the package uses PREFIX as the prefix for installing programs and libraries. Documentation and other data files still use the regular prefix. In addition, if you use an unusual directory layout you can give -options like `--bindir=DIR' to specify different values for particular -kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. In general, the -default for these options is expressed in terms of `${prefix}', so that -specifying just `--prefix' will affect all of the other directory +options like '--bindir=DIR' to specify different values for particular +kinds of files. Run 'configure --help' for a list of the directories +you can set and what kinds of files go in them. In general, the default +for these options is expressed in terms of '${prefix}', so that +specifying just '--prefix' will affect all of the other directory specifications that were not explicitly provided. The most portable way to affect installation locations is to pass the -correct locations to `configure'; however, many packages provide one or +correct locations to 'configure'; however, many packages provide one or both of the following shortcuts of passing variable assignments to the -`make install' command line to change installation locations without +'make install' command line to change installation locations without having to reconfigure or recompile. The first method involves providing an override variable for each -affected directory. For example, `make install +affected directory. For example, 'make install prefix=/alternate/directory' will choose an alternate location for all directory configuration variables that were expressed in terms of -`${prefix}'. Any directories that were specified during `configure', -but not in terms of `${prefix}', must each be overridden at install -time for the entire installation to be relocated. The approach of -makefile variable overrides for each directory variable is required by -the GNU Coding Standards, and ideally causes no recompilation. -However, some platforms have known limitations with the semantics of -shared libraries that end up requiring recompilation when using this -method, particularly noticeable in packages that use GNU Libtool. - - The second method involves providing the `DESTDIR' variable. For -example, `make install DESTDIR=/alternate/directory' will prepend -`/alternate/directory' before all installation names. The approach of -`DESTDIR' overrides is not required by the GNU Coding Standards, and +'${prefix}'. Any directories that were specified during 'configure', +but not in terms of '${prefix}', must each be overridden at install time +for the entire installation to be relocated. The approach of makefile +variable overrides for each directory variable is required by the GNU +Coding Standards, and ideally causes no recompilation. However, some +platforms have known limitations with the semantics of shared libraries +that end up requiring recompilation when using this method, particularly +noticeable in packages that use GNU Libtool. + + The second method involves providing the 'DESTDIR' variable. For +example, 'make install DESTDIR=/alternate/directory' will prepend +'/alternate/directory' before all installation names. The approach of +'DESTDIR' overrides is not required by the GNU Coding Standards, and does not work on platforms that have drive letters. On the other hand, it does better at avoiding recompilation issues, and works well even -when some directory options were not specified in terms of `${prefix}' -at `configure' time. +when some directory options were not specified in terms of '${prefix}' +at 'configure' time. Optional Features ================= If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. +with an extra prefix or suffix on their names by giving 'configure' the +option '--program-prefix=PREFIX' or '--program-suffix=SUFFIX'. - Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the + Some packages pay attention to '--enable-FEATURE' options to +'configure', where FEATURE indicates an optional part of the package. +They may also pay attention to '--with-PACKAGE' options, where PACKAGE +is something like 'gnu-as' or 'x' (for the X Window System). The +'README' should mention any '--enable-' and '--with-' options that the package recognizes. - For packages that use the X Window System, `configure' can usually + For packages that use the X Window System, 'configure' can usually find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. +you can use the 'configure' options '--x-includes=DIR' and +'--x-libraries=DIR' to specify their locations. Some packages offer the ability to configure how verbose the -execution of `make' will be. For these packages, running `./configure +execution of 'make' will be. For these packages, running './configure --enable-silent-rules' sets the default to minimal output, which can be -overridden with `make V=1'; while running `./configure +overridden with 'make V=1'; while running './configure --disable-silent-rules' sets the default to verbose, which can be -overridden with `make V=0'. +overridden with 'make V=0'. Particular systems ================== - On HP-UX, the default C compiler is not ANSI C compatible. If GNU -CC is not installed, it is recommended to use the following options in + On HP-UX, the default C compiler is not ANSI C compatible. If GNU CC +is not installed, it is recommended to use the following options in order to use an ANSI C compiler: ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" and if that doesn't work, install pre-built binaries of GCC for HP-UX. - HP-UX `make' updates targets which have the same time stamps as -their prerequisites, which makes it generally unusable when shipped -generated files such as `configure' are involved. Use GNU `make' -instead. + HP-UX 'make' updates targets which have the same time stamps as their +prerequisites, which makes it generally unusable when shipped generated +files such as 'configure' are involved. Use GNU 'make' instead. On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot -parse its `<wchar.h>' header file. The option `-nodtk' can be used as -a workaround. If GNU CC is not installed, it is therefore recommended -to try +parse its '<wchar.h>' header file. The option '-nodtk' can be used as a +workaround. If GNU CC is not installed, it is therefore recommended to +try ./configure CC="cc" @@ -242,26 +240,26 @@ ./configure CC="cc -nodtk" - On Solaris, don't put `/usr/ucb' early in your `PATH'. This + On Solaris, don't put '/usr/ucb' early in your 'PATH'. This directory contains several dysfunctional programs; working variants of -these programs are available in `/usr/bin'. So, if you need `/usr/ucb' -in your `PATH', put it _after_ `/usr/bin'. +these programs are available in '/usr/bin'. So, if you need '/usr/ucb' +in your 'PATH', put it _after_ '/usr/bin'. - On Haiku, software installed for all users goes in `/boot/common', -not `/usr/local'. It is recommended to use the following options: + On Haiku, software installed for all users goes in '/boot/common', +not '/usr/local'. It is recommended to use the following options: ./configure --prefix=/boot/common Specifying the System Type ========================== - There may be some features `configure' cannot figure out + There may be some features 'configure' cannot figure out automatically, but needs to determine by the type of machine the package will run on. Usually, assuming the package is built to be run on the -_same_ architectures, `configure' can figure that out, but if it prints +_same_ architectures, 'configure' can figure that out, but if it prints a message saying it cannot guess the machine type, give it the -`--build=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name which has the form: +'--build=TYPE' option. TYPE can either be a short name for the system +type, such as 'sun4', or a canonical name which has the form: CPU-COMPANY-SYSTEM @@ -270,101 +268,101 @@ OS KERNEL-OS - See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't + See the file 'config.sub' for the possible values of each field. If +'config.sub' isn't included in this package, then this package doesn't need to know the machine type. If you are _building_ compiler tools for cross-compiling, you should -use the option `--target=TYPE' to select the type of system they will +use the option '--target=TYPE' to select the type of system they will produce code for. If you want to _use_ a cross compiler, that generates code for a platform different from the build platform, you should specify the "host" platform (i.e., that on which the generated programs will -eventually be run) with `--host=TYPE'. +eventually be run) with '--host=TYPE'. Sharing Defaults ================ - If you want to set default values for `configure' scripts to share, -you can create a site shell script called `config.site' that gives -default values for variables like `CC', `cache_file', and `prefix'. -`configure' looks for `PREFIX/share/config.site' if it exists, then -`PREFIX/etc/config.site' if it exists. Or, you can set the -`CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. + If you want to set default values for 'configure' scripts to share, +you can create a site shell script called 'config.site' that gives +default values for variables like 'CC', 'cache_file', and 'prefix'. +'configure' looks for 'PREFIX/share/config.site' if it exists, then +'PREFIX/etc/config.site' if it exists. Or, you can set the +'CONFIG_SITE' environment variable to the location of the site script. +A warning: not all 'configure' scripts look for a site script. Defining Variables ================== Variables not defined in a site shell script can be set in the -environment passed to `configure'. However, some packages may run +environment passed to 'configure'. However, some packages may run configure again during the build, and the customized values of these variables may be lost. In order to avoid this problem, you should set -them in the `configure' command line, using `VAR=value'. For example: +them in the 'configure' command line, using 'VAR=value'. For example: ./configure CC=/usr/local2/bin/gcc -causes the specified `gcc' to be used as the C compiler (unless it is +causes the specified 'gcc' to be used as the C compiler (unless it is overridden in the site shell script). -Unfortunately, this technique does not work for `CONFIG_SHELL' due to -an Autoconf limitation. Until the limitation is lifted, you can use -this workaround: +Unfortunately, this technique does not work for 'CONFIG_SHELL' due to an +Autoconf limitation. Until the limitation is lifted, you can use this +workaround: CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash -`configure' Invocation +'configure' Invocation ====================== - `configure' recognizes the following options to control how it + 'configure' recognizes the following options to control how it operates. -`--help' -`-h' - Print a summary of all of the options to `configure', and exit. +'--help' +'-h' + Print a summary of all of the options to 'configure', and exit. -`--help=short' -`--help=recursive' +'--help=short' +'--help=recursive' Print a summary of the options unique to this package's - `configure', and exit. The `short' variant lists options used - only in the top level, while the `recursive' variant lists options - also present in any nested packages. - -`--version' -`-V' - Print the version of Autoconf used to generate the `configure' + 'configure', and exit. The 'short' variant lists options used only + in the top level, while the 'recursive' variant lists options also + present in any nested packages. + +'--version' +'-V' + Print the version of Autoconf used to generate the 'configure' script, and exit. -`--cache-file=FILE' +'--cache-file=FILE' Enable the cache: use and save the results of the tests in FILE, - traditionally `config.cache'. FILE defaults to `/dev/null' to + traditionally 'config.cache'. FILE defaults to '/dev/null' to disable caching. -`--config-cache' -`-C' - Alias for `--cache-file=config.cache'. - -`--quiet' -`--silent' -`-q' +'--config-cache' +'-C' + Alias for '--cache-file=config.cache'. + +'--quiet' +'--silent' +'-q' Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to `/dev/null' (any error + suppress all normal output, redirect it to '/dev/null' (any error messages will still be shown). -`--srcdir=DIR' +'--srcdir=DIR' Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. + 'configure' can determine that directory automatically. -`--prefix=DIR' - Use DIR as the installation prefix. *note Installation Names:: - for more details, including other options available for fine-tuning - the installation locations. +'--prefix=DIR' + Use DIR as the installation prefix. *note Installation Names:: for + more details, including other options available for fine-tuning the + installation locations. -`--no-create' -`-n' +'--no-create' +'-n' Run the configure checks, but stop before creating any output files. -`configure' also accepts some other, not widely useful, options. Run -`configure --help' for more details. +'configure' also accepts some other, not widely useful, options. Run +'configure --help' for more details. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sshpass-1.06/compile new/sshpass-1.09/compile --- old/sshpass-1.06/compile 2015-04-26 05:52:02.000000000 +0200 +++ new/sshpass-1.09/compile 2020-02-07 08:55:40.000000000 +0100 @@ -3,7 +3,7 @@ scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # Written by Tom Tromey <[email protected]>. # # This program is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sshpass-1.06/configure.ac new/sshpass-1.09/configure.ac --- old/sshpass-1.06/configure.ac 2016-06-30 21:23:33.000000000 +0200 +++ new/sshpass-1.09/configure.ac 2021-01-29 17:21:12.000000000 +0100 @@ -2,9 +2,9 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.57) -AC_INIT([sshpass], [1.06]) +AC_INIT([sshpass], [1.09]) AM_INIT_AUTOMAKE -AC_COPYRIGHT([Copyright (C) 2006,2008,2011,2016 Shachar Shemesh]) +AC_COPYRIGHT([Copyright (C) 2006,2008,2011,2016,2021 Shachar Shemesh]) AC_CONFIG_SRCDIR([main.c]) AC_USE_SYSTEM_EXTENSIONS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sshpass-1.06/main.c new/sshpass-1.09/main.c --- old/sshpass-1.06/main.c 2016-06-30 21:23:33.000000000 +0200 +++ new/sshpass-1.09/main.c 2021-01-29 14:15:03.000000000 +0100 @@ -1,5 +1,6 @@ /* This file is part of "sshpass", a tool for batch running password ssh authentication - * Copyright (C) 2006, 2015 Lingnu Open Source Consulting Ltd. + * Copyright (C) 2006 Lingnu Open Source Consulting Ltd. + * Copyright (C) 2015-2016, 2021 Shachar Shemesh * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -61,32 +62,40 @@ #endif int runprogram( int argc, char *argv[] ); +void reliable_write( int fd, const void *data, size_t size ); +int handleoutput( int fd ); +void window_resize_handler(int signum); +void sigchld_handler(int signum); +void term_handler(int signum); +int match( const char *reference, const char *buffer, ssize_t bufsize, int state ); +void write_pass( int fd ); struct { enum { PWT_STDIN, PWT_FILE, PWT_FD, PWT_PASS } pwtype; union { - const char *filename; - int fd; - const char *password; + const char *filename; + int fd; + const char *password; } pwsrc; const char *pwprompt; int verbose; + char *orig_password; } args; static void show_help() { printf("Usage: " PACKAGE_NAME " [-f|-d|-p|-e] [-hV] command parameters\n" - " -f filename Take password to use from file\n" - " -d number Use number as file descriptor for getting password\n" - " -p password Provide password as argument (security unwise)\n" - " -e Password is passed as env-var \"SSHPASS\"\n" - " With no parameters - password will be taken from stdin\n\n" + " -f filename Take password to use from file\n" + " -d number Use number as file descriptor for getting password\n" + " -p password Provide password as argument (security unwise)\n" + " -e Password is passed as env-var \"SSHPASS\"\n" + " With no parameters - password will be taken from stdin\n\n" " -P prompt Which string should sshpass search for to detect a password prompt\n" " -v Be verbose about what you're doing\n" - " -h Show help (this screen)\n" - " -V Print version information\n" - "At most one of -f, -d, -p or -e should be used\n"); + " -h Show help (this screen)\n" + " -V Print version information\n" + "At most one of -f, -d, -p or -e should be used\n"); } // Parse the command line. Fill in the "args" global struct with the results. Return argv offset @@ -105,77 +114,69 @@ error=RETURN_CONFLICTING_ARGUMENTS; } while( (opt=getopt(argc, argv, "+f:d:p:P:heVv"))!=-1 && error==-1 ) { - switch( opt ) { - case 'f': - // Password should come from a file - VIRGIN_PWTYPE; - - args.pwtype=PWT_FILE; - args.pwsrc.filename=optarg; - break; - case 'd': - // Password should come from an open file descriptor - VIRGIN_PWTYPE; - - args.pwtype=PWT_FD; - args.pwsrc.fd=atoi(optarg); - break; - case 'p': - // Password is given on the command line - VIRGIN_PWTYPE; - - args.pwtype=PWT_PASS; - args.pwsrc.password=strdup(optarg); - - // Hide the original password from the command line - { - int i; + switch( opt ) { + case 'f': + // Password should come from a file + VIRGIN_PWTYPE; - for( i=0; optarg[i]!='\0'; ++i ) - optarg[i]='z'; - } - break; + args.pwtype=PWT_FILE; + args.pwsrc.filename=optarg; + break; + case 'd': + // Password should come from an open file descriptor + VIRGIN_PWTYPE; + + args.pwtype=PWT_FD; + args.pwsrc.fd=atoi(optarg); + break; + case 'p': + // Password is given on the command line + VIRGIN_PWTYPE; + + args.pwtype=PWT_PASS; + args.orig_password=optarg; + break; case 'P': args.pwprompt=optarg; break; case 'v': args.verbose++; break; - case 'e': - VIRGIN_PWTYPE; + case 'e': + VIRGIN_PWTYPE; - args.pwtype=PWT_PASS; - args.pwsrc.password=getenv("SSHPASS"); - if( args.pwsrc.password==NULL ) { - fprintf(stderr, "sshpass: -e option given but SSHPASS environment variable not set\n"); + args.pwtype=PWT_PASS; + args.orig_password=getenv("SSHPASS"); + if( args.orig_password==NULL ) { + fprintf(stderr, "SSHPASS: -e option given but SSHPASS environment variable not set\n"); error=RETURN_INVALID_ARGUMENTS; } - break; - case '?': - case ':': - error=RETURN_INVALID_ARGUMENTS; - break; - case 'h': - error=RETURN_NOERROR; - break; - case 'V': - printf("%s\n" + break; + case '?': + case ':': + error=RETURN_INVALID_ARGUMENTS; + break; + case 'h': + error=RETURN_NOERROR; + break; + case 'V': + printf("%s\n" "(C) 2006-2011 Lingnu Open Source Consulting Ltd.\n" - "(C) 2015-2016 Shachar Shemesh\n" - "This program is free software, and can be distributed under the terms of the GPL\n" - "See the COPYING file for more information.\n" + "(C) 2015-2016, 2021 Shachar Shemesh\n" + "This program is free software, and can be distributed under the terms of the GPL\n" + "See the COPYING file for more information.\n" "\n" "Using \"%s\" as the default password prompt indicator.\n", PACKAGE_STRING, PASSWORD_PROMPT ); - exit(0); - break; - } + exit(0); + break; + } } if( error>=0 ) - return -(error+1); + return -(error+1); else - return optind; + return optind; } int main( int argc, char *argv[] ) @@ -183,57 +184,65 @@ int opt_offset=parse_options( argc, argv ); if( opt_offset<0 ) { - // There was some error - show_help(); + // There was some error + show_help(); return -(opt_offset+1); // -1 becomes 0, -2 becomes 1 etc. } if( argc-opt_offset<1 ) { - show_help(); + show_help(); return 0; } + if( args.orig_password!=NULL ) { + args.pwsrc.password = strdup(args.orig_password); + + // Hide the original password from prying eyes + while( *args.orig_password != '\0' ) { + *args.orig_password = 'x'; + ++args.orig_password; + } + } + return runprogram( argc-opt_offset, argv+opt_offset ); } -int handleoutput( int fd ); - /* Global variables so that this information be shared with the signal handler */ static int ourtty; // Our own tty static int masterpt; -void window_resize_handler(int signum); -void sigchld_handler(int signum); +int childpid; +int term; int runprogram( int argc, char *argv[] ) { struct winsize ttysize; // The size of our tty // We need to interrupt a select with a SIGCHLD. In order to do so, we need a SIGCHLD handler - signal( SIGCHLD,sigchld_handler ); + signal( SIGCHLD, sigchld_handler ); // Create a pseudo terminal for our process masterpt=posix_openpt(O_RDWR); if( masterpt==-1 ) { - perror("Failed to get a pseudo terminal"); + perror("Failed to get a pseudo terminal"); - return RETURN_RUNTIME_ERROR; + return RETURN_RUNTIME_ERROR; } fcntl(masterpt, F_SETFL, O_NONBLOCK); if( grantpt( masterpt )!=0 ) { - perror("Failed to change pseudo terminal's permission"); + perror("Failed to change pseudo terminal's permission"); - return RETURN_RUNTIME_ERROR; + return RETURN_RUNTIME_ERROR; } if( unlockpt( masterpt )!=0 ) { - perror("Failed to unlock pseudo terminal"); + perror("Failed to unlock pseudo terminal"); - return RETURN_RUNTIME_ERROR; + return RETURN_RUNTIME_ERROR; } ourtty=open("/dev/tty", 0); @@ -272,70 +281,92 @@ complete, at which point we no longer need to monitor the TTY anyways. */ - int childpid=fork(); + sigset_t sigmask, sigmask_select; + + // Set the signal mask during the select + sigemptyset(&sigmask_select); + + // And during the regular run + sigemptyset(&sigmask); + sigaddset(&sigmask, SIGCHLD); + sigaddset(&sigmask, SIGHUP); + sigaddset(&sigmask, SIGTERM); + sigaddset(&sigmask, SIGINT); + sigaddset(&sigmask, SIGTSTP); + + sigprocmask( SIG_SETMASK, &sigmask, NULL ); + + signal(SIGHUP, term_handler); + signal(SIGTERM, term_handler); + signal(SIGINT, term_handler); + signal(SIGTSTP, term_handler); + + childpid=fork(); if( childpid==0 ) { - // Child + // Child + + // Re-enable all signals to child + sigprocmask( SIG_SETMASK, &sigmask_select, NULL ); - // Detach us from the current TTY - setsid(); + // Detach us from the current TTY + setsid(); // This line makes the ptty our controlling tty. We do not otherwise need it open slavept=open(name, O_RDWR ); +#ifdef TIOCSCTTY + // On some systems, an open(2) is insufficient to set the + // controlling tty (see the documentation for TIOCSCTTY in + // tty(4)). + if (ioctl(slavept, TIOCSCTTY) == -1) { + perror("sshpass: Failed to set controlling terminal in child (TIOCSCTTY)"); + exit(RETURN_RUNTIME_ERROR); + } +#endif close( slavept ); - - close( masterpt ); - char **new_argv=malloc(sizeof(char *)*(argc+1)); + close( masterpt ); - int i; + char **new_argv=malloc(sizeof(char *)*(argc+1)); - for( i=0; i<argc; ++i ) { - new_argv[i]=argv[i]; - } + int i; - new_argv[i]=NULL; + for( i=0; i<argc; ++i ) { + new_argv[i]=argv[i]; + } - execvp( new_argv[0], new_argv ); + new_argv[i]=NULL; - perror("sshpass: Failed to run command"); + execvp( new_argv[0], new_argv ); - exit(RETURN_RUNTIME_ERROR); + perror("SSHPASS: Failed to run command"); + + exit(RETURN_RUNTIME_ERROR); } else if( childpid<0 ) { - perror("sshpass: Failed to create child process"); + perror("SSHPASS: Failed to create child process"); - return RETURN_RUNTIME_ERROR; + return RETURN_RUNTIME_ERROR; } - + // We are the parent slavept=open(name, O_RDWR|O_NOCTTY ); int status=0; int terminate=0; pid_t wait_id; - sigset_t sigmask, sigmask_select; - - // Set the signal mask during the select - sigemptyset(&sigmask_select); - - // And during the regular run - sigemptyset(&sigmask); - sigaddset(&sigmask, SIGCHLD); - - sigprocmask( SIG_SETMASK, &sigmask, NULL ); do { - if( !terminate ) { - fd_set readfd; + if( !terminate ) { + fd_set readfd; - FD_ZERO(&readfd); - FD_SET(masterpt, &readfd); + FD_ZERO(&readfd); + FD_SET(masterpt, &readfd); - int selret=pselect( masterpt+1, &readfd, NULL, NULL, NULL, &sigmask_select ); + int selret=pselect( masterpt+1, &readfd, NULL, NULL, NULL, &sigmask_select ); - if( selret>0 ) { - if( FD_ISSET( masterpt, &readfd ) ) { + if( selret>0 ) { + if( FD_ISSET( masterpt, &readfd ) ) { int ret; - if( (ret=handleoutput( masterpt )) ) { - // Authentication failed or any other error + if( (ret=handleoutput( masterpt )) ) { + // Authentication failed or any other error // handleoutput returns positive error number in case of some error, and a negative value // if all that happened is that the slave end of the pt is closed. @@ -344,39 +375,37 @@ close(slavept); } - terminate=ret; + terminate=ret; if( terminate ) { close( slavept ); } - } - } - } - wait_id=waitpid( childpid, &status, WNOHANG ); - } else { - wait_id=waitpid( childpid, &status, 0 ); - } + } + } + } + wait_id=waitpid( childpid, &status, WNOHANG ); + } else { + wait_id=waitpid( childpid, &status, 0 ); + } } while( wait_id==0 || (!WIFEXITED( status ) && !WIFSIGNALED( status )) ); if( terminate>0 ) - return terminate; + return terminate; else if( WIFEXITED( status ) ) - return WEXITSTATUS(status); + return WEXITSTATUS(status); else - return 255; + return 255; } -int match( const char *reference, const char *buffer, ssize_t bufsize, int state ); -void write_pass( int fd ); - int handleoutput( int fd ) { // We are looking for the string static int prevmatch=0; // If the "password" prompt is repeated, we have the wrong password. - static int state1, state2; + static int state1, state2, state3; static int firsttime = 1; static const char *compare1=PASSWORD_PROMPT; // Asking for a password static const char compare2[]="The authenticity of host "; // Asks to authenticate host + static const char compare3[] = "differs from the key for the IP address"; // Key changes // static const char compare3[]="WARNING: REMOTE HOST IDENTIFICATION HAS CHANGED!"; // Warns about man in the middle attack // The remote identification changed error is sent to stderr, not the tty, so we do not handle it. // This is not a problem, as ssh exists immediately in such a case @@ -389,31 +418,31 @@ if( args.verbose && firsttime ) { firsttime=0; - fprintf(stderr, "SSHPASS searching for password prompt using match \"%s\"\n", compare1); + fprintf(stderr, "SSHPASS: searching for password prompt using match \"%s\"\n", compare1); } int numread=read(fd, buffer, sizeof(buffer)-1 ); buffer[numread] = '\0'; if( args.verbose ) { - fprintf(stderr, "SSHPASS read: %s\n", buffer); + fprintf(stderr, "SSHPASS: read: %s\n", buffer); } state1=match( compare1, buffer, numread, state1 ); // Are we at a password prompt? if( compare1[state1]=='\0' ) { - if( !prevmatch ) { + if( !prevmatch ) { if( args.verbose ) - fprintf(stderr, "SSHPASS detected prompt. Sending password.\n"); - write_pass( fd ); - state1=0; - prevmatch=1; - } else { - // Wrong password - terminate with proper error code + fprintf(stderr, "SSHPASS: detected prompt. Sending password.\n"); + write_pass( fd ); + state1=0; + prevmatch=1; + } else { + // Wrong password - terminate with proper error code if( args.verbose ) - fprintf(stderr, "SSHPASS detected prompt, again. Wrong password. Terminating.\n"); - ret=RETURN_INCORRECT_PASSWORD; - } + fprintf(stderr, "SSHPASS: detected prompt, again. Wrong password. Terminating.\n"); + ret=RETURN_INCORRECT_PASSWORD; + } } if( ret==0 ) { @@ -422,8 +451,14 @@ // Are we being prompted to authenticate the host? if( compare2[state2]=='\0' ) { if( args.verbose ) - fprintf(stderr, "SSHPASS detected host authentication prompt. Exiting.\n"); + fprintf(stderr, "SSHPASS: detected host authentication prompt. Exiting.\n"); ret=RETURN_HOST_KEY_UNKNOWN; + } else { + state3 = match( compare3, buffer, numread, state3 ); + // Host key changed + if ( compare3[state3]=='\0' ) { + ret=RETURN_HOST_KEY_CHANGED; + } } } @@ -435,13 +470,13 @@ // This is a highly simplisic implementation. It's good enough for matching "Password: ", though. int i; for( i=0;reference[state]!='\0' && i<bufsize; ++i ) { - if( reference[state]==buffer[i] ) - state++; - else { - state=0; - if( reference[state]==buffer[i] ) - state++; - } + if( reference[state]==buffer[i] ) + state++; + else { + state=0; + if( reference[state]==buffer[i] ) + state++; + } } return state; @@ -453,24 +488,26 @@ { switch( args.pwtype ) { case PWT_STDIN: - write_pass_fd( STDIN_FILENO, fd ); - break; + write_pass_fd( STDIN_FILENO, fd ); + break; case PWT_FD: - write_pass_fd( args.pwsrc.fd, fd ); - break; + write_pass_fd( args.pwsrc.fd, fd ); + break; case PWT_FILE: - { - int srcfd=open( args.pwsrc.filename, O_RDONLY ); - if( srcfd!=-1 ) { - write_pass_fd( srcfd, fd ); - close( srcfd ); - } - } - break; + { + int srcfd=open( args.pwsrc.filename, O_RDONLY ); + if( srcfd!=-1 ) { + write_pass_fd( srcfd, fd ); + close( srcfd ); + } else { + fprintf(stderr, "SSHPASS: Failed to open password file \"%s\": %s\n", args.pwsrc.filename, strerror(errno)); + } + } + break; case PWT_PASS: - write( fd, args.pwsrc.password, strlen( args.pwsrc.password ) ); - write( fd, "\n", 1 ); - break; + reliable_write( fd, args.pwsrc.password, strlen( args.pwsrc.password ) ); + reliable_write( fd, "\n", 1 ); + break; } } @@ -480,19 +517,19 @@ int done=0; while( !done ) { - char buffer[40]; - int i; - int numread=read( srcfd, buffer, sizeof(buffer) ); - done=(numread<1); - for( i=0; i<numread && !done; ++i ) { - if( buffer[i]!='\n' ) - write( dstfd, buffer+i, 1 ); - else - done=1; - } + char buffer[40]; + int i; + int numread=read( srcfd, buffer, sizeof(buffer) ); + done=(numread<1); + for( i=0; i<numread && !done; ++i ) { + if( buffer[i]!='\n' ) + reliable_write( dstfd, buffer+i, 1 ); + else + done=1; + } } - write( dstfd, "\n", 1 ); + reliable_write( dstfd, "\n", 1 ); } void window_resize_handler(int signum) @@ -507,3 +544,34 @@ void sigchld_handler(int signum) { } + +void term_handler(int signum) +{ + fflush(stdout); + switch(signum) { + case SIGINT: + reliable_write(masterpt, "\x03", 1); + break; + case SIGTSTP: + reliable_write(masterpt, "\x1a", 1); + break; + default: + if( childpid>0 ) { + kill( childpid, signum ); + } + } + + term = 1; +} + +void reliable_write( int fd, const void *data, size_t size ) +{ + ssize_t result = write( fd, data, size ); + if( result!=size ) { + if( result<0 ) { + perror("SSHPASS: write failed"); + } else { + fprintf(stderr, "SSHPASS: Short write. Tried to write %lu, only wrote %ld\n", size, result); + } + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sshpass-1.06/missing new/sshpass-1.09/missing --- old/sshpass-1.06/missing 2015-04-26 05:52:02.000000000 +0200 +++ new/sshpass-1.09/missing 2020-02-07 08:55:40.000000000 +0100 @@ -3,7 +3,7 @@ scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sshpass-1.06/sshpass.1 new/sshpass-1.09/sshpass.1 --- old/sshpass-1.06/sshpass.1 2016-06-30 21:06:51.000000000 +0200 +++ new/sshpass-1.09/sshpass.1 2021-01-29 13:47:13.000000000 +0100 @@ -1,4 +1,4 @@ -.TH SSHPASS 1 "April 25, 2015" "Lingnu Open Source Consulting" "Sshpass User Manual" +.TH SSHPASS 1 "January 29, 2021" "Lingnu Open Source Consulting" "Sshpass User Manual" .\" Please adjust this date whenever revising the manpage. .SH NAME sshpass \- noninteractive ssh password provider @@ -64,7 +64,7 @@ more secure. .P In particular, people writing programs that are meant to communicate the password -programatically are encouraged to use an anonymous pipe and pass the pipe's reading +programmatically are encouraged to use an anonymous pipe and pass the pipe's reading end to sshpass using the \-d option. .SH RETURN VALUES As with any other program, sshpass returns 0 on success. In case of failure, the following @@ -87,6 +87,9 @@ .TP 6 Host public key is unknown. sshpass exits without confirming the new key. +.TP +7 +IP public key changed. sshpass exits without confirming the new key. .P In addition, ssh might be complaining about a man in the middle attack. This complaint does not go to the tty. In other words, even with sshpass, the error @@ -120,3 +123,6 @@ Any given version of sshpass is released with the belief that it is working, but experience has shown that these things do, occasionally, break. This happened with OpenSSH version 5.6. As of this writing, it is believed that sshpass is, again, working properly. +.P +It seems that HPUX has some non Posix compliant ideas how controlling TTY is detached. sshpass +may not work properly on that platform.
