- Update to 2.5-STABLE7; this release fixes a security issue regarding

  the SNMP module
- Remove a patch that is now part of the distribution
- Miscellaneuous small fixes:
  + in squid.sh, make stop_command poll for the squid processes' exit in
    the rcNG case too; this eliminates the need to do this in restart_command
  + make the information regarding rcNG'ness in pkg-install easier to read
  + install unstripped binaries if WITH_SQUID_STACKTRACES is defined

PR:		ports/72581
Submitted by:	Thomas-Martin Seck (maintainer)

2 files changed, 14 insertions, 21 deletions

diff --git a/www/squid30/files/patch-configure b/www/squid30/files/patch-configure
deleted file mode 100644
index 2d6d233edac4..000000000000
--- a/www/squid30/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Tue Mar  2 11:29:57 2004
-+++ configure	Tue Mar  2 11:30:34 2004
-@@ -2236,6 +2236,8 @@
- 	    ;;
- 	*-solaris-*)
- 	    ;;
-+	*-freebsd*)
-+	    ;;
- 	*)
- 	    echo "WARNING: ARP ACL support probably won't work on $host."
- 	    sleep 10
diff --git a/www/squid30/files/squid.sh b/www/squid30/files/squid.sh
index db49ae683c01..a46c9dc7bf4d 100644
--- a/www/squid30/files/squid.sh
+++ b/www/squid30/files/squid.sh
@@ -22,20 +22,28 @@ command=%%PREFIX%%/sbin/squid
 # --begin rcng
 extra_commands=reload
 reload_cmd="${command} -k reconfigure"
-restart_cmd=squid_restart
 # --end rcng
-stop_cmd="${command} -k shutdown"
+stop_cmd="squid_stop"
 squid_chdir=${squid_chdir:-%%PREFIX%%/squid/logs}
 squid_enable=${squid_enable:-"NO"}
 squid_flags=${squid_flags-"-D"}
 squid_user=${squid_user:-%%SQUID_UID%%}
 default_config=%%PREFIX%%/etc/squid/squid.conf
 
+# --begin rcold
+squid_stop() {
+	echo -n " ${name}"
+	${command} -k shutdown
+	while ps -xcU ${squid_user} | grep -q squid; do
+		sleep 2
+	done
+}
+
+# --end rcold
 # --begin rcng
-squid_restart() {
-	run_rc_command stop
+squid_stop() {
+	${command} -k shutdown
 	run_rc_command poll
-	run_rc_command start
 }
 
 . %%RC_SUBR%%
@@ -66,14 +74,10 @@ start)
 	;;
 stop)
 	if [ -x "${command}" ]; then
-		echo -n " ${name}"
 		${stop_cmd}
-		while ps -xcU ${squid_user} | grep -q squid; do
-			sleep 2
-		done
 	fi
 	;;
-	*)
+*)
 	echo "usage: ${0##*/} {start|stop}" >&2
 	exit 64
 	;;