jonathan/openssh
1
0
Fork 0
forked from rpms/openssh
Code Pull Requests Activity

import openssh-8.0p1-17.el8_7

Browse Source
This commit is contained in:
CentOS Sources 2023-02-21 08:47:30 +00:00 committed by Stepan Oksanichenko
parent d538637397
commit 8098341697
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
SOURCES/openssh-8.0p1-ipv6-process.patch Normal file
View File

@ -0,0 +1,27 @@
diff --git a/sftp.c b/sftp.c
index 04881c83..03c7a5c7 100644
--- a/sftp.c
+++ b/sftp.c
@@ -2527,12 +2527,17 @@ main(int argc, char **argv)
port = tmp;
break;
default:
+ /* Try with user, host and path. */
if (parse_user_host_path(*argv, &user, &host,
- &file1) == -1) {
- /* Treat as a plain hostname. */
- host = xstrdup(*argv);
- host = cleanhostname(host);
- }
+ &file1) == 0)
+ break;
+ /* Try with user and host. */
+ if (parse_user_host_port(*argv, &user, &host, NULL)
+ == 0)
+ break;
+ /* Treat as a plain hostname. */
+ host = xstrdup(*argv);
+ host = cleanhostname(host);
break;
}
file2 = *(argv + 1);

8
SPECS/openssh.spec
View File

@ -66,7 +66,7 @@
# Do not forget to bump pam_ssh_agent_auth release if you rewind the main package release to 1 # Do not forget to bump pam_ssh_agent_auth release if you rewind the main package release to 1
%global openssh_ver 8.0p1 %global openssh_ver 8.0p1
%global openssh_rel 16 %global openssh_rel 17
%global pam_ssh_agent_ver 0.10.3 %global pam_ssh_agent_ver 0.10.3
%global pam_ssh_agent_rel 7 %global pam_ssh_agent_rel 7
@ -272,6 +272,8 @@ Patch984: openssh-8.0p1-crypto-policy-doc.patch
# 0fa33683223c76289470a954404047bc762be84c # 0fa33683223c76289470a954404047bc762be84c
# f8df0413f0a057b6a3d3dd7bd8bc7c5d80911d3a # f8df0413f0a057b6a3d3dd7bd8bc7c5d80911d3a
Patch985: openssh-8.7p1-minimize-sha1-use.patch Patch985: openssh-8.7p1-minimize-sha1-use.patch
# Upstream 25e3bccbaa63d27b9d5e09c123f1eb28594d2bd6
Patch987: openssh-8.0p1-ipv6-process.patch
License: BSD License: BSD
Group: Applications/Internet Group: Applications/Internet
@ -503,6 +505,7 @@ popd
%patch983 -p1 -b .sftp-realpath %patch983 -p1 -b .sftp-realpath
%patch984 -p1 -b .crypto-policy-doc %patch984 -p1 -b .crypto-policy-doc
%patch985 -p1 -b .minimize-sha1-use %patch985 -p1 -b .minimize-sha1-use
%patch987 -p1 -b .sftp_ipv6
%patch200 -p1 -b .audit %patch200 -p1 -b .audit
%patch201 -p1 -b .audit-race %patch201 -p1 -b .audit-race
@ -794,6 +797,9 @@ getent passwd sshd >/dev/null || \
%endif %endif
%changelog %changelog
* Mon Jan 23 2023 Dmitry Belyavskiy <dbelyavs@redhat.com> - 8.0p1-17
- Fix parsing of IPv6 IPs in sftp client (#2162733)
* Wed Jun 29 2022 Zoltan Fridrich <zfridric@redhat.com> - 8.0p1-16 * Wed Jun 29 2022 Zoltan Fridrich <zfridric@redhat.com> - 8.0p1-16
- Omit client side from minimize-sha1-use.patch to prevent regression (#2093897) - Omit client side from minimize-sha1-use.patch to prevent regression (#2093897)