summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
Diffstat (limited to 'lang')
-rw-r--r--lang/php53/Makefile3
-rw-r--r--lang/php53/Makefile.common4
-rw-r--r--lang/php53/Makefile.php4
-rw-r--r--lang/php53/distinfo15
-rw-r--r--lang/php53/patches/patch-ag4
-rw-r--r--lang/php53/patches/patch-main_main.c3
-rw-r--r--lang/php53/patches/patch-sapi_fpm_fpm__fpm_sockets.c28
-rw-r--r--lang/php53/patches/patch-sapi_fpm_fpm__fpm_sockets.h7
8 files changed, 21 insertions, 47 deletions
diff --git a/lang/php53/Makefile b/lang/php53/Makefile
index aa83e3dc58b..8402b7d9136 100644
--- a/lang/php53/Makefile
+++ b/lang/php53/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.33 2012/07/25 13:20:30 fhajny Exp $
+# $NetBSD: Makefile,v 1.34 2012/08/17 15:32:31 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/php53/Makefile.common b/lang/php53/Makefile.common
index bf44d19752d..18f43adad02 100644
--- a/lang/php53/Makefile.common
+++ b/lang/php53/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2012/07/20 12:28:17 taca Exp $
+# $NetBSD: Makefile.common,v 1.16 2012/08/17 15:32:31 taca Exp $
# used by lang/php53/Makefile.php
# used by lang/php/ext.mk
# used by meta-pkgs/php53-extensions/Makefile
@@ -38,7 +38,7 @@ EXTRACT_SUFX?= .tar.bz2
MAINTAINER?= pkgsrc-users@NetBSD.org
HOMEPAGE?= http://www.php.net/
-PHP_BASE_VERS= 5.3.15
+PHP_BASE_VERS= 5.3.16
PHP_EXTENSION_DIR= lib/php/20090630
PLIST_SUBST+= PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR}
diff --git a/lang/php53/Makefile.php b/lang/php53/Makefile.php
index 0d9f89dd269..1a387e35eaa 100644
--- a/lang/php53/Makefile.php
+++ b/lang/php53/Makefile.php
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.21 2012/07/27 00:16:47 obache Exp $
+# $NetBSD: Makefile.php,v 1.22 2012/08/17 15:32:31 taca Exp $
# used by lang/php53/Makefile
# used by www/ap-php/Makefile
@@ -58,7 +58,7 @@ PKG_SUGGESTED_OPTIONS+= inet6 ssl
.if !empty(PKG_OPTIONS:Msuhosin)
SUHOSIN_PHPVER= 5.3.9
-. if ${SUHOSIN_PHPVER} != ${PHP_BASE_VERS} && ${PHP_BASE_VERS} != 5.3.15
+. if ${SUHOSIN_PHPVER} != ${PHP_BASE_VERS} && ${PHP_BASE_VERS} != 5.3.16
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 5c1b40f23df..d0fab17016b 100644
--- a/lang/php53/distinfo
+++ b/lang/php53/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.48 2012/07/31 12:23:12 fhajny Exp $
+$NetBSD: distinfo,v 1.49 2012/08/17 15:32:31 taca Exp $
-SHA1 (php-5.3.15.tar.bz2) = 05cf819352062ea3fbcccd3f15aa02c8c3f87440
-RMD160 (php-5.3.15.tar.bz2) = b82b9f57c4bdc3b451a0c179f131497ebbbfd94f
-Size (php-5.3.15.tar.bz2) = 11307865 bytes
+SHA1 (php-5.3.16.tar.bz2) = a8356b18f6413a87451bd70110b814c847b69f00
+RMD160 (php-5.3.16.tar.bz2) = 41ea044b961c4fdf04a1bd31a5b08cac8b271561
+Size (php-5.3.16.tar.bz2) = 11314384 bytes
SHA1 (suhosin-patch-5.3.9-0.9.10.patch.gz) = 7b9ef5c3e0831154df0d6290aba0989ca90138ed
RMD160 (suhosin-patch-5.3.9-0.9.10.patch.gz) = ce43921fd9b183b154713ecda98294f6c68d5f22
Size (suhosin-patch-5.3.9-0.9.10.patch.gz) = 40967 bytes
@@ -12,14 +12,13 @@ SHA1 (patch-ac) = 1720f154232241c19d0c6e08a824e33252f1b690
SHA1 (patch-ad) = 1608c58860a43b4e31df8646b5ded253ec9aa881
SHA1 (patch-ae) = e590db60a60f4e5ef2da4e5edb786335a67a3d56
SHA1 (patch-af) = 1618b23fd6d090ce5aa929208416028724278bfc
-SHA1 (patch-ag) = c49cdff097d1e54ebe93b5afb550e89b0cc2468e
+SHA1 (patch-ag) = 37225805be13ec76d8ac17833da8115e99b78745
SHA1 (patch-ah) = b20c29c64b3099f77855a5ec28960dc1c4f65c83
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_main.c) = 3e8f62eed3daadf2c93adeade234e378e792be04
SHA1 (patch-main_streams_cast.c) = c169ccb73dc660e40eff9f9e168374f35eedadad
SHA1 (patch-php__mssql.c) = b46c688ff2d8da33ca2f9beb0eb9182b6edf7e23
-SHA1 (patch-sapi_fpm_fpm__fpm_sockets.c) = 0961ebe67c2139ccd5090f91544c089877f479dd
-SHA1 (patch-sapi_fpm_fpm__fpm_sockets.h) = f486c3e8628530a62bfb11a4313a26ee8f598069
+SHA1 (patch-sapi_fpm_fpm__fpm_sockets.h) = 59b3afaef3ab5931ff51df4c2042ee3983f0489a
diff --git a/lang/php53/patches/patch-ag b/lang/php53/patches/patch-ag
index e75fc6b6b35..9e853fae4d6 100644
--- a/lang/php53/patches/patch-ag
+++ b/lang/php53/patches/patch-ag
@@ -1,4 +1,6 @@
-$NetBSD: patch-ag,v 1.1.1.1 2010/03/16 15:31:58 taca Exp $
+$NetBSD: patch-ag,v 1.2 2012/08/17 15:32:31 taca Exp $
+
+Use proper shbang line.
--- ext/phar/phar/phar.php.orig 2008-08-01 13:42:56.000000000 +0000
+++ ext/phar/phar/phar.php
diff --git a/lang/php53/patches/patch-main_main.c b/lang/php53/patches/patch-main_main.c
index 088664ba823..9f80943d0b2 100644
--- a/lang/php53/patches/patch-main_main.c
+++ b/lang/php53/patches/patch-main_main.c
@@ -1,6 +1,7 @@
-$NetBSD: patch-main_main.c,v 1.3 2012/07/25 13:20:30 fhajny Exp $
+$NetBSD: patch-main_main.c,v 1.4 2012/08/17 15:32:31 taca 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_
diff --git a/lang/php53/patches/patch-sapi_fpm_fpm__fpm_sockets.c b/lang/php53/patches/patch-sapi_fpm_fpm__fpm_sockets.c
deleted file mode 100644
index 3d8b8927669..00000000000
--- a/lang/php53/patches/patch-sapi_fpm_fpm__fpm_sockets.c
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-sapi_fpm_fpm__fpm_sockets.c,v 1.1 2012/07/31 12:23:12 fhajny Exp $
-
-Silly bug. 'sun' is of course taken on SunOS.
---- sapi/fpm/fpm/fpm_sockets.c.orig 2012-07-12 22:17:37.000000000 +0000
-+++ sapi/fpm/fpm/fpm_sockets.c
-@@ -455,11 +455,11 @@ int fpm_socket_get_listening_queue(int s
-
- #endif
-
--int fpm_socket_unix_test_connect(struct sockaddr_un *sun, size_t socklen) /* {{{ */
-+int fpm_socket_unix_test_connect(struct sockaddr_un *fpm_sun, size_t socklen) /* {{{ */
- {
- int fd;
-
-- if (!sun || sun->sun_family != AF_UNIX) {
-+ if (!fpm_sun || fpm_sun->sun_family != AF_UNIX) {
- return -1;
- }
-
-@@ -467,7 +467,7 @@ int fpm_socket_unix_test_connect(struct
- return -1;
- }
-
-- if (connect(fd, (struct sockaddr *)sun, socklen) == -1) {
-+ if (connect(fd, (struct sockaddr *)fpm_sun, socklen) == -1) {
- return -1;
- }
-
diff --git a/lang/php53/patches/patch-sapi_fpm_fpm__fpm_sockets.h b/lang/php53/patches/patch-sapi_fpm_fpm__fpm_sockets.h
index 98fa59a3285..c81d8826532 100644
--- a/lang/php53/patches/patch-sapi_fpm_fpm__fpm_sockets.h
+++ b/lang/php53/patches/patch-sapi_fpm_fpm__fpm_sockets.h
@@ -1,14 +1,15 @@
-$NetBSD: patch-sapi_fpm_fpm__fpm_sockets.h,v 1.1 2012/07/31 12:23:12 fhajny Exp $
+$NetBSD: patch-sapi_fpm_fpm__fpm_sockets.h,v 1.2 2012/08/17 15:32:31 taca Exp $
Silly bug. 'sun' is of course taken on SunOS.
---- sapi/fpm/fpm/fpm_sockets.h.orig 2012-07-12 22:17:37.000000000 +0000
+
+--- sapi/fpm/fpm/fpm_sockets.h.orig 2012-08-15 17:05:42.000000000 +0000
+++ sapi/fpm/fpm/fpm_sockets.h
@@ -25,7 +25,7 @@
enum fpm_address_domain fpm_sockets_domain_from_address(char *addr);
int fpm_sockets_init_main();
int fpm_socket_get_listening_queue(int sock, unsigned *cur_lq, unsigned *max_lq);
-int fpm_socket_unix_test_connect(struct sockaddr_un *sun, size_t socklen);
-+int fpm_socket_unix_test_connect(struct sockaddr_un *fpm_sun, size_t socklen);
++int fpm_socket_unix_test_connect(struct sockaddr_un *sock, size_t socklen);
static inline int fd_set_blocked(int fd, int blocked) /* {{{ */
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-22 09:21:41 +0000