From d7588dfb2c0258efd62bbeec5edb5af77f381713 Mon Sep 17 00:00:00 2001 From: Matthias Fechner Date: Wed, 7 Nov 2018 19:40:59 +0000 Subject: * Fix runtime PHP errors that stop the code working if short_opentag is disabled (default!) * Remove most PHP warnings/notices that go to error_log * Convert patches to new format where needed * Fix HTML output to be valid * Fix quoting of SQL objects * Fix escaping of user-provided SQL data (potential sql injection) * Widen fields in 95.php and 95.pl for interface and router names * Fix warnings in perl modules in newer perl versions * Fix createdb script to use CREATE USER/GRANT not manipulate user db directly * Add "Update_desc" config entry to auto-update port descriptions from snmp * Update default SNMP version to 2 * Although this doesn't reference any CVE's, it does contain fixes for potential security issues PR: 227376 Submitted by: freebsd-ports@dan.me.uk (maintainer) Reported by: freebsd-ports@dan.me.uk (maintainer) Reviewed by: mfechner Approved by: mentors (timeout), portmgr (timeout) MFC after: 2 days Differential Revision: https://reviews.freebsd.org/D17637 --- net/rtg/files/patch-man_rtgplot.1 | 43 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 net/rtg/files/patch-man_rtgplot.1 (limited to 'net/rtg/files/patch-man_rtgplot.1') diff --git a/net/rtg/files/patch-man_rtgplot.1 b/net/rtg/files/patch-man_rtgplot.1 new file mode 100644 index 000000000000..6ccca28ba90f --- /dev/null +++ b/net/rtg/files/patch-man_rtgplot.1 @@ -0,0 +1,43 @@ +--- man/rtgplot.1.orig 2003-09-25 04:10:36 UTC ++++ man/rtgplot.1 +@@ -10,7 +10,8 @@ + -t tablename(s) -i interface(s) [options] begin end + .br + .B rtgplot.cgi +-?t1=tablename &t2=tablename &iid=interface &begin=unixtime &end=unixtime &[options] ++?t1=tablename &t`_name=descname &t2=tablename &t2_name=descname &iid=interface ++&begin=unixtime &end=unixtime &[options] + .SH DESCRIPTION + .I rtgplot + generates traffic plots of RTG data in PNG format. It operates in +@@ -82,14 +83,19 @@ pixels. + Set plot bottom border to + .RI + pixels. ++.TP ++.IR "title=" ++Set graph title to ++.RI <title> + .PP + .SH "EXAMPLES" + .PP + .br + Example HTML IMG TAG: + .PP +-<IMG SRC="rtgplot.cgi? t1=ifInOctets_2& t2=ifOutOctets_2& iid=4& +-begin=1046754000& end=1046840399& units=bits/s& factor=8& scalex=yes"> ++<IMG SRC="rtgplot.cgi? t1=ifInOctets_2& t1_name=Input& t2=ifOutOctets_2& ++t2_name=Output& iid=4& begin=1046754000& end=1046840399& units=bits/s& ++factor=8& scalex=yes& title=Bandwidth+Graph"> + .PP + will plot two lines from the MySQL tables ifInOctets_2 and ifOutOctets_2 + corresponding to interface 4 on router 2 for the time span 1046754000 to +@@ -97,6 +103,8 @@ corresponding to interface 4 on router 2 + second; the units argument is displayed as the Y-axis label on the plot. + The scalex argument auto-adjusts the X time axis according to the available + data samples rather than according to the actual time span given. ++It will have a graph title of "Bandwidth Graph" and legend tags of "Input" ++and "Output" for t1 and t2 respectively. + .PP + Draw a 95th percentile line: + .PP -- cgit v1.2.3