- migrated to apache 2.4

[packages/squid.git] / squid.spec

diff --git a/squid.spec b/squid.spec
index 78fed2d7f3d60e111c2b016b409191f88d63317b..1695ccff496b8ccc516ed8bef0adc4e52d386563 100644 (file)
--- a/squid.spec
+++ b/squid.spec
@@ -16,13 +16,13 @@ Summary(ru.UTF-8):  Squid - кэш объектов Internet
 Summary(uk.UTF-8):     Squid - кеш об'єктів Internet
 Summary(zh_CN.UTF-8):  SQUID 高速缓冲代理服务器
 Name:          squid
-Version:       3.2.3
-Release:       1
+Version:       3.2.11
+Release:       2
 Epoch:         7
 License:       GPL v2
 Group:         Networking/Daemons
 Source0:       http://www.squid-cache.org/Versions/v3/3.2/%{name}-%{version}.tar.bz2
-# Source0-md5: b26171dfd397defd9ee113d555691b86
+# Source0-md5: cdd3612bed27e8d513b713004c78bf5b
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Source3:       http://squid-docs.sourceforge.net/latest/zip-files/book-full-html.zip
@@ -32,12 +32,18 @@ Source5:    %{name}.logrotate
 Source6:       %{name}.pamd
 Source7:       %{name}-cachemgr-apache.conf
 Source8:       %{name}.tmpfiles
+Source9:       %{name}-cachemgr-httpd.conf
 Patch0:                %{name}-fhs.patch
 Patch1:                %{name}-location.patch
 Patch2:                %{name}-crash-on-ENOSPC.patch
 Patch4:                %{name}-2.5.STABLE4-apache-like-combined-log.patch
 Patch5:                %{name}-ppc-m32.patch
 Patch6:                %{name}-cachemgr-webapp.patch
+# http://www.squid-cache.org/mail-archive/squid-dev/201207/0099.html
+# http://www.squid-cache.org/mail-archive/squid-dev/201207/att-0177/squidv3-vary-cache-1.patch
+Patch7:                squidv3-vary-cache-1.patch
+# http://www.squid-cache.org/mail-archive/squid-dev/201207/att-0177/squidv3-vary-headers-shm-hack.patch
+Patch8:                squidv3-vary-headers-shm-hack.patch
 URL:           http://www.squid-cache.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -197,6 +203,7 @@ Requires:   webserver
 Requires:      webserver(access)
 Requires:      webserver(alias)
 Requires:      webserver(cgi)
+Conflicts:     apache-base < 2.4.0-1
 
 %description cachemgr
 Cachemgr.cgi is a CGI script that allows administrator to check
@@ -211,8 +218,8 @@ Summary:    Authentication via the Negotiate RFC 4559 for proxies
 Summary(pl.UTF-8):     Uwierzytelnianie przez negocjację RFC 4559 dla serwerów proxy
 Group:         Networking/Admin
 Requires:      %{name} = %{epoch}:%{version}-%{release}
-Obsoletes:     squid-kerb_auth < %{epoch}:%{version}-%{release}
 Provides:      squid-kerb_auth = %{epoch}:%{version}-%{release}
+Obsoletes:     squid-kerb_auth < %{epoch}:%{version}-%{release}
 
 %description kerberos_auth
 This squid helper is a reference implementation that supports
@@ -292,8 +299,8 @@ Summary:    NIS authentication helper for Squid
 Summary(pl.UTF-8):     Obsługa uwierzytelniania NIS dla squida
 Group:         Networking/Admin
 Requires:      %{name} = %{epoch}:%{version}-%{release}
-Obsoletes:     squid-yp_auth < %{epoch}:%{version}-%{release}
 Provides:      squid-yp_auth = %{epoch}:%{version}-%{release}
+Obsoletes:     squid-yp_auth < %{epoch}:%{version}-%{release}
 
 %description nis_auth
 This is an authentication module for the Squid proxy server to
@@ -390,6 +397,8 @@ Summary:    Database authentication helper for Squid
 Summary(pl.UTF-8):     Obsługa uwierzytelniania przez bazę danych dla squida
 Group:         Networking/Admin
 Requires:      %{name} = %{epoch}:%{version}-%{release}
+Requires:      perl-DBI
+Suggests:      perl-DBD-mysql
 
 %description db_auth
 This is an authentication module for the Squid proxy server to
@@ -418,8 +427,8 @@ Summary:    Kerberos authentication helper for Squid
 Summary(pl.UTF-8):     Obsługa uwierzytelniania Kerberos dla squida
 Group:         Networking/Admin
 Requires:      %{name} = %{epoch}:%{version}-%{release}
-Requires:      %{name}-ntlm_auth = %{epoch}:%{version}-%{release}
 Requires:      %{name}-kerberos_auth = %{epoch}:%{version}-%{release}
+Requires:      %{name}-ntlm_auth = %{epoch}:%{version}-%{release}
 
 %description negotiate_wrapper_auth
 This is an authentication module for the Squid proxy server to
@@ -559,8 +568,8 @@ access for users based on LDAP Kerberos or NTLM credentials.
 
 %description kerberos_ldap_group_acl -l pl.UTF-8
 Jest to moduł kontroli dostępu (ACL) do proxy, który pozwala na
-ograniczenie dostępu użytkowników proxy na podstawie ich
-uprawnień Kerberosowych lub NTLM-owych w LDAP.
+ograniczenie dostępu użytkowników proxy na podstawie ich uprawnień
+Kerberosowych lub NTLM-owych w LDAP.
 
 %package scripts
 Summary:       Perl scripts for Squid
@@ -584,6 +593,10 @@ Ten pakiet zawiera skrypty perlowe i dodatkowe programy dla Squida.
 %patch5 -p1
 %endif
 %patch6 -p1
+%patch7 -p1
+%patch8 -p1
+
+%{__sed} -i -e '1s#!.*bin/perl#!%{__perl}#' {contrib,scripts}/*.pl
 
 %build
 %{__libtoolize}
@@ -667,7 +680,7 @@ install %{SOURCE8} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/squid.conf
 
 %{__mv} -f $RPM_BUILD_ROOT%{_libdir}/squid/cachemgr.cgi $RPM_BUILD_ROOT%{_cgidir}
 %{__cp} -a %{SOURCE7} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/apache.conf
-%{__cp} -a %{SOURCE7} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/httpd.conf
+%{__cp} -a %{SOURCE9} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/httpd.conf
 %{__rm} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/cachemgr.conf.default
 
 cd $RPM_BUILD_ROOT/etc/squid
@@ -740,10 +753,10 @@ fi
 %triggerun cachemgr -- apache1 < 1.3.37-3, apache1-base
 %webapp_unregister apache %{_webapp}
 
-%triggerin cachemgr -- apache < 2.2.0, apache-base
+%triggerin cachemgr -- apache-base
 %webapp_register httpd %{_webapp}
 
-%triggerun cachemgr -- apache < 2.2.0, apache-base
+%triggerun cachemgr -- apache-base
 %webapp_unregister httpd %{_webapp}
 
 %triggerpostun -- cachemgr < 7:3.0.STABLE10-0.2
@@ -905,7 +918,8 @@ fi
 %defattr(644,root,root,755)
 %config(noreplace) /etc/pam.d/squid
 %config(noreplace) /etc/security/blacklist.squid
-%attr(755,root,root) %{_libexecdir}/basic_pam_auth
+# it has to be suid root to access /etc/shadow
+%attr(4755,root,root) %{_libexecdir}/basic_pam_auth
 %{_mandir}/man8/basic_pam_auth.8*
 
 %files smb_auth
@@ -969,7 +983,7 @@ fi
 
 %files db_auth
 %defattr(644,root,root,755)
-%{_libexecdir}/basic_db_auth
+%attr(755,root,root) %{_libexecdir}/basic_db_auth
 %{_mandir}/man8/basic_db_auth.8*
 
 %files pop3_auth