support virtual host log format in varnishncsa (upstream #485)

Package-Manager: portage-2.2_rc33/cvs/Linux i686

4 files changed, 67 insertions, 4 deletions

diff --git a/www-servers/varnish/ChangeLog b/www-servers/varnish/ChangeLog
index a7f36f4481d7..2c97d13e8eb7 100644
--- a/www-servers/varnish/ChangeLog
+++ b/www-servers/varnish/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-servers/varnish
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/ChangeLog,v 1.23 2009/04/18 20:20:58 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/ChangeLog,v 1.24 2009/06/11 09:50:42 hollow Exp $
+
+  11 Jun 2009; Benedikt Böhm <hollow@gentoo.org>
+  +files/varnish-2.0.4-virtual-ncsa.patch, varnish-2.0.4.ebuild:
+  support virtual host log format in varnishncsa (upstream #485)
 
   18 Apr 2009; Thilo Bangert <bangert@gentoo.org> -varnish-2.0.2.ebuild,
   -varnish-2.0.3.ebuild:
diff --git a/www-servers/varnish/Manifest b/www-servers/varnish/Manifest
index 89fdb3463085..e6549fbd8f1c 100644
--- a/www-servers/varnish/Manifest
+++ b/www-servers/varnish/Manifest
@@ -1,7 +1,8 @@
 AUX varnish-2.0.4-link-order.patch 1163 RMD160 35a19df782493e71ac6645278cba7857509ede5d SHA1 28ef7346f0cdbe08acd6ea0ce95589108d7138eb SHA256 f1e796285ca4427619ed493b0bea17366260c7cb72e9edb86faa3b18421206c9
+AUX varnish-2.0.4-virtual-ncsa.patch 1722 RMD160 b5c99f2c5c39e9adc52ba4933b33813e600df374 SHA1 15e090b3d6c81e588a514eed9e57a22eb8c2fe35 SHA256 f7a2fd243c1a103dc4d26b1deb6d11d3a0d604ebbc4315520777769886b60227
 AUX varnishd.confd 166 RMD160 ce275968c702f547f6b0db2de24fc1abd3488b04 SHA1 29f426d4ab8de3fb79217fa738e9d8e0800b3662 SHA256 f98389902b477307b1bf4856c4ce744b4c57c88869fffcf0b47217d6b24c24a6
 AUX varnishd.initd 639 RMD160 e747e7077565d189024b61fc907d88aa6b566d77 SHA1 0dedb667ab2c0075009d71b3b183e578fa33aaae SHA256 f5bf12825fd3c844d9d299d84b4f1dc1aaa6987f9f3ab09e2290b06245d4f613
 DIST varnish-2.0.4.tar.gz 786945 RMD160 93f94555f42205ff5f324e76acb121c8da71f6e9 SHA1 7a7b1ce657b64c89025d61983b84d6ebf88dfbb2 SHA256 7ee6c66cdafda86a9d32169e5b773c57ba05e1f556b5c99585964e8f2985ae3e
-EBUILD varnish-2.0.4.ebuild 1061 RMD160 e6db95fce1fbaeb89dd73532f4df54d255adddc0 SHA1 8d5de9bf5c7612396d9693aaa2af16fcae218ad0 SHA256 5fa44682730039f94cf2531cde07153a93655a5eb0fa81cbd2fb45b39d15579f
-MISC ChangeLog 3633 RMD160 ed1a3fbdd560478b74653c2f7d9316c0d036b828 SHA1 997eb71e4faa62615e5264b4be8c5a092c7fcb58 SHA256 94030940ab868dc6f482f86d167384d1bfbd6a395d14418c3cf96361a0a96cd1
+EBUILD varnish-2.0.4.ebuild 1106 RMD160 f1453b238c43543016c3ce9295d8d04ad2aa808d SHA1 158705e695b753ea7cd59eb83f5a76f730788279 SHA256 017848c5e2434d7aedda89c8f7e6d133821771b9f6ef8b5dff35e0d43325adef
+MISC ChangeLog 3813 RMD160 8beae7f8b4e6d766db26d57f996273e5136df33d SHA1 42d3727e6c807dfe254e7b75c4744d01833a61a8 SHA256 1758526ca7702b720b9eed0fb80e43bf4ba512bc1b611685092e7fa72e01fd15
 MISC metadata.xml 1026 RMD160 e7e9f2813e22bea7b993644082badd89460d3d7f SHA1 3bd5b7b70bb6904df77374f7df74f6cedf074d08 SHA256 fda15c7ee0557ab9d595e3e98caa18bc7b3da81875bbac233f312b32eb4d84f5
diff --git a/www-servers/varnish/files/varnish-2.0.4-virtual-ncsa.patch b/www-servers/varnish/files/varnish-2.0.4-virtual-ncsa.patch
new file mode 100644
index 000000000000..7626bcad9ded
--- /dev/null
+++ b/www-servers/varnish/files/varnish-2.0.4-virtual-ncsa.patch
@@ -0,0 +1,57 @@
+diff -NurpP varnish-2.0.4.orig/bin/varnishncsa/varnishncsa.c varnish-2.0.4/bin/varnishncsa/varnishncsa.c
+--- varnish-2.0.4.orig/bin/varnishncsa/varnishncsa.c	2009-04-01 15:35:14.000000000 +0200
++++ varnish-2.0.4/bin/varnishncsa/varnishncsa.c	2009-06-11 11:45:44.084537099 +0200
+@@ -102,6 +102,7 @@ static struct logline {
+ 
+ static size_t nll;
+ static int prefer_x_forwarded_for = 0;
++static int virtual_host_style_logging = 0;
+ 
+ static int
+ isprefix(const char *str, const char *prefix, const char *end,
+@@ -399,6 +400,11 @@ h_ncsa(void *priv, enum shmlogtag tag, u
+ 	if (!lp->bogus) {
+ 		fo = priv;
+ 
++		/* the -v option */
++		if (virtual_host_style_logging) {
++			fprintf(fo, "%s ", lp->df_Host);
++		}
++
+ 		/* %h */
+ 		if (!lp->df_h && spec & VSL_S_BACKEND)
+ 			fprintf(fo, "127.0.0.1 ");
+@@ -438,7 +444,7 @@ h_ncsa(void *priv, enum shmlogtag tag, u
+ 		 * normalized the request URL.
+ 		 */
+ 		fprintf(fo, "\"%s ", lp->df_m);
+-		if (lp->df_Host) {
++		if (!virtual_host_style_logging && lp->df_Host) {
+ 			if (strncmp(lp->df_Host, "http://", 7) != 0)
+ 				fprintf(fo, "http://");
+ 			fprintf(fo, "%s", lp->df_Host);
+@@ -512,7 +518,7 @@ usage(void)
+ {
+ 
+ 	fprintf(stderr,
+-	    "usage: varnishncsa %s [-aDV] [-n varnish_name] "
++	    "usage: varnishncsa %s [-avDV] [-n varnish_name] "
+ 	    "[-P file] [-w file]\n", VSL_USAGE);
+ 	exit(1);
+ }
+@@ -531,11 +537,14 @@ main(int argc, char *argv[])
+ 
+ 	vd = VSL_New();
+ 
+-	while ((c = getopt(argc, argv, VSL_ARGS "aDn:P:Vw:f")) != -1) {
++	while ((c = getopt(argc, argv, VSL_ARGS "avDn:P:Vw:f")) != -1) {
+ 		switch (c) {
+ 		case 'a':
+ 			a_flag = 1;
+ 			break;
++		case 'v':
++			virtual_host_style_logging = 1;
++			break;
+ 		case 'f':
+ 			prefer_x_forwarded_for = 1;
+ 			break;
diff --git a/www-servers/varnish/varnish-2.0.4.ebuild b/www-servers/varnish/varnish-2.0.4.ebuild
index c9827da2b091..9bcb8e0d54d6 100644
--- a/www-servers/varnish/varnish-2.0.4.ebuild
+++ b/www-servers/varnish/varnish-2.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/varnish-2.0.4.ebuild,v 1.1 2009/04/13 09:54:47 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/varnish-2.0.4.ebuild,v 1.2 2009/06/11 09:50:42 hollow Exp $
 
 EAPI="2"
 
@@ -19,6 +19,7 @@ RDEPEND="sys-devel/gcc"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-link-order.patch
+	epatch "${FILESDIR}"/${P}-virtual-ncsa.patch
 	eautoreconf
 }