update to darkstat 3.0.708, mostly concerned with decreased memory usage.

all local patches merged upstream.
This commit is contained in:
ckuethe 2008-06-09 14:29:17 +00:00
parent b70891310f
commit 768ba9d9fc
4 changed files with 7 additions and 58 deletions

View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.9 2008/05/17 22:33:31 ckuethe Exp $
# $OpenBSD: Makefile,v 1.10 2008/06/09 14:29:17 ckuethe Exp $
COMMENT= network statistics gatherer with graphs
DISTNAME= darkstat-3.0.707
PKGNAME= ${DISTNAME}p0
DISTNAME= darkstat-3.0.708
CATEGORIES= net www
HOMEPAGE= http://dmr.ath.cx/net/darkstat/

View File

@ -1,5 +1,5 @@
MD5 (darkstat-3.0.707.tar.bz2) = kccPlkmN1nmyEzAhQ2Hk3A==
RMD160 (darkstat-3.0.707.tar.bz2) = kaGe+Delj2tGTMJMTcNLy47xWlk=
SHA1 (darkstat-3.0.707.tar.bz2) = pd9SH/vYAbMstSqqhG/qNEj1dQ8=
SHA256 (darkstat-3.0.707.tar.bz2) = JDvXf5Osu2gy9e8cxLA6voIwBsEp+I/lckaX4cCFdkQ=
SIZE (darkstat-3.0.707.tar.bz2) = 90459
MD5 (darkstat-3.0.708.tar.bz2) = If4jH27IS+CC6dQXR90PyQ==
RMD160 (darkstat-3.0.708.tar.bz2) = wwYZl6cHDG2pyZvexnyQZDZylSs=
SHA1 (darkstat-3.0.708.tar.bz2) = PmGFpaRz/dXVChXvcX88RPYuzjM=
SHA256 (darkstat-3.0.708.tar.bz2) = y6L5AshpS8DPbImtAO0XyCJdYKjxTWgbeHmCO97Y+JA=
SIZE (darkstat-3.0.708.tar.bz2) = 91765

View File

@ -1,27 +0,0 @@
$OpenBSD: patch-graph_db_c,v 1.1 2008/05/17 22:33:31 ckuethe Exp $
--- graph_db.c.orig Fri May 16 13:23:14 2008
+++ graph_db.c Fri May 16 13:41:43 2008
@@ -27,6 +27,8 @@
#define GRAPH_WIDTH "320"
#define GRAPH_HEIGHT "200"
+extern const char *interface;
+
struct graph {
uint64_t *in, *out;
unsigned int offset; /* i.e. seconds start at 0, days start at 1 */
@@ -348,11 +350,12 @@ html_front_page(void)
buf = str_make();
str_append(buf, html_header_1);
- str_append(buf, "<title>" PACKAGE_STRING " : graphs</title>\n");
+ str_appendf(buf, "<title>" PACKAGE_STRING " : graphs (%s)</title>\n",
+ interface);
str_append(buf, "<script src=\"graph.js\" type=\"text/javascript\">"
"</script>\n");
str_append(buf, html_header_2);
- str_append(buf, "<h2 class=\"pageheader\">Graphs</h2>\n");
+ str_appendf(buf, "<h2 class=\"pageheader\">Graphs (%s)</h2>\n", interface);
str_append(buf, "<p>\n");

View File

@ -1,23 +0,0 @@
$OpenBSD: patch-hosts_db_c,v 1.1 2008/05/17 22:33:31 ckuethe Exp $
--- hosts_db.c.orig Fri May 16 13:23:50 2008
+++ hosts_db.c Fri May 16 13:36:21 2008
@@ -26,6 +26,7 @@
#include <unistd.h>
int show_mac_addrs = 0;
+extern const char *interface;
/* FIXME: specify somewhere more sane/tunable */
#define MAX_ENTRIES 30 /* in an HTML table rendered from a hashtable */
@@ -887,9 +888,9 @@ html_hosts_main(const char *qs)
#define FULL "full table"
str_append(buf, html_header_1);
- str_append(buf, "<title>darkstat3: Hosts</title>\n");
+ str_appendf(buf, "<title>darkstat3: Hosts (%s)</title>\n", interface);
str_append(buf, html_header_2);
- str_append(buf, "<h2 class=\"pageheader\">Hosts</h2>\n");
+ str_appendf(buf, "<h2 class=\"pageheader\">Hosts (%s)</h2>\n", interface);
format_table(buf, hosts_db, start, sort, full);
/* <prev | full | stats | next> */