Security update

4 files changed, 100 insertions, 1 deletions

diff --git a/app-crypt/krb5/ChangeLog b/app-crypt/krb5/ChangeLog
index 37e41815c398..b8c9f991a5cc 100644
--- a/app-crypt/krb5/ChangeLog
+++ b/app-crypt/krb5/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/krb5
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/krb5/ChangeLog,v 1.5 2002/08/02 20:46:47 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/krb5/ChangeLog,v 1.6 2002/10/28 14:01:18 aliz Exp $
+
+*krb5-1.2.6 (28 Oct 2002)
+
+  28 Oct 2002; Daniel Ahlberg <aliz@gentoo.org> :
+  Security update.
 
 *krb5-1.2.5-r2 (02 aug 2002)
 
diff --git a/app-crypt/krb5/files/digest-krb5-1.2.6 b/app-crypt/krb5/files/digest-krb5-1.2.6
new file mode 100644
index 000000000000..c4ecd51a80be
--- /dev/null
+++ b/app-crypt/krb5/files/digest-krb5-1.2.6
@@ -0,0 +1 @@
+MD5 9723ca51368f8fbfcc52927d50dda7ac krb5-1.2.6.tar.gz 5488576
diff --git a/app-crypt/krb5/files/krb5-1.2.6-gentoo.diff b/app-crypt/krb5/files/krb5-1.2.6-gentoo.diff
new file mode 100644
index 000000000000..180f6a58f530
--- /dev/null
+++ b/app-crypt/krb5/files/krb5-1.2.6-gentoo.diff
@@ -0,0 +1,47 @@
+Index: kadm_ser_wrap.c
+===================================================================
+RCS file: /cvs/krbdev/krb5/src/kadmin/v4server/kadm_ser_wrap.c,v
+retrieving revision 1.10.4.1
+diff -c -r1.10.4.1 kadm_ser_wrap.c
+*** kadm_ser_wrap.c	2000/05/23 21:44:50	1.10.4.1
+- --- kadm_ser_wrap.c	2002/10/22 22:07:11
+***************
+*** 170,183 ****
+      u_char *retdat, *tmpdat;
+      int retval, retlen;
+  
+!     if (strncmp(KADM_VERSTR, (char *)*dat, KADM_VERSIZE)) {
+  	errpkt(dat, dat_len, KADM_BAD_VER);
+  	return KADM_BAD_VER;
+      }
+      in_len = KADM_VERSIZE;
+      /* get the length */
+!     if ((retc = stv_long(*dat, &r_len, in_len, *dat_len)) < 0)
+  	return KADM_LENGTH_ERROR;
+      in_len += retc;
+      authent.length = *dat_len - r_len - KADM_VERSIZE - sizeof(krb5_ui_4);
+      memcpy((char *)authent.dat, (char *)(*dat) + in_len, authent.length);
+- --- 170,190 ----
+      u_char *retdat, *tmpdat;
+      int retval, retlen;
+  
+!     if ((*dat_len < KADM_VERSIZE + sizeof(krb5_ui_4))
+! 	|| strncmp(KADM_VERSTR, (char *)*dat, KADM_VERSIZE)) {
+  	errpkt(dat, dat_len, KADM_BAD_VER);
+  	return KADM_BAD_VER;
+      }
+      in_len = KADM_VERSIZE;
+      /* get the length */
+!     if ((retc = stv_long(*dat, &r_len, in_len, *dat_len)) < 0
+! 	|| (r_len > *dat_len - KADM_VERSIZE - sizeof(krb5_ui_4))
+! 	|| (*dat_len - r_len - KADM_VERSIZE -
+! 	    sizeof(krb5_ui_4) > sizeof(authent.dat))) {
+! 	errpkt(dat, dat_len, KADM_LENGTH_ERROR);
+  	return KADM_LENGTH_ERROR;
++     }
++ 
+      in_len += retc;
+      authent.length = *dat_len - r_len - KADM_VERSIZE - sizeof(krb5_ui_4);
+      memcpy((char *)authent.dat, (char *)(*dat) + in_len, authent.length);
+
+
diff --git a/app-crypt/krb5/krb5-1.2.6.ebuild b/app-crypt/krb5/krb5-1.2.6.ebuild
new file mode 100644
index 000000000000..45e35ed3c3d2
--- /dev/null
+++ b/app-crypt/krb5/krb5-1.2.6.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/krb5/krb5-1.2.6.ebuild,v 1.1 2002/10/28 14:01:18 aliz Exp $
+
+S=${WORKDIR}/${P}/src
+SRC_URI="http://www.crypto-publish.org/dist/mit-kerberos5/${P}.tar.gz"
+DESCRIPTION="MIT Kerberos V (set up for pam)"
+HOMEPAGE="http://web.mit.edu/kerberos/www/"
+
+IUSE="doc"
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="x86 sparc sparc64"
+
+DEPEND="virtual/glibc"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	patch -p0 < ${FILESDIR}/${PN}-1.2.2-gentoo.diff || die
+
+	cd ${S}/kadmin/v4server/
+	patch -p0 < ${FILESDIR}/${PF}-gentoo.diff || die
+}
+
+src_compile() {
+	econf \
+		--with-krb4 \
+		--enable-shared \
+		--enable-dns || die
+	mv Makefile Makefile.orig
+	#Don't install the ftp, telnet, r* apps; use pam instead
+	sed -e 's/ appl / /' Makefile.orig > Makefile
+	make || die
+}
+
+src_install () {
+	make DESTDIR=${D} install || die
+	cd ..
+	dodoc README
+}
+
+pkg_postinst() {
+	einfo "ftp, telnet, r* apps not installed.  Install pam-krb5!"
+}