Fixes #16449

6 files changed, 165 insertions, 5 deletions

diff --git a/app-crypt/mit-krb5/ChangeLog b/app-crypt/mit-krb5/ChangeLog
index b7fef6e19a80..91e45fb13f45 100644
--- a/app-crypt/mit-krb5/ChangeLog
+++ b/app-crypt/mit-krb5/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-crypt/mit-krb5
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/ChangeLog,v 1.5 2003/04/20 21:22:02 method Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/ChangeLog,v 1.6 2003/06/06 23:53:04 rphillips Exp $
+
+*mit-krb5-1.2.7-r1 (6 Jun 2003)
+
+  7 Jun 2003; Ryan Phillips <rphillips@gentoo.org> mit-krb5-1.2.6-r3.ebuild :
+  Initd script split, merge mit packages into one mit-krb5 ebuild,
+  support for static build with USE="static", have html docs installed, pass
+  $CFLAGS and $CXXFLAGS to configure, remove the unnecessary 1.2.2 patch.
 
 *mit-krb5-1.2.7 (30 Mar 2003)
 
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index afe4dc4858d1..f3167584deb3 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -1,7 +1,8 @@
-MD5 ea61c4da2338b8d04d284693b4b0e0fd mit-krb5-1.2.6-r2.ebuild 1895
-MD5 16ed0de83bce1d29e4e290a40ed98460 mit-krb5-1.2.7.ebuild 2779
-MD5 37591324ff866332c0782d20577298a8 ChangeLog 2656
-MD5 bd50c0dafbfa7813abb8ec4552087d89 mit-krb5-1.2.6-r3.ebuild 1978
+MD5 e824295a27a816c782b1915ae566f4af mit-krb5-1.2.8.ebuild 2363
+MD5 b656cc2952790ff1ea7d38fd4b76a4b0 mit-krb5-1.2.6-r2.ebuild 1897
+MD5 bc28564cbf494a2ef20e1fea9122c134 mit-krb5-1.2.7.ebuild 2780
+MD5 9fe16b37422a3b49cc1ec3d3585015b2 ChangeLog 2988
+MD5 36bd48126adcab6d0243993e620b2a54 mit-krb5-1.2.6-r3.ebuild 1980
 MD5 38f68aea45bc300920563eb5b90b1a86 files/krb5-1.2.6-gentoo.diff 1657
 MD5 ad5d19a7bfe3339307c62797eef7a214 files/krb5-1.2.2-gentoo.diff 990
 MD5 c451148d1b3e182a19a8f9084d0b55b8 files/krb5.confd 233
@@ -10,6 +11,9 @@ MD5 fbb2a86038ab98ca0c7493ad9d55ace9 files/krb5.conf 541
 MD5 186bd4cbeff944079f44105d4c962c80 files/kdc.conf 438
 MD5 8b096b4ab22aec502c59b29325cd04ac files/digest-mit-krb5-1.2.6-r2 63
 MD5 8b096b4ab22aec502c59b29325cd04ac files/digest-mit-krb5-1.2.6-r3 63
+MD5 c214030264300e2d84375d23d7c1f892 files/mit-krb5kdc.initd 656
 MD5 589599adcbf4b8a7ce986449eef97428 files/digest-mit-krb5-1.2.7 136
+MD5 8b46231139151cf788c6f689c7fe8ba1 files/digest-mit-krb5-1.2.8 63
 MD5 c9cc84d6a3582384f84c6ccd9a4d8208 files/krb5-1.2.7-xdr.patch 3153
 MD5 589b9f6ef4cc8c9d8faf77528054cdf4 files/krb5-1.2.7-principal_name_handling.patch 2124
+MD5 61a61d22565605924a06789f9da352bf files/mit-krb5kadmind.initd 687
diff --git a/app-crypt/mit-krb5/files/digest-mit-krb5-1.2.8 b/app-crypt/mit-krb5/files/digest-mit-krb5-1.2.8
new file mode 100644
index 000000000000..71b0bb5dbf82
--- /dev/null
+++ b/app-crypt/mit-krb5/files/digest-mit-krb5-1.2.8
@@ -0,0 +1 @@
+MD5 99b840431ad2926de66d143cdd9307eb krb5-1.2.8.tar.gz 5496127
diff --git a/app-crypt/mit-krb5/files/mit-krb5kadmind.initd b/app-crypt/mit-krb5/files/mit-krb5kadmind.initd
new file mode 100644
index 000000000000..cb14afa20a3f
--- /dev/null
+++ b/app-crypt/mit-krb5/files/mit-krb5kadmind.initd
@@ -0,0 +1,31 @@
+#!/sbin/runscript
+
+#---------------------------------------------------------------------------
+# This script starts/stops the MIT Kerberos 5 Admin daemon
+#---------------------------------------------------------------------------
+
+daemon="MIT Kerberos 5 Admin daemon"	
+exec="/usr/sbin/kadmind"
+
+opts="start stop restart"
+
+depend() {
+	need net mit-krb5kdc 
+}
+
+start() {
+	ebegin "Starting $daemon"
+	start-stop-daemon --start --quiet --exec ${exec} 1>&2
+	eend $? "Error starting $daemon"
+}
+
+stop() { 
+        ebegin "Stopping $daemon"
+        start-stop-daemon --stop --quiet --oknodo --exec ${exec} 1>&2
+        eend $? "Error stopping $daemon"
+}
+
+restart() {
+   svc_stop
+   svc_start
+}
diff --git a/app-crypt/mit-krb5/files/mit-krb5kdc.initd b/app-crypt/mit-krb5/files/mit-krb5kdc.initd
new file mode 100644
index 000000000000..3162004f423e
--- /dev/null
+++ b/app-crypt/mit-krb5/files/mit-krb5kdc.initd
@@ -0,0 +1,31 @@
+#!/sbin/runscript
+
+#---------------------------------------------------------------------------
+# This script starts/stops the MIT Kerberos 5 KDC
+#---------------------------------------------------------------------------
+
+daemon="MIT Kerberos 5 KDC"	
+exec="/usr/sbin/krb5kdc"
+
+opts="start stop restart"
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting $daemon"
+	start-stop-daemon --start --quiet --exec ${exec} 1>&2
+	eend $? "Error starting $daemon"
+}
+
+stop() { 
+        ebegin "Stopping $daemon"
+        start-stop-daemon --stop --quiet --oknodo --exec ${exec} 1>&2
+        eend $? "Error stopping $daemon"
+}
+
+restart() {
+   svc_stop
+   svc_start
+}
diff --git a/app-crypt/mit-krb5/mit-krb5-1.2.8.ebuild b/app-crypt/mit-krb5/mit-krb5-1.2.8.ebuild
new file mode 100644
index 000000000000..df5cb8bcdaf9
--- /dev/null
+++ b/app-crypt/mit-krb5/mit-krb5-1.2.8.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.2.8.ebuild,v 1.1 2003/06/06 23:53:04 rphillips Exp $
+
+inherit eutils
+
+MY_P=${PN/mit-}-${PV}
+S=${WORKDIR}/${MY_P}/src
+SRC_URI="http://www.mirrors.wiretapped.net/security/cryptography/apps/kerberos/krb5-mit/unix/${MY_P}.tar.gz"
+DESCRIPTION="MIT Kerberos V"
+HOMEPAGE="http://web.mit.edu/kerberos/www/"
+IUSE="krb4 static"
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="~x86 ~sparc ~ppc ~alpha"
+PROVIDE="virtual/krb5"
+DEPEND="virtual/glibc"
+
+src_unpack() {
+	unpack ${A} ; cd ${S}
+
+        # Fix bad errno definitions (bug #16450 and #16267)
+        ebegin Fixing errno definitions
+        find . -name '*.[ch]' | xargs grep -l 'extern.*int.*errno' \
+          | xargs -n1 perl -pi.orig -e '
+                $.==1 && s/^/#include <errno.h>\n/;
+                s/extern\s+int\s+errno\s*\;//;'
+        eend $?
+}
+
+src_compile() {
+	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"
+
+	econf \
+                --with-ccopts="${CFLAGS}" \
+		--mandir=/usr/share/man \
+		--localstatedir=/etc \
+		--host=${CHOST} \
+		--prefix=/usr \
+		--enable-dns \
+		${myconf} || die
+
+	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,v4rcp,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/${P}/html/admin.html for documentation."
+	echo ""
+	einfo "The client apps are installed with the k prefix"
+	einfo "(ie. kftp, kftpd, ktelnet, ktelnetd, etc...)"
+	echo ""
+}