Thu Mar 5 11:16:28 2015 UTC ()
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.


(he)
diff -r1.78 -r1.79 pkgsrc/lang/php53/distinfo
diff -r0 -r1.1 pkgsrc/lang/php53/patches/patch-sapi_fpm_fpm_fpm__sockets.c
diff -r1.53 -r1.54 pkgsrc/lang/php54/distinfo
diff -r0 -r1.1 pkgsrc/lang/php54/patches/patch-sapi_fpm_fpm_fpm__sockets.c
diff -r1.35 -r1.36 pkgsrc/lang/php55/distinfo
diff -r0 -r1.1 pkgsrc/lang/php55/patches/patch-sapi_fpm_fpm_fpm__sockets.c
diff -r1.1 -r0 pkgsrc/www/php-fpm/patches/patch-sapi_fpm_fpm_fpm__sockets.c
cvs diff -r1.78 -r1.79 pkgsrc/lang/php53/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/php53/Attic/distinfo 2014/11/21 14:13:51 1.78
+++ pkgsrc/lang/php53/Attic/distinfo 2015/03/05 11:16:28 1.79
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.78 2014/11/21 14:13:51 joerg Exp $ 1$NetBSD: distinfo,v 1.79 2015/03/05 11:16:28 he Exp $
2 2
3SHA1 (php-5.3.29.tar.bz2) = 6e9e492c6d5853d063ddb9a4dbef60b8e5d87444 3SHA1 (php-5.3.29.tar.bz2) = 6e9e492c6d5853d063ddb9a4dbef60b8e5d87444
4RMD160 (php-5.3.29.tar.bz2) = e57beb4fdda41bca81b5856161bc97f3c5e3e9da 4RMD160 (php-5.3.29.tar.bz2) = e57beb4fdda41bca81b5856161bc97f3c5e3e9da
5Size (php-5.3.29.tar.bz2) = 11396771 bytes 5Size (php-5.3.29.tar.bz2) = 11396771 bytes
6SHA1 (suhosin-patch-5.3.29-0.9.10.patch.bz2) = b81a9b24f758cef4319759e09d011c7a350232a7 6SHA1 (suhosin-patch-5.3.29-0.9.10.patch.bz2) = b81a9b24f758cef4319759e09d011c7a350232a7
7RMD160 (suhosin-patch-5.3.29-0.9.10.patch.bz2) = 7685501fd40426068c58dfbe844d12f1af299d80 7RMD160 (suhosin-patch-5.3.29-0.9.10.patch.bz2) = 7685501fd40426068c58dfbe844d12f1af299d80
8Size (suhosin-patch-5.3.29-0.9.10.patch.bz2) = 32437 bytes 8Size (suhosin-patch-5.3.29-0.9.10.patch.bz2) = 32437 bytes
9SHA1 (patch-Zend_zend__ini.h) = dc019ec8f30c8525f6ba24f771f38e4fea23dd30 9SHA1 (patch-Zend_zend__ini.h) = dc019ec8f30c8525f6ba24f771f38e4fea23dd30
10SHA1 (patch-aa) = fd930d0d9b1c60e8c7c514cfb6864b61ce4d158d 10SHA1 (patch-aa) = fd930d0d9b1c60e8c7c514cfb6864b61ce4d158d
11SHA1 (patch-ab) = 36789fea71e316d5c4358e597df1928d94f8ea6a 11SHA1 (patch-ab) = 36789fea71e316d5c4358e597df1928d94f8ea6a
12SHA1 (patch-ac) = b194eaed2d81877166b13db58b37c5ddff0210a6 12SHA1 (patch-ac) = b194eaed2d81877166b13db58b37c5ddff0210a6
13SHA1 (patch-aclocal.m4) = 473b76c8575331604d30e24a08c527e15b166778 13SHA1 (patch-aclocal.m4) = 473b76c8575331604d30e24a08c527e15b166778
14SHA1 (patch-ad) = 6b42868f41335ddfa5a8c1e982819166b05e4ad2 14SHA1 (patch-ad) = 6b42868f41335ddfa5a8c1e982819166b05e4ad2
@@ -20,14 +20,15 @@ SHA1 (patch-ai) = 9659f73eef1b4fcca9b844 @@ -20,14 +20,15 @@ SHA1 (patch-ai) = 9659f73eef1b4fcca9b844
20SHA1 (patch-aj) = 181658ae523bd60f67750566711fc078b49191b7 20SHA1 (patch-aj) = 181658ae523bd60f67750566711fc078b49191b7
21SHA1 (patch-al) = fe534d7d50a529e3c7d0ffed76afdb70bb55a521 21SHA1 (patch-al) = fe534d7d50a529e3c7d0ffed76afdb70bb55a521
22SHA1 (patch-build_libtool.m4) = 6835b90ebd34739440c8eb94ed19ebacdf2ba6a5 22SHA1 (patch-build_libtool.m4) = 6835b90ebd34739440c8eb94ed19ebacdf2ba6a5
23SHA1 (patch-ext_exif_exif.c) = c78249a8ffae00bbdece2af9058e4ecf11cb0fa6 23SHA1 (patch-ext_exif_exif.c) = c78249a8ffae00bbdece2af9058e4ecf11cb0fa6
24SHA1 (patch-ext_gd_libgd_gdxpm.c) = 9a175417fad9ac23037a24122f8d1258b9eebbcb 24SHA1 (patch-ext_gd_libgd_gdxpm.c) = 9a175417fad9ac23037a24122f8d1258b9eebbcb
25SHA1 (patch-ext_standard_basic__functions.c) = 017fd25e646af4d7eb2a0bd13b3c8da34eaee8c5 25SHA1 (patch-ext_standard_basic__functions.c) = 017fd25e646af4d7eb2a0bd13b3c8da34eaee8c5
26SHA1 (patch-ext_standard_var__unserializer.c) = eb590c1d5349320e45bbdaf97c875b11eb275cfb 26SHA1 (patch-ext_standard_var__unserializer.c) = eb590c1d5349320e45bbdaf97c875b11eb275cfb
27SHA1 (patch-ext_standard_var__unserializer.re) = 23478a8a26c2c106efc4f0727743e2fffdebaf54 27SHA1 (patch-ext_standard_var__unserializer.re) = 23478a8a26c2c106efc4f0727743e2fffdebaf54
28SHA1 (patch-ext_xmlrpc_libxmlrpc_xmlrpc.c) = 9fd4004b4d94fcbf8d4104027018b46794bee127 28SHA1 (patch-ext_xmlrpc_libxmlrpc_xmlrpc.c) = 9fd4004b4d94fcbf8d4104027018b46794bee127
29SHA1 (patch-main_php.h) = 3f206a423a906932cb7f4662188580a9ce9fd79d 29SHA1 (patch-main_php.h) = 3f206a423a906932cb7f4662188580a9ce9fd79d
30SHA1 (patch-main_streams_cast.c) = d68b69c9418a8780b1610b8755487771f7c46a5a 30SHA1 (patch-main_streams_cast.c) = d68b69c9418a8780b1610b8755487771f7c46a5a
31SHA1 (patch-php__mssql.c) = 524c4e5d7ede0e503049bf1febec58e0c4a29aa4 31SHA1 (patch-php__mssql.c) = 524c4e5d7ede0e503049bf1febec58e0c4a29aa4
32SHA1 (patch-sapi_fpm_fpm_events_port.c) = ad45bcebadf923ee8cb3f2ad4d78d21dd178a8e3 32SHA1 (patch-sapi_fpm_fpm_events_port.c) = ad45bcebadf923ee8cb3f2ad4d78d21dd178a8e3
 33SHA1 (patch-sapi_fpm_fpm_fpm__sockets.c) = 0cd3dce6dc6c46b67052d96b76e8b54b5e2fde0d
33SHA1 (patch-sapi_fpm_php-fpm.conf.in) = 86137a37e74badf99c46d1ba7ca5d85f42bedfce 34SHA1 (patch-sapi_fpm_php-fpm.conf.in) = 86137a37e74badf99c46d1ba7ca5d85f42bedfce
File Added: pkgsrc/lang/php53/patches/Attic/patch-sapi_fpm_fpm_fpm__sockets.c
$NetBSD: patch-sapi_fpm_fpm_fpm__sockets.c,v 1.1 2015/03/05 11:16:28 he Exp $

Use the "right" fields in tcp_info struct for FreeBSD and NetBSD.

--- sapi/fpm/fpm/fpm_sockets.c.orig	2014-08-13 19:22:50.000000000 +0000
+++ sapi/fpm/fpm/fpm_sockets.c
@@ -406,6 +406,19 @@ int fpm_socket_get_listening_queue(int s
 		return -1;
 	}
 
+#if defined(__FreeBSD__) || defined(__NetBSD__)
+	if (info.__tcpi_sacked == 0) {
+		return -1;
+	}
+
+	if (cur_lq) {
+		*cur_lq = info.__tcpi_unacked;
+	}
+
+	if (max_lq) {
+		*max_lq = info.__tcpi_sacked;
+	}
+#else
 	/* kernel >= 2.6.24 return non-zero here, that means operation is supported */
 	if (info.tcpi_sacked == 0) {
 		return -1;
@@ -418,6 +431,7 @@ int fpm_socket_get_listening_queue(int s
 	if (max_lq) {
 		*max_lq = info.tcpi_sacked;
 	}
+#endif
 
 	return 0;
 }
cvs diff -r1.53 -r1.54 pkgsrc/lang/php54/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/php54/Attic/distinfo 2015/02/19 09:37:36 1.53
+++ pkgsrc/lang/php54/Attic/distinfo 2015/03/05 11:16:28 1.54
@@ -1,23 +1,24 @@ @@ -1,23 +1,24 @@
1$NetBSD: distinfo,v 1.53 2015/02/19 09:37:36 taca Exp $ 1$NetBSD: distinfo,v 1.54 2015/03/05 11:16:28 he Exp $
2 2
3SHA1 (php-5.4.38.tar.bz2) = 863fcb872fe20d054d1a3444c27ec7f8be9f4317 3SHA1 (php-5.4.38.tar.bz2) = 863fcb872fe20d054d1a3444c27ec7f8be9f4317
4RMD160 (php-5.4.38.tar.bz2) = 5cd4d7c80badd19aa7e1081e3fd190607e46e1af 4RMD160 (php-5.4.38.tar.bz2) = 5cd4d7c80badd19aa7e1081e3fd190607e46e1af
5Size (php-5.4.38.tar.bz2) = 12273298 bytes 5Size (php-5.4.38.tar.bz2) = 12273298 bytes
6SHA1 (patch-acinclude.m4) = 71635e5381abf99a9fc9f2537b1c2f18e8096f00 6SHA1 (patch-acinclude.m4) = 71635e5381abf99a9fc9f2537b1c2f18e8096f00
7SHA1 (patch-aclocal.m4) = 699086785fcd3d3834cc6016479dbdae6518e522 7SHA1 (patch-aclocal.m4) = 699086785fcd3d3834cc6016479dbdae6518e522
8SHA1 (patch-build_libtool.m4) = d81527abea3bd97e220f00a5d5296d8b1bfe2659 8SHA1 (patch-build_libtool.m4) = d81527abea3bd97e220f00a5d5296d8b1bfe2659
9SHA1 (patch-configure) = df6209127b1e23d17bc7128da3a44f3e44bbfd48 9SHA1 (patch-configure) = df6209127b1e23d17bc7128da3a44f3e44bbfd48
10SHA1 (patch-ext_gd_config.m4) = 2353efe6f25e1081b41d61033c3185cc643c7891 10SHA1 (patch-ext_gd_config.m4) = 2353efe6f25e1081b41d61033c3185cc643c7891
11SHA1 (patch-ext_imap_config.m4) = 01681e8b54ee586ec4db72a5da2d0aec3fa89fcc 11SHA1 (patch-ext_imap_config.m4) = 01681e8b54ee586ec4db72a5da2d0aec3fa89fcc
12SHA1 (patch-ext_mssql_php__mssql.c) = 732e48b05086180585a3087c2e9737db557dbc3b 12SHA1 (patch-ext_mssql_php__mssql.c) = 732e48b05086180585a3087c2e9737db557dbc3b
13SHA1 (patch-ext_pdo__mysql_config.m4) = 3526e737da25129710218e7141d5a05ae0a51390 13SHA1 (patch-ext_pdo__mysql_config.m4) = 3526e737da25129710218e7141d5a05ae0a51390
14SHA1 (patch-ext_pdo_config.m4) = 26a4ad02e5c6b7a54c3c54a6d026a3ccfed62c59 14SHA1 (patch-ext_pdo_config.m4) = 26a4ad02e5c6b7a54c3c54a6d026a3ccfed62c59
15SHA1 (patch-ext_phar_Makefile.frag) = 1af23d9135557bc7ba2f3627b317d4cbef37aaba 15SHA1 (patch-ext_phar_Makefile.frag) = 1af23d9135557bc7ba2f3627b317d4cbef37aaba
16SHA1 (patch-ext_phar_phar_phar.php) = 011f2d68048dbc63f5efcab4e23062daa9e8e08c 16SHA1 (patch-ext_phar_phar_phar.php) = 011f2d68048dbc63f5efcab4e23062daa9e8e08c
17SHA1 (patch-ext_standard_basic__functions.c) = 563fe67eb78b786cd46195026381ef22128e0841 17SHA1 (patch-ext_standard_basic__functions.c) = 563fe67eb78b786cd46195026381ef22128e0841
18SHA1 (patch-php.ini-development) = 056a74646cbeb0b2bcfc18463348343d817b54bc 18SHA1 (patch-php.ini-development) = 056a74646cbeb0b2bcfc18463348343d817b54bc
19SHA1 (patch-php.ini-production) = ac61016e18077a0870b8c8c42e89e3848c26d1f2 19SHA1 (patch-php.ini-production) = ac61016e18077a0870b8c8c42e89e3848c26d1f2
20SHA1 (patch-run-tests.php) = ff80b8ad52d7c0a43fa318ed9bffca9d7b3e688d 20SHA1 (patch-run-tests.php) = ff80b8ad52d7c0a43fa318ed9bffca9d7b3e688d
21SHA1 (patch-sapi_cgi_Makefile.frag) = c271096b8565e89a85b0189c6f503f3fb5cd4b27 21SHA1 (patch-sapi_cgi_Makefile.frag) = c271096b8565e89a85b0189c6f503f3fb5cd4b27
22SHA1 (patch-sapi_fpm_fpm_events_port.c) = ad45bcebadf923ee8cb3f2ad4d78d21dd178a8e3 22SHA1 (patch-sapi_fpm_fpm_events_port.c) = ad45bcebadf923ee8cb3f2ad4d78d21dd178a8e3
 23SHA1 (patch-sapi_fpm_fpm_fpm__sockets.c) = 3a43488f79fa778abb25b0e29579166d436cb4c3
23SHA1 (patch-sapi_fpm_php-fpm.conf.in) = 2369bb6a426a7fb47dc73c88f0daa0f6fa67b593 24SHA1 (patch-sapi_fpm_php-fpm.conf.in) = 2369bb6a426a7fb47dc73c88f0daa0f6fa67b593
File Added: pkgsrc/lang/php54/patches/Attic/patch-sapi_fpm_fpm_fpm__sockets.c
$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;
 	}
cvs diff -r1.35 -r1.36 pkgsrc/lang/php55/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/php55/Attic/distinfo 2015/02/19 13:35:24 1.35
+++ pkgsrc/lang/php55/Attic/distinfo 2015/03/05 11:16:28 1.36
@@ -1,26 +1,27 @@ @@ -1,26 +1,27 @@
1$NetBSD: distinfo,v 1.35 2015/02/19 13:35:24 taca Exp $ 1$NetBSD: distinfo,v 1.36 2015/03/05 11:16:28 he Exp $
2 2
3SHA1 (php-5.5.22.tar.bz2) = 76fcfc157855100e2bb09b22209e78e3088a4b11 3SHA1 (php-5.5.22.tar.bz2) = 76fcfc157855100e2bb09b22209e78e3088a4b11
4RMD160 (php-5.5.22.tar.bz2) = 8849bc779dbb8687d83e2d50dd476d43900713d6 4RMD160 (php-5.5.22.tar.bz2) = 8849bc779dbb8687d83e2d50dd476d43900713d6
5Size (php-5.5.22.tar.bz2) = 13305486 bytes 5Size (php-5.5.22.tar.bz2) = 13305486 bytes
6SHA1 (patch-acinclude.m4) = 9e9c433e4cb96e469f7cf14b2064a0f41fc4568a 6SHA1 (patch-acinclude.m4) = 9e9c433e4cb96e469f7cf14b2064a0f41fc4568a
7SHA1 (patch-aclocal.m4) = 46f192351e541453b1e32299acd1b4cfefc93cb2 7SHA1 (patch-aclocal.m4) = 46f192351e541453b1e32299acd1b4cfefc93cb2
8SHA1 (patch-build_libtool.m4) = 3811edd697fd21eadc4f65cba35c6297141e8ff2 8SHA1 (patch-build_libtool.m4) = 3811edd697fd21eadc4f65cba35c6297141e8ff2
9SHA1 (patch-configure) = e81731b426b31656de72a4e4b3ad341b5ac34f82 9SHA1 (patch-configure) = e81731b426b31656de72a4e4b3ad341b5ac34f82
10SHA1 (patch-ext_gd_config.m4) = 91c9798333d4776856a0a9e20196986856b758b2 10SHA1 (patch-ext_gd_config.m4) = 91c9798333d4776856a0a9e20196986856b758b2
11SHA1 (patch-ext_imap_config.m4) = 01681e8b54ee586ec4db72a5da2d0aec3fa89fcc 11SHA1 (patch-ext_imap_config.m4) = 01681e8b54ee586ec4db72a5da2d0aec3fa89fcc
12SHA1 (patch-ext_mssql_php__mssql.c) = 4ef1837850443e9db2e71620a3ddaed5ab5c435b 12SHA1 (patch-ext_mssql_php__mssql.c) = 4ef1837850443e9db2e71620a3ddaed5ab5c435b
13SHA1 (patch-ext_opcache_config.m4) = 7c0d98feaeec8a0ca61f6f77a1906aa2d601be3f 13SHA1 (patch-ext_opcache_config.m4) = 7c0d98feaeec8a0ca61f6f77a1906aa2d601be3f
14SHA1 (patch-ext_pdo__mysql_config.m4) = 3526e737da25129710218e7141d5a05ae0a51390 14SHA1 (patch-ext_pdo__mysql_config.m4) = 3526e737da25129710218e7141d5a05ae0a51390
15SHA1 (patch-ext_pdo_config.m4) = 26a4ad02e5c6b7a54c3c54a6d026a3ccfed62c59 15SHA1 (patch-ext_pdo_config.m4) = 26a4ad02e5c6b7a54c3c54a6d026a3ccfed62c59
16SHA1 (patch-ext_phar_Makefile.frag) = f8e3f7b7c3e93765d019e5614a884df6185d0436 16SHA1 (patch-ext_phar_Makefile.frag) = f8e3f7b7c3e93765d019e5614a884df6185d0436
17SHA1 (patch-ext_phar_phar_phar.php) = 011f2d68048dbc63f5efcab4e23062daa9e8e08c 17SHA1 (patch-ext_phar_phar_phar.php) = 011f2d68048dbc63f5efcab4e23062daa9e8e08c
18SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = b384b9daa466f2a8a3e6cfd4ea6cff81f9342941 18SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = b384b9daa466f2a8a3e6cfd4ea6cff81f9342941
19SHA1 (patch-ext_standard_basic__functions.c) = f2a44998145306c2cb2d2f3822c0e7cc70c778b4 19SHA1 (patch-ext_standard_basic__functions.c) = f2a44998145306c2cb2d2f3822c0e7cc70c778b4
20SHA1 (patch-makedist) = 3f6b0621d30264824f2cb4c2903d15ba95be3937 20SHA1 (patch-makedist) = 3f6b0621d30264824f2cb4c2903d15ba95be3937
21SHA1 (patch-php.ini-development) = 4fc40f0af5f6e58b614794e066a5738694dc8ef8 21SHA1 (patch-php.ini-development) = 4fc40f0af5f6e58b614794e066a5738694dc8ef8
22SHA1 (patch-php.ini-production) = 47c1b14ee78fbcaa084a58d2c0c3e843104072be 22SHA1 (patch-php.ini-production) = 47c1b14ee78fbcaa084a58d2c0c3e843104072be
23SHA1 (patch-run-tests.php) = ff80b8ad52d7c0a43fa318ed9bffca9d7b3e688d 23SHA1 (patch-run-tests.php) = ff80b8ad52d7c0a43fa318ed9bffca9d7b3e688d
24SHA1 (patch-sapi_cgi_Makefile.frag) = 3784758c085066d1088ae1420b0f9bcf98f74de9 24SHA1 (patch-sapi_cgi_Makefile.frag) = 3784758c085066d1088ae1420b0f9bcf98f74de9
25SHA1 (patch-sapi_fpm_fpm_events_port.c) = ad45bcebadf923ee8cb3f2ad4d78d21dd178a8e3 25SHA1 (patch-sapi_fpm_fpm_events_port.c) = ad45bcebadf923ee8cb3f2ad4d78d21dd178a8e3
 26SHA1 (patch-sapi_fpm_fpm_fpm__sockets.c) = 3a43488f79fa778abb25b0e29579166d436cb4c3
26SHA1 (patch-sapi_fpm_php-fpm.conf.in) = 2369bb6a426a7fb47dc73c88f0daa0f6fa67b593 27SHA1 (patch-sapi_fpm_php-fpm.conf.in) = 2369bb6a426a7fb47dc73c88f0daa0f6fa67b593
File Added: pkgsrc/lang/php55/patches/Attic/patch-sapi_fpm_fpm_fpm__sockets.c
$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;
 	}
File Deleted: pkgsrc/www/php-fpm/patches/Attic/patch-sapi_fpm_fpm_fpm__sockets.c