diff options
author | itojun <itojun@pkgsrc.org> | 2000-01-27 19:33:33 +0000 |
---|---|---|
committer | itojun <itojun@pkgsrc.org> | 2000-01-27 19:33:33 +0000 |
commit | 8e32020ae31259b4f77bb21476eeb566f1c184f0 (patch) | |
tree | 80ec01d393eb7e8acd1e8b42c5d655ddeb883017 | |
parent | c7973519f7f589ae278dd350121bc95ac8980f52 (diff) | |
download | pkgsrc-8e32020ae31259b4f77bb21476eeb566f1c184f0.tar.gz |
fix compilation on IPv6-ready environment.
the reason of failure: openssh configure.in tries to include specwise
incorrect header (netinet/in6.h), and checks for function availablility
with too high warning level.
-rw-r--r-- | security/openssh/files/patch-sum | 4 | ||||
-rw-r--r-- | security/openssh/patches/patch-aa | 27 |
2 files changed, 19 insertions, 12 deletions
diff --git a/security/openssh/files/patch-sum b/security/openssh/files/patch-sum index c213f76cc29..3346c4dff74 100644 --- a/security/openssh/files/patch-sum +++ b/security/openssh/files/patch-sum @@ -1,6 +1,6 @@ -$NetBSD: patch-sum,v 1.3 2000/01/27 17:12:03 hubertf Exp $ +$NetBSD: patch-sum,v 1.4 2000/01/27 19:33:33 itojun Exp $ -MD5 (patch-aa) = 0895daea0973a07833d5eadbfc902afd +MD5 (patch-aa) = 47133500cc4566c3cff2fae7b797b437 MD5 (patch-ab) = b1be98743ffb76d3e0401dda3a420f25 MD5 (patch-ad) = affe7f6d4df103015cb788cac15d2670 MD5 (patch-ag) = 037888228d97283b54d1232daf3945a2 diff --git a/security/openssh/patches/patch-aa b/security/openssh/patches/patch-aa index 334ea963ca8..e3cda9b30f1 100644 --- a/security/openssh/patches/patch-aa +++ b/security/openssh/patches/patch-aa @@ -1,7 +1,6 @@ -$NetBSD: patch-aa,v 1.3 2000/01/27 17:12:03 hubertf Exp $ - ---- configure.orig Thu Jan 27 04:17:06 2000 -+++ configure Thu Jan 27 17:02:44 2000 +$NetBSD: patch-aa,v 1.4 2000/01/27 19:33:34 itojun Exp $ +--- configure.orig Wed Jan 26 19:17:06 2000 ++++ configure Thu Jan 27 11:26:51 2000 @@ -1271,7 +1271,7 @@ if test "$ssldir" != "/usr"; then @@ -11,26 +10,34 @@ $NetBSD: patch-aa,v 1.3 2000/01/27 17:12:03 hubertf Exp $ fi echo "$ac_t""$ssldir" 1>&6 -@@ -2321,7 +2321,9 @@ +@@ -2293,9 +2293,11 @@ + + #include <sys/types.h> + #include <sys/socket.h> ++ #include <string.h> + + int main() { + struct sockaddr_storage s; ++memset(&s, 0, sizeof(s)); + ; return 0; } + EOF + if { (eval echo configure:2302: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +@@ -2321,6 +2323,7 @@ cat > conftest.$ac_ext <<EOF #line 2323 "configure" #include "confdefs.h" +#include <sys/types.h> #include <netinet/in.h> -+#include <netinet/in6.h> int main() { struct sockaddr_in6 s; s.sin6_family = 0; - ; return 0; } -@@ -2349,7 +2351,9 @@ +@@ -2349,6 +2352,7 @@ cat > conftest.$ac_ext <<EOF #line 2351 "configure" #include "confdefs.h" +#include <sys/types.h> #include <netinet/in.h> -+#include <netinet/in6.h> int main() { struct in6_addr s; s.s6_addr[0] = 0; - ; return 0; } @@ -2545,7 +2549,7 @@ if test "$cross_compiling" = yes; then { echo "configure: error: Cannot check for file existence when cross compiling" 1>&2; exit 1; } |