summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordemon <demon@FreeBSD.org>2016-07-01 09:16:32 +0000
committerdemon <demon@FreeBSD.org>2016-07-01 09:16:32 +0000
commitc08a760cc9625f0f15eea4685fea6e6d06b93147 (patch)
treefb91bbdf5f2362e7343bc870e587ed46c3085a7e
parent5810c70e3ad9b7a2c4eb0bc74cd0119fac27a511 (diff)
downloadFreeBSD-ports-c08a760cc9625f0f15eea4685fea6e6d06b93147.zip
FreeBSD-ports-c08a760cc9625f0f15eea4685fea6e6d06b93147.tar.gz
Understand log format produced by new versions of squid.
Submitted by: Dimitris Kalogeras <D.Kalogeras@noc.ntua.gr>
-rw-r--r--www/calamaris/Makefile2
-rw-r--r--www/calamaris/files/patch-calamaris13
2 files changed, 12 insertions, 3 deletions
diff --git a/www/calamaris/Makefile b/www/calamaris/Makefile
index 9f79673..29b4d84 100644
--- a/www/calamaris/Makefile
+++ b/www/calamaris/Makefile
@@ -3,7 +3,7 @@
PORTNAME= calamaris
PORTVERSION= 2.59
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www textproc
MASTER_SITES= http://cord.de/files/calamaris/
diff --git a/www/calamaris/files/patch-calamaris b/www/calamaris/files/patch-calamaris
index ee29939..b7b0cdb 100644
--- a/www/calamaris/files/patch-calamaris
+++ b/www/calamaris/files/patch-calamaris
@@ -1,5 +1,14 @@
---- calamaris.orig 2013-03-11 16:52:12.000000000 +0400
-+++ calamaris 2013-03-11 16:52:45.000000000 +0400
+--- calamaris.orig 2016-07-01 12:14:22.630107000 +0300
++++ calamaris 2016-07-01 12:14:58.852151000 +0300
+@@ -1728,7 +1728,7 @@
+ $hier++;
+ $hier_size += $log_size;
+ $hier_time += $log_reqtime;
+- if ( $log_hier_method =~ m#DIRECT|SOURCE_FASTEST#o ) {
++ if ( $log_hier_method =~ m#ORIGINAL_DST|DIRECT|SOURCE_FASTEST#o ) {
+ $hier_direct++;
+ $hier_direct_size += $log_size;
+ $hier_direct_time += $log_reqtime;';
@@ -2606,7 +2606,7 @@
100, 100 * $tcp_hit / $tcp );
}
OpenPOWER on IntegriCloud