added heimdal-1.2.1-r4 with a patch fixing bug #282459

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 177 insertions, 2 deletions

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 <mueli@gentoo.org>
+  +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 <mueli@gentoo.org> 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/Manifest b/app-crypt/heimdal/Manifest
index 77eecccaff6f..b28ae4915ba1 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -2,6 +2,7 @@ AUX heimdal-0.7.2-as_needed.patch 853 RMD160 5c03f5008e395e87c48f89fe91828e0d034
 AUX heimdal-autoconf-2.64.patch 364 RMD160 1b362be75f32eaf79502aa406db7ded25a2878d7 SHA1 1727677c8e5de5c12469a44a28c61f04b15d6a37 SHA256 2dc9dfb773b58b54d1aef76362db734066828893dd1e2ffcee9e20b3484abbf3
 AUX heimdal-autoconf-ipv6-backport.patch 4521 RMD160 0ee4317834939d23bd34cce02034bd3de7eb1022 SHA1 768461c3a40d55ecae3872c8957249fef0e71201 SHA256 6a1f8d23072e5b5a2253e3eb0fc931a4dc7f0be8076466b0f8993e644de5248f
 AUX heimdal-kdc-sans_pkinit.patch 500 RMD160 7ed56129127af088d4c10533abf178aa72bf3c8f SHA1 eda1939bf276bfc260981eb7ee770b4adde6070c SHA256 8d7f04189c897706ed8adae6cd81bab9bf5f2eb593d5e630c33eccd017bb8e4c
+AUX heimdal-mit-krb5-free.patch 779 RMD160 77be91acd791ee7e6467e7995f96ee744f228fa1 SHA1 b28cb6bd186acb89d738be70285b5ceff3c55949 SHA256 1d62caed12e50eb7a7a5f2a070d0d48462c91a2a2fdf830fc933316425aef816
 AUX heimdal-r23235-kb5-libwind_la.patch 270 RMD160 17784aca21208c3ae29b1e26a45e6394af8d55b5 SHA1 72466a7a8623d759121dbb765cd660b8582ad73c SHA256 0df907bf80298845480a415368bd492eb177fe4e8a11e83d2f1d124e9d889f5b
 AUX heimdal-r23238-kb5_locl_h-wind_h.patch 328 RMD160 0cab54e8605b56ed0168e2f680bee2c1386ec035 SHA1 6058f52df83ce0f04ac9d70e8c465ea88d1dca62 SHA256 abb7522a6675cc362fdb9b95096a69423b5742ea311bca4c7100cf0f5a71c1ec
 AUX heimdal-symlinked-manpages.patch 1104 RMD160 e76c9089229a1a5a87807c306a73d5bb5be7936e SHA1 f256e1f9193d9dfb061086a221ce3567b6626cda SHA256 f8c45e49c0d4366e133d01172c92a01050b48fea21160da439563ca927598956
@@ -14,6 +15,7 @@ EBUILD heimdal-0.7.2-r3.ebuild 3590 RMD160 f2dc077a927a1f05eb08acb6a87abf7710481
 EBUILD heimdal-1.2.1-r1.ebuild 4211 RMD160 a7b81e301846aa50e5d6f80c62b380d0b013b6af SHA1 80588902ac77b760543441e0f19d39818a2d6366 SHA256 44ac43775bd8beba7fcd09f886edd6d6f11212405758db9db12ffd3d7f105378
 EBUILD heimdal-1.2.1-r2.ebuild 3931 RMD160 909a28702187ec586a33b61b846e3e16ceeb4794 SHA1 5f5e8e8aa4e1d7dbbf2a0aa6fe48f65f63524429 SHA256 bbcccad1a9025df4359bf2be7235d0255ff939161c7685365ed098a93eef11ff
 EBUILD heimdal-1.2.1-r3.ebuild 3956 RMD160 6bfb58e2a8c93fa27f93230103fc309598da3eb1 SHA1 9dfee25f264bf55365f1a2ef4f13fad22f3a6a73 SHA256 27305a2b6d2a6a6527d02de08cb82741e092019deefb422797b75394162c55b1
+EBUILD heimdal-1.2.1-r4.ebuild 4004 RMD160 f49fcaa46207e590438513e71541798a640c11c3 SHA1 70c46898459b678f0879d1fd3cf8e0150beefecd SHA256 051b10d8a1b7fe08237dbf023a5e1a1f05df8f429721e57e6479b7183d7215b9
 EBUILD heimdal-1.2.1.ebuild 4123 RMD160 2ab7696409149ba204892b470e76f076232b9b1b SHA1 4014661ec25e09d770a6b8b90dca744dd904360d SHA256 7beba865ce965004e6c780db53af041c703414a56e30e5195113e885ad665d39
-MISC ChangeLog 22750 RMD160 84210a4c5115c4ad9ec55bd85fa9f03f0f959591 SHA1 afc11befcae5ef1e66a722ed98c2be6bdeb1ea48 SHA256 2d72b3bf740ac2fde30e50252d1003eda65af2ef4f8c16797a846a51a230ac1e
+MISC ChangeLog 22954 RMD160 b3886cc4b0c861f277aef1f27cffd7b49feb8605 SHA1 2018d746eeab17d32ae3a1fe6e3ba414faf83d10 SHA256 350a5f552908475e2ef2dc2d03932a34499b3481cddefbe79fa8c61fdced741a
 MISC metadata.xml 1086 RMD160 a5ee11683dbfe929a061ce2b4f1967ae61b86d5d SHA1 95cc60a2a78fb4cd71e336a9a05b47fdfa7d1715 SHA256 581e15be965c0fe6246010854acabb2fce21a7afdb9c669e46bacd5440514fec
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 <sys-libs/e2fsprogs-libs-1.41.8 )
+	afs? ( net-fs/openafs )
+	hdb-ldap? ( >=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
+}