From 9c4d06a3417d2dccb96a2ce7b114e0d17cfaf2f4 Mon Sep 17 00:00:00 2001
From: Jan F <jfch@kuscenko.localdomain6>
Date: Apr 27 2011 10:16:14 +0000
Subject: add flags AI_V4MAPPED and AI_ADDRCONFIG to getaddrinfo


---

diff --git a/openssh-5.8p1-getaddrinfo.patch b/openssh-5.8p1-getaddrinfo.patch
new file mode 100644
index 0000000..6f64067
--- /dev/null
+++ b/openssh-5.8p1-getaddrinfo.patch
@@ -0,0 +1,11 @@
+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
+ 	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,
diff --git a/openssh.spec b/openssh.spec
index e36f25e..ca0b080 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -71,7 +71,7 @@
 
 # Do not forget to bump pam_ssh_agent_auth release if you rewind the main package release to 1
 %define openssh_ver 5.8p1
-%define openssh_rel 32
+%define openssh_rel 33
 %define pam_ssh_agent_ver 0.9.2
 %define pam_ssh_agent_rel 30
 
@@ -107,6 +107,8 @@ Patch0: openssh-5.6p1-redhat.patch
 Patch100: openssh-5.8p1-fingerprint.patch
 #https://bugzilla.mindrot.org/show_bug.cgi?id=1879
 Patch200: openssh-5.8p1-exit.patch
+#https://bugzilla.mindrot.org/show_bug.cgi?id=1894
+Patch300: openssh-5.8p1-getaddrinfo.patch
 #https://bugzilla.mindrot.org/show_bug.cgi?id=1402
 Patch8: openssh-5.8p1-audit0.patch
 Patch1: openssh-5.8p1-audit1.patch
@@ -116,7 +118,7 @@ Patch4: openssh-5.8p1-audit4.patch
 Patch5: openssh-5.8p1-audit5.patch
 #https://bugzilla.mindrot.org/show_bug.cgi?id=1889
 Patch6: openssh-5.8p1-packet.patch
-#https://bugzilla.mindrot.org/show_bug.cgi?id=1890
+#https://bugzilla.mindrot.org/show_bug.cgi?id=1890 (WONTFIX) need integration to prng helper
 Patch7: openssh-5.8p1-entropy.patch
 #https://bugzilla.mindrot.org/show_bug.cgi?id=1640 (WONTFIX)
 Patch9: openssh-5.8p1-vendor.patch
@@ -331,6 +333,7 @@ The module is most useful for su and sudo service stacks.
 %patch0 -p1 -b .redhat
 %patch100 -p1 -b .fingerprint
 %patch200 -p1 -b .exit
+%patch300 -p1 -b .getaddrinfo
 %patch8 -p1 -b .audit0
 %patch1 -p1 -b .audit1
 %patch2 -p1 -b .audit2
@@ -720,6 +723,9 @@ exit 0
 %endif
 
 %changelog
+* Wed Apr 27 2011 Jan F. Chadima <jchadima@redhat.com> - 5.8p1-33 + 0.9.2-30
+- add flags AI_V4MAPPED and AI_ADDRCONFIG to getaddrinfo
+
 * Tue Apr 26 2011 Jan F. Chadima <jchadima@redhat.com> - 5.8p1-32 + 0.9.2-30
 - update scriptlets