From 2740f2774de99504c411caf8f658e9f44fed383c Mon Sep 17 00:00:00 2001 From: avsm Date: Mon, 22 Jul 2002 16:47:33 +0000 Subject: [PATCH] upgrade to php-4.2.2, from brad@ closes a security hole: http://www.php.net/release_4_2_2.php --- www/php4/Makefile.inc | 8 +++----- www/php4/core/distinfo | 6 +++--- www/php4/core/patches/patch-configure_in | 12 ++++++------ www/php4/extensions/distinfo | 6 +++--- www/php4/extensions/patches/patch-configure_in | 10 +++++----- .../extensions/patches/patch-main_php_config_h_in | 12 ------------ www/php4/pear/distinfo | 6 +++--- 7 files changed, 23 insertions(+), 37 deletions(-) delete mode 100644 www/php4/extensions/patches/patch-main_php_config_h_in diff --git a/www/php4/Makefile.inc b/www/php4/Makefile.inc index b4d6a34ae88..bf28c6ad7bc 100644 --- a/www/php4/Makefile.inc +++ b/www/php4/Makefile.inc @@ -1,14 +1,13 @@ -# $OpenBSD: Makefile.inc,v 1.3 2002/07/12 10:13:56 avsm Exp $ +# $OpenBSD: Makefile.inc,v 1.4 2002/07/22 16:47:33 avsm Exp $ # This port currently only works with archs supporting dynamic loading # and has Apache that supports DSO's. ONLY_FOR_ARCHS= alpha i386 m68k powerpc sparc sparc64 -V= 4.2.1 +V= 4.2.2 DISTNAME= php-${V} CATEGORIES= www lang -NEED_VERSION= 1.502 MAINTAINER= Anil Madhavapeddy @@ -42,8 +41,7 @@ CONFIGURE_ARGS+= --enable-shared \ --with-pic # default included extensions -CONFIGURE_ARGS+= \ - --with-openssl \ +CONFIGURE_ARGS+= --with-openssl \ --with-zlib USE_LIBTOOL= Yes diff --git a/www/php4/core/distinfo b/www/php4/core/distinfo index 587456f2ed0..eefd144c8b4 100644 --- a/www/php4/core/distinfo +++ b/www/php4/core/distinfo @@ -1,3 +1,3 @@ -MD5 (php-4.2.1.tar.gz) = 654983196a94ca91c272a00e877b2b40 -RMD160 (php-4.2.1.tar.gz) = d8b0bdd03173c3e62c6c2250cb4a111750459235 -SHA1 (php-4.2.1.tar.gz) = 90bb96676f88a1e6ef375add61c4974c12dfe2cf +MD5 (php-4.2.2.tar.gz) = 2c3c803152878c799cdf551d56bd142b +RMD160 (php-4.2.2.tar.gz) = 8266439f7ce6ca5f189b21ef33fdca0c3f9514cb +SHA1 (php-4.2.2.tar.gz) = fc90b8f82b30367600dfece2fdd1ee00d05b02b5 diff --git a/www/php4/core/patches/patch-configure_in b/www/php4/core/patches/patch-configure_in index a23338eff49..96874a7bf4f 100644 --- a/www/php4/core/patches/patch-configure_in +++ b/www/php4/core/patches/patch-configure_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure_in,v 1.2 2002/07/09 20:40:51 avsm Exp $ ---- configure.in.orig Sun May 12 22:23:57 2002 -+++ configure.in Tue Jul 9 21:12:31 2002 -@@ -792,7 +792,7 @@ unset with_pic +$OpenBSD: patch-configure_in,v 1.3 2002/07/22 16:47:33 avsm Exp $ +--- configure.in.orig Sun Jul 21 08:49:33 2002 ++++ configure.in Mon Jul 22 10:43:06 2002 +@@ -791,7 +791,7 @@ unset with_pic case $php_build_target in program|static) @@ -10,7 +10,7 @@ $OpenBSD: patch-configure_in,v 1.2 2002/07/09 20:40:51 avsm Exp $ if test "$lib_build_shared" != "yes"; then enable_shared=no fi -@@ -801,7 +801,7 @@ program|static) +@@ -800,7 +800,7 @@ program|static) ;; shared) enable_static=no @@ -19,7 +19,7 @@ $OpenBSD: patch-configure_in,v 1.2 2002/07/09 20:40:51 avsm Exp $ EXTRA_LDFLAGS="$EXTRA_LDFLAGS -avoid-version" ;; esac -@@ -921,7 +921,7 @@ EXPANDED_LIBDIR=$libdir +@@ -920,7 +920,7 @@ EXPANDED_LIBDIR=$libdir EXPANDED_SYSCONFDIR=`eval echo $sysconfdir` EXPANDED_DATADIR=$datadir EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"` diff --git a/www/php4/extensions/distinfo b/www/php4/extensions/distinfo index 587456f2ed0..eefd144c8b4 100644 --- a/www/php4/extensions/distinfo +++ b/www/php4/extensions/distinfo @@ -1,3 +1,3 @@ -MD5 (php-4.2.1.tar.gz) = 654983196a94ca91c272a00e877b2b40 -RMD160 (php-4.2.1.tar.gz) = d8b0bdd03173c3e62c6c2250cb4a111750459235 -SHA1 (php-4.2.1.tar.gz) = 90bb96676f88a1e6ef375add61c4974c12dfe2cf +MD5 (php-4.2.2.tar.gz) = 2c3c803152878c799cdf551d56bd142b +RMD160 (php-4.2.2.tar.gz) = 8266439f7ce6ca5f189b21ef33fdca0c3f9514cb +SHA1 (php-4.2.2.tar.gz) = fc90b8f82b30367600dfece2fdd1ee00d05b02b5 diff --git a/www/php4/extensions/patches/patch-configure_in b/www/php4/extensions/patches/patch-configure_in index c46154258fc..bc31c45a6be 100644 --- a/www/php4/extensions/patches/patch-configure_in +++ b/www/php4/extensions/patches/patch-configure_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure_in,v 1.1.1.1 2002/06/24 19:27:48 avsm Exp $ ---- configure.in.orig Sun May 12 22:23:57 2002 -+++ configure.in Wed Jun 19 22:18:14 2002 -@@ -792,7 +792,7 @@ unset with_pic +$OpenBSD: patch-configure_in,v 1.2 2002/07/22 16:47:33 avsm Exp $ +--- configure.in.orig Sun Jul 21 08:49:33 2002 ++++ configure.in Mon Jul 22 10:50:23 2002 +@@ -791,7 +791,7 @@ unset with_pic case $php_build_target in program|static) @@ -10,7 +10,7 @@ $OpenBSD: patch-configure_in,v 1.1.1.1 2002/06/24 19:27:48 avsm Exp $ if test "$lib_build_shared" != "yes"; then enable_shared=no fi -@@ -801,7 +801,7 @@ program|static) +@@ -800,7 +800,7 @@ program|static) ;; shared) enable_static=no diff --git a/www/php4/extensions/patches/patch-main_php_config_h_in b/www/php4/extensions/patches/patch-main_php_config_h_in deleted file mode 100644 index 1c15f65da9c..00000000000 --- a/www/php4/extensions/patches/patch-main_php_config_h_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-main_php_config_h_in,v 1.1 2002/07/09 15:06:30 wilfried Exp $ ---- main/php_config.h.in.orig Sun May 12 23:44:27 2002 -+++ main/php_config.h.in Tue Jul 9 16:30:57 2002 -@@ -996,7 +996,7 @@ - #undef HAVE_BZ2 - - /* Whether to build bz2 as dynamic module */ --#undef COMPILE_DL_BZ -+#undef COMPILE_DL_BZ2 - - /* */ - #undef HAVE_CALENDAR diff --git a/www/php4/pear/distinfo b/www/php4/pear/distinfo index 587456f2ed0..eefd144c8b4 100644 --- a/www/php4/pear/distinfo +++ b/www/php4/pear/distinfo @@ -1,3 +1,3 @@ -MD5 (php-4.2.1.tar.gz) = 654983196a94ca91c272a00e877b2b40 -RMD160 (php-4.2.1.tar.gz) = d8b0bdd03173c3e62c6c2250cb4a111750459235 -SHA1 (php-4.2.1.tar.gz) = 90bb96676f88a1e6ef375add61c4974c12dfe2cf +MD5 (php-4.2.2.tar.gz) = 2c3c803152878c799cdf551d56bd142b +RMD160 (php-4.2.2.tar.gz) = 8266439f7ce6ca5f189b21ef33fdca0c3f9514cb +SHA1 (php-4.2.2.tar.gz) = fc90b8f82b30367600dfece2fdd1ee00d05b02b5