patches: Removed bts573638-rrdcgi-segfault and bts573299-rrdgraph-M.

These patches have been included upstream.

diff --git a/debian/changelog b/debian/changelog
index afecf42cdf1cd0f07c411a74cfd695a0a0ce21b3..ee41b356f3d83ecf46a24b58f84f19e654d2d0d9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
 rrdtool (1.4.3-1) unstable; urgency=low
 
   * New upstream release.
+  * debian/patches:
+    - Removed bts573638-rrdcgi-segfault and bts573299-rrdgraph-M -- included
+      upstream.
 
- -- Sebastian Harl <tokkee@debian.org>  Wed, 24 Mar 2010 08:14:58 +0100
+ -- Sebastian Harl <tokkee@debian.org>  Wed, 24 Mar 2010 08:46:16 +0100
 
 rrdtool (1.4.2-2) unstable; urgency=low
 

diff --git a/debian/patches/bts573299-rrdgraph-M b/debian/patches/bts573299-rrdgraph-M
deleted file mode 100644 (file)
index 6568e87..0000000
--- a/debian/patches/bts573299-rrdgraph-M
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/rrd_graph.c b/src/rrd_graph.c
-index 2c4f71a..275a8c0 100644
---- a/src/rrd_graph.c
-+++ b/src/rrd_graph.c
-@@ -4191,7 +4191,7 @@ void rrd_graph_options(
-         int       col_start, col_end;
- 
-         opt = getopt_long(argc, argv,
--                          "Aa:B:b:c:Dd:Ee:Ff:G:gh:IiJjL:l:Nn:Bb:oPR:rS:s:T:t:u:v:W:w:X:x:Yy:z",
-+                          "Aa:B:b:c:Dd:Ee:Ff:G:gh:IiJjL:l:MNn:oPR:rS:s:T:t:u:v:W:w:X:x:Yy:z",
-                           long_options, &option_index);
-         if (opt == EOF)
-             break;

diff --git a/debian/patches/bts573638-rrdcgi-segfault b/debian/patches/bts573638-rrdcgi-segfault
deleted file mode 100644 (file)
index 844d5fa..0000000
--- a/debian/patches/bts573638-rrdcgi-segfault
+++ /dev/null
@@ -1,82 +0,0 @@
-diff a/src/rrd_cgi.c b/src/rrd_cgi.c
---- a/src/rrd_cgi.c
-+++ b/src/rrd_cgi.c
-@@ -988,7 +988,10 @@ char     *printtimelast(
-         if (buf == NULL) {
-             return stralloc("[ERROR: allocating strftime buffer]");
-         };
--        last = rrd_last(argc + 1, (char **) args - 1);
-+        /* not raising argc in step with args - 1 since the last argument
-+           will be used below for strftime  */
-+
-+        last = rrd_last(argc, (char **) args - 1);
-         if (rrd_test_error()) {
-             char     *err =
-                 malloc((strlen(rrd_get_error()) +
-@@ -1001,10 +1004,7 @@ char     *printtimelast(
-         strftime(buf, 254, args[1], &tm_last);
-         return buf;
-     }
--    if (argc < 2) {
--        return stralloc("[ERROR: too few arguments for RRD::TIME::LAST]");
--    }
--    return stralloc("[ERROR: not enough arguments for RRD::TIME::LAST]");
-+    return stralloc("[ERROR: expected <RRD::TIME::LAST file.rrd strftime-format>]");
- }
- 
- char     *printtimenow(
-@@ -1053,7 +1053,7 @@ char     *scanargs(
-     int       curarg_contains_rrd_directives;
- 
-     /* local array of arguments while parsing */
--    int       argc = 0;
-+    int       argc = 1;
-     char    **argv;
- 
- #ifdef DEBUG_PARSER
-@@ -1069,6 +1069,7 @@ char     *scanargs(
-     if (!argv) {
-         return NULL;
-     }
-+    argv[0] = "rrdcgi";
- 
-     /* skip leading blanks */
-     while (isspace((int) *line)) {
-@@ -1172,7 +1173,7 @@ char     *scanargs(
-         argv[argc - 1] = rrd_expand_vars(stralloc(argv[argc - 1]));
-     }
- #ifdef DEBUG_PARSER
--    if (argc > 0) {
-+    if (argc > 1) {
-         int       n;
- 
-         printf("<-- arguments found [%d]\n", argc);
-@@ -1186,8 +1187,17 @@ char     *scanargs(
- #endif
- 
-     /* update caller's notion of the argument array and it's size */
--    *arguments = argv;
--    *argument_count = argc;
-+
-+    /* note this is a bit of a hack since the rrd_cgi code used to just put
-+       its arguments into a normal array starting at 0 ... since the rrd_*
-+       commands expect and argc/argv array we used to just shift everything
-+       by -1 ... this in turn exploded when a rrd_* function tried to print
-+       argv[0] ... hence we are now doing everything in argv style but hand
-+       over seemingly the old array ... but doing argv-1 will actually end
-+       up in a 'good' place now. */
-+
-+    *arguments = argv+1;
-+    *argument_count = argc-1;
- 
-     if (Quote) {
-         return NULL;
-@@ -1241,7 +1251,7 @@ int parse(
-     if (end) {
-         /* got arguments, call function for 'tag' with arguments */
-         val = func(argc, (const char **) args);
--        free(args);
-+        free(args-1);
-     } else {
-         /* unable to parse arguments, undo 0-termination by scanargs */
-         for (; argc > 0; argc--) {

diff --git a/debian/patches/series b/debian/patches/series
index db134417910ccd9a6c8f6ec8a53997c8cd0e1467..e472686769fb37a4d5bcdabd40668061ac5a8c58 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,5 +4,3 @@ no-rpath-for-ruby
 no-rpath-for-perl
 implicit-decl-fix
 bts530814-hurd
-bts573638-rrdcgi-segfault
-bts573299-rrdgraph-M