- findutils are Red by rpm-build; dropped source*-size

[packages/squid.git] / squid.spec

diff --git a/squid.spec b/squid.spec
index b54a3fe85e10528741d63109ecadf53678ff336a..ec209f2db8d5a4062918a5f65826b079862f71b6 100644 (file)
--- a/squid.spec
+++ b/squid.spec
@@ -3,7 +3,7 @@
 %bcond_with    combined_log    # enables apache-like combined log format
 #
 Summary:       SQUID Internet Object Cache
-Summary(es):   proxy/cache para www/ftp/gopher
+Summary(es):   proxy/cache para WWW/FTP/gopher
 Summary(pl):   Uniwersalny proxy-cache server
 Summary(pt_BR):        Cache Squid de objetos Internet
 Summary(ru):   Squid - ËÜÛ ÏÂßÅËÔÏ× Internet
@@ -11,53 +11,59 @@ Summary(uk):        Squid - 
 Summary(zh_CN):        SQUID ¸ßËÙ»º³å´úÀí·þÎñÆ÷
 Name:          squid
 Version:       2.5.STABLE7
-Release:       2
+Release:       9
 Epoch:         7
 License:       GPL v2
 Group:         Networking/Daemons
 Source0:       http://www.squid-cache.org/Versions/v2/2.5/%{name}-%{version}.tar.bz2
 # Source0-md5: bf63e34906c68d716896eec0351108dc
-# Source0-size:        1051830
 # http://www.squid-cache.org/Doc/FAQ/FAQ.tar.gz
 Source1:       %{name}-FAQ.tar.gz
 # Source1-md5: cb9a955f8cda9cc166e086fccd412a43
-# Source1-size:        189993
 Source2:       %{name}.init
 Source3:       %{name}.sysconfig
 # http://squid-docs.sourceforge.net/latest/zip-files/book-full-html.zip
 Source4:       %{name}-book-full-html.zip
 # Source4-md5: 4f3b6dab1de9cbb847df89d8b417378a
-# Source4-size:        120253
 Source5:       %{name}.conf.patch
 Source6:       %{name}.logrotate
 Source7:       %{name}.pamd
 # Bug fixes from Squid home page:
-
+Patch0:                http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE7-half_closed_POST.patch
+Patch1:                http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE7_req_resp_header.patch
+Patch2:                http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE7-non_blocking_disk.patch
+Patch3:                http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE7-blank_response.patch
+Patch4:                http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE7-cachemgr_vmobjects.patch
+Patch5:                http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE7-dothost.patch
+Patch6:                http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE7-empty_acls.patch
 # Other patches:
-Patch110:      http://www.sed.pl/~mrk/qos/%{name}_hit_miss_mark.patch
-Patch120:      %{name}-fhs.patch
-Patch130:      %{name}-location.patch
-Patch140:      %{name}-domainmatch.patch
-Patch150:      %{name}-libnsl_fixes.patch
-Patch170:      %{name}-ac_fix.patch
-Patch180:      %{name}-crash-on-ENOSPC.patch
-Patch190:      %{name}-newssl.patch
-Patch210:      http://piorun.ds.pg.gda.pl/~blues/patches/%{name}-more_FD-new.patch
-Patch220:      %{name}-empty-referer.patch
-Patch230:      %{name}-2.5.STABLE4-apache-like-combined-log.patch
+Patch100:      http://www.sed.pl/~mrk/qos/%{name}_hit_miss_mark.patch
+Patch101:      %{name}-fhs.patch
+Patch102:      %{name}-location.patch
+Patch103:      %{name}-domainmatch.patch
+Patch104:      %{name}-libnsl_fixes.patch
+Patch105:      %{name}-ac_fix.patch
+Patch106:      %{name}-crash-on-ENOSPC.patch
+Patch107:      %{name}-newssl.patch
+Patch108:      %{name}-nolibs.patch
+Patch109:      http://piorun.ds.pg.gda.pl/~blues/patches/%{name}-more_FD-new.patch
+Patch110:      %{name}-empty-referer.patch
+Patch111:      %{name}-2.5.STABLE4-apache-like-combined-log.patch
 URL:           http://www.squid-cache.org/
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: cyrus-sasl-devel >= 2.1.0
-BuildRequires: findutils
 BuildRequires: openldap-devel
 BuildRequires: openssl-devel >= 0.9.7d
 BuildRequires: pam-devel
 BuildRequires: perl-base
-BuildRequires: rpmbuild(macros) >= 1.159
+BuildRequires: rpmbuild(macros) >= 1.166
+BuildRequires: unzip
 PreReq:                rc-scripts >= 0.2.0
+PreReq:                setup >= 2.4.6
 Requires(pre): /bin/id
 Requires(pre): /usr/bin/getgid
+Requires(pre): /usr/lib/rpm/user_group.sh
 Requires(pre): /usr/sbin/groupadd
 Requires(pre): /usr/sbin/useradd
 Requires(post,preun):  /sbin/chkconfig
@@ -420,20 +426,27 @@ Samba 2.2.4 lub wy
 
 %prep
 %setup -q -a1 -a4
-
 # Bug fixes from Squid home page:
-
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6        -p1
 # Other patches:
+%patch100 -p1
+%patch101 -p1
+%patch102 -p1
+%patch103 -p1
+%patch104 -p1
+%patch105 -p1
+%patch106 -p1
+%patch107 -p1
+%patch108 -p1
+%patch109 -p1
 %patch110 -p1
-%patch120 -p1
-%patch130 -p1
-%patch140 -p1
-%patch170 -p1
-%patch180 -p1
-%patch190 -p1
-%patch210 -p1
-%patch220 -p1
-%{?with_combined_log:%patch230 -p1}
+%{?with_combined_log:%patch111 -p1}
 
 %build
 %{__aclocal}
@@ -521,6 +534,9 @@ rm -f $RPM_BUILD_ROOT/etc/squid/msntauth.conf.default \
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%triggerpostun -- squid < 7:2.5.STABLE7-5
+%addusertogroup stats squid
+
 %pre
 if [ -n "`/usr/bin/getgid squid`" ]; then
        if [ "`/usr/bin/getgid squid`" != "91" ]; then
@@ -537,7 +553,8 @@ if [ -n "`/bin/id -u squid 2>/dev/null`" ]; then
        fi
 else
        /usr/sbin/useradd -o -u 91 -s /bin/false -g squid \
-               -c "SQU http caching daemon" -d /var/cache/squid squid 1>&2
+               -c "SQUID http caching daemon" -d /var/cache/squid squid 1>&2
+       %addusertogroup stats squid
 fi
 [ -L %{_datadir}/squid/errors ] && rm -rf %{_datadir}/squid/errors || :
 
@@ -584,7 +601,7 @@ fi
 %attr(755,root,root) %dir %{_sysconfdir}
 
 %attr(754,root,root) /etc/rc.d/init.d/squid
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/logrotate.d/squid
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/squid
 %attr(640,root,squid) %config(noreplace) /etc/sysconfig/squid
 %attr(640,root,squid) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/squid.conf
 %attr(640,root,squid) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mime.conf