Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 1 Jul 2016 09:16:32 +0000 (UTC)
From:      Dmitry Sivachenko <demon@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r417870 - in head/www/calamaris: . files
Message-ID:  <201607010916.u619GWpg001015@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: demon
Date: Fri Jul  1 09:16:32 2016
New Revision: 417870
URL: https://svnweb.freebsd.org/changeset/ports/417870

Log:
  Understand log format produced by new versions of squid.
  
  Submitted by:	Dimitris Kalogeras <D.Kalogeras@noc.ntua.gr>

Modified:
  head/www/calamaris/Makefile
  head/www/calamaris/files/patch-calamaris

Modified: head/www/calamaris/Makefile
==============================================================================
--- head/www/calamaris/Makefile	Fri Jul  1 09:07:35 2016	(r417869)
+++ head/www/calamaris/Makefile	Fri Jul  1 09:16:32 2016	(r417870)
@@ -3,7 +3,7 @@
 
 PORTNAME=	calamaris
 PORTVERSION=	2.59
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www textproc
 MASTER_SITES=	http://cord.de/files/calamaris/
 

Modified: head/www/calamaris/files/patch-calamaris
==============================================================================
--- head/www/calamaris/files/patch-calamaris	Fri Jul  1 09:07:35 2016	(r417869)
+++ head/www/calamaris/files/patch-calamaris	Fri Jul  1 09:16:32 2016	(r417870)
@@ -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 );
    }



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201607010916.u619GWpg001015>