Added in ncurses support, cleaned up ebuild a bit. Add in URL fopen security fix.

6 files changed, 67 insertions, 4 deletions

diff --git a/dev-php/php/ChangeLog b/dev-php/php/ChangeLog
index d1c3d54b4648..a748618c747c 100644
--- a/dev-php/php/ChangeLog
+++ b/dev-php/php/ChangeLog
@@ -1,12 +1,19 @@
 # ChangeLog for dev-php/php
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php/ChangeLog,v 1.52 2003/07/13 22:47:54 coredumb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/ChangeLog,v 1.53 2003/07/21 07:28:35 robbat2 Exp $
 
 *php-5.0_beta1 (14 Jul 2003)
 
   14 Jul 2003; Tal Peer <coredumb@gentoo.org> php-5.0_beta1.ebuild:
   Initial import
 
+*php-4.3.2-r2 (02 Jul 2003)
+
+  30 Jun 2003; Robin H. Johnson <robbat2@gentoo.org> php-4.3.2-r2.ebuild
+  files/digest-php-4.3.2-r2:
+  Added in ncurses support, cleaned up ebuild a bit. Add in URL fopen security
+  fix.
+
 *php-4.3.2-r1 (30 Jun 2003)
 
   30 Jun 2003; Robin H. Johnson <robbat2@gentoo.org> php-4.3.2-r1.ebuild
diff --git a/dev-php/php/Manifest b/dev-php/php/Manifest
index 437ad3369b1d..08e20a481099 100644
--- a/dev-php/php/Manifest
+++ b/dev-php/php/Manifest
@@ -1,7 +1,7 @@
 MD5 5541cf4177bfcf205012ed0da4cd38c0 php-4.3.2.ebuild 2423
-MD5 fae3978713db0a099893a4fd6855e71c php-4.3.2-r2.ebuild 1185
+MD5 8893110f384462d0082e4171222ad880 php-4.3.2-r2.ebuild 1185
 MD5 0ad96393a56530df42b3aca284635593 php-5.0_beta1.ebuild 1179
-MD5 cbd9c7a878c20d096c50d295da219745 ChangeLog 8262
+MD5 9bf044a23a650a784726eb9e54a3a185 ChangeLog 8261
 MD5 7588d047b95d706759df29bdafceb4cf php-4.3.2-r1.ebuild 992
 MD5 63f7765d77e10eeef4b306480cd5d200 files/digest-php-4.3.2-r1 137
 MD5 63f7765d77e10eeef4b306480cd5d200 files/digest-php-4.3.2-r2 137
diff --git a/dev-php/php/files/digest-php-4.3.2 b/dev-php/php/files/digest-php-4.3.2
index 7780d6111ce2..b16a849236e0 100644
--- a/dev-php/php/files/digest-php-4.3.2
+++ b/dev-php/php/files/digest-php-4.3.2
@@ -1,2 +1,2 @@
 MD5 8aec1bb2dbcca1c92835c71e2e30d9c5 php-4.3.2.tar.bz2 3697581
-MD5 be35e7f1f7d84343e94faa88f35a96c6 php-4.3.2-db4.diff.gz 606
+MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416
diff --git a/dev-php/php/files/digest-php-4.3.2-r1 b/dev-php/php/files/digest-php-4.3.2-r1
index 8271dab4f822..b16a849236e0 100644
--- a/dev-php/php/files/digest-php-4.3.2-r1
+++ b/dev-php/php/files/digest-php-4.3.2-r1
@@ -1 +1,2 @@
 MD5 8aec1bb2dbcca1c92835c71e2e30d9c5 php-4.3.2.tar.bz2 3697581
+MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416
diff --git a/dev-php/php/files/digest-php-4.3.2-r2 b/dev-php/php/files/digest-php-4.3.2-r2
new file mode 100644
index 000000000000..b16a849236e0
--- /dev/null
+++ b/dev-php/php/files/digest-php-4.3.2-r2
@@ -0,0 +1,2 @@
+MD5 8aec1bb2dbcca1c92835c71e2e30d9c5 php-4.3.2.tar.bz2 3697581
+MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416
diff --git a/dev-php/php/php-4.3.2-r2.ebuild b/dev-php/php/php-4.3.2-r2.ebuild
new file mode 100644
index 000000000000..d690e1ff1bcb
--- /dev/null
+++ b/dev-php/php/php-4.3.2-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-4.3.2-r2.ebuild,v 1.1 2003/07/21 07:28:35 robbat2 Exp $
+
+PHPSAPI="cli"
+inherit php eutils
+
+IUSE="${IUSE} readline"
+
+DESCRIPTION="PHP Shell Interpreter"
+SLOT="0"
+KEYWORDS="x86 ~ppc ~sparc ~alpha ~arm ~hppa ~mips"
+
+DEPEND="${DEPEND}
+	readline? ( >=sys-libs/ncurses-5.1 >=sys-libs/readline-4.1 ) 
+	ncurses? ( >=sys-libs/ncurses-5.1 )"
+
+RDEPEND="${RDEPEND}"
+
+src_compile() {
+	php_securityupgrade
+	
+	# Readline and Ncurses are CLI PHP only
+	use ncurses || use readline && use_ncurses="--with-" || use_ncurses="--without-"
+	myconf="${myconf} `use_with readline`"
+	myconf="${myconf} ${use_ncurses}-ncurses"
+
+	myconf="${myconf} \
+		--disable-cgi \
+		--enable-cli"
+	
+	php_src_compile
+}
+
+
+src_install() {
+	installtargets="${installtargets} install-cli"
+	php_src_install
+
+	# php executable is located in ./sapi/cli/
+	exeinto /usr/bin
+	doexe sapi/cli/php
+}
+
+pkg_postinst() {
+	php_pkg_postinst
+	php_securityupgrade
+	einfo "This is a CLI only build."
+	einfo "You can not use it on a webserver."
+}
+pkg_preinst() {
+	php_pkg_preinst
+}