[Midnightbsd-cvs] mports [17127] trunk/databases/rrdtool/files: add missing patches

[laffer1 at midnightbsd.org]

Revision: 17127
          http://svnweb.midnightbsd.org/mports/?rev=17127
Author:   laffer1
Date:     2014-09-14 14:25:59 -0400 (Sun, 14 Sep 2014)
Log Message:
-----------
add missing patches

Added Paths:
-----------
    trunk/databases/rrdtool/files/patch-bindings_perl-shared_Makefile.PL
    trunk/databases/rrdtool/files/patch-configure
    trunk/databases/rrdtool/files/patch-src__rrd_graph.c

Added: trunk/databases/rrdtool/files/patch-bindings_perl-shared_Makefile.PL
===================================================================
--- trunk/databases/rrdtool/files/patch-bindings_perl-shared_Makefile.PL	                        (rev 0)
+++ trunk/databases/rrdtool/files/patch-bindings_perl-shared_Makefile.PL	2014-09-14 18:25:59 UTC (rev 17127)
@@ -0,0 +1,11 @@
+--- bindings/perl-shared/Makefile.PL.orig	2014-04-19 13:00:18.000000000 +0200
++++ bindings/perl-shared/Makefile.PL	2014-04-19 13:13:26.000000000 +0200
+@@ -31,7 +31,7 @@
+ 			/linux/   && do{ $R = "-Wl,--rpath -Wl,$rp"};
+ 			/hpux/    && do{ $R = "+b$rp"};
+ 			/solaris/ && do{ $R = "-R$rp"};
+-			/bsd/     && do{ $R = "-R$rp"};
++			/bsd/     && do{ $R = "-Wl,--rpath -Wl,$rp"};
+ 			/aix/     && do{ $R = "-blibpath:$rp"};
+ 		}
+ 	}

Added: trunk/databases/rrdtool/files/patch-configure
===================================================================
--- trunk/databases/rrdtool/files/patch-configure	                        (rev 0)
+++ trunk/databases/rrdtool/files/patch-configure	2014-09-14 18:25:59 UTC (rev 17127)
@@ -0,0 +1,11 @@
+--- configure.orig	2013-05-23 09:55:19.000000000 +0200
++++ configure	2014-07-15 19:59:43.000000000 +0200
+@@ -12846,7 +12846,7 @@
+ 
+ 
+ if test "x$GCC" = "xyes"; then
+-  for flag in -fno-strict-aliasing -Wall -std=gnu99 -pedantic -Wundef -Wshadow -Wpointer-arith -Wcast-align -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Winline -Wold-style-definition -W; do
++  for flag in -fno-strict-aliasing -Wall -std=gnu99 -pedantic -Wundef -Wshadow -Wpointer-arith -Wcast-align -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Winline -Wold-style-definition; do
+     oCFLAGS="$CFLAGS"
+     CFLAGS="$CFLAGS $flag"
+     cachename=rd_cv_gcc_flag_`echo $flag|sed 's/[^A-Za-z]/_/g'`

Added: trunk/databases/rrdtool/files/patch-src__rrd_graph.c
===================================================================
--- trunk/databases/rrdtool/files/patch-src__rrd_graph.c	                        (rev 0)
+++ trunk/databases/rrdtool/files/patch-src__rrd_graph.c	2014-09-14 18:25:59 UTC (rev 17127)
@@ -0,0 +1,68 @@
+--- src/rrd_graph.c.orig	2013-05-23 09:55:07.000000000 +0200
++++ src/rrd_graph.c	2014-07-20 22:11:58.000000000 +0200
+@@ -305,6 +305,52 @@
+ 
+ #undef conv_if
+ 
++
++static int bad_format_imginfo(
++    char *fmt)
++{
++    char     *ptr;
++    int       n = 0;
++
++    ptr = fmt;
++    while (*ptr != '\0')
++        if (*ptr++ == '%') {
++
++            /* line cannot end with percent char */
++            if (*ptr == '\0')
++                return 1;
++            /* '%%' is allowed */
++            if (*ptr == '%')
++                ptr++;
++            /* '%s', '%S' are allowed */
++            else if (*ptr == 's' || *ptr == 'S') {
++                n = 1;
++                ptr++;
++            }
++
++            /* or else '% 4lu' and such are allowed */
++            else {
++                /* optional padding character */
++                if (*ptr == ' ')
++                    ptr++;
++                /* This should take care of 'm' */
++                while (*ptr >= '0' && *ptr <= '9')
++                    ptr++;
++                /* 'lu' must follow here */
++                if (*ptr++ != 'l')
++                    return 1;
++                if (*ptr == 'u')
++                    ptr++;
++                else
++                    return 1;
++                n++;
++            }
++        }
++
++    return (n != 3);
++}
++
++
+ int im_free(
+     image_desc_t *im)
+ {
+@@ -4022,6 +4068,12 @@
+         char     *path;
+         char     *filename;
+ 
++        if (bad_format_imginfo(im.imginfo)) {
++            rrd_info_free(im.grinfo);
++            im_free(&im);
++            rrd_set_error("bad format for imginfo");
++            return NULL;
++        }
+         path = strdup(im.graphfile);
+         filename = basename(path);
+         info.u_str =