[gentoo-commits] gentoo-x86 commit in dev-libs/apr: metadata.xml ChangeLog apr-1.4.6.ebuild

[Christian Ruppert (idl0r)]

idl0r       12/02/28 08:08:16

  Modified:             metadata.xml ChangeLog
  Added:                apr-1.4.6.ebuild
  Log:
  Version bump, CVE-2012-0840, bug 403731
  
  (Portage version: 2.2.0_alpha89/cvs/Linux x86_64)

Revision  Changes    Path
1.8                  dev-libs/apr/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/apr/metadata.xml?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/apr/metadata.xml?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/apr/metadata.xml?r1=1.7&r2=1.8

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/apr/metadata.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- metadata.xml	18 Feb 2011 17:02:48 -0000	1.7
+++ metadata.xml	28 Feb 2012 08:08:16 -0000	1.8
@@ -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@g.o</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@g.o</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>



1.183                dev-libs/apr/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/apr/ChangeLog?rev=1.183&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/apr/ChangeLog?rev=1.183&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/apr/ChangeLog?r1=1.182&r2=1.183

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -r1.182 -r1.183
--- ChangeLog	11 Nov 2011 20:34:47 -0000	1.182
+++ ChangeLog	28 Feb 2012 08:08:16 -0000	1.183
@@ -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@g.o> +apr-1.4.6.ebuild,
+  metadata.xml:
+  Version bump, CVE-2012-0840, bug 403731
 
   11 Nov 2011; Markos Chandras <hwoarang@g.o> -apr-1.4.4.ebuild:
   remove old ebuild



1.1                  dev-libs/apr/apr-1.4.6.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/apr/apr-1.4.6.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/apr/apr-1.4.6.ebuild?rev=1.1&content-type=text/plain

Index: apr-1.4.6.ebuild
===================================================================
# 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"
}