diff options
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/php5/Makefile | 7 | ||||
| -rw-r--r-- | lang/php5/distinfo | 6 | ||||
| -rw-r--r-- | lang/php5/files/patch-main_streams_xp_socket.c | 11 | ||||
| -rw-r--r-- | lang/php53/Makefile | 7 | ||||
| -rw-r--r-- | lang/php53/distinfo | 6 | ||||
| -rw-r--r-- | lang/php53/files/patch-main_streams_xp_socket.c | 11 |
6 files changed, 14 insertions, 34 deletions
diff --git a/lang/php5/Makefile b/lang/php5/Makefile index a028f827010f..69b29fd9bf5e 100644 --- a/lang/php5/Makefile +++ b/lang/php5/Makefile @@ -6,8 +6,8 @@ # PORTNAME= php5 -PORTVERSION= 5.2.11 -PORTREVISION?= 1 +PORTVERSION= 5.2.12 +PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= ${MASTER_SITE_PHP} MASTER_SITE_SUBDIR= distributions @@ -56,7 +56,8 @@ MAN1= php-config.1 phpize.1 PATCH_DIST_STRIP= -p1 .if !defined(WITHOUT_SUHOSIN) -PATCHFILES+= suhosin-patch-${PORTVERSION}-0.9.7.patch.gz:suhosin +#PATCHFILES+= suhosin-patch-${PORTVERSION}-0.9.7.patch.gz:suhosin +PATCHFILES+= suhosin-patch-5.2.11-0.9.7.patch.gz:suhosin PATCH_SITES+= http://download.suhosin.org/:suhosin PLIST_SUB+= SUHOSIN="" .else diff --git a/lang/php5/distinfo b/lang/php5/distinfo index a95c17a66fc1..0f0bbaba1d64 100644 --- a/lang/php5/distinfo +++ b/lang/php5/distinfo @@ -1,6 +1,6 @@ -MD5 (php-5.2.11.tar.bz2) = 286bf34630f5643c25ebcedfec5e0a09 -SHA256 (php-5.2.11.tar.bz2) = 9bcd14ceda2b4bd7abcc7eb59bd74bae490d9335e4207580de783b48aa7e8f23 -SIZE (php-5.2.11.tar.bz2) = 9030787 +MD5 (php-5.2.12.tar.bz2) = 5b7077e366c7eeab34da31dd860a1923 +SHA256 (php-5.2.12.tar.bz2) = e65756a8412726a491ca48da1e0693eaeb3f38f19fb6cbc8f53005cab1f2491a +SIZE (php-5.2.12.tar.bz2) = 9075161 MD5 (suhosin-patch-5.2.11-0.9.7.patch.gz) = 8f9de4d97fae6eba163cf3699509a260 SHA256 (suhosin-patch-5.2.11-0.9.7.patch.gz) = 392f10c9b7d9c47f30e989fb7775cc46d36153b933bf7ac9ccd8826b2954584b SIZE (suhosin-patch-5.2.11-0.9.7.patch.gz) = 23050 diff --git a/lang/php5/files/patch-main_streams_xp_socket.c b/lang/php5/files/patch-main_streams_xp_socket.c deleted file mode 100644 index 7b4c5e15d448..000000000000 --- a/lang/php5/files/patch-main_streams_xp_socket.c +++ /dev/null @@ -1,11 +0,0 @@ ---- main/streams/xp_socket.c 2009/09/04 07:59:48 288034 -+++ main/streams/xp_socket.c 2009/09/23 10:25:54 288604 -@@ -289,7 +289,7 @@ - if (sock->socket == -1) { - alive = 0; - } else if (php_pollfd_for(sock->socket, PHP_POLLREADABLE|POLLPRI, &tv) > 0) { -- if (recv(sock->socket, &buf, sizeof(buf), MSG_PEEK) != SOCK_CONN_ERR && php_socket_errno() != EWOULDBLOCK) { -+ if (0 >= recv(sock->socket, &buf, sizeof(buf), MSG_PEEK) && php_socket_errno() != EWOULDBLOCK) { - alive = 0; - } - } diff --git a/lang/php53/Makefile b/lang/php53/Makefile index a028f827010f..69b29fd9bf5e 100644 --- a/lang/php53/Makefile +++ b/lang/php53/Makefile @@ -6,8 +6,8 @@ # PORTNAME= php5 -PORTVERSION= 5.2.11 -PORTREVISION?= 1 +PORTVERSION= 5.2.12 +PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= ${MASTER_SITE_PHP} MASTER_SITE_SUBDIR= distributions @@ -56,7 +56,8 @@ MAN1= php-config.1 phpize.1 PATCH_DIST_STRIP= -p1 .if !defined(WITHOUT_SUHOSIN) -PATCHFILES+= suhosin-patch-${PORTVERSION}-0.9.7.patch.gz:suhosin +#PATCHFILES+= suhosin-patch-${PORTVERSION}-0.9.7.patch.gz:suhosin +PATCHFILES+= suhosin-patch-5.2.11-0.9.7.patch.gz:suhosin PATCH_SITES+= http://download.suhosin.org/:suhosin PLIST_SUB+= SUHOSIN="" .else diff --git a/lang/php53/distinfo b/lang/php53/distinfo index a95c17a66fc1..0f0bbaba1d64 100644 --- a/lang/php53/distinfo +++ b/lang/php53/distinfo @@ -1,6 +1,6 @@ -MD5 (php-5.2.11.tar.bz2) = 286bf34630f5643c25ebcedfec5e0a09 -SHA256 (php-5.2.11.tar.bz2) = 9bcd14ceda2b4bd7abcc7eb59bd74bae490d9335e4207580de783b48aa7e8f23 -SIZE (php-5.2.11.tar.bz2) = 9030787 +MD5 (php-5.2.12.tar.bz2) = 5b7077e366c7eeab34da31dd860a1923 +SHA256 (php-5.2.12.tar.bz2) = e65756a8412726a491ca48da1e0693eaeb3f38f19fb6cbc8f53005cab1f2491a +SIZE (php-5.2.12.tar.bz2) = 9075161 MD5 (suhosin-patch-5.2.11-0.9.7.patch.gz) = 8f9de4d97fae6eba163cf3699509a260 SHA256 (suhosin-patch-5.2.11-0.9.7.patch.gz) = 392f10c9b7d9c47f30e989fb7775cc46d36153b933bf7ac9ccd8826b2954584b SIZE (suhosin-patch-5.2.11-0.9.7.patch.gz) = 23050 diff --git a/lang/php53/files/patch-main_streams_xp_socket.c b/lang/php53/files/patch-main_streams_xp_socket.c deleted file mode 100644 index 7b4c5e15d448..000000000000 --- a/lang/php53/files/patch-main_streams_xp_socket.c +++ /dev/null @@ -1,11 +0,0 @@ ---- main/streams/xp_socket.c 2009/09/04 07:59:48 288034 -+++ main/streams/xp_socket.c 2009/09/23 10:25:54 288604 -@@ -289,7 +289,7 @@ - if (sock->socket == -1) { - alive = 0; - } else if (php_pollfd_for(sock->socket, PHP_POLLREADABLE|POLLPRI, &tv) > 0) { -- if (recv(sock->socket, &buf, sizeof(buf), MSG_PEEK) != SOCK_CONN_ERR && php_socket_errno() != EWOULDBLOCK) { -+ if (0 >= recv(sock->socket, &buf, sizeof(buf), MSG_PEEK) && php_socket_errno() != EWOULDBLOCK) { - alive = 0; - } - } |