added patches - were missing in last commit :(

(Portage version: 2.1.4.4)

4 files changed, 238 insertions, 143 deletions

diff --git a/app-crypt/heimdal/ChangeLog b/app-crypt/heimdal/ChangeLog
index 383d230158e3..004cc354b16f 100644
--- a/app-crypt/heimdal/ChangeLog
+++ b/app-crypt/heimdal/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/heimdal
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.122 2008/07/31 10:52:13 mueli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.123 2008/07/31 10:59:32 mueli Exp $
+
+  31 Jul 2008; Michael Hammer <mueli@gentoo.org>
+  +files/heimdal-autoconf-ipv6-backport.patch,
+  +files/heimdal-symlinked-manpages.patch, -heimdal-1.2.1_rc1-r1.ebuild:
+  - removed heimdal 1.2.1 release candidate
+  - added patches for manpage symlinks and the ipv6 glibc bug
 
 *heimdal-1.2.1 (31 Jul 2008)
 
diff --git a/app-crypt/heimdal/files/heimdal-autoconf-ipv6-backport.patch b/app-crypt/heimdal/files/heimdal-autoconf-ipv6-backport.patch
new file mode 100644
index 000000000000..82bb36cf22c9
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal-autoconf-ipv6-backport.patch
@@ -0,0 +1,199 @@
+Index: cf/krb-ipv6.m4
+===================================================================
+--- cf/krb-ipv6.m4	(revision 23011)
++++ cf/krb-ipv6.m4	(working copy)
+@@ -2,94 +2,97 @@
+ dnl
+ dnl test for IPv6
+ dnl
++ac_cv_lib_ipv6=check
++
+ AC_DEFUN([AC_KRB_IPV6], [
+ AC_ARG_WITH(ipv6,
+ 	AS_HELP_STRING([--without-ipv6],[do not enable IPv6 support]),[
+-if test "$withval" = "no"; then
+-	ac_cv_lib_ipv6=no
+-fi])
++        ac_cv_lib_ipv6="$withval"
++])
+ save_CFLAGS="${CFLAGS}"
+-AC_CACHE_CHECK([for IPv6 stack type], rk_cv_v6type,
+-[dnl check for different v6 implementations (by itojun)
+-v6type=unknown
+-v6lib=none
+ 
+-for i in v6d toshiba kame inria zeta linux; do
+-	case $i in
+-	v6d)
+-		AC_EGREP_CPP(yes, [
++if test "X$ac_cv_lib_ipv6" != "Xno"; then
++
++	AC_CACHE_CHECK([for IPv6 stack type], rk_cv_v6type, 
++	[dnl check for different v6 implementations (by itojun)
++	v6type=unknown
++	v6lib=none
++
++	for i in v6d toshiba kame inria zeta linux; do
++		case $i in
++		v6d)
++			AC_EGREP_CPP(yes, [
+ #include </usr/local/v6/include/sys/types.h>
+ #ifdef __V6D__
+ yes
+ #endif],
+-			[v6type=$i; v6lib=v6;
+-			v6libdir=/usr/local/v6/lib;
+-			CFLAGS="-I/usr/local/v6/include $CFLAGS"])
+-		;;
+-	toshiba)
+-		AC_EGREP_CPP(yes, [
++				[v6type=$i; v6lib=v6;
++				v6libdir=/usr/local/v6/lib;
++				CFLAGS="-I/usr/local/v6/include $CFLAGS"])
++			;;
++		toshiba)
++			AC_EGREP_CPP(yes, [
+ #include <sys/param.h>
+ #ifdef _TOSHIBA_INET6
+ yes
+ #endif],
+-			[v6type=$i; v6lib=inet6;
+-			v6libdir=/usr/local/v6/lib;
+-			CFLAGS="-DINET6 $CFLAGS"])
+-		;;
+-	kame)
+-		AC_EGREP_CPP(yes, [
++				[v6type=$i; v6lib=inet6;
++				v6libdir=/usr/local/v6/lib;
++				CFLAGS="-DINET6 $CFLAGS"])
++			;;
++		kame)
++			AC_EGREP_CPP(yes, [
+ #include <netinet/in.h>
+ #ifdef __KAME__
+ yes
+ #endif],
+-			[v6type=$i; v6lib=inet6;
+-			v6libdir=/usr/local/v6/lib;
+-			CFLAGS="-DINET6 $CFLAGS"])
+-		;;
+-	inria)
+-		AC_EGREP_CPP(yes, [
++				[v6type=$i; v6lib=inet6;
++				v6libdir=/usr/local/v6/lib;
++				CFLAGS="-DINET6 $CFLAGS"])
++			;;
++		inria)
++			AC_EGREP_CPP(yes, [
+ #include <netinet/in.h>
+ #ifdef IPV6_INRIA_VERSION
+ yes
+ #endif],
+-			[v6type=$i; CFLAGS="-DINET6 $CFLAGS"])
+-		;;
+-	zeta)
+-		AC_EGREP_CPP(yes, [
++				[v6type=$i; CFLAGS="-DINET6 $CFLAGS"])
++			;;
++		zeta)
++			AC_EGREP_CPP(yes, [
+ #include <sys/param.h>
+ #ifdef _ZETA_MINAMI_INET6
+ yes
+ #endif],
+-			[v6type=$i; v6lib=inet6;
+-			v6libdir=/usr/local/v6/lib;
+-			CFLAGS="-DINET6 $CFLAGS"])
+-		;;
+-	linux)
+-		if test -d /usr/inet6; then
+-			v6type=$i
+-			v6lib=inet6
+-			v6libdir=/usr/inet6
+-			CFLAGS="-DINET6 $CFLAGS"
+-		fi
+-		;;
+-	esac
+-	if test "$v6type" != "unknown"; then
+-		break
+-	fi
+-done
+-
+-if test "$v6lib" != "none"; then
+-	for dir in $v6libdir /usr/local/v6/lib /usr/local/lib; do
+-		if test -d $dir -a -f $dir/lib$v6lib.a; then
+-			LIBS="-L$dir -l$v6lib $LIBS"
++				[v6type=$i; v6lib=inet6;
++				v6libdir=/usr/local/v6/lib;
++				CFLAGS="-DINET6 $CFLAGS"])
++			;;
++		linux)
++			if test -d /usr/inet6; then
++				v6type=$i
++				v6lib=inet6
++				v6libdir=/usr/inet6
++				CFLAGS="-DINET6 $CFLAGS"
++			fi
++			;;
++		esac
++		if test "$v6type" != "unknown"; then
+ 			break
+ 		fi
+ 	done
+-fi
+-])
+ 
+-AC_CACHE_CHECK([for IPv6], rk_cv_lib_ipv6, [
+-AC_LINK_IFELSE([AC_LANG_PROGRAM([[
++	if test "$v6lib" != "none"; then
++		for dir in $v6libdir /usr/local/v6/lib /usr/local/lib; do
++			if test -d $dir -a -f $dir/lib$v6lib.a; then
++				LIBS="-L$dir -l$v6lib $LIBS"
++				break
++			fi
++		done
++	fi])
++
++	AC_CACHE_CHECK([for IPv6], rk_cv_lib_ipv6, [
++	AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+ #ifdef HAVE_SYS_TYPES_H
+ #include <sys/types.h>
+ #endif
+@@ -103,7 +106,7 @@
+ #include <netinet/in6.h>
+ #endif
+ ]],
+-[[
++	[[
+  struct sockaddr_in6 sin6;
+  int s;
+ 
+@@ -114,8 +117,10 @@
+  sin6.sin6_addr = in6addr_any;
+  bind(s, (struct sockaddr *)&sin6, sizeof(sin6));
+ ]])],
+-[ac_cv_lib_ipv6=yes],
+-[ac_cv_lib_ipv6=no])])
++	[ac_cv_lib_ipv6=yes],
++	[ac_cv_lib_ipv6=no])])
++fi
++
+ if test "$ac_cv_lib_ipv6" = yes; then
+   AC_DEFINE(HAVE_IPV6, 1, [Define if you have IPv6.])
+ else
+Index: lib/roken/mini_inetd.c
+===================================================================
+--- lib/roken/mini_inetd.c	(revision 14773)
++++ lib/roken/mini_inetd.c	(working copy)
+@@ -83,10 +83,8 @@
+ 
+     for (i = 0, a = ai; a != NULL; a = a->ai_next) {
+ 	fds[i] = socket (a->ai_family, a->ai_socktype, a->ai_protocol);
+-	if (fds[i] < 0) {
+-	    warn ("socket af = %d", a->ai_family);
++	if (fds[i] < 0)
+ 	    continue;
+-	}
+ 	socket_set_reuseaddr (fds[i], 1);
+ 	if (bind (fds[i], a->ai_addr, a->ai_addrlen) < 0) {
+ 	    warn ("bind af = %d", a->ai_family);
diff --git a/app-crypt/heimdal/files/heimdal-symlinked-manpages.patch b/app-crypt/heimdal/files/heimdal-symlinked-manpages.patch
new file mode 100644
index 000000000000..3ccc9a22951c
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal-symlinked-manpages.patch
@@ -0,0 +1,32 @@
+diff -NaurwB heimdal-1.2.1rc1.orig/cf/install-catman.sh heimdal-1.2.1rc1/cf/install-catman.sh
+--- heimdal-1.2.1rc1.orig/cf/install-catman.sh	2008-05-31 16:38:43.000000000 +0200
++++ heimdal-1.2.1rc1/cf/install-catman.sh	2008-07-11 01:17:51.000000000 +0200
+@@ -38,26 +38,18 @@
+ 		fi
+ 		if test "$cmd" = install ; then
+ 			target="$mandir/$link.$section"
+-			for lncmd in "ln -f $mandir/$base.$section $target" \
+-				   "ln -s $base.$section $target" \
+-				   "cp -f $mandir/$base.$section $target"
+-			do
++			lncmd="ln -sf $mandir/$base.$section $target"
+ 				if eval "$lncmd"; then
+ 					eval echo "$lncmd"
+ 					break
+ 				fi
+-			done
+ 			if test "$catinstall" = yes -a -f "$srcdir/$c"; then
+ 				target="$catdir/$link.$suffix"
+-				for lncmd in "ln -f $catdir/$base.$suffix $target" \
+-					   "ln -fs $base.$suffix $target" \
+-					   "cp -f $catdir/$base.$suffix $target"
+-				do
++				lncmd="ln -sf $catdir/$base.$suffix $target"
+ 					if eval "$lncmd"; then
+ 						eval echo "$lncmd"
+ 						break
+ 					fi
+-				done
+ 			fi
+ 		elif test "$cmd" = uninstall ; then
+ 			target="$mandir/$link.$section"
diff --git a/app-crypt/heimdal/heimdal-1.2.1_rc1-r1.ebuild b/app-crypt/heimdal/heimdal-1.2.1_rc1-r1.ebuild
deleted file mode 100644
index f658e8c2e5ef..000000000000
--- a/app-crypt/heimdal/heimdal-1.2.1_rc1-r1.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-1.2.1_rc1-r1.ebuild,v 1.2 2008/06/14 17:43:27 mr_bones_ Exp $
-
-WANT_AUTOMAKE=latest
-WANT_AUTOCONF=latest
-
-inherit autotools libtool eutils virtualx toolchain-funcs flag-o-matic
-
-PATCHVER=0.2
-PATCH_P=${PN}-gentoo-patches-${PATCHVER}
-
-DESCRIPTION="Kerberos 5 implementation from KTH"
-HOMEPAGE="http://www.h5l.org/"
-SRC_URI="http://www.h5l.org/dist/src/snapshots/${P/_rc/rc}.tar.gz
-	mirror://gentoo/${PATCH_P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="berkdb ipv6 ssl threads X pkinit otp" # ldap ldap-shared <- circular dependency
-
-RDEPEND="ssl? ( dev-libs/openssl )
-	berkdb? ( sys-libs/db )
-	>=dev-db/sqlite-3.5.7
-	sys-libs/ss
-	sys-libs/com_err
-	!virtual/krb5"
-# Sry for that - still have no cute solution to break circular dependency
-# I also want to point at http://www.h5l.org/manual/heimdal-1-1-branch/info/heimdal.html#Using-LDAP-to-store-the-database
-# I agree that it's not advicable to use LDAP as backend for kerberos
-#	ldap? ( >=net-nds/openldap-2.3.0 )
-#	ldap-shared? ( >=net-nds/openldap-2.3.0 )
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=sys-devel/autoconf-2.62"
-#	>=sys-devel/libtool-2.2"
-PROVIDE="virtual/krb5"
-
-GENTOODIR=${WORKDIR}/gentoo
-S=${WORKDIR}/${P/_rc/rc}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	EPATCH_SUFFIX="patch" epatch "${GENTOODIR}"/patches
-
-	epatch "${FILESDIR}"/heimdal-r23238-kb5_locl_h-wind_h.patch
-	epatch "${FILESDIR}"/heimdal-r23235-kb5-libwind_la.patch
-	epatch "${FILESDIR}"/heimdal-kdc-sans_pkinit.patch
-	epatch "${FILESDIR}"/heimdal-system_sqlite.patch
-
-	AT_M4DIR="cf" eautoreconf
-}
-
-src_compile() {
-	local myconf=""
-
-#	if use ldap || use ldap-shared ; then
-#		myconf="${myconf} --with-openldap=/usr"
-#	fi
-
-	econf \
-		$(use_with ipv6) \
-		$(use_enable berkdb berkeley-db) \
-		$(use_enable pkinit pk-init) \
-		$(use_with ssl openssl) \
-		$(use_with X x) \
-		$(use_enable threads pthread-support) \
-		$(use_enable otp) \
-		--enable-kcm \
-		--enable-shared \
-		--enable-netinfo \
-		--prefix=/usr \
-		--libexecdir=/usr/sbin \
-		${myconf} || die "econf failed"
-#		$(use_enable ldap-shared hdb-openldap-module) \
-
-	local ltversion=`libtool --version |grep 'GNU libtool' |sed -e's/^.*(GNU libtool) \([0-9]\+\.[0-9]\+\(\.[0-9]\+\)\+\) .*$/\1/'`
-	local ltmajor=`echo $ltversion |sed -e's/^\([0-9]\+\)\..*$/\1/'`
-	local ltminor=`echo $ltversion |sed -e's/^[0-9]\+\.\([0-9]\+\)\..*$/\1/'`
-	if [ $ltmajor -lt 2 ] || ( [ $ltmajor -eq 2 ] && [ $ltminor -lt 2 ] ); then
-		ewarn "Using old libtool with a quick hack."
-		sed -i -e's/ECHO=/echo=/' libtool
-	fi
-
-	emake || die "emake failed"
-
-}
-
-src_test() {
-	addpredict /proc/fs/openafs/afs_ioctl
-	addpredict /proc/fs/nnpfs/afs_ioctl
-
-	if use X ; then
-		KRB5_CONFIG="${S}"/krb5.conf Xmake check || die
-	else
-		KRB5_CONFIG="${S}"/krb5.conf make check || die
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc ChangeLog README NEWS TODO
-
-	# Begin client rename and install
-	for i in {telnetd,ftpd,rshd}
-	do
-		mv "${D}"/usr/share/man/man8/{,k}${i}.8
-		mv "${D}"/usr/sbin/{,k}${i}
-	done
-
-	for i in {rcp,rsh,telnet,ftp,su,login}
-	do
-		mv "${D}"/usr/share/man/man1/{,k}${i}.1
-		mv "${D}"/usr/bin/{,k}${i}
-	done
-
-	mv "${D}"/usr/share/man/man5/{,k}ftpusers.5
-	mv "${D}"/usr/share/man/man5/{,k}login.access.5
-
-	doinitd "${GENTOODIR}"/configs/heimdal-kdc
-	doinitd "${GENTOODIR}"/configs/heimdal-kadmind
-	doinitd "${GENTOODIR}"/configs/heimdal-kpasswdd
-	doinitd "${GENTOODIR}"/configs/heimdal-kcm
-
-	insinto /etc
-	newins "${GENTOODIR}"/configs/krb5.conf krb5.conf.example
-
-	sed -i "s:/lib:/$(get_libdir):" "${D}"/etc/krb5.conf.example || die "sed failed"
-
-#	if use ldap; then
-#		insinto /etc/openldap/schema
-#		doins "${GENTOODIR}"/configs/krb5-kdc.schema
-#	fi
-
-	# default database dir
-	keepdir /var/heimdal
-}