summaryrefslogtreecommitdiff
path: root/lang/php55
diff options
context:
space:
mode:
authorhe <he@pkgsrc.org>2015-03-05 11:16:28 +0000
committerhe <he@pkgsrc.org>2015-03-05 11:16:28 +0000
commit88fbbb5162c2a7a2e93e487f6300946797342302 (patch)
tree816516290f6d737175fe977c8a2a13fa713435c2 /lang/php55
parentfec25b5c2d0e2cf377ea55cde7f4a0970562c44f (diff)
downloadpkgsrc-88fbbb5162c2a7a2e93e487f6300946797342302.tar.gz
Well, the fpm_sockets.c patch doesn't belong in php-fpm, but
rather in the PHP package proper, and there's three of them. Copy and adapt as necessary. No revision bump here: only build fix for NetBSD with TCP_INFO.
Diffstat (limited to 'lang/php55')
-rw-r--r--lang/php55/distinfo3
-rw-r--r--lang/php55/patches/patch-sapi_fpm_fpm_fpm__sockets.c13
2 files changed, 15 insertions, 1 deletions
diff --git a/lang/php55/distinfo b/lang/php55/distinfo
index b733bdef5de..4d8a0c88416 100644
--- a/lang/php55/distinfo
+++ b/lang/php55/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.35 2015/02/19 13:35:24 taca Exp $
+$NetBSD: distinfo,v 1.36 2015/03/05 11:16:28 he Exp $
SHA1 (php-5.5.22.tar.bz2) = 76fcfc157855100e2bb09b22209e78e3088a4b11
RMD160 (php-5.5.22.tar.bz2) = 8849bc779dbb8687d83e2d50dd476d43900713d6
@@ -23,4 +23,5 @@ SHA1 (patch-php.ini-production) = 47c1b14ee78fbcaa084a58d2c0c3e843104072be
SHA1 (patch-run-tests.php) = ff80b8ad52d7c0a43fa318ed9bffca9d7b3e688d
SHA1 (patch-sapi_cgi_Makefile.frag) = 3784758c085066d1088ae1420b0f9bcf98f74de9
SHA1 (patch-sapi_fpm_fpm_events_port.c) = ad45bcebadf923ee8cb3f2ad4d78d21dd178a8e3
+SHA1 (patch-sapi_fpm_fpm_fpm__sockets.c) = 3a43488f79fa778abb25b0e29579166d436cb4c3
SHA1 (patch-sapi_fpm_php-fpm.conf.in) = 2369bb6a426a7fb47dc73c88f0daa0f6fa67b593
diff --git a/lang/php55/patches/patch-sapi_fpm_fpm_fpm__sockets.c b/lang/php55/patches/patch-sapi_fpm_fpm_fpm__sockets.c
new file mode 100644
index 00000000000..b34f743c61f
--- /dev/null
+++ b/lang/php55/patches/patch-sapi_fpm_fpm_fpm__sockets.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-sapi_fpm_fpm_fpm__sockets.c,v 1.1 2015/03/05 11:16:28 he Exp $
+
+--- ./sapi/fpm/fpm/fpm_sockets.c.orig 2014-09-17 07:03:27.000000000 +0000
++++ ./sapi/fpm/fpm/fpm_sockets.c
+@@ -405,7 +405,7 @@ int fpm_socket_get_listening_queue(int s
+ zlog(ZLOG_SYSERROR, "failed to retrieve TCP_INFO for socket");
+ return -1;
+ }
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__)
+ if (info.__tcpi_sacked == 0) {
+ return -1;
+ }