Added new heimdal version - see bug #185899. Sry for the partial QA payment but it makes no sense IMHO to refactor the outdated heimdal release.

Package-Manager: portage-2.1.4.4

6 files changed, 251 insertions, 2 deletions

diff --git a/app-crypt/heimdal/ChangeLog b/app-crypt/heimdal/ChangeLog
index 5f21afb07bdf..fb0e00a9ca5c 100644
--- a/app-crypt/heimdal/ChangeLog
+++ b/app-crypt/heimdal/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-crypt/heimdal
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.118 2007/09/07 11:33:43 dev-zero Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.119 2008/06/11 07:27:46 mueli Exp $
+
+*heimdal-1.2.1_rc1 (11 Jun 2008)
+
+  11 Jun 2008; Michael Hammer <mueli@gentoo.org>
+  +files/heimdal-kdc-sans_pkinit.patch,
+  +files/heimdal-r23235-kb5-libwind_la.patch,
+  +files/heimdal-r23238-kb5_locl_h-wind_h.patch,
+  +files/heimdal-system_sqlite.patch, +heimdal-1.2.1_rc1.ebuild:
+  Added new heimdal version. This one is really unstable but should work so
+  far except a few issues. Please have a look at #185899 for history and
+  future development of heimdal in gentoo
 
   07 Sep 2007; Tiziano Müller <dev-zero@gentoo.org>
   +files/heimdal-0.7.2-as_needed.patch, heimdal-0.7.2-r3.ebuild:
diff --git a/app-crypt/heimdal/files/heimdal-kdc-sans_pkinit.patch b/app-crypt/heimdal/files/heimdal-kdc-sans_pkinit.patch
new file mode 100644
index 000000000000..a6548ce22d33
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal-kdc-sans_pkinit.patch
@@ -0,0 +1,18 @@
+diff -Naur tmp-old/kdc/Makefile.am tmp-new/kdc/Makefile.am
+--- kdc/Makefile.am	2008-06-02 14:38:03.000000000 +0000
++++ kdc/Makefile.am	2008-06-03 04:06:19.000000000 +0000
+@@ -84,12 +84,10 @@
+ 	$(LIB_roken) \
+ 	$(DBLIB) 
+ 
+-if PKINIT
+-LIB_pkinit = $(top_builddir)/lib/hx509/libhx509.la
+-endif
++LIB_hx509 = $(top_builddir)/lib/hx509/libhx509.la
+ 
+ libkdc_la_LIBADD = \
+-	$(LIB_pkinit) \
++	$(LIB_hx509) \
+ 	$(top_builddir)/lib/hdb/libhdb.la \
+ 	$(LIB_openldap) \
+ 	$(top_builddir)/lib/krb5/libkrb5.la \
diff --git a/app-crypt/heimdal/files/heimdal-r23235-kb5-libwind_la.patch b/app-crypt/heimdal/files/heimdal-r23235-kb5-libwind_la.patch
new file mode 100644
index 000000000000..5390b2cf69a7
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal-r23235-kb5-libwind_la.patch
@@ -0,0 +1,11 @@
+--- trunk/heimdal/lib/krb5/krb5_locl.h	2008-06-01 22:26:24 UTC (rev 23237)
++++ trunk/heimdal/lib/krb5/krb5_locl.h	2008-06-01 22:26:43 UTC (rev 23238)
+@@ -131,6 +131,8 @@
+ #include <parse_time.h>
+ #include <base64.h>
+ 
++#include <wind.h>
++
+ #include "crypto-headers.h"
+
+
diff --git a/app-crypt/heimdal/files/heimdal-r23238-kb5_locl_h-wind_h.patch b/app-crypt/heimdal/files/heimdal-r23238-kb5_locl_h-wind_h.patch
new file mode 100644
index 000000000000..88c02e598c66
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal-r23238-kb5_locl_h-wind_h.patch
@@ -0,0 +1,10 @@
+--- trunk/heimdal/lib/krb5/Makefile.am	2008-06-01 22:25:41 UTC (rev 23234)
++++ trunk/heimdal/lib/krb5/Makefile.am	2008-06-01 22:25:53 UTC (rev 23235)
+@@ -57,6 +57,7 @@
+ 	$(LIB_com_err) \
+ 	$(LIB_hcrypto) \
+ 	$(top_builddir)/lib/asn1/libasn1.la \
++	../wind/libwind.la \
+ 	$(LIBADD_roken) \
+ 	$(LIB_door_create) \
+ 	$(LIB_dlopen)
diff --git a/app-crypt/heimdal/files/heimdal-system_sqlite.patch b/app-crypt/heimdal/files/heimdal-system_sqlite.patch
new file mode 100644
index 000000000000..2f8254e4d6b0
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal-system_sqlite.patch
@@ -0,0 +1,56 @@
+diff -Naur tmp-old/configure.in tmp-new/configure.in
+--- configure.in	2008-06-08 08:06:38.000000000 +0000
++++ configure.in	2008-06-08 08:15:29.000000000 +0000
+@@ -104,6 +104,8 @@
+ 
+ KRB_PTHREADS
+ 
++PKG_CHECK_MODULES([sqlite], [sqlite3])
++
+ AC_ARG_ENABLE(dce, 
+ 	AS_HELP_STRING([--enable-dce],[if you want support for DCE/DFS PAG's]))
+ if test "$enable_dce" = yes; then
+diff -Naur tmp-old/lib/Makefile.am tmp-new/lib/Makefile.am
+--- lib/Makefile.am	2008-06-07 16:53:11.000000000 +0000
++++ lib/Makefile.am	2008-06-07 16:55:58.000000000 +0000
+@@ -18,6 +18,6 @@
+ dir_hcrypto = hcrypto
+ endif
+ 
+-SUBDIRS = roken vers editline $(dir_com_err) sl wind asn1 sqlite \
++SUBDIRS = roken vers editline $(dir_com_err) sl wind asn1 \
+ 	$(dir_hcrypto) hx509 krb5 ntlm kafs gssapi hdb kadm5 \
+ 	auth $(dir_45) $(dir_otp) $(dir_dce)
+diff -Naur tmp-old/lib/krb5/Makefile.am tmp-new/lib/krb5/Makefile.am
+--- lib/krb5/Makefile.am	2008-06-07 16:54:02.000000000 +0000
++++ lib/krb5/Makefile.am	2008-06-08 08:17:00.000000000 +0000
+@@ -2,7 +2,7 @@
+ 
+ include $(top_srcdir)/Makefile.am.common
+ 
+-AM_CPPFLAGS += $(INCLUDE_krb4) $(INCLUDE_hcrypto) -I../com_err -I$(srcdir)/../com_err -I$(srcdir)/../sqlite
++AM_CPPFLAGS += $(INCLUDE_krb4) $(INCLUDE_hcrypto) -I../com_err -I$(srcdir)/../com_err $(sqlite_CFLAGS)
+ 
+ bin_PROGRAMS = verify_krb5_conf
+ 
+@@ -53,7 +53,7 @@
+ 
+ libkrb5_la_LIBADD = \
+ 	$(LIB_pkinit) \
+-	../sqlite/libsqlite.la \
++	$(sqlite_LIBS) \
+ 	$(LIB_com_err) \
+ 	$(LIB_hcrypto) \
+ 	$(top_builddir)/lib/asn1/libasn1.la \
+diff -Naur tmp-old/lib/krb5/scache.c tmp-new/lib/krb5/scache.c
+--- lib/krb5/scache.c	2008-06-07 16:54:30.000000000 +0000
++++ lib/krb5/scache.c	2008-06-07 17:01:43.000000000 +0000
+@@ -32,7 +32,7 @@
+  */
+ 
+ #include "krb5_locl.h"
+-#include "sqlite3.h"
++#include <sqlite3.h>
+ 
+ RCSID("$Id: heimdal-system_sqlite.patch,v 1.1 2008/06/11 07:27:47 mueli Exp $");
+ 
diff --git a/app-crypt/heimdal/heimdal-1.2.1_rc1.ebuild b/app-crypt/heimdal/heimdal-1.2.1_rc1.ebuild
new file mode 100644
index 000000000000..292d295d0b16
--- /dev/null
+++ b/app-crypt/heimdal/heimdal-1.2.1_rc1.ebuild
@@ -0,0 +1,143 @@
+# 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.ebuild,v 1.1 2008/06/11 07:27:46 mueli 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 pkinit ssl threads X" # 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
+	sys-libs/cracklib
+	!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) \
+		--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
+}