mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-20 00:21:35 +00:00
Upgrade to 1.1.2.
This commit is contained in:
Dag-Erling Smørgrav
parent
a7ad33043b
commit
1492e1edb9
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=204212
@ -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>
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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);
|
||||
}
|
||||
39
www/varnish/files/varnishncsa.in
Normal file
39
www/varnish/files/varnishncsa.in
Normal file
@ -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"
|
||||
@ -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>
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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);
|
||||
}
|
||||
39
www/varnish2/files/varnishncsa.in
Normal file
39
www/varnish2/files/varnishncsa.in
Normal file
@ -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"
|
||||
Loading…
Reference in New Issue
Block a user