[35342] trunk/dports/net/squid

[jmr at macports.org]

Revision: 35342
          http://trac.macosforge.org/projects/macports/changeset/35342
Author:   jmr at macports.org
Date:     2008-03-25 08:25:15 -0700 (Tue, 25 Mar 2008)

Log Message:
-----------
squid: launch as root in order to fix #11065. This shouldn't be a problem,
since squid changes its effective UID after launch. Also remove the old unused
rc script.

Modified Paths:
--------------
    trunk/dports/net/squid/Portfile

Removed Paths:
-------------
    trunk/dports/net/squid/files/squid.sh.in

Modified: trunk/dports/net/squid/Portfile
===================================================================
--- trunk/dports/net/squid/Portfile	2008-03-25 15:13:27 UTC (rev 35341)
+++ trunk/dports/net/squid/Portfile	2008-03-25 15:25:15 UTC (rev 35342)
@@ -53,12 +53,12 @@
 startupitem.start \
 	"cd ${prefix}/var/squid" \
 	"if \[ ! -d \"${prefix}/var/squid/cache/00\" \]; then" \
-	"\tsu -fm squid -c \"exec ${prefix}/sbin/squid -s -z\"" \
+	"\tsu -fm root -c \"exec ${prefix}/sbin/squid -s -z\"" \
 	"fi" \
-	"su -fm squid -c \"exec ${prefix}/sbin/squid -s\""
+	"su -fm root -c \"exec ${prefix}/sbin/squid -s\""
 startupitem.stop \
 	"cd ${prefix}/var/squid" \
-	"su -fm squid -c \"exec ${prefix}/sbin/squid -k shutdown\""
+	"su -fm root -c \"exec ${prefix}/sbin/squid -k shutdown\""
 
 pre-destroot {
 	addgroup squid

Deleted: trunk/dports/net/squid/files/squid.sh.in
===================================================================
--- trunk/dports/net/squid/files/squid.sh.in	2008-03-25 15:13:27 UTC (rev 35341)
+++ trunk/dports/net/squid/files/squid.sh.in	2008-03-25 15:25:15 UTC (rev 35342)
@@ -1,34 +0,0 @@
-#!/bin/sh
-
-prefix=__PREFIX
-exec_prefix=${prefix}
-statedir=${prefix}/var/squid
-cachedir=${statedir}/cache
-
-squid_user=__UID
-
-PATH=${exec_prefix}/sbin:/bin:/usr/bin
-export PATH
-
-cd ${statedir}
-
-case "$1" in
-start)
-	[ -d "${cachedir}/00" ] \
-		|| su -fm $squid_user -c "exec $exec_prefix/sbin/squid -s -z"
-	su -fm $squid_user -c "exec $exec_prefix/sbin/squid -s"
-	;;
-stop)
-	su -fm $squid_user -c "exec $exec_prefix/sbin/squid -k shutdown"
-	;;
-restart)
-	$0 stop
-	$0 start
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop|restart}" >&2
-	;;
-esac
-
-exit 0
-

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080325/0832a79e/attachment.html