[pkgsrc/trunk]: pkgsrc/security/openssh Reorder inclusion of headers to fix b...

[markd <markd%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/46ee057325d3
branches:  trunk
changeset: 482874:46ee057325d3
user:      markd <markd%pkgsrc.org@localhost>
date:      Thu Nov 04 12:46:33 2004 +0000

description:
Reorder inclusion of headers to fix build on Solaris when kerberos option
is enabled.

diffstat:

 security/openssh/distinfo         |   3 ++-
 security/openssh/patches/patch-ar |  28 ++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletions(-)

diffs (46 lines):

diff -r dcda5de51537 -r 46ee057325d3 security/openssh/distinfo
--- a/security/openssh/distinfo Thu Nov 04 12:37:54 2004 +0000
+++ b/security/openssh/distinfo Thu Nov 04 12:46:33 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.35 2004/08/31 11:27:11 wiz Exp $
+$NetBSD: distinfo,v 1.36 2004/11/04 12:46:33 markd Exp $
 
 SHA1 (openssh-3.9p1.tar.gz) = 80b19d83a9d4717f5c38b2d950501e1471f60afc
 Size (openssh-3.9p1.tar.gz) = 854027 bytes
@@ -19,3 +19,4 @@
 SHA1 (patch-ao) = 00750c5f80bced34c54558cbd5ad3b96384e0d00
 SHA1 (patch-ap) = ba0a85060632dfa3939b7316f0acecfa3100082d
 SHA1 (patch-aq) = ee466164b653f521445884e119627f4927fabbe0
+SHA1 (patch-ar) = 1c551d1459cd690a2d5c5383a2b1726707df9134
diff -r dcda5de51537 -r 46ee057325d3 security/openssh/patches/patch-ar
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/openssh/patches/patch-ar Thu Nov 04 12:46:33 2004 +0000
@@ -0,0 +1,28 @@
+$NetBSD: patch-ar,v 1.3 2004/11/04 12:46:33 markd Exp $
+
+--- includes.h.orig    2004-08-15 02:01:48.000000000 +1200
++++ includes.h
+@@ -176,11 +176,6 @@ static /**/const char *const rcsid[] = {
+ # include <libutil.h> /* Openpty on FreeBSD at least */
+ #endif
+ 
+-#if defined(KRB5) && defined(USE_AFS)
+-# include <krb5.h>
+-# include <kafs.h>
+-#endif
+-
+ /*
+  * On HP-UX 11.11, shadow.h and prot.h provide conflicting declarations
+  * of getspnam when _INCLUDE__STDC__ is defined, so we unset it here.
+@@ -195,6 +190,11 @@ static /**/const char *const rcsid[] = {
+ 
+ #include "defines.h"
+ 
++#if defined(KRB5) && defined(USE_AFS)
++# include <krb5.h>
++# include <kafs.h>
++#endif
++
+ #include "version.h"
+ #include "openbsd-compat/openbsd-compat.h"
+ #include "openbsd-compat/bsd-nextstep.h"