rrdtool1: import from packages, add myself as maintainer

While we're at it, relocate from libs/ to utils/ as it provides executables
and change the directory name from rrdtool-1.0.x to rrdtool1 to make it match
the source package name.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
This commit is contained in:
Jo-Philipp Wich
2014-06-11 16:50:35 +02:00
parent 177bfef1c7
commit f41826e344
5 changed files with 200 additions and 0 deletions
@@ -0,0 +1,21 @@
diff -urN rrdtool-1.0.50/configure rrdtool-1.0.50.new/configure
--- rrdtool-1.0.50/configure 2005-04-25 22:48:09.000000000 +0200
+++ rrdtool-1.0.50.new/configure 2009-03-09 17:25:38.000000000 +0100
@@ -24873,17 +24873,12 @@
echo "${ECHO_T}and out again" >&6
echo $ECHO_N "ordering CD from http://people.ee.ethz.ch/~oetiker/wish $ac_c" 1>&6
-sleep 1
echo $ECHO_N ".$ac_c" 1>&6
-sleep 2
echo $ECHO_N ".$ac_c" 1>&6
-sleep 1
echo $ECHO_N ".$ac_c" 1>&6
-sleep 3
echo $ECHO_N ".$ac_c" 1>&6
echo $ECHO_N ".$ac_c" 1>&6
echo $ECHO_N ".$ac_c" 1>&6
-sleep 2
echo "$as_me:$LINENO: result: just kidding ;-)" >&5
echo "${ECHO_T} just kidding ;-)" >&6
echo
@@ -0,0 +1,24 @@
--- a/src/rrd_tool.c
+++ b/src/rrd_tool.c
@@ -225,11 +225,8 @@
struct rusage myusage;
struct timeval starttime;
struct timeval currenttime;
- struct timezone tz;
- tz.tz_minuteswest =0;
- tz.tz_dsttime=0;
- gettimeofday(&starttime,&tz);
+ gettimeofday(&starttime,NULL);
#endif
while (fgets(aLine, sizeof(aLine)-1, stdin)){
@@ -252,7 +249,7 @@
#if HAVE_GETRUSAGE
getrusage(RUSAGE_SELF,&myusage);
- gettimeofday(&currenttime,&tz);
+ gettimeofday(&currenttime,NULL);
printf("OK u:%1.2f s:%1.2f r:%1.2f\n",
(double)myusage.ru_utime.tv_sec+
(double)myusage.ru_utime.tv_usec/1000000.0,
@@ -0,0 +1,13 @@
Index: rrdtool-1.0.50/src/rrd_format.h
===================================================================
--- rrdtool-1.0.50.orig/src/rrd_format.h
+++ rrdtool-1.0.50/src/rrd_format.h
@@ -20,7 +20,7 @@
#define RRD_COOKIE "RRD"
#define RRD_VERSION "0001"
-#define FLOAT_COOKIE 8.642135E130
+#define FLOAT_COOKIE ((double)8.642135E130)
#if defined(WIN32)
#define DNAN ((double)fmod(0.0,0.0))
@@ -0,0 +1,11 @@
--- rrdtool-1.0.50/doc/Makefile.am.orig 2013-11-16 11:44:50.940231208 -0500
+++ rrdtool-1.0.50/doc/Makefile.am 2013-11-16 11:45:09.802229483 -0500
@@ -35,7 +35,7 @@
all-local: link txt man html
.pod.1 .pm.1 .pl.1:
- pod2man --release=$(VERSION) --center=RRDtool $< > $@
+ pod2man --stderr --release=$(VERSION) --center=RRDtool $< > $@
.1.txt:
@NROFF@ -man -Tlp $< > $@ || echo @NROFF@ failed > $@