diff options
author | dholland <dholland> | 2011-12-13 07:11:13 +0000 |
---|---|---|
committer | dholland <dholland> | 2011-12-13 07:11:13 +0000 |
commit | 5944944e3195a4323e78128351c7e65c7e949a81 (patch) | |
tree | bf24ec6932018c57b0b352b04e3f7159d3127ab8 /shells | |
parent | 86d555eea5b35831abbc629bc5136b1f8103cda5 (diff) | |
download | pkgsrc-5944944e3195a4323e78128351c7e65c7e949a81.tar.gz |
fix some low-hanging fruit
Diffstat (limited to 'shells')
-rw-r--r-- | shells/scsh/distinfo | 5 | ||||
-rw-r--r-- | shells/scsh/patches/patch-c_unix_dynamo_c | 14 | ||||
-rw-r--r-- | shells/scsh/patches/patch-c_unix_socket_c | 23 | ||||
-rw-r--r-- | shells/scsh/patches/patch-scsh_network1_c | 33 |
4 files changed, 74 insertions, 1 deletions
diff --git a/shells/scsh/distinfo b/shells/scsh/distinfo index 056d55a3d81..2707a489502 100644 --- a/shells/scsh/distinfo +++ b/shells/scsh/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.14 2011/03/19 03:58:20 obache Exp $ +$NetBSD: distinfo,v 1.15 2011/12/13 07:11:13 dholland Exp $ SHA1 (scsh-0.6.7.tar.gz) = a1eaf0d0593e14914824898a0c3ec166429affd7 RMD160 (scsh-0.6.7.tar.gz) = f017c5a157cd1a3ad5daeaecba43ce84784c7e51 @@ -10,3 +10,6 @@ SHA1 (patch-ad) = 46825c2742f8c3f41ce6300411841fde6fa63de0 SHA1 (patch-ae) = 3838934816cf23f1975d15f3dfd3ce8fae10ee40 SHA1 (patch-af) = faddb025c3bada2d321b693217104dc986a8a90f SHA1 (patch-ag) = efd04134ee52795c1538a31ad6052da8fd8946ae +SHA1 (patch-c_unix_dynamo_c) = eef2ef3319c74b2a1e858ea3a4bcc41ad2af882a +SHA1 (patch-c_unix_socket_c) = d493a22df14f6f171076eb4756aa344eb4c258f9 +SHA1 (patch-scsh_network1_c) = 26283f75b7303ec42ed50c15019c0c2ad08e8ece diff --git a/shells/scsh/patches/patch-c_unix_dynamo_c b/shells/scsh/patches/patch-c_unix_dynamo_c new file mode 100644 index 00000000000..11f579edd89 --- /dev/null +++ b/shells/scsh/patches/patch-c_unix_dynamo_c @@ -0,0 +1,14 @@ +$NetBSD: patch-c_unix_dynamo_c,v 1.1 2011/12/13 07:11:13 dholland Exp $ + +Use standard headers. + +--- c/unix/dynamo.c~ 2001-01-22 12:48:00.000000000 +0000 ++++ c/unix/dynamo.c +@@ -4,6 +4,7 @@ + */ + + #include <stdlib.h> ++#include <string.h> + #include <unistd.h> + #include "sysdep.h" + #include "scheme48.h" diff --git a/shells/scsh/patches/patch-c_unix_socket_c b/shells/scsh/patches/patch-c_unix_socket_c new file mode 100644 index 00000000000..590f744f0cd --- /dev/null +++ b/shells/scsh/patches/patch-c_unix_socket_c @@ -0,0 +1,23 @@ +$NetBSD: patch-c_unix_socket_c,v 1.1 2011/12/13 07:11:13 dholland Exp $ + +Use standard headers. + +--- c/unix/socket.c~ 2003-06-25 08:19:34.000000000 +0000 ++++ c/unix/socket.c +@@ -12,6 +12,7 @@ + #include <fcntl.h> + #include <netdb.h> + #include <unistd.h> ++#include <stdlib.h> + #include <string.h> + #include <netinet/in.h> + +@@ -390,7 +391,7 @@ s48_get_host_name(void) + char *tmp; + + mbuff_len += 256; /* Initial guess */ +- tmp = (char *) realloc(mbuff, mbuff_len); ++ tmp = realloc(mbuff, mbuff_len); + + if (tmp == NULL) { + free(mbuff); diff --git a/shells/scsh/patches/patch-scsh_network1_c b/shells/scsh/patches/patch-scsh_network1_c new file mode 100644 index 00000000000..7c9e5eb617e --- /dev/null +++ b/shells/scsh/patches/patch-scsh_network1_c @@ -0,0 +1,33 @@ +$NetBSD: patch-scsh_network1_c,v 1.1 2011/12/13 07:11:13 dholland Exp $ + +Use socklen_t appropriately. + +--- scsh/network1.c~ 2006-03-02 21:46:15.000000000 +0000 ++++ scsh/network1.c +@@ -409,7 +409,7 @@ s48_value scheme_getsockopt (s48_value s + s48_value optname) + { + int optval; +- size_t optlen=sizeof(optval); ++ socklen_t optlen=sizeof(optval); + + if (getsockopt(s48_extract_fixnum (s), + s48_extract_fixnum (level), +@@ -426,7 +426,7 @@ s48_value scheme_getsockopt_linger (s48_ + s48_value optname) + { + struct linger optval; +- size_t optlen=sizeof(optval); ++ socklen_t optlen=sizeof(optval); + + if (getsockopt(s48_extract_fixnum (s), + s48_extract_fixnum (level), +@@ -444,7 +444,7 @@ s48_value scheme_getsockopt_timeout (s48 + s48_value optname) + { + struct timeval optval; +- size_t optlen=sizeof(optval); ++ socklen_t optlen=sizeof(optval); + + if (getsockopt(s48_extract_fixnum (s), + s48_extract_fixnum (level), |