Changes 1.5.3:

Bug fixes
- Fix leaking file descriptors in KDC
- Better socket/timeout handling in libkrb5
- General bug fixes
- Build fixes

3 files changed, 16 insertions, 27 deletions

diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index 9ca043bdd5d..5d4ddd6e879 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.100 2013/08/15 11:15:11 jperkin Exp $
+# $NetBSD: Makefile,v 1.101 2013/08/16 08:30:14 adam Exp $
 
-DISTNAME=	heimdal-1.5.2
-PKGREVISION=	8
+DISTNAME=	heimdal-1.5.3
 CATEGORIES=	security
 MASTER_SITES=	http://www.h5l.org/dist/src/
 
@@ -16,8 +15,6 @@ CONFLICTS+=	openafs-[0-9]*
 CONFLICTS+=	gss-[0-9]*
 CONFLICTS+=	kth-krb4-[0-9]*
 
-MAKE_JOBS_SAFE=		no
-
 USE_LIBTOOL=		yes
 USE_TOOLS+=		bison flex
 PKGCONFIG_OVERRIDE+=	tools/heimdal-gssapi.pc.in
@@ -42,6 +39,13 @@ CONFIGURE_ENV+=		COMPILE_ET=no	# build Heimdal's compile_et(1)
 # XXX Grand Central Dispatch is broken in 1.4
 CONFIGURE_ENV+=		ac_cv_funclib_dispatch_async_f=no
 
+.include "../../mk/bdb.buildlink3.mk"
+
+# XXX Don't detect db1 when a newer version is available; otherwise build fails
+.if ${BDB_TYPE} != "db1"
+CONFIGURE_ENV+=		ac_cv_funclib_dbopen=no
+.endif
+
 CFLAGS.Darwin+=		-DBIND_8_COMPAT
 
 # Though Solaris has a <vis.h> header, it does something very unrelated
@@ -75,12 +79,6 @@ SPECIAL_PERMS=		${PREFIX}/bin/${KRB5_PREFIX}su ${SETUID_ROOT_PERMS}
 RCD_SCRIPTS=		kadmind kcm kdc kpasswdd
 INFO_FILES=		yes
 
-# Dynamically determine the "replacement" headers for bits needed by
-# Heimdal but are missing in the base system and add them to the PLIST.
-GENERATE_PLIST+=	\
-	( cd ${WRKSRC}/lib/roken && ${BUILD_MAKE_CMD} print-xheaders |	\
-	  ${XARGS} -n 1 | ${SED} -e "s,^,include/krb5/roken/," );
-
 TEST_TARGET=		check
 
 # remove manpages conficting with OpenSSL keeping only the important ones
@@ -95,7 +93,7 @@ pre-build:
 
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
-.include "../../mk/bdb.buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/heimdal/distinfo b/security/heimdal/distinfo
index 72fce89278f..504f9056c1e 100644
--- a/security/heimdal/distinfo
+++ b/security/heimdal/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.37 2013/07/26 12:40:06 ryoon Exp $
+$NetBSD: distinfo,v 1.38 2013/08/16 08:30:14 adam Exp $
 
-SHA1 (heimdal-1.5.2.tar.gz) = dd0920a181d18236432e4b3e5eab6e468cda4b89
-RMD160 (heimdal-1.5.2.tar.gz) = 1ab2f835309a916dfbba667d3d0d38a57c312fde
-Size (heimdal-1.5.2.tar.gz) = 6798615 bytes
-SHA1 (patch-ad) = fc7820f21ae6f2aa62126ec360be6d913eef2eb7
+SHA1 (heimdal-1.5.3.tar.gz) = 23f39a099ae862dce1f5f4e5c3720861849a4bd0
+RMD160 (heimdal-1.5.3.tar.gz) = 834660b4c0fe81a3aac4ffd9d8d37d74add1fa70
+Size (heimdal-1.5.3.tar.gz) = 6798305 bytes
+SHA1 (patch-ad) = 3dad4f3dfb19deb37c6b684ddea3e931678c5c6e
 SHA1 (patch-al) = 022d5f3723bd1db7fe5e92eea5d0106851a5d424
 SHA1 (patch-cf_install-catman.sh) = 8eb8ea0c0c8b281c080c85eefc3abbc7dcbe6746
 SHA1 (patch-cf_libtool.m4) = cd229e0e934649cb04c3f39928d1fa12c2474f62
diff --git a/security/heimdal/patches/patch-ad b/security/heimdal/patches/patch-ad
index cb5f2ac1c9f..520554e2293 100644
--- a/security/heimdal/patches/patch-ad
+++ b/security/heimdal/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.12 2013/07/26 12:40:06 ryoon Exp $
+$NetBSD: patch-ad,v 1.13 2013/08/16 08:30:14 adam Exp $
 
 * GNU/kFreeBSD parts: use host of Debian GNU/kFreeBSD 7.0.
 
@@ -53,12 +53,3 @@ $NetBSD: patch-ad,v 1.12 2013/07/26 12:40:06 ryoon Exp $
  	native_pthread_support=yes
  	PTHREAD_CFLAGS=-pthread
  	PTHREAD_LIBADD=-pthread
-@@ -26547,7 +26551,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
- int
- main ()
- {
--unsigned int foo; __sync_add_and_fetch(&foo, 1);
-+unsigned int foo, bar; bar = __sync_add_and_fetch(&foo, 1);
-   ;
-   return 0;
- }