Commit -> Stable 7.7-r1 wrt bug 228091.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25.8 i686
RepoMan-Options: --force

4 files changed, 78 insertions, 2 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/Manifest b/dev-libs/libpcre/Manifest
index 42d9b059878d..f689a80c82c0 100644
--- a/dev-libs/libpcre/Manifest
+++ b/dev-libs/libpcre/Manifest
@@ -1,10 +1,12 @@
 AUX libpcre-7.6-ABI_correction.patch 701 RMD160 48c03a1c481ac8f2234cd30abd6148efe7beebe8 SHA1 10fe3f6874f94227bbfee451a945642f60e115e5 SHA256 93ce2941cc8ebce1dd552620a14321e4ba20a4e9b99656a76db2cef1f31b6892
+AUX libpcre-7.7-buffer-overflow.patch 636 RMD160 49538a7ec5a6defe4dbe56d0dee6ec645e823545 SHA1 5a69fb97f1fa547f9012082221a6b98d77b65277 SHA256 cb35a6f7b28f3d0525710a692066b0b4fedc8c31160ab6c7d322309ac68ce3f8
 DIST pcre-7.4.tar.bz2 783044 RMD160 42bc33e5592c23c7eb337f8fcfab77fb290aed61 SHA1 2092ff639da7694b47056f3f9abed285d4a840b3 SHA256 a5fb383fcc6d35e694950d203f9d7ef525165854dd4ac2c269e20e57a0d0b3e5
 DIST pcre-7.6.tar.bz2 802829 RMD160 d62ebef7828bbf135a80e55a5d69d12f02953506 SHA1 e1ed4d3c90d0657bb1967123e90a525744fd12f9 SHA256 362e4b4473f2f7a3bfa28ea73e80ec00a2fe525a1aceb5f66e1c528a900bd735
 DIST pcre-7.7.tar.bz2 818897 RMD160 fdf7785b982879ce91847130960fa1531caffaeb SHA1 f1f54d3e13e6cb427de962e62eaaee32c74cba38 SHA256 bada84f483b428bb45ee68899b62c996f03e8c9422408fc72e60ec854c9df640
 EBUILD libpcre-7.4-r1.ebuild 1287 RMD160 fc6f34a4f242d67bf8594c199c03c02990219b06 SHA1 b1044334ea4bdada723411f64f6154c4f25fa36c SHA256 492451e8f0dabbbe7a68f6c9166d85e483fd5702d0bbf4d50cb4e68c6fcdb24b
 EBUILD libpcre-7.4.ebuild 1154 RMD160 a1a5aa464f280ab3ed1fb16ff020e3ff321b2fa6 SHA1 f8aa2be344aa1645743ed6e4d94f4c4dfdf1e409 SHA256 3b661cd4d5facfb765e1529e01cfa248f3f8b0e63dfb1c0dfcf0b7a147d06997
 EBUILD libpcre-7.6-r1.ebuild 1386 RMD160 e5f3ec88ff89ce21ff1471712c8ce18ab906139e SHA1 c6570171a8709b36b223bfe968fb7cd3cef94f80 SHA256 411a99a966cc593306a74acd5f91edc8e0939ba3e0f4310601e25364ae8d525b
+EBUILD libpcre-7.7-r1.ebuild 1390 RMD160 dabb10590f22c5e9da9ed4889929e50a5944653f SHA1 17ae41f1539fef410c8add9c368578500170c61c SHA256 2863c6e6930431b22be7b34132e469664b69705e8f47f61d02b375fab264c8dd
 EBUILD libpcre-7.7.ebuild 1346 RMD160 2bcf9ff22129c551697db9892537c6cdaa5e3ec4 SHA1 f5c7bbe99103a7dc76ac9cd08083387906a827af SHA256 e141c061fe824e84f6942eb4e7602f9e713ac5e4776beacd9fac7afb02712c83
-MISC ChangeLog 17397 RMD160 16dabba030d0cd12f68904254591d0c123f427d3 SHA1 f4f59e8f77092b29bce3bdae40cb37a9622d31be SHA256 c2ef8ee82f5cf0009b983277045c91404a554702b799ee3d13b9eb6e4af894e4
+MISC ChangeLog 17592 RMD160 9f63abc4f6e2570549cea09273e6ac4a77aacaaa SHA1 cc14f87d6820ab9b25be981892516b23fadd55fd SHA256 02e4ec1d9a1dcf5ab94032e94a7da003bfe80cda98bee1cdb7f34db0b1824868
 MISC metadata.xml 306 RMD160 828e2a0aae05636e0341c95770549c8901e891d9 SHA1 a7ab5b463baa92c0540fb4f4013674a243ca922b SHA256 6c64b79712509179600cae5676df6460f166225ee0f9a10aafe494fde9a8ccb1
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/*
+}