- Release 8.

- Another bugfix from Squid web site.
- Original config file is now patched instaed being replaced with one from
  PLD. If some new options are added to config file, they will not be lost,
  and there still is a chance, that patch will apply.

Changed files:
    squid.spec -> 1.52

diff --git a/squid.spec b/squid.spec
index a72d7f922606138a1920bdd3e0d5681aea02443d..654489a4c1b8a6e7719fe4a2e15603e27114b96e 100644 (file)
--- a/squid.spec
+++ b/squid.spec
@@ -2,7 +2,7 @@ Summary:        SQUID Internet Object Cache
 Summary(pl):   Uniwersalny proxy-cache
 Name:          squid
 Version:       2.3.STABLE4
-Release:       7
+Release:       8
 Epoch:         6
 License:       GPL
 Group:         Networking/Daemons
@@ -13,7 +13,7 @@ Source1:      %{name}-1.1.19-faq.tar.gz
 Source2:       %{name}.init
 Source3:       %{name}.sysconfig
 Source4:       http://cache.is.co.za/%{name}-docs.tar.gz
-Source5:       %{name}.conf
+Source5:       %{name}.conf.patch
 Source6:       %{name}.logrotate
 Patch0:                %{name}-2.0-make.patch
 Patch1:                %{name}-perl.patch
@@ -27,6 +27,7 @@ Patch13:      http://www.squid-cache.org/Versions/v2/2.3/bugs/%{name}-2.3.stable4-inv
 Patch14:       http://www.squid-cache.org/Versions/v2/2.3/bugs/%{name}-2.3.stable4-accel_only_access.patch
 Patch15:       http://www.squid-cache.org/Versions/v2/2.3/bugs/%{name}-2.3.stable4-html_quoting.patch
 Patch16:       http://www.squid-cache.org/Versions/v2/2.3/bugs/%{name}-2.3.stable4-carp-assertion.patch
+Patch17:       http://www.squid-cache.org/Versions/v2/2.3/bugs/%{name}-2.3.stable4-snmp-community-null-pointer.patch
 Prereq:                rc-scripts >= 0.2.0
 Prereq:                /sbin/chkconfig
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -93,6 +94,10 @@ zapozna
 %patch11 -p0
 %patch12 -p0
 %patch13 -p0
+%patch14 -p0
+%patch15 -p0
+%patch16 -p0
+%patch17 -p0
 
 %build
 autoconf
@@ -147,10 +152,13 @@ for LNG in *; do
 done
 cd ..
 
+cp $RPM_BUILD_ROOT/etc/squid/squid.conf{,.default}
+cd $RPM_BUILD_ROOT/etc/squid
+patch -p0 < %{SOURCE5}
+cd -
+
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/squid
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/squid
-install %{SOURCE5} $RPM_BUILD_ROOT/etc/squid
-install %{SOURCE5} $RPM_BUILD_ROOT/etc/squid/squid.conf.default
 install %{SOURCE6} $RPM_BUILD_ROOT/etc/logrotate.d/squid
 
 install scripts/*.pl $RPM_BUILD_ROOT%{_libexecdir}