From 467ec24eeb201e438cb5974f35d711d5efc1ac45 Mon Sep 17 00:00:00 2001 From: reed Date: Tue, 23 Aug 2005 14:07:25 +0000 Subject: Include sys/types.h. This fixes configure on DragonFly. Bump PKGREVISION. Okayed by lha@. I tested on Linux and DragonFly. I got this from Joerg Sonnenberger. On DragonFly, the configure errored like: /usr/include/openssl/md5.h:110: error: syntax error before "size_t" In file included from conftest.c:34: /usr/include/openssl/sha.h:109: error: syntax error before "size_t" This caused tests to break and it ended up building and installing libdes and des.h, md4.h, and related headers. So later libgssapi needed this libdes which was not buildlinked which broke kdelibs3 build. --- security/heimdal/Makefile | 4 ++-- security/heimdal/distinfo | 4 ++-- security/heimdal/patches/patch-ad | 36 ++++++++++++++++++++++++++++++++++-- 3 files changed, 38 insertions(+), 6 deletions(-) (limited to 'security') diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile index e5c7318f4cd..000b88e6a17 100644 --- a/security/heimdal/Makefile +++ b/security/heimdal/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.41 2005/08/04 16:50:18 tonio Exp $ +# $NetBSD: Makefile,v 1.42 2005/08/23 14:07:25 reed Exp $ DISTNAME= heimdal-0.6.5 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= security MASTER_SITES= ftp://ftp.pdc.kth.se/pub/heimdal/src/ \ ftp://ftp.sunet.se/pub/unix/admin/mirror-pdc/heimdal/src/ diff --git a/security/heimdal/distinfo b/security/heimdal/distinfo index 812ae2b40a5..6e45819b847 100644 --- a/security/heimdal/distinfo +++ b/security/heimdal/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.13 2005/08/04 16:50:18 tonio Exp $ +$NetBSD: distinfo,v 1.14 2005/08/23 14:07:25 reed Exp $ SHA1 (heimdal-0.6.5.tar.gz) = 1cb896e2f081e74bf766279535a2510c9a5cb0b3 RMD160 (heimdal-0.6.5.tar.gz) = 726f9b4c655e6380ac0ad4ea3917b938013d8e5c @@ -6,4 +6,4 @@ Size (heimdal-0.6.5.tar.gz) = 3329395 bytes SHA1 (patch-aa) = c0a736131b3fb54f9cdea57ea55e4f0f0619532b SHA1 (patch-ab) = 400a9ac3a76ac7e8b4dcc230e0bdf7fc5222fbb7 SHA1 (patch-ac) = 121961811f559822c6a4f3d7f7e4646b16908942 -SHA1 (patch-ad) = 20347c61cf79c17500ab3508424632efc3545b65 +SHA1 (patch-ad) = dd34b20754399c3554bb7bba8fc18c8195791aa5 diff --git a/security/heimdal/patches/patch-ad b/security/heimdal/patches/patch-ad index 5ba870a2b88..81b03a611a3 100644 --- a/security/heimdal/patches/patch-ad +++ b/security/heimdal/patches/patch-ad @@ -1,6 +1,6 @@ -$NetBSD: patch-ad,v 1.5 2004/12/14 19:24:29 jlam Exp $ +$NetBSD: patch-ad,v 1.6 2005/08/23 14:07:25 reed Exp $ ---- configure.orig 2004-09-13 08:27:10.000000000 -0400 +--- configure.orig 2005-06-14 14:29:16.000000000 +0000 +++ configure @@ -3176,9 +3176,6 @@ fi @@ -12,3 +12,35 @@ $NetBSD: patch-ad,v 1.5 2004/12/14 19:24:29 jlam Exp $ # Make sure we can run config.sub. $ac_config_sub sun4 >/dev/null 2>&1 || { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 +@@ -22000,6 +21997,7 @@ cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + + #undef KRB5 /* makes md4.h et al unhappy */ ++ #include + #ifdef HAVE_OPENSSL + #include + #include +@@ -22096,6 +22094,7 @@ cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + + #undef KRB5 /* makes md4.h et al unhappy */ ++ #include + #ifdef HAVE_OPENSSL + #include + #include +@@ -22192,6 +22191,7 @@ cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + + #undef KRB5 /* makes md4.h et al unhappy */ ++ #include + #ifdef HAVE_OPENSSL + #include + #include +@@ -22319,6 +22319,7 @@ cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + + #undef KRB5 /* makes md4.h et al unhappy */ ++ #include + #ifdef HAVE_OPENSSL + #include + #include -- cgit v1.2.3