[csw-devel] SF.net SVN: gar:[5312] csw/mgar/pkg/squid/trunk

[valholla at users.sourceforge.net]

Revision: 5312
          http://gar.svn.sourceforge.net/gar/?rev=5312&view=rev
Author:   valholla
Date:     2009-06-18 20:36:05 +0000 (Thu, 18 Jun 2009)

Log Message:
-----------
tweak postinstall

Modified Paths:
--------------
    csw/mgar/pkg/squid/trunk/checksums
    csw/mgar/pkg/squid/trunk/files/cswsquid
    csw/mgar/pkg/squid/trunk/files/squid.conf.CSW

Modified: csw/mgar/pkg/squid/trunk/checksums
===================================================================
--- csw/mgar/pkg/squid/trunk/checksums	2009-06-18 20:24:12 UTC (rev 5311)
+++ csw/mgar/pkg/squid/trunk/checksums	2009-06-18 20:36:05 UTC (rev 5312)
@@ -1,5 +1,5 @@
 257a1bb82830125d2e63e5ff6103992f  download/CSWsquid.postinstall
 f97bf395c3d2d73a876f9091707126bc  download/CSWsquid.preremove
-5a1aea0077dd2c8a65b6309d2fdea02f  download/cswsquid
+7eae68e2517a8de2afea1819039b9847  download/cswsquid
 6de3a6a7a56a7ecae092f2d31a04f039  download/squid-2.7.STABLE6.tar.bz2
-2b6b3053a34a53e2e5e036edc2f0a74b  download/squid.conf.CSW
+8548ba784b9e7a8920afcfcb4c05ea0a  download/squid.conf.CSW

Modified: csw/mgar/pkg/squid/trunk/files/cswsquid
===================================================================
--- csw/mgar/pkg/squid/trunk/files/cswsquid	2009-06-18 20:24:12 UTC (rev 5311)
+++ csw/mgar/pkg/squid/trunk/files/cswsquid	2009-06-18 20:36:05 UTC (rev 5312)
@@ -14,7 +14,7 @@
 case "$1" in
     'start')
         if [ -x ${SQUID_DAEMON} -a -f ${SQUID_CONF} ]; then
-            if [ -n "`pgrep squid`" ]; then
+            if [ "_xx_" != "_x`pgrep squid`x_" ]; then
                 echo 'squid server is already running'
 	            exit 0
             else
@@ -32,11 +32,11 @@
         ;;
     'stop')
         if [ -x ${SQUID_DAEMON} -a -f ${SQUID_CONF} ]; then
-            if [ -n "`pgrep squid`" ]; then
+            if [ "_xx_" != "_x`pgrep squid`x_" ]; then
                 ## stop gracefully
 	            echo 'stopping squid server... please wait for cleanup...'
                 ${SQUID_DAEMON} -k shutdown 
-                if [ -n "`pgrep squid`" ]; then
+                if [ "_xx_" != "_x`pgrep squid`x_" ]; then
                     echo 'squid server still running, killing...'
                     pkill -9 squid
                 fi

Modified: csw/mgar/pkg/squid/trunk/files/squid.conf.CSW
===================================================================
--- csw/mgar/pkg/squid/trunk/files/squid.conf.CSW	2009-06-18 20:24:12 UTC (rev 5311)
+++ csw/mgar/pkg/squid/trunk/files/squid.conf.CSW	2009-06-18 20:36:05 UTC (rev 5312)
@@ -4467,7 +4467,7 @@
 #	Specify the location of the executable for dnslookup process.
 #
 #Default:
-cache_dns_program /opt/csw/libexec/dnsserver
+#cache_dns_program /opt/csw/libexec/dnsserver
 
 #  TAG: dns_children
 # Note: This option is only available if Squid is rebuilt with the


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.