Ok, so we can make this work on Irix by adding

-DSETEUID_BREAKS_SETUID -DBROKEN_SETREUID -DBROKEN_SETREGID
to the CFLAGS.  Wuppi.

3 files changed, 15 insertions, 12 deletions

diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index 1987bf2ddf3..b5055e8cc68 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.112 2003/09/17 16:42:01 jschauma Exp $
+# $NetBSD: Makefile,v 1.113 2003/09/18 02:11:38 jschauma Exp $
 
 DISTNAME=		openssh-3.7.1p1
 PKGNAME=		openssh-3.7.1.1
@@ -58,16 +58,6 @@ CONFIGURE_ARGS+=	--with-tcp-wrappers=${BUILDLINK_PREFIX.tcp_wrappers}
 CONFIGURE_ARGS+=	--with-privsep-path=${OPENSSH_CHROOT}
 CONFIGURE_ARGS+=	--with-privsep-user=${OPENSSH_USER}
 
-# OpenSSH 3.7x currently does *not* work on IRIX!
-# To compile, we would need to remove the extraneous inclusion of the
-# ``inet_ntoa.h'' header in openbsd-compat/inet_ntoa.c, but even though
-# sshd will not work:  It seems the connection is closed by the daemon
-# when it tries to spawn off a child to handle the incoming connection
-#
-# If you need the latest security patches for your openssh, I'm afraid you'll
-# have to apply them by hand to the 3.6.1p2 version.
-NOT_FOR_PLATFORM=	IRIX-*-*
-
 # XXX: PAM authentication causes memory faults, and I haven't tracked down
 # XXX: why yet.  For the moment, disable PAM authentication.
 #
@@ -81,6 +71,8 @@ NOT_FOR_PLATFORM=	IRIX-*-*
 .if ${OPSYS} == "Darwin" || ${OPSYS} == "SunOS"
 .  include "../../security/skey/buildlink2.mk"
 CONFIGURE_ARGS+=	--with-skey=${BUILDLINK_PREFIX.skey}
+.elif ${OPSYS} == "IRIX"
+CFLAGS+=	-DSETEUID_BREAKS_SETUID -DBROKEN_SETREUID -DBROKEN_SETREGID
 .elif ${OPSYS} == "NetBSD"
 # XXX: NetBSD has 4 args (4: sslen) to skeychallenge instead of 3
 #CONFIGURE_ARGS+=	--with-skey=/usr
diff --git a/security/openssh/distinfo b/security/openssh/distinfo
index 0fae988c8b7..693618a0154 100644
--- a/security/openssh/distinfo
+++ b/security/openssh/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.27 2003/09/16 23:05:34 grant Exp $
+$NetBSD: distinfo,v 1.28 2003/09/18 02:11:40 jschauma Exp $
 
 SHA1 (openssh-3.7.1p1.tar.gz) = b936ca7528fb46318febe02042a0e1bccf31c127
 Size (openssh-3.7.1p1.tar.gz) = 791161 bytes
 SHA1 (patch-aa) = 6d9fda6b4258a295cef814021b06fa7b3709f59e
 SHA1 (patch-ab) = 1069fe256b7925fcf404781ef14e5c492f52c21e
 SHA1 (patch-ah) = 9913c868bde5d318915b1dee2c05dcf454a0f506
+SHA1 (patch-ai) = 3f1ec11561916388c5ed9ce36e531bce411d54a4
diff --git a/security/openssh/patches/patch-ai b/security/openssh/patches/patch-ai
new file mode 100644
index 00000000000..f7982a5b90f
--- /dev/null
+++ b/security/openssh/patches/patch-ai
@@ -0,0 +1,10 @@
+--- openbsd-compat/inet_ntoa.c.orig	Wed Sep 17 21:35:26 2003
++++ openbsd-compat/inet_ntoa.c	Wed Sep 17 21:35:37 2003
+@@ -43,7 +43,6 @@
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <stdio.h>
+-#include "inet_ntoa.h"
+ 
+ char *inet_ntoa(struct in_addr in)
+ {