Version bump, CVE-2012-0840, bug 403731

Package-Manager: portage-2.2.0_alpha89/cvs/Linux x86_64

4 files changed, 120 insertions, 28 deletions

diff --git a/dev-libs/apr/ChangeLog b/dev-libs/apr/ChangeLog
index 61757897fef3..9967b6e9464f 100644
--- a/dev-libs/apr/ChangeLog
+++ b/dev-libs/apr/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/apr
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.182 2011/11/11 20:34:47 hwoarang Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.183 2012/02/28 08:08:16 idl0r Exp $
+
+*apr-1.4.6 (28 Feb 2012)
+
+  28 Feb 2012; Christian Ruppert <idl0r@gentoo.org> +apr-1.4.6.ebuild,
+  metadata.xml:
+  Version bump, CVE-2012-0840, bug 403731
 
   11 Nov 2011; Markos Chandras <hwoarang@gentoo.org> -apr-1.4.4.ebuild:
   remove old ebuild
diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index dd130155b8b5..6da941ad26e3 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -1,25 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX config.layout.patch 818 RMD160 dada232c8b85e6c3c62fbc6caa1d05f36164dc27 SHA1 3822a0ec508165dd189e1b750bdf4e7778b6c21e SHA256 eeacaf654f23084e842bff02b97c083a8da5b5c056fd086166ba2d250edf3181
 DIST apr-1.4.5.tar.bz2 754763 RMD160 d2a966c1b143416cd3655cf849cb5d3cb1ca2c5f SHA1 517de5e3cc1e3be810d9bc95508ab66bb8ebe7cb SHA256 38c61cacb39be649411cdab212979c71ce29495549c249c2e9a1b0d12480c93e
+DIST apr-1.4.6.tar.bz2 785724 RMD160 ca496323a921f71ed28695ede94ff4fc00df9b0d SHA1 1a72fc9d89a378590ef243399396169426d1f6cf SHA256 9b635e60feb163e6fc6c375721f71f44d7e26d6b9cd52f6b86b04e65d2481cbc
 EBUILD apr-1.4.5.ebuild 2131 RMD160 b5da63b392e7af2c71ceceada6cbaaa6e3bdd4ce SHA1 d18fddb52ba4406128c98f6cd07804aa0c5b157d SHA256 13c591ee66cdfef1d3da5fbcf18925b18f3415ede24255be1897156568d4d7e5
-MISC ChangeLog 21820 RMD160 308834d90f6e44da8aae2e13db9239fa219b977d SHA1 26fab23adcc65c88b2acde6ea826aaff04ea575d SHA256 8d0539585a638de90ce698352f8c8f02988da12e2b3d19b9fd1bafca8be95d5e
-MISC metadata.xml 453 RMD160 44be42dfd9fe4c26f5655b4a8b78446ae1c073e7 SHA1 d7378602457f126b8448744b2f965853b4a17188 SHA256 c089c114bb8c838899abeb5c1f1c19a495039b30e106363c14e5de83b7e9a1f4
+EBUILD apr-1.4.6.ebuild 2123 RMD160 4c7f465ca8b5c2bca9bd70e3102a7b00e1f3be63 SHA1 35f06f120546dd1b4ab6801a4c95ffae51e4d439 SHA256 a620642a569bb5667008b4728bba9bf3058524b734b01da2e4993acb5cca76eb
+MISC ChangeLog 21973 RMD160 2a94fbb767fd223c776a6e75982c6343613205ec SHA1 de61577f99c1b328fee0d31caccfa0ea2c4b1d91 SHA256 e78869ff63229f2424c5287efc2fc46268ef7365139d1ae0d68ddc13e47427d4
+MISC metadata.xml 458 RMD160 87c6c168968b4205420e8c0d9a8553ef63d6bdd6 SHA1 4dd7b1e9b7ec5e44cad4c4e8562da93e28faf685 SHA256 aa87ee029ce91a847b0fb331613572835f08aff1b2fc8104e2ac9b6b1250532b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOvYbqAAoJEPqDWhW0r/LCOQoP/RMASu34u34WDV0k5M1iS60p
-HF/nlPQv73/bc14i92SJJ5/LwIsi1vM3yebaOTIZ1Vr5AdLZDiDaI+nsBwcPmly1
-zabDeGVsy9eqTVj8CpkafR+QGtt8m7ZXVvD/3eVmTkGrOqt+Y40K2SaxAe4+C2Dv
-N4gMAqGSwG90eGbD11cWmEwJkCtmM35AfAbb9M3+ED84MShn3eWGRmbylAKCOSjb
-zR8OvSvFIZajqyBt83uaKF3PZ2uovztoYEcwUVS8BNTNj5Puq9Ke91t7paE4XoaX
-JIkbB51roensPliC4AMAMS221QMY8au6mDdQ2Fzob/rIonicZOVIZA7yDANJvfOs
-SaNbNVKfY9Rop+9pw4vte8QreQgTK5ehBPpUItbfoIm5IMM1yKQfbuSrCNq6m19N
-B4kgzTurvtaBKxOxtP2br4ZX3dj4DqjkhmVV2yOQf5OCjXDkmSUJMiS/zRv8vqXc
-ZxUzG67C96Zg+dWWRUcdam6XkfMYQOnNw/MJRwhLVz7N4ziMk7EYcOYTOzQme2tF
-AwxPchwJPDUDj5D9RUSqsxz6VQ1UCQ7tcHbPzK6jXsr4/cge3NS6TblpUVsKoH3m
-ksWCXx4l+wjPzkL0ToHGnxgNbCB236Gu8BhTKt4UvRyQv1wdLpOiTJUWJiLl6bBD
-VHoxJZ07C4Y2tXcnID7m
-=E2DM
+iQEcBAEBCAAGBQJPTIt5AAoJEMOx0zmdw4Z1n/UIAKm3IgA+0htVedTZ4IIVePTY
+4uVwAni/0mNSMktfGnvJi8ZPAk0eDRLUIZEm40oSSUg38iC/eFXTBI/PPqqbjIiI
+ceBHcf8lBJxDDBcALoChgg8UAxY/GUBPFiNyDUkwLz8vm/GzjgW7QX3BeRCewbVm
+nE9BlrR7DKbm6L4J5jBnUmBQmN5AVcNjj6hUVtCnKrNMGVBZ8hNaOmEW5BuJY2Qv
+Bg1iwzra4Oq/3XyZCTWw3Tv7GhRMGDwdU6tX/4YpOltNssuVeBL2Bl75g0MR8wv8
+VtAkHoZq4WkvZbm4WyzLy9Am68/XA1udtaHUqCzxYUgGDhrmHlnAIriJgbDDjX8=
+=uyVX
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/apr/apr-1.4.6.ebuild b/dev-libs/apr/apr-1.4.6.ebuild
new file mode 100644
index 000000000000..2b002ef2878f
--- /dev/null
+++ b/dev-libs/apr/apr-1.4.6.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.4.6.ebuild,v 1.1 2012/02/28 08:08:16 idl0r Exp $
+
+EAPI="4"
+
+inherit autotools eutils libtool multilib
+
+DESCRIPTION="Apache Portable Runtime Library"
+HOMEPAGE="http://apr.apache.org/"
+SRC_URI="mirror://apache/apr/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="doc elibc_FreeBSD older-kernels-compatibility static-libs +urandom +uuid"
+
+RDEPEND="uuid? ( !elibc_FreeBSD? ( >=sys-apps/util-linux-2.16 ) )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+DOCS=(CHANGES NOTICE README)
+
+src_prepare() {
+	# Ensure that system libtool is used.
+	sed -e 's:${installbuilddir}/libtool:/usr/bin/libtool:' -i apr-config.in || die "sed failed"
+	sed -e 's:@LIBTOOL@:$(SHELL) /usr/bin/libtool:' -i build/apr_rules.mk.in || die "sed failed"
+
+	AT_M4DIR="build" eautoreconf
+	elibtoolize
+
+	epatch "${FILESDIR}/config.layout.patch"
+}
+
+src_configure() {
+	local myconf
+
+	if use older-kernels-compatibility; then
+		local apr_cv_accept4 apr_cv_dup3 apr_cv_epoll_create1 apr_cv_sock_cloexec
+		export apr_cv_accept4="no"
+		export apr_cv_dup3="no"
+		export apr_cv_epoll_create1="no"
+		export apr_cv_sock_cloexec="no"
+	fi
+
+	if use urandom; then
+		myconf+=" --with-devrandom=/dev/urandom"
+	else
+		myconf+=" --with-devrandom=/dev/random"
+	fi
+
+	if ! use uuid; then
+		local apr_cv_osuuid
+		export apr_cv_osuuid="no"
+	fi
+
+	CONFIG_SHELL="/bin/bash" econf \
+		--enable-layout=gentoo \
+		--enable-nonportable-atomics \
+		--enable-threads \
+		${myconf}
+
+	rm -f libtool
+}
+
+src_compile() {
+	emake
+
+	if use doc; then
+		emake dox
+	fi
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name "*.la" -exec rm -f {} +
+
+	if use doc; then
+		dohtml -r docs/dox/html/*
+	fi
+
+	if ! use static-libs; then
+		find "${ED}" -name "*.a" -exec rm -f {} +
+	fi
+
+	# This file is only used on AIX systems, which Gentoo is not,
+	# and causes collisions between the SLOTs, so remove it.
+	rm -f "${ED}usr/$(get_libdir)/apr.exp"
+}
diff --git a/dev-libs/apr/metadata.xml b/dev-libs/apr/metadata.xml
index 7a90328af9c1..b3e439228262 100644
--- a/dev-libs/apr/metadata.xml
+++ b/dev-libs/apr/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>apache</herd>
-<maintainer>
-  <email>apache-bugs@gentoo.org</email>
-</maintainer>
-<use>
-  <flag name='older-kernels-compatibility'>Enable binary compatibility with older kernels</flag>
-  <flag name='urandom'>Use /dev/urandom instead of /dev/random</flag>
-  <flag name='uuid'>Enable UUID support</flag>
-</use>
+	<herd>apache</herd>
+	<maintainer>
+		<email>apache-bugs@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="older-kernels-compatibility">Enable binary compatibility with older kernels</flag>
+		<flag name="urandom">Use /dev/urandom instead of /dev/random</flag>
+		<flag name="uuid">Enable UUID support</flag>
+	</use>
 </pkgmetadata>