Attachment 166607 Details for Bug 206902 – Complete 2.19_5 -> 2.23 diff

[patch] Complete 2.19_5 -> 2.23 diff

routers2.23.patch (text/plain), 5.12 KB, created by Dan Lukes on 2016-02-05 07:59:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dan Lukes

Created: 2016-02-05 07:59:00 UTC

Size: 5.12 KB

patch

obsolete

>diff -ur /home/dan/routers2/Makefile ./Makefile
>--- /home/dan/routers2/Makefile	2016-02-05 08:41:48.729360000 +0100
>+++ ./Makefile	2016-02-05 08:42:21.581777000 +0100
>@@ -2,8 +2,7 @@
> # $FreeBSD: head/net-mgmt/routers2/Makefile 395483 2015-08-28 13:39:56Z amdmi3 $
> 
> PORTNAME=	routers2
>-PORTVERSION=	2.19
>-PORTREVISION=	5
>+PORTVERSION=	2.23
> CATEGORIES=	net-mgmt
> MASTER_SITES=	http://www.steveshipway.org/software/rrd/ \
> 		ftp://ftp.oav.oav.net/routers2/
>diff -ur /home/dan/routers2/distinfo ./distinfo
>--- /home/dan/routers2/distinfo	2016-02-05 08:41:48.729086000 +0100
>+++ ./distinfo	2016-02-05 08:42:25.522800000 +0100
>@@ -1,2 +1,2 @@
>-SHA256 (routers2-v2.19.tar.gz) = 6763b5a039780d42a5f7b222cf4b90922fd3cd78787c8e36028a923142b0cacb
>-SIZE (routers2-v2.19.tar.gz) = 411136
>+SHA256 (routers2-v2.23.tar.gz) = bb1d98648afa11e487724069f0a160b4414cffa9ab1db412573db8e7a66fb4dd
>+SIZE (routers2-v2.23.tar.gz) = 707749
>diff -ur /home/dan/routers2/files/patch-routers2.conf ./files/patch-routers2.conf
>--- /home/dan/routers2/files/patch-routers2.conf	2016-02-05 08:41:48.728987000 +0100
>+++ ./files/patch-routers2.conf	2016-02-05 08:49:50.715570000 +0100
>@@ -1,7 +1,7 @@
>---- routers2.conf.orig	2008-11-06 11:19:55.000000000 +0100
>-+++ routers2.conf	2008-11-06 11:46:39.000000000 +0100
>-@@ -148,7 +148,7 @@
>- #mysql-database = authdb
>+--- routers2.conf.orig	2013-07-30 06:09:20.000000000 +0200
>++++ routers2.conf	2016-02-05 08:48:48.910106000 +0100
>+@@ -162,7 +162,7 @@
>+ # pass = varchar(50), encrypted password
>  #
>  # Multi-language characters support: set charset here.
> -#charset = iso-8859-1
>@@ -9,7 +9,7 @@
>  #charset = utf-8
>  #
>  # Language support 
>-@@ -186,7 +186,7 @@
>+@@ -214,7 +214,7 @@
>  # Set this to 'yes' to greatly speed up the parsing at the expense of
>  # having to have your .cfg files in a set format.  DO NOT enable this
>  # unless you are sure that your .cfg files meet the necessary criteria.
>@@ -18,7 +18,7 @@
>  #
>  # Set this to no if your browser barfs on the popup javascript. Default is yes.
>  #javascript = no
>-@@ -208,17 +208,17 @@
>+@@ -236,17 +236,17 @@
>  # is not really necessary in here and can (usually) be safely ignored.
>  # NT users can put a drive letter in if required.
>  # dbpath = D:\rrdtool\files
>@@ -39,7 +39,7 @@
>  # Wildcarded pattern match for MRTG conf files.
>  # You can put several of these here, separated by spaces.
>  # Note that these can include a path separator - eg, site*/*.cfg
>-@@ -269,28 +269,29 @@
>+@@ -297,29 +297,30 @@
>  #
>  # The default graph type.  Must be 6 d w m y or dwmy (All graphs). Default is d
>  #graphtype = d
>@@ -66,15 +66,16 @@
>  # yes/no/always default: no
> -#6hour = no
> +6hour = yes
>+ 
>  # Shall we have the 95th percentile and total usage calculations?
>  # This can eat a LOT of CPU/Memory, so make sure to test with it OFF first.
>  # default: no
> -#percentile = yes
> +percentile = yes
>- # Shall we use the last update time as the base, instead of the current time?
>- # This can stop the occasional occurence of a grey band at the end of the graph
>- # and is useful if demoing the software with some (non-updated) test data.
>-@@ -311,7 +312,7 @@
>+ # What level should this percentile be?  Default is 95th.
>+ # default: 95
>+ #percent = 90
>+@@ -345,7 +346,7 @@
>  # All styles:
>  #sorder = s t n n2 l l2 l2D x x2 x3 x3D sbp nbp sp np
>  # No PDA support:
>@@ -83,13 +84,13 @@
>  # Style codes are usually made from the width code (stnlx), and an optional
>  # suffix consisting of 2(double heigth), b(black and white), p(PDA mode).
>  # Also now we can have a suffix of 3 for triple-height.
>-@@ -353,14 +354,14 @@
>+@@ -387,14 +388,14 @@
>  # Do we want a 'total traffic' line on the default 'incoming' and 
>  # 'outgoing' graphs?
>  # yes/no default is NO
> -#showtotal = no
> +showtotal = yes
>- #
>+ 
>  # Group the router names in the left-hand menu by directory name?
>  # yes/no default is NO
> -#group = yes
>@@ -101,7 +102,7 @@
>  # Groups heirachy is by group description, separated by :. Change the separating
>  # character here:
>  #groupsep = :
>-@@ -385,8 +386,8 @@
>+@@ -418,8 +419,8 @@
>  # maybe you'd prefer 8 and 18 ?
>  # These hours may NOT cross midnight (ie, end > start) and are relative to the
>  # timezone of the target in question, or local timezone if not known.
>@@ -109,22 +110,23 @@
> -#dayend   = 18
> +daystart = 8 
> +dayend   = 18
>- # Work days - Sun=0 -- default 1 2 3 4 5
>+ 
>  # THIS NOT YET USED: EXPERIMENTAL
>- #workdays = 1 2 3 4 5 
>-@@ -462,6 +463,7 @@
>+ # Work days - Sun=0 -- default 1 2 3 4 5
>+@@ -496,7 +497,7 @@
>+ 
>  # Use twin-menu screen format (not recommended for screens < 1024x768 )
>  # yes/no default is NO
>- #twinmenu = no
>+-#twinmenu = no
> +twinmenu = yes
>- #
>+ 
>  # Normally, graphs refresh automatically as soon as they become out of date.
>  # This is about every 5 mins for daily graphs.  You may wish to make the
>-@@ -521,6 +523,7 @@
>+@@ -560,6 +561,7 @@
>  # Set to 'no' to never use 'lazy' mode.  A bug in rrdtool 1.3.0 and 1.3.1 can 
>  # make lazy mode result in nondisplaying or nonupdating graph images.
>  #lazy = no
> +lazy = yes
>  
>- # short descriptions for routers and interfaces
>- # These are used in the lefthand menu, and in small graphs.
>+ # Set to 'yes' to enable Pango markup in graph labels.  Experimental.
>+ #pango = no

Flags:

rakuco: maintainer-approval? (kiwi)

Actions: View | Diff

Attachments on bug 206902: 166527 | 166607 | 167733