Author: dzeus Date: Thu Sep 18 12:55:27 2008 GMT Module: SPECS Tag: SQUID_2 ---- Log message: - up to 2.7.STABLE4 - ZPH TOS & max_filedesc included in source
---- Files affected: SPECS: squid.spec (1.282.2.8.2.7 -> 1.282.2.8.2.8) ---- Diffs: ================================================================ Index: SPECS/squid.spec diff -u SPECS/squid.spec:1.282.2.8.2.7 SPECS/squid.spec:1.282.2.8.2.8 --- SPECS/squid.spec:1.282.2.8.2.7 Wed Jul 23 09:48:43 2008 +++ SPECS/squid.spec Thu Sep 18 14:55:21 2008 @@ -1,7 +1,7 @@ # $Revision$, $Date$ # TODO # - use /usr/lib/cgi-bin instead of /home/services -# +# - update combined_log patch # Conditional build: %bcond_with combined_log # enables apache-like combined log format # @@ -13,13 +13,13 @@ Summary(uk.UTF-8): Squid - кеш об'єктів Internet Summary(zh_CN.UTF-8): SQUID 高速缓冲代理服务器 Name: squid -Version: 2.6.STABLE21 -Release: 1 +Version: 2.7.STABLE4 +Release: 0.9 Epoch: 7 License: GPL v2 Group: Networking/Daemons -Source0: http://www.squid-cache.org/Versions/v2/2.6/%{name}-%{version}.tar.bz2 -# Source0-md5: 3a24e37ee2bc0c4721973ca6354d4aa4 +Source0: http://www.squid-cache.org/Versions/v2/2.7/%{name}-%{version}.tar.bz2 +# Source0-md5: 88ea575a67d35013ec786761d8a14f33 # http://www.squid-cache.org/Doc/FAQ/FAQ.tar.gz Source1: %{name}-FAQ.tar.gz # Source1-md5: cb9a955f8cda9cc166e086fccd412a43 @@ -34,19 +34,15 @@ # Bug fixes from Squid home page, please include URL # lets have fun - there is no patches... yet:) # Other patches: -# http://www.it-academy.bg/zph/ -Patch0: %{name}_hit_miss_mark.patch -Patch1: %{name}-fhs.patch -Patch2: %{name}-location.patch -Patch3: %{name}-domainmatch.patch -Patch4: %{name}-libnsl_fixes.patch -Patch5: %{name}-crash-on-ENOSPC.patch -Patch6: %{name}-newssl.patch -Patch7: %{name}-empty-referer.patch -Patch8: %{name}-2.5.STABLE4-apache-like-combined-log.patch -Patch9: %{name}-auth_on_acceleration.patch -Patch10: %{name}-ppc-m32.patch -Patch11: %{name}-fd-config.patch +Patch0: %{name}-fhs.patch +Patch1: %{name}-location.patch +Patch2: %{name}-domainmatch.patch +Patch3: %{name}-libnsl_fixes.patch +Patch4: %{name}-newssl.patch +Patch5: %{name}-empty-referer.patch +Patch6: %{name}-2.5.STABLE4-apache-like-combined-log.patch +Patch7: %{name}-auth_on_acceleration.patch +Patch8: %{name}-ppc-m32.patch URL: http://www.squid-cache.org/ BuildRequires: autoconf BuildRequires: automake @@ -75,6 +71,7 @@ Requires: setup >= 2.4.6 # epoll enabled by default: Requires: uname(release) >= 2.6 +Requires: w3c-libwww Provides: group(squid) Provides: user(squid) Conflicts: logrotate < 3.7-4 @@ -443,14 +440,11 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch6 -p1 +%{?with_combined_log:%patch6 -p1} %patch7 -p1 -%{?with_combined_log:%patch8 -p1} -%patch9 -p1 %ifarch ppc -%patch10 -p1 +%patch8 -p1 %endif -%patch11 -p1 %{__sed} -i -e '1s#!.*bin/perl#!%{__perl}#' {contrib,scripts,helpers/*/*}/*.pl @@ -493,7 +487,6 @@ --with-auth-on-acceleration \ --with-pthreads \ --with-large-files \ - --enable-fd-config \ --with-maxfd=32768 %{__make} @@ -597,10 +590,11 @@ %attr(755,root,root) %{_bindir}/squidclient %attr(755,root,root) %{_bindir}/cossdump %attr(755,root,root) %{_libexecdir}/diskd-daemon +%attr(755,root,root) %{_libexecdir}/fakeauth_auth +%attr(755,root,root) %{_libexecdir}/logfile-daemon # YES, it has to be suid root, it sends ICMP packets. %attr(4754,root,squid) %{_libexecdir}/pinger %attr(755,root,root) %{_libexecdir}/unlinkd -%attr(755,root,root) %{_libexecdir}/fakeauth_auth %attr(755,root,root) %{_sbindir}/* %dir %{_sysconfdir} @@ -764,6 +758,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.282.2.8.2.8 2008/09/18 12:55:21 dzeus +- up to 2.7.STABLE4 +- ZPH TOS & max_filedesc included in source + Revision 1.282.2.8.2.7 2008/07/23 07:48:43 arekm - up to stable21 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/squid.spec?r1=1.282.2.8.2.7&r2=1.282.2.8.2.8&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
