summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoerg <joerg>2015-12-25 20:08:38 +0000
committerjoerg <joerg>2015-12-25 20:08:38 +0000
commit790c1514e11d0210002be801b2c2f68b5b6b187d (patch)
tree001d5a3121fbc460f90150dd9db572000e5d4a68
parent87af89e7986c8867b7b67ac2b53d64d678cc3a03 (diff)
downloadpkgsrc-790c1514e11d0210002be801b2c2f68b5b6b187d.tar.gz
NetBSD has no receive/send quotas, unbreak build. Fix format strings for
32bit vs 64bit differences between the BSDs.
-rw-r--r--net/bmon/distinfo3
-rw-r--r--net/bmon/patches/patch-src_in__sysctl.c26
2 files changed, 28 insertions, 1 deletions
diff --git a/net/bmon/distinfo b/net/bmon/distinfo
index 17e49d211d7..f1302edea67 100644
--- a/net/bmon/distinfo
+++ b/net/bmon/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.5 2015/11/03 17:46:57 bsiegert Exp $
+$NetBSD: distinfo,v 1.6 2015/12/25 20:08:38 joerg Exp $
SHA1 (bmon-3.8.tar.gz) = f10ddfebf4b6c2fcdeea9ccd3027dd5291cd6838
RMD160 (bmon-3.8.tar.gz) = eba503ff9d5bedc3901ab546193effcef8fbb298
SHA512 (bmon-3.8.tar.gz) = 629a8678bf76e2dab125a08b334925f953e3ddd5ee0b2b865f157013a5462a5fa8e1bc76920487a03f5afdf12143c4a2cc1c6ab51d514119ca9754cc67117d84
Size (bmon-3.8.tar.gz) = 195437 bytes
SHA1 (patch-examples_Makefile.in) = f7dab570d8b141226f70774aed3a5f119793229f
+SHA1 (patch-src_in__sysctl.c) = 71c0a11b7e19e0de0eaac281f94e18835aeb532e
diff --git a/net/bmon/patches/patch-src_in__sysctl.c b/net/bmon/patches/patch-src_in__sysctl.c
new file mode 100644
index 00000000000..a168cb78420
--- /dev/null
+++ b/net/bmon/patches/patch-src_in__sysctl.c
@@ -0,0 +1,26 @@
+$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);