diff options
| author | rillig <rillig@pkgsrc.org> | 2008-01-27 12:35:16 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2008-01-27 12:35:16 +0000 |
| commit | 7d4b87ed73f03089995871d31b72a0f6834719cb (patch) | |
| tree | 048806936c795f2eea2c4f9cf03f3d9f44deb41a /net/socat | |
| parent | 7f02e7ad0ef040cc2c5615b2f1050f46a4b0e704 (diff) | |
| download | pkgsrc-7d4b87ed73f03089995871d31b72a0f6834719cb.tar.gz | |
Fixed a segmentation fault when calling "socat -hhh".
Diffstat (limited to 'net/socat')
| -rw-r--r-- | net/socat/distinfo | 4 | ||||
| -rw-r--r-- | net/socat/patches/patch-ab | 15 | ||||
| -rw-r--r-- | net/socat/patches/patch-ac | 16 |
3 files changed, 34 insertions, 1 deletions
diff --git a/net/socat/distinfo b/net/socat/distinfo index 11eecaaa3b2..e6546c561fc 100644 --- a/net/socat/distinfo +++ b/net/socat/distinfo @@ -1,6 +1,8 @@ -$NetBSD: distinfo,v 1.9 2007/04/09 09:47:48 adrianp Exp $ +$NetBSD: distinfo,v 1.10 2008/01/27 12:35:16 rillig Exp $ SHA1 (socat-1.6.0.0.tar.gz) = d7e20e67c2691926e965272520a844644226f0b9 RMD160 (socat-1.6.0.0.tar.gz) = 37b4f46e9e6ae49c2bf3a36ba94d3d63318a9826 Size (socat-1.6.0.0.tar.gz) = 427187 bytes SHA1 (patch-aa) = 60d8dc14e1b15a7da5efb717b5bffd7338f86158 +SHA1 (patch-ab) = 8b8d9f86b7d0d08c5c8870ace5c2fb5a4515c95a +SHA1 (patch-ac) = 981f623c32f3e03120aa86c3520bf8527afb5221 diff --git a/net/socat/patches/patch-ab b/net/socat/patches/patch-ab new file mode 100644 index 00000000000..1e7a714e89b --- /dev/null +++ b/net/socat/patches/patch-ab @@ -0,0 +1,15 @@ +$NetBSD: patch-ab,v 1.1 2008/01/27 12:35:17 rillig Exp $ + +The construction #if FOO #elif FOO #endif is almost always wrong. + +--- xiohelp.c.orig 2007-02-05 22:15:57.000000000 +0100 ++++ xiohelp.c 2008-01-27 13:29:19.000000000 +0100 +@@ -25,7 +25,7 @@ static const char *optiontypenames[] = { + "OFF_T", "OFF64_T", + #if HAVE_STRUCT_IP_MREQN + "STRUCT-IP_MREQN", +-#elif HAVE_STRUCT_IP_MREQN ++#elif HAVE_STRUCT_IP_MREQ + "STRUCT-IP_MREQ", + #endif + "IP4NAME", diff --git a/net/socat/patches/patch-ac b/net/socat/patches/patch-ac new file mode 100644 index 00000000000..27ec906fb95 --- /dev/null +++ b/net/socat/patches/patch-ac @@ -0,0 +1,16 @@ +$NetBSD: patch-ac,v 1.1 2008/01/27 12:35:17 rillig Exp $ + +As the author said: Keep the enums and their names in sync. + +--- xioopts.h.orig 2007-03-06 22:19:46.000000000 +0100 ++++ xioopts.h 2008-01-27 13:32:15.000000000 +0100 +@@ -49,7 +49,9 @@ enum e_types { + TYPE_LONGLONG, /* long long */ + TYPE_OFF32, /* off_t */ + TYPE_OFF64, /* off64_t */ ++#if HAVE_STRUCT_IP_MREQ || HAVE_STRUCT_IP_MREQN + TYPE_IP_MREQN, /* for struct ip_mreq or struct ip_mreqn */ ++#endif + TYPE_IP4NAME, /* IPv4 hostname or address */ + + TYPE_2BYTE = TYPE_USHORT |