Rev bump for: sys-apps/keyutils added to DEPEND - bug #326201. Remove vulnerable versions

(Portage version: 2.1.8.3/cvs/Linux x86_64)

5 files changed, 24 insertions, 340 deletions

diff --git a/app-crypt/mit-krb5/ChangeLog b/app-crypt/mit-krb5/ChangeLog
index 9e85ba322485..76b5bfcb946f 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/ChangeLog,v 1.225 2010/07/11 10:14:26 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/ChangeLog,v 1.226 2010/07/14 15:28:13 darkside Exp $
+
+*mit-krb5-1.8.2-r1 (14 Jul 2010)
+
+  14 Jul 2010; Jeremy Olexa <darkside@gentoo.org> -mit-krb5-1.6.3-r7.ebuild,
+  -mit-krb5-1.7-r2.ebuild, -mit-krb5-1.8.1.ebuild,
+  -mit-krb5-1.8.1-r1.ebuild, +mit-krb5-1.8.2-r1.ebuild:
+  Rev bump for: sys-apps/keyutils added to DEPEND - bug #326201. Remove
+  vulnerable versions
 
   11 Jul 2010; Tobias Klausmann <klausman@gentoo.org> mit-krb5-1.8.2.ebuild:
   Stable on alpha, bug #323525
diff --git a/app-crypt/mit-krb5/mit-krb5-1.6.3-r7.ebuild b/app-crypt/mit-krb5/mit-krb5-1.6.3-r7.ebuild
deleted file mode 100644
index 7876a32ed4b3..000000000000
--- a/app-crypt/mit-krb5/mit-krb5-1.6.3-r7.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2010 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.6.3-r7.ebuild,v 1.1 2010/01/14 09:12:31 mueli Exp $
-
-inherit eutils flag-o-matic versionator autotools
-
-PATCHV="0.5"
-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
-	mirror://gentoo/${P}-patches-${PATCHV}.tar.bz2"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="krb4 doc"
-
-RDEPEND="!virtual/krb5
-	>=sys-libs/e2fsprogs-libs-1.41.0"
-DEPEND="${RDEPEND}
-	doc? ( virtual/latex-base )"
-
-S=${WORKDIR}/${MY_P}/src
-
-PROVIDE="virtual/krb5"
-
-src_unpack() {
-	unpack ${A}
-	unpack ./${MY_P}.tar.gz
-	cd "${S}"
-	EPATCH_SOURCE="${WORKDIR}/patch" EPATCH_SUFFIX="patch" epatch
-	epatch "${FILESDIR}/CVE-2009-0844+CVE-2009-0847.patch"
-	epatch "${FILESDIR}/CVE-2009-0846.patch"
-	epatch "${FILESDIR}/1.6-CVE-2009-4212.patch"
-	einfo "Regenerating configure scripts (be patient)"
-	local subdir
-	for subdir in $(find . -name configure.in \
-		| xargs grep -l 'AC_CONFIG_SUBDIRS' \
-		| sed 's@/configure\.in$@@'); do
-		ebegin "Regenerating configure script in ${subdir}"
-		cd "${S}"/${subdir}
-		eautoconf --force -I "${S}"
-		eend $?
-	done
-}
-
-src_compile() {
-	# needed to work with sys-libs/e2fsprogs-libs <- should be removed!!
-	append-flags "-I/usr/include/et"
-	econf \
-		$(use_with krb4) \
-		--enable-shared \
-		--with-system-et --with-system-ss \
-		--enable-dns-for-realm \
-		--enable-kdc-replay-cache || die
-
-	emake -j1 || die
-
-	if use doc ; then
-		cd ../doc
-		for dir in api implement ; do
-			make -C "${dir}" || die
-		done
-	fi
-}
-
-src_test() {
-	einfo "Tests do not run in sandbox, have a lot of dependencies and are therefore completely disabled."
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		EXAMPLEDIR=/usr/share/doc/${PF}/examples \
-		install || die
-
-	keepdir /var/lib/krb5kdc
-
-	cd ..
-	dodoc README
-	dodoc doc/*.ps
-	doinfo doc/*.info*
-	dohtml -r doc/*
-
-	use doc && dodoc doc/{api,implement}/*.ps
-
-	for i in {telnetd,ftpd} ; do
-		mv "${D}"/usr/share/man/man8/${i}.8 "${D}"/usr/share/man/man8/k${i}.8
-		mv "${D}"/usr/sbin/${i} "${D}"/usr/sbin/k${i}
-	done
-
-	for i in {rcp,rlogin,rsh,telnet,ftp} ; do
-		mv "${D}"/usr/share/man/man1/${i}.1 "${D}"/usr/share/man/man1/k${i}.1
-		mv "${D}"/usr/bin/${i} "${D}"/usr/bin/k${i}
-	done
-
-	newinitd "${FILESDIR}"/mit-krb5kadmind.initd mit-krb5kadmind
-	newinitd "${FILESDIR}"/mit-krb5kdc.initd mit-krb5kdc
-
-	insinto /etc
-	newins "${D}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
-	newins "${D}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
-}
-
-pkg_postinst() {
-	elog "See /usr/share/doc/${PF}/html/krb5-admin.html for documentation."
-}
diff --git a/app-crypt/mit-krb5/mit-krb5-1.7-r2.ebuild b/app-crypt/mit-krb5/mit-krb5-1.7-r2.ebuild
deleted file mode 100644
index bd232e4d720b..000000000000
--- a/app-crypt/mit-krb5/mit-krb5-1.7-r2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2010 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.7-r2.ebuild,v 1.1 2010/01/14 09:12:31 mueli Exp $
-
-inherit eutils flag-o-matic versionator autotools
-
-PATCHV="0.6"
-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
-	mirror://gentoo/${P}-patches-${PATCHV}.tar.bz2"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="doc"
-
-RDEPEND="!virtual/krb5
-	>=sys-libs/e2fsprogs-libs-1.41.0"
-DEPEND="${RDEPEND}
-	doc? ( virtual/latex-base )"
-
-S=${WORKDIR}/${MY_P}/src
-
-PROVIDE="virtual/krb5"
-
-src_unpack() {
-	unpack ${A}
-	unpack ./${MY_P}.tar.gz
-	cd "${S}"
-	epatch "${FILESDIR}/1.7-CVE-2009-4212.patch"
-	EPATCH_SOURCE="${WORKDIR}/patch" \
-		EPATCH_EXCLUDE="0001_all_lazyldflags.patch" \
-		EPATCH_SUFFIX="patch" epatch
-	einfo "Regenerating configure scripts (be patient)"
-	local subdir
-	for subdir in $(find . -name configure.in \
-		| xargs grep -l 'AC_CONFIG_SUBDIRS' \
-		| sed 's@/configure\.in$@@'); do
-		ebegin "Regenerating configure script in ${subdir}"
-		cd "${S}"/${subdir}
-		eautoconf --force -I "${S}"
-		eend $?
-	done
-}
-
-src_compile() {
-	append-flags "-I/usr/include/et"
-	econf \
-		--without-krb4 \
-		--enable-shared \
-		--with-system-et --with-system-ss \
-		--enable-dns-for-realm \
-		--enable-kdc-replay-cache || die
-	emake -j1 || die
-
-	if use doc ; then
-		cd ../doc
-		for dir in api implement ; do
-			make -C "${dir}" || die
-		done
-	fi
-}
-
-src_test() {
-	einfo "Tests do not run in sandbox, they need mit-krb5 to be already installed to test it."
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		EXAMPLEDIR=/usr/share/doc/${PF}/examples \
-		install || die
-
-	keepdir /var/lib/krb5kdc
-
-	cd ..
-	dodoc README
-	dodoc doc/*.ps
-	doinfo doc/*.info*
-	dohtml -r doc/*
-
-	use doc && dodoc doc/{api,implement}/*.ps
-
-	for i in {telnetd,ftpd} ; do
-		mv "${D}"/usr/share/man/man8/${i}.8 "${D}"/usr/share/man/man8/k${i}.8
-		mv "${D}"/usr/sbin/${i} "${D}"/usr/sbin/k${i}
-	done
-
-	for i in {rcp,rlogin,rsh,telnet,ftp} ; do
-		mv "${D}"/usr/share/man/man1/${i}.1 "${D}"/usr/share/man/man1/k${i}.1
-		mv "${D}"/usr/bin/${i} "${D}"/usr/bin/k${i}
-	done
-
-	newinitd "${FILESDIR}"/mit-krb5kadmind.initd mit-krb5kadmind
-	newinitd "${FILESDIR}"/mit-krb5kdc.initd mit-krb5kdc
-
-	insinto /etc
-	newins "${D}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
-	newins "${D}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
-}
diff --git a/app-crypt/mit-krb5/mit-krb5-1.8.1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.8.1.ebuild
deleted file mode 100644
index 13c6334bbc8a..000000000000
--- a/app-crypt/mit-krb5/mit-krb5-1.8.1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2010 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.1.ebuild,v 1.2 2010/05/01 14:43:06 darkside Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic versionator autotools
-
-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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="ldap doc"
-
-RDEPEND="!virtual/krb5
-	>=sys-libs/e2fsprogs-libs-1.41.0
-	ldap? ( net-nds/openldap )"
-DEPEND="${RDEPEND}
-	doc? ( virtual/latex-base )"
-
-S=${WORKDIR}/${MY_P}/src
-
-PROVIDE="virtual/krb5"
-
-src_unpack() {
-	unpack ${A}
-	unpack ./"${MY_P}".tar.gz
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/CVE-2010-1320.patch"
-	local subdir
-	for subdir in $(find . -name configure.in \
-		| xargs grep -l 'AC_CONFIG_SUBDIRS' \
-		| sed 's@/configure\.in$@@'); do
-		ebegin "Regenerating configure script in ${subdir}"
-		cd "${S}"/${subdir}
-		eautoconf --force -I "${S}"
-		eend $?
-	done
-}
-
-src_configure() {
-	append-flags "-I/usr/include/et"
-	econf \
-		$(use_with ldap) \
-		--without-krb4 \
-		--enable-shared \
-		--with-system-et \
-		--with-system-ss \
-		--enable-dns-for-realm \
-		--enable-kdc-replay-cache
-}
-
-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_test() {
-	einfo "Tests do not run in sandbox, they need mit-krb5 to be already installed to test it."
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		EXAMPLEDIR=/usr/share/doc/${PF}/examples \
-		install || die "install failed"
-
-	keepdir /var/lib/krb5kdc
-
-	cd ..
-	dodoc README
-	dodoc doc/*.ps
-	doinfo doc/*.info*
-	dohtml -r doc/*
-
-#   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
-	newinitd "${FILESDIR}"/mit-krb5kdc.initd mit-krb5kdc
-
-	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
-}
-
-pkg_preinst() {
-
-	if has_version "<${CATEGORY}/${PN}-1.8.0" ; then
-		einfo
-		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."
-		einfo
-	fi
-}
diff --git a/app-crypt/mit-krb5/mit-krb5-1.8.1-r1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.8.2-r1.ebuild
index 77b7891dbf41..427c62edf494 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.8.1-r1.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.8.2-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 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.1-r1.ebuild,v 1.2 2010/05/24 12:35:37 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.8.2-r1.ebuild,v 1.1 2010/07/14 15:28:13 darkside Exp $
 
 EAPI="2"
 
-inherit eutils flag-o-matic versionator autotools
+inherit eutils flag-o-matic versionator
 
 MY_P=${P/mit-}
 P_DIR=$(get_version_component_range 1-2)
@@ -15,11 +15,13 @@ 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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="ldap doc"
+IUSE="ldap doc xinetd"
 
 RDEPEND="!virtual/krb5
 	>=sys-libs/e2fsprogs-libs-1.41.0
-	ldap? ( net-nds/openldap )"
+	sys-apps/keyutils
+	ldap? ( net-nds/openldap )
+	xinetd? ( sys-apps/xinetd )"
 DEPEND="${RDEPEND}
 	doc? ( virtual/latex-base )"
 
@@ -32,12 +34,6 @@ src_unpack() {
 	unpack ./"${MY_P}".tar.gz
 }
 
-src_prepare() {
-	epatch "${FILESDIR}/CVE-2010-1320.patch"
-	epatch "${FILESDIR}/CVE-2010-1321.patch"
-
-}
-
 src_configure() {
 
 	append-flags "-I/usr/include/et"
@@ -53,7 +49,7 @@ src_configure() {
 }
 
 src_compile() {
-	emake || die "emake failed"
+	emake -j1 || die "emake failed"
 
 	if use doc ; then
 		cd ../doc
@@ -73,6 +69,7 @@ src_install() {
 		EXAMPLEDIR=/usr/share/doc/${PF}/examples \
 		install || die "install failed"
 
+	# default database dir
 	keepdir /var/lib/krb5kdc
 
 	cd ..
@@ -81,7 +78,7 @@ src_install() {
 	doinfo doc/*.info*
 	dohtml -r doc/*
 
-#   die if we cannot respect a USE flag
+	# die if we cannot respect a USE flag
 	if use doc ; then
 	    dodoc doc/{api,implement}/*.ps || die "dodoc failed"
 	fi
@@ -96,8 +93,12 @@ src_install() {
 
 	if use ldap ; then
 		insinto /etc/openldap/schema
-		newins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema" \
-		kerberos.schema
+		doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema"
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}/kpropd.xinetd" kpropd
 	fi
 }