Thu Oct 8 10:07:10 2015 UTC ()
Check current file descriptor limit and raise if required rather than
blindly setting to 4096 (which may in fact be lower than current limit).
Bump PKGREVISION


(sborrill)
diff -r1.54 -r1.55 pkgsrc/www/squid3/Makefile
diff -r1.2 -r1.3 pkgsrc/www/squid3/files/squid.sh
cvs diff -r1.54 -r1.55 pkgsrc/www/squid3/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/squid3/Attic/Makefile 2015/10/02 07:57:13 1.54
+++ pkgsrc/www/squid3/Attic/Makefile 2015/10/08 10:07:10 1.55
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.54 2015/10/02 07:57:13 adam Exp $ 1# $NetBSD: Makefile,v 1.55 2015/10/08 10:07:10 sborrill Exp $
2 2
3DISTNAME= squid-3.5.10 3DISTNAME= squid-3.5.10
 4PKGREVISION= 1
4CATEGORIES= www 5CATEGORIES= www
5MASTER_SITES= http://www.squid-cache.org/Versions/v3/${PKGVERSION_NOREV:R}/ \ 6MASTER_SITES= http://www.squid-cache.org/Versions/v3/${PKGVERSION_NOREV:R}/ \
6 ftp://ftp.squid-cache.org/pub/squid/ \ 7 ftp://ftp.squid-cache.org/pub/squid/ \
7 http://ftp.nluug.nl/internet/squid/ 8 http://ftp.nluug.nl/internet/squid/
8EXTRACT_SUFX= .tar.xz 9EXTRACT_SUFX= .tar.xz
9 10
10MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.squid-cache.org/ 12HOMEPAGE= http://www.squid-cache.org/
12COMMENT= Post-Harvest_cached WWW proxy cache and accelerator 13COMMENT= Post-Harvest_cached WWW proxy cache and accelerator
13LICENSE= gnu-gpl-v2 14LICENSE= gnu-gpl-v2
14 15
15USE_LANGUAGES= c c++ 16USE_LANGUAGES= c c++
16USE_TOOLS+= perl:run gmake 17USE_TOOLS+= perl:run gmake
cvs diff -r1.2 -r1.3 pkgsrc/www/squid3/files/Attic/squid.sh (expand / switch to unified diff)

--- pkgsrc/www/squid3/files/Attic/squid.sh 2014/08/29 11:13:46 1.2
+++ pkgsrc/www/squid3/files/Attic/squid.sh 2015/10/08 10:07:10 1.3
@@ -1,36 +1,46 @@ @@ -1,36 +1,46 @@
1#!@RCD_SCRIPTS_SHELL@ 1#!@RCD_SCRIPTS_SHELL@
2# 2#
3# $NetBSD: squid.sh,v 1.2 2014/08/29 11:13:46 tron Exp $ 3# $NetBSD: squid.sh,v 1.3 2015/10/08 10:07:10 sborrill Exp $
4# 4#
5# PROVIDE: squid 5# PROVIDE: squid
6# REQUIRE: DAEMON 6# REQUIRE: DAEMON
7# KEYWORD: shutdown 7# KEYWORD: shutdown
8 8
9if [ -f /etc/rc.subr ]; then 9if [ -f /etc/rc.subr ]; then
10 . /etc/rc.subr 10 . /etc/rc.subr
11fi 11fi
12 12
13: ${squid_conf:=@PKG_SYSCONFDIR@/squid.conf} 13: ${squid_conf:=@PKG_SYSCONFDIR@/squid.conf}
14 14
15name="squid" 15name="squid"
16rcvar=$name 16rcvar=$name
17command="@PREFIX@/sbin/${name}" 17command="@PREFIX@/sbin/${name}"
18pidfile="@VARBASE@/run/${name}.pid" 18pidfile="@VARBASE@/run/${name}.pid"
19procname="squid-1" 19procname="squid-1"
20required_files="${squid_conf} @PKG_SYSCONFDIR@/mime.conf" 20required_files="${squid_conf} @PKG_SYSCONFDIR@/mime.conf"
21command_args="-Y -f ${squid_conf}" 21command_args="-Y -f ${squid_conf}"
22 22
23start_precmd='ulimit -n 4096' 23start_precmd='setproclimits'
 24
 25setproclimits()
 26{
 27 local climit
 28 climit=`ulimit -n`
 29 if [ "$climit" -lt 4096 ]; then
 30 ulimit -n 4096
 31 fi
 32}
 33
24# Note: 'shutdown' waits 30 seconds, while 'interrupt' stops immediately 34# Note: 'shutdown' waits 30 seconds, while 'interrupt' stops immediately
25reload_cmd="${command} ${squid_flags} ${command_args} -k reconfigure" 35reload_cmd="${command} ${squid_flags} ${command_args} -k reconfigure"
26rotate_cmd="${command} ${squid_flags} ${command_args} -k rotate" 36rotate_cmd="${command} ${squid_flags} ${command_args} -k rotate"
27createdirs_cmd="${command} ${squid_flags} ${command_args} -z" 37createdirs_cmd="${command} ${squid_flags} ${command_args} -z"
28extra_commands="createdirs reload rotate" 38extra_commands="createdirs reload rotate"
29 39
30if [ -f /etc/rc.subr -a -f /etc/rc.conf -a -f /etc/rc.d/DAEMON ]; then 40if [ -f /etc/rc.subr -a -f /etc/rc.conf -a -f /etc/rc.d/DAEMON ]; then
31 load_rc_config $name 41 load_rc_config $name
32 run_rc_command "$1" 42 run_rc_command "$1"
33else 43else
34 if [ -f /etc/rc.conf ]; then 44 if [ -f /etc/rc.conf ]; then
35 . /etc/rc.conf 45 . /etc/rc.conf
36 fi 46 fi