Upgrade to 1.1.2.

8 files changed, 88 insertions, 48 deletions

diff --git a/www/varnish/Makefile b/www/varnish/Makefile
index d4e869406d6a..56d3334549b8 100644
--- a/www/varnish/Makefile
+++ b/www/varnish/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	varnish
-PORTVERSION=	1.1.1
-PORTREVISION=	2
+PORTVERSION=	1.1.2
 CATEGORIES=	www
 MASTER_SITES=	SF
 
@@ -23,7 +22,7 @@ MAN1=		varnishadm.1 varnishd.1 varnishhist.1 varnishlog.1 \
 		varnishncsa.1 varnishreplay.1 varnishstat.1 varnishtop.1
 MAN7=		vcl.7
 USE_REINPLACE=	YES
-USE_RC_SUBR=	varnishd varnishlog
+USE_RC_SUBR=	varnishd varnishlog varnishncsa
 
 .include <bsd.port.pre.mk>
 
diff --git a/www/varnish/distinfo b/www/varnish/distinfo
index e6e94e79b807..c049c1a561d4 100644
--- a/www/varnish/distinfo
+++ b/www/varnish/distinfo
@@ -1,3 +1,3 @@
-MD5 (varnish-1.1.1.tar.gz) = fb4159a46a32b8c5bceca88f22e999a5
-SHA256 (varnish-1.1.1.tar.gz) = a7fadf7e109c22bd6bf750e2ed98af4423f801ad183e8241668311dea57e2c19
-SIZE (varnish-1.1.1.tar.gz) = 569143
+MD5 (varnish-1.1.2.tar.gz) = d9f74dae59a2158cdc31f446b6d92397
+SHA256 (varnish-1.1.2.tar.gz) = 3377c15bc61b3284b615a890497b413d55f7c702167754ae9088ad758340a440
+SIZE (varnish-1.1.2.tar.gz) = 584191
diff --git a/www/varnish/files/patch-svn-r1913 b/www/varnish/files/patch-svn-r1913
deleted file mode 100644
index 318666826f0e..000000000000
--- a/www/varnish/files/patch-svn-r1913
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: bin/varnishd/cache_center.c
-===================================================================
---- bin/varnishd/cache_center.c	(revision 1912)
-+++ bin/varnishd/cache_center.c	(revision 1913)
-@@ -524,7 +524,12 @@
- 		 */
- 		WSL(sp->wrk, SLT_Debug, sp->fd,
- 		    "on waiting list on obj %u", sp->obj->xid);
--		assert(!isnan(sp->wrk->used));
-+		/*
-+		 * There is a non-zero risk that we come here more than once
-+		 * before we get through, in that case cnt_recv must be set
-+		 */
-+		if (isnan(sp->wrk->used))
-+			sp->wrk->used = TIM_real();
- 		SES_Charge(sp);
- 		return (1);
- 	}
diff --git a/www/varnish/files/varnishncsa.in b/www/varnish/files/varnishncsa.in
new file mode 100644
index 000000000000..25c4bd4fa12e
--- /dev/null
+++ b/www/varnish/files/varnishncsa.in
@@ -0,0 +1,39 @@
+#!/bin/sh
+#
+# $Id$
+#
+
+# PROVIDE: varnishncsa
+# REQUIRE: DAEMON
+# KEYWORD: shutdown
+
+#
+# Add the following lines to /etc/rc.conf to enable varnishncsa:
+#
+#varnishncsa_enable="YES"
+#
+# Configuration variables and their default values:
+#
+#varnishncsa_file=${varnishncsa_file:-"/var/log/varnish-ncsa.log"}
+#varnishncsa_flags=${varnishncsa_flags:-"-D -P ${pidfile} -a -w ${varnishncsa_file}"}
+#
+# See varnishncsa(1) for a detailed overview of command-line options.
+#
+
+. %%RC_SUBR%%
+
+name=varnishncsa
+rcvar=`set_rcvar`
+
+command="%%PREFIX%%/bin/varnishncsa"
+pidfile="/var/run/${name}.pid"
+
+# read configuration and set defaults
+load_rc_config ${name}
+: ${varnishncsa_enable="NO"}
+: ${varnishncsa_file="/var/log/varnish-ncsa.log"}
+: ${varnishncsa_flags="-P ${pidfile} -D -a -w ${varnishncsa_file}"}
+
+load_rc_config ${name}
+
+run_rc_command "$1"
diff --git a/www/varnish2/Makefile b/www/varnish2/Makefile
index d4e869406d6a..56d3334549b8 100644
--- a/www/varnish2/Makefile
+++ b/www/varnish2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	varnish
-PORTVERSION=	1.1.1
-PORTREVISION=	2
+PORTVERSION=	1.1.2
 CATEGORIES=	www
 MASTER_SITES=	SF
 
@@ -23,7 +22,7 @@ MAN1=		varnishadm.1 varnishd.1 varnishhist.1 varnishlog.1 \
 		varnishncsa.1 varnishreplay.1 varnishstat.1 varnishtop.1
 MAN7=		vcl.7
 USE_REINPLACE=	YES
-USE_RC_SUBR=	varnishd varnishlog
+USE_RC_SUBR=	varnishd varnishlog varnishncsa
 
 .include <bsd.port.pre.mk>
 
diff --git a/www/varnish2/distinfo b/www/varnish2/distinfo
index e6e94e79b807..c049c1a561d4 100644
--- a/www/varnish2/distinfo
+++ b/www/varnish2/distinfo
@@ -1,3 +1,3 @@
-MD5 (varnish-1.1.1.tar.gz) = fb4159a46a32b8c5bceca88f22e999a5
-SHA256 (varnish-1.1.1.tar.gz) = a7fadf7e109c22bd6bf750e2ed98af4423f801ad183e8241668311dea57e2c19
-SIZE (varnish-1.1.1.tar.gz) = 569143
+MD5 (varnish-1.1.2.tar.gz) = d9f74dae59a2158cdc31f446b6d92397
+SHA256 (varnish-1.1.2.tar.gz) = 3377c15bc61b3284b615a890497b413d55f7c702167754ae9088ad758340a440
+SIZE (varnish-1.1.2.tar.gz) = 584191
diff --git a/www/varnish2/files/patch-svn-r1913 b/www/varnish2/files/patch-svn-r1913
deleted file mode 100644
index 318666826f0e..000000000000
--- a/www/varnish2/files/patch-svn-r1913
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: bin/varnishd/cache_center.c
-===================================================================
---- bin/varnishd/cache_center.c	(revision 1912)
-+++ bin/varnishd/cache_center.c	(revision 1913)
-@@ -524,7 +524,12 @@
- 		 */
- 		WSL(sp->wrk, SLT_Debug, sp->fd,
- 		    "on waiting list on obj %u", sp->obj->xid);
--		assert(!isnan(sp->wrk->used));
-+		/*
-+		 * There is a non-zero risk that we come here more than once
-+		 * before we get through, in that case cnt_recv must be set
-+		 */
-+		if (isnan(sp->wrk->used))
-+			sp->wrk->used = TIM_real();
- 		SES_Charge(sp);
- 		return (1);
- 	}
diff --git a/www/varnish2/files/varnishncsa.in b/www/varnish2/files/varnishncsa.in
new file mode 100644
index 000000000000..25c4bd4fa12e
--- /dev/null
+++ b/www/varnish2/files/varnishncsa.in
@@ -0,0 +1,39 @@
+#!/bin/sh
+#
+# $Id$
+#
+
+# PROVIDE: varnishncsa
+# REQUIRE: DAEMON
+# KEYWORD: shutdown
+
+#
+# Add the following lines to /etc/rc.conf to enable varnishncsa:
+#
+#varnishncsa_enable="YES"
+#
+# Configuration variables and their default values:
+#
+#varnishncsa_file=${varnishncsa_file:-"/var/log/varnish-ncsa.log"}
+#varnishncsa_flags=${varnishncsa_flags:-"-D -P ${pidfile} -a -w ${varnishncsa_file}"}
+#
+# See varnishncsa(1) for a detailed overview of command-line options.
+#
+
+. %%RC_SUBR%%
+
+name=varnishncsa
+rcvar=`set_rcvar`
+
+command="%%PREFIX%%/bin/varnishncsa"
+pidfile="/var/run/${name}.pid"
+
+# read configuration and set defaults
+load_rc_config ${name}
+: ${varnishncsa_enable="NO"}
+: ${varnishncsa_file="/var/log/varnish-ncsa.log"}
+: ${varnishncsa_flags="-P ${pidfile} -D -a -w ${varnishncsa_file}"}
+
+load_rc_config ${name}
+
+run_rc_command "$1"