- upgrade to latest upstream 3.0.STABLE2

- check config file before starting (#428998)
- whitespace unification of init script
- some minor path changes in the QUICKSTART file
- configure with the --with-filedescriptors=16384 option

.cvsignore

@@ -1 +1 @@
-squid-3.0.STABLE1.tar.bz2
+squid-3.0.STABLE2.tar.bz2

sources

@@ -1 +1 @@
-ec7458b00a68341854d91e7f6ece56ba  squid-3.0.STABLE1.tar.bz2
+33c89b22aaf27d12b818b5f120aa0322  squid-3.0.STABLE2.tar.bz2

squid-3.0.STABLE1-location.patch

@@ -1,6 +1,6 @@
-diff -up squid-3.0.STABLE1/QUICKSTART.location squid-3.0.STABLE1/QUICKSTART
---- squid-3.0.STABLE1/QUICKSTART.location	2003-07-18 13:10:32.000000000 +0200
-+++ squid-3.0.STABLE1/QUICKSTART	2008-01-23 12:07:50.000000000 +0100
+diff -up squid-3.0.STABLE2/QUICKSTART.location squid-3.0.STABLE2/QUICKSTART
+--- squid-3.0.STABLE2/QUICKSTART.location	2008-02-10 12:04:32.000000000 +0100
++++ squid-3.0.STABLE2/QUICKSTART	2008-03-11 15:53:36.000000000 +0100
 @@ -12,10 +12,9 @@ After you retrieved, compiled and instal
  INSTALL in the same directory), you have to configure the squid.conf
  file. This is the list of the values you *need* to change, because no
@@ -18,12 +18,12 @@ diff -up squid-3.0.STABLE1/QUICKSTART.location squid-3.0.STABLE1/QUICKSTART
      always ask permission before adding a parent cache. See also the
      never_direct/always_direct directives.
  
--cache_dir /usr/local/squid/var/cache 100 16 256
-+cache_dir /var/spool/squid 100 16 256
+-cache_dir ufs /usr/local/squid/var/cache 100 16 256
++cache_dir ufs /var/spool/squid 100 16 256
  
      Add here (first number, here 100) the amount of hard disk space 
      (in megabytes) to devote to caching.
-@@ -69,8 +68,8 @@ visible_hostname
+@@ -69,10 +68,10 @@ visible_hostname
  After editing squid.conf to your liking, run Squid from the command
  line TWICE:
  
@@ -32,5 +32,8 @@ diff -up squid-3.0.STABLE1/QUICKSTART.location squid-3.0.STABLE1/QUICKSTART
 +    % /usr/sbin/squid -z
 +    % /usr/sbin/squid 
  
- Check in the cache.log (/usr/local/squid/var/logs/cache.log) that
+-Check in the cache.log (/usr/local/squid/var/logs/cache.log) that
++Check in the cache.log (/var/log/squid/cache.log) that
  everything is all right.
+ 
+ Once Squid created all its files (it can take several minutes on some

squid.init

@@ -62,6 +62,14 @@ probe() {
 start() {
 	probe
 
+	$SQUID -k parse
+	RETVAL=$?
+	if [ $RETVAL -ne 0 ]; then
+		echo -n $"Starting $prog: "
+		echo_failure
+		echo
+		return 1
+	fi
 	for adir in $CACHE_SWAP; do
 		if [ ! -d $adir/00 ]; then
 			echo -n "init_cache_dir $adir... "

squid.spec

@@ -3,11 +3,11 @@
 ## % define __find_requires %{SOURCE99}
 
 Name:     squid
-Version:  3.0.STABLE1
-Release:  3%{?dist}
+Version:  3.0.STABLE2
+Release:  1%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
-License:  GPLv2
+License:  GPLv2+
 Group:    System Environment/Daemons
 URL:      http://www.squid-cache.org
 Source:   http://www.squid-cache.org/Squid/Versions/v3/3.0/squid-%{version}.tar.bz2
@@ -32,7 +32,7 @@ Patch203: squid-3.0.STABLE1-build.patch
 Patch204: squid-3.0.STABLE1-perlpath.patch
 Patch205: squid-3.0.STABLE1-smb-path.patch
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: bash >= 2.0
 Requires(pre): shadow-utils
 Requires(post): /sbin/chkconfig
@@ -97,9 +97,10 @@ export CXXFLAGS="-fPIE" ; export CFLAGS="-fPIE -Os -g -pipe -fsigned-char" ; exp
    --enable-wccpv2 \
    --with-aio \
    --with-default-user="squid" \
+   --with-filedescriptors=16384 \
    --with-dl \
    --with-openssl=/usr/kerberos \
-   --with-pthreads \
+   --with-pthreads
 
 # following options are no longer supported
 #   --with-winbind-auth-challenge \
@@ -330,6 +331,13 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Tue Mar 13 2008 Martin Nagy <mnagy@redhat.com> - 7:3.0.STABLE2-1
+- upgrade to latest upstream 3.0.STABLE2
+- check config file before starting (#428998)
+- whitespace unification of init script
+- some minor path changes in the QUICKSTART file
+- configure with the --with-filedescriptors=16384 option
+
 * Tue Feb 26 2008 Martin Nagy <mnagy@redhat.com> - 7:3.0.STABLE1-3
 - change the cache_effective_group default back to none