Commit -> Stable 7.7-r1 wrt bug 228091.

(Portage version: 2.2_rc1/cvs/Linux 2.6.25.8 i686, RepoMan options: --force)

3 files changed, 75 insertions, 1 deletions

diff --git a/dev-libs/libpcre/ChangeLog b/dev-libs/libpcre/ChangeLog
index ddd9c0939e8f..161df3e7f65e 100644
--- a/dev-libs/libpcre/ChangeLog
+++ b/dev-libs/libpcre/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libpcre
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/ChangeLog,v 1.138 2008/05/26 14:16:24 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/ChangeLog,v 1.139 2008/06/30 21:03:05 loki_val Exp $
+
+*libpcre-7.7-r1 (30 Jun 2008)
+
+  30 Jun 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/libpcre-7.7-buffer-overflow.patch, +libpcre-7.7-r1.ebuild:
+  Commit -> Stable 7.7-r1 wrt bug 228091.
 
 *libpcre-7.7 (26 May 2008)
 
diff --git a/dev-libs/libpcre/files/libpcre-7.7-buffer-overflow.patch b/dev-libs/libpcre/files/libpcre-7.7-buffer-overflow.patch
new file mode 100644
index 000000000000..a27987fa0c93
--- /dev/null
+++ b/dev-libs/libpcre/files/libpcre-7.7-buffer-overflow.patch
@@ -0,0 +1,16 @@
+diff -NrU5 pcre-7.7.orig/pcre_compile.c pcre-7.7/pcre_compile.c
+--- pcre-7.7.orig/pcre_compile.c	2008-06-18 17:08:49.000000000 +0200
++++ pcre-7.7/pcre_compile.c	2008-06-18 17:11:04.000000000 +0200
+@@ -4929,11 +4929,11 @@
+           {
+           if (code == cd->start_code + 1 + LINK_SIZE &&
+                (lengthptr == NULL || *lengthptr == 2 + 2*LINK_SIZE))
+             {
+             cd->external_options = newoptions;
+-            options = newoptions;
++            options = *optionsptr = newoptions;
+             }
+          else
+             {
+             if ((options & PCRE_IMS) != (newoptions & PCRE_IMS))
+               {
diff --git a/dev-libs/libpcre/libpcre-7.7-r1.ebuild b/dev-libs/libpcre/libpcre-7.7-r1.ebuild
new file mode 100644
index 000000000000..6c8555f372ed
--- /dev/null
+++ b/dev-libs/libpcre/libpcre-7.7-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-7.7-r1.ebuild,v 1.1 2008/06/30 21:03:05 loki_val Exp $
+
+EAPI=1
+
+inherit libtool eutils
+
+MY_P="pcre-${PV}"
+
+DESCRIPTION="Perl-compatible regular expression library"
+HOMEPAGE="http://www.pcre.org/"
+SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${MY_P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="3"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~sparc-fbsd x86 ~x86-fbsd"
+IUSE="bzip2 +cxx doc unicode zlib"
+
+DEPEND="dev-util/pkgconfig"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-buffer-overflow.patch
+	elibtoolize
+}
+
+src_compile() {
+	# Enable building of static libs too - grep and others
+	# depend on them being built: bug 164099
+	econf --with-match-limit-recursion=8192 \
+		$(use_enable unicode utf8) $(use_enable unicode unicode-properties) \
+		$(use_enable cxx cpp) \
+		$(use_enable zlib pcregrep-libz) \
+		$(use_enable bzip2 pcregrep-libbz2) \
+		--enable-static \
+		--htmldir=/usr/share/doc/${PF}/html \
+		--docdir=/usr/share/doc/${PF} \
+		|| die "econf failed"
+	emake all || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	dodoc doc/*.txt AUTHORS
+	use doc && dohtml doc/html/*
+}