Index: head/databases/rrdtool/Makefile
===================================================================
--- head/databases/rrdtool/Makefile	(revision 530221)
+++ head/databases/rrdtool/Makefile	(revision 530222)
@@ -1,111 +1,111 @@
 # Created by: Dmitry Sivachenko <dima@Chg.RU>
 # $FreeBSD$
 
 PORTNAME=	rrdtool
 PORTVERSION=	1.7.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases graphics
 MASTER_SITES=	http://oss.oetiker.ch/rrdtool/pub/
 
 MAINTAINER=	zeising@FreeBSD.org
 COMMENT=	Round Robin Database Tools
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 CONFLICTS=	rrdtool12-*
 
 CONFIGURE_ARGS=	--disable-tcl
 CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2
 USE_RC_SUBR=	rrdcached
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 USES=		gmake gnome libtool pathfix pkgconfig shebangfix
 USE_GNOME=	glib20 libxml2
 INSTALL_TARGET=	install-strip
 
 PORTEXAMPLES=	cgi-demo.cgi
 
 OPTIONS_DEFINE=	DEJAVU GRAPH MMAP NLS PERL PYTHON \
 		RUBY EXAMPLES DOCS
 OPTIONS_DEFAULT=DEJAVU GRAPH MMAP PERL
 OPTIONS_SUB=	yes
 GRAPH_DESC=	Enable the rrdtool graph command (needs cairo)
 DEJAVU_DESC=	Use DejaVu fonts (requires X11)
 MMAP_DESC=	Use mmap in rrd_update
 PERL_DESC=	Build PERL module
 PYTHON_DESC=	Build PYTHON bindings
 RUBY_DESC=	Build RUBY bindings
 
 DEJAVU_RUN_DEPENDS=	dejavu>0:x11-fonts/dejavu
 
 DOCS_CONFIGURE_ENABLE=	docs
 DOCS_USES=		groff
 
 GRAPH_CONFIGURE_OFF=	--disable-rrdcgi --disable-rrd_graph
 GRAPH_LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 			libpng.so:graphics/png
 GRAPH_USE=		GNOME=cairo,pango
 MMAP_CONFIGURE_ENABLE=	mmap
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USE=		GNOME=intltool
 NLS_USES=		gettext localbase
 PERL_CONFIGURE_OFF=	--disable-perl
 PERL_CONFIGURE_ON=	--enable-perl --enable-perl-site-install
 PERL_MAKE_ARGS=		PERL_MAKE_OPTIONS='PREFIX="${PREFIX}" INSTALLPRIVLIB="${PREFIX}/lib" INSTALLARCHLIB="${PREFIX}/lib"'
 PERL_USES=		perl5
 PYTHON_CONFIGURE_ENABLE=python
 PYTHON_USES=		python
 PYTHON_USE=		python=flavors,optsuffix
 RUBY_CONFIGURE_ENABLE=	ruby
 RUBY_USE=		RUBY=yes
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPERL}
 SHEBANG_FILES=	examples/rrdcached/rrdcached-size.pl
 PORTEXAMPLES+=	4charts.pl bigtops.pl minmax.pl perftest.pl \
 		piped-demo.pl shared-demo.pl stripes.pl \
 		rrdcached/RRDCached.pm rrdcached/rrdcached-size.pl
 .endif
 .if ${PORT_OPTIONS:MPYTHON}
 SHEBANG_FILES+=	examples/stripes.py
 PORTEXAMPLES+=	stripes.py
 .endif
 
 post-extract:
 	@${REINPLACE_CMD} -E 's|(^rrdcached_LDADD = librrd_th.la)|\1 $$\(ALL_LIBS\)|' \
 		${WRKSRC}/src/Makefile.in
 
 	@${REINPLACE_CMD} -E 's|(^rrdtool_LDADD = librrd.la)|\1 $$\(ALL_LIBS\)|' \
 		${WRKSRC}/src/Makefile.in
 
 post-extract-EXAMPLES-off:
 	@${REINPLACE_CMD} -e '/^SUBDIRS = /s| examples | |' \
 		${WRKSRC}/Makefile.in
 
 post-install-EXAMPLES-on:
 .if !defined(BATCH)
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "############################################################################"
 	@${ECHO_MSG} "# See ${EXAMPLESDIR} for some demonstration code        #"
 	@${ECHO_MSG} "############################################################################"
 .endif
 
 post-install-PERL-on:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/RRDs/RRDs.so
 
 post-install-PERL-off:
 	${RM} ${STAGEDIR}${EXAMPLESDIR}/*.pl
 	${RM} -r ${STAGEDIR}${EXAMPLESDIR}/rrdcached
 
 post-install-PYTHON-on:
 	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/rrdtool.so
 
 post-install-PYTHON-off:
 	${RM} ${STAGEDIR}${EXAMPLESDIR}/stripes.py
 
 post-install-RUBY-on:
 	${STRIP_CMD} ${STAGEDIR}${RUBY_SITEARCHLIBDIR}/RRD.so
 
 .include <bsd.port.mk>
Index: head/databases/rrdtool/files/patch-src_rrd__graph__helper.c
===================================================================
--- head/databases/rrdtool/files/patch-src_rrd__graph__helper.c	(nonexistent)
+++ head/databases/rrdtool/files/patch-src_rrd__graph__helper.c	(revision 530222)
@@ -0,0 +1,25 @@
+Backport of:
+
+commit 254e4e44cd7828fba8f5bb18a7a29668221e0af5
+Author: John W. O'Brien <john@saltant.com>
+Date:   Sat Mar 14 08:49:47 2020 -0400
+
+    Fix double meaning of time 0 as uninitialized value
+
+    Treat "VRULE:0#..." as "VRULE:1#..." because elsewhere xrule==0 is
+    used to mean xrule has not been set, which can lead to an array
+    bounds violation.
+
+--- src/rrd_graph_helper.c.orig	2020-03-14 17:06:47 UTC
++++ src/rrd_graph_helper.c
+@@ -776,6 +776,10 @@ static graph_desc_t* newGraphDescription(image_desc_t 
+               }
+               if (gf==GF_VRULE){
+                  gdp->xrule=val;
++                 if (gdp->xrule == 0) {
++                    /* distinguish from uninitialized */
++                    gdp->xrule++;
++                 }
+               }
+               else {
+                  gdp->yrule=val;

Property changes on: head/databases/rrdtool/files/patch-src_rrd__graph__helper.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property