From: Sebastian Harl <sh@tokkee.org>
Date: Sun, 21 Mar 2010 20:35:58 +0000 (+0100)
Subject: patches: Added bts573299-rrdgraph-M.
X-Git-Tag: debian/1.4.2-2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c397a78525a287fbb64551ebd8834d1c2407e01d;p=pkg-rrdtool.git

patches: Added bts573299-rrdgraph-M.

This fixes short option parsing in rrd_graph() by adding support for '-M' as
documented in the manpage.

Thanks to Ralf Hildebrandt for reporting this!
Closes: #573299
---

diff --git a/debian/changelog b/debian/changelog
index c852f1f..1acd90d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,11 @@ rrdtool (1.4.2-2) unstable; urgency=low
     - Added bts573638-rrdcgi-segfault: upstream patch fixing a segfault in
       rrdcgi's printlasttime() (and possibly others); thanks to Robert Luberda
       for reporting this (Closes: #573638).
+    - Added bts573299-rrdgraph-M: fix short option parsing in rrd_graph() --
+      added support for '-M' as documented in the manpage; thanks to Ralf
+      Hildebrandt for reporting this (Closes: #573299).
 
- -- Sebastian Harl <tokkee@debian.org>  Sun, 21 Mar 2010 21:28:05 +0100
+ -- Sebastian Harl <tokkee@debian.org>  Sun, 21 Mar 2010 21:33:46 +0100
 
 rrdtool (1.4.2-1) unstable; urgency=low
 
diff --git a/debian/patches/bts573299-rrdgraph-M b/debian/patches/bts573299-rrdgraph-M
new file mode 100644
index 0000000..6568e87
--- /dev/null
+++ b/debian/patches/bts573299-rrdgraph-M
@@ -0,0 +1,13 @@
+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/series b/debian/patches/series
index 81b1166..db13441 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ no-rpath-for-perl
 implicit-decl-fix
 bts530814-hurd
 bts573638-rrdcgi-segfault
+bts573299-rrdgraph-M