X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=squid.spec;h=47630b02cdc16eae4ac27c404bec1851d7edf820;hb=9edaad92847e99093dfd509f2b7f999f1de60da1;hp=eace66be4c470d6e737e6e95244b3a3c458e1020;hpb=3d3de1cc084d450bea1d4441f23b4f9e4ad08b36;p=packages%2Fsquid.git diff --git a/squid.spec b/squid.spec index eace66b..47630b0 100644 --- a/squid.spec +++ b/squid.spec @@ -1,6 +1,6 @@ # # Conditional build: -# _with_combined_log - enables apache-like combined log format +%bcond_with combined_log # enables apache-like combined log format # Summary: SQUID Internet Object Cache Summary(es): proxy/cache para www/ftp/gopher @@ -10,48 +10,53 @@ Summary(ru): Squid - Summary(uk): Squid - ËÅÛ ÏÂ'¤ËÔ¦× Internet Summary(zh_CN): SQUID ¸ßËÙ»º³å´úÀí·þÎñÆ÷ Name: squid -Version: 2.5.STABLE4 -Release: 1 +Version: 2.5.STABLE7 +Release: 4 Epoch: 7 License: GPL v2 Group: Networking/Daemons Source0: http://www.squid-cache.org/Versions/v2/2.5/%{name}-%{version}.tar.bz2 -# Source0-md5: 9894a1fe855b0cccdc14fbf014060990 -Source1: %{name}-1.1.19-faq.tar.gz -# Source1-md5: 77d04ae621d19548797e3a0deb540df6 +# 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 -Source4: http://cache.is.co.za/%{name}-docs.tar.gz -# Source4-md5: 0cfee556bf6394a0bd3c438c89dd2e63 +# 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.STABLE4-fqdnnegcache.patch -Patch1: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE4-redirect_login_space.patch -Patch2: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE4-digest_auth_pwchange.patch -Patch3: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE4-reconfigure_message.patch - +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 # 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 -Patch200: %{name}-sasl.patch -Patch210: http://piorun.ds.pg.gda.pl/~blues/patches/%{name}-more_FD-new.patch -Patch220: %{name}-empty-referer.patch -Patch230: %{name}-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.7c +BuildRequires: openssl-devel >= 0.9.7d BuildRequires: pam-devel -BuildRequires: perl +BuildRequires: perl-base +BuildRequires: rpmbuild(macros) >= 1.159 PreReq: rc-scripts >= 0.2.0 Requires(pre): /bin/id Requires(pre): /usr/bin/getgid @@ -64,6 +69,8 @@ Requires(post): grep Requires(post): /bin/hostname Requires(postun): /usr/sbin/groupdel Requires(postun): /usr/sbin/userdel +Provides: group(squid) +Provides: user(squid) BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _libexecdir %{_libdir}/%{name} @@ -183,7 +190,7 @@ zapozna %package ldap_auth Summary: LDAP authentication helper for Squid -Summary(pl): Wsparcie autentykacji LDAP dla squida +Summary(pl): Obs³uga uwierzytelniania LDAP dla squida Group: Networking/Admin Requires: %{name} = %{epoch}:%{version}-%{release} @@ -192,12 +199,12 @@ This Squid helper allows authentication against LDAP directories using the "simple authentication" (plain-text). %description ldap_auth -l pl -Pakiet ten pozwala na autentykacjê LDAP za pomoc± prostej autentykacji -(otwartym tekstem). +Pakiet ten pozwala na uwierzytelnianie przez LDAP za pomoc± prostego +uwierzytelniania (otwartym tekstem). %package pam_auth Summary: PAM authentication helper for Squid -Summary(pl): Wsparcie autentykacji PAM dla squida +Summary(pl): Obs³uga uwierzytelniania PAM dla squida Group: Networking/Admin Requires: %{name} = %{epoch}:%{version}-%{release} Requires: pam >= 0.77.3 @@ -208,12 +215,12 @@ authentication service "squid". This allows you to authenticate Squid users to any authentication source for which you have a PAM module. %description pam_auth -l pl -Program ten pozwala na autentykacjê u¿ytkowników squida w dowolnym +Program ten pozwala na uwierzytelnianie u¿ytkowników squida w dowolnym ¼ródle posiadaj±cym modu³ PAM. %package smb_auth Summary: SMB authentication helper for Squid -Summary(pl): Wsparcie autentykacji SMB dla squida +Summary(pl): Obs³uga uwierzytelniania SMB dla squida Group: Networking/Admin Requires: %{name} = %{epoch}:%{version}-%{release} @@ -223,12 +230,13 @@ authenticate proxy users against an SMB server like Windows NT or Samba. %description smb_auth -l pl -To jest modu³ autentykacji proxy. Z smb_auth mo¿esz autentyfikowaæ -u¿ytkowników proxy na serwerach SMB, jak Windows NT czy Samba. +To jest modu³ uwierzytelniania proxy. Przy pomocy smb_auth mo¿na +uwierzytelniaæ u¿ytkowników proxy na serwerach SMB, jak Windows NT czy +Samba. %package msnt_auth Summary: MSNT domain authentication helper for Squid -Summary(pl): Wsparcie autentykacji domen MSNT dla squida +Summary(pl): Obs³uga uwierzytelniania w domenie MSNT dla squida Group: Networking/Admin Requires: %{name} = %{epoch}:%{version}-%{release} @@ -237,12 +245,12 @@ This is an authentication module for the Squid proxy server to authenticate users on an NT domain. %description msnt_auth -l pl -Jest to modu³ autentykacji proxy, który pozwala na autentyfikowanie -u¿ytkowników proxy w domenie NT. +Jest to modu³ uwierzytelniania proxy, który pozwala na +uwierzytelnianie u¿ytkowników proxy w domenie NT. %package yp_auth Summary: YP authentication helper for Squid -Summary(pl): Wsparcie autentykacji YP dla squida +Summary(pl): Obs³uga uwierzytelniania YP dla squida Group: Networking/Admin Requires: %{name} = %{epoch}:%{version}-%{release} @@ -251,12 +259,12 @@ This is an authentication module for the Squid proxy server to authenticate users on YP. %description yp_auth -l pl -Jest to modu³ autentykacji proxy, który pozwala na autentyfikowanie -u¿ytkowników proxy poprzez YP. +Jest to modu³ uwierzytelniania proxy, który pozwala na +uwierzytelnianie u¿ytkowników proxy poprzez YP. %package ncsa_auth Summary: NCSA httpd style authentication helper for Squid -Summary(pl): Wsparcie autentykacji NCSA httpd dla squida +Summary(pl): Obs³uga uwierzytelniania NCSA httpd dla squida Group: Networking/Admin Requires: %{name} = %{epoch}:%{version}-%{release} @@ -264,11 +272,11 @@ Requires: %{name} = %{epoch}:%{version}-%{release} This module uses a NCSA httpd style password file for authentication. %description ncsa_auth -l pl -Modu³ autentykacji proxy u¿ywaj±cy pliku hase³ jak w NCSA httpd. +Modu³ uwierzytelniania proxy u¿ywaj±cy pliku hase³ jak w NCSA httpd. %package sasl_auth Summary: SASL authentication helper for Squid -Summary(pl): Wsparcie autentykacji SASL dla squida +Summary(pl): Obs³uga uwierzytelniania SASL dla squida Group: Networking/Admin Requires: %{name} = %{epoch}:%{version}-%{release} @@ -277,12 +285,12 @@ This is an authentication module for the Squid proxy server to authenticate users via SASL. %description sasl_auth -l pl -Jest to modu³ autentykacji proxy, który pozwala na autentyfikowanie -u¿ytkowników proxy poprzez SASL. +Jest to modu³ uwierzytelniania proxy, który pozwala na +uwierzytelnianie u¿ytkowników proxy poprzez SASL. %package winbind_auth Summary: WINBIND authentication helper for Squid -Summary(pl): Wsparcie autentykacji WINBIND dla squida +Summary(pl): Obs³uga uwierzytelniania WINBIND dla squida Group: Networking/Admin Requires: %{name} = %{epoch}:%{version}-%{release} @@ -291,12 +299,12 @@ This is an authentication module for the Squid proxy server to authenticate users via WINBIND. %description winbind_auth -l pl -Jest to modu³ autentykacji proxy, który pozwala na autentyfikowanie -u¿ytkowników proxy poprzez WINBIND. +Jest to modu³ uwierzytelniania proxy, który pozwala na +uwierzytelnianie u¿ytkowników proxy poprzez WINBIND. %package getpwname_auth Summary: getpwname authentication helper for Squid -Summary(pl): Wsparcie autentykacji getpwname dla squida +Summary(pl): Obs³uga uwierzytelniania getpwname dla squida Group: Networking/Admin Requires: %{name} = %{epoch}:%{version}-%{release} @@ -305,12 +313,12 @@ This is an authentication module for the Squid proxy server to authenticate users using getpwname. %description getpwname_auth -l pl -Jest to modu³ autentykacji proxy, który pozwala na autentyfikowanie -u¿ytkowników proxy poprzez getpwname. +Jest to modu³ uwierzytelniania proxy, który pozwala na +uwierzytelnianie u¿ytkowników proxy poprzez getpwname. %package passwd_auth Summary: passwd authentication helper for Squid -Summary(pl): Wsparcie autentykacji passwd dla squida +Summary(pl): Obs³uga uwierzytelniania passwd dla squida Group: Networking/Admin Requires: %{name} = %{epoch}:%{version}-%{release} @@ -319,12 +327,12 @@ This is an authentication module for the Squid proxy server to authenticate users with separate passwd file. %description passwd_auth -l pl -Jest to modu³ autentykacji proxy, który pozwala na autentyfikowanie -u¿ytkowników proxy poprzez oddzielny plik passwd. +Jest to modu³ uwierzytelniania proxy, który pozwala na +uwierzytelnianie u¿ytkowników proxy poprzez oddzielny plik passwd. %package ntlm_auth Summary: NTLM authentication helper for Squid -Summary(pl): Wsparcie autentykacji NTLM dla squida +Summary(pl): Obs³uga uwierzytelniania NTLM dla squida Group: Networking/Admin Requires: %{name} = %{epoch}:%{version}-%{release} @@ -333,8 +341,8 @@ This is an authentication module for the Squid proxy server to authenticate users on NTLM. %description ntlm_auth -l pl -Jest to modu³ autentykacji proxy, który pozwala na autentyfikowanie -u¿ytkowników proxy poprzez NTLM. +Jest to modu³ uwierzytelniania proxy, który pozwala na +uwierzytelnianie u¿ytkowników proxy poprzez NTLM. %package ip_acl Summary: IP external ACL helper for Squid @@ -344,7 +352,7 @@ Requires: %{name} = %{epoch}:%{version}-%{release} %description ip_acl This is an external ACL module for the Squid proxy server to limit -acces for users based on IP address. +access for users based on IP address. %description ip_acl -l pl Jest to modu³ kontroli dostêpu (ACL) do proxy, który pozwala na @@ -358,7 +366,7 @@ Requires: %{name} = %{epoch}:%{version}-%{release} %description ldap_acl This is an external ACL module for the Squid proxy server to limit -acces for users based on LDAP group membership. +access for users based on LDAP group membership. %description ldap_acl -l pl Jest to modu³ kontroli dostêpu (ACL) do proxy, który pozwala na @@ -373,7 +381,7 @@ Requires: %{name} = %{epoch}:%{version}-%{release} %description unix_acl This is an external ACL module for the Squid proxy server to limit -acces for users based on UNIX group membership. +access for users based on UNIX group membership. %description unix_acl -l pl Jest to modu³ kontroli dostêpu (ACL) do proxy, który pozwala na @@ -388,8 +396,7 @@ Requires: %{name} = %{epoch}:%{version}-%{release} %description wbinfo_acl This is an external ACL module for the Squid proxy server to limit -acces for users based on NT domain group membership using wbinfo. - +access for users based on NT domain group membership using wbinfo. %description wbinfo_acl -l pl Jest to modu³ kontroli dostêpu (ACL) do proxy, który pozwala na @@ -404,7 +411,7 @@ Requires: %{name} = %{epoch}:%{version}-%{release} %description winbind_acl This is an external ACL module for the Squid proxy server to limit -acces for users based on NT domain group membership based on Samba +access for users based on NT domain group membership based on Samba Winbindd from Samba 2.2.4 or greater. %description winbind_acl -l pl @@ -414,26 +421,25 @@ przynale Samba 2.2.4 lub wy¿szego. %prep -%setup -q -a 1 -a 4 +%setup -q -a1 -a4 # Bug fixes from Squid home page: %patch0 -p1 %patch1 -p1 -%patch2 -p1 -%patch3 -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 -%patch200 -p1 -%patch210 -p1 -%patch220 -p1 -%{?_with_combined_log:%patch230 -p1} +%{?with_combined_log:%patch111 -p1} %build %{__aclocal} @@ -468,7 +474,6 @@ Samba 2.2.4 lub wy --sysconfdir=%{_sysconfdir} \ --with-pthreads -mv -f squid/* doc %{__make} perl -pi -e 's#%{_prefix}/.*bin/perl#%{_bindir}/perl#g' contrib/* @@ -516,29 +521,29 @@ mv doc/squid.8 $RPM_BUILD_ROOT%{_mandir}/man8 rm -f doc/Makefile* # We don't like message: rpm found unpackaged files ... -rm -f $RPM_BUILD_ROOT/etc/squid/msntauth.conf.default \ - $RPM_BUILD_ROOT/etc/squid/squid.conf.orig +rm -f $RPM_BUILD_ROOT/etc/squid/msntauth.conf.default \ + $RPM_BUILD_ROOT/etc/squid/squid.conf.orig %clean rm -rf $RPM_BUILD_ROOT %pre -if [ -n "`getgid squid`" ]; then - if [ "`getgid squid`" != "91" ]; then +if [ -n "`/usr/bin/getgid squid`" ]; then + if [ "`/usr/bin/getgid squid`" != "91" ]; then echo "Error: group squid doesn't have gid=91. Correct this before installing squid." 1>&2 exit 1 fi else - /usr/sbin/groupadd -g 91 -r -f squid 1>&2 || : + /usr/sbin/groupadd -g 91 squid 1>&2 fi -if [ -n "`id -u squid 2>/dev/null`" ]; then - if [ "`id -u squid`" != "91" ]; then +if [ -n "`/bin/id -u squid 2>/dev/null`" ]; then + if [ "`/bin/id -u squid`" != "91" ]; then echo "Error: user squid doesn't have uid=91. Correct this before installing squid." 1>&2 exit 1 fi else - /usr/sbin/useradd -M -o -r -u 91 -s /bin/false \ - -g squid -c "SQUID http caching daemon" -d /var/cache/squid squid 1>&2 || : + /usr/sbin/useradd -o -u 91 -s /bin/false -g squid \ + -c "SQU http caching daemon" -d /var/cache/squid squid 1>&2 fi [ -L %{_datadir}/squid/errors ] && rm -rf %{_datadir}/squid/errors || : @@ -566,14 +571,14 @@ fi %postun if [ "$1" = "0" ]; then - /usr/sbin/userdel squid - /usr/sbin/groupdel squid + %userremove squid + %groupremove squid fi %files %defattr(644,root,root,755) -%doc faq CONTRIBUTORS COPYRIGHT CREDITS README ChangeLog QUICKSTART -%doc RELEASENOTES.html SPONSORS doc/* src/mib.txt +%doc CONTRIBUTORS COPYRIGHT CREDITS README ChangeLog QUICKSTART RELEASENOTES.html SPONSORS +%doc doc/* src/mib.txt FAQ*.html book-full.html %attr(755,root,root) %{_bindir}/squidclient %attr(755,root,root) %{_libexecdir}/diskd # YES, it has to be suid root, it sends ICMP packets. @@ -585,7 +590,7 @@ fi %attr(755,root,root) %dir %{_sysconfdir} %attr(754,root,root) /etc/rc.d/init.d/squid -%attr(640,root,root) %config(noreplace) /etc/logrotate.d/squid +%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /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