diff options
| author | fhajny <fhajny@pkgsrc.org> | 2012-07-31 12:23:12 +0000 |
|---|---|---|
| committer | fhajny <fhajny@pkgsrc.org> | 2012-07-31 12:23:12 +0000 |
| commit | 74aa09156d5f7b5180ad594b52f7684c9335c08a (patch) | |
| tree | f8113c1daaef932d3a7cc9da31a2d02d50c24bb3 /lang/php53 | |
| parent | 1d0b5b102d2581bd74433205edcc073733cd6b39 (diff) | |
| download | pkgsrc-74aa09156d5f7b5180ad594b52f7684c9335c08a.tar.gz | |
Fix a silly bug in latest PHP. Arbitrary symbol cannot be 'sun', which
is taken on all SunOS platforms.
Diffstat (limited to 'lang/php53')
| -rw-r--r-- | lang/php53/distinfo | 4 | ||||
| -rw-r--r-- | lang/php53/patches/patch-sapi_fpm_fpm__fpm_sockets.c | 28 | ||||
| -rw-r--r-- | lang/php53/patches/patch-sapi_fpm_fpm__fpm_sockets.h | 14 |
3 files changed, 45 insertions, 1 deletions
diff --git a/lang/php53/distinfo b/lang/php53/distinfo index 9272558d21c..5c1b40f23df 100644 --- a/lang/php53/distinfo +++ b/lang/php53/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.47 2012/07/25 13:20:30 fhajny Exp $ +$NetBSD: distinfo,v 1.48 2012/07/31 12:23:12 fhajny Exp $ SHA1 (php-5.3.15.tar.bz2) = 05cf819352062ea3fbcccd3f15aa02c8c3f87440 RMD160 (php-5.3.15.tar.bz2) = b82b9f57c4bdc3b451a0c179f131497ebbbfd94f @@ -21,3 +21,5 @@ SHA1 (patch-ext_standard_basic__functions.c) = 18596d281017760293189d87d19de9c5c SHA1 (patch-main_main.c) = 3535bd480d176a488405555d03f3bf7e2ce22ad5 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 diff --git a/lang/php53/patches/patch-sapi_fpm_fpm__fpm_sockets.c b/lang/php53/patches/patch-sapi_fpm_fpm__fpm_sockets.c new file mode 100644 index 00000000000..3d8b8927669 --- /dev/null +++ b/lang/php53/patches/patch-sapi_fpm_fpm__fpm_sockets.c @@ -0,0 +1,28 @@ +$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 new file mode 100644 index 00000000000..98fa59a3285 --- /dev/null +++ b/lang/php53/patches/patch-sapi_fpm_fpm__fpm_sockets.h @@ -0,0 +1,14 @@ +$NetBSD: patch-sapi_fpm_fpm__fpm_sockets.h,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.h.orig 2012-07-12 22:17:37.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); + + + static inline int fd_set_blocked(int fd, int blocked) /* {{{ */ |