diff options
author | taca <taca> | 2013-08-17 13:15:21 +0000 |
---|---|---|
committer | taca <taca> | 2013-08-17 13:15:21 +0000 |
commit | b5f1ee1468bd7d3da53579da5bac4c6ca34c1506 (patch) | |
tree | 689419dbb2ff3d35958d5f8ba45a913f17e3e136 | |
parent | 2715a2f8b7ec36953f452959905069f01372ba99 (diff) | |
download | pkgsrc-b5f1ee1468bd7d3da53579da5bac4c6ca34c1506.tar.gz |
Update php55 to 5.5.2.
15 Aug 2013, PHP 5.5.2
- Core:
. Fixed bug #62691 (solaris sed has no -i switch). (Chris Jones)
. Fixed bug #61345 (CGI mode - make install don't work). (Michael Heimpold)
. Fixed bug #61268 (--enable-dtrace leads make to clobber
Zend/zend_dtrace.d) (Chris Jones)
- DOM:
. Added flags option to DOMDocument::schemaValidate() and
DOMDocument::schemaValidateSource(). Added LIBXML_SCHEMA_CREATE flag.
(Chris Wright)
- Sessions:
. Implemented strict sessions RFC (https://wiki.php.net/rfc/strict_sessions)
which protects against session fixation attacks and session collisions.
(Yasuo Ohgaki)
. Fixed possible buffer overflow under Windows. Note: Not a security fix.
(Yasuo)
. Changed session.auto_start to PHP_INI_PERDIR. (Yasuo)
- Pgsql:
. Fixed bug #62978 (Disallow possible SQL injections with pg_select()
/pg_update()/pg_delete()/pg_insert()). (Yasuo)
?? ??? 2013, PHP 5.5.2
- Core:
. Fixed bug #65372 (Segfault in gc_zval_possible_root when return reference
fails). (Laruence)
. Fixed value of FILTER_SANITIZE_FULL_SPECIAL_CHARS constant (previously was
erroneously set to FILTER_SANITIZE_SPECIAL_CHARS value). (Andrey
avp200681 gmail com).
. Fixed bug #65304 (Use of max int in array_sum). (Laruence)
. Fixed bug #65291 (get_defined_constants() causes PHP to crash in a very
limited case). (Arpad)
- OPcache:
. Added opcache.restrict_api configuration directive that may limit
usage of OPcahce API functions only to patricular script(s). (Dmitry)
. Added support for glob symbols in blacklist entries (?, *, **).
(Terry Elison, Dmitry)
. Fixed bug #65338 (Enabling both php_opcache and php_wincache AVs on
shutdown). (Dmitry)
- Openssl:
. Fixed handling null bytes in subjectAltName (CVE-2013-4073).
(Christian Heimes)
- PDO_mysql:
. Fixed bug #65299 (pdo mysql parsing errors). (Johannes)
- Phar:
. Fixed bug #65028 (Phar::buildFromDirectory creates corrupt archives for
some specific contents). (Stas)
- SOAP:
. Fixed bug #65018 (SoapHeader problems with SoapServer). (Dmitry)
- SPL:
. Fixed bug #65328 (Segfault when getting SplStack object Value). (Laruence)
. Added RecursiveTreeIterator setPostfix and getPostifx methods. (Joshua
Thijssen)
. Fixed bug #61697 (spl_autoload_functions returns lambda functions
incorrectly). (Laruence)
- Streams:
. Fixed bug #65268 (select() implementation uses outdated tick API). (Anatol)
- Pgsql:
. Fixed bug #65336 (pg_escape_literal/identifier() scilently returns false).
(Yasuo)
-rw-r--r-- | lang/php55/Makefile | 3 | ||||
-rw-r--r-- | lang/php55/distinfo | 26 | ||||
-rw-r--r-- | lang/php55/patches/patch-acinclude.m4 | 6 | ||||
-rw-r--r-- | lang/php55/patches/patch-configure | 23 | ||||
-rw-r--r-- | lang/php55/patches/patch-ext_gd_config.m4 | 10 | ||||
-rw-r--r-- | lang/php55/patches/patch-ext_mssql_php__mssql.c | 8 | ||||
-rw-r--r-- | lang/php55/patches/patch-ext_openssl_openssl.c | 114 | ||||
-rw-r--r-- | lang/php55/patches/patch-ext_standard_basic__functions.c | 6 | ||||
-rw-r--r-- | lang/php55/patches/patch-main_streams_cast.c | 15 | ||||
-rw-r--r-- | lang/php55/patches/patch-php.ini-development | 6 | ||||
-rw-r--r-- | lang/php55/patches/patch-php.ini-production | 6 | ||||
-rw-r--r-- | lang/php55/patches/patch-sapi_cgi_Makefile.frag | 11 |
12 files changed, 47 insertions, 187 deletions
diff --git a/lang/php55/Makefile b/lang/php55/Makefile index eee26ae246d..add5aac9a99 100644 --- a/lang/php55/Makefile +++ b/lang/php55/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.4 2013/08/14 15:43:40 taca Exp $ +# $NetBSD: Makefile,v 1.5 2013/08/17 13:15:21 taca Exp $ # # We can't omit PKGNAME here to handle PKG_OPTIONS. # PKGNAME= php-${PHP_BASE_VERS} -PKGREVISION= 1 CATEGORIES= lang HOMEPAGE= http://www.php.net/ diff --git a/lang/php55/distinfo b/lang/php55/distinfo index c1ebdf083c1..2fb08d7e5ac 100644 --- a/lang/php55/distinfo +++ b/lang/php55/distinfo @@ -1,23 +1,21 @@ -$NetBSD: distinfo,v 1.3 2013/08/16 00:38:34 taca Exp $ +$NetBSD: distinfo,v 1.4 2013/08/17 13:15:21 taca Exp $ -SHA1 (php-5.5.1.tar.bz2) = b31b6922cb2796a52be9dc6696f31fcbb20ac916 -RMD160 (php-5.5.1.tar.bz2) = fe1e20e59ac366f4c105c1cda22fbfeb98dbebd2 -Size (php-5.5.1.tar.bz2) = 12004597 bytes -SHA1 (patch-acinclude.m4) = afead7122844e8290d9ef4fdb8deec3c40cf0746 -SHA1 (patch-configure) = ee537d9b0c5e13bddfbb04e944e81671ccb2ff22 -SHA1 (patch-ext_gd_config.m4) = 2353efe6f25e1081b41d61033c3185cc643c7891 +SHA1 (php-5.5.2.tar.bz2) = 94f42a7807ae21b3a547bf69310dc454f613fe1f +RMD160 (php-5.5.2.tar.bz2) = b968829512ad4dbe67fff1d6f37efb2a015bb53e +Size (php-5.5.2.tar.bz2) = 12292281 bytes +SHA1 (patch-acinclude.m4) = 9e9c433e4cb96e469f7cf14b2064a0f41fc4568a +SHA1 (patch-configure) = 9ac8c43978df580c592631c923283e61e15e90af +SHA1 (patch-ext_gd_config.m4) = 91c9798333d4776856a0a9e20196986856b758b2 SHA1 (patch-ext_imap_config.m4) = 01681e8b54ee586ec4db72a5da2d0aec3fa89fcc -SHA1 (patch-ext_mssql_php__mssql.c) = 732e48b05086180585a3087c2e9737db557dbc3b -SHA1 (patch-ext_openssl_openssl.c) = 5413f54cb3ba40b61ba74c4350446120020334a6 +SHA1 (patch-ext_mssql_php__mssql.c) = 4ef1837850443e9db2e71620a3ddaed5ab5c435b SHA1 (patch-ext_pdo__mysql_config.m4) = 3526e737da25129710218e7141d5a05ae0a51390 SHA1 (patch-ext_pdo_config.m4) = 26a4ad02e5c6b7a54c3c54a6d026a3ccfed62c59 SHA1 (patch-ext_phar_Makefile.frag) = 1af23d9135557bc7ba2f3627b317d4cbef37aaba SHA1 (patch-ext_phar_phar_phar.php) = 011f2d68048dbc63f5efcab4e23062daa9e8e08c -SHA1 (patch-ext_standard_basic__functions.c) = 563fe67eb78b786cd46195026381ef22128e0841 -SHA1 (patch-main_streams_cast.c) = 955aee9efb4868e00fbfc443bb7d92c71844a853 +SHA1 (patch-ext_standard_basic__functions.c) = f2a44998145306c2cb2d2f3822c0e7cc70c778b4 SHA1 (patch-makedist) = a2a77c3d15a28fee08fdd88f0c9fee6cbec107d8 -SHA1 (patch-php.ini-development) = 79512bd276adaed6bcf5f7f28e965f8a6b589add -SHA1 (patch-php.ini-production) = f5d275abe7668a139999b3607e99f271450f56ae +SHA1 (patch-php.ini-development) = b4690be8f589933ee5654bdd7bc80712481711a5 +SHA1 (patch-php.ini-production) = 535ee9bff509ee8cab31cc73ec49b25b3ffdbff5 SHA1 (patch-run-tests.php) = ff80b8ad52d7c0a43fa318ed9bffca9d7b3e688d -SHA1 (patch-sapi_cgi_Makefile.frag) = 16fc782c309c462d92e72b61d258b9701159748a +SHA1 (patch-sapi_cgi_Makefile.frag) = 3784758c085066d1088ae1420b0f9bcf98f74de9 SHA1 (patch-sapi_fpm_php-fpm.conf.in) = 2369bb6a426a7fb47dc73c88f0daa0f6fa67b593 diff --git a/lang/php55/patches/patch-acinclude.m4 b/lang/php55/patches/patch-acinclude.m4 index 9cbb562d1cf..21a00786913 100644 --- a/lang/php55/patches/patch-acinclude.m4 +++ b/lang/php55/patches/patch-acinclude.m4 @@ -1,8 +1,8 @@ -$NetBSD: patch-acinclude.m4,v 1.1 2013/07/29 16:41:02 taca Exp $ +$NetBSD: patch-acinclude.m4,v 1.2 2013/08/17 13:15:21 taca Exp $ ---- acinclude.m4.orig 2012-05-03 17:10:43.000000000 +0000 +--- acinclude.m4.orig 2013-08-15 20:42:04.000000000 +0000 +++ acinclude.m4 -@@ -2352,7 +2352,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[ +@@ -2354,7 +2354,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[ if test "$found_openssl" = "no"; then if test "$PHP_OPENSSL_DIR" = "yes"; then diff --git a/lang/php55/patches/patch-configure b/lang/php55/patches/patch-configure index 8531de149e1..dfaa3d8e1ad 100644 --- a/lang/php55/patches/patch-configure +++ b/lang/php55/patches/patch-configure @@ -1,17 +1,8 @@ -$NetBSD: patch-configure,v 1.1 2013/07/29 16:41:02 taca Exp $ +$NetBSD: patch-configure,v 1.2 2013/08/17 13:15:21 taca Exp $ ---- configure.orig 2013-07-18 14:42:04.000000000 +0000 +--- configure.orig 2013-08-15 20:48:19.000000000 +0000 +++ configure -@@ -20784,7 +20784,7 @@ _ACEOF - cat>>Makefile.objects<<EOF - - $ac_bdir$ac_hdrobj: $abs_srcdir/$ac_provsrc -- CFLAGS="\$(CFLAGS_CLEAN)" dtrace -h -C -s $ac_srcdir$ac_provsrc -o \$@ && \$(SED) -ibak 's,PHP_,DTRACE_,g' \$@ -+ CFLAGS="\$(CFLAGS_CLEAN)" dtrace -h -C -s $ac_srcdir$ac_provsrc -o \$@ && \$(SED) 's,PHP_,DTRACE_,g' \$@ > \$@.tmp && mv \$@.tmp \$@ - - \$(PHP_DTRACE_OBJS): $ac_bdir$ac_hdrobj - -@@ -23567,7 +23567,7 @@ fi +@@ -23571,7 +23571,7 @@ fi if test "$found_openssl" = "no"; then if test "$PHP_OPENSSL_DIR" = "yes"; then @@ -20,7 +11,7 @@ $NetBSD: patch-configure,v 1.1 2013/07/29 16:41:02 taca Exp $ fi for i in $PHP_OPENSSL_DIR; do -@@ -25717,7 +25717,7 @@ $as_echo "yes" >&6; } +@@ -25721,7 +25721,7 @@ $as_echo "yes" >&6; } PHP_SQLITE3_CFLAGS="-I@ext_srcdir@/libsqlite $other_flags $threadsafe_flags $debug_flags" @@ -29,7 +20,7 @@ $NetBSD: patch-configure,v 1.1 2013/07/29 16:41:02 taca Exp $ unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'` -@@ -36774,7 +36774,7 @@ fi +@@ -36778,7 +36778,7 @@ fi if test "$found_openssl" = "no"; then if test "$PHP_OPENSSL_DIR" = "yes"; then @@ -38,7 +29,7 @@ $NetBSD: patch-configure,v 1.1 2013/07/29 16:41:02 taca Exp $ fi for i in $PHP_OPENSSL_DIR; do -@@ -48532,7 +48532,7 @@ fi +@@ -48536,7 +48536,7 @@ fi if test "$found_openssl" = "no"; then if test "$PHP_OPENSSL_DIR" = "yes"; then @@ -47,7 +38,7 @@ $NetBSD: patch-configure,v 1.1 2013/07/29 16:41:02 taca Exp $ fi for i in $PHP_OPENSSL_DIR; do -@@ -104355,12 +104355,7 @@ old_CC=$CC +@@ -104360,12 +104360,7 @@ old_CC=$CC if test "$PHP_THREAD_SAFETY" = "yes" && test -n "$ac_cv_pthreads_cflags"; then CXXFLAGS="$CXXFLAGS $ac_cv_pthreads_cflags" INLINE_CFLAGS="$INLINE_CFLAGS $ac_cv_pthreads_cflags" diff --git a/lang/php55/patches/patch-ext_gd_config.m4 b/lang/php55/patches/patch-ext_gd_config.m4 index facf887e063..22f9d584d6c 100644 --- a/lang/php55/patches/patch-ext_gd_config.m4 +++ b/lang/php55/patches/patch-ext_gd_config.m4 @@ -1,8 +1,8 @@ -$NetBSD: patch-ext_gd_config.m4,v 1.1 2013/07/29 16:41:02 taca Exp $ +$NetBSD: patch-ext_gd_config.m4,v 1.2 2013/08/17 13:15:21 taca Exp $ ---- ext/gd/config.m4.orig 2012-05-03 17:10:43.000000000 +0000 +--- ext/gd/config.m4.orig 2013-08-15 20:42:04.000000000 +0000 +++ ext/gd/config.m4 -@@ -50,18 +50,7 @@ dnl Checks for the configure options +@@ -49,18 +49,7 @@ dnl Checks for the configure options dnl AC_DEFUN([PHP_GD_ZLIB],[ @@ -22,7 +22,7 @@ $NetBSD: patch-ext_gd_config.m4,v 1.1 2013/07/29 16:41:02 taca Exp $ if test -f "$i/include/zlib/zlib.h"; then PHP_ZLIB_DIR="$i" PHP_ZLIB_INCDIR="$i/include/zlib" -@@ -70,7 +59,6 @@ AC_DEFUN([PHP_GD_ZLIB],[ +@@ -69,7 +58,6 @@ AC_DEFUN([PHP_GD_ZLIB],[ PHP_ZLIB_INCDIR="$i/include" fi done @@ -30,7 +30,7 @@ $NetBSD: patch-ext_gd_config.m4,v 1.1 2013/07/29 16:41:02 taca Exp $ ]) AC_DEFUN([PHP_GD_VPX],[ -@@ -139,13 +127,13 @@ AC_DEFUN([PHP_GD_PNG],[ +@@ -138,13 +126,13 @@ AC_DEFUN([PHP_GD_PNG],[ AC_MSG_ERROR([PNG support requires ZLIB. Use --with-zlib-dir=<DIR>]) fi diff --git a/lang/php55/patches/patch-ext_mssql_php__mssql.c b/lang/php55/patches/patch-ext_mssql_php__mssql.c index c6da624cb8e..1183c750fc7 100644 --- a/lang/php55/patches/patch-ext_mssql_php__mssql.c +++ b/lang/php55/patches/patch-ext_mssql_php__mssql.c @@ -1,8 +1,8 @@ -$NetBSD: patch-ext_mssql_php__mssql.c,v 1.1 2013/07/29 16:41:02 taca Exp $ +$NetBSD: patch-ext_mssql_php__mssql.c,v 1.2 2013/08/17 13:15:21 taca Exp $ ---- ext/mssql/php_mssql.c.orig 2012-05-03 17:10:43.000000000 +0000 +--- ext/mssql/php_mssql.c.orig 2013-08-15 20:42:04.000000000 +0000 +++ ext/mssql/php_mssql.c -@@ -764,7 +764,7 @@ static void php_mssql_do_connect(INTERNA +@@ -769,7 +769,7 @@ static void php_mssql_do_connect(INTERNA dbfreelogin(mssql.login); RETURN_FALSE; } @@ -11,7 +11,7 @@ $NetBSD: patch-ext_mssql_php__mssql.c,v 1.1 2013/07/29 16:41:02 taca Exp $ ptr = zend_list_find(link,&type); /* check if the link is still there */ if (ptr && (type==le_link || type==le_plink)) { zend_list_addref(link); -@@ -1117,7 +1117,7 @@ static void php_mssql_get_column_content +@@ -1122,7 +1122,7 @@ static void php_mssql_get_column_content } res_length = 19; diff --git a/lang/php55/patches/patch-ext_openssl_openssl.c b/lang/php55/patches/patch-ext_openssl_openssl.c deleted file mode 100644 index a6035dd2dac..00000000000 --- a/lang/php55/patches/patch-ext_openssl_openssl.c +++ /dev/null @@ -1,114 +0,0 @@ -$NetBSD: patch-ext_openssl_openssl.c,v 1.2 2013/08/16 00:38:34 taca Exp $ - -Fix for CVE-2013-4248. - ---- ext/openssl/openssl.c.orig 2013-07-03 06:10:53.000000000 +0000 -+++ ext/openssl/openssl.c -@@ -1398,6 +1398,75 @@ PHP_FUNCTION(openssl_x509_check_private_ - } - /* }}} */ - -+ -+/* Special handling of subjectAltName, see CVE-2013-4073 -+ * Christian Heimes -+ */ -+ -+static int openssl_x509v3_subjectAltName(BIO *bio, X509_EXTENSION *extension) -+{ -+ GENERAL_NAMES *names; -+ const X509V3_EXT_METHOD *method = NULL; -+ long i, length, num; -+ const unsigned char *p; -+ -+ method = X509V3_EXT_get(extension); -+ if (method == NULL) { -+ return -1; -+ } -+ -+ p = extension->value->data; -+ length = extension->value->length; -+ if (method->it) { -+ names = (GENERAL_NAMES*)(ASN1_item_d2i(NULL, &p, length, -+ ASN1_ITEM_ptr(method->it))); -+ } else { -+ names = (GENERAL_NAMES*)(method->d2i(NULL, &p, length)); -+ } -+ if (names == NULL) { -+ return -1; -+ } -+ -+ num = sk_GENERAL_NAME_num(names); -+ for (i = 0; i < num; i++) { -+ GENERAL_NAME *name; -+ ASN1_STRING *as; -+ name = sk_GENERAL_NAME_value(names, i); -+ switch (name->type) { -+ case GEN_EMAIL: -+ BIO_puts(bio, "email:"); -+ as = name->d.rfc822Name; -+ BIO_write(bio, ASN1_STRING_data(as), -+ ASN1_STRING_length(as)); -+ break; -+ case GEN_DNS: -+ BIO_puts(bio, "DNS:"); -+ as = name->d.dNSName; -+ BIO_write(bio, ASN1_STRING_data(as), -+ ASN1_STRING_length(as)); -+ break; -+ case GEN_URI: -+ BIO_puts(bio, "URI:"); -+ as = name->d.uniformResourceIdentifier; -+ BIO_write(bio, ASN1_STRING_data(as), -+ ASN1_STRING_length(as)); -+ break; -+ default: -+ /* use builtin print for GEN_OTHERNAME, GEN_X400, -+ * GEN_EDIPARTY, GEN_DIRNAME, GEN_IPADD and GEN_RID -+ */ -+ GENERAL_NAME_print(bio, name); -+ } -+ /* trailing ', ' except for last element */ -+ if (i < (num - 1)) { -+ BIO_puts(bio, ", "); -+ } -+ } -+ sk_GENERAL_NAME_pop_free(names, GENERAL_NAME_free); -+ -+ return 0; -+} -+ - /* {{{ proto array openssl_x509_parse(mixed x509 [, bool shortnames=true]) - Returns an array of the fields/values of the CERT */ - PHP_FUNCTION(openssl_x509_parse) -@@ -1494,15 +1563,29 @@ PHP_FUNCTION(openssl_x509_parse) - - - for (i = 0; i < X509_get_ext_count(cert); i++) { -+ int nid; - extension = X509_get_ext(cert, i); -- if (OBJ_obj2nid(X509_EXTENSION_get_object(extension)) != NID_undef) { -+ nid = OBJ_obj2nid(X509_EXTENSION_get_object(extension)); -+ if (nid != NID_undef) { - extname = (char *)OBJ_nid2sn(OBJ_obj2nid(X509_EXTENSION_get_object(extension))); - } else { - OBJ_obj2txt(buf, sizeof(buf)-1, X509_EXTENSION_get_object(extension), 1); - extname = buf; - } - bio_out = BIO_new(BIO_s_mem()); -- if (X509V3_EXT_print(bio_out, extension, 0, 0)) { -+ if (nid == NID_subject_alt_name) { -+ if (openssl_x509v3_subjectAltName(bio_out, extension) == 0) { -+ add_assoc_stringl(subitem, extname, bio_buf->data, bio_buf->length, 1); -+ } else { -+ zval_dtor(return_value); -+ if (certresource == -1 && cert) { -+ X509_free(cert); -+ } -+ BIO_free(bio_out); -+ RETURN_FALSE; -+ } -+ } -+ else if (X509V3_EXT_print(bio_out, extension, 0, 0)) { - BIO_get_mem_ptr(bio_out, &bio_buf); - add_assoc_stringl(subitem, extname, bio_buf->data, bio_buf->length, 1); - } else { diff --git a/lang/php55/patches/patch-ext_standard_basic__functions.c b/lang/php55/patches/patch-ext_standard_basic__functions.c index a75487dcd1a..670ad4d0dab 100644 --- a/lang/php55/patches/patch-ext_standard_basic__functions.c +++ b/lang/php55/patches/patch-ext_standard_basic__functions.c @@ -1,10 +1,10 @@ -$NetBSD: patch-ext_standard_basic__functions.c,v 1.1 2013/07/29 16:41:02 taca Exp $ +$NetBSD: patch-ext_standard_basic__functions.c,v 1.2 2013/08/17 13:15:21 taca Exp $ Work around VAX FP lack of INF ---- ext/standard/basic_functions.c.orig 2012-05-08 05:22:56.000000000 +0000 +--- ext/standard/basic_functions.c.orig 2013-08-15 20:42:04.000000000 +0000 +++ ext/standard/basic_functions.c -@@ -3498,7 +3498,7 @@ PHPAPI double php_get_nan(void) /* {{{ * +@@ -3519,7 +3519,7 @@ PHPAPI double php_get_nan(void) /* {{{ * PHPAPI double php_get_inf(void) /* {{{ */ { diff --git a/lang/php55/patches/patch-main_streams_cast.c b/lang/php55/patches/patch-main_streams_cast.c deleted file mode 100644 index ea742d7754e..00000000000 --- a/lang/php55/patches/patch-main_streams_cast.c +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-main_streams_cast.c,v 1.1 2013/07/29 16:41:02 taca Exp $ - -* For NetBSD 6.0+, __NetBSD_Version__ should includes 600000000. - ---- main/streams/cast.c.orig 2013-07-03 06:10:53.000000000 +0000 -+++ main/streams/cast.c -@@ -33,7 +33,7 @@ - #if defined(HAVE_FUNOPEN) && !defined(HAVE_FOPENCOOKIE) - - /* NetBSD 6.0+ uses off_t instead of fpos_t in funopen */ --# if defined(__NetBSD__) && (__NetBSD_Version__ > 600000000) -+# if defined(__NetBSD__) && (__NetBSD_Version__ >= 600000000) - # define PHP_FPOS_T off_t - # else - # define PHP_FPOS_T fpos_t diff --git a/lang/php55/patches/patch-php.ini-development b/lang/php55/patches/patch-php.ini-development index 3a44a6f0a81..e6ce909703a 100644 --- a/lang/php55/patches/patch-php.ini-development +++ b/lang/php55/patches/patch-php.ini-development @@ -1,6 +1,6 @@ -$NetBSD: patch-php.ini-development,v 1.1 2013/07/29 16:41:02 taca Exp $ +$NetBSD: patch-php.ini-development,v 1.2 2013/08/17 13:15:21 taca Exp $ ---- php.ini-development.orig 2012-05-03 17:10:43.000000000 +0000 +--- php.ini-development.orig 2013-08-15 20:42:04.000000000 +0000 +++ php.ini-development @@ -702,7 +702,7 @@ default_mimetype = "text/html" ;;;;;;;;;;;;;;;;;;;;;;;;; @@ -22,7 +22,7 @@ $NetBSD: patch-php.ini-development,v 1.1 2013/07/29 16:41:02 taca Exp $ ; extension_dir = "./" ; On windows: ; extension_dir = "ext" -@@ -793,7 +793,7 @@ file_uploads = On +@@ -797,7 +797,7 @@ file_uploads = On ; Temporary directory for HTTP uploaded files (will use system default if not ; specified). ; http://php.net/upload-tmp-dir diff --git a/lang/php55/patches/patch-php.ini-production b/lang/php55/patches/patch-php.ini-production index 28225d68704..21495050f0a 100644 --- a/lang/php55/patches/patch-php.ini-production +++ b/lang/php55/patches/patch-php.ini-production @@ -1,6 +1,6 @@ -$NetBSD: patch-php.ini-production,v 1.1 2013/07/29 16:41:02 taca Exp $ +$NetBSD: patch-php.ini-production,v 1.2 2013/08/17 13:15:21 taca Exp $ ---- php.ini-production.orig 2012-05-03 17:10:43.000000000 +0000 +--- php.ini-production.orig 2013-08-15 20:42:04.000000000 +0000 +++ php.ini-production @@ -702,7 +702,7 @@ default_mimetype = "text/html" ;;;;;;;;;;;;;;;;;;;;;;;;; @@ -22,7 +22,7 @@ $NetBSD: patch-php.ini-production,v 1.1 2013/07/29 16:41:02 taca Exp $ ; extension_dir = "./" ; On windows: ; extension_dir = "ext" -@@ -793,7 +793,7 @@ file_uploads = On +@@ -797,7 +797,7 @@ file_uploads = On ; Temporary directory for HTTP uploaded files (will use system default if not ; specified). ; http://php.net/upload-tmp-dir diff --git a/lang/php55/patches/patch-sapi_cgi_Makefile.frag b/lang/php55/patches/patch-sapi_cgi_Makefile.frag index f106b05e780..7c9d98a4e6c 100644 --- a/lang/php55/patches/patch-sapi_cgi_Makefile.frag +++ b/lang/php55/patches/patch-sapi_cgi_Makefile.frag @@ -1,15 +1,16 @@ -$NetBSD: patch-sapi_cgi_Makefile.frag,v 1.1 2013/07/29 16:41:02 taca Exp $ +$NetBSD: patch-sapi_cgi_Makefile.frag,v 1.2 2013/08/17 13:15:21 taca Exp $ ---- sapi/cgi/Makefile.frag.orig 2013-07-18 14:37:33.000000000 +0000 +--- sapi/cgi/Makefile.frag.orig 2013-08-15 20:42:04.000000000 +0000 +++ sapi/cgi/Makefile.frag -@@ -4,8 +4,8 @@ $(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(P +@@ -4,9 +4,9 @@ $(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(P $(BUILD_CGI) install-cgi: $(SAPI_CGI_PATH) - @echo "Installing PHP CGI binary: $(INSTALL_ROOT)$(bindir)/" -- @$(INSTALL) -m 0755 $(SAPI_CGI_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)php-cgi$(program_suffix)$(EXEEXT) + @echo "Installing PHP CGI binary: $(INSTALL_ROOT)@CGIDIR@/" -+ @$(INSTALL) -m 0755 $(SAPI_CGI_PATH) $(INSTALL_ROOT)@CGIDIR@/php + @$(mkinstalldirs) $(INSTALL_ROOT)$(bindir) +- @$(INSTALL) -m 0755 $(SAPI_CGI_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)php-cgi$(program_suffix)$(EXEEXT) ++ @$(INSTALL) -m 0755 $(SAPI_CGI_PATH) $(INSTALL_ROOT)@CGIDIR@/$(program_prefix)php$(program_suffix)$(EXEEXT) @echo "Installing PHP CGI man page: $(INSTALL_ROOT)$(mandir)/man1/" @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1 @$(INSTALL_DATA) sapi/cgi/php-cgi.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)php-cgi$(program_suffix).1 |