forked from rpms/openssh
Drop unused patch
This commit is contained in:
parent
f660e11adc
commit
b33caef080
@ -1,24 +0,0 @@
|
|||||||
diff -up openssh-5.6p1/channels.c.getaddrinfo openssh-5.6p1/channels.c
|
|
||||||
--- openssh-5.6p1/channels.c.getaddrinfo 2012-02-14 16:12:54.427852524 +0100
|
|
||||||
+++ openssh-5.6p1/channels.c 2012-02-14 16:13:22.818928690 +0100
|
|
||||||
@@ -3275,6 +3275,9 @@ x11_create_display_inet(int x11_display_
|
|
||||||
memset(&hints, 0, sizeof(hints));
|
|
||||||
hints.ai_family = IPv4or6;
|
|
||||||
hints.ai_flags = x11_use_localhost ? 0: AI_PASSIVE;
|
|
||||||
+#ifdef AI_ADDRCONFIG
|
|
||||||
+ hints.ai_flags |= AI_ADDRCONFIG;
|
|
||||||
+#endif
|
|
||||||
hints.ai_socktype = SOCK_STREAM;
|
|
||||||
snprintf(strport, sizeof strport, "%d", port);
|
|
||||||
if ((gaierr = getaddrinfo(NULL, strport, &hints, &aitop)) != 0) {
|
|
||||||
diff -up openssh-5.6p1/sshconnect.c.getaddrinfo openssh-5.6p1/sshconnect.c
|
|
||||||
--- openssh-5.6p1/sshconnect.c.getaddrinfo 2012-02-14 16:09:25.057964291 +0100
|
|
||||||
+++ openssh-5.6p1/sshconnect.c 2012-02-14 16:09:25.106047007 +0100
|
|
||||||
@@ -343,6 +343,7 @@ ssh_connect(const char *host, struct soc
|
|
||||||
memset(&hints, 0, sizeof(hints));
|
|
||||||
hints.ai_family = family;
|
|
||||||
hints.ai_socktype = SOCK_STREAM;
|
|
||||||
+ hints.ai_flags = AI_V4MAPPED | AI_ADDRCONFIG;
|
|
||||||
snprintf(strport, sizeof strport, "%u", port);
|
|
||||||
if ((gaierr = getaddrinfo(host, strport, &hints, &aitop)) != 0)
|
|
||||||
fatal("%s: Could not resolve hostname %.100s: %s", __progname,
|
|
@ -94,9 +94,6 @@ Source15: sshd-keygen.target
|
|||||||
|
|
||||||
#https://bugzilla.mindrot.org/show_bug.cgi?id=2581
|
#https://bugzilla.mindrot.org/show_bug.cgi?id=2581
|
||||||
Patch100: openssh-6.7p1-coverity.patch
|
Patch100: openssh-6.7p1-coverity.patch
|
||||||
#https://bugzilla.mindrot.org/show_bug.cgi?id=1894
|
|
||||||
#https://bugzilla.redhat.com/show_bug.cgi?id=735889
|
|
||||||
#Patch102: openssh-5.8p1-getaddrinfo.patch
|
|
||||||
|
|
||||||
#https://bugzilla.mindrot.org/show_bug.cgi?id=1402
|
#https://bugzilla.mindrot.org/show_bug.cgi?id=1402
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1171248
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1171248
|
||||||
@ -356,8 +353,6 @@ The module is most useful for su and sudo service stacks.
|
|||||||
gpgv2 --quiet --keyring %{SOURCE3} %{SOURCE1} %{SOURCE0}
|
gpgv2 --quiet --keyring %{SOURCE3} %{SOURCE1} %{SOURCE0}
|
||||||
%setup -q -a 4
|
%setup -q -a 4
|
||||||
|
|
||||||
# investigate %%patch102 -p1 -b .getaddrinfo
|
|
||||||
|
|
||||||
%if %{pam_ssh_agent}
|
%if %{pam_ssh_agent}
|
||||||
pushd pam_ssh_agent_auth-%{pam_ssh_agent_ver}
|
pushd pam_ssh_agent_auth-%{pam_ssh_agent_ver}
|
||||||
%patch300 -p2 -b .psaa-build
|
%patch300 -p2 -b .psaa-build
|
||||||
|
Loading…
Reference in New Issue
Block a user