diff options
| author | mspo <mspo@pkgsrc.org> | 2014-02-23 16:34:27 +0000 |
|---|---|---|
| committer | mspo <mspo@pkgsrc.org> | 2014-02-23 16:34:27 +0000 |
| commit | 90e325171796322149d9edbf70619c838192de30 (patch) | |
| tree | 2ff4b7a933c213ecbf7fd4b62613b815873df12f /sysutils | |
| parent | 804fdb621c6254fb3f9ca8de66f9c21db1df13b0 (diff) | |
| download | pkgsrc-90e325171796322149d9edbf70619c838192de30.tar.gz | |
fix compilation on netbsd current; compile-tested hack for CIRCLEQ vs TAILQ in tcpconns
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/collectd/distinfo | 3 | ||||
| -rw-r--r-- | sysutils/collectd/patches/patch-src_tcpconns.c | 36 |
2 files changed, 38 insertions, 1 deletions
diff --git a/sysutils/collectd/distinfo b/sysutils/collectd/distinfo index 2fbaccb9cb5..efce44164a6 100644 --- a/sysutils/collectd/distinfo +++ b/sysutils/collectd/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1 2014/02/17 11:21:54 fhajny Exp $ +$NetBSD: distinfo,v 1.2 2014/02/23 16:34:27 mspo Exp $ SHA1 (collectd-5.4.1.tar.gz) = faaccac4daf48449bcefc9d6f9236f98a5dd5b4b RMD160 (collectd-5.4.1.tar.gz) = a98ff2d845238d4792f732aa7518effdc95e24f9 @@ -11,3 +11,4 @@ SHA1 (patch-src_collectd.conf.in) = 97400dbc16a31a440750beed0bc16927afdcb570 SHA1 (patch-src_df.c) = 19cca888b183a90759b359702e4d65c8afa6e58d SHA1 (patch-src_libcollectclient_network__buffer.c) = e07d403d299613fa0885a0e7285849eb85510253 SHA1 (patch-src_network.c) = 03ed5169903bb579470e77228400dec077ff16cb +SHA1 (patch-src_tcpconns.c) = 7aa5fa63e0d3b60a298f9db6392698c6e456a786 diff --git a/sysutils/collectd/patches/patch-src_tcpconns.c b/sysutils/collectd/patches/patch-src_tcpconns.c new file mode 100644 index 00000000000..ba55a7b34f4 --- /dev/null +++ b/sysutils/collectd/patches/patch-src_tcpconns.c @@ -0,0 +1,36 @@ +$NetBSD: patch-src_tcpconns.c,v 1.1 2014/02/23 16:34:27 mspo Exp $ + +--- src/tcpconns.c.orig 2014-01-26 08:09:14.000000000 +0000 ++++ src/tcpconns.c +@@ -893,6 +893,7 @@ static int conn_init (void) + return (0); + } /* int conn_init */ + ++#include <sys/param.h> + static int conn_read (void) + { + struct inpcbtable table; +@@ -912,7 +913,11 @@ static int conn_read (void) + /* Get the `head' pcb */ + head = (struct inpcb *) &(inpcbtable_ptr->inpt_queue); + /* Get the first pcb */ ++#if __NetBSD_Version__ > 600000000 ++ next = (struct inpcb *)TAILQ_FIRST (&table.inpt_queue); ++#else + next = (struct inpcb *)CIRCLEQ_FIRST (&table.inpt_queue); ++#endif + + while (next != head) + { +@@ -920,7 +925,11 @@ static int conn_read (void) + kread ((u_long) next, &inpcb, sizeof (inpcb)); + + /* Advance `next' */ ++#if __NetBSD_Version__ > 600000000 ++ next = (struct inpcb *)TAILQ_NEXT (&inpcb, inp_queue); ++#else + next = (struct inpcb *)CIRCLEQ_NEXT (&inpcb, inp_queue); ++#endif + + /* Ignore sockets, that are not connected. */ + #ifdef __NetBSD__ |