fix building with newer securid 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 (file)
index 0000000..1a0017b
--- /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 c6ded543321c65586e37043e888491ec2461f06a..e2fdcec3a65c5b1d100000b0f26295688f1615bf 100644 (file)
--- 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 3fd5000026ce6272d40f2c3c5c2229cbbcb33db0..1dd7173c312fc0c85090cece66f88adff80c4370 100644 (file)
--- 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