app-crypt/heimdal dependencies fix & virtual/krb5 support

7 files changed, 263 insertions, 1 deletions

diff --git a/dev-libs/cyrus-sasl/ChangeLog b/dev-libs/cyrus-sasl/ChangeLog
index f8e7c41f7960..cb2374565db6 100644
--- a/dev-libs/cyrus-sasl/ChangeLog
+++ b/dev-libs/cyrus-sasl/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/cyrus-sasl
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.24 2002/12/03 22:32:06 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.25 2002/12/06 20:15:07 kain Exp $
+
+*cyrus-sasl-2.1.9-r1 (06 Dec 2002)
+
+  06 Dec 2002; Bryon Roche <kain@kain.org> cyrus-sasl-2.1.9-r1.ebuild,
+  cyrus-sasl-1.5.27-r6.ebuild, files/cyrus-sasl-heimdal-deps.patch,
+  files/cyrus-sasl2-heimdal-deps.patch, files/digest-cyrus-sasl-2.1.9-r1,
+  files/digest-cyrus-sasl-1.5.27-r6:
+  New ebuild for virtual/krb5 && fixing heimdal deps.  Needs more testing.
 
 *cyrus-sasl-2.1.9 (26 Nov 2002)
 
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-1.5.27-r6.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-1.5.27-r6.ebuild
new file mode 100644
index 000000000000..52aa505227a7
--- /dev/null
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-1.5.27-r6.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-1.5.27-r6.ebuild,v 1.1 2002/12/06 20:15:12 kain Exp $
+
+IUSE="kerberos"
+
+DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
+HOMEPAGE="http://asg.web.cmu.edu/cyrus/"
+
+S=${WORKDIR}/${P}
+SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${P}.tar.gz"
+LICENSE="as-is"
+SLOT="1"
+KEYWORDS="~x86 ~ppc ~sparc ~sparc64"
+
+inherit eutils
+
+RDEPEND="virtual/glibc
+	>=sys-libs/db-3.2
+	>=sys-libs/pam-0.75
+	kerberos? ( virtual/krb5 )"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/automake-1.6.1-r2"
+# need automake for fixed automake-1.5 support.
+
+src_unpack() {
+	unpack ${A} ; cd ${S}
+	# some nice patches...  thanks mandrake ;-)
+	epatch ${FILESDIR}/${PN}-1.5.21-des.patch
+	epatch ${FILESDIR}/${PN}-configdir.patch
+	epatch ${FILESDIR}/${PN}-saslauthd.patch
+	epatch ${FILESDIR}/${PN}-1.5.24-rpath.patch
+	epatch ${FILESDIR}/${PN}-1.5.27-scram.patch
+
+	# fix gcc3.2 brokenness
+	epatch ${FILESDIR}/${PN}-gcc32.patch
+
+	# fix dependencies for heimdal.  We have a /usr/lib/libgssapi.la, so
+	# we may as well use it.
+	epatch ${FILESDIR}/${PN}-heimdal-deps.patch
+
+	# this script distributed with the package is too
+	# old, so remove it, as "automake --add-missing"
+	# will install the new one if its not found.
+	rm -f ${S}/config/missing
+
+	libtoolize --copy --force
+	export WANT_AUTOMAKE_1_5=1
+	aclocal -I cmulocal || die
+	automake --add-missing || die
+	autoconf || die
+}
+
+src_compile() {
+	./configure \
+		--prefix=/usr \
+		--libdir=/usr/lib \
+		--mandir=/usr/share/man \
+		--with-configdir=/etc/sasl \
+		--with-pwcheck=/var/lib/sasl \
+		--with-plugindir=/usr/lib/sasl \
+		--with-saslauthd=/var/lib/sasl \
+		--with-dbpath=/var/lib/sasl/sasl.db \
+		--with-des \
+		--with-rc4 \
+		--enable-pam \
+		--enable-anon \
+		--enable-cram \
+		--with-gnu-ld \
+		--enable-scram \
+		--enable-plain \
+		--enable-login \
+		--disable-krb4 \
+		--enable-static \
+		--enable-shared \
+		--without-mysql \
+		--enable-digest \
+		--enable-gssapi \
+		--disable-sample \
+		--with-dblib=berkeley \
+		--host=${CHOST} ${myconf} || die "bad ./configure"
+
+	emake || die "compile problem"
+}
+
+src_install () {
+	make DESTDIR=${D} install || die
+
+	dodoc COPYING AUTHORS INSTALL NEWS README* TODO \
+		ChangeLog testing.txt doc/*.txt
+	docinto examples ; dodoc sample/{*.[ch],Makefile}
+	newdoc pwcheck/README README.pwcheck
+	dohtml doc/*
+
+	insinto /etc/conf.d ; newins ${FILESDIR}/saslauthd.confd saslauthd
+	exeinto /etc/init.d ; newexe ${FILESDIR}/saslauthd.rc6 saslauthd
+	exeinto /etc/init.d ; newexe ${FILESDIR}/pwcheck.rc6 pwcheck
+}
+
+pkg_postinst() {
+	# empty directories..
+	install -d -m0755 ${ROOT}/var/lib/sasl
+	install -d -m0755 ${ROOT}/etc/sasl
+}
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.9-r1.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.9-r1.ebuild
new file mode 100644
index 000000000000..254c1fb20ccd
--- /dev/null
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.9-r1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.9-r1.ebuild,v 1.1 2002/12/06 20:15:12 kain Exp $
+
+S=${WORKDIR}/${P}
+
+DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
+HOMEPAGE="http://asg.web.cmu.edu/sasl/"
+SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="2"
+KEYWORDS="~x86 ~ppc -sparc -sparc64"
+
+inherit eutils
+
+RDEPEND=">=sys-libs/db-3.2
+	>=sys-libs/pam-0.75
+	>=dev-libs/openssl-0.9.6d
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	berkdb? ( >=sys-libs/db-3.2.9 )
+	ldap? ( >=net-nds/openldap-2.0.25 )
+	mysql? ( >=dev-db/mysql-3.23.51 )
+	kerberos? ( virtual/krb5 )"
+	
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+	sys-devel/autoconf
+	sys-devel/automake"
+
+src_unpack() {
+	unpack ${A} ; cd ${S}
+	
+	# Fix depends for heimdal needed in saslv2 too
+	epatch ${FILESDIR}/${PN}2-heimdal-deps.patch
+}
+
+src_compile() {
+
+	local myconf
+
+	libtoolize --copy --force
+	aclocal -I config -I cmulocal || die
+	autoheader || die
+	automake -a --foreign || die
+	autoconf || die
+	autoconf saslauthd/configure.in > saslauthd/configure || die
+	chmod +x saslauthd/configure || die
+
+	use ldap && myconf="${myconf} --with-ldap" \
+		|| myconf="${myconf} --without-ldap"
+
+	use mysql && myconf="${myconf} --with-mysql" \
+		|| myconf="${myconf} --without-mysql"
+
+	if use berkdb; then
+		myconf="${myconf} --with-dblib=berkeley"
+	elif use gdbm; then
+		myconf="${myconf} --with-dblib=gdbm --with-gdbm=/usr"
+	else
+		myconf="${myconf} --with-dblib=berkeley"
+	fi
+
+	use static && myconf="${myconf} --enable-static --with-staticsasl" \
+		|| myconf="${myconf} --disable-static --without-staticsasl"
+
+	use kerberos && myconf="${myconf} --enable-gssapi=/usr" \
+		|| myconf="${myconf} --disable-gssapi"
+
+	econf \
+		--with-saslauthd=/var/lib/sasl2 \
+		--with-pwcheck=/var/lib/sasl2 \
+		--with-configdir=/etc/sasl2 \
+		--with-openssl \
+		--with-plugindir=/usr/lib/sasl2 \
+		--with-dbpath=/etc/sasl2/sasldb2 \
+		--with-des \
+		--with-rc4 \
+		--disable-krb4 \
+		--with-gnu-ld \
+		--enable-shared \
+		--disable-sample \
+		--enable-login \
+		${myconf} || die "bad ./configure"
+
+	make MAKE=emake || die "compile problem"
+}
+
+src_install () {
+
+	einstall || die "install problem"
+
+	dodoc AUTHORS ChangeLog COPYING NEWS README doc/*.txt
+	docinto examples ; dodoc sample/{*.[ch],Makefile}
+	newdoc pwcheck/README README.pwcheck
+	dohtml doc/*
+
+	dodir /var/lib/sasl2
+	dodir /etc/sasl2
+	# generate an empty sasldb2 with correct permissions
+	LD_OLD=${LD_LIBRARY_PATH}
+	export LD_LIBRARY_PATH=${S}/lib/.libs
+	echo "gentoo" | ${D}usr/sbin/saslpasswd2 -f ${D}etc/sasl2/sasldb2 -p cyrus
+	${D}usr/sbin/saslpasswd2 -f ${D}etc/sasl2/sasldb2 -d cyrus
+	export LD_LIBRARY_PATH=${LD_OLD}
+	chown root.mail ${D}etc/sasl2/sasldb2
+	chmod 0640 ${D}etc/sasl2/sasldb2
+																
+	insinto /etc/conf.d ; newins ${FILESDIR}/saslauthd.confd saslauthd
+	exeinto /etc/init.d ; newexe ${FILESDIR}/saslauthd2.rc6 saslauthd
+	exeinto /etc/init.d ; newexe ${FILESDIR}/pwcheck.rc6 pwcheck
+}
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-heimdal-deps.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-heimdal-deps.patch
new file mode 100644
index 000000000000..f6bca5f8a0c7
--- /dev/null
+++ b/dev-libs/cyrus-sasl/files/cyrus-sasl-heimdal-deps.patch
@@ -0,0 +1,12 @@
+diff -urN cyrus-sasl-1.5.27.old/configure.in cyrus-sasl-1.5.27/configure.in
+--- cyrus-sasl-1.5.27.old/configure.in	2002-12-06 05:13:39.000000000 -0600
++++ cyrus-sasl-1.5.27/configure.in	2002-12-06 05:24:43.000000000 -0600
+@@ -507,7 +507,7 @@
+   if test "$gss_impl" = mit; then
+      GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS/lib -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
+   elif test "$gss_impl" = "heimdal"; then
+-     GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS/lib -lgssapi -lkrb5 -ldes -lasn1 -lroken ${LIB_CRYPT} -lcom_err"
++     GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS/lib -lgssapi"
+   else
+      gssapi="no"
+      AC_WARN(Disabling GSSAPI)
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl2-heimdal-deps.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl2-heimdal-deps.patch
new file mode 100644
index 000000000000..63e70bcd6608
--- /dev/null
+++ b/dev-libs/cyrus-sasl/files/cyrus-sasl2-heimdal-deps.patch
@@ -0,0 +1,23 @@
+diff -urN cyrus-sasl-2.1.9.old/cmulocal/sasl2.m4 cyrus-sasl-2.1.9/cmulocal/sasl2.m4
+--- cyrus-sasl-2.1.9.old/cmulocal/sasl2.m4	2002-09-24 10:12:33.000000000 -0500
++++ cyrus-sasl-2.1.9/cmulocal/sasl2.m4	2002-12-06 06:16:31.000000000 -0600
+@@ -44,14 +44,15 @@
+ 
+   # Check a full link against the heimdal libraries.  If this fails, assume
+   # MIT.
+-  AC_CHECK_LIB(gssapi,gss_unwrap,gss_impl="heimdal",,$GSSAPIBASE_LIBS -lgssapi -lkrb5 -ldes -lasn1 -lroken ${LIB_CRYPT} -lcom_err)
+-
++  if krb5-config --libs gssapi | grep -q -e -lroken ; then
++  AC_CHECK_LIB(gssapi,gss_unwrap,gss_impl="heimdal",,$GSSAPIBASE_LIBS `krb5-config --libs gssapi`)
++  fi
+   if test "$gss_impl" = "mit"; then
+      GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
+      GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a"
+   elif test "$gss_impl" = "heimdal"; then
+-     GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -ldes -lasn1 -lroken ${LIB_CRYPT} -lcom_err"
+-     GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libdes.a $gssapi_dir/libasn1.a $gssapi_dir/libroken.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}"
++     GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS $(krb5-config --libs gssapi)"
++     GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $(krb5-config --libs gssapi)"
+   else
+      gssapi="no"
+      AC_WARN(Disabling GSSAPI)
diff --git a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-1.5.27-r6 b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-1.5.27-r6
new file mode 100644
index 000000000000..477dd8cc141c
--- /dev/null
+++ b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-1.5.27-r6
@@ -0,0 +1 @@
+MD5 76ea426e2e2da3b8d2e3a43af5488f3b cyrus-sasl-1.5.27.tar.gz 528252
diff --git a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.9-r1 b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.9-r1
new file mode 100644
index 000000000000..0db58593d207
--- /dev/null
+++ b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.9-r1
@@ -0,0 +1 @@
+MD5 19ac851b291a6631b8f8c2a2bebb7843 cyrus-sasl-2.1.9.tar.gz 1274451