Added 1.3.6-r1 with ppc64 patch

5 files changed, 199 insertions, 40 deletions

diff --git a/app-crypt/mit-krb5/ChangeLog b/app-crypt/mit-krb5/ChangeLog
index 14519ada62d6..b03699cd69ea 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-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/ChangeLog,v 1.61 2004/12/30 18:19:04 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/ChangeLog,v 1.62 2004/12/31 10:10:41 corsair Exp $
+
+*mit-krb5-1.3.6-r1 (31 Dec 2004)
+
+  31 Dec 2004; Markus Rothe <corsair@gentoo.org> +mit-krb5-1.3.6-r1.ebuild,
+  mit-krb5-1.3.6.ebuild:
+  implemented Koon's suggestions from bug #75143
 
   30 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> mit-krb5-1.3.6.ebuild:
   Stable on alpha, bug 75143.
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index f703e9360f79..46770fc001d7 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -1,49 +1,41 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 973a633c7f812aa79e83a5c82c5b75e1 mit-krb5-1.3.4.ebuild 4332
-MD5 b44e7aba0b12d5f8ee680ed75a65a15b mit-krb5-1.3.1-r1.ebuild 4209
-MD5 6e5a23b5d0dbfeb16da847d61a51a54a ChangeLog 10156
-MD5 679ff451b45c63eb436f39d3351f6a88 mit-krb5-1.3.5-r1.ebuild 4354
-MD5 104eb5703eee4ec114c09cca0bfebb57 mit-krb5-1.3.6.ebuild 4213
 MD5 43c3a7a1974ef9610bb9458e1a3a4d87 metadata.xml 353
+MD5 b44e7aba0b12d5f8ee680ed75a65a15b mit-krb5-1.3.1-r1.ebuild 4209
+MD5 25c6e801e8e65ed06eb6995545b7f9a6 mit-krb5-1.3.1.ebuild 4176
 MD5 ca478361a3fb4943c5f0d6a13d380d50 mit-krb5-1.3.3-r1.ebuild 4310
 MD5 0c1b0790ee360b15d69f2570f90c3bef mit-krb5-1.3.3.ebuild 4204
 MD5 375c7c56158fa761abec14671e1e455f mit-krb5-1.3.4-r1.ebuild 4380
+MD5 973a633c7f812aa79e83a5c82c5b75e1 mit-krb5-1.3.4.ebuild 4332
+MD5 679ff451b45c63eb436f39d3351f6a88 mit-krb5-1.3.5-r1.ebuild 4354
 MD5 73e725dcff1255556054a6b8fc6477a7 mit-krb5-1.3.5.ebuild 4298
-MD5 25c6e801e8e65ed06eb6995545b7f9a6 mit-krb5-1.3.1.ebuild 4176
-MD5 fa5e3bd6fb521c29db85ce623905087b files/mit-krb5-1.3.6-ppc64.patch 923
-MD5 95cba23977319310f6cf67be1f97a65f files/mit-krb5-1.3.3-aname.patch.bz2 1829
+MD5 4425e36e8da8eed164672d510767c1ce mit-krb5-1.3.6.ebuild 4165
+MD5 9b9205c85d8debbf4a6eb5ac1e6beaad mit-krb5-1.3.6-r1.ebuild 4220
+MD5 dc62257340fcc94a2c59546f5e556119 ChangeLog 10342
+MD5 7b9b25de3cffdafa3d572dee9644f83e files/2004-002-patch_1.3.4.txt 7196
 MD5 6ddd962c015b6986004819321295aecd files/2004-003-patch_1.3.4.txt 592
-MD5 d7dcbbab51ce1849c77c083b8d363c15 files/krb5.initd 1486
-MD5 61a61d22565605924a06789f9da352bf files/mit-krb5kadmind.initd 687
+MD5 2c4ba0f8f9513fb2f285a9224f063ad8 files/digest-mit-krb5-1.3.1 63
 MD5 2c4ba0f8f9513fb2f285a9224f063ad8 files/digest-mit-krb5-1.3.1-r1 63
-MD5 4ddffa1df5b9fe9ad84da7f73526774c files/mit-krb5-1.3.5-res_search.patch.bz2 1992
 MD5 596ab1238ca3a14926eb5fd3947ab4ce files/digest-mit-krb5-1.3.3 60
-MD5 7b9b25de3cffdafa3d572dee9644f83e files/2004-002-patch_1.3.4.txt 7196
-MD5 1300b7bf5dff7e1b837041f55c565081 files/mit-krb5-1.3.5-suid_fix.patch.bz2 269
-MD5 435b8a123e8849fa5f92c9a7c53c514d files/mit-krb5-1.3.4-autoheader.patch.bz2 379
-MD5 2c4ba0f8f9513fb2f285a9224f063ad8 files/digest-mit-krb5-1.3.1 63
-MD5 bc450f834d336f154d1f850c2ab50c9c files/digest-mit-krb5-1.3.6 67
+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 1f5afce6458d8ca364f153965cd992ca files/digest-mit-krb5-1.3.4-r1 60
-MD5 c214030264300e2d84375d23d7c1f892 files/mit-krb5kdc.initd 656
-MD5 65a524c259b87b884c0f77739cc686e1 files/mit-krb5-1.3.4-tempfile.patch.bz2 791
-MD5 1f5afce6458d8ca364f153965cd992ca files/digest-mit-krb5-1.3.4 60
-MD5 4ddffa1df5b9fe9ad84da7f73526774c files/mit-krb5-1.3.4-res_search.patch.bz2 1992
-MD5 fbb2a86038ab98ca0c7493ad9d55ace9 files/krb5.conf 541
-MD5 4ddffa1df5b9fe9ad84da7f73526774c files/mit-krb5-1.3.3-res_search.patch.bz2 1992
-MD5 435b8a123e8849fa5f92c9a7c53c514d files/mit-krb5-1.3.5-autoheader.patch.bz2 379
-MD5 4ddffa1df5b9fe9ad84da7f73526774c files/mit-krb5-1.3.1-res_search.patch.bz2 1992
 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 435b8a123e8849fa5f92c9a7c53c514d files/mit-krb5-1.3.3-autoheader.patch.bz2 379
-MD5 596ab1238ca3a14926eb5fd3947ab4ce files/digest-mit-krb5-1.3.3-r1 60
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFB1EaiugEuf3OQ0akRAoI7AJ9y9Gq8E5vRTAp5K7HZu08BdxnYKQCeLtrJ
-cuH6k/5zhbK/WwEIv66nxI8=
-=FpHz
------END PGP SIGNATURE-----
+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 61a61d22565605924a06789f9da352bf files/mit-krb5kadmind.initd 687
+MD5 c214030264300e2d84375d23d7c1f892 files/mit-krb5kdc.initd 656
+MD5 bc450f834d336f154d1f850c2ab50c9c files/digest-mit-krb5-1.3.6 67
+MD5 fa5e3bd6fb521c29db85ce623905087b files/mit-krb5-1.3.6-ppc64.patch 923
+MD5 bc450f834d336f154d1f850c2ab50c9c files/digest-mit-krb5-1.3.6-r1 67
diff --git a/app-crypt/mit-krb5/files/digest-mit-krb5-1.3.6-r1 b/app-crypt/mit-krb5/files/digest-mit-krb5-1.3.6-r1
new file mode 100644
index 000000000000..11ae258ef189
--- /dev/null
+++ b/app-crypt/mit-krb5/files/digest-mit-krb5-1.3.6-r1
@@ -0,0 +1 @@
+MD5 18d5a6a8e1cce120536718d39a052a87 krb5-1.3.6-signed.tar 6533120
diff --git a/app-crypt/mit-krb5/mit-krb5-1.3.6-r1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.3.6-r1.ebuild
new file mode 100644
index 000000000000..fee374fa9319
--- /dev/null
+++ b/app-crypt/mit-krb5/mit-krb5-1.3.6-r1.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2004 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-r1.ebuild,v 1.1 2004/12/31 10:10:41 corsair Exp $
+
+inherit eutils
+
+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 ~arm ~amd64 ~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}
+	use ppc64 && epatch ${FILESDIR}/${P}-ppc64.patch
+}
+
+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 ""
+}
diff --git a/app-crypt/mit-krb5/mit-krb5-1.3.6.ebuild b/app-crypt/mit-krb5/mit-krb5-1.3.6.ebuild
index dab46bbcba5f..dbb0dd4d7023 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.3.6.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.3.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.ebuild,v 1.6 2004/12/30 18:19:04 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.3.6.ebuild,v 1.7 2004/12/31 10:10:41 corsair Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ SRC_URI="http://web.mit.edu/kerberos/dist/krb5/1.3/${MY_P}-signed.tar"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="alpha ~arm ~amd64 ~hppa ~ia64 mips ~ppc ppc64 ~s390 sparc ~x86"
+KEYWORDS="alpha ~arm ~amd64 ~hppa ~ia64 mips ~ppc ~ppc64 ~s390 sparc ~x86"
 IUSE="krb4 static"
 
 DEPEND="virtual/libc
@@ -26,7 +26,6 @@ src_unpack() {
 	unpack ${A}
 	tar -zxf ${MY_P}.tar.gz
 	cd ${S}
-	use ppc64 && epatch ${FILESDIR}/${P}-ppc64.patch
 }
 
 src_compile() {