diff options
| author | taca <taca> | 2013-10-15 15:46:37 +0000 |
|---|---|---|
| committer | taca <taca> | 2013-10-15 15:46:37 +0000 |
| commit | 7ed00352f8989116b7acc5875243c6b251444ebd (patch) | |
| tree | 3e132453a964cde10ca46bff79955e3695087993 /lang/php55 | |
| parent | c5e973f3d82363fdb24ee271ac412e7eea3536f2 (diff) | |
| download | pkgsrc-7ed00352f8989116b7acc5875243c6b251444ebd.tar.gz | |
Fix php-socket with php55.
- Use USE_PHP_EXT_PATCHES in net/php-sockets.
- Make AI_V4MAPPED noop if platform dosen't have it.
It is poor assumption that AI_V4MAPPED is always defined and V4 mapped
address is always available.
Diffstat (limited to 'lang/php55')
| -rw-r--r-- | lang/php55/distinfo | 4 | ||||
| -rw-r--r-- | lang/php55/patches/patch-ext_sockets_sockaddr__conv.c | 17 | ||||
| -rw-r--r-- | lang/php55/patches/patch-sockaddr__conv.c | 14 |
3 files changed, 19 insertions, 16 deletions
diff --git a/lang/php55/distinfo b/lang/php55/distinfo index c2b5afd2d19..c39a9a903a1 100644 --- a/lang/php55/distinfo +++ b/lang/php55/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2013/10/15 14:43:51 joerg Exp $ +$NetBSD: distinfo,v 1.8 2013/10/15 15:46:37 taca Exp $ SHA1 (php-5.5.4.tar.bz2) = fdc6724a7a3f23f7c87a3470e5b29d260685e2b6 RMD160 (php-5.5.4.tar.bz2) = fcd69b4d4716392edf065b5cd5dabb68b4bacd45 @@ -12,6 +12,7 @@ SHA1 (patch-ext_pdo__mysql_config.m4) = 3526e737da25129710218e7141d5a05ae0a51390 SHA1 (patch-ext_pdo_config.m4) = 26a4ad02e5c6b7a54c3c54a6d026a3ccfed62c59 SHA1 (patch-ext_phar_Makefile.frag) = 1af23d9135557bc7ba2f3627b317d4cbef37aaba SHA1 (patch-ext_phar_phar_phar.php) = 011f2d68048dbc63f5efcab4e23062daa9e8e08c +SHA1 (patch-ext_sockets_sockaddr__conv.c) = ca4a1e97208071b3e28598f23d4b88ffb9b56df4 SHA1 (patch-ext_standard_basic__functions.c) = f2a44998145306c2cb2d2f3822c0e7cc70c778b4 SHA1 (patch-makedist) = a2a77c3d15a28fee08fdd88f0c9fee6cbec107d8 SHA1 (patch-php.ini-development) = b4690be8f589933ee5654bdd7bc80712481711a5 @@ -19,4 +20,3 @@ SHA1 (patch-php.ini-production) = 535ee9bff509ee8cab31cc73ec49b25b3ffdbff5 SHA1 (patch-run-tests.php) = ff80b8ad52d7c0a43fa318ed9bffca9d7b3e688d SHA1 (patch-sapi_cgi_Makefile.frag) = 3784758c085066d1088ae1420b0f9bcf98f74de9 SHA1 (patch-sapi_fpm_php-fpm.conf.in) = 2369bb6a426a7fb47dc73c88f0daa0f6fa67b593 -SHA1 (patch-sockaddr__conv.c) = 6f368e323648922eaeebee1601741051c3462147 diff --git a/lang/php55/patches/patch-ext_sockets_sockaddr__conv.c b/lang/php55/patches/patch-ext_sockets_sockaddr__conv.c new file mode 100644 index 00000000000..c4c62c93c9d --- /dev/null +++ b/lang/php55/patches/patch-ext_sockets_sockaddr__conv.c @@ -0,0 +1,17 @@ +$NetBSD: patch-ext_sockets_sockaddr__conv.c,v 1.1 2013/10/15 15:46:37 taca Exp $ + +Not all operating system have AI_V4MAPPED. + +--- ext/sockets/sockaddr_conv.c.orig 2013-09-18 13:08:04.000000000 +0000 ++++ ext/sockets/sockaddr_conv.c +@@ -24,6 +24,10 @@ int php_set_inet6_addr(struct sockaddr_i + } else { + #if HAVE_GETADDRINFO + ++#ifndef AI_V4MAPPED ++#define AI_V4MAPPED 0 ++#endif ++ + memset(&hints, 0, sizeof(struct addrinfo)); + hints.ai_family = AF_INET6; + hints.ai_flags = AI_V4MAPPED | AI_ADDRCONFIG; diff --git a/lang/php55/patches/patch-sockaddr__conv.c b/lang/php55/patches/patch-sockaddr__conv.c deleted file mode 100644 index 5b8407f48a6..00000000000 --- a/lang/php55/patches/patch-sockaddr__conv.c +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-sockaddr__conv.c,v 1.1 2013/10/15 14:43:51 joerg Exp $ - ---- sockaddr_conv.c.orig 2013-10-14 13:24:02.000000000 +0000 -+++ sockaddr_conv.c -@@ -26,6 +26,9 @@ int php_set_inet6_addr(struct sockaddr_i - - memset(&hints, 0, sizeof(struct addrinfo)); - hints.ai_family = AF_INET6; -+#ifndef AI_V4MAPPED -+#define AI_V4MAPPED 1 -+#endif - hints.ai_flags = AI_V4MAPPED | AI_ADDRCONFIG; - getaddrinfo(string, NULL, &hints, &addrinfo); - if (!addrinfo) { |