472 Commits

Author SHA1 Message Date
Damien Miller
af956575eb update versions 2025-10-06 12:51:13 +11:00
Damien Miller
2fd0945913 sync ssh-copy-id to upstream version 527be673f4d 2025-10-06 12:48:16 +11:00
Jan Tojnar
e6805e2a6b Add gnome-ssh-askpass4 for GNOME 40+
GTK 3 has been in maintenance mode for a while now, and it is on the road
to being abandoned. As a result, the dialogue looks out of place on modern
systems.

We could port it to GTK 4 but without the program being registered as an
application (i.e. having a .desktop file), GNOME Shell would ask for
permission to grab input every time.

Let’s instead use the GNOME Shell’s native prompt through the unstable
Gcr API.
2025-07-14 15:29:15 -07:00
Damien Miller
1e8347e354 add sshd-auth to RPM spec files 2025-06-17 09:48:47 +10:00
djm@openbsd.org
7cc8e150d5 upstream: remove DSA from the regression/unit test suite too.
OpenBSD-Regress-ID: 4424d2eaf0bce3887318ef6d18de6c06f3617d6e
2025-05-07 15:58:53 +10:00
djm@openbsd.org
a32d28d792 upstream: finally remove DSA signature support from OpenSSH.
feedback/ok tb@, ok deraadt@

OpenBSD-Commit-ID: bfe6ee73c1b676c81a2901030c791f8ec888228f
2025-05-07 14:20:14 +10:00
Damien Miller
8725dbc5b5 update version numbers 2025-04-09 17:02:17 +10:00
Damien Miller
0cbeedba81 openssh-9.9p2 2025-02-18 19:12:14 +11:00
Fabio Pedretti
6b9cd09556 Remove ancient RHL 6.x config in RPM spec.
It looks like build6x options were intended for RHL 6.x
(the Red Hat distro predating Fedora, not RHEL), but were
then applied to RHEL.

Completely remove support for this ancient configuration.

Successfully built, installed and run on RHEL 6. This also
remove a build warning about deprecation of PreReq.
2024-12-07 01:15:48 +11:00
Darren Tucker
9a2f4c7508 Change text from "login to" to "log in to".
From ThinLinc-Zeijlon via GHPR#532.
2024-12-06 17:56:17 +11:00
Damien Miller
46d1fb16b2 update version numbers 2024-09-20 08:20:13 +10:00
Wu Weixin
49f325fd47 Fix without_openssl always being set to 1
In Fedora systems, %{?rhel} is empty. In RHEL systems, %{?fedora} is
empty. Therefore, the original code always sets without_openssl to 1.
2024-09-13 14:09:19 +10:00
Philip Hands
1c3a714526 make sure that usage & man page match
SSH-Copy-ID-Upstream: da5b1abe55b72a16e0430e7598e1573da01779c0
2024-08-17 11:19:40 +10:00
Philip Hands
cd0d681645 update copyright notices
Bump the year to 2024, but also reflect the fact that hands.com Ltd. has
been wound up in the UK, and its assets (including this copyright) have
now reverted to its owner, Philip Hands.

SSH-Copy-ID-Upstream: 0e4c4d072747a6568b11a790c29dd1b4ce663d7f
2024-08-17 11:19:39 +10:00
Philip Hands
7fc9ccdce1 restore optionality of -i's argument
SSH-Copy-ID-Upstream: f70e3abb510e4eeb040b47894e41828246c1b720
2024-08-17 11:19:37 +10:00
Philip Hands
c37aa7012b avoid exploring .ssh/id*.pub subdirectories
SSH-Copy-ID-Upstream: 0b9e08b7707ad16de3c8e6a0410d9f42fbd56997
2024-08-17 11:19:36 +10:00
Philip Hands
777dce9e2e ensure that we're always told the source of keys
SSH-Copy-ID-Upstream: 1bee96f4793e8ec3fab9f9361204ae58f5cc7cae
2024-08-17 11:19:33 +10:00
Philip Hands
fb94fd2339 add $HOME to ERROR if one cannot write to ~/.ssh
SSH-Copy-ID-Upstream: ebef3e9c06e0447bff06e9d84b33023cf592e0ba
2024-08-17 11:19:32 +10:00
Philip Hands
eb5aafa1ff assert that SCRATCH_DIR is a writable directory
SSH-Copy-ID-Upstream: ecb2b9d10883b9a16df56c83896c9bb47a80cde2
2024-08-17 11:19:31 +10:00
Philip Hands
abcc460a2a quote to avoid potential for word splitting
SSH-Copy-ID-Upstream: f379adbe06ac2ef1daf0f130752234c7f8b97e3c
2024-08-17 11:19:30 +10:00
Philip Hands
b3f91411fd ensure ERROR output goes to STDERR
SSH-Copy-ID-Upstream: ac394b05eead3b91feb7c2ae4129a3e9b892f1e2
2024-08-17 11:19:29 +10:00
Philip Hands
674b8f30f0 avoid extra space when no arg given to -i option
SSH-Copy-ID-Upstream: feca9e67e6e37c5653445d1c733569d7abb1770e
2024-08-17 11:19:28 +10:00
Philip Hands
0efa0e1c41 put the -i before -[pP] (matching man pages)
The man pages (ssh, sftp & ssh-copy-id) all list -i before the port
setting, so make the output match that order, which also seems more
natural with the port being next to the server.

SSH-Copy-ID-Upstream: 34d5d614172c78f9a42249466c4b81975b8883a1
2024-08-17 11:19:27 +10:00
Shreyas Mahangade
87831345e9 Minor space issue fixed
SSH-Copy-ID-Upstream: 335e44d7be78b03962a54c3a5c99a2ff45294a54
2024-08-17 11:19:26 +10:00
Shreyas Mahangade
2f3010f473 Show identity file in 'ssh' command
- Previously no identity file is shown in "ssh" command output on the line "Now try logging into the..."
- This commit makes sure whenever "ssh-copy-id" with "-i" is invoked, it also reflects in "ssh" command

SSH-Copy-ID-Upstream: 58e022ec26cb2315eb3be581d01e0ba787082428
2024-08-17 11:19:24 +10:00
Damien Miller
fa41f6592f version numbers 2024-07-01 14:33:26 +10:00
Damien Miller
24a1f3e5ad attempt at updating RPM specs for sshd-session 2024-05-17 14:50:43 +10:00
Damien Miller
282721418e crank RPM spec versions 2024-03-11 16:20:08 +11:00
Damien Miller
8241b9c052 crank versions 2023-12-19 01:59:50 +11:00
Fabio Pedretti
c2003d0dbd Update openssl-devel dependency in RPM spec.
Since openssh 9.4p1, openssl >= 1.1.1 is required, so
build with --without-openssl elsewhere.
According to https://repology.org/project/openssl/versions
openssl 1.1.1 is available on fedora >= 29 and rhel >= 8.
Successfully build tested, installed and run on rhel 6
2023-10-16 21:40:01 +11:00
Fabio Pedretti
064e09cd63 Remove reference of dropped sshd.pam.old file
The file was removed in openssh 8.8
2023-10-16 20:14:04 +11:00
Damien Miller
80a2f64b8c crank version numbers 2023-10-04 15:34:10 +11:00
Damien Miller
0fcb60bf83 update versions in RPM specs 2023-08-10 20:17:06 +10:00
Philip Hands
2709809fd6 fixup! if -s & -p specified, mention 'sftp -P' on
success

SSH-Copy-ID-Upstream: 32686e7c65b4fa2846e474d3315102dfa0f043b0
2023-05-25 18:24:58 +10:00
Darren Tucker
204e0bf051 Make ssh-copy-id(1) consistent with OpenSSH.
This makes the ssh-copy-id man page more consistent with the rest of the
OpenSSH man pages:
- new sentence, new line
- no sentences >80
- N.B. -> NB
- zap unused .Pp
- zap trailing whitespace

Report from Debian via mindrot bz#3331, diff from jmc at openbsd.org.

SSH-Copy-ID-Upstream: d8974cfb6242316460ed22a1ccc662800a50c5d3
2023-05-25 18:24:55 +10:00
Philip Hands
9de79df66d if -s & -p specified, mention 'sftp -P' on success
This was inspired by this:
 https://github.com/openssh/openssh-portable/pull/321
but I thought that it was better to not do the sed patching.

BTW the reason one can get away with using $SSH_OPTS throughout, despite
the lowercase -p in there, even if sftp is in use, is that the sftp call
is using the already-established ssh master connection, so the port was
passed to the earlier ssh.

SSH-Copy-ID-Upstream: 1c124d9bfafdbe28a00b683367ebf5750ce12eb2
2023-05-25 18:24:53 +10:00
Philip Hands
801cda54c0 drop whitespace
SSH-Copy-ID-Upstream: e604fae1cdee35c18055d35dcec530cf12ef00ad
2023-05-25 18:24:50 +10:00
Philip Hands
288482f536 make -x also apply to the target script
SSH-Copy-ID-Upstream: 3c4214704f427bd0654adf9b0fc079253db21cf4
2023-05-25 18:24:47 +10:00
Philip Hands
b79e7b88ed add -t option to specify the target path
Allow the default target path (.ssh/authorized_files) to be over-riden

This was inspired by this MR from Panagiotis Cheilaris <philaris@cs.ntua.gr>

 https://gitlab.com/phil_hands/ssh-copy-id/-/merge_requests/8

SSH-Copy-ID-Upstream: a942a0e076874adb6d8b2f0fb76d6c7918190fcd
2023-05-25 18:24:45 +10:00
Carlos Rodríguez Gili
914f4ad138 Fix test error for /bin/sh on Solaris 10 and older
On Solaris 10 and older targets /bin/sh is not POSIX-compliant.
Test -z `...` fails with error 'sh: test: argument expected'.
Using quotes around backticks fixes this and doesn't break
POSIX compatibility.

SSH-Copy-ID-Upstream: 98394072a3f985b2650c1e8eab2fef84e38cc065
2023-05-25 18:24:42 +10:00
Jakub Jelen
bd382dca31 Remove outdated comment
The commit b068122 removed the code dropping the trailing colon, but the comment stayed leaving the code confusing for future readers

SSH-Copy-ID-Upstream: 930d39f238117cd53810240ec989d0356aa1c1f6
2023-05-25 18:24:39 +10:00
Darren Tucker
bdcaf79390 Special case OpenWrt instead of Dropbear.
OpenWrt overrides the location of authorized_keys for root.  Currently we
assume that all Dropbear installations behave this way, which is not the
case.  Check for OpenWrt and root user before using that location instead
of assuming that for all Dropbear servers.  Prompted by Github PR#250.

SSH-Copy-ID-Upstream: 0e1f5d443a9967483c33945793107ae3f3e4af2d
2023-05-25 18:24:37 +10:00
Philip Hands
cf84498f67 ssh-copy-id: add -x option (for debugging)
This option causes the ssh-copy-id to run with set -x

SSH-Copy-ID-Upstream: a0ee367ea8c0a29c8b4515245e408d2d349e7844
2023-05-25 18:24:32 +10:00
Philip Hands
b4a1efdcb8 update copyright notices
SSH-Copy-ID-Upstream: c284ed33b361814ea48ff68cbd01ca525b2bf117
2023-05-25 18:24:25 +10:00
Damien Miller
1dba63eb10 crank version 2023-03-16 08:27:54 +11:00
Damien Miller
6dfb65de94 crank versions in RPM specs 2023-02-02 23:21:54 +11:00
Damien Miller
f059da2b29 crank versions in RPM spec files 2022-10-04 01:45:41 +11:00
Damien Miller
94eb6858ef update version numbers for release 2022-04-06 10:47:48 +10:00
Damien Miller
62a2d4e50b update versions in preparation for 8.9 release 2022-02-16 16:26:17 +11:00
Damien Miller
a5ab488234 remove built-in support for md5crypt()
Users of MD5-hashed password should arrange for ./configure to link
against libxcrypt or similar. Though it would be better to avoid use
of MD5 password hashing entirely, it's arguably worse than DEScrypt.

feedback and ok dtucker@
2021-10-28 16:16:13 +11:00