From 13d158513768402182dc6d5813df6b2d28bf5f61 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Thu, 9 Sep 2004 12:41:01 +0000
Subject: [PATCH] auto-import squid-2.4.STABLE7-2 from
 squid-2.4.STABLE7-2.src.rpm

---
 .cvsignore |  3 +--
 sources    |  3 +--
 squid.init | 15 ++++++++++++++-
 squid.spec | 31 +++++++++++--------------------
 4 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 2b0525a..1492e03 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1 @@
-msntauth-v2.0.3-squid.1.tar.gz
-squid-2.4.STABLE6-src.tar.gz
+squid-2.4.STABLE7-src.tar.gz
diff --git a/sources b/sources
index 421b259..6a98d68 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-0067e2732930853b0d6011589ac0aed8  msntauth-v2.0.3-squid.1.tar.gz
-103fe9d03aca06f89218740f29730527  squid-2.4.STABLE6-src.tar.gz
+3b91136b8ddcc37196716fa6e85a14b2  squid-2.4.STABLE7-src.tar.gz
diff --git a/squid.init b/squid.init
index 4991830..d1ce853 100644
--- a/squid.init
+++ b/squid.init
@@ -31,6 +31,7 @@ if [ -f /etc/sysconfig/squid ]; then
   . /etc/sysconfig/squid
 else
   SQUID_OPTS="-D"
+  SQUID_PIDFILE_TIMEOUT=20
   SQUID_SHUTDOWN_TIMEOUT=100
 fi
 
@@ -55,8 +56,20 @@ start() {
 	fi
     done
     echo -n $"Starting $prog: "
-    $SQUID $SQUID_OPTS 2> /dev/null &
+    $SQUID $SQUID_OPTS 2> /dev/null
     RETVAL=$?
+    if [ $RETVAL -eq 0 ]; then 
+       timeout=0;
+       while : ; do
+          [ ! -f /var/run/squid.pid ] || break
+	  if [ $timeout -ge $SQUID_PIDFILE_TIMEOUT ]; then
+	     RETVAL=1
+	     break
+	  fi
+	  sleep 1 && echo -n "."
+	  timeout=$((timeout+1))
+       done
+    fi
     [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$SQUID
     [ $RETVAL -eq 0 ] && echo_success
     [ $RETVAL -ne 0 ] && echo_failure
diff --git a/squid.spec b/squid.spec
index 63adae7..6c6edc7 100644
--- a/squid.spec
+++ b/squid.spec
@@ -1,7 +1,7 @@
 Summary: The Squid proxy caching server.
 Name: squid
-Version: 2.4.STABLE6
-Release: 6.7.3
+Version: 2.4.STABLE7
+Release: 2
 Serial: 7
 License: GPL
 Group: System Environment/Daemons
@@ -10,16 +10,11 @@ Source1: http://www.squid-cache.org/Squid/FAQ/FAQ.sgml
 Source2: squid.init
 Source3: squid.logrotate
 Source4: squid.sysconfig
-Source10: msntauth-v2.0.3-squid.1.tar.gz
 Patch0: squid-2.1-make.patch
 Patch1: squid-2.4-config.patch
 Patch2: squid-perlpath.patch
 Patch3: squid-location.patch
-Patch10: squid-2.4.STABLE6-deny_transfer_encoding.patch
-Patch11: squid-2.4.STABLE6-ftp_directories.patch
-Patch12: squid-2.4.STABLE6-ftp_sanitycheck.patch
-Patch13: squid-2.4.STABLE6-gopher.patch
-Patch14: squid-2.4.STABLE6-proxy_auth.patch
+Patch10: squid-2.4.STABLE7-msntauth.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Prereq: /sbin/chkconfig logrotate shadow-utils
 Requires: bash >= 2.0
@@ -39,20 +34,12 @@ lookup program (dnsserver), a program for retrieving FTP data
 (ftpget), and some management and client tools.
 
 %prep
-%setup -q -a 10
+%setup -q
 %patch0 -p1 -b .make
 %patch1 -p1 -b .config
 %patch2 -p1 -b .perlpath
 %patch3 -p1
 %patch10 -p1
-%patch12 -p1
-%patch11 -p1
-%patch13 -p1
-%patch14 -p1
-
-rm -rf auth_moudles/MSNT/*
-mv msntauth-v2.0.3-squid.1/* auth_modules/MSNT/
-rm -rf msntauth-v2.0.3-squid.1
 
 %build
 %configure \
@@ -129,9 +116,6 @@ install -m 644 $RPM_SOURCE_DIR/squid.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/squ
 mkdir -p $RPM_BUILD_ROOT/var/log/squid
 mkdir -p $RPM_BUILD_ROOT/var/spool/squid
 
-strip $RPM_BUILD_ROOT/usr/bin/* $RPM_BUILD_ROOT/usr/sbin/* \
-      $RPM_BUILD_ROOT/usr/lib/squid/* || :
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -258,6 +242,13 @@ if [ "$1" -ge "1" ] ; then
 fi
 
 %changelog
+* Thu Jul 18 2002 Bill Nottingham <notting@redhat.com> 2.4.STABLE7-2
+- don't strip binaries
+
+* Mon Jul  8 2002 Bill Nottingham <notting@redhat.com>
+- update to 2.4.STABLE7
+- fix restart (#53761)
+
 * Tue Jun 25 2002 Bill Nottingham <notting@redhat.com>
 - add various upstream bugfix patches