summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lang/php/phpversion.mk8
-rw-r--r--lang/php53/Makefile3
-rw-r--r--lang/php53/Makefile.php4
-rw-r--r--lang/php53/distinfo11
-rw-r--r--lang/php53/patches/patch-ext_date_lib_parse__iso__intervals.c15
-rw-r--r--lang/php53/patches/patch-ext_date_lib_parse__iso__intervals.re15
-rw-r--r--lang/php53/patches/patch-ext_openssl_openssl.c114
-rw-r--r--lang/php54/distinfo10
-rw-r--r--lang/php54/patches/patch-ext_date_lib_parse__iso__intervals.c15
-rw-r--r--lang/php54/patches/patch-ext_date_lib_parse__iso__intervals.re15
-rw-r--r--lang/php55/PLIST3
-rw-r--r--lang/php55/distinfo14
-rw-r--r--lang/php55/patches/patch-configure23
-rw-r--r--lang/php55/patches/patch-ext_date_lib_parse__iso__intervals.c15
-rw-r--r--lang/php55/patches/patch-ext_date_lib_parse__iso__intervals.re15
-rw-r--r--lang/php55/patches/patch-ext_opcache_config.m415
-rw-r--r--lang/php55/patches/patch-ext_sockets_sockaddr__conv.c17
-rw-r--r--lang/php55/patches/patch-sockaddr__conv.c14
-rw-r--r--net/php-sockets/Makefile4
19 files changed, 185 insertions, 145 deletions
diff --git a/lang/php/phpversion.mk b/lang/php/phpversion.mk
index 07ecf61f169..2038fc37dca 100644
--- a/lang/php/phpversion.mk
+++ b/lang/php/phpversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: phpversion.mk,v 1.45 2013/09/21 16:08:37 taca Exp $
+# $NetBSD: phpversion.mk,v 1.45.2.1 2013/12/16 17:05:47 tron Exp $
#
# This file selects a PHP version, based on the user's preferences and
# the installed packages. It does not add a dependency on the PHP
@@ -81,9 +81,9 @@
PHPVERSION_MK= defined
# Define each PHP's version.
-PHP53_VERSION= 5.3.27
-PHP54_VERSION= 5.4.20
-PHP55_VERSION= 5.5.4
+PHP53_VERSION= 5.3.28
+PHP54_VERSION= 5.4.23
+PHP55_VERSION= 5.5.7
# Define initial release of major version.
PHP53_RELDATE= 20090630
diff --git a/lang/php53/Makefile b/lang/php53/Makefile
index c327b4f69fa..aaa5ea99cd3 100644
--- a/lang/php53/Makefile
+++ b/lang/php53/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.43 2013/08/14 15:42:56 taca Exp $
+# $NetBSD: Makefile,v 1.43.2.1 2013/12/16 17:05:48 tron Exp $
#
# We can't omit PKGNAME here to handle PKG_OPTIONS.
#
PKGNAME= php-${PHP_BASE_VERS}
-PKGREVISION= 2
CATEGORIES= lang
HOMEPAGE= http://www.php.net/
diff --git a/lang/php53/Makefile.php b/lang/php53/Makefile.php
index f7eab1380e6..22723bbe623 100644
--- a/lang/php53/Makefile.php
+++ b/lang/php53/Makefile.php
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.37 2013/07/21 17:29:47 taca Exp $
+# $NetBSD: Makefile.php,v 1.37.2.1 2013/12/16 17:05:48 tron Exp $
# used by lang/php53/Makefile
# used by www/ap-php/Makefile
# used by www/php-fpm/Makefile
@@ -53,7 +53,7 @@ PKG_SUGGESTED_OPTIONS+= inet6 ssl
.if !empty(PKG_OPTIONS:Msuhosin)
SUHOSIN_PHPVER= 5.3.25
-. if ${SUHOSIN_PHPVER} != ${PHP_BASE_VERS} && ${PHP_BASE_VERS} != "5.3.27"
+. if ${SUHOSIN_PHPVER} != ${PHP_BASE_VERS} && ${PHP_BASE_VERS} != "5.3.28"
PKG_FAIL_REASON+= "The suhosin patch is currently not available for"
PKG_FAIL_REASON+= "this version of PHP. You may have to wait until"
PKG_FAIL_REASON+= "an updated patch is released or temporarily"
diff --git a/lang/php53/distinfo b/lang/php53/distinfo
index 2b319c58c92..64d431d24ae 100644
--- a/lang/php53/distinfo
+++ b/lang/php53/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.68 2013/08/16 00:38:13 taca Exp $
+$NetBSD: distinfo,v 1.68.2.1 2013/12/16 17:05:48 tron Exp $
-SHA1 (php-5.3.27.tar.bz2) = 4f95682940ebe1bc1a93812d593460625a2aae64
-RMD160 (php-5.3.27.tar.bz2) = c2887004859f32b25229ffe52d86270c8de194b7
-Size (php-5.3.27.tar.bz2) = 11432791 bytes
+SHA1 (php-5.3.28.tar.bz2) = f985ca1f6a5f49ebfb25a08f1837a44c563b31f8
+RMD160 (php-5.3.28.tar.bz2) = e4910c0c365f39a5009807801bd5ee6e25be020d
+Size (php-5.3.28.tar.bz2) = 11051714 bytes
SHA1 (suhosin-patch-5.3.25-0.9.10.patch.bz2) = ce5883b05daf91e8a44fffbfa4d3989ac3311dd1
RMD160 (suhosin-patch-5.3.25-0.9.10.patch.bz2) = 6c4d0cfe070802481121be465b66d3cefe44da83
Size (suhosin-patch-5.3.25-0.9.10.patch.bz2) = 32447 bytes
@@ -17,7 +17,8 @@ SHA1 (patch-ah) = 697156508da2d837a1ea1a41f036eab4fb87e94b
SHA1 (patch-ai) = 9659f73eef1b4fcca9b844bdaa785ac6d5e582a1
SHA1 (patch-aj) = 181658ae523bd60f67750566711fc078b49191b7
SHA1 (patch-al) = fe534d7d50a529e3c7d0ffed76afdb70bb55a521
-SHA1 (patch-ext_openssl_openssl.c) = f45f4322ac875db7b0bb86efb7cfda1f659ac6cc
+SHA1 (patch-ext_date_lib_parse__iso__intervals.c) = 1243e4cda1d6446ee4f8b6cab61556fa07837139
+SHA1 (patch-ext_date_lib_parse__iso__intervals.re) = 75d4abd666c17d7d5f8a4ee9e489bf2565f83524
SHA1 (patch-ext_standard_basic__functions.c) = 017fd25e646af4d7eb2a0bd13b3c8da34eaee8c5
SHA1 (patch-main_streams_cast.c) = d68b69c9418a8780b1610b8755487771f7c46a5a
SHA1 (patch-php__mssql.c) = 524c4e5d7ede0e503049bf1febec58e0c4a29aa4
diff --git a/lang/php53/patches/patch-ext_date_lib_parse__iso__intervals.c b/lang/php53/patches/patch-ext_date_lib_parse__iso__intervals.c
new file mode 100644
index 00000000000..dc88b972e70
--- /dev/null
+++ b/lang/php53/patches/patch-ext_date_lib_parse__iso__intervals.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-ext_date_lib_parse__iso__intervals.c,v 1.1.2.2 2013/12/16 17:05:48 tron Exp $
+
+Fix for CVE-2013-6712.
+
+--- ext/date/lib/parse_iso_intervals.c.orig 2013-07-10 17:43:08.000000000 +0000
++++ ext/date/lib/parse_iso_intervals.c
+@@ -415,7 +415,7 @@ yy6:
+ break;
+ }
+ ptr++;
+- } while (*ptr);
++ } while (!s->errors->error_count && *ptr);
+ s->have_period = 1;
+ TIMELIB_DEINIT;
+ return TIMELIB_PERIOD;
diff --git a/lang/php53/patches/patch-ext_date_lib_parse__iso__intervals.re b/lang/php53/patches/patch-ext_date_lib_parse__iso__intervals.re
new file mode 100644
index 00000000000..1807e48d3b6
--- /dev/null
+++ b/lang/php53/patches/patch-ext_date_lib_parse__iso__intervals.re
@@ -0,0 +1,15 @@
+$NetBSD: patch-ext_date_lib_parse__iso__intervals.re,v 1.1.2.2 2013/12/16 17:05:48 tron Exp $
+
+Fix for CVE-2013-6712.
+
+--- ext/date/lib/parse_iso_intervals.re.orig 2013-07-10 17:43:08.000000000 +0000
++++ ext/date/lib/parse_iso_intervals.re
+@@ -383,7 +383,7 @@ isoweek = year4 "-"? "W" weekof
+ break;
+ }
+ ptr++;
+- } while (*ptr);
++ } while (!s->errors->error_count && *ptr);
+ s->have_period = 1;
+ TIMELIB_DEINIT;
+ return TIMELIB_PERIOD;
diff --git a/lang/php53/patches/patch-ext_openssl_openssl.c b/lang/php53/patches/patch-ext_openssl_openssl.c
deleted file mode 100644
index 577ae4edb2f..00000000000
--- a/lang/php53/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:13 taca Exp $
-
-Fix for CVE-2013-4248.
-
---- ext/openssl/openssl.c.orig 2013-07-10 17:43:08.000000000 +0000
-+++ ext/openssl/openssl.c
-@@ -1326,6 +1326,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)
-@@ -1422,15 +1491,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/php54/distinfo b/lang/php54/distinfo
index e3d777281c1..139e7e903de 100644
--- a/lang/php54/distinfo
+++ b/lang/php54/distinfo
@@ -1,10 +1,12 @@
-$NetBSD: distinfo,v 1.27 2013/09/21 16:06:07 taca Exp $
+$NetBSD: distinfo,v 1.27.2.1 2013/12/16 17:05:48 tron Exp $
-SHA1 (php-5.4.20.tar.bz2) = b468faaf1f88dd4dd5dbeb11283dd9d76c523cd5
-RMD160 (php-5.4.20.tar.bz2) = 629a1ac46a8a067bec99e4fb0469ada072fca12e
-Size (php-5.4.20.tar.bz2) = 11700446 bytes
+SHA1 (php-5.4.23.tar.bz2) = 1ad25b03486742dba18134ce07111146805d930f
+RMD160 (php-5.4.23.tar.bz2) = 3a5e3b7a6013f5a284c80d41a95989ba2a78b6d4
+Size (php-5.4.23.tar.bz2) = 12251671 bytes
SHA1 (patch-acinclude.m4) = 71635e5381abf99a9fc9f2537b1c2f18e8096f00
SHA1 (patch-configure) = ce3205292370fb279033aaa06138cea1a3725ef1
+SHA1 (patch-ext_date_lib_parse__iso__intervals.c) = c2b18faed698a6ace171ca93cd082985ac3e1b83
+SHA1 (patch-ext_date_lib_parse__iso__intervals.re) = 1a6b18d1d9bec66b0ab67cb2f602cc9ef97678b1
SHA1 (patch-ext_gd_config.m4) = 2353efe6f25e1081b41d61033c3185cc643c7891
SHA1 (patch-ext_imap_config.m4) = 01681e8b54ee586ec4db72a5da2d0aec3fa89fcc
SHA1 (patch-ext_mssql_php__mssql.c) = 732e48b05086180585a3087c2e9737db557dbc3b
diff --git a/lang/php54/patches/patch-ext_date_lib_parse__iso__intervals.c b/lang/php54/patches/patch-ext_date_lib_parse__iso__intervals.c
new file mode 100644
index 00000000000..d87a93f1494
--- /dev/null
+++ b/lang/php54/patches/patch-ext_date_lib_parse__iso__intervals.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-ext_date_lib_parse__iso__intervals.c,v 1.1.2.2 2013/12/16 17:05:48 tron Exp $
+
+Fix for CVE-2013-6712.
+
+--- ext/date/lib/parse_iso_intervals.c.orig 2013-11-13 06:46:59.000000000 +0000
++++ ext/date/lib/parse_iso_intervals.c
+@@ -415,7 +415,7 @@ yy6:
+ break;
+ }
+ ptr++;
+- } while (*ptr);
++ } while (!s->errors->error_count && *ptr);
+ s->have_period = 1;
+ TIMELIB_DEINIT;
+ return TIMELIB_PERIOD;
diff --git a/lang/php54/patches/patch-ext_date_lib_parse__iso__intervals.re b/lang/php54/patches/patch-ext_date_lib_parse__iso__intervals.re
new file mode 100644
index 00000000000..b8c8488ea92
--- /dev/null
+++ b/lang/php54/patches/patch-ext_date_lib_parse__iso__intervals.re
@@ -0,0 +1,15 @@
+$NetBSD: patch-ext_date_lib_parse__iso__intervals.re,v 1.1.2.2 2013/12/16 17:05:48 tron Exp $
+
+Fix for CVE-2013-6712.
+
+--- ext/date/lib/parse_iso_intervals.re.orig 2013-11-13 06:46:59.000000000 +0000
++++ ext/date/lib/parse_iso_intervals.re
+@@ -383,7 +383,7 @@ isoweek = year4 "-"? "W" weekof
+ break;
+ }
+ ptr++;
+- } while (*ptr);
++ } while (!s->errors->error_count && *ptr);
+ s->have_period = 1;
+ TIMELIB_DEINIT;
+ return TIMELIB_PERIOD;
diff --git a/lang/php55/PLIST b/lang/php55/PLIST
index dadacb7c06e..34d4bfc3ad1 100644
--- a/lang/php55/PLIST
+++ b/lang/php55/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2013/07/29 16:41:02 taca Exp $
+@comment $NetBSD: PLIST,v 1.1.2.1 2013/12/16 17:05:48 tron Exp $
bin/phar
bin/phar.phar
bin/php
@@ -101,6 +101,7 @@ 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/php_pcre.h
+include/php/ext/phar/php_phar.h
include/php/ext/session/mod_files.h
include/php/ext/session/mod_user.h
include/php/ext/session/php_session.h
diff --git a/lang/php55/distinfo b/lang/php55/distinfo
index 342b38dbb6a..27441905bbd 100644
--- a/lang/php55/distinfo
+++ b/lang/php55/distinfo
@@ -1,17 +1,21 @@
-$NetBSD: distinfo,v 1.6 2013/09/21 16:08:37 taca Exp $
+$NetBSD: distinfo,v 1.6.2.1 2013/12/16 17:05:48 tron Exp $
-SHA1 (php-5.5.4.tar.bz2) = fdc6724a7a3f23f7c87a3470e5b29d260685e2b6
-RMD160 (php-5.5.4.tar.bz2) = fcd69b4d4716392edf065b5cd5dabb68b4bacd45
-Size (php-5.5.4.tar.bz2) = 12047184 bytes
+SHA1 (php-5.5.7.tar.bz2) = f32ccf1a2aa0592e2dcc151c89a7a811e53e0925
+RMD160 (php-5.5.7.tar.bz2) = d4285b6a4b151748395bddc9eedaaf6feaea109f
+Size (php-5.5.7.tar.bz2) = 12991330 bytes
SHA1 (patch-acinclude.m4) = 9e9c433e4cb96e469f7cf14b2064a0f41fc4568a
-SHA1 (patch-configure) = 9ac8c43978df580c592631c923283e61e15e90af
+SHA1 (patch-configure) = 37b19e0f75619ffe016a1d834dbe774ea4452a2d
+SHA1 (patch-ext_date_lib_parse__iso__intervals.c) = b0810f2e6d23cbc52356b38bc6a8fa545d1a0b6f
+SHA1 (patch-ext_date_lib_parse__iso__intervals.re) = fb27d18d88f13dce8d44de805f255d5af61afef1
SHA1 (patch-ext_gd_config.m4) = 91c9798333d4776856a0a9e20196986856b758b2
SHA1 (patch-ext_imap_config.m4) = 01681e8b54ee586ec4db72a5da2d0aec3fa89fcc
SHA1 (patch-ext_mssql_php__mssql.c) = 4ef1837850443e9db2e71620a3ddaed5ab5c435b
+SHA1 (patch-ext_opcache_config.m4) = 7c0d98feaeec8a0ca61f6f77a1906aa2d601be3f
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_sockets_sockaddr__conv.c) = ca4a1e97208071b3e28598f23d4b88ffb9b56df4
SHA1 (patch-ext_standard_basic__functions.c) = f2a44998145306c2cb2d2f3822c0e7cc70c778b4
SHA1 (patch-makedist) = a2a77c3d15a28fee08fdd88f0c9fee6cbec107d8
SHA1 (patch-php.ini-development) = b4690be8f589933ee5654bdd7bc80712481711a5
diff --git a/lang/php55/patches/patch-configure b/lang/php55/patches/patch-configure
index dfaa3d8e1ad..1b9e811b783 100644
--- a/lang/php55/patches/patch-configure
+++ b/lang/php55/patches/patch-configure
@@ -1,8 +1,8 @@
-$NetBSD: patch-configure,v 1.2 2013/08/17 13:15:21 taca Exp $
+$NetBSD: patch-configure,v 1.2.2.1 2013/12/16 17:05:48 tron Exp $
---- configure.orig 2013-08-15 20:48:19.000000000 +0000
+--- configure.orig 2013-10-15 14:29:41.000000000 +0000
+++ configure
-@@ -23571,7 +23571,7 @@ fi
+@@ -23604,7 +23604,7 @@ fi
if test "$found_openssl" = "no"; then
if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -11,7 +11,7 @@ $NetBSD: patch-configure,v 1.2 2013/08/17 13:15:21 taca Exp $
fi
for i in $PHP_OPENSSL_DIR; do
-@@ -25721,7 +25721,7 @@ $as_echo "yes" >&6; }
+@@ -25754,7 +25754,7 @@ $as_echo "yes" >&6; }
PHP_SQLITE3_CFLAGS="-I@ext_srcdir@/libsqlite $other_flags $threadsafe_flags $debug_flags"
@@ -20,7 +20,7 @@ $NetBSD: patch-configure,v 1.2 2013/08/17 13:15:21 taca Exp $
unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
-@@ -36778,7 +36778,7 @@ fi
+@@ -36811,7 +36811,7 @@ fi
if test "$found_openssl" = "no"; then
if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -29,7 +29,7 @@ $NetBSD: patch-configure,v 1.2 2013/08/17 13:15:21 taca Exp $
fi
for i in $PHP_OPENSSL_DIR; do
-@@ -48536,7 +48536,7 @@ fi
+@@ -48569,7 +48569,7 @@ fi
if test "$found_openssl" = "no"; then
if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -38,7 +38,16 @@ $NetBSD: patch-configure,v 1.2 2013/08/17 13:15:21 taca Exp $
fi
for i in $PHP_OPENSSL_DIR; do
-@@ -104360,12 +104360,7 @@ old_CC=$CC
+@@ -65546,7 +65546,7 @@ rm -f core *.core core.conftest.* gmon.o
+ fi
+
+
+-if test "$flock_type" == "unknown"; then
++if test "$flock_type" = "unknown"; then
+ as_fn_error $? "Don't know how to define struct flock on this system, set --enable-opcache=no" "$LINENO" 5
+ fi
+
+@@ -104883,12 +104883,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_date_lib_parse__iso__intervals.c b/lang/php55/patches/patch-ext_date_lib_parse__iso__intervals.c
new file mode 100644
index 00000000000..7d6c6fc9afb
--- /dev/null
+++ b/lang/php55/patches/patch-ext_date_lib_parse__iso__intervals.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-ext_date_lib_parse__iso__intervals.c,v 1.1.2.2 2013/12/16 17:05:48 tron Exp $
+
+Fix for CVE-2013-6712.
+
+--- ext/date/lib/parse_iso_intervals.c.orig 2013-11-12 14:17:27.000000000 +0000
++++ ext/date/lib/parse_iso_intervals.c
+@@ -380,7 +380,7 @@ yy6:
+ break;
+ }
+ ptr++;
+- } while (*ptr);
++ } while (!s->errors->error_count && *ptr);
+ s->have_period = 1;
+ TIMELIB_DEINIT;
+ return TIMELIB_PERIOD;
diff --git a/lang/php55/patches/patch-ext_date_lib_parse__iso__intervals.re b/lang/php55/patches/patch-ext_date_lib_parse__iso__intervals.re
new file mode 100644
index 00000000000..82b0fcb09b9
--- /dev/null
+++ b/lang/php55/patches/patch-ext_date_lib_parse__iso__intervals.re
@@ -0,0 +1,15 @@
+$NetBSD: patch-ext_date_lib_parse__iso__intervals.re,v 1.1.2.2 2013/12/16 17:05:48 tron Exp $
+
+Fix for CVE-2013-6712.
+
+--- ext/date/lib/parse_iso_intervals.re.orig 2013-11-12 14:17:27.000000000 +0000
++++ ext/date/lib/parse_iso_intervals.re
+@@ -348,7 +348,7 @@ isoweek = year4 "-"? "W" weekof
+ break;
+ }
+ ptr++;
+- } while (*ptr);
++ } while (!s->errors->error_count && *ptr);
+ s->have_period = 1;
+ TIMELIB_DEINIT;
+ return TIMELIB_PERIOD;
diff --git a/lang/php55/patches/patch-ext_opcache_config.m4 b/lang/php55/patches/patch-ext_opcache_config.m4
new file mode 100644
index 00000000000..e9fe6c92efa
--- /dev/null
+++ b/lang/php55/patches/patch-ext_opcache_config.m4
@@ -0,0 +1,15 @@
+$NetBSD: patch-ext_opcache_config.m4,v 1.1.2.2 2013/12/16 17:05:48 tron Exp $
+
+Avoid use "==" in test(1).
+
+--- ext/opcache/config.m4.orig 2013-10-15 13:49:47.000000000 +0000
++++ ext/opcache/config.m4
+@@ -359,7 +359,7 @@ AC_TRY_RUN([
+ AC_MSG_RESULT("yes")
+ ], AC_MSG_RESULT("no") )
+
+-if test "$flock_type" == "unknown"; then
++if test "$flock_type" = "unknown"; then
+ AC_MSG_ERROR([Don't know how to define struct flock on this system[,] set --enable-opcache=no])
+ fi
+
diff --git a/lang/php55/patches/patch-ext_sockets_sockaddr__conv.c b/lang/php55/patches/patch-ext_sockets_sockaddr__conv.c
new file mode 100644
index 00000000000..11ad7bf090a
--- /dev/null
+++ b/lang/php55/patches/patch-ext_sockets_sockaddr__conv.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-ext_sockets_sockaddr__conv.c,v 1.1.2.2 2013/12/16 17:05:48 tron Exp $
+
+Not all operating system have AI_V4MAPPED.
+
+--- ext/sockets/sockaddr_conv.c.orig 2013-09-18 13:08:04.000000000 +0000
++++ ext/sockets/sockaddr_conv.c
+@@ -24,6 +24,10 @@ int php_set_inet6_addr(struct sockaddr_i
+ } else {
+ #if HAVE_GETADDRINFO
+
++#ifndef AI_V4MAPPED
++#define AI_V4MAPPED 0
++#endif
++
+ memset(&hints, 0, sizeof(struct addrinfo));
+ hints.ai_family = AF_INET6;
+ hints.ai_flags = AI_V4MAPPED | AI_ADDRCONFIG;
diff --git a/lang/php55/patches/patch-sockaddr__conv.c b/lang/php55/patches/patch-sockaddr__conv.c
new file mode 100644
index 00000000000..7964cb0c762
--- /dev/null
+++ b/lang/php55/patches/patch-sockaddr__conv.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-sockaddr__conv.c,v 1.2.2.2 2013/12/16 17:05:48 tron Exp $
+
+--- sockaddr_conv.c.orig 2013-10-14 13:24:02.000000000 +0000
++++ sockaddr_conv.c
+@@ -26,6 +26,9 @@ int php_set_inet6_addr(struct sockaddr_i
+
+ memset(&hints, 0, sizeof(struct addrinfo));
+ hints.ai_family = AF_INET6;
++#ifndef AI_V4MAPPED
++#define AI_V4MAPPED 1
++#endif
+ hints.ai_flags = AI_V4MAPPED | AI_ADDRCONFIG;
+ getaddrinfo(string, NULL, &hints, &addrinfo);
+ if (!addrinfo) {
diff --git a/net/php-sockets/Makefile b/net/php-sockets/Makefile
index 3ec69dc67f1..2d11ec82217 100644
--- a/net/php-sockets/Makefile
+++ b/net/php-sockets/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2012/10/23 17:18:58 asau Exp $
+# $NetBSD: Makefile,v 1.11.8.1 2013/12/16 17:05:48 tron Exp $
MODNAME= sockets
CATEGORIES+= net
@@ -8,6 +8,8 @@ CONFLICTS= php-sockets-[0-9]*
CONFIGURE_ARGS+= --enable-${MODNAME}=shared,${BUILDLINK_DIR}
+USE_PHP_EXT_PATCHES= Yes
+
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "SunOS"
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-18 10:34:14 +0000