summaryrefslogtreecommitdiff
path: root/databases
diff options
context:
space:
mode:
authorhe <he>2008-06-19 15:56:04 +0000
committerhe <he>2008-06-19 15:56:04 +0000
commit461effe48f530b83db516699342fc478269b9997 (patch)
tree5625bd59adc75905c9e3026e87ccd23dcd527c89 /databases
parent57d5b29786cf8cbdd82bf1de7ea333f7a27264e7 (diff)
downloadpkgsrc-461effe48f530b83db516699342fc478269b9997.tar.gz
Add name of rrd database to "illegal attempt to update using time..."
error message, since rrdupdate may update more than one rrd database. Submitted as a feature enhancement request upstream (#162). Bump package revision.
Diffstat (limited to 'databases')
-rw-r--r--databases/rrdtool/Makefile4
-rw-r--r--databases/rrdtool/distinfo3
-rw-r--r--databases/rrdtool/patches/patch-am16
3 files changed, 20 insertions, 3 deletions
diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index c876fe4daf5..4e91f90d1f0 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.63 2008/04/14 16:05:35 he Exp $
+# $NetBSD: Makefile,v 1.64 2008/06/19 15:56:04 he Exp $
DISTNAME= rrdtool-1.2.27
-#PKGREVISION= 1
+PKGREVISION= 1
CATEGORIES= databases graphics net
MASTER_SITES= http://oss.oetiker.ch/rrdtool/pub/
diff --git a/databases/rrdtool/distinfo b/databases/rrdtool/distinfo
index dd2fd3d7ad3..55d0834a20f 100644
--- a/databases/rrdtool/distinfo
+++ b/databases/rrdtool/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.26 2008/05/05 05:25:20 martti Exp $
+$NetBSD: distinfo,v 1.27 2008/06/19 15:56:04 he Exp $
SHA1 (rrdtool-1.2.27.tar.gz) = 15028b65be68da83602f7479405dffb1eef819ec
RMD160 (rrdtool-1.2.27.tar.gz) = ee01b9cd52a9dbf42c6ac8d9259bdcfcd036b112
@@ -6,6 +6,7 @@ Size (rrdtool-1.2.27.tar.gz) = 1081450 bytes
SHA1 (patch-aa) = cb7129fcb30ca961c824204975fc9481ab7bb1e9
SHA1 (patch-ab) = 01cb2f7f19925b7ac8693239d03df78fe604e381
SHA1 (patch-al) = f4e8687e8d92347373646c0db344911420203f84
+SHA1 (patch-am) = bc6c6dd11a322e368e220cc813a32613576fec48
SHA1 (patch-as) = aa48dbc38ae23493b8ff700fabf90d6e0f3f1d5a
SHA1 (patch-av) = 2e2a626c8bbc78671ff7e834cb229f4a1b0c35c3
SHA1 (patch-aw) = 69b95e3d92ac58f53ca06784dec5d76f6f632fff
diff --git a/databases/rrdtool/patches/patch-am b/databases/rrdtool/patches/patch-am
new file mode 100644
index 00000000000..a7b0ea20f4f
--- /dev/null
+++ b/databases/rrdtool/patches/patch-am
@@ -0,0 +1,16 @@
+$NetBSD: patch-am,v 1.4 2008/06/19 15:56:04 he Exp $
+
+--- src/rrd_update.c.orig 2008-02-17 11:26:32.000000000 +0100
++++ src/rrd_update.c
+@@ -533,9 +533,9 @@ _rrd_update(const char *filename, const
+ if(current_time < rrd.live_head->last_up ||
+ (current_time == rrd.live_head->last_up &&
+ (long)current_time_usec <= (long)rrd.live_head->last_up_usec)) {
+- rrd_set_error("illegal attempt to update using time %ld when "
++ rrd_set_error("%s: illegal attempt to update using time %ld when "
+ "last update time is %ld (minimum one second step)",
+- current_time, rrd.live_head->last_up);
++ filename, current_time, rrd.live_head->last_up);
+ free(step_start);
+ break;
+ }