[Midnightbsd-cvs] mports: lang/php5: Update to 5.26.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Wed May 21 01:37:20 EDT 2008
Log Message:
-----------
Update to 5.26. The extensions need to be updated yet.
Modified Files:
--------------
mports/lang/php5:
Makefile (r1.14 -> r1.15)
Makefile.ext (r1.9 -> r1.10)
distinfo (r1.7 -> r1.8)
mports/lang/php5/files:
patch-ext_standard_basic_functions.c (r1.1 -> r1.2)
patch-main_SAPI.c (r1.1 -> r1.2)
patch-scripts::phpize.in (r1.6 -> r1.7)
-------------- next part --------------
Index: Makefile.ext
===================================================================
RCS file: /home/cvs/mports/lang/php5/Makefile.ext,v
retrieving revision 1.9
retrieving revision 1.10
diff -L lang/php5/Makefile.ext -L lang/php5/Makefile.ext -u -r1.9 -r1.10
--- lang/php5/Makefile.ext
+++ lang/php5/Makefile.ext
@@ -96,7 +96,7 @@
--with-png-dir=${LOCALBASE} \
--with-zlib-dir=/usr
. if !defined(WITHOUT_X11)
-CONFIGURE_ARGS+=--with-xpm-dir=${X11BASE}
+CONFIGURE_ARGS+=--with-xpm-dir=${LOCALBASE}
. endif
OPTIONS= T1LIB "Include T1lib support" on \
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/lang/php5/Makefile,v
retrieving revision 1.14
retrieving revision 1.15
diff -L lang/php5/Makefile -L lang/php5/Makefile -u -r1.14 -r1.15
--- lang/php5/Makefile
+++ lang/php5/Makefile
@@ -7,8 +7,8 @@
#
PORTNAME= php5
-PORTVERSION= 5.2.5
-PORTREVISION?= 1
+PORTVERSION= 5.2.6
+PORTREVISION?= 0
CATEGORIES?= lang devel www
MASTER_SITES= ${MASTER_SITE_PHP:S,$,:release,} \
http://downloads.php.net/ilia/:rc \
@@ -45,7 +45,7 @@
CGI "Build CGI version" on \
APACHE "Build Apache module" off \
DEBUG "Enable debug" off \
- SUHOSIN "Enable Suhosin protection system" on \
+ SUHOSIN "Enable Suhosin protection system (not for jails)" on \
MULTIBYTE "Enable zend multibyte support" off \
IPV6 "Enable ipv6 support" on \
REDIRECT "Enable force-cgi-redirect support (CGI only)" off \
@@ -58,8 +58,8 @@
.include <bsd.port.pre.mk>
.if !defined(WITHOUT_SUHOSIN)
-PATCHFILES= suhosin-patch-${PORTVERSION}-0.9.6.2.patch.gz
-PATCH_SITES= http://www.hardened-php.net/suhosin/_media/
+PATCHFILES+= suhosin-patch-${PORTVERSION}-0.9.6.2.patch.gz:suhosin
+PATCH_SITES+= http://download.suhosin.org/:suhosin
PATCH_DIST_STRIP= -p1
PLIST_SUB+= SUHOSIN=""
.else
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/lang/php5/distinfo,v
retrieving revision 1.7
retrieving revision 1.8
diff -L lang/php5/distinfo -L lang/php5/distinfo -u -r1.7 -r1.8
--- lang/php5/distinfo
+++ lang/php5/distinfo
@@ -1,6 +1,6 @@
-MD5 (php-5.2.5.tar.bz2) = 1fe14ca892460b09f06729941a1bb605
-SHA256 (php-5.2.5.tar.bz2) = 5cac1e70df5019ebdfdab2e0b8b216f7fdf56b9895c9f68c993313918249bba3
-SIZE (php-5.2.5.tar.bz2) = 7773024
-MD5 (suhosin-patch-5.2.5-0.9.6.2.patch.gz) = a43f1a0ee9e7c41c4cb6890174f1f9d8
-SHA256 (suhosin-patch-5.2.5-0.9.6.2.patch.gz) = fd77ccdeb90c83af7492876dda17518de95dd74a5b6feecc5a1bd2c8e322ab53
-SIZE (suhosin-patch-5.2.5-0.9.6.2.patch.gz) = 23157
+MD5 (php-5.2.6.tar.bz2) = 7380ffecebd95c6edb317ef861229ebd
+SHA256 (php-5.2.6.tar.bz2) = 1892b2dd50b56ae2c9aec027fcd9035b76673f113555bc2bc1007bab8ae4db81
+SIZE (php-5.2.6.tar.bz2) = 9571312
+MD5 (suhosin-patch-5.2.6-0.9.6.2.patch.gz) = f2ec986341a314c271259dbe4d940858
+SHA256 (suhosin-patch-5.2.6-0.9.6.2.patch.gz) = dfdae803778e6ed6854ea3ad2948bbfedbfffc5a32dbc75a657b99092a9cc5e4
+SIZE (suhosin-patch-5.2.6-0.9.6.2.patch.gz) = 22986
Index: patch-main_SAPI.c
===================================================================
RCS file: /home/cvs/mports/lang/php5/files/patch-main_SAPI.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -L lang/php5/files/patch-main_SAPI.c -L lang/php5/files/patch-main_SAPI.c -u -r1.1 -r1.2
--- lang/php5/files/patch-main_SAPI.c
+++ lang/php5/files/patch-main_SAPI.c
@@ -1,6 +1,6 @@
---- main/SAPI.c.orig Sun Jan 1 13:50:17 2006
-+++ main/SAPI.c Wed May 3 09:38:09 2006
-@@ -602,7 +602,7 @@
+--- main/SAPI.c.orig 2007-05-25 11:20:01.000000000 +0200
++++ main/SAPI.c 2008-02-01 23:48:51.000000000 +0100
+@@ -604,7 +606,7 @@
ptr++;
len--;
}
@@ -9,7 +9,7 @@
if(!strncmp(ptr, "image/", sizeof("image/")-1)) {
zend_alter_ini_entry("zlib.output_compression", sizeof("zlib.output_compression"), "0", sizeof("0") - 1, PHP_INI_USER, PHP_INI_STAGE_RUNTIME);
}
-@@ -756,7 +756,7 @@
+@@ -758,7 +760,7 @@
return SUCCESS;
}
Index: patch-scripts::phpize.in
===================================================================
RCS file: /home/cvs/mports/lang/php5/files/patch-scripts::phpize.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -L lang/php5/files/patch-scripts::phpize.in -L lang/php5/files/patch-scripts::phpize.in -u -r1.6 -r1.7
--- lang/php5/files/patch-scripts::phpize.in
+++ lang/php5/files/patch-scripts::phpize.in
@@ -6,8 +6,8 @@
{
- test -z "$PHP_AUTOCONF" && PHP_AUTOCONF=autoconf
- test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=autoheader
-+ test -z "$PHP_AUTOCONF" && PHP_AUTOCONF=autoconf-2.61
-+ test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=autoheader-2.61
++ test -z "$PHP_AUTOCONF" && PHP_AUTOCONF=autoconf261
++ test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=autoheader261
if test ! -x "`$php_shtool path $PHP_AUTOCONF`"; then
cat <<EOF
Index: patch-ext_standard_basic_functions.c
===================================================================
RCS file: /home/cvs/mports/lang/php5/files/patch-ext_standard_basic_functions.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -L lang/php5/files/patch-ext_standard_basic_functions.c -L lang/php5/files/patch-ext_standard_basic_functions.c -u -r1.1 -r1.2
--- lang/php5/files/patch-ext_standard_basic_functions.c
+++ lang/php5/files/patch-ext_standard_basic_functions.c
@@ -1,10 +1,33 @@
---- ext/standard/basic_functions.c.orig Mon Jan 30 16:58:56 2006
-+++ ext/standard/basic_functions.c Mon Jan 30 16:59:13 2006
-@@ -78,6 +78,7 @@
- # include <sys/mman.h>
+--- ext/standard/basic_functions.c.orig 2008-05-02 08:44:06.000000000 +0200
++++ ext/standard/basic_functions.c 2008-05-02 08:54:00.000000000 +0200
+@@ -87,6 +87,7 @@
+ # include <sys/loadavg.h>
#endif
+#define HARTMUT_0
#ifdef HARTMUT_0
#include <getopt.h>
#endif
+@@ -3861,9 +3862,7 @@
+ SetEnvironmentVariable(pe->key, "bugbug");
+ #endif
+ putenv(pe->previous_value);
+-# if defined(PHP_WIN32)
+ efree(pe->previous_value);
+-# endif
+ } else {
+ # if HAVE_UNSETENV
+ unsetenv(pe->key);
+@@ -4463,12 +4462,8 @@
+ pe.previous_value = NULL;
+ for (env = environ; env != NULL && *env != NULL; env++) {
+ if (!strncmp(*env, pe.key, pe.key_len) && (*env)[pe.key_len] == '=') { /* found it */
+-#if defined(PHP_WIN32)
+ /* must copy previous value because MSVCRT's putenv can free the string without notice */
+ pe.previous_value = estrdup(*env);
+-#else
+- pe.previous_value = *env;
+-#endif
+ break;
+ }
+ }
More information about the Midnightbsd-cvs
mailing list