Fri Dec 25 20:08:38 2015 UTC ()
NetBSD has no receive/send quotas, unbreak build. Fix format strings for
32bit vs 64bit differences between the BSDs.
(joerg)
diff -r1.5 -r1.6 pkgsrc/net/bmon/distinfo
diff -r0 -r1.1 pkgsrc/net/bmon/patches/patch-src_in__sysctl.c
--- pkgsrc/net/bmon/distinfo 2015/11/03 17:46:57 1.5
+++ pkgsrc/net/bmon/distinfo 2015/12/25 20:08:38 1.6
| @@ -1,7 +1,8 @@ | | | @@ -1,7 +1,8 @@ |
| 1 | $NetBSD: distinfo,v 1.5 2015/11/03 17:46:57 bsiegert Exp $ | | 1 | $NetBSD: distinfo,v 1.6 2015/12/25 20:08:38 joerg Exp $ |
| 2 | | | 2 | |
| 3 | SHA1 (bmon-3.8.tar.gz) = f10ddfebf4b6c2fcdeea9ccd3027dd5291cd6838 | | 3 | SHA1 (bmon-3.8.tar.gz) = f10ddfebf4b6c2fcdeea9ccd3027dd5291cd6838 |
| 4 | RMD160 (bmon-3.8.tar.gz) = eba503ff9d5bedc3901ab546193effcef8fbb298 | | 4 | RMD160 (bmon-3.8.tar.gz) = eba503ff9d5bedc3901ab546193effcef8fbb298 |
| 5 | SHA512 (bmon-3.8.tar.gz) = 629a8678bf76e2dab125a08b334925f953e3ddd5ee0b2b865f157013a5462a5fa8e1bc76920487a03f5afdf12143c4a2cc1c6ab51d514119ca9754cc67117d84 | | 5 | SHA512 (bmon-3.8.tar.gz) = 629a8678bf76e2dab125a08b334925f953e3ddd5ee0b2b865f157013a5462a5fa8e1bc76920487a03f5afdf12143c4a2cc1c6ab51d514119ca9754cc67117d84 |
| 6 | Size (bmon-3.8.tar.gz) = 195437 bytes | | 6 | Size (bmon-3.8.tar.gz) = 195437 bytes |
| 7 | SHA1 (patch-examples_Makefile.in) = f7dab570d8b141226f70774aed3a5f119793229f | | 7 | SHA1 (patch-examples_Makefile.in) = f7dab570d8b141226f70774aed3a5f119793229f |
| | | 8 | SHA1 (patch-src_in__sysctl.c) = 71c0a11b7e19e0de0eaac281f94e18835aeb532e |
$NetBSD: patch-src_in__sysctl.c,v 1.1 2015/12/25 20:08:38 joerg Exp $
--- src/in_sysctl.c.orig 2015-07-25 08:45:17.000000000 +0000
+++ src/in_sysctl.c
@@ -226,17 +226,19 @@ sysctl_read(void)
attr_update(e, m->attrid, rx, tx, flags);
}
- snprintf(info_buf, sizeof(info_buf), "%u", ifm->ifm_data.ifi_mtu);
+ snprintf(info_buf, sizeof(info_buf), "%ju", (uintmax_t)ifm->ifm_data.ifi_mtu);
element_update_info(e, "MTU", info_buf);
- snprintf(info_buf, sizeof(info_buf), "%u", ifm->ifm_data.ifi_metric);
+ snprintf(info_buf, sizeof(info_buf), "%ju", (uintmax_t)ifm->ifm_data.ifi_metric);
element_update_info(e, "Metric", info_buf);
+#ifndef __NetBSD__
snprintf(info_buf, sizeof(info_buf), "%u", ifm->ifm_data.ifi_recvquota);
element_update_info(e, "RX-Quota", info_buf);
snprintf(info_buf, sizeof(info_buf), "%u", ifm->ifm_data.ifi_xmitquota);
element_update_info(e, "TX-Quota", info_buf);
+#endif
element_notify_update(e, NULL);
element_lifesign(e, 1);