From 3839a4bf832c4d37454a2992e2b076e4836c746f Mon Sep 17 00:00:00 2001 From: Michael Hammer Date: Thu, 27 Aug 2009 07:54:57 +0000 Subject: added heimdal-1.2.1-r4 with a patch fixing bug #282459 (Portage version: 2.1.6.13/cvs/Linux x86_64) --- app-crypt/heimdal/ChangeLog | 8 +- .../heimdal/files/heimdal-mit-krb5-free.patch | 25 ++++ app-crypt/heimdal/heimdal-1.2.1-r4.ebuild | 142 +++++++++++++++++++++ 3 files changed, 174 insertions(+), 1 deletion(-) create mode 100644 app-crypt/heimdal/files/heimdal-mit-krb5-free.patch create mode 100644 app-crypt/heimdal/heimdal-1.2.1-r4.ebuild (limited to 'app-crypt/heimdal') diff --git a/app-crypt/heimdal/ChangeLog b/app-crypt/heimdal/ChangeLog index b037d290adf5..0bf540096006 100644 --- a/app-crypt/heimdal/ChangeLog +++ b/app-crypt/heimdal/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-crypt/heimdal # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.139 2009/08/06 08:58:45 mueli Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.140 2009/08/27 07:54:57 mueli Exp $ + +*heimdal-1.2.1-r4 (27 Aug 2009) + + 27 Aug 2009; Michael Hammer + +files/heimdal-mit-krb5-free.patch, +heimdal-1.2.1-r4.ebuild: + added heimdal-1.2.1-r4 with a patch fixing bug #282459 06 Aug 2009; Michael Hammer heimdal-1.2.1-r3.ebuild: pulled util-linux in as dependency because libuuid is going to move there diff --git a/app-crypt/heimdal/files/heimdal-mit-krb5-free.patch b/app-crypt/heimdal/files/heimdal-mit-krb5-free.patch new file mode 100644 index 000000000000..ae6f37bcc045 --- /dev/null +++ b/app-crypt/heimdal/files/heimdal-mit-krb5-free.patch @@ -0,0 +1,25 @@ +--- lib/krb5/principal.c.orig 2009-08-27 09:34:57.000000000 +0200 ++++ lib/krb5/principal.c 2009-08-27 09:36:02.000000000 +0200 +@@ -465,6 +465,12 @@ + return unparse_name(context, principal, name, 0); + } + ++void KRB5_LIB_FUNCTION ++krb5_free_unparsed_name(krb5_context context, char *str) ++{ ++ krb5_xfree(str); ++} ++ + krb5_error_code KRB5_LIB_FUNCTION + krb5_unparse_name_flags(krb5_context context, + krb5_const_principal principal, +--- lib/krb5/version-script.map.orig 2009-08-27 09:38:48.000000000 +0200 ++++ lib/krb5/version-script.map 2009-08-27 09:39:22.000000000 +0200 +@@ -280,6 +280,7 @@ + krb5_free_principal; + krb5_free_salt; + krb5_free_ticket; ++ krb5_free_unparsed_name; + krb5_fwd_tgt_creds; + krb5_generate_random_block; + krb5_generate_random_keyblock; diff --git a/app-crypt/heimdal/heimdal-1.2.1-r4.ebuild b/app-crypt/heimdal/heimdal-1.2.1-r4.ebuild new file mode 100644 index 000000000000..4d4bc5b365db --- /dev/null +++ b/app-crypt/heimdal/heimdal-1.2.1-r4.ebuild @@ -0,0 +1,142 @@ +# Copyright 1999-2009 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-r4.ebuild,v 1.1 2009/08/27 07:54:57 mueli Exp $ + +EAPI=1 + +inherit autotools libtool eutils virtualx toolchain-funcs flag-o-matic + +PATCHVER=0.2 +PATCH_P=${PN}-gentoo-patches-${PATCHVER} +RESTRICT="test" + +DESCRIPTION="Kerberos 5 implementation from KTH" +HOMEPAGE="http://www.h5l.org/" +SRC_URI="http://www.h5l.org/dist/src/${P}.tar.gz + mirror://gentoo/${PATCH_P}.tar.bz2" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~m68k" +IUSE="afs +berkdb hdb-ldap ipv6 otp pkinit ssl threads X" + +RDEPEND="ssl? ( dev-libs/openssl ) + berkdb? ( sys-libs/db ) + !berkdb? ( sys-libs/gdbm ) + >=dev-db/sqlite-3.5.7 + sys-libs/e2fsprogs-libs + || ( >=sys-apps/util-linux-2.16 =net-nds/openldap-2.3.0 ) + !virtual/krb5" + +DEPEND="${RDEPEND} + dev-util/pkgconfig + >=sys-devel/autoconf-2.62" +# >=sys-devel/libtool-2.2" + +PROVIDE="virtual/krb5" + +GENTOODIR=${WORKDIR}/gentoo +S=${WORKDIR}/${P} + +src_unpack() { + unpack ${A} + cd "${S}" + + EPATCH_SUFFIX="patch" epatch "${GENTOODIR}"/patches + + epatch "${FILESDIR}"/${PN}-r23238-kb5_locl_h-wind_h.patch + epatch "${FILESDIR}"/${PN}-r23235-kb5-libwind_la.patch + epatch "${FILESDIR}"/${PN}-kdc-sans_pkinit.patch + epatch "${FILESDIR}"/${PN}-system_sqlite.patch + epatch "${FILESDIR}"/${PN}-symlinked-manpages.patch + epatch "${FILESDIR}"/${PN}-autoconf-ipv6-backport.patch + epatch "${FILESDIR}"/${PN}-autoconf-2.64.patch + epatch "${FILESDIR}"/${PN}-mit-krb5-free.patch + + AT_M4DIR="cf" eautoreconf +} + +src_compile() { + # needed to work with sys-libs/e2fsprogs-libs <- should be removed!! + append-flags "-I/usr/include/et" + econf \ + $(use_with ipv6) \ + $(use_enable berkdb berkeley-db) \ + $(use_enable pkinit pk-init) \ + $(use_with ssl openssl /usr) \ + $(use_with X x) \ + $(use_enable threads pthread-support) \ + $(use_enable otp) \ + $(use_enable afs afs-support) \ + $(use_with hdb-ldap openldap /usr) \ + --disable-osfc2 \ + --enable-kcm \ + --enable-shared \ + --disable-netinfo \ + --prefix=/usr \ + --libexecdir=/usr/sbin || die "econf failed" + + 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() { + INSTALL_CATPAGES="no" emake DESTDIR="${D}" install || die "emake install failed" + + dodoc ChangeLog README NEWS TODO + + # Begin client rename and install + for i in {telnetd,ftpd,rshd,popper} + 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,pagsh,kf} + 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 + mv "${D}"/usr/share/man/man3/{,k}editline.3 + + 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 hdb-ldap; then + insinto /etc/openldap/schema + doins "${GENTOODIR}"/configs/krb5-kdc.schema + fi + + # default database dir + keepdir /var/heimdal +} -- cgit v1.2.3-65-gdbad