Date: Wed, 5 May 2010 11:16:54 +0800 (CST) From: Joe Horn <joehorn@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: des@FreeBSD.org Subject: ports/146319: [PATCH] www/varnish: add a configuration variable about hash algorithm in rc.d/varnishd script Message-ID: <20100505031654.DD8AA4DFC1F@Leo.mi.chu.edu.tw> Resent-Message-ID: <201005050320.o453K2wt004636@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 146319
>Category: ports
>Synopsis: [PATCH] www/varnish: add a configuration variable about hash algorithm in rc.d/varnishd script
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed May 05 03:20:01 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Joe Horn
>Release: FreeBSD 8.0-RELEASE-p2 amd64
>Organization:
Taiwanese User
>Environment:
System: FreeBSD joehorn.idv.tw 8.0-RELEASE-p2 FreeBSD 8.0-RELEASE-p2 #1: Fri Jan 8 23:08:25 CST
>Description:
* Add a configuration variable about hash algorithm in rc.d/varnishd script
* Suppress a warning messege shown by FreeBSD Port Tools :
WARN: Makefile: "LIB_DEPENDS" has to appear earlier.
* Bump PORTREVISION
Port maintainer (des@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- varnish-2.1.1_2.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/www/varnish/Makefile /home/admin/joehorn/varnish/Makefile
--- /usr/ports/www/varnish/Makefile 2010-05-05 02:15:51.000000000 +0800
+++ /home/admin/joehorn/varnish/Makefile 2010-05-05 11:07:13.000000000 +0800
@@ -7,21 +7,21 @@
PORTNAME= varnish
PORTVERSION= 2.1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= SF
MAINTAINER= des@FreeBSD.org
COMMENT= The Varnish high-performance HTTP accelerator
+LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre
+
GNU_CONFIGURE= yes
USE_GMAKE= yes
CONFIGURE_ARGS= --localstatedir=${PREFIX}
USE_LDCONFIG= yes
USE_GNOME= pkgconfig
-LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre
-
MAN1= varnishadm.1 varnishd.1 varnishhist.1 varnishlog.1 \
varnishncsa.1 varnishreplay.1 varnishsizes.1 \
varnishstat.1 varnishtest.1 varnishtop.1
diff -ruN --exclude=CVS /usr/ports/www/varnish/files/varnishd.in /home/admin/joehorn/varnish/files/varnishd.in
--- /usr/ports/www/varnish/files/varnishd.in 2010-03-27 08:15:19.000000000 +0800
+++ /home/admin/joehorn/varnish/files/varnishd.in 2010-05-05 11:02:52.000000000 +0800
@@ -31,6 +31,9 @@
# varnishd_config - name of the varnishd config file.
# default: unset.
#
+# varnishd_algo - hash algorithm
+# default: "classic,16383"
+#
# varnishd_storage - storage method and parameters.
# default: "file,/tmp,50%"
#
@@ -41,8 +44,8 @@
# default: "www"
#
# varnishd_flags - complete command line arguments.
-# default if varnishd_config is unset: "-P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -b ${varnishd_backend} -s ${varnishd_storage} -u ${varnishd_user} -g ${varnishd_group}"
-# default if varnishd_config is set: "-P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -f ${varnishd_config} -s ${varnishd_storage} -u ${varnishd_user} -g ${varnishd_group}"
+# default if varnishd_config is unset: "-P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -b ${varnishd_backend} -s ${varnishd_storage} -h ${varnishd_algo} -u ${varnishd_user} -g ${varnishd_group}"
+# default if varnishd_config is set: "-P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -f ${varnishd_config} -s ${varnishd_storage} -h ${varnishd_algo} -u ${varnishd_user} -g ${varnishd_group}"
#
# See varnishd(1) for a detailed overview of command-line options.
#
@@ -63,12 +66,13 @@
: ${varnishd_backend:="localhost:8080"}
: ${varnishd_config:=""}
: ${varnishd_storage:="file,/tmp,50%"}
+: ${varnishd_algo:="classic,16383"}
: ${varnishd_user:="www"}
: ${varnishd_group:="www"}
if [ -n "${varnishd_config}" ] ; then
- : ${varnishd_flags:="-P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -f ${varnishd_config} -s ${varnishd_storage} -u ${varnishd_user} -g ${varnishd_group}"}
+ : ${varnishd_flags:="-P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -f ${varnishd_config} -s ${varnishd_storage} -h ${varnishd_algo} -u ${varnishd_user} -g ${varnishd_group}"}
else
- : ${varnishd_flags:="-P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -b ${varnishd_backend} -s ${varnishd_storage} -u ${varnishd_user} -g ${varnishd_group}"}
+ : ${varnishd_flags:="-P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -b ${varnishd_backend} -s ${varnishd_storage} -h ${varnishd_algo} -u ${varnishd_user} -g ${varnishd_group}"}
fi
# If we leave these set, rc.subr will su to them before starting
--- varnish-2.1.1_2.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20100505031654.DD8AA4DFC1F>