patch included and new version

8 files changed, 83 insertions, 8 deletions

diff --git a/app-crypt/kth-krb/Manifest b/app-crypt/kth-krb/Manifest
index e593442b1b0f..ca0cd3e0c70a 100644
--- a/app-crypt/kth-krb/Manifest
+++ b/app-crypt/kth-krb/Manifest
@@ -1,7 +1,9 @@
-MD5 f76f8c5eb16fb149857517c4e4078153 ChangeLog 1367
-MD5 6846e83b01ad6c7156c229de88694456 kth-krb-1.2.1.ebuild 1232
-MD5 cd824e9c5946841057eaabaf586bcb38 kth-krb-1.2.ebuild 1225
-MD5 6846e83b01ad6c7156c229de88694456 kth-krb-1.2.2.ebuild 1232
+MD5 a7cd00ab114b82e225f5db11959b5fce ChangeLog 1532
+MD5 52d6c61f464a1dbbb09907a4d4a998d6 kth-krb-1.2.1.ebuild 1233
+MD5 81401f4edf1f8cdd62d9e400b737a729 kth-krb-1.1-r1.ebuild 1190
+MD5 40c5c3794b6a5da86ddd5ae068c43582 kth-krb-1.2.ebuild 1228
+MD5 c3279d8211021886f9136f98304ba5a1 kth-krb-1.2.2.ebuild 1233
+MD5 984fecc212fd1c9d6b4814c175994987 kth-krb-1.1.1.ebuild 1188
 MD5 be7f2f326e6022797dca6608b6248b7e files/02kth-krb 118
 MD5 daffa490e9b86f52a9fe5b88559d00e2 files/digest-kth-krb-1.2.2 63
 MD5 c6ac0230ef8dc2b0476517e265a1bc4c files/kth-gentoo.patch 426
diff --git a/app-crypt/kth-krb/files/digest-kth-krb-1.1-r1 b/app-crypt/kth-krb/files/digest-kth-krb-1.1-r1
deleted file mode 100644
index bdbc0ea8645b..000000000000
--- a/app-crypt/kth-krb/files/digest-kth-krb-1.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fc7a9f7a0d1c81e93a31a9409ee7ea00 krb4-1.1.tar.gz 1814096
diff --git a/app-crypt/kth-krb/files/digest-kth-krb-1.1.1 b/app-crypt/kth-krb/files/digest-kth-krb-1.1.1
deleted file mode 100644
index 8f31ef4e1967..000000000000
--- a/app-crypt/kth-krb/files/digest-kth-krb-1.1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 67cde032c81a1ec0b6883695117c1c0a krb4-1.1.1.tar.gz 1817919
diff --git a/app-crypt/kth-krb/files/digest-kth-krb-1.2.2 b/app-crypt/kth-krb/files/digest-kth-krb-1.2.2
new file mode 100644
index 000000000000..93e0994665b4
--- /dev/null
+++ b/app-crypt/kth-krb/files/digest-kth-krb-1.2.2
@@ -0,0 +1 @@
+MD5 e91fae1622a30a4e033092ef39c2b6b9 krb4-1.2.2.tar.gz 1876603
diff --git a/app-crypt/kth-krb/files/kth-gentoo.patch b/app-crypt/kth-krb/files/kth-gentoo.patch
new file mode 100644
index 000000000000..102dbf0e3c5f
--- /dev/null
+++ b/app-crypt/kth-krb/files/kth-gentoo.patch
@@ -0,0 +1,14 @@
+diff -urN krb4-1.2.2.old/lib/roken/getipnodebyname.c
+krb4-1.2.2/lib/roken/getipnodebyname.c
+--- krb4-1.2.2.old/lib/roken/getipnodebyname.c  1999-12-02 13:58:46.000000000 -0300
++++ krb4-1.2.2/lib/roken/getipnodebyname.c      2003-07-09 17:27:23.000000000 -0300
+@@ -39,7 +39,8 @@
+ #include "roken.h"
+
+ #ifndef HAVE_H_ERRNO
+-static int h_errno = NO_RECOVERY;
++//static int h_errno = NO_RECOVERY;
++#include <errno.h>
+ #endif
+
+ /*
diff --git a/app-crypt/kth-krb/kth-krb-1.2.1.ebuild b/app-crypt/kth-krb/kth-krb-1.2.1.ebuild
index 1444dbf42786..68584915a63d 100644
--- a/app-crypt/kth-krb/kth-krb-1.2.1.ebuild
+++ b/app-crypt/kth-krb/kth-krb-1.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/kth-krb/kth-krb-1.2.1.ebuild,v 1.7 2003/07/16 14:54:57 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/kth-krb/kth-krb-1.2.1.ebuild,v 1.8 2003/08/05 18:16:56 rphillips Exp $
 
 DESCRIPTION="Kerberos 4 implementation from KTH"
 SRC_URI="ftp://ftp.pdc.kth.se/pub/krb/src/krb4-${PV}.tar.gz"
@@ -19,6 +19,8 @@ S=${WORKDIR}/krb4-${PV}
 src_compile() {
 	local myconf=""
 
+	epatch ${FILESDIR}/kth-gentoo.patch
+
 	use ssl && myconf="${myconf} --with-openssl=/usr"
 
 	use afs || myconf="${myconf} --without-afs-support"
diff --git a/app-crypt/kth-krb/kth-krb-1.2.2.ebuild b/app-crypt/kth-krb/kth-krb-1.2.2.ebuild
new file mode 100644
index 000000000000..ad637ff86700
--- /dev/null
+++ b/app-crypt/kth-krb/kth-krb-1.2.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/kth-krb/kth-krb-1.2.2.ebuild,v 1.1 2003/08/05 18:16:56 rphillips Exp $
+
+DESCRIPTION="Kerberos 4 implementation from KTH"
+SRC_URI="ftp://ftp.pdc.kth.se/pub/krb/src/krb4-${PV}.tar.gz"
+HOMEPAGE="http://www.pdc.kth.se/kth-krb/"
+
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="x86 ppc"
+IUSE="ssl afs"
+
+DEPEND="ssl? ( >=dev-libs/openssl-0.9.6b )
+	afs? ( >=net-fs/openafs-1.2.2-r7 )"
+
+S=${WORKDIR}/krb4-${PV}
+
+src_compile() {
+	local myconf=""
+
+	epatch ${FILESDIR}/kth-gentoo.patch
+
+	use ssl && myconf="${myconf} --with-openssl=/usr"
+
+	use afs || myconf="${myconf} --without-afs-support"
+
+	./configure \
+		--host=${CHOST} \
+		--prefix=/usr/athena \
+		--sysconfdir=/etc \
+		${myconf} || die
+
+	make || die
+}
+
+src_install() {
+	make prefix=${D}/usr/athena \
+		sysconfdir=${D}/etc \
+		install || die
+
+	# Doesn't get install otherwise (for some reason, look into this).
+	if [ "`use ssl`" ] ; then
+		cd ${S}/lib/des
+
+		make prefix=${D}/usr/athena \
+	 		install || die
+
+		cd ${S}
+	fi
+
+	dodir /etc/env.d
+	cp ${FILESDIR}/02kth-krb ${D}/etc/env.d
+
+	dodoc COPYRIGHT ChangeLog README NEWS PROBLEMS TODO
+}
diff --git a/app-crypt/kth-krb/kth-krb-1.2.ebuild b/app-crypt/kth-krb/kth-krb-1.2.ebuild
index 35551a126130..8f01e907fee6 100644
--- a/app-crypt/kth-krb/kth-krb-1.2.ebuild
+++ b/app-crypt/kth-krb/kth-krb-1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/kth-krb/kth-krb-1.2.ebuild,v 1.5 2003/02/13 06:23:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/kth-krb/kth-krb-1.2.ebuild,v 1.6 2003/08/05 18:16:56 rphillips Exp $
 
 DESCRIPTION="Kerberos 4 implementation from KTH"
 SRC_URI="ftp://ftp.pdc.kth.se/pub/krb/src/krb4-${PV}.tar.gz"
@@ -19,6 +19,8 @@ S=${WORKDIR}/krb4-${PV}
 src_compile() {
 	local myconf=""
 
+	epatch ${FILESDIR}/kth-gentoo.patch
+
 	use ssl && myconf="${myconf} --with-openssl=/usr"
 
 	use afs || myconf="${myconf} --without-afs-support"