Add missing symbols - bug #420821

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

4 files changed, 186 insertions, 12 deletions

diff --git a/app-crypt/heimdal/ChangeLog b/app-crypt/heimdal/ChangeLog
index 07d5c08470de..bd6fa3ecc353 100644
--- a/app-crypt/heimdal/ChangeLog
+++ b/app-crypt/heimdal/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/heimdal
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.194 2012/05/31 03:25:16 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.195 2012/06/13 17:48:19 eras Exp $
+
+*heimdal-1.5.2-r1 (13 Jun 2012)
+
+  13 Jun 2012; Eray Aslan <eras@gentoo.org> +heimdal-1.5.2-r1.ebuild,
+  +files/heimdal_missing_symbols.patch:
+  Add missing symbols - bug #420821
 
   31 May 2012; Zac Medico <zmedico@gentoo.org> heimdal-1.5.1-r1.ebuild,
   heimdal-1.5.2.ebuild:
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index 88543b72a813..f0783cabb1a1 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX CVE-2011-4862.patch 456 RMD160 e28419dffda573918ff5d6e0da1dc51fd5324629 SHA1 b927c7cb3f8a69fcfac34615c381b118d4c91a53 SHA256 856ef749a795087582849e6e14921d36271c110b6e1039e7e073e8b508031a08
 AUX heimdal-kadmind.confd 151 RMD160 25ae05e118d61a06871d4b7cea4caf3bf8b28cc1 SHA1 4187aa7ec5ddbc79f25d30d65c1f0d6dd2ab0992 SHA256 892f9650d4eb631eb1ea435dc8d3defd3805e6d1f2fa59a698d424c44915d644
 AUX heimdal-kadmind.initd-r1 553 RMD160 aaa2e4a8918254f1f663089ef2f63161cebefb0b SHA1 fdda38fda6ad81e3dfe31aa20b8948a57d940ae5 SHA256 cb598a34926c9152072f77027da0106684245e6c53cb931233de32a2c8011a79
@@ -14,17 +11,12 @@ AUX heimdal_db5.patch 923 RMD160 e7e74d67b2b8789b006ea0dae5695a49386f86f3 SHA1 6
 AUX heimdal_disable-check-iprop.patch 577 RMD160 ce3733c555c5c13f320bb9a11b5911ab43f7da85 SHA1 a5ab37be218e03e57cf637a5f45ba630bcb45bcf SHA256 b2ab6f335b5a756856a5df635df82488f9dcdb3ed02a7114f90b4a34911f9721
 AUX heimdal_link_order.patch 1164 RMD160 5aaed57c15dd24e3f51e9fb10c2020bbec88d811 SHA1 5080b5d7d350da5c34e77ef11b990e59b2af4709 SHA256 794560047c549a996d03140ebcbd0476646f4a8e9e36d0cfe6cbaddba611e754
 AUX heimdal_missing-include.patch 255 RMD160 113517789c643163acec3a2f09870a87074af37e SHA1 b647d5a23f67c71febcf0a3b0fe4f2be867ebe1b SHA256 1ad9d71d01776e2d2dd49da5951f6f02630ce137be910ff8484968e8327837c3
+AUX heimdal_missing_symbols.patch 821 RMD160 fcdcb8fc06d8e487935df540b0a1438bd6083637 SHA1 edd2139e9589df5c8dc8145a51e0509121be0a86 SHA256 f8ef2353ce328e444dc48e211a32e77af16b5877e9d3679bf36825e7e37911fd
 AUX krb5.conf 424 RMD160 80a0159824b8a44698d97d911c701bb05f2f0688 SHA1 7602cc72576d144429cae5cf568feb25a5906ab7 SHA256 3acbae7a561b0a76c90ab53f41d5ffb5b811a39049c5ed15b1e7a34e8c889c6e
 DIST heimdal-1.5.1.tar.gz 6800347 RMD160 d66b09bddcd762e91092f862ea084abbcc3670ca SHA1 78421d3f80d3bd1f2eccfa0e5a690e964842b2fb SHA256 bd69940e67ce985589451d868354a959eebf96d8a059f513b23d40e4aa101d5f
 DIST heimdal-1.5.2.tar.gz 6798615 RMD160 1ab2f835309a916dfbba667d3d0d38a57c312fde SHA1 dd0920a181d18236432e4b3e5eab6e468cda4b89 SHA256 22603f282f31173533b939d289f3374258aa1ccccbe51ee088d7568d321279ec
 EBUILD heimdal-1.5.1-r1.ebuild 3875 RMD160 c0579cb6f12d2755da7058430e5b8e694d19651e SHA1 c6dd75bc8b98e0df170456380f7e7788f365335c SHA256 d9b54f31d60d628eb780d8548382939f6ee29c59357a0fe34449c57a6221f8d8
+EBUILD heimdal-1.5.2-r1.ebuild 3819 RMD160 fe287a158571e9f56f6675a5536cc437e9ff229b SHA1 4ccf14b0ff13bad0bf5aa93c60aee0df82f06baa SHA256 7d62483282132b9e0487abf33e06917bf16386de6cacf555b7da5974bd43c53f
 EBUILD heimdal-1.5.2.ebuild 3789 RMD160 76fea5dc8c0c9e9674e8a33374ae7dc0cbb5ac35 SHA1 3f4186fe23c8143fda9677235b9774f7eb25da7f SHA256 c39af36fc72a3a5caaedcab3c3860b8ba922af50c41c744626bfd5cca92fca82
-MISC ChangeLog 31664 RMD160 56d377d282c9a3b1188952df1b24347d8866d8ae SHA1 8801301d177579b414767e07bea993f07e7b2088 SHA256 e67e0f9e40d5cbb812e7ac6942cb3f842f78b17b631a291c4e18d1aaa849d35a
+MISC ChangeLog 31841 RMD160 d51bf3345180fae41dbf169617e5fefc7a296788 SHA1 fc9567d70abd701184c9bd3c35099029ba2356f9 SHA256 97081a67b41b0dbb51680e8a7752e44db62b8c4d050ec1673a618326deb78906
 MISC metadata.xml 469 RMD160 2dc8ebb842bdde2d766a1d35335d97581686cccc SHA1 f87ee646d52dc65e1c232b5ca15f7cfeef213304 SHA256 8d648750dfc00c8726d98166f672d9d35396cdad6f1ebed89e0ee4a29045abad
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEARECAAYFAk/G5KIACgkQ/ejvha5XGaP07gCgiTF5qs3WHjLi70myJ9W7JhfB
-/bQAoLvJ+OF3jceZ0zv2B6Eg29UUQVRP
-=27LW
------END PGP SIGNATURE-----
diff --git a/app-crypt/heimdal/files/heimdal_missing_symbols.patch b/app-crypt/heimdal/files/heimdal_missing_symbols.patch
new file mode 100644
index 000000000000..aa915fb130dd
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal_missing_symbols.patch
@@ -0,0 +1,28 @@
+Add missing symbols.  Cherry picked from upstream master.
+Bug #420821.
+
+--- a/lib/krb5/version-script.map	2012-01-10 21:53:51.000000000 +0000
++++ b/lib/krb5/version-script.map	2012-06-13 16:23:26.000000000 +0000
+@@ -42,6 +42,7 @@
+ 		krb5_auth_con_getrcache;
+ 		krb5_auth_con_getremoteseqnumber;
+ 		krb5_auth_con_getremotesubkey;
++		krb5_auth_con_getsendsubkey;
+ 		krb5_auth_con_init;
+ 		krb5_auth_con_removeflags;
+ 		krb5_auth_con_setaddrs;
+@@ -383,6 +384,14 @@
+ 		krb5_h_errno_to_heim_errno;
+ 		krb5_have_error_string;
+ 		krb5_hmac;
++		krb5_init_creds_init;
++		krb5_init_creds_set_service;
++		krb5_init_creds_set_keytab;
++		krb5_init_creds_get;
++		krb5_init_creds_set_password;
++		krb5_init_creds_free;
++		krb5_init_creds_get_creds;
++		krb5_init_creds_get_error;
+ 		krb5_init_context;
+ 		krb5_init_ets;
+ 		krb5_initlog;
diff --git a/app-crypt/heimdal/heimdal-1.5.2-r1.ebuild b/app-crypt/heimdal/heimdal-1.5.2-r1.ebuild
new file mode 100644
index 000000000000..7b566688e1ea
--- /dev/null
+++ b/app-crypt/heimdal/heimdal-1.5.2-r1.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-1.5.2-r1.ebuild,v 1.1 2012/06/13 17:48:19 eras Exp $
+
+EAPI=4
+# PYTHON_BDEPEND="2"
+VIRTUALX_REQUIRED="manual"
+
+inherit autotools db-use eutils multilib python toolchain-funcs virtualx flag-o-matic
+
+MY_P="${P}"
+DESCRIPTION="Kerberos 5 implementation from KTH"
+HOMEPAGE="http://www.h5l.org/"
+SRC_URI="http://www.h5l.org/dist/src/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="afs +berkdb caps hdb-ldap ipv6 otp +pkinit ssl static-libs threads test X"
+
+RDEPEND="ssl? ( dev-libs/openssl )
+	berkdb? ( sys-libs/db )
+	!berkdb? ( sys-libs/gdbm )
+	caps? ( sys-libs/libcap-ng )
+	>=dev-db/sqlite-3.5.7
+	>=sys-libs/e2fsprogs-libs-1.41.11
+	sys-libs/ncurses
+	sys-libs/readline
+	afs? ( net-fs/openafs )
+	hdb-ldap? ( >=net-nds/openldap-2.3.0 )
+	X? ( x11-libs/libX11
+		x11-libs/libXau
+		x11-libs/libXt )
+	!!app-crypt/mit-krb5
+	!!app-crypt/mit-krb5-appl"
+
+DEPEND="${RDEPEND}
+	=dev-lang/python-2*
+	virtual/pkgconfig
+	>=sys-devel/autoconf-2.62
+	test? ( X? ( ${VIRTUALX_DEPEND} ) )"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/heimdal_missing-include.patch"
+	epatch "${FILESDIR}/heimdal_db5.patch"
+	epatch "${FILESDIR}/heimdal_disable-check-iprop.patch"
+	epatch "${FILESDIR}/heimdal_link_order.patch"
+	epatch "${FILESDIR}/heimdal_missing_symbols.patch"
+	eautoreconf
+}
+
+src_configure() {
+	# QA
+	append-flags -fno-strict-aliasing
+
+	local myconf=""
+	if use berkdb; then
+		myconf="--with-berkeley-db --with-berkeley-db-include=$(db_includedir)"
+	else
+		myconf="--without-berkeley-db"
+	fi
+	econf \
+		--enable-kcm \
+		--disable-osfc2 \
+		--enable-shared \
+		--with-libintl=/usr \
+		--with-readline=/usr \
+		--with-sqlite3=/usr \
+		--libexecdir=/usr/sbin \
+		$(use_enable afs afs-support) \
+		$(use_enable otp) \
+		$(use_enable pkinit kx509) \
+		$(use_enable pkinit pk-init) \
+		$(use_enable static-libs static) \
+		$(use_enable threads pthread-support) \
+		$(use_with caps capng) \
+		$(use_with hdb-ldap openldap /usr) \
+		$(use_with ipv6) \
+		$(use_with ssl openssl /usr) \
+		$(use_with X x) \
+		${myconf}
+}
+
+src_compile() {
+	emake -j1
+}
+
+src_install() {
+	INSTALL_CATPAGES="no" emake DESTDIR="${D}" install
+
+	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
+
+	newinitd "${FILESDIR}"/heimdal-kdc.initd-r1 heimdal-kdc
+	newinitd "${FILESDIR}"/heimdal-kadmind.initd-r1 heimdal-kadmind
+	newinitd "${FILESDIR}"/heimdal-kpasswdd.initd-r1 heimdal-kpasswdd
+	newinitd "${FILESDIR}"/heimdal-kcm.initd-r1 heimdal-kcm
+
+	newconfd "${FILESDIR}"/heimdal-kdc.confd heimdal-kdc
+	newconfd "${FILESDIR}"/heimdal-kadmind.confd heimdal-kadmind
+	newconfd "${FILESDIR}"/heimdal-kpasswdd.confd heimdal-kpasswdd
+	newconfd "${FILESDIR}"/heimdal-kcm.confd heimdal-kcm
+
+	insinto /etc
+	newins "${FILESDIR}"/krb5.conf krb5.conf.example
+
+	if use hdb-ldap; then
+		insinto /etc/openldap/schema
+		doins "${S}/lib/hdb/hdb.schema"
+	fi
+
+	use static-libs || prune_libtool_files
+
+	# default database dir
+	keepdir /var/heimdal
+
+	# Ugly hack for broken symlink - bug #417081
+	rm "${D}"/usr/share/man/man5/qop.5 || die
+	dosym mech.5 /usr/share/man/man5/qop.5
+}
+
+pkg_preinst() {
+	preserve_old_lib /usr/$(get_libdir)/libgssapi.so.2
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /usr/$(get_libdir)/libgssapi.so.2
+}