Update 1.5.1 --> 1.6

Security:	MITKRB5-SA-2006-002,  MITKRB5-SA-2006-003, and
		US-CERT Technical Cyber Security Alert TA07-009B

5 files changed, 17 insertions, 38 deletions

diff --git a/security/krb5-16/Makefile b/security/krb5-16/Makefile
index c53e08d2f807..a3d14dd26016 100644
--- a/security/krb5-16/Makefile
+++ b/security/krb5-16/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=		krb5
-PORTVERSION=		1.5.1
-PORTREVISION=		1
+PORTVERSION=		1.6
 CATEGORIES=		security
 MASTER_SITES=		http://web.mit.edu/kerberos/dist/krb5/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/
 DISTNAME=		${PORTNAME}-${PORTVERSION}-signed
@@ -65,8 +64,11 @@ WRKSRC=			${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
 
 WANT_HTML?=		YES
 HTML_DOC_DIR=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/doc
-HTML_DOCS=		admin.html user-guide.html install.html
-HTML_OUTDIRS=		krb5-admin krb5-install
+HTML_DOCS=		ftp.html kdestroy.html kinit.html klist.html \
+			kpasswd.html krb425.html krb5-admin.html \
+			krb5-install.html krb5-user.html ksu.html \
+			rcp.html rlogin.html rsh.html telnet.html
+
 
 .include <bsd.port.pre.mk>
 
@@ -93,12 +95,8 @@ pre-build:
 .endif
 
 post-build:
-	@(cd ${WRKSRC}/../doc && \
-	${MAKE} ${INFO:S/$/.info/})
-.if defined(WANT_HTML) && ${WANT_HTML} == "YES"
-	@(cd ${WRKSRC}/../doc && \
-	${MAKE} ${HTML_DOCS})
-.endif
+	@cd ${WRKSRC}/../doc && \
+	${MAKE} all
 
 post-install:
 # html documentation
@@ -108,14 +106,6 @@ post-install:
 		${INSTALL_MAN} $${html} ${PREFIX}/share/doc/krb5; \
 		${ECHO_CMD} share/doc/krb5/`${BASENAME} $${html}` >> ${TMPPLIST}; \
 	done
-.for htmldir in ${HTML_OUTDIRS}
-	@${MKDIR} ${PREFIX}/share/doc/krb5/${htmldir}
-	for html in ${HTML_DOC_DIR}/${htmldir}/*; do \
-		${INSTALL_MAN} $${html} ${PREFIX}/share/doc/krb5/${htmldir}; \
-		${ECHO_CMD} share/doc/krb5/${htmldir}/`${BASENAME} $${html}` >> ${TMPPLIST}; \
-	done
-	${ECHO_CMD} @dirrm share/doc/krb5/${htmldir} >> ${TMPPLIST}
-.endfor
 .endif
 	${ECHO_CMD} @dirrm share/doc/krb5 >> ${TMPPLIST}
 # handle info files
diff --git a/security/krb5-16/distinfo b/security/krb5-16/distinfo
index 7f4fba77bb52..2cbc77bafea1 100644
--- a/security/krb5-16/distinfo
+++ b/security/krb5-16/distinfo
@@ -1,3 +1,3 @@
-MD5 (krb5-1.5.1-signed.tar) = c8618ca9d87f794b8d71d447a202e12d
-SHA256 (krb5-1.5.1-signed.tar) = af3011fee19c696fac4e7a7d85365b4351d98cbee57a9d45f6c229c72aca8fb5
-SIZE (krb5-1.5.1-signed.tar) = 10065920
+MD5 (krb5-1.6-signed.tar) = a365e39ff7d39639556c2797a0e1c3f4
+SHA256 (krb5-1.6-signed.tar) = fe3dbb53f22cde38b6bc27ed14e706d2cf4e686a0078d8ae2610283906e26ebb
+SIZE (krb5-1.6-signed.tar) = 12062720
diff --git a/security/krb5-16/files/patch-ax b/security/krb5-16/files/patch-ax
index 472c40035307..2c110174a901 100644
--- a/security/krb5-16/files/patch-ax
+++ b/security/krb5-16/files/patch-ax
@@ -1,13 +1,11 @@
---- ../doc/Makefile.orig	Thu Apr 21 16:02:59 2005
-+++ ../doc/Makefile	Sat Jul  1 06:08:13 2006
-@@ -2,8 +2,8 @@
+--- ../doc/Makefile.orig	Thu Dec 21 14:07:10 2006
++++ ../doc/Makefile	Tue Jan  9 18:29:27 2007
+@@ -2,7 +2,7 @@
  DVI=texi2dvi
  DVIPS=dvips -o "$@"
  PSPDF=ps2pdf
 -INFO=makeinfo
--HTML=makeinfo --html
 +INFO=makeinfo --no-validate --no-split
-+HTML=makeinfo --html --no-split
+ HTML=makeinfo --html --no-split
  RM=rm -f
  TAR=tar -chvf
- GZIP=gzip -9
diff --git a/security/krb5-16/files/patch-lib-krb5-os-dnsglue.c b/security/krb5-16/files/patch-lib-krb5-os-dnsglue.c
deleted file mode 100644
index 756d04289133..000000000000
--- a/security/krb5-16/files/patch-lib-krb5-os-dnsglue.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/krb5/os/dnsglue.c.orig	Sat Sep 16 22:57:46 2006
-+++ lib/krb5/os/dnsglue.c	Sat Sep 16 22:58:25 2006
-@@ -100,6 +100,7 @@
- #endif
- 
- #if USE_RES_NINIT
-+    memset(&statbuf, 0, sizeof statbuf);
-     ret = res_ninit(&statbuf);
- #else
-     ret = res_init();
diff --git a/security/krb5-16/pkg-plist b/security/krb5-16/pkg-plist
index 7830a8f9dfcf..f4419c1a94a2 100644
--- a/security/krb5-16/pkg-plist
+++ b/security/krb5-16/pkg-plist
@@ -18,6 +18,7 @@ bin/telnet
 bin/uuclient
 %%KRB4%%bin/v4rcp
 include/com_err.h
+include/gssapi.h
 include/gssapi/gssapi.h
 include/gssapi/gssapi_generic.h
 include/gssapi/gssapi_krb5.h
@@ -106,5 +107,5 @@ share/gnats/mit
 @dirrm include/kerberosIV
 @dirrm include/krb5
 @dirrm share/et
-@dirrm share/gnats
+@dirrmtry share/gnats
 @dirrm share/examples/krb5