Version bump for security bug #103337. Stable amd64, sparc, x86.

(Portage version: 2.0.51.22-r2)

6 files changed, 130 insertions, 18 deletions

diff --git a/dev-libs/libpcre/ChangeLog b/dev-libs/libpcre/ChangeLog
index b40f8af6a446..61df4e7c7924 100644
--- a/dev-libs/libpcre/ChangeLog
+++ b/dev-libs/libpcre/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/libpcre
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/ChangeLog,v 1.60 2005/07/02 23:23:15 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/ChangeLog,v 1.61 2005/08/22 20:37:24 eradicator Exp $
+
+*libpcre-6.3 (22 Aug 2005)
+
+  22 Aug 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/pcre-6.3-link.patch, +files/pcre-6.3-uclibc-tuple.patch,
+  +libpcre-6.3.ebuild:
+  Version bump for security bug #103337.  Stable amd64, sparc, x86.
 
 *libpcre-6.1 (02 Jul 2005)
 
diff --git a/dev-libs/libpcre/Manifest b/dev-libs/libpcre/Manifest
index 26baa2ec0553..d8b8d326c0c3 100644
--- a/dev-libs/libpcre/Manifest
+++ b/dev-libs/libpcre/Manifest
@@ -1,27 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 29e606c243e3dba231f15f3373a62827 ChangeLog 7522
+MD5 59046451dd9a28a2a59c373b6b7f12c3 libpcre-4.2-r1.ebuild 852
+MD5 47ad7fd446e1df9f7b55008a9aa8bbc1 libpcre-4.4.ebuild 1008
+MD5 e11933575b142a8990bda3881545b63e libpcre-4.5.ebuild 1106
+MD5 a588281f5693f0ab201655b0e19c75a7 libpcre-5.0.ebuild 1059
+MD5 c1e212329f9083e2405b16dd382d6632 metadata.xml 259
+MD5 e6a7a5e86e3dbcfed3918bf935a3ae9c libpcre-6.1.ebuild 1298
+MD5 ca9eff37cd4eea49c5d0d3c9e851b9cf libpcre-6.3.ebuild 1298
 MD5 9aa6aa1ebfe1906cfd3ce45e47a58873 files/digest-libpcre-4.2-r1 61
 MD5 e8b4b76c398da338c2c88e5321435d78 files/digest-libpcre-4.4 61
 MD5 4e0522aaf9e2d5a196830b897f2341d2 files/digest-libpcre-4.5 61
 MD5 6f60a57bf3e47726ed16127d65ae834c files/digest-libpcre-5.0 61
-MD5 0e8194a0bf3adfbe3e1c95ec64a1ebf1 files/digest-libpcre-6.1 61
 MD5 1af02e35bc7fb89c7884027ff3a2a555 files/pcre-4.2-link.patch 717
 MD5 0e2abdb46d4bf2a27fd55cf72358d465 files/pcre-4.2-macos.patch 1505
 MD5 42a3f4bf8ab591263bcc23343f99c035 files/pcre-4.4-uclibc-tuple.patch 1437
 MD5 bf62625896b04a15d6ca53e66f2c3e1e files/pcre-5.0-uclibc-tuple.patch 1624
+MD5 0e8194a0bf3adfbe3e1c95ec64a1ebf1 files/digest-libpcre-6.1 61
 MD5 7b7690bbbf7e1c6881aae2bc50f4d4e7 files/pcre-6.1-link.patch 832
-MD5 59046451dd9a28a2a59c373b6b7f12c3 libpcre-4.2-r1.ebuild 852
-MD5 47ad7fd446e1df9f7b55008a9aa8bbc1 libpcre-4.4.ebuild 1008
-MD5 e11933575b142a8990bda3881545b63e libpcre-4.5.ebuild 1106
-MD5 a588281f5693f0ab201655b0e19c75a7 libpcre-5.0.ebuild 1059
-MD5 e6a7a5e86e3dbcfed3918bf935a3ae9c libpcre-6.1.ebuild 1298
-MD5 c1e212329f9083e2405b16dd382d6632 metadata.xml 259
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCx04YI1lqEGTUzyQRAiFkAKDbxVwyIJubTCwy9cdQ51AvP4kBTgCgl3eD
-CmU48PLbrFLLvb5Y8n5C2k4=
-=8MA+
------END PGP SIGNATURE-----
+MD5 7aefa27b2326ddccbebd14a6c845b726 files/digest-libpcre-6.3 61
+MD5 17042ca451c3bcc9cefd3f3738b4c7f7 files/pcre-6.3-uclibc-tuple.patch 1606
+MD5 785165d99d81b52418a5dc2d7a2708fa files/pcre-6.3-link.patch 1047
diff --git a/dev-libs/libpcre/files/digest-libpcre-6.3 b/dev-libs/libpcre/files/digest-libpcre-6.3
new file mode 100644
index 000000000000..0a44697aa00b
--- /dev/null
+++ b/dev-libs/libpcre/files/digest-libpcre-6.3
@@ -0,0 +1 @@
+MD5 e6779ead12cd20fa055fb3a05b004f2c pcre-6.3.tar.bz2 565852
diff --git a/dev-libs/libpcre/files/pcre-6.3-link.patch b/dev-libs/libpcre/files/pcre-6.3-link.patch
new file mode 100644
index 000000000000..48af0ddb2847
--- /dev/null
+++ b/dev-libs/libpcre/files/pcre-6.3-link.patch
@@ -0,0 +1,11 @@
+--- pcre-6.3/Makefile.in.orig	2005-08-22 13:27:12.000000000 -0700
++++ pcre-6.3/Makefile.in	2005-08-22 13:27:51.000000000 -0700
+@@ -105,7 +105,7 @@ LTCOMPILE = $(LIBTOOL) --mode=compile $(
+ LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) -c $(CXXFLAGS) -I. -I$(top_srcdir) $(NEWLINE) $(LINK_SIZE) $(MATCH_LIMIT) $(NO_RECURSE) $(EBCDIC)
+ @ON_WINDOWS@LINK = $(CC) $(LDFLAGS) -I. -I$(top_srcdir) -L.libs
+ @NOT_ON_WINDOWS@LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -I. -I$(top_srcdir)
+-LINKLIB = $(LIBTOOL) --mode=link $(CC) -export-symbols-regex '^[^_]|__?pcre_.*utf8|__?pcre_printint' $(LDFLAGS) -I. -I$(top_srcdir)
++LINKLIB = $(LIBTOOL) --mode=link $(CC) -export-symbols-regex '^[^_]|__?pcre_.*utf8|__?pcre_printint' $(LDFLAGS) -I. -I$(top_srcdir) -L. -L.libs
+ LINK_FOR_BUILD = $(LIBTOOL) --mode=link $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -I. -I$(top_srcdir)
+ @ON_WINDOWS@CXXLINK = $(CXX) $(LDFLAGS) -I. -I$(top_srcdir) -L.libs
+ @NOT_ON_WINDOWS@CXXLINK = $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -I. -I$(top_srcdir)
diff --git a/dev-libs/libpcre/files/pcre-6.3-uclibc-tuple.patch b/dev-libs/libpcre/files/pcre-6.3-uclibc-tuple.patch
new file mode 100644
index 000000000000..127171d5d2e4
--- /dev/null
+++ b/dev-libs/libpcre/files/pcre-6.3-uclibc-tuple.patch
@@ -0,0 +1,53 @@
+diff -Naurp pcre-6.3.orig/configure pcre-6.3/configure
+--- pcre-6.3.orig/configure	2005-08-18 06:08:28.000000000 -0700
++++ pcre-6.3/configure	2005-08-22 13:25:36.000000000 -0700
+@@ -3410,10 +3410,15 @@ irix5* | irix6* | nonstopux*)
+   ;;
+ 
+ # This must be Linux ELF.
+-linux*)
++linux-gnu*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
++linux-uclibc*)
++  lt_cv_deplibs_check_method=pass_all
++  lt_cv_file_magic_test_file=`echo /lib/uClibc-*.so`
++  ;;
++
+ netbsd*)
+   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+@@ -7759,7 +7764,7 @@ linux*oldld* | linux*aout* | linux*coff*
+   ;;
+ 
+ # This must be Linux ELF.
+-linux*)
++linux-gnu*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -7819,6 +7824,23 @@ linux*)
+   sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+   ;;
+ 
++linux-uclibc*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}.so$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  # This implies no fast_install, which is unacceptable.
++  # Some rework will be needed to allow for fast_install
++  # before this can be enabled.
++  hardcode_into_libs=yes
++  # Assume using the uClibc dynamic linker is in use.
++  dynamic_linker='uClibc ld.so'
++  ;;
++
+ knetbsd*-gnu)
+   version_type=linux
+   need_lib_prefix=no
diff --git a/dev-libs/libpcre/libpcre-6.3.ebuild b/dev-libs/libpcre/libpcre-6.3.ebuild
new file mode 100644
index 000000000000..de47237b1c40
--- /dev/null
+++ b/dev-libs/libpcre/libpcre-6.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-6.3.ebuild,v 1.1 2005/08/22 20:37:24 eradicator Exp $
+
+inherit libtool flag-o-matic eutils
+
+DESCRIPTION="Perl-compatible regular expression library"
+HOMEPAGE="http://www.pcre.org/"
+SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${PV}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="3"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~ppc-macos ~s390 ~sh sparc x86"
+IUSE="doc"
+
+DEPEND="dev-util/pkgconfig"
+
+S="${WORKDIR}/pcre-${PV}"
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+	epatch "${FILESDIR}"/pcre-6.3-uclibc-tuple.patch
+	use ppc-macos || epatch "${FILESDIR}"/pcre-6.3-link.patch
+
+	# TODO: Fix this.  Use -fPIC just for the shared objects.
+	# position-independent code must used for all shared objects.
+	append-flags -fPIC
+	use ppc-macos || elibtoolize
+}
+
+src_compile() {
+	# How about the following flags?
+	# --enable-unicode-properties  enable Unicode properties support
+	# --disable-stack-for-recursion  disable use of stack recursion when matching
+	econf --enable-utf8 || die
+	emake all libpcrecpp.la || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+
+	dodoc AUTHORS INSTALL NON-UNIX-USE
+	dodoc doc/*.txt doc/Tech.Notes
+	use doc && dohtml doc/html/*
+}