diff options
| author | fhajny <fhajny> | 2012-07-25 13:16:01 +0000 |
|---|---|---|
| committer | fhajny <fhajny> | 2012-07-25 13:16:01 +0000 |
| commit | 67231755baeea7641c27d5e6f785dea9d82c09b0 (patch) | |
| tree | cd669c6714e23f852519468859ca5b3353a8b9cd | |
| parent | a61b90c63c73782143229471cfa37de9456989a5 (diff) | |
| download | pkgsrc-67231755baeea7641c27d5e6f785dea9d82c09b0.tar.gz | |
Fix file descriptor leak on SunOS.
See https://bugs.php.net/bug.php?id=47675
| -rw-r--r-- | lang/php54/Makefile | 3 | ||||
| -rw-r--r-- | lang/php54/distinfo | 3 | ||||
| -rw-r--r-- | lang/php54/patches/patch-main_main.c | 14 |
3 files changed, 18 insertions, 2 deletions
diff --git a/lang/php54/Makefile b/lang/php54/Makefile index 8de8c8a6078..8e44ae54d45 100644 --- a/lang/php54/Makefile +++ b/lang/php54/Makefile @@ -1,9 +1,10 @@ -# $NetBSD: Makefile,v 1.1 2012/06/16 05:21:55 taca Exp $ +# $NetBSD: Makefile,v 1.2 2012/07/25 13:16:01 fhajny 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/php54/distinfo b/lang/php54/distinfo index c027a0d3c26..610634c9f00 100644 --- a/lang/php54/distinfo +++ b/lang/php54/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2012/07/25 13:01:05 fhajny Exp $ +$NetBSD: distinfo,v 1.4 2012/07/25 13:16:01 fhajny Exp $ SHA1 (php-5.4.5.tar.bz2) = b6c5e6653ba28e2f071bafe30c9691eddb950ba0 RMD160 (php-5.4.5.tar.bz2) = 1f89a9b31d5e14765ad9c4acff43aad825e1f9d8 @@ -13,6 +13,7 @@ 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_main.c) = 3535bd480d176a488405555d03f3bf7e2ce22ad5 SHA1 (patch-main_streams_cast.c) = ebf23f9908340be3d1f947c4112ec940f9324ecb SHA1 (patch-php.ini-development) = 79512bd276adaed6bcf5f7f28e965f8a6b589add SHA1 (patch-php.ini-production) = f5d275abe7668a139999b3607e99f271450f56ae diff --git a/lang/php54/patches/patch-main_main.c b/lang/php54/patches/patch-main_main.c new file mode 100644 index 00000000000..56fb5b6e764 --- /dev/null +++ b/lang/php54/patches/patch-main_main.c @@ -0,0 +1,14 @@ +$NetBSD: patch-main_main.c,v 1.1 2012/07/25 13:16:02 fhajny Exp $ + +Fix fd leak on SunOS (https://bugs.php.net/bug.php?id=47675). +--- main/main.c.orig 2012-06-13 04:54:23.000000000 +0000 ++++ main/main.c +@@ -2388,7 +2388,7 @@ PHPAPI int php_execute_script(zend_file_ + zend_file_handle *prepend_file_p, *append_file_p; + zend_file_handle prepend_file = {0}, append_file = {0}; + #if HAVE_BROKEN_GETCWD +- int old_cwd_fd = -1; ++ volatile int old_cwd_fd = -1; + #else + char *old_cwd; + ALLOCA_FLAG(use_heap) |