version bump - bug #389573

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

5 files changed, 284 insertions, 15 deletions

diff --git a/app-crypt/mit-krb5/ChangeLog b/app-crypt/mit-krb5/ChangeLog
index 084b04df7876..43d65da39f6a 100644
--- a/app-crypt/mit-krb5/ChangeLog
+++ b/app-crypt/mit-krb5/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-crypt/mit-krb5
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/ChangeLog,v 1.299 2011/10/24 13:44:20 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/ChangeLog,v 1.300 2011/11/05 13:08:11 eras Exp $
+
+*mit-krb5-1.9.2 (05 Nov 2011)
+*mit-krb5-1.8.5 (05 Nov 2011)
+
+  05 Nov 2011; Eray Aslan <eras@gentoo.org>
+  +files/mit-krb5-kprop_exit_on_error.patch, +mit-krb5-1.8.5.ebuild,
+  +mit-krb5-1.9.2.ebuild:
+  version bump - bug #389573
 
   24 Oct 2011; Eray Aslan <eras@gentoo.org> mit-krb5-1.8.3-r5.ebuild,
   -mit-krb5-1.8.4.ebuild, -mit-krb5-1.9.1.ebuild, -mit-krb5-1.9.1-r1.ebuild:
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index 586864b7dbb7..6e95773a7680 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -13,32 +13,37 @@ AUX kpropd.xinetd 194 RMD160 5772b04bf7f6b8a5588331a4d9dca03738756f15 SHA1 a9c84
 AUX mit-krb5-1.8.3-CVE-2011-0281.0282.0283.patch 6130 RMD160 23cb2560f0d87e6128cdbb12f1e7d8aae85f85f5 SHA1 574a3c82ad7d3c9a1c9c62c6ff95c2d6f0e0fc96 SHA256 7831c9a9553404b41774f40f3fc0df6769342c1923c5b1177062710fd5f0f2bb
 AUX mit-krb5-1.8.3-CVE-2011-0285.patch 1136 RMD160 03d06d5c88505688eb4dbcd516144999ecb89a70 SHA1 7853bcbdf0dba6f0fce15fc3b475f86d692287b2 SHA256 88f8d015f2bce8f54a6a0321716ed887aef587aeae3017d47c7c18de26189f02
 AUX mit-krb5-1.9.1-fd-leak.patch 2178 RMD160 1ccfac11299058c5eb24393d0ef10e8ad53016dc SHA1 d99f865813833c3aa4a1e1c012656525bf716b97 SHA256 6f7a099e9527a5544f095e6ec0946218124a6c8b41a3a9f75522d58d2040a56a
+AUX mit-krb5-kprop_exit_on_error.patch 712 RMD160 3aa6371103ed4fddbbad98683798b51970d1d4a8 SHA1 65ce64c22145348ee89a88a4a3eecd4346d5397d SHA256 a59b64e0a00dda8e394925aad68893aebc7b7d7c6651684df9b671551f77d9f7
 AUX mit-krb5_testsuite.patch 3069 RMD160 59af8c128fbaeadc472111c4bef4dfe3ac7567f0 SHA1 e0896cac3d99a3e4f9d06afdab58a6d5cda82e7a SHA256 3c8cfdb012a5388b1a92658437dce619593b91f0b0c582ef66194347274b26f9
 AUX mit-krb5kadmind.initd 687 RMD160 7602d12d570e80edf24953befbe4ec03d247e4ba SHA1 753a5875659d3bef63c1a50bb0228f1c3c06bdf9 SHA256 427953b3a2dbe0a8f85bee1294a348c97dbbdac4741f06c2a3768170ba29161a
 AUX mit-krb5kdc.initd 656 RMD160 8c4c508273f9d715ac0e0a8d9c54e36f63526b9b SHA1 62017fc3a2f5adbd6e0c1421041593a268a6252d SHA256 d813dbf3ee89f0da6b73455fd8759898223529c4cf7c1c2ec64a3128363194e2
 AUX mit-krb5kpropd.initd 639 RMD160 a4c5f7749860aa125222302386be7b67476c9442 SHA1 f4f05e9721f293aea25dea2d74a02686d256e3ea SHA256 7aff9f002fabe1d8ca52b6be032a111e7bed358485d8c72c171e8b95bc556d25
 DIST krb5-1.8.3-signed.tar 11642880 RMD160 bdf3a505e4b2447af0c9080b441918d665dcdd9c SHA1 69696f63b6c2b0e3238156b19eed68cecd661c6b SHA256 2c5988ddd8b409134cd0e77e9ce8f762605ce8d8fb0aa22f6500f53381567019
 DIST krb5-1.8.4-signed.tar 11642880 RMD160 34d6df8248007bac0321400b2650c2aca774af16 SHA1 fe1fc21e923ae8dcaa7a26f4f97e0ac49c8e3115 SHA256 2ea1ad0e02d8040110c70046a3bb44aa116ccc72a351185799cd19a2dec11123
+DIST krb5-1.8.5-signed.tar 11950080 RMD160 00f350422b3517d2b8f99d4ae694551d2065fd75 SHA1 9ca7edaaa1d4ef4bfe2611d937eb741d7ad5da3c SHA256 7d6989efaaf0b3330ce5b329edb1d0bf33250ca78b789fdd117e02c49c238812
 DIST krb5-1.9.1-signed.tar 11888640 RMD160 8de31bc83c2fede038780a4375e29a6b4281581f SHA1 e23a1795a237521493da9cf3443ac8b98a90c066 SHA256 525e258aa7401427a5a9edee0051f83b6151bf96a979ca526393932c90484c8e
+DIST krb5-1.9.2-signed.tar 12185600 RMD160 4129e76f6725c18fb3c24b5dd1c5b41f6ee94b5f SHA1 aa06f778ee1f9791cd4c5cf4c9e9465769ffec92 SHA256 96b213345b02862b5fef61ef1dd26f643f07e4207496c35179cea35ddb7ae68c
 EBUILD mit-krb5-1.8.3-r5.ebuild 2939 RMD160 df03d1333c291448be9c88931854c8e1bbe698c7 SHA1 fbd2e1a4ca141ccbecf0c0cf2b07d4bc6532feb0 SHA256 481041e8ac828123765991fc726a94f9344724bf236224b208d3b4963d22ab68
 EBUILD mit-krb5-1.8.4-r1.ebuild 2839 RMD160 45cfe931d145d5a0adf11b6c094510bf89091e1b SHA1 6d5f06c229a369103a0864c555708270e57a6d1f SHA256 5a9cadc82825fc506f0895f33b5343eea940f182e7f4603177b7591069b81aaa
+EBUILD mit-krb5-1.8.5.ebuild 2709 RMD160 f6b3a46e9e01d6581ee4d93a11770c6f71eb6461 SHA1 b7409a07e9fe5bb9a664daf896fb4b81bc6d555c SHA256 90c03d3f408262b0b142de45899d2a0637559a5c32cc2721fd77d5be193e66b2
 EBUILD mit-krb5-1.9.1-r2.ebuild 3202 RMD160 9a72d9d3dbf64db70e01a1a95c6902ad17ed0102 SHA1 ca0b2e199042f67cc2698ef55628c3424628238b SHA256 7ec3c4dfa4d0a7c3833d58c4ce137c0379a1ab4c70d4efd2fb969014a868e770
-MISC ChangeLog 47203 RMD160 1a356f5909ff0afd6d6c0ee84d97703df6b5097f SHA1 976dca872cba7c48c00bd0e2c47c78305f3b8116 SHA256 093d594fff32b80662f90ebb2406083b03b842e72f1df4431e23dad47d0540fb
+EBUILD mit-krb5-1.9.2.ebuild 3146 RMD160 53622c78084fbd6ce873bd05c920f7a6a4d8d594 SHA1 f5e1a405183e7a046255d02bb268d4db2f42f188 SHA256 6c49aa492f333d0a13d84e1dd7f3b2cda358bc3c7ce2fff403c25e70b3523efa
+MISC ChangeLog 47433 RMD160 1cd7d6736f8fcc0ebfd4b1fc059f593697c87592 SHA1 ca485c9cd32c20c3b5c392620960ceedc447336a SHA256 ac3055861a96df4c0b7f2a6e0db7b8b19187044a36c38cb3a095ba99008324f0
 MISC metadata.xml 668 RMD160 825e73c2b8d1bdcfffb6c5cfa2110f596d7940ae SHA1 b9fca90e7a86fea05d8174d824e939cf61905310 SHA256 da5862dde92f34b882870961cb9f1e4aa8209fc549e32a43d99770a9de8b232d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOpWu5AAoJEHfx8XVYajsfLJoQAJAKglJfByHD/3orUSpYGM9H
-rtctm0N1awk0avLOfpn25Maj+XDeX1gTbCbBGW132BkSdliysEMIFSv8eO8LjA/E
-03xwNyRwWnUlFA7Yz84DeBLr/H9Dj241TfgHL/lvkbfayfy+J3aROKivPvy4lzhM
-Ed56JY+ta0jrEPbxPDQN2htYOi0y+80SSPaAQwVV4q3rfeC8Phn3zNT8nue/V2yV
-4dT5fQevgHIrGJsZ1OChBvXDWy3/bG6wpWCWhn3w+S1szZ0R1wotUbbtFmuKYOXU
-1WXm2g46vAfeeEhDb75rKOAwDt+pZFhBDykZi/tBZQxLSn+YP2OaGpDwnhkGIpa1
-5q8lXPnItkYEingzQFXQOqP/A73/5qrQHLyE+v//ElpOfm93sn9Ewj8Kg0WzhfzO
-iGibi0Ef6FKY1Dn7Sn9Lu7DqUdVVPwuaqALYK7UagWblOTmT3/qZFBvROZG1K3Lb
-0NkyrWZXh07L5aZDiBrNnU/pG6kjSlQ9uJE6uCarc/AuAebXKg5b3+kwAW3zVRH3
-9k41fjcRIq8uFe03kLH0WpdMxvHEZqDNv1Qf2vOPwqV3uqYFGAk6GaKTdWjLaihe
-55tmkmN9uf1QDLUyz40E8NZ2j4zgiWagtisX0lmcq3mHzkzFEm71TqUbXbkVv/xt
-jtXsTSVudte5iudz83gu
-=Ilfu
+iQIcBAEBCAAGBQJOtTVJAAoJEHfx8XVYajsfcEoP/jRkHrz6yXuCGjZbD2fo2hp7
+q9RCiHLF1/TOACWpWPFBHD83/0i2mVrh1F7IHEHhlf/vAq3+OUIU36e02rRU/yxT
+kj75LIFURnmq9Mi0mkcRGw2GcRvhiqd1Cl+thkSD8bSh+nbay17ftmwbaolzBDNM
+F7WubJPaq/bqszWgbFUiI3DjNBOrtxmyNoaVOCRDMd4nABcGc3TCdgIIiHzGb21Q
+HX8F91xMim0Kdkp7bnnObJNGA8jKMeOXiDvmca6vlXSe+oWmqaVLpWJ4e/8+yLeE
+Z+fiuCkPTyJ0gRCMk4DwGQVxKpPFxs7O0uPB1laYWhpBo0by03g0zlvxzYIweHBL
+fe5brxuuMz8ixzY0tdEH6Wp8h7eAriTYvhDVJUxdnX9okzTJjDwrNBYYqAiCnnfr
+Re2oJlm/Qg01Y38ose+UzRU4YLCpYroHlLUxILpC4t4Ws7svh6r1ffqwg1VIl+k4
+bKAVE8nI99PPt9XuDNKDQ3zG+c2iGXqgpfhmZRdnuoCOAJFIkKQgd/XEQWgW7JIB
+qY04rSyT10lkAVkXVP2R/bb0/VN4WdhfwDd+xWv9huPI15N1a4IBnxuaAXJO8uBr
+Oue3cQuXJ2zmfkEKR1CLPfFhGglFjI8wujgbSDszvlGL+0QlLkBsz7OQj9vmTTb7
+DV+IACkpMQDumcii6irr
+=fg+E
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/mit-krb5/files/mit-krb5-kprop_exit_on_error.patch b/app-crypt/mit-krb5/files/mit-krb5-kprop_exit_on_error.patch
new file mode 100644
index 000000000000..c2fb7aa008b5
--- /dev/null
+++ b/app-crypt/mit-krb5/files/mit-krb5-kprop_exit_on_error.patch
@@ -0,0 +1,25 @@
+http://krbdev.mit.edu/rt/Ticket/Display.html?id=7000
+
+Index: trunk/src/kadmin/server/ipropd_svc.c
+===================================================================
+diff -u -N -r24961 -r25433
+--- trunk/src/kadmin/server/ipropd_svc.c	(.../ipropd_svc.c)	(revision 24961)
++++ trunk/src/kadmin/server/ipropd_svc.c	(.../ipropd_svc.c)	(revision 25433)
+@@ -380,7 +380,7 @@
+ 			     _("%s: pclose(popen) failed: %s"),
+ 			     whoami,
+ 			     error_message(errno));
+-	    goto out;
++	    _exit(1);
+ 	}
+ 
+ 	DPRINT(("%s: exec `kprop -f %s %s' ...\n",
+@@ -401,7 +401,7 @@
+ 			     _("%s: exec failed: %s"),
+ 			     whoami,
+ 			     error_message(errno));
+-	    goto out;
++	    _exit(1);
+ 	}
+ 
+     default: /* parent */
diff --git a/app-crypt/mit-krb5/mit-krb5-1.8.5.ebuild b/app-crypt/mit-krb5/mit-krb5-1.8.5.ebuild
new file mode 100644
index 000000000000..0ab2890b02c9
--- /dev/null
+++ b/app-crypt/mit-krb5/mit-krb5-1.8.5.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.8.5.ebuild,v 1.1 2011/11/05 13:08:11 eras Exp $
+
+EAPI=2
+
+inherit eutils flag-o-matic versionator
+
+MY_P=${P/mit-}
+P_DIR=$(get_version_component_range 1-2)
+DESCRIPTION="MIT Kerberos V"
+HOMEPAGE="http://web.mit.edu/kerberos/www/"
+SRC_URI="http://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}-signed.tar"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="doc openldap test xinetd"
+
+RDEPEND="!!app-crypt/heimdal
+	>=sys-libs/e2fsprogs-libs-1.41.0
+	sys-apps/keyutils
+	openldap? ( net-nds/openldap )
+	xinetd? ( sys-apps/xinetd )"
+DEPEND="${RDEPEND}
+	doc? ( virtual/latex-base )
+	test? (	dev-lang/tcl
+			dev-lang/perl
+			dev-util/dejagnu )"
+
+S=${WORKDIR}/${MY_P}/src
+
+src_unpack() {
+	unpack ${A}
+	unpack ./"${MY_P}".tar.gz
+}
+
+src_configure() {
+	append-flags "-I/usr/include/et"
+	append-flags "-fno-strict-aliasing"
+	append-flags "-fno-strict-overflow"
+	econf \
+		$(use_with openldap ldap) \
+		$(use_with test tcl /usr) \
+		--enable-shared \
+		--with-system-et \
+		--with-system-ss \
+		--enable-dns-for-realm \
+		--enable-kdc-replay-cache \
+		--disable-rpath
+}
+
+src_compile() {
+	emake -j1 || die "emake failed"
+
+	if use doc ; then
+		cd ../doc
+		for dir in api implement ; do
+			emake -C "${dir}" || die "doc emake failed"
+		done
+	fi
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		EXAMPLEDIR="/usr/share/doc/${PF}/examples" \
+		install || die "install failed"
+
+	# default database dir
+	keepdir /var/lib/krb5kdc
+
+	cd ..
+	dodoc README
+	dodoc doc/*.{ps,txt}
+	doinfo doc/*.info*
+	dohtml -r doc/*.html
+
+	# die if we cannot respect a USE flag
+	if use doc ; then
+	    dodoc doc/{api,implement}/*.ps || die "dodoc failed"
+	fi
+
+	newinitd "${FILESDIR}"/mit-krb5kadmind.initd mit-krb5kadmind || die
+	newinitd "${FILESDIR}"/mit-krb5kdc.initd mit-krb5kdc || die
+
+	insinto /etc
+	newins "${D}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
+	insinto /var/lib/krb5kdc
+	newins "${D}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
+
+	if use openldap ; then
+		insinto /etc/openldap/schema
+		doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema" || die
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}/kpropd.xinetd" kpropd || die
+	fi
+}
+
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-1.8.0" ; then
+		elog "MIT split the Kerberos applications from the base Kerberos"
+		elog "distribution.  Kerberized versions of telnet, rlogin, rsh, rcp,"
+		elog "ftp clients and telnet, ftp deamons now live in"
+		elog "\"app-crypt/mit-krb5-appl\" package."
+	fi
+}
diff --git a/app-crypt/mit-krb5/mit-krb5-1.9.2.ebuild b/app-crypt/mit-krb5/mit-krb5-1.9.2.ebuild
new file mode 100644
index 000000000000..6e8f58db1707
--- /dev/null
+++ b/app-crypt/mit-krb5/mit-krb5-1.9.2.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.9.2.ebuild,v 1.1 2011/11/05 13:08:11 eras Exp $
+
+EAPI=3
+
+inherit eutils flag-o-matic versionator
+
+MY_P="${P/mit-}"
+P_DIR=$(get_version_component_range 1-2)
+DESCRIPTION="MIT Kerberos V"
+HOMEPAGE="http://web.mit.edu/kerberos/www/"
+SRC_URI="http://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}-signed.tar"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="doc +keyutils openldap +pkinit +threads test xinetd"
+
+RDEPEND="!!app-crypt/heimdal
+	>=sys-libs/e2fsprogs-libs-1.41.0
+	keyutils? ( sys-apps/keyutils )
+	openldap? ( net-nds/openldap )
+	xinetd? ( sys-apps/xinetd )"
+DEPEND="${RDEPEND}
+	virtual/yacc
+	doc? ( virtual/latex-base )
+	test? ( dev-lang/tcl
+	        dev-lang/python
+			dev-util/dejagnu )"
+
+S=${WORKDIR}/${MY_P}/src
+
+src_unpack() {
+	unpack ${A}
+	unpack ./"${MY_P}".tar.gz
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-kprop_exit_on_error.patch"
+}
+
+src_configure() {
+	append-flags "-I${EPREFIX}/usr/include/et"
+	# QA
+	append-flags -fno-strict-aliasing
+	append-flags -fno-strict-overflow
+	use keyutils || export ac_cv_header_keyutils_h=no
+	econf \
+		$(use_with openldap ldap) \
+		"$(use_with test tcl "${EPREFIX}/usr")" \
+		$(use_enable pkinit) \
+		$(use_enable threads thread-support) \
+		--without-hesiod \
+		--enable-shared \
+		--with-system-et \
+		--with-system-ss \
+		--enable-dns-for-realm \
+		--enable-kdc-lookaside-cache \
+		--disable-rpath
+}
+
+src_compile() {
+	emake -j1 || die "emake failed"
+
+	if use doc ; then
+		cd ../doc
+		for dir in api implement ; do
+			emake -C "${dir}" || die "doc emake failed"
+		done
+	fi
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
+		install || die "install failed"
+
+	# default database dir
+	keepdir /var/lib/krb5kdc
+
+	cd ..
+	dodoc NOTICE README
+	dodoc doc/*.{ps,txt}
+	doinfo doc/*.info*
+	dohtml -r doc/*.html
+
+	# die if we cannot respect a USE flag
+	if use doc ; then
+	    dodoc doc/{api,implement}/*.ps || die "dodoc failed"
+	fi
+
+	newinitd "${FILESDIR}"/mit-krb5kadmind.initd mit-krb5kadmind || die
+	newinitd "${FILESDIR}"/mit-krb5kdc.initd mit-krb5kdc || die
+	newinitd "${FILESDIR}"/mit-krb5kpropd.initd mit-krb5kpropd || die
+
+	insinto /etc
+	newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
+	insinto /var/lib/krb5kdc
+	newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
+
+	if use openldap ; then
+		insinto /etc/openldap/schema
+		doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema" || die
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}/kpropd.xinetd" kpropd || die
+	fi
+}
+
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-1.8.0" ; then
+		elog "MIT split the Kerberos applications from the base Kerberos"
+		elog "distribution.  Kerberized versions of telnet, rlogin, rsh, rcp,"
+		elog "ftp clients and telnet, ftp deamons now live in"
+		elog "\"app-crypt/mit-krb5-appl\" package."
+	fi
+}