diff --git a/openssh-5.6p1-getaddrinfo.patch b/openssh-5.6p1-getaddrinfo.patch index 6f64067..76deaef 100644 --- a/openssh-5.6p1-getaddrinfo.patch +++ b/openssh-5.6p1-getaddrinfo.patch @@ -1,7 +1,20 @@ -diff -up openssh-5.8p1/sshconnect.c.getaddrinfo openssh-5.8p1/sshconnect.c ---- openssh-5.8p1/sshconnect.c.getaddrinfo 2011-04-27 09:51:44.521384633 +0200 -+++ openssh-5.8p1/sshconnect.c 2011-04-27 09:53:21.224443308 +0200 -@@ -355,6 +355,7 @@ ssh_connect(const char *host, struct soc +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; diff --git a/openssh.spec b/openssh.spec index 640db97..e49c2a8 100644 --- a/openssh.spec +++ b/openssh.spec @@ -140,6 +140,7 @@ Patch80: openssh-5.6p1-biguid.patch #https://bugzilla.mindrot.org/show_bug.cgi?id=1842 Patch81: openssh-5.6p1-clientloop.patch #https://bugzilla.mindrot.org/show_bug.cgi?id=1894 +#https://bugzilla.redhat.com/show_bug.cgi?id=735889 Patch82:openssh-5.6p1-getaddrinfo.patch #https://bugzilla.mindrot.org/show_bug.cgi?id=1838 Patch83:openssh-5.6p1-linux-oomkiller.patch