pcre fix bug #47498

8 files changed, 51 insertions, 3 deletions

diff --git a/dev-php/php-cgi/ChangeLog b/dev-php/php-cgi/ChangeLog
index fb843b235a77..95c6314102e7 100644
--- a/dev-php/php-cgi/ChangeLog
+++ b/dev-php/php-cgi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-php/php-cgi
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/ChangeLog,v 1.8 2004/04/14 18:39:10 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/ChangeLog,v 1.9 2004/04/21 00:34:24 robbat2 Exp $
+
+*php-cgi-4.3.6 (20 Apr 2004)
+
+  20 Apr 2004; Robin H. Johnson <robbat2@gentoo.org> php-cgi-4.3.6.ebuild:
+  pcre fix bug #47498
 
   14 Apr 2004; Guy Martin <gmsoft@gentoo.org> php-cgi-4.3.6_rc2.ebuild:
   Marked stable on hppa.
diff --git a/dev-php/php-cgi/files/digest-php-cgi-4.3.6 b/dev-php/php-cgi/files/digest-php-cgi-4.3.6
new file mode 100644
index 000000000000..7a5e03fd37db
--- /dev/null
+++ b/dev-php/php-cgi/files/digest-php-cgi-4.3.6
@@ -0,0 +1,3 @@
+MD5 79cde484e31871176137eb78014657fa php-4.3.6.tar.bz2 3957796
+MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416
+MD5 0ed6c4e7dbba264521ab54d49f02912d php-4.3.6-pcrealloc.patch 1004
diff --git a/dev-php/php-cgi/files/digest-php-cgi-4.3.6_rc2 b/dev-php/php-cgi/files/digest-php-cgi-4.3.6_rc2
index 7ff2d034c70b..095a6f8a4583 100644
--- a/dev-php/php-cgi/files/digest-php-cgi-4.3.6_rc2
+++ b/dev-php/php-cgi/files/digest-php-cgi-4.3.6_rc2
@@ -1,2 +1,3 @@
 MD5 0bf89373a60f65cd37c1e3e652e278f5 php-4.3.6RC2.tar.bz2 3958337
 MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416
+MD5 0ed6c4e7dbba264521ab54d49f02912d php-4.3.6-pcrealloc.patch 1004
diff --git a/dev-php/php-cgi/php-cgi-4.3.6.ebuild b/dev-php/php-cgi/php-cgi-4.3.6.ebuild
new file mode 100644
index 000000000000..9c472598550a
--- /dev/null
+++ b/dev-php/php-cgi/php-cgi-4.3.6.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/php-cgi-4.3.6.ebuild,v 1.1 2004/04/21 00:34:24 robbat2 Exp $
+
+PHPSAPI="cgi"
+SRC_URI_BASE="http://downloads.php.net/ilia/"
+inherit php-sapi eutils
+
+DESCRIPTION="PHP CGI"
+SLOT="0"
+KEYWORDS="x86 ~ppc ~sparc ~alpha hppa"
+
+src_compile() {
+	# CLI needed to build stuff
+	myconf="${myconf} \
+		--enable-cgi \
+		--enable-cli \
+		--enable-fastcgi"
+
+	php-sapi_src_compile
+}
+
+
+src_install() {
+	PHP_INSTALLTARGETS="install"
+	php-sapi_src_install
+
+	# rename binary
+	mv ${D}/usr/bin/php ${D}/usr/bin/php-cgi
+}
+
+pkg_postinst() {
+	php-sapi_pkg_postinst
+	einfo "This is a CGI only build."
+}
diff --git a/dev-php/php/ChangeLog b/dev-php/php/ChangeLog
index 0b50eba6e41c..49d8a1cc1954 100644
--- a/dev-php/php/ChangeLog
+++ b/dev-php/php/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-php/php
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php/ChangeLog,v 1.83 2004/04/17 01:42:21 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/ChangeLog,v 1.84 2004/04/21 00:36:05 robbat2 Exp $
+
+  20 Apr 2004; Robin H. Johnson <robbat2@gentoo.org> :
+  pcre fix bug #47498
 
 *php-4.3.6 (16 Apr 2004)
 
diff --git a/dev-php/php/files/digest-php-4.3.4-r4 b/dev-php/php/files/digest-php-4.3.4-r4
index d65ce9576341..b64954307a20 100644
--- a/dev-php/php/files/digest-php-4.3.4-r4
+++ b/dev-php/php/files/digest-php-4.3.4-r4
@@ -1,2 +1 @@
 MD5 b9dd601863e08e52e3c4d5e02c2627cf php-4.3.4.tar.bz2 3774324
-MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416
diff --git a/dev-php/php/files/digest-php-4.3.6 b/dev-php/php/files/digest-php-4.3.6
index 8a4e623734fc..518886e220e0 100644
--- a/dev-php/php/files/digest-php-4.3.6
+++ b/dev-php/php/files/digest-php-4.3.6
@@ -1 +1,2 @@
 MD5 79cde484e31871176137eb78014657fa php-4.3.6.tar.bz2 3957796
+MD5 0ed6c4e7dbba264521ab54d49f02912d php-4.3.6-pcrealloc.patch 1004
diff --git a/dev-php/php/files/digest-php-4.3.6_rc2 b/dev-php/php/files/digest-php-4.3.6_rc2
index c0e0c3dc9b4f..b3e302df6046 100644
--- a/dev-php/php/files/digest-php-4.3.6_rc2
+++ b/dev-php/php/files/digest-php-4.3.6_rc2
@@ -1 +1,2 @@
 MD5 0bf89373a60f65cd37c1e3e652e278f5 php-4.3.6RC2.tar.bz2 3958337
+MD5 0ed6c4e7dbba264521ab54d49f02912d php-4.3.6-pcrealloc.patch 1004