summaryrefslogtreecommitdiff
path: root/lang/php53
diff options
context:
space:
mode:
authorfhajny <fhajny@pkgsrc.org>2012-07-25 13:20:30 +0000
committerfhajny <fhajny@pkgsrc.org>2012-07-25 13:20:30 +0000
commit1c997a7f031b201a969fe6cbc20f47a293aa1a0b (patch)
tree6abda142b27b56ff45058602f7248540616dacf9 /lang/php53
parenta962d0c6cbcfda2698f583dfc007bf0a05d146eb (diff)
downloadpkgsrc-1c997a7f031b201a969fe6cbc20f47a293aa1a0b.tar.gz
Fix file descriptor leak on SunOS. Bump PKGREVISION.
See https://bugs.php.net/bug.php?id=47675
Diffstat (limited to 'lang/php53')
-rw-r--r--lang/php53/Makefile3
-rw-r--r--lang/php53/distinfo3
-rw-r--r--lang/php53/patches/patch-main_main.c14
3 files changed, 18 insertions, 2 deletions
diff --git a/lang/php53/Makefile b/lang/php53/Makefile
index 1c175963e94..aa83e3dc58b 100644
--- a/lang/php53/Makefile
+++ b/lang/php53/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.32 2012/06/16 01:27:24 taca Exp $
+# $NetBSD: Makefile,v 1.33 2012/07/25 13:20:30 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/php53/distinfo b/lang/php53/distinfo
index c38a751a2f0..9272558d21c 100644
--- a/lang/php53/distinfo
+++ b/lang/php53/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.46 2012/07/20 12:28:17 taca Exp $
+$NetBSD: distinfo,v 1.47 2012/07/25 13:20:30 fhajny Exp $
SHA1 (php-5.3.15.tar.bz2) = 05cf819352062ea3fbcccd3f15aa02c8c3f87440
RMD160 (php-5.3.15.tar.bz2) = b82b9f57c4bdc3b451a0c179f131497ebbbfd94f
@@ -18,5 +18,6 @@ SHA1 (patch-ai) = d4766893a2c47a4e4a744248dda265b0a9a66a1f
SHA1 (patch-aj) = 8698b3caa6299843c7483473b0cb18ceffa3dada
SHA1 (patch-al) = fbbee5502e0cd1c47c6e7c15e0d54746414ec32e
SHA1 (patch-ext_standard_basic__functions.c) = 18596d281017760293189d87d19de9c5c772232d
+SHA1 (patch-main_main.c) = 3535bd480d176a488405555d03f3bf7e2ce22ad5
SHA1 (patch-main_streams_cast.c) = c169ccb73dc660e40eff9f9e168374f35eedadad
SHA1 (patch-php__mssql.c) = b46c688ff2d8da33ca2f9beb0eb9182b6edf7e23
diff --git a/lang/php53/patches/patch-main_main.c b/lang/php53/patches/patch-main_main.c
new file mode 100644
index 00000000000..088664ba823
--- /dev/null
+++ b/lang/php53/patches/patch-main_main.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-main_main.c,v 1.3 2012/07/25 13:20:30 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)