Misc fixes

7 files changed, 231 insertions, 21 deletions

diff --git a/app-crypt/heimdal/ChangeLog b/app-crypt/heimdal/ChangeLog
index 8a7f7d680f5f..812cc6f9f224 100644
--- a/app-crypt/heimdal/ChangeLog
+++ b/app-crypt/heimdal/ChangeLog
@@ -1,6 +1,26 @@
 # ChangeLog for app-crypt/heimdal
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.53 2004/09/15 22:40:44 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.54 2004/09/17 22:55:39 aliz Exp $
+
+*heimdal-0.6.3-r1 (17 Sep 2004)
+
+  17 Sep 2004; Daniel Ahlberg <aliz@gentoo.org> heimdal-0.6.2-r1.ebuild,
+  heimdal-0.6.2.ebuild, heimdal-0.6.3-r1.ebuild,
+  files/heimdal-0.6-berkdb.patch, files/heimdal-0.6-berkdb.patch.bz2,
+  files/heimdal-0.6-gcc3.patch, files/heimdal-0.6-gcc3.patch.bz2,
+  files/heimdal-0.6-rxapps.patch, files/heimdal-0.6-rxapps.patch.bz2,
+  files/heimdal-0.6.1-fPIC.patch, files/heimdal-0.6.1-fPIC.patch.bz2,
+  files/heimdal-0.6.2-fPIC.patch, files/heimdal-0.6.2-fPIC.patch.bz2,
+  files/heimdal-0.6.3-berkdb.patch.bz2, files/heimdal-0.6.3-fPIC.patch.bz2,
+  files/heimdal-0.6.3-ldap-subtree.patch,
+  files/heimdal-0.6.3-ldap-subtree.patch.bz2,
+  files/heimdal-0.6.3-no_libedit.patch.bz2,
+  files/heimdal-0.6.3-rxapps.patch.bz2, files/heimdal-0.6.3.all.patch:
+
+  + Don't check for el_init in -ledit, thanks to Jason Wever <wever@gentoo.org> for finding the bug.
+  + Split heimdal-0.6.3.all.patch.
+  + Added suid fix patch instead of appending flags to ldflags globally.
+  + Compressed patches.
 
   16 Sep 2004; Bryan Østergaard,,, <kloeri@gentoo.org> heimdal-0.6.3.ebuild:
   Stable on alpha, bug 61412.
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index 46519bdf5fa6..0fa59c72c577 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -1,21 +1,28 @@
-MD5 7be76695998e4ec3ca2beba0c582622b heimdal-0.6.2-r1.ebuild 3139
-MD5 e35c57eef5261146988f0bd8efea82a1 heimdal-0.6.3.ebuild 2953
-MD5 8df0f96350f4dd138e49bd6c84a238d3 ChangeLog 7517
+MD5 d9c89cf0a6eee0c3a90d75dea14fe0f3 heimdal-0.6.2-r1.ebuild 3168
+MD5 5de88bfe12a67d1fd55f394328bba3e2 heimdal-0.6.3.ebuild 2957
+MD5 e1a0133c06b9c5d61a94ee3f3ad172f6 ChangeLog 8532
 MD5 e5573e25f19694fc8ccaaced2dd576f4 metadata.xml 353
-MD5 bf72d9d820834284e0f4681b508bac49 heimdal-0.6.2.ebuild 2810
-MD5 35eed8dc7a9b322e4ed6220ef29cd1bc files/heimdal-0.6-berkdb.patch 542
+MD5 7463392c85ec1e6ecc40e619ff6d3302 heimdal-0.6.3-r1.ebuild 3076
+MD5 f4711f31649a981dab1bf339940d2c38 heimdal-0.6.2.ebuild 2822
+MD5 1199c4a4a38e9c2b2c0a99bd5781767a files/heimdal-0.6.3-no_libedit.patch 389
+MD5 2ef8e452d46ff88fdca9321e7371ee73 files/heimdal-0.6.3-berkdb.patch.bz2 361
+MD5 e7bee43b270f79fb99ccd79e8f0d6fe0 files/heimdal-0.6.3-ldap-subtree.patch.bz2 472
 MD5 0f222a777af729dc4d6076ab03342056 files/krb5.conf 423
 MD5 59cbfb44a4bd4c27cf0dd3943b50ae52 files/digest-heimdal-0.6.2-r1 66
+MD5 3927bef9ae6c9b6cf6c5d6eb9c2bfcf7 files/digest-heimdal-0.6.3-r1 66
+MD5 0ff5ffd13efa173c639c67d7f55261de files/heimdal-0.6.3-rxapps.patch.bz2 378
 MD5 f0e0f39d4efb0fe27133d47bff91e453 files/heimdal-0.6.3.all.patch 2313
-MD5 52dcc61b4dcb2747e0f2cbd2b1b3186f files/heimdal-0.6.3-ldap-subtree.patch 737
-MD5 3d0262aa218e1611500de735d3581e28 files/heimdal-0.6.1-fPIC.patch 352
+MD5 6dc7d9f2166d5c130a8ed3303ec74f04 files/heimdal-0.6-gcc3.patch.bz2 292
 MD5 06ae43d9ec1ce6f03630f6bd5e1631eb files/krb5-kdc.schema 4051
 MD5 2be6ab7b49a076e078f34913d65bcaad files/heimdal-kdc 514
-MD5 3d0262aa218e1611500de735d3581e28 files/heimdal-0.6.2-fPIC.patch 352
-MD5 8eb01abfea336bcb2791c23ef05a5b24 files/heimdal-0.6-rxapps.patch 729
+MD5 aef635716540deadcfca7b31b2689d11 files/heimdal-0.6.3-fPIC.patch.bz2 316
+MD5 be01246cb05aad324798612f8afba51d files/heimdal-0.6.3-suid_fix.patch.bz2 368
+MD5 2ef8e452d46ff88fdca9321e7371ee73 files/heimdal-0.6-berkdb.patch.bz2 361
+MD5 aef635716540deadcfca7b31b2689d11 files/heimdal-0.6.2-fPIC.patch.bz2 316
 MD5 f4811d443f68fe11946a031ada8ce125 files/heimdal-kpasswdd 551
+MD5 0ff5ffd13efa173c639c67d7f55261de files/heimdal-0.6-rxapps.patch.bz2 378
 MD5 59cbfb44a4bd4c27cf0dd3943b50ae52 files/digest-heimdal-0.6.2 66
 MD5 3927bef9ae6c9b6cf6c5d6eb9c2bfcf7 files/digest-heimdal-0.6.3 66
-MD5 bdcc2eedb42140afd25307f21aa5bb17 files/heimdal-0.6-gcc3.patch 466
 MD5 12c2f086658ad67e3ddaf1340cb9405a files/01heimdal 125
+MD5 aef635716540deadcfca7b31b2689d11 files/heimdal-0.6.1-fPIC.patch.bz2 316
 MD5 0becad2fb5b2e15b30b47b2939304647 files/heimdal-kadmind 546
diff --git a/app-crypt/heimdal/files/heimdal-0.6.3.all.patch b/app-crypt/heimdal/files/heimdal-0.6.3.all.patch
new file mode 100644
index 000000000000..9f898af0727d
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal-0.6.3.all.patch
@@ -0,0 +1,62 @@
+diff -ru heimdal-0.6.3.orig/appl/kx/rxtelnet.in heimdal-0.6.3/appl/kx/rxtelnet.in
+--- heimdal-0.6.3.orig/appl/kx/rxtelnet.in	2002-03-19 03:07:34.000000000 +0930
++++ heimdal-0.6.3/appl/kx/rxtelnet.in	2004-09-13 23:34:02.154228824 +0930
+@@ -2,7 +2,7 @@
+ # $Id: heimdal-0.6.3.all.patch,v 1.3 2004/09/17 22:55:39 aliz Exp $
+ #
+ usage="Usage: $0 [-l username] [-k] [-f] [-t args_to_telnet] [-x args_to_xterm] [-K args_to_kx] [-w term_emulator] [-b telnet_binary] [-n] [-v] [-h | --help] [--version] host [port]"
+-binary=telnet
++binary=ktelnet
+ term=
+ kx_args=-P
+ while true
+Only in heimdal-0.6.3/appl/kx: rxtelnet.in.orig
+diff -ru heimdal-0.6.3.orig/appl/kx/rxterm.in heimdal-0.6.3/appl/kx/rxterm.in
+--- heimdal-0.6.3.orig/appl/kx/rxterm.in	2002-03-19 03:07:34.000000000 +0930
++++ heimdal-0.6.3/appl/kx/rxterm.in	2004-09-13 23:34:02.155227672 +0930
+@@ -2,7 +2,7 @@
+ # $Id: heimdal-0.6.3.all.patch,v 1.3 2004/09/17 22:55:39 aliz Exp $
+ #
+ usage="Usage: $0 [-l username] [-k] [-f] [-r rsh_args] [-x xterm_args] [-K kx_args] [-w term_emulator] [-b rsh_binary][-v] [-h | --help] [--version] host"
+-binary=rsh
++binary=krsh
+ term=xterm
+ while true
+ do
+Only in heimdal-0.6.3/appl/kx: rxterm.in.orig
+diff -ru heimdal-0.6.3.orig/cf/db.m4 heimdal-0.6.3/cf/db.m4
+--- heimdal-0.6.3.orig/cf/db.m4	2002-09-10 23:59:47.000000000 +0930
++++ heimdal-0.6.3/cf/db.m4	2004-09-13 23:37:13.174919192 +0930
+@@ -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 -ru heimdal-0.6.3.orig/lib/editline/Makefile.am heimdal-0.6.3/lib/editline/Makefile.am
+--- heimdal-0.6.3.orig/lib/editline/Makefile.am	2002-08-13 23:18:15.000000000 +0930
++++ heimdal-0.6.3/lib/editline/Makefile.am	2004-09-13 23:30:53.917327832 +0930
+@@ -47,6 +47,9 @@
+ 
+ EXTRA_DIST = $(man_MANS)
+ 
++$(libeditline_la_OBJECTS): %.lo: %.c
++	$(LTCOMPILE) -fPIC -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++
+ snprintf.c:
+ 	$(LN_S) $(srcdir)/../roken/snprintf.c .
+ strdup.c:
diff --git a/app-crypt/heimdal/heimdal-0.6.2-r1.ebuild b/app-crypt/heimdal/heimdal-0.6.2-r1.ebuild
index 690d05698a29..9c77f3018c8d 100644
--- a/app-crypt/heimdal/heimdal-0.6.2-r1.ebuild
+++ b/app-crypt/heimdal/heimdal-0.6.2-r1.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/heimdal/heimdal-0.6.2-r1.ebuild,v 1.2 2004/09/15 00:27:38 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-0.6.2-r1.ebuild,v 1.3 2004/09/17 22:55:39 aliz Exp $
 
 inherit libtool eutils
 
@@ -32,9 +32,9 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A} ; cd ${S}
 
-	epatch ${FILESDIR}/${PN}-${PV:0:3}-rxapps.patch
-	epatch ${FILESDIR}/${PN}-${PV:0:3}-berkdb.patch
-	epatch ${FILESDIR}/${P}-fPIC.patch
+	epatch ${FILESDIR}/${PN}-${PV:0:3}-rxapps.patch.bz2
+	epatch ${FILESDIR}/${PN}-${PV:0:3}-berkdb.patch.bz2
+	epatch ${FILESDIR}/${P}-fPIC.patch.bz2
 
 	# 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
@@ -83,6 +83,7 @@ src_install() {
 		datadir=${D}/usr/share \
 		localstatedir=${D}/var/lib \
 		includedir=${D}/usr/include/heimdal \
+		DESTDIR=${D} \
 		install || die
 
 	#dodir /etc/env.d
diff --git a/app-crypt/heimdal/heimdal-0.6.2.ebuild b/app-crypt/heimdal/heimdal-0.6.2.ebuild
index df90a48d4c5c..16ac53a41b06 100644
--- a/app-crypt/heimdal/heimdal-0.6.2.ebuild
+++ b/app-crypt/heimdal/heimdal-0.6.2.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/heimdal/heimdal-0.6.2.ebuild,v 1.11 2004/06/24 21:32:53 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-0.6.2.ebuild,v 1.12 2004/09/17 22:55:39 aliz Exp $
 
 inherit libtool eutils
 
@@ -32,9 +32,9 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A} ; cd ${S}
 
-	epatch ${FILESDIR}/${PN}-${PV:0:3}-rxapps.patch
-	epatch ${FILESDIR}/${PN}-${PV:0:3}-berkdb.patch
-	epatch ${FILESDIR}/${P}-fPIC.patch
+	epatch ${FILESDIR}/${PN}-${PV:0:3}-rxapps.patch.bz2
+	epatch ${FILESDIR}/${PN}-${PV:0:3}-berkdb.patch.bz2
+	epatch ${FILESDIR}/${P}-fPIC.patch.bz2
 
 	# 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
diff --git a/app-crypt/heimdal/heimdal-0.6.3-r1.ebuild b/app-crypt/heimdal/heimdal-0.6.3-r1.ebuild
new file mode 100644
index 000000000000..80618ab424a6
--- /dev/null
+++ b/app-crypt/heimdal/heimdal-0.6.3-r1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-0.6.3-r1.ebuild,v 1.1 2004/09/17 22:55:39 aliz Exp $
+
+inherit libtool eutils
+
+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 ppc alpha ~ia64 amd64 hppa ~mips"
+IUSE="ssl berkdb ipv6 krb4 ldap"
+PROVIDE="virtual/krb5"
+
+RDEPEND="ssl? ( dev-libs/openssl )
+	berkdb? ( sys-libs/db )
+	krb4? ( >=app-crypt/kth-krb-1.2.2-r2 )
+	ldap? ( net-nds/openldap )
+	!virtual/krb5"
+
+	# With this enabled, we create a multiple stage
+	# circular dependency with USE="ldap kerberos"
+	# -- Kain <kain@kain.org> 05 Dec 2002
+
+DEPEND="${RDEPEND}
+	sys-devel/autoconf
+	sys-devel/automake
+	sys-devel/gcc
+	>=sys-apps/sed-4"
+
+src_unpack() {
+	unpack ${A} ; cd ${S}
+
+	epatch ${FILESDIR}/${P}-ldap-subtree.patch.bz2
+	epatch ${FILESDIR}/${P}-no_libedit.patch.bz2
+	epatch ${FILESDIR}/${P}-fPIC.patch.bz2
+	epatch ${FILESDIR}/${P}-rxapps.patch.bz2
+	epatch ${FILESDIR}/${P}-berkdb.patch.bz2
+	epatch ${FILESDIR}/${P}-suid_fix.patch.bz2
+}
+
+src_compile() {
+	elibtoolize
+
+	aclocal -I cf || die "configure problem"
+	autoheader || die "configure problem"
+	automake -a || die "configure problem"
+	autoconf || die "configure problem"
+
+	local myconf="
+		$(use_with ipv6)
+		$(use_with berkdb berkeley-db)
+		$(use_with ssl openssl)
+		--enable-shared
+		--includedir=/usr/include/heimdal
+		--libexecdir=/usr/sbin"
+
+	use krb4 \
+		&& myconf="${myconf} --with-krb4 --with-krb4-config=/usr/athena/bin/krb4-config" \
+		|| myconf="${myconf} --without-krb4"
+
+	use ldap && myconf="${myconf} --with-openldap=/usr"
+
+	econf ${myconf} || die "econf failed"
+	emake		|| die
+}
+
+src_install() {
+	make DESTDIR=${D} \
+		install || die
+
+	dodoc ChangeLog README NEWS TODO
+
+	# 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}
+	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
+
+	# Create symlinks for the includes
+	cd ${D}/usr/include/ && \
+		ln -s heimdal gssapi && \
+		ln -s heimdal/krb5-types.h krb5-types.h && \
+		ln -s heimdal/krb5.h krb5.h && \
+		ln -s heimdal/asn1_err.h asn1_err.h && \
+		ln -s heimdal/krb5_asn1.h krb5_asn1.h && \
+		ln -s heimdal/krb5_err.h krb5_err.h && \
+		ln -s heimdal/heim_err.h heim_err.h && \
+		ln -s heimdal/k524_err.h k524_err.h && \
+		ln -s heimdal/krb5-protos.h krb5-protos.h \
+	|| die "Creation of include symlinks failed."
+
+	dodir /etc/init.d
+	exeinto /etc/init.d
+
+	doexe ${FILESDIR}/heimdal-kdc \
+		${FILESDIR}/heimdal-kadmind \
+		${FILESDIR}/heimdal-kpasswdd
+
+	insinto /etc
+		newins ${FILESDIR}/krb5.conf krb5.conf
+
+	if use ldap;
+	then
+		insinto /etc/openldap/schema
+		newins ${FILESDIR}/krb5-kdc.schema krb5-kdc.schema
+	fi
+
+
+	# default database dir
+	dodir /var/heimdal
+}
diff --git a/app-crypt/heimdal/heimdal-0.6.3.ebuild b/app-crypt/heimdal/heimdal-0.6.3.ebuild
index e0d4ef389846..8f2df5fb08b7 100644
--- a/app-crypt/heimdal/heimdal-0.6.3.ebuild
+++ b/app-crypt/heimdal/heimdal-0.6.3.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/heimdal/heimdal-0.6.3.ebuild,v 1.8 2004/09/15 22:40:44 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-0.6.3.ebuild,v 1.9 2004/09/17 22:55:39 aliz Exp $
 
 inherit libtool eutils flag-o-matic
 
@@ -35,7 +35,7 @@ src_unpack() {
 
 	epatch ${FILESDIR}/${P}.all.patch
 	cd ${S}
-	epatch ${FILESDIR}/${P}-ldap-subtree.patch
+	epatch ${FILESDIR}/${P}-ldap-subtree.patch.bz2
 }
 
 src_compile() {