From d2e8f0ad026888b5a1482cd35a46764e34f4161c Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 6 Sep 2005 01:39:23 +0000 Subject: [PATCH] fix building with newer securid patch --- .../files/openssh-securid-1.3.1-updates.patch | 21 +++++++++++++++++++ net-misc/openssh/openssh-4.0_p1-r2.ebuild | 4 ++-- net-misc/openssh/openssh-4.1_p1-r1.ebuild | 4 ++-- 3 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 net-misc/openssh/files/openssh-securid-1.3.1-updates.patch diff --git a/net-misc/openssh/files/openssh-securid-1.3.1-updates.patch b/net-misc/openssh/files/openssh-securid-1.3.1-updates.patch new file mode 100644 index 000000000000..1a0017b1d9f8 --- /dev/null +++ b/net-misc/openssh/files/openssh-securid-1.3.1-updates.patch @@ -0,0 +1,21 @@ +Running configure with --without-securid causes failure because the +securid_usersfile_find func isnt properly protected. Fix sent upstream. + +--- auth-securid.c ++++ auth-securid.c +@@ -65,6 +65,7 @@ + */ + #define INBUFFLEN 256 + ++#ifdef SECURID + int + securid_usersfile_find(const char *pw_name) + { +@@ -104,6 +105,7 @@ + pw_name, options.securid_usersfile); + return 0; + } ++#endif + int + auth_securid(Authctxt *authctxt, const char *password) + { diff --git a/net-misc/openssh/openssh-4.0_p1-r2.ebuild b/net-misc/openssh/openssh-4.0_p1-r2.ebuild index c6ded543321c..e2fdcec3a65c 100644 --- a/net-misc/openssh/openssh-4.0_p1-r2.ebuild +++ b/net-misc/openssh/openssh-4.0_p1-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.0_p1-r2.ebuild,v 1.5 2005/09/05 22:09:36 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.0_p1-r2.ebuild,v 1.6 2005/09/06 01:39:23 vapier Exp $ inherit eutils flag-o-matic ccc pam @@ -60,7 +60,7 @@ src_unpack() { use selinux && epatch ${FILESDIR}/${SELINUX_PATCH}.bz2 use smartcard && epatch ${FILESDIR}/openssh-3.9_p1-opensc.patch.bz2 if ! use X509 ; then - use smartcard && epatch ${DISTDIR}/${SECURID_PATCH} + use smartcard && epatch ${DISTDIR}/${SECURID_PATCH} ${FILESDIR}/openssh-securid-1.3.1-updates.patch use smartcard && use ldap && epatch ${FILESDIR}/openssh-4.0_p1-smartcard-ldap-happy.patch if use sftplogging ; then ewarn "Sorry, sftplogging and ldap don't get along" diff --git a/net-misc/openssh/openssh-4.1_p1-r1.ebuild b/net-misc/openssh/openssh-4.1_p1-r1.ebuild index 3fd5000026ce..1dd7173c312f 100644 --- a/net-misc/openssh/openssh-4.1_p1-r1.ebuild +++ b/net-misc/openssh/openssh-4.1_p1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.1_p1-r1.ebuild,v 1.6 2005/09/05 22:09:36 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-4.1_p1-r1.ebuild,v 1.7 2005/09/06 01:39:23 vapier Exp $ inherit eutils flag-o-matic ccc pam @@ -60,7 +60,7 @@ src_unpack() { use smartcard && epatch ${FILESDIR}/openssh-3.9_p1-opensc.patch.bz2 if ! use X509 ; then if [[ -n ${SECURID_PATCH} ]] && use smartcard ; then - epatch ${DISTDIR}/${SECURID_PATCH} + epatch ${DISTDIR}/${SECURID_PATCH} ${FILESDIR}/openssh-securid-1.3.1-updates.patch use ldap && epatch ${FILESDIR}/openssh-4.0_p1-smartcard-ldap-happy.patch fi if use sftplogging ; then -- 2.26.2