From 5fc5e86b282d4af72be3c86df511936b9354ca32 Mon Sep 17 00:00:00 2001
From: cy <cy@FreeBSD.org>
Date: Thu, 2 Dec 2010 02:09:23 +0000
Subject: Fix security vulnerabilities CVE-2010-1324, CVE-2010-1323,
 CVE-2010-4020, CVE-2010-4021, and CVE-2010-1322.

PR:		152755
Submitted by:	wollman
Security:	CVE-2010-1324, CVE-2010-1323, CVE-2010-4020, CVE-2010-4021,
		and CVE-2010-1322.
Feature safe:	Yes
---
 security/krb5/Makefile | 4 +++-
 security/krb5/distinfo | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'security/krb5')

diff --git a/security/krb5/Makefile b/security/krb5/Makefile
index 44def665217..fdee7a5706e 100644
--- a/security/krb5/Makefile
+++ b/security/krb5/Makefile
@@ -7,12 +7,13 @@
 
 PORTNAME=		krb5
 PORTVERSION=		1.8.3
-PORTREVISION=		1
+PORTREVISION=		2
 CATEGORIES=		security
 MASTER_SITES=		http://web.mit.edu/kerberos/dist/${PORTNAME}/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/
 PATCH_SITES=		http://web.mit.edu/kerberos/advisories/
 DISTNAME=		${PORTNAME}-${PORTVERSION}-signed
 EXTRACT_SUFX=		.tar
+PATCHFILES=		2010-006-patch.txt 2010-007-patch.txt
 
 MAINTAINER=		cy@FreeBSD.org
 COMMENT=		An authentication system developed at MIT, successor to Kerberos IV
@@ -33,6 +34,7 @@ CONFIGURE_ARGS?=	--enable-shared
 CONFIGURE_ENV=		INSTALL="${INSTALL}" YACC=/usr/bin/yacc \
 			CFLAGS="${CFLAGS}"
 MAKE_ARGS=		INSTALL="${INSTALL}"
+PATCH_DIST_STRIP=	-p2
 
 OPTIONS=		KRB5_DOC "Build and install krb5 documentation" on \
 			WANT_HTML "Want HTML documentation too" on \
diff --git a/security/krb5/distinfo b/security/krb5/distinfo
index a961d0f83e9..ac40f74a26c 100644
--- a/security/krb5/distinfo
+++ b/security/krb5/distinfo
@@ -1,3 +1,6 @@
-MD5 (krb5-1.8.3-signed.tar) = 7c5f38e31ee744cb538eed2301096b93
 SHA256 (krb5-1.8.3-signed.tar) = 2c5988ddd8b409134cd0e77e9ce8f762605ce8d8fb0aa22f6500f53381567019
 SIZE (krb5-1.8.3-signed.tar) = 11642880
+SHA256 (2010-006-patch.txt) = 7d9fbfffdaa0cde0ca499ccbb2cf09a6c7253e537755bbf6da9e08715fd9a474
+SIZE (2010-006-patch.txt) = 1066
+SHA256 (2010-007-patch.txt) = ec08fca9738b5fae619154379ae0158531cb630b6f25551c14d87313c2d2a5f0
+SIZE (2010-007-patch.txt) = 7908
-- 
cgit