- Release 1.

- Updated to 2.4STABLE2.
- All bugfixes removed --- merged with sources.
- Disabled ipf-transparent. THIS IS FOR BSD SYSTEMS NOT FOR LINUX.
- Fixed typo.

Changed files:
    squid.spec -> 1.65

diff --git a/squid.spec b/squid.spec
index 8f13ac4deb9e5fd903150942b7691091a1e3c359..c33009e633b6d0b891b9af6391dc6c142cc025f3 100644 (file)
--- a/squid.spec
+++ b/squid.spec
@@ -1,8 +1,8 @@
 Summary:       SQUID Internet Object Cache
 Summary(pl):   Uniwersalny proxy-cache server
 Name:          squid
-Version:       2.4.STABLE1
-Release:       4
+Version:       2.4.STABLE2
+Release:       1
 Epoch:         6
 License:       GPL
 Group:         Networking/Daemons
@@ -21,12 +21,7 @@ Patch2:              %{name}-fhs.patch
 Patch3:                %{name}-location.patch
 Patch4:                %{name}-domainmatch.patch
 # Bug fixes from Squid home page.
-Patch10:       http://www.squid-cache.org/Versions/v2/2.4/bugs/squid-2.4.stable1-diskd_fixed_path.patch
-Patch11:       http://www.squid-cache.org/Versions/v2/2.4/bugs/squid-2.4.stable1-htcp_assertion_fix.patch
-Patch12:       http://www.squid-cache.org/Versions/v2/2.4/bugs/squid-2.4.stable1-kill_parent_on_child_sigkill.patch
-Patch13:       http://www.squid-cache.org/Versions/v2/2.4/bugs/squid-2.4.stable1-force_valid_blksize.patch
-Patch14:       http://www.squid-cache.org/Versions/v2/2.4/bugs/squid-2.4.stable1-high_cpu_with_peers.patch
-Patch15:       http://www.squid-cache.org/Versions/v2/2.4/bugs/squid-2.4.stable1-wrong_sign_on_timestamp_check.patch
+# Patch10:
 Prereq:                rc-scripts >= 0.2.0
 Prereq:                /sbin/chkconfig
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -86,12 +81,7 @@ zapozna
 %setup -q -a 1 -a 4
 
 # Bug fixes from Squid home page.
-%patch10 -p0
-%patch11 -p0
-%patch12 -p0
-%patch13 -p0
-%patch14 -p0
-%patch15 -p0
+# None at the moment, but will be here soon... ;)
 
 %patch0 -p1 
 %patch1 -p1 
@@ -112,7 +102,7 @@ autoconf
        --enable-carp \
        --enable-storeio="aufs,coss,diskd,null,ufs" \
        --enable-removal-policies="lru heap" \
-       --enable-ipf-transparent \
+       --disable-ipf-transparent \
        --enable-delay-pools \
        --with-pthreads \
        --enable-cache-digests
@@ -238,7 +228,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %attr(755,root,root) %{_bindir}/client
 %attr(755,root,root) %{_bindir}/diskd
-# It's absolete while internal-dns is enabled
+# It's obsolete while internal-dns is enabled
 #%attr(755,root,root) %{_bindir}/dnsserver
 # YES, it has to be suid root, it sends ICMP packets.
 %attr(4754,root,squid) %{_bindir}/pinger