summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorjlam <jlam>2004-12-23 04:02:39 +0000
committerjlam <jlam>2004-12-23 04:02:39 +0000
commit2d6ff8ede93a6b8d90fad88b1741ce51580a790f (patch)
treee9c2bdf8f66a245d0a6c8db5303aa82d146d9db4 /security
parent16fe99647c095726e11fc54e88f6e1583b6cfcbb (diff)
downloadpkgsrc-2d6ff8ede93a6b8d90fad88b1741ce51580a790f.tar.gz
Update security/mit-krb5 to 1.3.6.
NOTE: THIS IS A SECURITY UPDATE. Changes from version 1.3.4 include: * [2841] Fix heap buffer overflow in password history mechanism. [MITKRB5-SA-2004-004] * [2682] Fix ftpd hang caused by empty PASS command. * [2686] Fix double-free errors. [MITKRB5-SA-2004-002] * [2687] Fix denial-of-service vulnerability in ASN.1 decoder. [MITKRB5-SA-2004-003]
Diffstat (limited to 'security')
-rw-r--r--security/mit-krb5/Makefile40
-rw-r--r--security/mit-krb5/distinfo10
2 files changed, 16 insertions, 34 deletions
diff --git a/security/mit-krb5/Makefile b/security/mit-krb5/Makefile
index c92553a08c5..4e351449ddc 100644
--- a/security/mit-krb5/Makefile
+++ b/security/mit-krb5/Makefile
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.14 2004/10/03 00:18:10 tv Exp $
+# $NetBSD: Makefile,v 1.15 2004/12/23 04:02:39 jlam Exp $
-DISTNAME= krb5-1.3.4
-PKGNAME= mit-${DISTNAME}
-PKGREVISION= 3
+DISTNAME= krb5-1.3.6
+PKGNAME= mit-${DISTNAME:S/-signed$//}
CATEGORIES= security
+MASTER_SITES= http://web.mit.edu/kerberos/dist/krb5/1.3/
+DISTFILES= ${DISTNAME}-signed${EXTRACT_SUFX}
+EXTRACT_SUFX= .tar
MAINTAINER= jlam@NetBSD.org
HOMEPAGE= http://web.mit.edu/kerberos/www/
@@ -15,29 +17,6 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/src
.include "../../mk/bsd.prefs.mk"
-USE_MIT_KRB5_MASTER_SITE?= yes
-.if !empty(USE_MIT_KRB5_MASTER_SITE:M[yY][eE][sS])
-MASTER_SITES= http://web.mit.edu/kerberos/dist/krb5/1.3/
-EXTRACT_SUFX= .tar
-
-post-extract:
- cd ${WRKDIR} && ${PAX} -O -rzf ${WRKDIR}/${DISTNAME}.tar.gz
-.else
-MASTER_SITES= http://www.crypto-publish.org/dist/mit-kerberos5/ \
- http://www.mirrors.wiretapped.net/security/cryptography/apps/kerberos/krb5-mit/unix/
-EXTRACT_SUFX= .tar.gz
-.endif
-
-# Patches to fix MIT-krb5 security advisories.
-MITKRB5_SA_2004_002_PATCH= 2004-002-patch_1.3.4.txt
-MITKRB5_SA_2004_003_PATCH= 2004-003-patch_1.3.4.txt
-.for _patch_ in ${MITKRB5_SA_2004_002_PATCH} ${MITKRB5_SA_2004_003_PATCH}
-PATCHFILES+= ${_patch_}
-SITES_${_patch_}= http://web.mit.edu/kerberos/advisories/
-PATCH_DIST_STRIP.${_patch_}= -p1
-PATCH_DIST_CAT.${_patch_}= ${CAT} ${_patch_}
-.endfor
-
CONFLICTS+= heimdal-[0-9]*
CONFLICTS+= kth-krb4-[0-9]*
@@ -114,6 +93,13 @@ RCD_SCRIPTS= kadmind kdc
INSTALLATION_DIRS= bin info lib sbin
+# The MIT krb5 distribution is actually a tar file that contains the
+# real .tar.gz distfile and a PGP signature.
+#
+post-extract:
+ @extract_file="${WRKDIR}/${DISTNAME}.tar.gz"; \
+ cd ${WRKDIR} && ${EXTRACT_CMD}
+
pre-configure:
@cd ${WRKSRC}; ${FIND} . -name configure -print | \
${XARGS} -n 1 ${DIRNAME} | \
diff --git a/security/mit-krb5/distinfo b/security/mit-krb5/distinfo
index 45e3ecf2e72..9b0f3148445 100644
--- a/security/mit-krb5/distinfo
+++ b/security/mit-krb5/distinfo
@@ -1,11 +1,7 @@
-$NetBSD: distinfo,v 1.6 2004/09/07 01:47:28 jlam Exp $
+$NetBSD: distinfo,v 1.7 2004/12/23 04:02:39 jlam Exp $
-SHA1 (krb5-1.3.4.tar) = 4d6ae36055fce9d2aea5ae9349cdd81f803c6052
-Size (krb5-1.3.4.tar) = 6369280 bytes
-SHA1 (2004-002-patch_1.3.4.txt) = 20bc11080433a1025f3f0f03a88664d4c055e6f9
-Size (2004-002-patch_1.3.4.txt) = 7196 bytes
-SHA1 (2004-003-patch_1.3.4.txt) = 81c12ad33e4b5a76cd309deec23e4578773e22d5
-Size (2004-003-patch_1.3.4.txt) = 592 bytes
+SHA1 (krb5-1.3.6-signed.tar) = 5d9c7a594a0fc972d220e5bc345e8680a89e7b6d
+Size (krb5-1.3.6-signed.tar) = 6533120 bytes
SHA1 (patch-aa) = 2f4e62e7c8cdee2f58f8dd5b385faea0253c0aa5
SHA1 (patch-ab) = b9f2f54f9ecfe9eaa168bb68b695a454ac044b9d
SHA1 (patch-ac) = e1282a6f00e439d83444f5d8f81dceab863ab1d5