version bump (#313377)

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

5 files changed, 131 insertions, 2 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/Manifest b/www-servers/varnish/Manifest
index 97a19d4c0e76..cf2be353d7b5 100644
--- a/www-servers/varnish/Manifest
+++ b/www-servers/varnish/Manifest
@@ -1,13 +1,17 @@
 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 varnish-2.1.4-find-rst2man.py.patch 558 RMD160 76800fdd0e6d047a3cfd20fa0d44ed932bc8c825 SHA1 36ee3afa89cff9c3ca5e2e33db3ee4baa7161352 SHA256 3bf1bbc6b8b103c9cfbe4e0ef366122c7dc84ea2aa039c147e45b35654c4d882
+AUX varnish-2.1.4-virtual-ncsa.patch 1540 RMD160 d4d13281be8320b57391a4a5d010daf0d249d23f SHA1 b1e2684af02501002609e44781f010aafbaf7df3 SHA256 6f08c3d21799cb845712f5c5590727521d857a5146347c582f6618a257825ecc
 AUX varnishd.confd 311 RMD160 7ae692df018d0a889f4465ec9436b56a2b8d6368 SHA1 44abde826e884c35ff0748c62fe470dcdc2bb914 SHA256 06330cb231b6d64d85be34e5537c3c8741c0d50291f82cd549a2d0685f294e37
 AUX varnishd.initd 1047 RMD160 3afab33ab08be488111de692d8e6e06d05cf33ff SHA1 a19eab18e12550b0b16232f404badf24adc3c443 SHA256 e8c46f79bf38a6e6aebfbbfea6dcbdd69865527301d03928c7ee4f2a379624a5
 AUX varnishd.logrotate 115 RMD160 975e67b1250be86eec8b02c043e89dc045cc2d1e SHA1 f5fbed252083090c8a138063031be62e840137ee SHA256 017173cb42bb60f853063b7fbc843120c547e501233ce2299e1066b5d81e4d5e
 DIST varnish-2.0.4.tar.gz 786945 RMD160 93f94555f42205ff5f324e76acb121c8da71f6e9 SHA1 7a7b1ce657b64c89025d61983b84d6ebf88dfbb2 SHA256 7ee6c66cdafda86a9d32169e5b773c57ba05e1f556b5c99585964e8f2985ae3e
 DIST varnish-2.0.6.tar.gz 810518 RMD160 5b3827ae4de7be27442d68283bd8e4bd57a13199 SHA1 c688d7825d52b2f21a368cb332564abe62227595 SHA256 08c5f6059cb6e2df97d90ddf8e183156faa007121da3b3128678825b4b9fd2eb
 DIST varnish-2.1.3.tar.gz 886945 RMD160 b919fde15176b3c96e5860ee32465f45228fc683 SHA1 730eea869b6aabace6e3e638c743d722f5f67fd7 SHA256 09a97dabbc081a28f3b4530491fcbc6f2510ee9964794e24cbc9f1f6935340ef
+DIST varnish-2.1.4.tar.gz 1539241 RMD160 f5d9bea792f7d2f9ca8dec8bc96c3ac88f0a45a9 SHA1 3e3734f7795880a90a0514e9fb40d76fd170221b SHA256 474913110458fd0989a5cddf8f67011fc1d20bb1cd61e85cbef99147acb6ac8e
 EBUILD varnish-2.0.4-r1.ebuild 1390 RMD160 3541f08e9564998fb6affe52bacde6138d1ea2f1 SHA1 98cd57f581c8dca74bb29728078499858cd27312 SHA256 27b7d1cc03006f0949297abcb0d1f4f19abedbe01e3741405abeedf197bba7d9
 EBUILD varnish-2.0.6.ebuild 1403 RMD160 b5a8c3c94c0e170ca7a0bad56bd2e88f56021ed4 SHA1 5e4991df042cd066bf2830b2a20334966d30b8a1 SHA256 8bd5ed40b662fe054d4e57ebed8b8a52b66844936997d8d65f0312dc171fbaf3
 EBUILD varnish-2.1.3.ebuild 1331 RMD160 ccaf29e326362b12251078f5e5f5263467638b91 SHA1 24a21c86bc27529fe75264ecac6c9d1ae3d98c95 SHA256 c6089a11826650d98fb22daf66f9b01d733569c1ee5fd43f556ae81f82a61c51
-MISC ChangeLog 5023 RMD160 e174a82b4c75576207040d3681333eb765644221 SHA1 06f626675a9d01433dab7fa85e26c39b93eb85dd SHA256 339b33c594b094a2554ad78d26b3c7d4a7eecbe7332763777e0e2b8f3f68aca2
+EBUILD varnish-2.1.4.ebuild 1491 RMD160 442996a86f42540c7ce9067e4273f748a471d24a SHA1 111a402ef8a9cc0626c9d90be36a1c751d3b31fb SHA256 7db6dd4bdf609ebefd520ff525cbbfe07cbc401311b236f740778d3f8b63db6c
+MISC ChangeLog 5241 RMD160 8c6d99edfa1518313d1f0c6559049205524b06bc SHA1 c67d69c0e4b47c68868b6ba6ebce352b3d73c874 SHA256 96a5d3d5baad0e19a65eac056f2fb96a66bbc5eecbc06d208330d62b7d74684f
 MISC metadata.xml 1026 RMD160 e7e9f2813e22bea7b993644082badd89460d3d7f SHA1 3bd5b7b70bb6904df77374f7df74f6cedf074d08 SHA256 fda15c7ee0557ab9d595e3e98caa18bc7b3da81875bbac233f312b32eb4d84f5
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"
+}