diff options
| author | tonio <tonio> | 2009-10-18 12:47:53 +0000 |
|---|---|---|
| committer | tonio <tonio> | 2009-10-18 12:47:53 +0000 |
| commit | 129dc8d4f1ef02630afa4eee433230c45641db09 (patch) | |
| tree | c7d93ddf78f49fde184c0fdbd8b413f90d3a0d7e /lang/ocaml | |
| parent | f666856cdffd7fb541426ae366837ead9a15d1b1 (diff) | |
| download | pkgsrc-129dc8d4f1ef02630afa4eee433230c45641db09.tar.gz | |
Fix PR pkg/42190
Use #ifdef SIN6_LEN to know whether we have a 4.3 bsd or 4.4 bsd sockaddr
structure.
Diffstat (limited to 'lang/ocaml')
| -rw-r--r-- | lang/ocaml/distinfo | 4 | ||||
| -rw-r--r-- | lang/ocaml/patches/patch-ba | 22 |
2 files changed, 14 insertions, 12 deletions
diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo index 84c2a7dedea..0d97b9c06ac 100644 --- a/lang/ocaml/distinfo +++ b/lang/ocaml/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.47 2009/09/22 20:19:30 tonio Exp $ +$NetBSD: distinfo,v 1.48 2009/10/18 12:47:53 tonio Exp $ SHA1 (ocaml-3.11.1.tar.bz2) = 570feab47b34b29f866ecadcc16153d5a4a4f6a1 RMD160 (ocaml-3.11.1.tar.bz2) = 991147354a85b975a86ce2dffafce669c9338db5 @@ -18,7 +18,7 @@ SHA1 (patch-aw) = 5838ca13ba0f5d9328b9bb2135604f72e7d8b87b SHA1 (patch-ax) = d46667e6874aa8aa656f6fb15ddcedc493d7bdf1 SHA1 (patch-ay) = 702dd7d24ac94851bbb0f2c3f22e2141345ee8ea SHA1 (patch-az) = 1aa4bfe207eb4348987612576f30490bee2376ff -SHA1 (patch-ba) = cec240f6d6bf7f22e78e5d945221a41ad10bfb4a +SHA1 (patch-ba) = 002ffd1c9c1331d6f6ddb52560cfba4cb21e2a2c SHA1 (patch-bb) = 50bd9aa5b46052d8f35c04f6e4c3cbb365d2f93c SHA1 (patch-bc) = 3b6cab5af3d34b2d25c7ba718e5dd89e2d1f2171 SHA1 (patch-bd) = 226fd916ee68db9165e15e462bbf38d3d6bac8a6 diff --git a/lang/ocaml/patches/patch-ba b/lang/ocaml/patches/patch-ba index 5355e36376e..08e6fdffe65 100644 --- a/lang/ocaml/patches/patch-ba +++ b/lang/ocaml/patches/patch-ba @@ -1,22 +1,24 @@ -$NetBSD: patch-ba,v 1.6 2009/09/07 21:48:14 tonio Exp $ +$NetBSD: patch-ba,v 1.7 2009/10/18 12:47:53 tonio Exp $ --- otherlibs/unix/socketaddr.c.orig 2005-03-24 18:20:53.000000000 +0100 -+++ otherlibs/unix/socketaddr.c 2009-05-31 14:23:50.000000000 +0200 -@@ -80,7 +80,7 @@ ++++ otherlibs/unix/socketaddr.c +@@ -80,6 +80,9 @@ void get_sockaddr(value mladr, adr->s_inet6.sin6_family = AF_INET6; adr->s_inet6.sin6_addr = GET_INET6_ADDR(Field(mladr, 0)); adr->s_inet6.sin6_port = htons(Int_val(Field(mladr, 1))); -- *adr_len = sizeof(struct sockaddr_in6); -+ adr->s_gen.sa_len = *adr_len = sizeof(struct sockaddr_in6); ++#ifdef SIN6_LEN ++ adr->s_gen.sa_len = ++#endif + *adr_len = sizeof(struct sockaddr_in6); break; } - #endif -@@ -88,7 +88,7 @@ +@@ -88,6 +91,9 @@ void get_sockaddr(value mladr, adr->s_inet.sin_family = AF_INET; adr->s_inet.sin_addr = GET_INET_ADDR(Field(mladr, 0)); adr->s_inet.sin_port = htons(Int_val(Field(mladr, 1))); -- *adr_len = sizeof(struct sockaddr_in); -+ adr->s_gen.sa_len = *adr_len = sizeof(struct sockaddr_in); ++#ifdef SIN6_LEN ++ adr->s_gen.sa_len = ++#endif + *adr_len = sizeof(struct sockaddr_in); break; } - } |