[Midnightbsd-cvs] mports: lang/php5:
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Thu Mar 12 20:59:30 EDT 2009
Log Message:
-----------
Modified Files:
--------------
mports/lang/php5:
Makefile (r1.24 -> r1.25)
distinfo (r1.10 -> r1.11)
pkg-plist (r1.4 -> r1.5)
mports/lang/php5/files:
patch-ext_standard_basic_functions.c (r1.2 -> r1.3)
Removed Files:
-------------
mports/lang/php5/files:
patch-ext_date_lib_timelib_structs.h
patch-main_SAPI.c
-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/lang/php5/pkg-plist,v
retrieving revision 1.4
retrieving revision 1.5
diff -L lang/php5/pkg-plist -L lang/php5/pkg-plist -u -r1.4 -r1.5
--- lang/php5/pkg-plist
+++ lang/php5/pkg-plist
@@ -77,7 +77,6 @@
include/php/ext/pcre/pcrelib/pcre_internal.h
include/php/ext/pcre/pcrelib/pcreposix.h
include/php/ext/pcre/pcrelib/ucp.h
-include/php/ext/pcre/pcrelib/ucptable.h
include/php/ext/pcre/php_pcre.h
include/php/ext/standard/base64.h
include/php/ext/standard/basic_functions.h
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/lang/php5/Makefile,v
retrieving revision 1.24
retrieving revision 1.25
diff -L lang/php5/Makefile -L lang/php5/Makefile -u -r1.24 -r1.25
--- lang/php5/Makefile
+++ lang/php5/Makefile
@@ -7,7 +7,7 @@
#
PORTNAME= php5
-PORTVERSION= 5.2.8
+PORTVERSION= 5.2.9
PORTREVISION?= 1
CATEGORIES?= lang devel www
MASTER_SITES= ${MASTER_SITE_PHP:S/$/:release/}
@@ -58,7 +58,7 @@
.include <bsd.mport.options.mk>
.if !defined(WITHOUT_SUHOSIN)
-PATCHFILES+= suhosin-patch-5.2.7-0.9.6.3.patch.gz:suhosin
+PATCHFILES+= suhosin-patch-${PORTVERSION}-0.9.7.patch.gz:suhosin
PATCH_SITES+= http://download.suhosin.org/:suhosin
PATCH_DIST_STRIP= -p1
PLIST_SUB+= SUHOSIN=""
@@ -67,7 +67,7 @@
.endif
.if defined(WITH_MAILHEAD)
-PATCHFILES+= php-${PORTVERSION}-mail-header.patch:mail
+PATCHFILES+= php-5.2.8-mail-header.patch:mail
PATCH_SITES+= http://choon.net/opensource/php/:mail
.endif
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/lang/php5/distinfo,v
retrieving revision 1.10
retrieving revision 1.11
diff -L lang/php5/distinfo -L lang/php5/distinfo -u -r1.10 -r1.11
--- lang/php5/distinfo
+++ lang/php5/distinfo
@@ -1,9 +1,9 @@
-MD5 (php-5.2.8.tar.bz2) = 8760a833cf10433d3e72271ab0d0eccf
-SHA256 (php-5.2.8.tar.bz2) = a70600e13410213a637f1c9825e9c0d45c64de8cefb1929f8f5aa761b20b2b67
-SIZE (php-5.2.8.tar.bz2) = 9827180
-MD5 (suhosin-patch-5.2.7-0.9.6.3.patch.gz) = d455c3dd5b652046dbac2951a58f64fa
-SHA256 (suhosin-patch-5.2.7-0.9.6.3.patch.gz) = 85e6262f53014e393977d1efed2d3a7e686767a07f96b14b2c3f126f694aee46
-SIZE (suhosin-patch-5.2.7-0.9.6.3.patch.gz) = 23125
+MD5 (php-5.2.9.tar.bz2) = 280d6cda7f72a4fc6de42fda21ac2db7
+SHA256 (php-5.2.9.tar.bz2) = 30166dda7c3d8bdcb2753ab79260be25454cdf3673d681b7651f8d32006ee2a6
+SIZE (php-5.2.9.tar.bz2) = 10203122
+MD5 (suhosin-patch-5.2.9-0.9.7.patch.gz) = f80dbcd2773a98da1dab0c73c3654895
+SHA256 (suhosin-patch-5.2.9-0.9.7.patch.gz) = 6f7a86cff1cdd1007ba248292f6adfe3b7c01adfed56c2e937c87c60210bbc38
+SIZE (suhosin-patch-5.2.9-0.9.7.patch.gz) = 23026
MD5 (php-5.2.8-mail-header.patch) = 74bf3a2a123c284f908c4f5483ebe886
SHA256 (php-5.2.8-mail-header.patch) = 9bd306145153a371f619d89996cb329bdc36791b22a50daf4afe7cc69c46dccb
SIZE (php-5.2.8-mail-header.patch) = 3381
--- lang/php5/files/patch-main_SAPI.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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--;
- }
--#if HAVE_ZLIB
-+#if 1
- 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);
- }
-@@ -758,7 +760,7 @@
- return SUCCESS;
- }
-
--#if HAVE_ZLIB
-+#if 1
- /* Add output compression headers at this late stage in order to make
- it possible to switch it off inside the script. */
-
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.2
retrieving revision 1.3
diff -L lang/php5/files/patch-ext_standard_basic_functions.c -L lang/php5/files/patch-ext_standard_basic_functions.c -u -r1.2 -r1.3
--- lang/php5/files/patch-ext_standard_basic_functions.c
+++ lang/php5/files/patch-ext_standard_basic_functions.c
@@ -1,5 +1,5 @@
---- 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
+--- ext/standard/basic_functions.c.orig 2008-06-09 14:06:40.000000000 +0200
++++ ext/standard/basic_functions.c 2008-06-09 14:08:28.000000000 +0200
@@ -87,6 +87,7 @@
# include <sys/loadavg.h>
#endif
@@ -8,26 +8,21 @@
#ifdef HARTMUT_0
#include <getopt.h>
#endif
-@@ -3861,9 +3862,7 @@
+@@ -3859,7 +3860,7 @@
SetEnvironmentVariable(pe->key, "bugbug");
#endif
putenv(pe->previous_value);
-# if defined(PHP_WIN32)
++# if defined(PHP_WIN32) || __FreeBSD_version < 700050
efree(pe->previous_value);
--# endif
+ # endif
} else {
- # if HAVE_UNSETENV
- unsetenv(pe->key);
-@@ -4463,12 +4462,8 @@
+@@ -4461,7 +4462,7 @@
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)
++#if defined(PHP_WIN32) || __FreeBSD_version < 700050
/* 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;
- }
- }
+ #else
--- lang/php5/files/patch-ext_date_lib_timelib_structs.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- ext/date/lib/timelib_structs.h.orig Wed Dec 7 11:11:39 2005
-+++ ext/date/lib/timelib_structs.h Wed Dec 7 11:11:53 2005
-@@ -21,7 +21,7 @@
- #ifndef __TIMELIB_STRUCTS_H__
- #define __TIMELIB_STRUCTS_H__
-
--#include <timelib_config.h>
-+#include "timelib_config.h"
-
- #ifdef HAVE_SYS_TYPES_H
- #include <sys/types.h>
More information about the Midnightbsd-cvs
mailing list