tags 333915 patch
thanks
On Fri, Oct 14, 2005 at 02:20:27PM +0200, Abraham vd Merwe wrote:
> I don't think so. librrd2 is not backwards compatible to librrd0, so it is
> not as simple as updating the build dependency.
Hi,
the API change in librrd2 is minimal. I'm attaching a patch for this.
Note that the patch by Bart Martens in #381034 is not enough, but the
package seems to build correctly with it because it's invoking make as
-$(MAKE) and thus ignoring all errors.
Unfortunately, orca still does not build correctly because of API
changes between tinysnmp-manager-dev 0.6.3 and 0.8.4 (the current
version), so this is not enough to get orca to work. I have tested
these librrd changes with a self-built tinysnmp-manager-dev 0.6.3,
though, so at least they should be OK.
I'll open a separate bug for the build issues in router.c to keep
things straight.
Cheers,
--
Niko Tyni [EMAIL PROTECTED]
--- /tmp/KKms7QgaYm/orca-0.2.3/debian/control 2004-07-19 16:01:11.000000000
+0300
+++ /tmp/GdSRA2Coaj/orca-0.2.3.1/debian/control 2006-08-29 22:03:14.000000000
+0300
@@ -2,7 +2,7 @@
Section: net
Priority: optional
Maintainer: Abraham vd Merwe <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 3.0.0), tinysnmp-manager-dev (>= 0.6.3),
libdebug0-dev (>= 0.3.2), libconfig0-dev (>= 0.1.5), libber0-dev (>= 0.3.5),
librrd0-dev
+Build-Depends: debhelper (>> 3.0.0), tinysnmp-manager-dev (>= 0.6.3),
libdebug0-dev (>= 0.3.2), libconfig0-dev (>= 0.1.5), libber0-dev (>= 0.3.5),
librrd2-dev
Standards-Version: 3.6.1
Package: orca
--- /tmp/KKms7QgaYm/orca-0.2.3/src/db.c 2002-06-23 16:50:03.000000000 +0300
+++ /tmp/GdSRA2Coaj/orca-0.2.3.1/src/db.c 2006-09-02 23:26:51.000000000
+0300
@@ -229,6 +229,7 @@
};
time_t curtime = time (NULL) - 305;
int i;
+ double ymax, ymin; /* only used as arguments for rrd_graph() */
sprintf (now,"%lu",curtime);
if (strftime (title,sizeof (title),"%a %b %e %T %Z %Y",localtime
(&curtime)) < 0)
@@ -267,7 +268,7 @@
rrd_clear_error ();
optind = opterr = 0;
- if (rrd_graph (NB_OF (argv),argv,&print,width,height) < 0)
+ if (rrd_graph (NB_OF (argv),argv,&print,width,height,NULL,&ymax,&ymin) < 0)
{
mem_free (a);
mem_free (b);
@@ -330,6 +331,7 @@
};
time_t curtime = time (NULL) - 305;
int i;
+ double ymax, ymin; /* only used as arguments for rrd_graph() */
sprintf (now,"%lu",curtime);
if (strftime (title,sizeof (title),"%a %b %e %T %Z %Y",localtime
(&curtime)) < 0)
@@ -378,7 +380,7 @@
rrd_clear_error ();
optind = opterr = 0;
- if (rrd_graph (NB_OF (argv),argv,&print,width,height) < 0)
+ if (rrd_graph (NB_OF (argv),argv,&print,width,height,NULL,&ymax,&ymin) < 0)
{
mem_free (a);
mem_free (b);
@@ -429,6 +431,7 @@
};
time_t curtime = time (NULL) - 305;
int i;
+ double ymax, ymin; /* only used as arguments for rrd_graph() */
sprintf (now,"%lu",curtime);
if (strftime (title,sizeof (title),"%a %b %e %T %Z %Y",localtime
(&curtime)) < 0)
@@ -458,7 +461,7 @@
rrd_clear_error ();
optind = opterr = 0;
- if (rrd_graph (NB_OF (argv),argv,&print,width,height) < 0)
+ if (rrd_graph (NB_OF (argv),argv,&print,width,height,NULL,&ymax,&ymin) < 0)
{
mem_free (a);
mem_free (b);
