Merged branch 'rrdtool-1.4.7-2.1'.

[pkg-rrdtool.git] / debian / patches / bts530814-hurd

diff --git a/debian/patches/bts530814-hurd b/debian/patches/bts530814-hurd
index 8e8941d02e1eaf5e1d03da41991b503b31ebdcc6..de4a0be833a8c99b0c66b91e8f41554b3fe356c6 100644 (file)
--- a/debian/patches/bts530814-hurd
+++ b/debian/patches/bts530814-hurd
@@ -1,15 +1,15 @@
 diff a/src/rrd_graph.c /src/rrd_graph.c
 --- a/src/rrd_graph.c
 +++ b/src/rrd_graph.c
-@@ -3697,6 +3697,7 @@
-     image_desc_t im;
+@@ -3958,6 +3958,7 @@ rrd_info_t *rrd_graph_v(
      rrd_info_t *grinfo;
+     char *old_locale;
      rrd_graph_init(&im);
 +    size_t graphfile_len;
      /* a dummy surface so that we can measure text sizes for placements */
-     
-     rrd_graph_options(argc, argv, &im);
-@@ -3713,7 +3714,9 @@
+     old_locale = setlocale(LC_NUMERIC, NULL);
+     setlocale(LC_NUMERIC, "C");
+@@ -3975,7 +3976,9 @@ rrd_info_t *rrd_graph_v(
          return NULL;
      }
  
@@ -20,7 +20,7 @@ diff a/src/rrd_graph.c /src/rrd_graph.c
          rrd_set_error("filename (including path) too long");
          rrd_info_free(im.grinfo);
          im_free(&im);
-@@ -3722,6 +3725,16 @@
+@@ -3984,6 +3987,16 @@ rrd_info_t *rrd_graph_v(
  
      strncpy(im.graphfile, argv[optind], MAXPATH - 1);
      im.graphfile[MAXPATH - 1] = '\0';
@@ -37,10 +37,9 @@ diff a/src/rrd_graph.c /src/rrd_graph.c
  
      if (strcmp(im.graphfile, "-") == 0) {
          im.graphfile[0] = '\0';
-diff a/src/rrd_graph.h b/src/rrd_graph.h
 --- a/src/rrd_graph.h
 +++ b/src/rrd_graph.h
-@@ -196,7 +196,11 @@
+@@ -206,7 +206,11 @@ typedef struct image_desc_t {
  
      /* configuration of graph */
  
@@ -52,10 +51,9 @@ diff a/src/rrd_graph.h b/src/rrd_graph.h
      long      xsize, ysize; /* graph area size in pixels */
      struct gfx_color_t graph_col[__GRC_END__];  /* real colors for the graph */
      text_prop_t text_prop[TEXT_PROP_LAST];  /* text properties */
-diff a/src/rrd_tool.c b/src/rrd_tool.c
 --- a/src/rrd_tool.c
 +++ b/src/rrd_tool.c
-@@ -555,7 +555,11 @@
+@@ -576,7 +576,11 @@ int HandleInputLine(
                  printf("ERROR: invalid parameter count for pwd\n");
                  return (1);
              }