Fixes to allow heimdal to link.

7 files changed, 133 insertions, 8 deletions

diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index 2a071a9f20bf..dd0dcf010a50 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -1,13 +1,16 @@
 MD5 0e8dc4d4ee0b4149396b5af6052cd176 heimdal-0.6.ebuild 2684
 MD5 1870803f21f81294e8751238c106b435 heimdal-0.6.1.ebuild 2736
 MD5 a4398c35578c6ade246c1695fc259749 heimdal-0.6.1-r1.ebuild 2638
-MD5 4cf7825bcf9ec7143437f58165988aca ChangeLog 4893
+MD5 4c172e563d56c8e0d3354c433376ce25 ChangeLog 5052
 MD5 e5573e25f19694fc8ccaaced2dd576f4 metadata.xml 353
+MD5 9ef27b5c21d9bb7c71ca9f48f8573c43 heimdal-0.6.2.ebuild 2807
 MD5 35eed8dc7a9b322e4ed6220ef29cd1bc files/heimdal-0.6-berkdb.patch 542
 MD5 9cf5addf22f494dcf6c5aa9d16a372a8 files/digest-heimdal-0.6 64
 MD5 a97dade54c35f0835e9f067d825de8a5 files/digest-heimdal-0.6.1-r1 66
 MD5 3d0262aa218e1611500de735d3581e28 files/heimdal-0.6.1-fPIC.patch 352
+MD5 3d0262aa218e1611500de735d3581e28 files/heimdal-0.6.2-fPIC.patch 352
 MD5 8eb01abfea336bcb2791c23ef05a5b24 files/heimdal-0.6-rxapps.patch 729
 MD5 a97dade54c35f0835e9f067d825de8a5 files/digest-heimdal-0.6.1 66
+MD5 59cbfb44a4bd4c27cf0dd3943b50ae52 files/digest-heimdal-0.6.2 66
 MD5 bdcc2eedb42140afd25307f21aa5bb17 files/heimdal-0.6-gcc3.patch 466
 MD5 12c2f086658ad67e3ddaf1340cb9405a files/01heimdal 125
diff --git a/app-crypt/kth-krb/ChangeLog b/app-crypt/kth-krb/ChangeLog
index 7bf4f0643f91..64b97029ab45 100644
--- a/app-crypt/kth-krb/ChangeLog
+++ b/app-crypt/kth-krb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/kth-krb
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/kth-krb/ChangeLog,v 1.21 2004/05/01 00:14:41 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/kth-krb/ChangeLog,v 1.22 2004/05/10 11:43:56 aliz Exp $
+
+*kth-krb-1.2.2-r2 (10 May 2004)
+
+  10 May 2004; Daniel Ahlberg <aliz@gentoo.org> kth-krb-1.2.2-r2.ebuild:
+  + Added fPIC patch to allow heimdal to link to kth-krb libs.
+  + Added berkdb patch for newer versions of berkdb.  
 
   30 Apr 2004; Ryan Phillips <rphillips@gentoo.org> kth-krb-1.2.2-r1.ebuild:
   Added Weeve's patch for a sandbox violation
diff --git a/app-crypt/kth-krb/Manifest b/app-crypt/kth-krb/Manifest
index 4da50fb01b9e..1b1e109c0d9f 100644
--- a/app-crypt/kth-krb/Manifest
+++ b/app-crypt/kth-krb/Manifest
@@ -1,13 +1,17 @@
-MD5 8d9a567ceb3453663473a3be73b43992 ChangeLog 2395
-MD5 5f62e2a99e462ec87ec05412a3b50806 kth-krb-1.2.1.ebuild 1246
-MD5 1eb03ded1a14c0d284c09af27b698612 kth-krb-1.2.2.ebuild 1246
+MD5 cb931e15e93a855e7140800142d83b6d kth-krb-1.2.2-r2.ebuild 1478
 MD5 9f2a1a92792508433f529d4409f3c42f kth-krb-1.2.ebuild 1241
 MD5 6b1d8fe9677213372cea52972c918289 kth-krb-1.2.2-r1.ebuild 1410
+MD5 1eb03ded1a14c0d284c09af27b698612 kth-krb-1.2.2.ebuild 1246
+MD5 eaabaeff9ecce93000753f400fe04694 ChangeLog 2615
 MD5 059733ad92a101895ce18a1120b6eb55 metadata.xml 225
-MD5 be7f2f326e6022797dca6608b6248b7e files/02kth-krb 118
+MD5 5f62e2a99e462ec87ec05412a3b50806 kth-krb-1.2.1.ebuild 1246
+MD5 a4d154cc6e477b4c6a443592fab2d4d6 files/kth-krb-1.2.2-fPIC.patch 702
 MD5 2884941e77f936011c4c56d9af159ae6 files/digest-kth-krb-1.2 61
+MD5 55f56de790181ad8a1df5176a53551dd files/kth-gentoo-ssl.patch 6873
 MD5 38a19d9c77f2f822ae597ae120f34fc9 files/digest-kth-krb-1.2.1 63
 MD5 daffa490e9b86f52a9fe5b88559d00e2 files/digest-kth-krb-1.2.2 63
-MD5 c6ac0230ef8dc2b0476517e265a1bc4c files/kth-gentoo.patch 426
+MD5 35eed8dc7a9b322e4ed6220ef29cd1bc files/kth-krb-1.2.2-berkdb.patch 542
 MD5 daffa490e9b86f52a9fe5b88559d00e2 files/digest-kth-krb-1.2.2-r1 63
-MD5 55f56de790181ad8a1df5176a53551dd files/kth-gentoo-ssl.patch 6873
+MD5 daffa490e9b86f52a9fe5b88559d00e2 files/digest-kth-krb-1.2.2-r2 63
+MD5 be7f2f326e6022797dca6608b6248b7e files/02kth-krb 118
+MD5 c6ac0230ef8dc2b0476517e265a1bc4c files/kth-gentoo.patch 426
diff --git a/app-crypt/kth-krb/files/digest-kth-krb-1.2.2-r2 b/app-crypt/kth-krb/files/digest-kth-krb-1.2.2-r2
new file mode 100644
index 000000000000..93e0994665b4
--- /dev/null
+++ b/app-crypt/kth-krb/files/digest-kth-krb-1.2.2-r2
@@ -0,0 +1 @@
+MD5 e91fae1622a30a4e033092ef39c2b6b9 krb4-1.2.2.tar.gz 1876603
diff --git a/app-crypt/kth-krb/files/kth-krb-1.2.2-berkdb.patch b/app-crypt/kth-krb/files/kth-krb-1.2.2-berkdb.patch
new file mode 100644
index 000000000000..4b4ab86ca082
--- /dev/null
+++ b/app-crypt/kth-krb/files/kth-krb-1.2.2-berkdb.patch
@@ -0,0 +1,22 @@
+--- cf/db.m4	2004-03-30 09:00:23.315562886 +0000
++++ cf/db.m4	2004-03-30 09:00:47.278672201 +0000
+@@ -14,6 +14,8 @@
+ if test "$enable_berkeley_db" != no; then
+ 
+   AC_CHECK_HEADERS([				\
++	db4.2/db.h				\
++	db4.1/db.h				\
+ 	db4/db.h				\
+ 	db3/db.h				\
+ 	db.h					\
+@@ -24,6 +26,10 @@
+ 
+   AC_FIND_FUNC_NO_LIBS(db_create, db4 db3 db, [
+   #include <stdio.h>
++  #ifdef HAVE_DB4_2_DB_H
++  #include <db4.2/db.h>
++  #ifdef HAVE_DB4_1_DB_H
++  #include <db4.1/db.h>
+   #ifdef HAVE_DB4_DB_H
+   #include <db4/db.h>
+   #elif defined(HAVE_DB3_DB_H)
diff --git a/app-crypt/kth-krb/files/kth-krb-1.2.2-fPIC.patch b/app-crypt/kth-krb/files/kth-krb-1.2.2-fPIC.patch
new file mode 100644
index 000000000000..50bed7543b90
--- /dev/null
+++ b/app-crypt/kth-krb/files/kth-krb-1.2.2-fPIC.patch
@@ -0,0 +1,24 @@
+--- lib/krb/Makefile.in	2004-05-10 10:34:23.417620023 +0000
++++ lib/krb/Makefile.in	2004-05-10 10:34:38.720867551 +0000
+@@ -444,6 +444,9 @@
+ distclean-compile:
+ 	-rm -f *.tab.c
+ 
++$(am_libkrb_la_OBJECTS): %.lo: %.c
++	$(LTCOMPILE) -fPIC -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++
+ .c.o:
+ 	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+--- lib/roken/Makefile.in	2004-05-10 11:26:19.101133205 +0000
++++ lib/roken/Makefile.in	2004-05-10 11:27:01.150777015 +0000
+@@ -572,6 +572,9 @@
+ distclean-compile:
+ 	-rm -f *.tab.c
+ 
++$(am_libroken_la_OBJECTS): %.lo: %.c
++	$(LTCOMPILE) -fPIC -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++
+ .c.o:
+ 	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ 
diff --git a/app-crypt/kth-krb/kth-krb-1.2.2-r2.ebuild b/app-crypt/kth-krb/kth-krb-1.2.2-r2.ebuild
new file mode 100644
index 000000000000..353d0607513e
--- /dev/null
+++ b/app-crypt/kth-krb/kth-krb-1.2.2-r2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2004 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-r2.ebuild,v 1.1 2004/05/10 11:43:56 aliz Exp $
+
+inherit eutils
+
+DESCRIPTION="Kerberos 4 implementation from KTH"
+HOMEPAGE="http://www.pdc.kth.se/kth-krb/"
+SRC_URI="ftp://ftp.pdc.kth.se/pub/krb/src/krb4-${PV}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="x86 ppc sparc alpha ia64 amd64"
+IUSE="ssl afs"
+
+DEPEND="ssl? ( >=dev-libs/openssl-0.9.6b )
+	!amd64? ( afs? ( >=net-fs/openafs-1.2.2-r7 ) )"
+
+S=${WORKDIR}/krb4-${PV}
+
+src_compile() {
+	local myconf=""
+	echo ${PORTAGE_TMPDIR}
+
+	epatch ${FILESDIR}/kth-gentoo.patch
+	epatch ${FILESDIR}/kth-gentoo-ssl.patch
+	epatch ${FILESDIR}/${P}-berkdb.patch
+	epatch ${FILESDIR}/${P}-fPIC.patch
+
+	use ssl && myconf="${myconf} --with-openssl=/usr"
+
+	use afs || myconf="${myconf} --without-afs-support"
+
+	econf \
+		--prefix=/usr/athena \
+		${myconf} || die
+
+	make || die
+}
+
+src_install() {
+
+	make DESTDIR=${D} 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 DESTDIR=${D}/usr/athena \
+	 		install || die
+
+		cd ${S}
+	fi
+
+	dodir /etc/env.d
+	cp ${FILESDIR}/02kth-krb ${D}/etc/env.d
+
+	dodoc ChangeLog README NEWS PROBLEMS TODO
+
+	# rphillips: cludge to fix the paths
+	einfo "Fixing /usr/athena/lib library paths"
+	cd ${D}/usr/athena/lib
+	sed -i 's:${D}/::g' *.la
+}