added telnet security patch. fixes #87145

5 files changed, 200 insertions, 28 deletions

diff --git a/app-crypt/mit-krb5/ChangeLog b/app-crypt/mit-krb5/ChangeLog
index fb4bee4f6e1d..af92a35bae56 100644
--- a/app-crypt/mit-krb5/ChangeLog
+++ b/app-crypt/mit-krb5/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/mit-krb5
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/ChangeLog,v 1.69 2005/02/22 20:27:11 sejo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/ChangeLog,v 1.70 2005/04/04 16:11:58 rphillips Exp $
+
+*mit-krb5-1.3.6-r2 (04 Apr 2005)
+
+  04 Apr 2005; <rphillips@gentoo.org> +files/mit-krb5-1.3.6-telnet.patch.bz2,
+  +mit-krb5-1.3.6-r2.ebuild:
+  Added telnet security patch which fixes #87145
 
   22 Feb 2005; <SeJo@gentoo.org> mit-krb5-1.3.6-r1.ebuild:
   stable on ppc
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index b24ab28cdc05..d25704d943da 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -1,41 +1,44 @@
-MD5 17c10c3442dab8548ba506474256971c ChangeLog 11030
-MD5 43c3a7a1974ef9610bb9458e1a3a4d87 metadata.xml 353
+MD5 7eddea76cb2787a0f6e764f35e9282fa mit-krb5-1.3.6-r1.ebuild 4211
+MD5 398a1fae4a8f3d39ad5192b2a4721565 mit-krb5-1.3.4.ebuild 4337
+MD5 0a8d58d17a8674e8e4ba1c206a04e699 mit-krb5-1.3.5-r1.ebuild 4355
 MD5 e0d32f4e4a830c3cba1dc81930488aa6 mit-krb5-1.3.1-r1.ebuild 4215
+MD5 4f44fd6d264495d9a34e01f48d8fe4e9 mit-krb5-1.3.6.ebuild 4168
 MD5 738e47cc713ee703aa340c6e414143f7 mit-krb5-1.3.1.ebuild 4182
-MD5 3e40cc8a9ecfc37cc8b83c9cd0ac4b12 mit-krb5-1.3.3-r1.ebuild 4313
-MD5 b4a6865066a31de57fc8c2ad7625f537 mit-krb5-1.3.3.ebuild 4207
 MD5 1f0ab28ecf3a6a659e80896becd2ed4e mit-krb5-1.3.4-r1.ebuild 4384
-MD5 398a1fae4a8f3d39ad5192b2a4721565 mit-krb5-1.3.4.ebuild 4337
-MD5 0a8d58d17a8674e8e4ba1c206a04e699 mit-krb5-1.3.5-r1.ebuild 4355
+MD5 b4a6865066a31de57fc8c2ad7625f537 mit-krb5-1.3.3.ebuild 4207
+MD5 b5ef53909965c9ff7b964a75ce04ef19 mit-krb5-1.3.6-r2.ebuild 4268
 MD5 019c6e7077c4cd18818a2fcf7a3b06b3 mit-krb5-1.3.5.ebuild 4301
-MD5 4f44fd6d264495d9a34e01f48d8fe4e9 mit-krb5-1.3.6.ebuild 4168
-MD5 7eddea76cb2787a0f6e764f35e9282fa mit-krb5-1.3.6-r1.ebuild 4211
+MD5 3e40cc8a9ecfc37cc8b83c9cd0ac4b12 mit-krb5-1.3.3-r1.ebuild 4313
+MD5 d72ef0dd92c0f3922611e318000e536f ChangeLog 11226
+MD5 43c3a7a1974ef9610bb9458e1a3a4d87 metadata.xml 353
+MD5 435b8a123e8849fa5f92c9a7c53c514d files/mit-krb5-1.3.4-autoheader.patch.bz2 379
+MD5 1300b7bf5dff7e1b837041f55c565081 files/mit-krb5-1.3.5-suid_fix.patch.bz2 269
+MD5 c451148d1b3e182a19a8f9084d0b55b8 files/krb5.confd 233
+MD5 d7dcbbab51ce1849c77c083b8d363c15 files/krb5.initd 1486
+MD5 fbb2a86038ab98ca0c7493ad9d55ace9 files/krb5.conf 541
 MD5 7b9b25de3cffdafa3d572dee9644f83e files/2004-002-patch_1.3.4.txt 7196
+MD5 4ddffa1df5b9fe9ad84da7f73526774c files/mit-krb5-1.3.5-res_search.patch.bz2 1992
+MD5 65a524c259b87b884c0f77739cc686e1 files/mit-krb5-1.3.4-tempfile.patch.bz2 791
+MD5 435b8a123e8849fa5f92c9a7c53c514d files/mit-krb5-1.3.5-autoheader.patch.bz2 379
+MD5 186bd4cbeff944079f44105d4c962c80 files/kdc.conf 438
+MD5 2c4ba0f8f9513fb2f285a9224f063ad8 files/digest-mit-krb5-1.3.1-r1 63
+MD5 596ab1238ca3a14926eb5fd3947ab4ce files/digest-mit-krb5-1.3.3-r1 60
+MD5 1f5afce6458d8ca364f153965cd992ca files/digest-mit-krb5-1.3.4-r1 60
+MD5 8f275083c0b04344cbb068d883cda623 files/digest-mit-krb5-1.3.5-r1 60
+MD5 bc450f834d336f154d1f850c2ab50c9c files/digest-mit-krb5-1.3.6-r1 67
+MD5 bc450f834d336f154d1f850c2ab50c9c files/digest-mit-krb5-1.3.6-r2 67
 MD5 6ddd962c015b6986004819321295aecd files/2004-003-patch_1.3.4.txt 592
+MD5 c214030264300e2d84375d23d7c1f892 files/mit-krb5kdc.initd 656
+MD5 4ddffa1df5b9fe9ad84da7f73526774c files/mit-krb5-1.3.3-res_search.patch.bz2 1992
 MD5 2c4ba0f8f9513fb2f285a9224f063ad8 files/digest-mit-krb5-1.3.1 63
-MD5 2c4ba0f8f9513fb2f285a9224f063ad8 files/digest-mit-krb5-1.3.1-r1 63
 MD5 596ab1238ca3a14926eb5fd3947ab4ce files/digest-mit-krb5-1.3.3 60
-MD5 596ab1238ca3a14926eb5fd3947ab4ce files/digest-mit-krb5-1.3.3-r1 60
 MD5 1f5afce6458d8ca364f153965cd992ca files/digest-mit-krb5-1.3.4 60
-MD5 1f5afce6458d8ca364f153965cd992ca files/digest-mit-krb5-1.3.4-r1 60
 MD5 8f275083c0b04344cbb068d883cda623 files/digest-mit-krb5-1.3.5 60
-MD5 8f275083c0b04344cbb068d883cda623 files/digest-mit-krb5-1.3.5-r1 60
 MD5 bc450f834d336f154d1f850c2ab50c9c files/digest-mit-krb5-1.3.6 67
-MD5 bc450f834d336f154d1f850c2ab50c9c files/digest-mit-krb5-1.3.6-r1 67
-MD5 186bd4cbeff944079f44105d4c962c80 files/kdc.conf 438
-MD5 fbb2a86038ab98ca0c7493ad9d55ace9 files/krb5.conf 541
-MD5 c451148d1b3e182a19a8f9084d0b55b8 files/krb5.confd 233
-MD5 d7dcbbab51ce1849c77c083b8d363c15 files/krb5.initd 1486
-MD5 4ddffa1df5b9fe9ad84da7f73526774c files/mit-krb5-1.3.1-res_search.patch.bz2 1992
-MD5 95cba23977319310f6cf67be1f97a65f files/mit-krb5-1.3.3-aname.patch.bz2 1829
+MD5 00e92c082ffe700b74cfd14c64260d18 files/mit-krb5-1.3.6-telnet.patch.bz2 841
 MD5 435b8a123e8849fa5f92c9a7c53c514d files/mit-krb5-1.3.3-autoheader.patch.bz2 379
-MD5 4ddffa1df5b9fe9ad84da7f73526774c files/mit-krb5-1.3.3-res_search.patch.bz2 1992
-MD5 435b8a123e8849fa5f92c9a7c53c514d files/mit-krb5-1.3.4-autoheader.patch.bz2 379
-MD5 4ddffa1df5b9fe9ad84da7f73526774c files/mit-krb5-1.3.4-res_search.patch.bz2 1992
-MD5 65a524c259b87b884c0f77739cc686e1 files/mit-krb5-1.3.4-tempfile.patch.bz2 791
-MD5 435b8a123e8849fa5f92c9a7c53c514d files/mit-krb5-1.3.5-autoheader.patch.bz2 379
-MD5 4ddffa1df5b9fe9ad84da7f73526774c files/mit-krb5-1.3.5-res_search.patch.bz2 1992
-MD5 1300b7bf5dff7e1b837041f55c565081 files/mit-krb5-1.3.5-suid_fix.patch.bz2 269
 MD5 fa5e3bd6fb521c29db85ce623905087b files/mit-krb5-1.3.6-64bit.patch 923
+MD5 4ddffa1df5b9fe9ad84da7f73526774c files/mit-krb5-1.3.1-res_search.patch.bz2 1992
+MD5 95cba23977319310f6cf67be1f97a65f files/mit-krb5-1.3.3-aname.patch.bz2 1829
 MD5 61a61d22565605924a06789f9da352bf files/mit-krb5kadmind.initd 687
-MD5 c214030264300e2d84375d23d7c1f892 files/mit-krb5kdc.initd 656
+MD5 4ddffa1df5b9fe9ad84da7f73526774c files/mit-krb5-1.3.4-res_search.patch.bz2 1992
diff --git a/app-crypt/mit-krb5/files/digest-mit-krb5-1.3.6-r2 b/app-crypt/mit-krb5/files/digest-mit-krb5-1.3.6-r2
new file mode 100644
index 000000000000..11ae258ef189
--- /dev/null
+++ b/app-crypt/mit-krb5/files/digest-mit-krb5-1.3.6-r2
@@ -0,0 +1 @@
+MD5 18d5a6a8e1cce120536718d39a052a87 krb5-1.3.6-signed.tar 6533120
diff --git a/app-crypt/mit-krb5/files/mit-krb5-1.3.6-telnet.patch.bz2 b/app-crypt/mit-krb5/files/mit-krb5-1.3.6-telnet.patch.bz2
new file mode 100644
index 000000000000..c74ef4b8d5ec
--- /dev/null
+++ b/app-crypt/mit-krb5/files/mit-krb5-1.3.6-telnet.patch.bz2
diff --git a/app-crypt/mit-krb5/mit-krb5-1.3.6-r2.ebuild b/app-crypt/mit-krb5/mit-krb5-1.3.6-r2.ebuild
new file mode 100644
index 000000000000..6317e4ae7396
--- /dev/null
+++ b/app-crypt/mit-krb5/mit-krb5-1.3.6-r2.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.3.6-r2.ebuild,v 1.1 2005/04/04 16:11:58 rphillips Exp $
+
+inherit eutils 64-bit
+
+MY_P=${PN/mit-}-${PV}
+S=${WORKDIR}/${MY_P}/src
+DESCRIPTION="MIT Kerberos V"
+HOMEPAGE="http://web.mit.edu/kerberos/www/"
+SRC_URI="http://web.mit.edu/kerberos/dist/krb5/1.3/${MY_P}-signed.tar"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+IUSE="krb4 static"
+
+DEPEND="virtual/libc
+	sys-devel/autoconf
+	!virtual/krb5"
+RDEPEND="virtual/libc
+	!virtual/krb5"
+PROVIDE="virtual/krb5"
+
+src_unpack() {
+	unpack ${A}
+	tar -zxf ${MY_P}.tar.gz
+	cd ${S}
+	64-bit && epatch ${FILESDIR}/${P}-64bit.patch
+	epatch ${FILESDIR}/${P}-telnet.patch.bz2
+}
+
+src_compile() {
+	ebegin "Updating configure"
+		autoconf
+		cd ${S}/util/et
+		WANT_AUTOCONF=2.5 autoconf -I ../../
+		cd ${S}/util/ss
+		WANT_AUTOCONF=2.5 autoconf -I ../../
+		cd ${S}/util/profile
+		WANT_AUTOCONF=2.5 autoconf -I ../../
+		cd ${S}/util/pty
+		WANT_AUTOCONF=2.5 autoconf -I ../../
+		cd ${S}/util/db2
+		WANT_AUTOCONF=2.5 autoconf -I ../../
+		cd ${S}/include
+		WANT_AUTOCONF=2.5 autoconf -I ../
+		cd ${S}/lib/crypto
+		WANT_AUTOCONF=2.5 autoconf -I ../../
+		cd ${S}/lib/krb5
+		WANT_AUTOCONF=2.5 autoconf -I ../../
+		cd ${S}/lib/des425
+		WANT_AUTOCONF=2.5 autoconf -I ../../
+		cd ${S}/lib/kdb
+		WANT_AUTOCONF=2.5 autoconf -I ../../
+		cd ${S}/lib/gssapi
+		WANT_AUTOCONF=2.5 autoconf -I ../../
+		cd ${S}/lib/rpc
+		WANT_AUTOCONF=2.5 autoconf -I ../../
+		cd ${S}/lib/rpc/unit-test
+		WANT_AUTOCONF=2.5 autoconf -I ../../../
+		cd ${S}/lib/kadm5
+		WANT_AUTOCONF=2.5 autoconf -I ../../
+		cd ${S}/kdc
+		WANT_AUTOCONF=2.5 autoconf -I ../
+		cd ${S}/kadmin
+		WANT_AUTOCONF=2.5 autoconf -I ../
+		cd ${S}/slave
+		WANT_AUTOCONF=2.5 autoconf -I ../
+		cd ${S}/clients
+		WANT_AUTOCONF=2.5 autoconf -I ../
+		cd ${S}/appl
+		WANT_AUTOCONF=2.5 autoconf -I ../
+		cd ${S}/appl/bsd
+		WANT_AUTOCONF=2.5 autoconf -I ../../
+		cd ${S}/appl/gssftp
+		WANT_AUTOCONF=2.5 autoconf -I ../../
+		cd ${S}/appl/telnet
+		WANT_AUTOCONF=2.5 autoconf -I ../../
+		cd ${S}/appl/telnet/libtelnet
+		WANT_AUTOCONF=2.5 autoconf -I ../../../
+		cd ${S}/appl/telnet/telnet
+		WANT_AUTOCONF=2.5 autoconf -I ../../../
+		cd ${S}/appl/telnet/telnetd
+		WANT_AUTOCONF=2.5 autoconf -I ../../../
+		cd ${S}/tests
+		WANT_AUTOCONF=2.5 autoconf -I ../
+		cd ${S}/lib/krb4
+		WANT_AUTOCONF=2.5 autoconf -I ../../
+		cd ${S}/krb524
+		WANT_AUTOCONF=2.5 autoconf -I ../
+		cd ${S}
+	eend $?
+
+	local myconf
+
+	use krb4 && myconf="${myconf} --with-krb4 --enable-krb4" \
+		|| myconf="${myconf} --without-krb4 --disable-krb4"
+
+	use static && myconf="${myconf} --disable-shared --enable-static" \
+		|| myconf="${myconf} --enable-shared --disable-static"
+
+	CFLAGS=`echo ${CFLAGS} | xargs`
+	CXXFLAGS=`echo ${CXXFLAGS} | xargs`
+	LDFLAGS=`echo ${LDFLAGS} | xargs`
+
+	CFLAGS="${CFLAGS}" \
+	CXXFLAGS="${CXXFLAGS}" \
+	LDFLAGS="${LDFLAGS}" \
+	econf \
+		--mandir=/usr/share/man \
+		--localstatedir=/etc \
+		--host=${CHOST} \
+		--prefix=/usr \
+		--enable-dns \
+		${myconf} || die
+
+	if [ "${ARCH}" = "hppa" ]
+	then
+		einfo "Fixating Makefiles ..."
+		for i in `find ${S} -name Makefile`; \
+		do cp $i $i.old; sed -e 's/LDCOMBINE=ld -shared -h lib/LDCOMBINE=gcc -shared -h lib/' $i.old > $i; done
+	fi
+
+	make || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	cd ..
+	dodoc README
+	dohtml doc/*.html
+
+	# Begin client rename and install
+	for i in {telnetd,ftpd}
+	do
+		mv ${D}/usr/share/man/man8/${i}.8 ${D}/usr/share/man/man8/k${i}.8
+		mv ${D}/usr/sbin/${i} ${D}/usr/sbin/k${i}
+	done
+	for i in {rcp,rsh,telnet,ftp,rlogin}
+	do
+		mv ${D}/usr/share/man/man1/${i}.1 ${D}/usr/share/man/man1/k${i}.1
+		mv ${D}/usr/bin/${i} ${D}/usr/bin/k${i}
+	done
+
+	insinto /etc
+		newins ${FILESDIR}/krb5.conf krb5.conf
+	insinto /etc/krb5kdc
+		newins ${FILESDIR}/kdc.conf kdc.conf
+	exeinto /etc/init.d
+		newexe ${FILESDIR}/mit-krb5kadmind.initd mit-krb5kadmind
+		newexe ${FILESDIR}/mit-krb5kdc.initd mit-krb5kdc
+}
+
+pkg_postinst() {
+	einfo "See /usr/share/doc/${PF}/html/admin.html for documentation."
+	echo ""
+	einfo "The client apps are installed with the k prefix"
+	einfo "(ie. kftp, kftpd, ktelnet, ktelnetd, etc...)"
+	echo ""
+}