diff options
| -rw-r--r-- | net-misc/openssh/ChangeLog | 6 | ||||
| -rw-r--r-- | net-misc/openssh/files/openssh-4.3_p2-opensc-libs.patch | 14 | ||||
| -rw-r--r-- | net-misc/openssh/openssh-4.3_p2-r4.ebuild | 3 |
3 files changed, 21 insertions, 2 deletions
diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog index 462bab146575..b3f6ab4fa396 100644 --- a/net-misc/openssh/ChangeLog +++ b/net-misc/openssh/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/openssh # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.192 2006/09/23 02:27:41 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.193 2006/09/23 04:57:43 vapier Exp $ + + 23 Sep 2006; Mike Frysinger <vapier@gentoo.org> + +files/openssh-4.3_p2-opensc-libs.patch, openssh-4.3_p2-r4.ebuild: + Fix building with --as-needed #148538 by Mart Raudsepp. 23 Sep 2006; Mike Frysinger <vapier@gentoo.org> +files/openssh-4.3_p2-ldap-updates.patch, openssh-4.3_p2-r4.ebuild: diff --git a/net-misc/openssh/files/openssh-4.3_p2-opensc-libs.patch b/net-misc/openssh/files/openssh-4.3_p2-opensc-libs.patch new file mode 100644 index 000000000000..8eb8ff823069 --- /dev/null +++ b/net-misc/openssh/files/openssh-4.3_p2-opensc-libs.patch @@ -0,0 +1,14 @@ +http://bugs.gentoo.org/148538 +http://bugzilla.mindrot.org/show_bug.cgi?id=1234 + +--- openssh/configure ++++ openssh/configure +@@ -3086,7 +3086,7 @@ AC_ARG_WITH(opensc, + LIBOPENSC_CFLAGS=`$OPENSC_CONFIG --cflags` + LIBOPENSC_LIBS=`$OPENSC_CONFIG --libs` + CPPFLAGS="$CPPFLAGS $LIBOPENSC_CFLAGS" +- LDFLAGS="$LDFLAGS $LIBOPENSC_LIBS" ++ LIBS="$LIBS $LIBOPENSC_LIBS" + cat >>confdefs.h <<\_ACEOF + #define SMARTCARD 1 + _ACEOF diff --git a/net-misc/openssh/openssh-4.3_p2-r4.ebuild b/net-misc/openssh/openssh-4.3_p2-r4.ebuild index b10a21ceb72e..fc632bd2ede4 100644 --- a/net-misc/openssh/openssh-4.3_p2-r4.ebuild +++ b/net-misc/openssh/openssh-4.3_p2-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.3_p2-r4.ebuild,v 1.2 2006/09/23 02:27:41 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.3_p2-r4.ebuild,v 1.3 2006/09/23 04:57:43 vapier Exp $ WANT_AUTOCONF="latest" WANT_AUTOMAKE="latest" @@ -60,6 +60,7 @@ src_unpack() { epatch "${FILESDIR}"/openssh-4.3_p2-identical-simple-dos.patch #148228 epatch "${FILESDIR}"/openssh-4.3_p2-configure.patch #137921 epatch "${FILESDIR}"/openssh-4.3_p1-krb5-typos.patch #124494 + epatch "${FILESDIR}"/openssh-4.3_p2-opensc-libs.patch #148538 use X509 && epatch "${DISTDIR}"/${X509_PATCH} "${FILESDIR}"/${P}-x509-hpn-glue.patch use sftplogging && epatch "${FILESDIR}"/openssh-4.2_p1-sftplogging-1.4-gentoo.patch.bz2 use chroot && epatch "${FILESDIR}"/openssh-4.3_p1-chroot.patch |