diff options
| -rw-r--r-- | net/nocol/distinfo | 9 | ||||
| -rw-r--r-- | net/nocol/patches/patch-al | 9 | ||||
| -rw-r--r-- | net/nocol/patches/patch-as | 27 | ||||
| -rw-r--r-- | net/nocol/patches/patch-tknocol_ndaemon_c | 22 |
4 files changed, 57 insertions, 10 deletions
diff --git a/net/nocol/distinfo b/net/nocol/distinfo index d327b78b583..c6976b4b6ec 100644 --- a/net/nocol/distinfo +++ b/net/nocol/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.17 2012/09/09 19:49:45 dholland Exp $ +$NetBSD: distinfo,v 1.18 2013/03/03 01:07:24 joerg Exp $ SHA1 (nocol-4.3.1.tar.gz) = a8cb88727bc3a3ddd544792407d431b3ef13a325 RMD160 (nocol-4.3.1.tar.gz) = 77a57ae447f0a8f1ce2417d9b828710f21865cc8 @@ -12,16 +12,17 @@ SHA1 (patch-ah) = 14091c7a6c8de7dd451e4292f2d0121ab3643158 SHA1 (patch-ai) = d8317fad7c5e4574fa980859762f5acb1a7c631d SHA1 (patch-aj) = 0eb201f47864132b04702fab4d03e452c07c2e2a SHA1 (patch-ak) = 97364e3ca5956d43b6e18520a288242d4bfc9131 -SHA1 (patch-al) = a6abfabbd944c760fcb4fc1b60a3d9f8606ab5c1 +SHA1 (patch-al) = f4932b5e84fc7647140c2b3e46abd6b12ea7e887 SHA1 (patch-am) = a8345c95b9183e1a70af682729d24ebb8af97eb6 SHA1 (patch-an) = 1a869a8a2e4e0c5a29540bff7d1da76e4d8c74e9 SHA1 (patch-ao) = 83a4f72fbf433ef496fee481af36dac7b9c51c4a SHA1 (patch-ap) = 0c7ca32c9d00eb493df3ff2b1c441e6c1e1aa34e SHA1 (patch-aq) = 04a764918910d6d20e09842ff280be0231a269f5 SHA1 (patch-ar) = 758be995183713f7d390f6642a7d66ab147cefe0 -SHA1 (patch-as) = 86ad437e3a0719d393bf8b83e179a21a6b69c045 +SHA1 (patch-as) = 7a49170bbeb04812ad83c294777d9d364e60823f SHA1 (patch-at) = c49b96d1c2158d0a8f67228922f0e4bff5df2908 SHA1 (patch-au) = a8bbcb0eef41ac514bb1106c5feedb5bc087aac7 +SHA1 (patch-cmu-snmp_snmp_new-parse.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709 SHA1 (patch-etherload_bpf_c) = 2d11b411693b8bca39954da47bc2fc9afb1fc273 SHA1 (patch-etherload_get__devlist_c) = dc03458a5ba5d825371dafced876de4c80228fb3 SHA1 (patch-etherload_main_c) = 0ee5cffa70b42be6eca2e5de90b5583a7d684d50 @@ -35,5 +36,5 @@ SHA1 (patch-netconsole_utils_c) = 40bfc9bee53f6c77ccf7674bdb0ab153e56eadc3 SHA1 (patch-noclog_noclogd_c) = 65409b1768de39eb8341af9aafb9d7a81c9622bb SHA1 (patch-nsmon_main_c) = 26992f1cc7b4cbfac3f968937ee9533b9c55d126 SHA1 (patch-strerror_c) = 566959a5784ea640c269b247cdd1ad5ad988882e -SHA1 (patch-tknocol_ndaemon_c) = 5e99d671b3bbf2480b9dd844db5b9d2d66fbe220 +SHA1 (patch-tknocol_ndaemon_c) = 9ea38cd4495b4b99532dcaecaf266c28662bc5c0 SHA1 (patch-utility_display__nocol__datafile_c) = 6c7796043658fa6e56d2ccf4a0b5346007aea537 diff --git a/net/nocol/patches/patch-al b/net/nocol/patches/patch-al index 9f95238ffb7..4637d4124b3 100644 --- a/net/nocol/patches/patch-al +++ b/net/nocol/patches/patch-al @@ -1,4 +1,4 @@ -$NetBSD: patch-al,v 1.2 2012/09/09 19:35:20 dholland Exp $ +$NetBSD: patch-al,v 1.3 2013/03/03 01:07:24 joerg Exp $ --- portmon/portmon.c.orig 2000-04-06 19:32:26.000000000 +0000 +++ portmon/portmon.c @@ -16,6 +16,13 @@ $NetBSD: patch-al,v 1.2 2012/09/09 19:35:20 dholland Exp $ + /* value */ (u_long)(harray[i]->elapsedsecs), harray[i]->testseverity) ; lseek(fdout, -(off_t)sizeof(v), SEEK_CUR); +@@ -221,5 +223,5 @@ checkports(hv, nhosts) + fd_set rset, wset; + +- if (nhosts <= 0) return; ++ if (nhosts <= 0) return -1; + + FD_ZERO(&rset); FD_ZERO(&wset); @@ -659,14 +661,19 @@ static char *Strcasestr(haystack, needle do { diff --git a/net/nocol/patches/patch-as b/net/nocol/patches/patch-as index f8d83221abe..46dfd36288e 100644 --- a/net/nocol/patches/patch-as +++ b/net/nocol/patches/patch-as @@ -1,10 +1,19 @@ -$NetBSD: patch-as,v 1.2 2012/09/09 19:49:45 dholland Exp $ +$NetBSD: patch-as,v 1.3 2013/03/03 01:07:24 joerg Exp $ Don't declare own errno. ---- support/multiping/multiping.c.orig 2005-12-18 20:42:05.000000000 +0000 +--- support/multiping/multiping.c.orig 1999-11-05 04:53:11.000000000 +0000 +++ support/multiping/multiping.c -@@ -158,7 +158,7 @@ main(argc, argv) +@@ -151,6 +151,8 @@ char *prognm ; + char *pr_addr(); + void catcher(), prefinish(), finish(); + ++static void pr_pack(char *buf, int cc, struct sockaddr_in *from); ++ + int packlen ; + u_char *packet; + +@@ -158,7 +160,7 @@ main(argc, argv) int argc; char **argv; { @@ -13,3 +22,15 @@ Don't declare own errno. extern char *optarg; struct timeval timeout; struct protoent *proto; +@@ -518,10 +520,7 @@ mpinger() + * this program to be run without having intermingled output (or + * statistics!). + */ +-pr_pack(buf, cc, from) +- char *buf; +- int cc; +- struct sockaddr_in *from; ++static void pr_pack(char *buf, int cc, struct sockaddr_in *from) + { + register struct icmp *icp; + register u_long l; diff --git a/net/nocol/patches/patch-tknocol_ndaemon_c b/net/nocol/patches/patch-tknocol_ndaemon_c index 69cf74c1b52..f6b87912b49 100644 --- a/net/nocol/patches/patch-tknocol_ndaemon_c +++ b/net/nocol/patches/patch-tknocol_ndaemon_c @@ -1,8 +1,8 @@ -$NetBSD: patch-tknocol_ndaemon_c,v 1.1 2012/09/09 19:35:21 dholland Exp $ +$NetBSD: patch-tknocol_ndaemon_c,v 1.2 2013/03/03 01:07:24 joerg Exp $ Use standard headers. ---- tknocol/ndaemon.c~ 2000-01-27 05:23:42.000000000 +0000 +--- tknocol/ndaemon.c.orig 2000-01-27 05:23:42.000000000 +0000 +++ tknocol/ndaemon.c @@ -45,6 +45,9 @@ * @@ -14,3 +14,21 @@ Use standard headers. #include "ndaemon.h" #ifdef LEASED_LINES /* Company specific */ +@@ -332,7 +335,7 @@ static int handle_command(d, cmd) + + argstr = (char *) index(cmd, ' '); + if (!argstr) /* invalid malformed command */ +- return; ++ return -1; + *argstr++ = '\0'; + + if (!strcasecmp(cmd, "SEVLEVEL")) { +@@ -342,7 +345,7 @@ static int handle_command(d, cmd) + numarg = atoi(argstr); + if ((numarg < 1) || (numarg > 4)) { + /* Invalid severity level */ +- return; ++ return -1; + } + d->sev_level = numarg; + } |