From 806a11fa626fa7703206f0e0310b24d894a0930f Mon Sep 17 00:00:00 2001
From: Jan F. Chadima <jfch2222@fedoraproject.org>
Date: Feb 15 2010 12:20:04 +0000
Subject: ImplicitDSOLinking


---

diff --git a/openssh-5.3p1-dso.patch b/openssh-5.3p1-dso.patch
new file mode 100644
index 0000000..3cf9060
--- /dev/null
+++ b/openssh-5.3p1-dso.patch
@@ -0,0 +1,12 @@
+diff -up openssh-5.3p1/contrib/Makefile.dso openssh-5.3p1/contrib/Makefile
+--- openssh-5.3p1/contrib/Makefile.dso	2010-02-15 11:51:53.000000000 +0100
++++ openssh-5.3p1/contrib/Makefile	2010-02-15 11:54:47.000000000 +0100
+@@ -9,7 +9,7 @@ gnome-ssh-askpass1: gnome-ssh-askpass1.c
+ gnome-ssh-askpass2: gnome-ssh-askpass2.c
+ 	$(CC) `pkg-config --cflags gtk+-2.0` \
+ 		gnome-ssh-askpass2.c -o gnome-ssh-askpass2 \
+-		`pkg-config --libs gtk+-2.0`
++		`pkg-config --libs gtk+-2.0` -lX11
+ 
+ clean:
+ 	rm -f *.o gnome-ssh-askpass1 gnome-ssh-askpass2 gnome-ssh-askpass
diff --git a/openssh-5.3p1-nss-keys.patch b/openssh-5.3p1-nss-keys.patch
index 1bb4376..50a6441 100644
--- a/openssh-5.3p1-nss-keys.patch
+++ b/openssh-5.3p1-nss-keys.patch
@@ -88,7 +88,7 @@ diff -up openssh-5.3p1/configure.ac.nss-keys openssh-5.3p1/configure.ac
 +		LIBNSS_MSG="yes"
 +		CPPFLAGS="$CPPFLAGS -I/usr/include/nss3 -I/usr/include/nspr4"
 +		AC_CHECK_HEADERS(pk11pub.h)
-+		LIBS="$LIBS -lnss3"
++		LIBS="$LIBS -lnss3 -lplc4"
 +		AC_CHECK_DECLS([SEC_ERROR_LOCKED_PASSWORD], [], [], [#include <secerr.h>])
 +	fi
 +	])
diff --git a/openssh.spec b/openssh.spec
index 2ed4399..6988819 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -71,7 +71,7 @@ Name: openssh
 Version: 5.3p1
 # Do not rewind release to 1 on version upgrades unless the pam_ssh_agent_auth
 # is updated as well.
-Release: 21%{?dist}%{?rescue_rel}
+Release: 22%{?dist}%{?rescue_rel}
 URL: http://www.openssh.com/portable.html
 #URL1: http://pamsshagentauth.sourceforge.net
 #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
@@ -113,6 +113,7 @@ Patch71: openssh-5.2p1-edns.patch
 Patch72: openssh-5.3p1-pka.patch
 Patch73: openssh-5.3p1-gsskex.patch
 Patch74: openssh-5.3p1-randclean.patch
+Patch75: openssh-5.3p1-dso.patch
 
 License: BSD
 Group: Applications/Internet
@@ -270,6 +271,7 @@ popd
 %patch72 -p1 -b .pka
 %patch73 -p1 -b .gsskex
 %patch74 -p1 -b .randclean
+%patch75 -p1 -b .dso
 
 autoreconf
 
@@ -527,6 +529,9 @@ fi
 %endif
 
 %changelog
+* Mon Feb 15 2010 Jan F. Chadima <jchadima@redhat.com> - 5.3p1-22
+- ImplicitDSOLinking (#564824)
+
 * Fri Jan 29 2010 Jan F. Chadima <jchadima@redhat.com> - 5.3p1-21
 - Allow to use hardware crypto if awailable (#559555)