version bump (#313377)

(Portage version: 2.2_rc98/cvs/Linux i686)

4 files changed, 126 insertions, 1 deletions

diff --git a/www-servers/varnish/ChangeLog b/www-servers/varnish/ChangeLog
index 27a79d7a9043..51689be8eb02 100644
--- a/www-servers/varnish/ChangeLog
+++ b/www-servers/varnish/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-servers/varnish
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/ChangeLog,v 1.32 2010/10/21 20:31:50 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/ChangeLog,v 1.33 2010/10/21 21:43:30 bangert Exp $
+
+*varnish-2.1.4 (21 Oct 2010)
+
+  21 Oct 2010; Thilo Bangert <bangert@gentoo.org> +varnish-2.1.4.ebuild,
+  +files/varnish-2.1.4-find-rst2man.py.patch,
+  +files/varnish-2.1.4-virtual-ncsa.patch:
+  version bump (#313377)
 
 *varnish-2.1.3 (21 Oct 2010)
 
diff --git a/www-servers/varnish/files/varnish-2.1.4-find-rst2man.py.patch b/www-servers/varnish/files/varnish-2.1.4-find-rst2man.py.patch
new file mode 100644
index 000000000000..190432f68065
--- /dev/null
+++ b/www-servers/varnish/files/varnish-2.1.4-find-rst2man.py.patch
@@ -0,0 +1,12 @@
+diff -Naur varnish-2.1.4.orig/configure.ac varnish-2.1.4/configure.ac
+--- varnish-2.1.4.orig/configure.ac	2010-10-21 17:45:41.000000000 +0200
++++ varnish-2.1.4/configure.ac	2010-10-21 23:05:35.000000000 +0200
+@@ -30,7 +30,7 @@
+    AC_MSG_WARN([xsltproc not found – not building documentation])
+ fi
+ AM_CONDITIONAL(HAVE_XSLTPROC,[test "x$XSLTPROC" != "xno"])
+-AC_CHECK_PROGS(RST2MAN, [rst2man], "no")
++AC_CHECK_PROGS(RST2MAN, [rst2man rst2man.py], "no")
+ if test "x$RST2MAN" = "xno"; then
+    AC_MSG_WARN([rst2man not found – not building man pages])
+ fi
diff --git a/www-servers/varnish/files/varnish-2.1.4-virtual-ncsa.patch b/www-servers/varnish/files/varnish-2.1.4-virtual-ncsa.patch
new file mode 100644
index 000000000000..4c5bb25b1f4b
--- /dev/null
+++ b/www-servers/varnish/files/varnish-2.1.4-virtual-ncsa.patch
@@ -0,0 +1,57 @@
+diff -Naur varnish-2.1.4.orig/bin/varnishncsa/varnishncsa.c varnish-2.1.4/bin/varnishncsa/varnishncsa.c
+--- varnish-2.1.4.orig/bin/varnishncsa/varnishncsa.c	2010-10-21 17:45:41.000000000 +0200
++++ varnish-2.1.4/bin/varnishncsa/varnishncsa.c	2010-10-21 22:42:50.000000000 +0200
+@@ -102,6 +102,7 @@
+ 
+ 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,
+@@ -469,6 +470,11 @@
+ 
+ 	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 ");
+@@ -508,7 +514,7 @@
+ 	 * 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);
+@@ -568,7 +574,7 @@
+ {
+ 
+ 	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);
+ }
+@@ -587,11 +593,14 @@
+ 
+ 	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.1.4.ebuild b/www-servers/varnish/varnish-2.1.4.ebuild
new file mode 100644
index 000000000000..a6e509983d3b
--- /dev/null
+++ b/www-servers/varnish/varnish-2.1.4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/varnish-2.1.4.ebuild,v 1.1 2010/10/21 21:43:30 bangert Exp $
+
+EAPI="3"
+
+inherit eutils autotools
+
+DESCRIPTION="Varnish is a state-of-the-art, high-performance HTTP accelerator."
+HOMEPAGE="http://www.varnish-cache.org/"
+SRC_URI="http://www.varnish-software.com/sites/default/files/${P}.tar.gz"
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+#varnish compiles stuff at run time
+RDEPEND="sys-devel/gcc"
+DEPEND="dev-python/docutils"
+
+RESTRICT="test" #315725
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.1.4-virtual-ncsa.patch
+	epatch "${FILESDIR}"/${PN}-2.1.4-find-rst2man.py.patch
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	newinitd "${FILESDIR}"/varnishd.initd varnishd || die
+	newconfd "${FILESDIR}"/varnishd.confd varnishd || die
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/varnishd.logrotate" varnishd
+
+	dodir /var/log/varnish
+
+	use doc && dohtml -r "doc/sphinx/=build/html/"
+}
+
+pkg_postinst () {
+	elog "No demo-/sample-configfile is included in the distribution -"
+	elog "please read the man-page for more info."
+	elog "A sample (localhost:8080 -> localhost:80) for gentoo is given in"
+	elog "   /etc/conf.d/varnishd"
+	echo
+	ewarn "Varnish 2.1.x introduces VCL changes wrt. 2.0.x. See also"
+	ewarn "http://www.varnish-cache.org/docs/2.1/reference/vcl.html"
+}