restore 1.3.6 at the request of: WGi <wgi@muenster.de> in bug #98303, but I'll like to get 1.4.1 solved and working for people

(Portage version: 2.0.51.22-r1)

6 files changed, 201 insertions, 3 deletions

diff --git a/app-crypt/mit-krb5/ChangeLog b/app-crypt/mit-krb5/ChangeLog
index 99bd78551939..f7db74e5a1cd 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/ChangeLog,v 1.95 2005/07/12 21:03:18 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/ChangeLog,v 1.96 2005/07/13 13:08:28 seemant Exp $
+
+*mit-krb5-1.3.6-r3 (13 Jul 2005)
+
+  13 Jul 2005; Seemant Kulleen <seemant@gentoo.org>
+  -files/mit-krb5-1.4.1-lazyldflags.patch,
+  +files/mit-krb5-lazyldflags.patch, +mit-krb5-1.3.6-r3.ebuild,
+  mit-krb5-1.4.1-r2.ebuild:
+  restore 1.3.6 at the request of: WGi <wgi@muenster.de> in bug #98303, but
+  I'll like to get 1.4.1 solved and working for people
 
 *mit-krb5-1.4.1-r2 (12 Jul 2005)
 
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index deefd42732e1..8c2b8c49997b 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -1,6 +1,7 @@
 MD5 7f1023254ec1e19011d199bad8a3c2b1 ChangeLog 16462
 MD5 f3ea9dd1d52f37139fbc4d101044f821 metadata.xml 241
 MD5 5a42cd89c7ecfac45c2d7ea824583b50 mit-krb5-1.4.1-r2.ebuild 3073
+MD5 53f28a9d5cb4caa70a6422c192160d0c mit-krb5-1.3.6-r3.ebuild 4783
 MD5 186bd4cbeff944079f44105d4c962c80 files/kdc.conf 438
 MD5 fbb2a86038ab98ca0c7493ad9d55ace9 files/krb5.conf 541
 MD5 c451148d1b3e182a19a8f9084d0b55b8 files/krb5.confd 233
@@ -9,3 +10,4 @@ MD5 ae7e2bde0b20e580f49d5a3c524b445b files/mit-krb5-1.4.1-lazyldflags.patch 509
 MD5 61a61d22565605924a06789f9da352bf files/mit-krb5kadmind.initd 687
 MD5 c214030264300e2d84375d23d7c1f892 files/mit-krb5kdc.initd 656
 MD5 bd5b2d0e988dc8f634c70e965d75cb3a files/digest-mit-krb5-1.4.1-r2 200
+MD5 f77b53fd98753864e67d28bed3fd9948 files/digest-mit-krb5-1.3.6-r3 276
diff --git a/app-crypt/mit-krb5/files/digest-mit-krb5-1.3.6-r3 b/app-crypt/mit-krb5/files/digest-mit-krb5-1.3.6-r3
new file mode 100644
index 000000000000..21b2200314f3
--- /dev/null
+++ b/app-crypt/mit-krb5/files/digest-mit-krb5-1.3.6-r3
@@ -0,0 +1,4 @@
+MD5 18d5a6a8e1cce120536718d39a052a87 krb5-1.3.6-signed.tar 6533120
+MD5 251797420e6f2e8334cadbdfd494e099 mit-krb5-1.3.6-gentoo-0.1.tar.bz2 1934
+MD5 c00d48c6425ab6a40d7a0a9377a5a1da 2005-002-patch_1.4.1.txt 2482
+MD5 520eb464c5171563818ec9e3b82b0117 2005-003-patch_1.4.1.txt 885
diff --git a/app-crypt/mit-krb5/files/mit-krb5-1.4.1-lazyldflags.patch b/app-crypt/mit-krb5/files/mit-krb5-lazyldflags.patch
index ad2adc1dd0dc..ad2adc1dd0dc 100644
--- a/app-crypt/mit-krb5/files/mit-krb5-1.4.1-lazyldflags.patch
+++ b/app-crypt/mit-krb5/files/mit-krb5-lazyldflags.patch
diff --git a/app-crypt/mit-krb5/mit-krb5-1.3.6-r3.ebuild b/app-crypt/mit-krb5/mit-krb5-1.3.6-r3.ebuild
new file mode 100644
index 000000000000..dcd510f89350
--- /dev/null
+++ b/app-crypt/mit-krb5/mit-krb5-1.3.6-r3.ebuild
@@ -0,0 +1,183 @@
+# 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-r3.ebuild,v 1.1 2005/07/13 13:08:28 seemant Exp $
+
+inherit eutils
+
+MY_P=${PN/mit-}-${PV}
+S=${WORKDIR}/${MY_P}/src
+PATCHVER=0.1
+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
+	http://dev.gentoo.org/~seemant/distfiles/${P}-gentoo-${PATCHVER}.tar.bz2
+	mirror://gentoo/${P}-gentoo-${PATCHVER}.tar.bz2
+	http://web.mit.edu/kerberos/advisories/2005-002-patch_1.4.1.txt
+	http://web.mit.edu/kerberos/advisories/2005-003-patch_1.4.1.txt"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
+IUSE="krb4 static"
+
+RDEPEND="virtual/libc
+	!virtual/krb5"
+
+DEPEND="${RDEPEND}
+	sys-libs/com_err
+	sys-libs/ss
+	sys-devel/autoconf"
+
+PROVIDE="virtual/krb5"
+
+PATCHDIR=${WORKDIR}/gentoo/patches
+
+src_unpack() {
+	unpack ${P}-gentoo-${PATCHVER}.tar.bz2
+	unpack ${MY_P}-signed.tar; tar zxf ${MY_P}.tar.gz; cd ${S}
+
+
+	EPATCH_SUFFIX="patch" epatch ${PATCHDIR}
+
+	epatch ${FILESDIR}/${PN}-lazyldflags.patch
+
+	EPATCH_SUFFIX="txt" \
+		epatch ${DISTDIR}/2005-002-patch_1.4.1.txt
+
+	EPATCH_SUFFIX="txt" \
+		epatch ${DISTDIR}/2005-003-patch_1.4.1.txt
+}
+
+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 $?
+
+
+	CFLAGS="${CFLAGS}" \
+	CXXFLAGS="${CXXFLAGS}" \
+	LDFLAGS="${LDFLAGS}" \
+		econf \
+			$(use_with krb4) $(use_enable krb4) \
+			$(use_enable static) \
+			--localstatedir=/etc \
+			--enable-shared \
+			--with-system-et --with-system-ss \
+			--enable-dns || die
+
+	if [ "${ARCH}" = "hppa" ]
+	then
+		ebegin "Fixing Makefiles"
+		for i in `find ${S} -name Makefile`; do
+			sed -i 's/\(LDCOMBINE=\)ld \(-shared -h lib\)/\1gcc \2/' ${i}
+		done
+		eend $?
+	fi
+
+	MAKEOPTS="-j1" emake || die
+}
+
+src_test() {
+	einfo "Tests fail for now, so make check is disabled"
+}
+
+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
+	doins ${FILESDIR}/krb5.conf
+	insinto /etc/krb5kdc
+	doins ${FILESDIR}/kdc.conf
+
+	newinitd ${FILESDIR}/mit-krb5kadmind.initd mit-krb5kadmind
+	newinitd ${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
+	ewarn "PLEASE READ THIS"
+	einfo "This release of mit-krb4 now depends on an external version"
+	einfo "of the com_err and ss libraries. Please make sure to run"
+	einfo "revdep-rebuild to ensure the integrity of the linking on your"
+	einfo "system"
+	echo
+	epause 10
+	ebeep
+}
diff --git a/app-crypt/mit-krb5/mit-krb5-1.4.1-r2.ebuild b/app-crypt/mit-krb5/mit-krb5-1.4.1-r2.ebuild
index 1baefcdb6815..87726b8d450d 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.4.1-r2.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.4.1-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.4.1-r2.ebuild,v 1.1 2005/07/12 21:03:18 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.4.1-r2.ebuild,v 1.2 2005/07/13 13:08:28 seemant Exp $
 
 inherit eutils flag-o-matic versionator
 
@@ -31,7 +31,7 @@ PROVIDE="virtual/krb5"
 
 src_unpack() {
 	unpack ${MY_P}-signed.tar; tar zxf ${MY_P}.tar.gz; cd ${S}
-	epatch ${FILESDIR}/${P}-lazyldflags.patch
+	epatch ${FILESDIR}/${PN}-lazyldflags.patch
 
 	EPATCH_SUFFIX="txt" \
 		epatch ${DISTDIR}/2005-002-patch_${PV}.txt