remove old versions

(Portage version: 2.2_rc20/cvs/Linux 2.6.28-gentoo i686)

4 files changed, 7 insertions, 157 deletions

diff --git a/www-servers/varnish/ChangeLog b/www-servers/varnish/ChangeLog
index 7d01c01b24cc..e394136e941a 100644
--- a/www-servers/varnish/ChangeLog
+++ b/www-servers/varnish/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-servers/varnish
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/ChangeLog,v 1.18 2008/11/14 14:59:09 bangert Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/ChangeLog,v 1.19 2009/01/27 19:52:24 bangert Exp $
+
+  27 Jan 2009; Thilo Bangert <bangert@gentoo.org>
+  -files/varnish-2.0.1-fix-ESI-coredump.diff, -varnish-1.1.2.ebuild,
+  -varnish-2.0.1-r1.ebuild:
+  remove old versions
 
 *varnish-2.0.2 (14 Nov 2008)
 
diff --git a/www-servers/varnish/files/varnish-2.0.1-fix-ESI-coredump.diff b/www-servers/varnish/files/varnish-2.0.1-fix-ESI-coredump.diff
deleted file mode 100644
index 1dd4e2e59406..000000000000
--- a/www-servers/varnish/files/varnish-2.0.1-fix-ESI-coredump.diff
+++ /dev/null
@@ -1,86 +0,0 @@
-diff -Naur varnish-2.0.1.orig/bin/varnishd/cache_hash.c varnish-2.0.1/bin/varnishd/cache_hash.c
---- varnish-2.0.1.orig/bin/varnishd/cache_hash.c	2008-10-17 20:59:49.000000000 +0200
-+++ varnish-2.0.1/bin/varnishd/cache_hash.c	2008-10-23 21:00:29.000000000 +0200
-@@ -266,7 +266,8 @@
- 
- 	if (busy_o != NULL) {
- 		/* There are one or more busy objects, wait for them */
--		VTAILQ_INSERT_TAIL(&oh->waitinglist, sp, list);
-+		if (sp->esis == 0)
-+			VTAILQ_INSERT_TAIL(&oh->waitinglist, sp, list);
- 		sp->objhead = oh;
- 		UNLOCK(&oh->mtx);
- 		return (NULL);
-diff -Naur varnish-2.0.1.orig/bin/varnishd/cache_vrt_esi.c varnish-2.0.1/bin/varnishd/cache_vrt_esi.c
---- varnish-2.0.1.orig/bin/varnishd/cache_vrt_esi.c	2008-10-17 20:59:49.000000000 +0200
-+++ varnish-2.0.1/bin/varnishd/cache_vrt_esi.c	2008-10-23 20:59:35.000000000 +0200
-@@ -796,7 +796,6 @@
- void
- ESI_Deliver(struct sess *sp)
- {
--
- 	struct esi_bit *eb;
- 	struct object *obj;
- 
-@@ -839,7 +838,16 @@
- 		sp->step = STP_RECV;
- 		http_ForceGet(sp->http);
- 		http_Unset(sp->http, H_Content_Length);
--		CNT_Session(sp);
-+		while (1) {
-+			CNT_Session(sp);
-+			if (sp->step == STP_DONE)
-+				break;
-+			AN(sp->wrk);
-+			WSL_Flush(sp->wrk, 0);
-+			DSL(0x20, SLT_Debug, sp->id, "loop waiting for ESI");
-+			usleep(10000);
-+		}
-+		assert(sp->step == STP_DONE);
- 		sp->esis--;
- 		sp->obj = obj;
- 
-diff -Naur varnish-2.0.1.orig/varnishtest/tests/r00345.vtc varnish-2.0.1/varnishtest/tests/r00345.vtc
---- varnish-2.0.1.orig/varnishtest/tests/r00345.vtc	1970-01-01 01:00:00.000000000 +0100
-+++ varnish-2.0.1/varnishtest/tests/r00345.vtc	2008-10-23 20:56:40.000000000 +0200
-@@ -0,0 +1,40 @@
-+# $Id: varnish-2.0.1-fix-ESI-coredump.diff,v 1.1 2008/10/23 19:30:05 bangert Exp $

-+

-+test "#345, ESI waitinglist trouble"

-+

-+server s1 {

-+	rxreq 

-+	txresp -body {<esi:include src="someurl">}

-+	rxreq 

-+	sema r1 sync 2

-+	delay 1

-+	txresp -body {DATA}

-+} -start

-+

-+varnish v1 -arg "-p diag_bitmap=0x20" -vcl+backend {

-+	sub vcl_fetch {

-+		if (req.url == "/") {

-+			esi;

-+		}

-+	}

-+} -start

-+

-+client c1 {

-+	txreq

-+	rxresp

-+	expect resp.bodylen == 4

-+} -start

-+

-+client c2 {

-+	txreq

-+	sema r1 sync 2

-+	rxresp

-+	expect resp.bodylen == 4

-+} -run

-+

-+client c1 {

-+	txreq

-+	rxresp

-+	expect resp.bodylen == 4

-+} -run

-+

diff --git a/www-servers/varnish/varnish-1.1.2.ebuild b/www-servers/varnish/varnish-1.1.2.ebuild
deleted file mode 100644
index 78dcf4e404e2..000000000000
--- a/www-servers/varnish/varnish-1.1.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/varnish-1.1.2.ebuild,v 1.2 2008/03/10 22:10:20 bangert Exp $
-
-inherit eutils
-DESCRIPTION="Varnish is an HTTP accelerator"
-HOMEPAGE="http://varnish.linpro.no/"
-SRC_URI="mirror://sourceforge/varnish/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-RDEPEND="sys-devel/gcc"
-
-src_compile() {
-	econf || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	newinitd "${FILESDIR}"/varnishd.initd varnishd || die
-	newconfd "${FILESDIR}"/varnishd.confd varnishd || die
-}
-
-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
-}
diff --git a/www-servers/varnish/varnish-2.0.1-r1.ebuild b/www-servers/varnish/varnish-2.0.1-r1.ebuild
deleted file mode 100644
index 98fe5e0ed385..000000000000
--- a/www-servers/varnish/varnish-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/varnish-2.0.1-r1.ebuild,v 1.1 2008/10/23 19:30:05 bangert Exp $
-
-inherit eutils
-
-DESCRIPTION="Varnish is an HTTP accelerator"
-HOMEPAGE="http://varnish.projects.linpro.no/"
-SRC_URI="mirror://sourceforge/varnish/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-#varnish compiles stuff at run time
-RDEPEND="sys-devel/gcc"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/varnish-2.0.1-fix-ESI-coredump.diff
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	newinitd "${FILESDIR}"/varnishd.initd varnishd || die
-	newconfd "${FILESDIR}"/varnishd.confd varnishd || die
-}
-
-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
-}