diff options
Diffstat (limited to 'lang/php5')
| -rw-r--r-- | lang/php5/Makefile.common | 4 | ||||
| -rw-r--r-- | lang/php5/Makefile.php | 4 | ||||
| -rw-r--r-- | lang/php5/PLIST | 5 | ||||
| -rw-r--r-- | lang/php5/distinfo | 12 | ||||
| -rw-r--r-- | lang/php5/patches/patch-ax | 30 |
5 files changed, 10 insertions, 45 deletions
diff --git a/lang/php5/Makefile.common b/lang/php5/Makefile.common index 7352eef9769..e21fb5827cc 100644 --- a/lang/php5/Makefile.common +++ b/lang/php5/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.36 2009/07/07 21:57:28 jdolecek Exp $ +# $NetBSD: Makefile.common,v 1.37 2009/09/26 05:40:05 taca Exp $ # used by lang/php5/Makefile.php # used by lang/php/ext.mk @@ -26,7 +26,7 @@ EXTRACT_SUFX?= .tar.bz2 MAINTAINER?= jdolecek@NetBSD.org HOMEPAGE?= http://www.php.net/ -PHP_BASE_VERS= 5.2.10 +PHP_BASE_VERS= 5.2.11 PHP_EXTENSION_DIR= lib/php/20040412 PLIST_SUBST+= PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR:Q} diff --git a/lang/php5/Makefile.php b/lang/php5/Makefile.php index 63b5ad7901a..d1090c815e7 100644 --- a/lang/php5/Makefile.php +++ b/lang/php5/Makefile.php @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.php,v 1.35 2009/07/07 21:57:28 jdolecek Exp $ +# $NetBSD: Makefile.php,v 1.36 2009/09/26 05:40:05 taca Exp $ # .include "../../lang/php5/Makefile.common" @@ -50,7 +50,7 @@ SUBST_CLASSES+= ini SUBST_STAGE.ini= post-patch SUBST_FILES.ini= php.ini-dist SUBST_FILES.ini+= php.ini-recommended -SUBST_SED.ini= -e "s|\;include_path = \".:/php/includes\"|include_path = \".:${PREFIX}/lib/php\"|g" +SUBST_SED.ini= -e "s|\\;include_path = \".:/php/includes\"|include_path = \".:${PREFIX}/lib/php\"|g" SUBST_MESSAGE.ini= Fixing default ini files. .include "../../mk/bsd.options.mk" diff --git a/lang/php5/PLIST b/lang/php5/PLIST index c758a4faa1c..465de671077 100644 --- a/lang/php5/PLIST +++ b/lang/php5/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.23 2009/06/14 20:34:14 joerg Exp $ +@comment $NetBSD: PLIST,v 1.24 2009/09/26 05:40:05 taca Exp $ bin/php bin/php-config bin/phpize @@ -110,7 +110,6 @@ include/php/ext/standard/css.h include/php/ext/standard/cyr_convert.h include/php/ext/standard/datetime.h include/php/ext/standard/dl.h -include/php/ext/standard/dns.h include/php/ext/standard/exec.h include/php/ext/standard/file.h include/php/ext/standard/flock_compat.h @@ -127,6 +126,7 @@ include/php/ext/standard/php_assert.h include/php/ext/standard/php_browscap.h include/php/ext/standard/php_crypt.h include/php/ext/standard/php_dir.h +include/php/ext/standard/php_dns.h include/php/ext/standard/php_ext_syslog.h include/php/ext/standard/php_filestat.h include/php/ext/standard/php_fopen_wrappers.h @@ -157,7 +157,6 @@ include/php/ext/standard/sha1.h include/php/ext/standard/streamsfuncs.h include/php/ext/standard/uniqid.h include/php/ext/standard/url.h -include/php/ext/standard/url_scanner.h include/php/ext/standard/url_scanner_ex.h include/php/ext/xml/expat_compat.h include/php/ext/xml/php_xml.h diff --git a/lang/php5/distinfo b/lang/php5/distinfo index 2135b8251c5..04f29a7d4e4 100644 --- a/lang/php5/distinfo +++ b/lang/php5/distinfo @@ -1,11 +1,8 @@ -$NetBSD: distinfo,v 1.65 2009/08/11 14:41:23 taca Exp $ +$NetBSD: distinfo,v 1.66 2009/09/26 05:40:05 taca Exp $ -SHA1 (php-5.2.10/php-5.2.10.tar.bz2) = 9a287e2791d28928fb1ee1a1167290c5005feccd -RMD160 (php-5.2.10/php-5.2.10.tar.bz2) = 9a9ec823eda9d6b3c085967e7a71f776071fc78f -Size (php-5.2.10/php-5.2.10.tar.bz2) = 8808759 bytes -SHA1 (php-5.2.10/suhosin-patch-5.2.10-0.9.7.patch.gz) = 3768bbded0bb2376414322b26308342452cb927a -RMD160 (php-5.2.10/suhosin-patch-5.2.10-0.9.7.patch.gz) = 18df1686a48d652f581591115b51461e9dacf5a4 -Size (php-5.2.10/suhosin-patch-5.2.10-0.9.7.patch.gz) = 23072 bytes +SHA1 (php-5.2.11/php-5.2.11.tar.bz2) = 819c853ce657ef260d4a73b5a21f961115b97eef +RMD160 (php-5.2.11/php-5.2.11.tar.bz2) = 6aad53dee864ab89f794a9d3c2aa32d435ed5654 +Size (php-5.2.11/php-5.2.11.tar.bz2) = 9030787 bytes SHA1 (patch-aa) = 20bc3831e435182d014b11ae9f1f6c537a21af20 SHA1 (patch-ag) = 4ccb67ba6f5370b1d16b087e3e714de3e5ae604e SHA1 (patch-ah) = c7cbd4b9ea0796ea3b7491c2cffb6ddddc518587 @@ -16,4 +13,3 @@ SHA1 (patch-ap) = 5eb0e0e4244a993da93e36f8fcb5553454207fce SHA1 (patch-aq) = 0c9d48547da2fa80aa8357d23ad8505d1c0330df SHA1 (patch-ar) = 2d74ec926cc00bfbb67d16210af78c33ad9ac38d SHA1 (patch-as) = f7ce5caffe2acdd1f8e9fc8ae6c7ba1d8c6a25c1 -SHA1 (patch-ax) = faee56533644ef84c1e001e37d5d399259047d71 diff --git a/lang/php5/patches/patch-ax b/lang/php5/patches/patch-ax deleted file mode 100644 index 20761b00d60..00000000000 --- a/lang/php5/patches/patch-ax +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-ax,v 1.1 2009/08/11 14:41:23 taca Exp $ - ---- ext/openssl/openssl.c.orig 2009-04-20 19:00:41.000000000 +0900 -+++ ext/openssl/openssl.c -@@ -227,8 +227,13 @@ inline static int php_openssl_safe_mode_ - static char default_ssl_conf_filename[MAXPATHLEN]; - - struct php_x509_request { /* {{{ */ -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ LHASH_OF(CONF_VALUE) * global_config; /* Global SSL config */ -+ LHASH_OF(CONF_VALUE) * req_config; /* SSL config for this request */ -+#else - LHASH * global_config; /* Global SSL config */ - LHASH * req_config; /* SSL config for this request */ -+#endif - const EVP_MD * md_alg; - const EVP_MD * digest; - char * section_name, -@@ -410,7 +415,11 @@ static inline int php_openssl_config_che - const char * section_label, - const char * config_filename, - const char * section, -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ LHASH_OF(CONF_VALUE) * config TSRMLS_DC -+#else - LHASH * config TSRMLS_DC -+#endif - ) /* {{{ */ - { - X509V3_CTX ctx; |