security version bump. bug #46590

12 files changed, 55 insertions, 193 deletions

diff --git a/app-crypt/heimdal/ChangeLog b/app-crypt/heimdal/ChangeLog
index f9df6be91300..08bc013ee92f 100644
--- a/app-crypt/heimdal/ChangeLog
+++ b/app-crypt/heimdal/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-crypt/heimdal
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.23 2004/03/30 09:12:47 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.24 2004/04/07 18:24:01 solar Exp $
+
+*heimdal-0.6.1 (07 Apr 2004)
+
+  07 Apr 2004; <solar@gentoo.org> heimdal-0.4e-r1.ebuild,
+  heimdal-0.5.1-r1.ebuild, heimdal-0.5.1.ebuild, heimdal-0.5.ebuild,
+  heimdal-0.6.1.ebuild, metadata.xml:
+  security version bump. bug #46590
 
   30 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> heimdal-0.6.ebuild,
   files/heimdal-0.6-berkdb.patch:
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index 739ea7c5d8a8..1336d8e6ef5b 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -1,15 +1,10 @@
-MD5 fdd19765d39c772a4c1d5b47223e16c0 heimdal-0.5.1.ebuild 1317
-MD5 c4a2a7d5b732d94e225dd82386cceff7 heimdal-0.5.1-r1.ebuild 2240
+MD5 e7a698103786c23e4a97c2b4b30564f8 ChangeLog 3689
+MD5 727ced3992540d6a6f03cf048ab6b6f2 metadata.xml 381
 MD5 d0aa4f48342fc8c4550163330ec3d192 heimdal-0.6.ebuild 2574
-MD5 8fc197c92855920e4cf399b17501f1b1 heimdal-0.5.ebuild 1307
-MD5 841f1b3ef210302d451226b336af2033 ChangeLog 3456
-MD5 3076338903c640bb9e03b75adbe63604 heimdal-0.4e-r1.ebuild 1159
-MD5 35eed8dc7a9b322e4ed6220ef29cd1bc files/heimdal-0.6-berkdb.patch 542
-MD5 9938c171c490847ed838372b75d29d0c files/digest-heimdal-0.5 64
+MD5 2dd6e70298494ae7520fae3c6ccd08dc heimdal-0.6.1.ebuild 2618
+MD5 12c2f086658ad67e3ddaf1340cb9405a files/01heimdal 125
 MD5 9cf5addf22f494dcf6c5aa9d16a372a8 files/digest-heimdal-0.6 64
-MD5 4b0bf925049fd324edb977fa85fb907f files/digest-heimdal-0.4e-r1 65
-MD5 2da7cbb90cc55b12828f118553582ead files/digest-heimdal-0.5.1-r1 66
-MD5 8eb01abfea336bcb2791c23ef05a5b24 files/heimdal-0.6-rxapps.patch 729
-MD5 2da7cbb90cc55b12828f118553582ead files/digest-heimdal-0.5.1 66
 MD5 bdcc2eedb42140afd25307f21aa5bb17 files/heimdal-0.6-gcc3.patch 466
-MD5 12c2f086658ad67e3ddaf1340cb9405a files/01heimdal 125
+MD5 8eb01abfea336bcb2791c23ef05a5b24 files/heimdal-0.6-rxapps.patch 729
+MD5 35eed8dc7a9b322e4ed6220ef29cd1bc files/heimdal-0.6-berkdb.patch 542
+MD5 a97dade54c35f0835e9f067d825de8a5 files/digest-heimdal-0.6.1 66
diff --git a/app-crypt/heimdal/files/digest-heimdal-0.4e-r1 b/app-crypt/heimdal/files/digest-heimdal-0.4e-r1
deleted file mode 100644
index 72c111cdf5da..000000000000
--- a/app-crypt/heimdal/files/digest-heimdal-0.4e-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 239aa6841881f77db64faeaea47d7593 heimdal-0.4e.tar.gz 2893375
diff --git a/app-crypt/heimdal/files/digest-heimdal-0.5 b/app-crypt/heimdal/files/digest-heimdal-0.5
deleted file mode 100644
index 30e60c745345..000000000000
--- a/app-crypt/heimdal/files/digest-heimdal-0.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 43e0689e72168e537cd24bb25704db50 heimdal-0.5.tar.gz 3110281
diff --git a/app-crypt/heimdal/files/digest-heimdal-0.5.1 b/app-crypt/heimdal/files/digest-heimdal-0.5.1
deleted file mode 100644
index 1a8baebe1014..000000000000
--- a/app-crypt/heimdal/files/digest-heimdal-0.5.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bef2257673ddb9196702bf60c550ce53 heimdal-0.5.1.tar.gz 2979612
diff --git a/app-crypt/heimdal/files/digest-heimdal-0.5.1-r1 b/app-crypt/heimdal/files/digest-heimdal-0.5.1-r1
deleted file mode 100644
index 1a8baebe1014..000000000000
--- a/app-crypt/heimdal/files/digest-heimdal-0.5.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bef2257673ddb9196702bf60c550ce53 heimdal-0.5.1.tar.gz 2979612
diff --git a/app-crypt/heimdal/files/digest-heimdal-0.6.1 b/app-crypt/heimdal/files/digest-heimdal-0.6.1
new file mode 100644
index 000000000000..ee6f0f437db7
--- /dev/null
+++ b/app-crypt/heimdal/files/digest-heimdal-0.6.1
@@ -0,0 +1 @@
+MD5 20ef3dade89afc45eac9d8935a1a9cc0 heimdal-0.6.1.tar.gz 3312603
diff --git a/app-crypt/heimdal/heimdal-0.4e-r1.ebuild b/app-crypt/heimdal/heimdal-0.4e-r1.ebuild
deleted file mode 100644
index 42f03cabd813..000000000000
--- a/app-crypt/heimdal/heimdal-0.4e-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-0.4e-r1.ebuild,v 1.16 2004/02/22 18:13:01 agriffis Exp $
-
-DESCRIPTION="Kerberos 5 implementation from KTH"
-SRC_URI="ftp://ftp.pdc.kth.se/pub/heimdal/src/${P}.tar.gz"
-HOMEPAGE="http://www.pdc.kth.se/heimdal/"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="x86 -sparc"
-IUSE="ssl berkdb ipv6 ldap"
-
-DEPEND=">=app-crypt/kth-krb-1.1-r1
-	ssl? ( dev-libs/openssl )
-	ldap? ( net-nds/openldap )
-	berkdb? ( sys-libs/db )"
-
-src_compile() {
-	local myconf
-
-	use ssl && myconf="--with-openssl=/usr"
-
-	use ldap && myconf="${myconf} --with-open-ldap=/usr"
-
-	use ipv6 || myconf="${myconf} --without-ipv6"
-
-	use berkdb || myconf="${myconf} --without-berkely-db"
-
-	./configure --host=${CHOST} \
-		--prefix=/usr/heimdal \
-		--sysconfdir=/etc \
-		--with-krb4=/usr/athena \
-		${myconf} || die
-
-	make || die
-}
-
-src_install() {
-	make prefix=${D}/usr/heimdal \
-		sysconfdir=${D}/etc \
-		install || die
-
-	dodir /etc/env.d
-	cp ${FILESDIR}/01heimdal ${D}/etc/env.d
-
-	dodoc COPYRIGHT ChangeLog README NEWS PROBLEMS TODO
-}
diff --git a/app-crypt/heimdal/heimdal-0.5.1.ebuild b/app-crypt/heimdal/heimdal-0.5.1.ebuild
deleted file mode 100644
index 59efca3c5bfd..000000000000
--- a/app-crypt/heimdal/heimdal-0.5.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-0.5.1.ebuild,v 1.10 2004/02/22 18:13:01 agriffis Exp $
-
-DESCRIPTION="Kerberos 5 implementation from KTH"
-SRC_URI="ftp://ftp.pdc.kth.se/pub/heimdal/src/${P}.tar.gz"
-HOMEPAGE="http://www.pdc.kth.se/heimdal/"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="x86 -sparc"
-IUSE="ssl ldap berkdb ipv6"
-
-DEPEND=">=app-crypt/kth-krb-1.2.1
-	ssl? ( dev-libs/openssl )
-	ldap? ( net-nds/openldap )
-	berkdb? ( sys-libs/db )"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}/lib/krb5
-	sed -i "s:LIB_crypt = @LIB_crypt@:LIB_crypt = -lssl @LIB_crypt@:g" Makefile.in
-}
-
-src_compile() {
-	local myconf
-
-	use ssl && myconf="--with-openssl=/usr" || myconf="--without-openssl"
-
-	use ldap && myconf="${myconf} --with-open-ldap=/usr"
-
-	use ipv6 || myconf="${myconf} --without-ipv6"
-
-	use berkdb || myconf="${myconf} --without-berkely-db"
-
-	./configure --host=${CHOST} \
-		--prefix=/usr/heimdal \
-		--sysconfdir=/etc \
-		--with-krb4=/usr/athena \
-		${myconf} || die
-
-	emake || die
-}
-
-src_install() {
-	make prefix=${D}/usr/heimdal \
-		sysconfdir=${D}/etc \
-		install || die
-
-	dodir /etc/env.d
-	cp ${FILESDIR}/01heimdal ${D}/etc/env.d
-
-	dodoc COPYRIGHT ChangeLog README NEWS PROBLEMS TODO
-}
diff --git a/app-crypt/heimdal/heimdal-0.5.ebuild b/app-crypt/heimdal/heimdal-0.5.ebuild
deleted file mode 100644
index b9fd549e0128..000000000000
--- a/app-crypt/heimdal/heimdal-0.5.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-0.5.ebuild,v 1.9 2004/02/17 22:09:15 agriffis Exp $
-
-DESCRIPTION="Kerberos 5 implementation from KTH"
-SRC_URI="ftp://ftp.pdc.kth.se/pub/heimdal/src/${P}.tar.gz"
-HOMEPAGE="http://www.pdc.kth.se/heimdal/"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="x86 -sparc"
-IUSE="ssl ldap berkdb ipv6"
-
-DEPEND=">=app-crypt/kth-krb-1.1-r1
-	ssl? ( dev-libs/openssl )
-	ldap? ( net-nds/openldap )
-	berkdb? ( sys-libs/db )"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}/lib/krb5
-	sed -i "s:LIB_crypt = @LIB_crypt@:LIB_crypt = -lssl @LIB_crypt@:g" Makefile.in
-}
-
-src_compile() {
-	local myconf
-
-	use ssl && myconf="--with-openssl=/usr" || myconf="--without-openssl"
-
-	use ldap && myconf="${myconf} --with-open-ldap=/usr"
-
-	use ipv6 || myconf="${myconf} --without-ipv6"
-
-	use berkdb || myconf="${myconf} --without-berkely-db"
-
-	./configure --host=${CHOST} \
-		--prefix=/usr/heimdal \
-		--sysconfdir=/etc \
-		--with-krb4=/usr/athena \
-		${myconf}
-
-	make || die
-}
-
-src_install() {
-	make prefix=${D}/usr/heimdal \
-		sysconfdir=${D}/etc \
-		install || die
-
-	dodir /etc/env.d
-	cp ${FILESDIR}/01heimdal ${D}/etc/env.d
-
-	dodoc COPYRIGHT ChangeLog README NEWS PROBLEMS TODO
-}
diff --git a/app-crypt/heimdal/heimdal-0.5.1-r1.ebuild b/app-crypt/heimdal/heimdal-0.6.1.ebuild
index 0f41b6bf404e..b85d9ddfc15f 100644
--- a/app-crypt/heimdal/heimdal-0.5.1-r1.ebuild
+++ b/app-crypt/heimdal/heimdal-0.6.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-0.5.1-r1.ebuild,v 1.12 2004/02/17 22:09:15 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-0.6.1.ebuild,v 1.1 2004/04/07 18:24:01 solar Exp $
 
-inherit libtool
+inherit libtool eutils
 
 DESCRIPTION="Kerberos 5 implementation from KTH"
 SRC_URI="ftp://ftp.pdc.kth.se/pub/heimdal/src/${P}.tar.gz"
@@ -10,25 +10,33 @@ HOMEPAGE="http://www.pdc.kth.se/heimdal/"
 
 SLOT="0"
 LICENSE="as-is"
-KEYWORDS="x86 -sparc ~ppc"
-IUSE="ssl ldap berkdb ipv6 krb4"
+KEYWORDS="~x86 ~sparc ~ppc ~alpha ~ia64 ~amd64 ~hppa ~mips"
+IUSE="ssl ldap berkdb ipv6"
 PROVIDE="virtual/krb5"
 
 DEPEND="
-	krb4? ( >=app-crypt/kth-krb-1.2.1 )
 	ssl? ( dev-libs/openssl )
-	berkdb? ( sys-libs/db )"
+	berkdb? ( sys-libs/db )
+	!app-crypt/kth-krb
+	sys-devel/autoconf"
 	# ldap? ( net-nds/openldap )
 	# With this enabled, we create a multiple stage
 	# circular dependency with USE="ldap kerberos"
 	# -- Kain <kain@kain.org> 05 Dec 2002
 
 src_unpack() {
-	unpack ${A}
+	unpack ${A} ; cd ${S}
+
+	#epatch ${FILESDIR}/${PN}-${PV:0:3}-gcc3.patch
+	epatch ${FILESDIR}/${PN}-${PV:0:3}-rxapps.patch
+	epatch ${FILESDIR}/${PN}-${PV:0:3}-berkdb.patch
+
+	# Um, I don't think the below is doing anything since automake is
+	# run in src_compile(), but I'll leave it alone since this ebuild
+	# isn't mine... (16 Feb 2004 agriffis)
+	cd ${S}/lib/krb5 || die
+	sed -i "s:LIB_crypt = @LIB_crypt@:LIB_crypt = -lssl @LIB_crypt@:g" Makefile.in || die
 
-	cd ${S}/lib/krb5
-	mv Makefile.in Makefile.in.bak
-	sed -i "s:LIB_crypt = @LIB_crypt@:LIB_crypt = -lssl @LIB_crypt@:g" Makefile.in
 }
 
 src_compile() {
@@ -40,20 +48,23 @@ src_compile() {
 	automake -a || die "configure problem"
 	autoconf || die "configure problem"
 
-	local myconf
+	local myconf="
+		$(use_with ipv6)
+		$(use_with berkdb berkely-db)
+		--enable-shared"
 
-	use ssl && myconf="--with-openssl=/usr" || myconf="--without-openssl"
+	use ssl \
+		&& myconf="--with-openssl=/usr" \
+		|| myconf="--without-openssl"
 
 	#use ldap && myconf="${myconf} --with-open-ldap=/usr"
 
-	use ipv6 || myconf="${myconf} --without-ipv6"
-
-	use berkdb || myconf="${myconf} --without-berkely-db"
-	use krb4 && myconf="${myconf} --with-krb4=/usr/athena --disable-shared" \
-		|| myconf="${myconf} --enable-shared"
-
 	econf ${myconf}
 
+	# editline archive is linked into shared objects, needs to be
+	# built with -fPIC (16 Feb 2004 agriffis)
+	sed -i -e '/^CFLAGS\>/s/$/ -fPIC/' lib/editline/Makefile || die
+
 	emake || die
 }
 
diff --git a/app-crypt/heimdal/metadata.xml b/app-crypt/heimdal/metadata.xml
new file mode 100644
index 000000000000..830ed061a75c
--- /dev/null
+++ b/app-crypt/heimdal/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>no-herd</herd>
+	<maintainer>
+		<email>bug-wranglers@gentoo.org</email>
+		<description>This package lacks a primary herd or maintainer.</description>
+	</maintainer>
+	<longdescription>Kerberos 5 implementation from KTH</longdescription>
+</pkgmetadata>