Do not override localstatedir, bug #137433. Use always the internal berkdb,

see bug #137438. Install more docs; tetex use flag is gone, use doc to build
the developer docs. Install upstream configuration files examples and correct
krb5.conf for stable ebuild, bug #53520.

Package-Manager: portage-2.1.1_pre2-r2

5 files changed, 142 insertions, 13 deletions

diff --git a/app-crypt/mit-krb5/ChangeLog b/app-crypt/mit-krb5/ChangeLog
index 72cb5acba5e8..b287d16c3ef7 100644
--- a/app-crypt/mit-krb5/ChangeLog
+++ b/app-crypt/mit-krb5/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-crypt/mit-krb5
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/ChangeLog,v 1.122 2006/07/05 23:27:41 exg Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/ChangeLog,v 1.123 2006/07/06 16:18:52 exg Exp $
+
+*mit-krb5-1.4.3-r2 (06 Jul 2006)
+
+  06 Jul 2006; Emanuele Giaquinta <exg@gentoo.org>
+  +mit-krb5-1.4.3-r2.ebuild:
+  Do not override localstatedir, bug #137433. Use always the internal berkdb,
+  see bug #137438. Install more docs; tetex use flag is gone, use doc to build
+  the developer docs. Install upstream configuration files examples and correct
+  krb5.conf for stable ebuild, bug #53520.
 
   05 Jul 2006; Emanuele Giaquinta <exg@gentoo.org> files/krb5.conf,
   mit-krb5-1.4.3.ebuild, mit-krb5-1.4.3-r1.ebuild:
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index 8cc50b39d90a..dd207759d989 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -2,10 +2,10 @@ AUX kdc.conf 438 RMD160 c2f29dba3a0b270a5b219741d1ffad07dd62951d SHA1 25b204242b
 MD5 186bd4cbeff944079f44105d4c962c80 files/kdc.conf 438
 RMD160 c2f29dba3a0b270a5b219741d1ffad07dd62951d files/kdc.conf 438
 SHA256 ad7507da8acfb7d8a37ca83f414e5eb25faf4374a879a48c7af6cdd8fb5ae113 files/kdc.conf 438
-AUX krb5.conf 535 RMD160 10def47f5a70343adfbca1efed1dd50621989b2c SHA1 4e2f63d4d727f07decd10ea53fee9568d1856c9e SHA256 2786ed970daeefbc2a2d1e43e9bc0b3f6b203455cc4732e084df035cf51fda42
-MD5 7b01aae6304a0f75d2edbbd8895e06ef files/krb5.conf 535
-RMD160 10def47f5a70343adfbca1efed1dd50621989b2c files/krb5.conf 535
-SHA256 2786ed970daeefbc2a2d1e43e9bc0b3f6b203455cc4732e084df035cf51fda42 files/krb5.conf 535
+AUX krb5.conf 494 RMD160 1abd2180678a1aca1e2ceada18d523063df830da SHA1 8e93caeab960f33ce1906178286617d3e32f935d SHA256 6889183b28c5a5475b0e99b622d07de4dc60ff363d111f09774b41296956cf8e
+MD5 234658ef640b553f241fbed5468b6583 files/krb5.conf 494
+RMD160 1abd2180678a1aca1e2ceada18d523063df830da files/krb5.conf 494
+SHA256 6889183b28c5a5475b0e99b622d07de4dc60ff363d111f09774b41296956cf8e files/krb5.conf 494
 AUX krb5.confd 233 RMD160 b85d8a56c17ea695e0ca7f3287cff5bd2691cc5e SHA1 5cb0b01beee0b85e305423df36886683cd3d398e SHA256 b8a885fbebe397f2c302e8fd7f2b038d649da2dea3b36e8fbcdc99d395d99ac5
 MD5 c451148d1b3e182a19a8f9084d0b55b8 files/krb5.confd 233
 RMD160 b85d8a56c17ea695e0ca7f3287cff5bd2691cc5e files/krb5.confd 233
@@ -43,14 +43,18 @@ EBUILD mit-krb5-1.4.3-r1.ebuild 3162 RMD160 558321abf9a9dd0b61cfbb92173262906738
 MD5 5ea980ea492325fcf99d32cdf3ed5473 mit-krb5-1.4.3-r1.ebuild 3162
 RMD160 558321abf9a9dd0b61cfbb921732629067383813 mit-krb5-1.4.3-r1.ebuild 3162
 SHA256 9fd1e63f7a1d0882d68b076af9ae7cfd259398ad413ff807d752e437f2c3706a mit-krb5-1.4.3-r1.ebuild 3162
+EBUILD mit-krb5-1.4.3-r2.ebuild 2798 RMD160 e9468c0f256818462485c2ab17fc8039ee7a52ba SHA1 b9e0ae280d83bf7fd731f01ab1e5431347ce5808 SHA256 2847ee3676433ba6f17543ff788f4133178e52af0891fd1a495cd5204f5c2d6d
+MD5 5b621f061f4ccd1e6841a58c4c8314c7 mit-krb5-1.4.3-r2.ebuild 2798
+RMD160 e9468c0f256818462485c2ab17fc8039ee7a52ba mit-krb5-1.4.3-r2.ebuild 2798
+SHA256 2847ee3676433ba6f17543ff788f4133178e52af0891fd1a495cd5204f5c2d6d mit-krb5-1.4.3-r2.ebuild 2798
 EBUILD mit-krb5-1.4.3.ebuild 2729 RMD160 2e286302e7d7479c4416fe555416cdbe6d8c8c9a SHA1 d227a6fbf908ef0ab669393ce7a6aad8b84b7dd5 SHA256 731df169e38eacfa6ed5a27be0c1446fc999ec40f7d19a751ef2bb978434c49d
 MD5 f58cf92a14b72d684b83e7a1a9ce5a38 mit-krb5-1.4.3.ebuild 2729
 RMD160 2e286302e7d7479c4416fe555416cdbe6d8c8c9a mit-krb5-1.4.3.ebuild 2729
 SHA256 731df169e38eacfa6ed5a27be0c1446fc999ec40f7d19a751ef2bb978434c49d mit-krb5-1.4.3.ebuild 2729
-MISC ChangeLog 20505 RMD160 f1a0b21b5f6c59eebf3e0df3bb1c015cf80b1833 SHA1 2327056bb7736e028310cb654901e6e52b2a339d SHA256 93a495f56899cebc8c755529d7a75b029a3d4f40f918cb393bd768b14dfefac2
-MD5 c20e3a0657448b2f6a623bdc01062962 ChangeLog 20505
-RMD160 f1a0b21b5f6c59eebf3e0df3bb1c015cf80b1833 ChangeLog 20505
-SHA256 93a495f56899cebc8c755529d7a75b029a3d4f40f918cb393bd768b14dfefac2 ChangeLog 20505
+MISC ChangeLog 20900 RMD160 929b35469206aca5f6ae3f4f9d5628974d482912 SHA1 58a046a38f59ea295b3fb3421a4cca34dc61a0bb SHA256 74ba7a095b0c84f93faead2e79101f4e0e7fde1dd5bcaabeb969d6589e15cfb5
+MD5 5cdba55cb9eb3554c719d8eec6eac5fb ChangeLog 20900
+RMD160 929b35469206aca5f6ae3f4f9d5628974d482912 ChangeLog 20900
+SHA256 74ba7a095b0c84f93faead2e79101f4e0e7fde1dd5bcaabeb969d6589e15cfb5 ChangeLog 20900
 MISC metadata.xml 241 RMD160 4b15a3aa85942fcbab1c0afa871bd88c85acb001 SHA1 97dc5c2f74beed14ac9e171f36380370afae95be SHA256 119a622b44a5b38856cb9398389cf060f93a077b369161a5ab9a193234af763f
 MD5 f3ea9dd1d52f37139fbc4d101044f821 metadata.xml 241
 RMD160 4b15a3aa85942fcbab1c0afa871bd88c85acb001 metadata.xml 241
@@ -61,3 +65,6 @@ SHA256 6dbbea82aa2ce1f7db8b21fa84eaa99e1fc045e2a4a4b6d175d27267f197c123 files/di
 MD5 6ba0d8f5bbf423058a90022e33bd30a4 files/digest-mit-krb5-1.4.3-r1 247
 RMD160 b4c529af7319d39a8ceedc6dd92a3676808acf20 files/digest-mit-krb5-1.4.3-r1 247
 SHA256 6dbbea82aa2ce1f7db8b21fa84eaa99e1fc045e2a4a4b6d175d27267f197c123 files/digest-mit-krb5-1.4.3-r1 247
+MD5 6ba0d8f5bbf423058a90022e33bd30a4 files/digest-mit-krb5-1.4.3-r2 247
+RMD160 b4c529af7319d39a8ceedc6dd92a3676808acf20 files/digest-mit-krb5-1.4.3-r2 247
+SHA256 6dbbea82aa2ce1f7db8b21fa84eaa99e1fc045e2a4a4b6d175d27267f197c123 files/digest-mit-krb5-1.4.3-r2 247
diff --git a/app-crypt/mit-krb5/files/digest-mit-krb5-1.4.3-r2 b/app-crypt/mit-krb5/files/digest-mit-krb5-1.4.3-r2
new file mode 100644
index 000000000000..ecbc87ab159a
--- /dev/null
+++ b/app-crypt/mit-krb5/files/digest-mit-krb5-1.4.3-r2
@@ -0,0 +1,3 @@
+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
diff --git a/app-crypt/mit-krb5/files/krb5.conf b/app-crypt/mit-krb5/files/krb5.conf
index 2b7231d1c9da..3dc26ba531da 100644
--- a/app-crypt/mit-krb5/files/krb5.conf
+++ b/app-crypt/mit-krb5/files/krb5.conf
@@ -1,5 +1,5 @@
 [libdefaults]
-	ticket_lifetime = 600
+	renew_lifetime = 600
 	default_realm = EXAMPLE.COM
 	default_tkt_enctypes = des3-hmac-sha1 des-cbc-crc
 	default_tgs_enctypes = des3-hmac-sha1 des-cbc-crc
@@ -15,9 +15,6 @@
 	.example.com = EXAMPLE.COM
 	example.com = EXAMPLE.COM
 
-[kdc]
-	profile = /etc/krb5kdc/kdc.conf
-
 [logging]
 	kdc = FILE:/var/log/krb5kdc.log
 	admin_server = FILE:/var/log/kadmin.log
diff --git a/app-crypt/mit-krb5/mit-krb5-1.4.3-r2.ebuild b/app-crypt/mit-krb5/mit-krb5-1.4.3-r2.ebuild
new file mode 100644
index 000000000000..6c63bc2c169b
--- /dev/null
+++ b/app-crypt/mit-krb5/mit-krb5-1.4.3-r2.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2006 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-r2.ebuild,v 1.1 2006/07/06 16:18:52 exg Exp $
+
+inherit eutils flag-o-matic versionator autotools
+
+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"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="krb4 static tcltk ipv6 doc"
+
+RDEPEND="!virtual/krb5
+	sys-libs/com_err
+	sys-libs/ss
+	tcltk? ( dev-lang/tcl )"
+
+DEPEND="${RDEPEND}
+	doc? ( virtual/tetex )"
+
+PROVIDE="virtual/krb5"
+
+src_unpack() {
+	unpack ${MY_P}-signed.tar
+	unpack ./${MY_P}.tar.gz
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-lazyldflags.patch
+	epatch ${FILESDIR}/${PN}-robustgnu.patch
+	epatch ${FILESDIR}/${PN}-pthreads.patch
+	epatch ${FILESDIR}/${PN}-setupterm.patch
+	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 $?
+}
+
+src_compile() {
+	econf \
+		$(use_with krb4) \
+		$(use_with tcltk tcl) \
+		$(use_enable ipv6) \
+		$(use_enable static) \
+		--enable-shared \
+		--with-system-et --with-system-ss \
+		--enable-dns-for-realm || die
+
+	emake -j1 || die
+
+	if use doc ; then
+		cd ../doc
+		for dir in api implement ; do
+			( cd ${dir} ; make ) || die
+		done
+	fi
+}
+
+src_test() {
+	einfo "Testing is being debugged, disabled for now"
+}
+
+src_install() {
+	make \
+		DESTDIR=${D} \
+		EXAMPLEDIR=/usr/share/doc/${PF}/examples \
+		install || die
+
+	cd ..
+	dodoc README
+	dodoc doc/*.ps
+	doinfo doc/*.info*
+	dohtml -r doc/*
+
+	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}
+	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}
+	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
+}
+
+pkg_postinst() {
+
+	einfo "See /usr/share/doc/${PF}/html/krb5-admin/index.html for documentation."
+	echo ""
+	echo ""
+	ewarn "PLEASE READ THIS"
+	ewarn "This release of mit-krb5 now depends on an external version"
+	ewarn "of the com_err library.  Please make sure to run revdep-rebuild"
+	ewarn "to ensure the integrity of the linking on your system"
+	echo ""
+	epause 10
+	ebeep
+
+}