removed the 1.4 stuff, because it's totally unmaintained upstream and here. Bumped to 1.5.3-r1 for the newest security fix. See bug #191301

Package-Manager: portage-2.1.3.7

5 files changed, 42 insertions, 44 deletions

diff --git a/app-crypt/mit-krb5/ChangeLog b/app-crypt/mit-krb5/ChangeLog
index 46cd234db44f..c8ae50006545 100644
--- a/app-crypt/mit-krb5/ChangeLog
+++ b/app-crypt/mit-krb5/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-crypt/mit-krb5
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/ChangeLog,v 1.161 2007/09/07 06:03:15 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/ChangeLog,v 1.162 2007/09/07 06:27:33 seemant Exp $
+
+*mit-krb5-1.5.3-r1 (07 Sep 2007)
+
+  07 Sep 2007; Seemant Kulleen <seemant@gentoo.org>
+  -mit-krb5-1.4.3-r3.ebuild, +mit-krb5-1.5.3-r1.ebuild:
+  removed the 1.4 stuff, because it's totally unmaintained upstream and here.
+  Bumped to 1.5.3-r1 for the newest security fix. See bug #191301
 
   07 Sep 2007; Seemant Kulleen <seemant@gentoo.org>
   -mit-krb5-1.5.2-r1.ebuild, -mit-krb5-1.5.2-r2.ebuild,
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index 313fd4d75c96..db2e9ea77534 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -10,29 +10,28 @@ AUX mit-krb5kdc.initd 656 RMD160 8c4c508273f9d715ac0e0a8d9c54e36f63526b9b SHA1 6
 MD5 c214030264300e2d84375d23d7c1f892 files/mit-krb5kdc.initd 656
 RMD160 8c4c508273f9d715ac0e0a8d9c54e36f63526b9b files/mit-krb5kdc.initd 656
 SHA256 d813dbf3ee89f0da6b73455fd8759898223529c4cf7c1c2ec64a3128363194e2 files/mit-krb5kdc.initd 656
-DIST krb5-1.4.3-signed.tar 7290880 RMD160 838425b59bf37da69c927eb346be78d059fa6db7 SHA1 94bd12d664b1ef32bbf5b8ffe062fe473909f9a7 SHA256 86f246877cc912ae6a82b6bb16217e54ec31fe46ae33a39a42b3f062bb5e6cbe
 DIST krb5-1.5.3-signed.tar 10106880 RMD160 06effac25b84f0a52a876833730ca03f78d97d15 SHA1 2351004911c7b6ac403232cf6e969c6e430da068 SHA256 f3be0764bbb38f66fa8cc233301bee410c06cb88c40b8af8d0b132dfbb9b3d07
-DIST mit-krb5-1.4.3-patches-0.1.tar.bz2 4271 RMD160 89f4b6bf1d343377e37839d28ac0f401be216e69 SHA1 461b8b968415c0269775d19cd1ea2974c779823a SHA256 e1bd1d4ad64ab34d6eba5a91141a7a0fc94982f0a2db8aa057ae356f7da9c109
 DIST mit-krb5-1.5.3-patches-0.1.tar.bz2 2624 RMD160 a1e5090e07a3e8eb9fe3536f2777585daef017e7 SHA1 fd941240431278705b23c3dd76cc19324dabed54 SHA256 4db7da6a55c7588db00111bde75044947f4ef92bb380096ab33bd60bb3bf1d82
-EBUILD mit-krb5-1.4.3-r3.ebuild 2775 RMD160 dd1bd2d8a3c7d8ce01ccf29e8430132a1241ad70 SHA1 fc59220799af53dff8a0c1db303d35a1e4154a11 SHA256 87ef7aff2603ddd3103d3f959cca3df22d6d0e8b4ba7cdd3b1ec4cc6fb15c8c1
-MD5 b4916a6aeedf72cc52be8066e8ff17f6 mit-krb5-1.4.3-r3.ebuild 2775
-RMD160 dd1bd2d8a3c7d8ce01ccf29e8430132a1241ad70 mit-krb5-1.4.3-r3.ebuild 2775
-SHA256 87ef7aff2603ddd3103d3f959cca3df22d6d0e8b4ba7cdd3b1ec4cc6fb15c8c1 mit-krb5-1.4.3-r3.ebuild 2775
+DIST mit-krb5-1.5.3-patches-0.2.tar.bz2 3095 RMD160 5fc8c41d78f4921e947f68a8d9fb82722e04eb8a SHA1 5916632435d697fa0704251d7653f74559ce7b47 SHA256 8044dbaa17db399c6bea4be671517501c0b528485f8b8b196d75caba559ba9cd
+EBUILD mit-krb5-1.5.3-r1.ebuild 2578 RMD160 a9fc5a14678a4755e51c42c2695339ad458fa002 SHA1 3accdbf6552452e80fb7af48fb13bfe1d4eb54d5 SHA256 81d114d54065601de789ce5a32d6b225153051a86c1a1604e5d108435c22db68
+MD5 b302fd229eba22f08c80f440607cce6d mit-krb5-1.5.3-r1.ebuild 2578
+RMD160 a9fc5a14678a4755e51c42c2695339ad458fa002 mit-krb5-1.5.3-r1.ebuild 2578
+SHA256 81d114d54065601de789ce5a32d6b225153051a86c1a1604e5d108435c22db68 mit-krb5-1.5.3-r1.ebuild 2578
 EBUILD mit-krb5-1.5.3.ebuild 2562 RMD160 e4aecd96a95e5d79c5a9967fec515f3f0e2e6747 SHA1 a6a04f70c00aa63dba8ca225c8ff2202e62ac834 SHA256 a37f069423a630e78a052813029864e82b5140dd742cdd6705ec4b843471da17
 MD5 81e797b8cf881d004be86d4c6196d456 mit-krb5-1.5.3.ebuild 2562
 RMD160 e4aecd96a95e5d79c5a9967fec515f3f0e2e6747 mit-krb5-1.5.3.ebuild 2562
 SHA256 a37f069423a630e78a052813029864e82b5140dd742cdd6705ec4b843471da17 mit-krb5-1.5.3.ebuild 2562
-MISC ChangeLog 27083 RMD160 bab40bba0249bdbcae3e7eca6d2d1fe05b475ba2 SHA1 062fbb58860af7e4a8663088a7abd2bcb711063d SHA256 a084268165f6fa224f37c2bffa53bf93077584637aaf180d8126951b11c59ab1
-MD5 32058b13e719ae56d3ae5d181aed9fa0 ChangeLog 27083
-RMD160 bab40bba0249bdbcae3e7eca6d2d1fe05b475ba2 ChangeLog 27083
-SHA256 a084268165f6fa224f37c2bffa53bf93077584637aaf180d8126951b11c59ab1 ChangeLog 27083
+MISC ChangeLog 27370 RMD160 24e056b4b2cf869277be61b539f0fceb46921bb9 SHA1 7b56b381dd9755409b905656dc4319aba04229e6 SHA256 048336ea3f02e051addfb5364598541bf517c4652c3061feb016947ab4f9650f
+MD5 4563b10532da148828d41e100b7cf742 ChangeLog 27370
+RMD160 24e056b4b2cf869277be61b539f0fceb46921bb9 ChangeLog 27370
+SHA256 048336ea3f02e051addfb5364598541bf517c4652c3061feb016947ab4f9650f ChangeLog 27370
 MISC metadata.xml 241 RMD160 4b15a3aa85942fcbab1c0afa871bd88c85acb001 SHA1 97dc5c2f74beed14ac9e171f36380370afae95be SHA256 119a622b44a5b38856cb9398389cf060f93a077b369161a5ab9a193234af763f
 MD5 f3ea9dd1d52f37139fbc4d101044f821 metadata.xml 241
 RMD160 4b15a3aa85942fcbab1c0afa871bd88c85acb001 metadata.xml 241
 SHA256 119a622b44a5b38856cb9398389cf060f93a077b369161a5ab9a193234af763f metadata.xml 241
-MD5 90bf96b2ef57fc8849e8b046c400bc9c files/digest-mit-krb5-1.4.3-r3 524
-RMD160 293463bcdff3279351fe15e5910d346b0d8b4eb2 files/digest-mit-krb5-1.4.3-r3 524
-SHA256 8958fdc80b15b327341ebff1a82d1577c76d77d2619503903680d640e1f2c404 files/digest-mit-krb5-1.4.3-r3 524
 MD5 735ac439fa0d44026c6b7fe01b769021 files/digest-mit-krb5-1.5.3 527
 RMD160 f9be6bd34c15aa20cf0e8d36030c62ba79dc5968 files/digest-mit-krb5-1.5.3 527
 SHA256 66abd2f045b4cde7cd506407afcde169c5883d0ea5f97cc73b6c1337a4024f3f files/digest-mit-krb5-1.5.3 527
+MD5 caf47565334300103f104c464df34d13 files/digest-mit-krb5-1.5.3-r1 527
+RMD160 751fb9ff5da94f71d226bf850c061271d5156b2a files/digest-mit-krb5-1.5.3-r1 527
+SHA256 ab0762f48b0808647bf636d00812ad55636e84105227bc02e1bb8d5e14424b77 files/digest-mit-krb5-1.5.3-r1 527
diff --git a/app-crypt/mit-krb5/files/digest-mit-krb5-1.4.3-r3 b/app-crypt/mit-krb5/files/digest-mit-krb5-1.4.3-r3
deleted file mode 100644
index 5d9882e02c2d..000000000000
--- a/app-crypt/mit-krb5/files/digest-mit-krb5-1.4.3-r3
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 6c805139a4108fbb82fa4adba557a448 krb5-1.4.3-signed.tar 7290880
-RMD160 838425b59bf37da69c927eb346be78d059fa6db7 krb5-1.4.3-signed.tar 7290880
-SHA256 86f246877cc912ae6a82b6bb16217e54ec31fe46ae33a39a42b3f062bb5e6cbe krb5-1.4.3-signed.tar 7290880
-MD5 b369322efbf8387a27d8de67e5b53898 mit-krb5-1.4.3-patches-0.1.tar.bz2 4271
-RMD160 89f4b6bf1d343377e37839d28ac0f401be216e69 mit-krb5-1.4.3-patches-0.1.tar.bz2 4271
-SHA256 e1bd1d4ad64ab34d6eba5a91141a7a0fc94982f0a2db8aa057ae356f7da9c109 mit-krb5-1.4.3-patches-0.1.tar.bz2 4271
diff --git a/app-crypt/mit-krb5/files/digest-mit-krb5-1.5.3-r1 b/app-crypt/mit-krb5/files/digest-mit-krb5-1.5.3-r1
new file mode 100644
index 000000000000..553fcf6c0d23
--- /dev/null
+++ b/app-crypt/mit-krb5/files/digest-mit-krb5-1.5.3-r1
@@ -0,0 +1,6 @@
+MD5 7a58ae9ede67b77792a9fb988545df40 krb5-1.5.3-signed.tar 10106880
+RMD160 06effac25b84f0a52a876833730ca03f78d97d15 krb5-1.5.3-signed.tar 10106880
+SHA256 f3be0764bbb38f66fa8cc233301bee410c06cb88c40b8af8d0b132dfbb9b3d07 krb5-1.5.3-signed.tar 10106880
+MD5 68c1456c4515640321728c69c93c0c0e mit-krb5-1.5.3-patches-0.2.tar.bz2 3095
+RMD160 5fc8c41d78f4921e947f68a8d9fb82722e04eb8a mit-krb5-1.5.3-patches-0.2.tar.bz2 3095
+SHA256 8044dbaa17db399c6bea4be671517501c0b528485f8b8b196d75caba559ba9cd mit-krb5-1.5.3-patches-0.2.tar.bz2 3095
diff --git a/app-crypt/mit-krb5/mit-krb5-1.4.3-r3.ebuild b/app-crypt/mit-krb5/mit-krb5-1.5.3-r1.ebuild
index 04dbff965e56..2556af8f4a5b 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.4.3-r3.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.5.3-r1.ebuild
@@ -1,24 +1,25 @@
 # Copyright 1999-2007 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.4.3-r3.ebuild,v 1.13 2007/04/04 02:46:56 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.5.3-r1.ebuild,v 1.1 2007/09/07 06:27:33 seemant Exp $
 
 inherit eutils flag-o-matic versionator autotools
 
-PATCHV="0.1"
+PATCHV="0.2"
 MY_P=${P/mit-}
 P_DIR=$(get_version_component_range 1-2)
 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/${P_DIR}/${MY_P}-signed.tar
+	http://dev.gentoo.org/~seemant/distfiles/${P}-patches-${PATCHV}.tar.bz2
 	mirror://gentoo/${P}-patches-${PATCHV}.tar.bz2"
 
 PATCHDIR="${WORKDIR}/patch"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
-IUSE="krb4 tcl ipv6 doc berkdb"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="krb4 tcl ipv6 doc"
 
 RDEPEND="!virtual/krb5
 	sys-libs/com_err
@@ -28,15 +29,6 @@ DEPEND="${RDEPEND}
 	doc? ( virtual/tetex )"
 PROVIDE="virtual/krb5"
 
-pkg_setup() {
-	if use berkdb ; then
-		eerror "Please export your current kerberos db because"
-		eerror "we are now using the built-in db with its new locations"
-		eerror "Once you have exported your db, please set the -berkdb"
-		eerror "USE flag for this package"
-	fi
-}
-
 src_unpack() {
 	unpack ${A}
 	unpack ./${MY_P}.tar.gz
@@ -46,7 +38,6 @@ src_unpack() {
 	ebegin "Reconfiguring configure scripts (be patient)"
 	cd "${S}"/appl/telnet
 	eautoconf --force -I "${S}"
-	sed -i 's/^# \(@lib\(obj\)\?_frag@\)/\1/' libtelnet/Makefile.in
 	eend $?
 }
 
@@ -55,10 +46,10 @@ src_compile() {
 		$(use_with krb4) \
 		$(use_with tcl) \
 		$(use_enable ipv6) \
-		--enable-static \
 		--enable-shared \
 		--with-system-et --with-system-ss \
-		--enable-dns-for-realm || die
+		--enable-dns-for-realm \
+		--enable-kdc-replay-cache || die
 
 	emake -j1 || die
 
@@ -75,11 +66,13 @@ src_test() {
 }
 
 src_install() {
-	make \
+	emake \
 		DESTDIR="${D}" \
 		EXAMPLEDIR=/usr/share/doc/${PF}/examples \
 		install || die
 
+	keepdir /var/lib/krb5kdc
+
 	cd ..
 	dodoc README
 	dodoc doc/*.ps
@@ -89,24 +82,23 @@ src_install() {
 	use doc && dodoc doc/{api,implement}/*.ps
 
 	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}
+		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,rlogin,rsh,telnet,ftp} ; 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}
+		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
 
 	newinitd "${FILESDIR}"/mit-krb5kadmind.initd mit-krb5kadmind
 	newinitd "${FILESDIR}"/mit-krb5kdc.initd mit-krb5kdc
 
 	insinto /etc
-	newins /usr/share/doc/${PF}/examples/krb5.conf krb5.conf.example
-	newins /usr/share/doc/${PF}/examples/kdc.conf kdc.conf.example
+	newins ${D}/usr/share/doc/${PF}/examples/krb5.conf krb5.conf.example
+	newins ${D}/usr/share/doc/${PF}/examples/kdc.conf kdc.conf.example
 }
 
 pkg_postinst() {
-
 	elog "See /usr/share/doc/${PF}/html/krb5-admin/index.html for documentation."
 }