Summary(uk.UTF-8): Squid - кеш об'єктів Internet
Summary(zh_CN.UTF-8): SQUID 高速缓冲代理服务器
Name: squid
-Version: 3.2.3
-Release: 6
+Version: 4.6
+Release: 1
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: http://www.squid-cache.org/Versions/v4/%{name}-%{version}.tar.xz
+# Source0-md5: e25e7cc37754ad14d8aa368c0c210e54
Source1: %{name}.init
Source2: %{name}.sysconfig
Source3: http://squid-docs.sourceforge.net/latest/zip-files/book-full-html.zip
Source6: %{name}.pamd
Source7: %{name}-cachemgr-apache.conf
Source8: %{name}.tmpfiles
-Patch0: %{name}-fhs.patch
+Source9: %{name}-cachemgr-httpd.conf
+Source10: %{name}.service
+Source11: %{name}-check_cache
+
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
+# still needed? http://bugs.squid-cache.org/show_bug.cgi?id=3806
# 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
+Patch7: squidv3-vary-headers-shm-hack.patch
URL: http://www.squid-cache.org/
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: expat-devel
BuildRequires: heimdal-devel
BuildRequires: libcap-devel >= 1:2.09
-BuildRequires: libecap-devel >= 0.2.0
+BuildRequires: libecap-devel >= 1
BuildRequires: libltdl-devel
BuildRequires: libnetfilter_conntrack-devel
BuildRequires: libstdc++-devel
BuildRequires: openssl-devel >= 0.9.7d
BuildRequires: pam-devel
BuildRequires: perl-base
-BuildRequires: rpmbuild(macros) >= 1.268
+BuildRequires: rpmbuild(macros) >= 1.671
BuildRequires: sed >= 4.0
+BuildRequires: tar >= 1:1.22
BuildRequires: unzip
+BuildRequires: xz
Requires(post): /bin/hostname
Requires(post): fileutils
Requires(post): findutils
Requires(pre): /usr/sbin/useradd
Requires(pre,triggerpostun): /bin/id
Requires(pre,triggerpostun): /usr/sbin/usermod
+Requires(post,preun,postun): systemd-units >= 38
Requires: rc-scripts >= 0.2.0
Requires: setup >= 2.4.6
+Requires: systemd-units >= 38
Provides: group(squid)
# epoll enabled by default:
Requires: uname(release) >= 2.6
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
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
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
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
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
%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 sql_session_acl
+Summary: SQL Database session lookup helper for Squid
+Group: Networking/Admin
+Requires: %{name} = %{epoch}:%{version}-%{release}
+
+%description sql_session_acl
+Validates an HTTP requests access authorization with a session
+database.
+
+%package time_quota_acl
+Summary: Squid time quota external acl helper
+Group: Networking/Admin
+Requires: %{name} = %{epoch}:%{version}-%{release}
+
+%description time_quota_acl
+This extension allows an administrator to define time budgets for the
+users of squid to limit the time using squid.
+
+%package log_db_daemon
+Summary: Database logging daemon for Squid
+Group: Networking/Admin
+Requires: %{name} = %{epoch}:%{version}-%{release}
+
+%description log_db_daemon
+This program writes Squid access.log entries to a database. Presently
+only accepts the squid native format.
+
+%package storeid_file_rewrite
+Summary: File based Store-ID helper for Squid
+Group: Networking/Admin
+Requires: %{name} = %{epoch}:%{version}-%{release}
+
+%description storeid_file_rewrite
+This program acts as a store_id helper program, rewriting URLs passed
+by Squid into storage-ids that can be used to achieve better caching
+for websites that use different URLs for the same content.
%package scripts
Summary: Perl scripts for Squid
%prep
%setup -q -a3
-%patch0 -p1
+
%patch1 -p1
%patch2 -p1
%{?with_combined_log:%patch4 -p1}
%patch5 -p1
%endif
%patch6 -p1
-%patch7 -p1
-%patch8 -p1
+#%patch7 -p1
%{__sed} -i -e '1s#!.*bin/perl#!%{__perl}#' {contrib,scripts}/*.pl
%{__autoheader}
%{__automake}
%configure \
+ --disable-silent-rules \
--disable-strict-error-checking \
--with-default-user=squid \
--with-logdir=/var/log/squid \
--enable-referer-log \
--enable-removal-policies="heap,lru" \
--enable-storeio="aufs,diskd,rock,ufs" \
+ --enable-storeid-rewrite-helpers="file" \
--enable-snmp \
--enable-ssl \
--enable-ipv6 \
--with-large-files \
--with-maxfd=32768 \
--with-pthreads \
+ --with-openssl \
+ --without-nettle \
--enable-zph-qos
%{__make}
$RPM_BUILD_ROOT%{_mandir}/man8 \
$RPM_BUILD_ROOT%{_datadir}/squid \
$RPM_BUILD_ROOT/var/{cache,log{,/archive}}/squid \
- $RPM_BUILD_ROOT%{systemdtmpfilesdir}
+ $RPM_BUILD_ROOT%{systemdtmpfilesdir} \
+ $RPM_BUILD_ROOT%{systemdunitdir}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
%{__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
:> $RPM_BUILD_ROOT/var/cache/squid/swap.state.clean
:> $RPM_BUILD_ROOT/var/cache/squid/swap.state.last-clean
+%{__sed} -e 's|@@LIBEXECDIR@@|%{_libexecdir}|g' %{SOURCE10} >$RPM_BUILD_ROOT%{systemdunitdir}/squid.service
+cp -p %{SOURCE11} $RPM_BUILD_ROOT%{_libexecdir}/squid-check_cache
+
%clean
rm -rf $RPM_BUILD_ROOT
/sbin/service squid init >&2
fi
%service squid restart
+%systemd_post squid.service
%preun
if [ "$1" = "0" ]; then
# nuke squid cache if uninstalling
rm -rf /var/cache/squid/??
fi
+%systemd_preun squid.service
%postun
if [ "$1" = "0" ]; then
%userremove squid
%groupremove squid
fi
+%systemd_reload
%triggerpostun -- squid < 7:2.5.STABLE7-5
%addusertogroup stats squid
+%triggerpostun -- squid < 7:3.4.7-2
+%systemd_trigger squid.service
+
%triggerin cachemgr -- apache1 < 1.3.37-3, apache1-base
%webapp_register apache %{_webapp}
%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
%files
%defattr(644,root,root,755)
-%doc CONTRIBUTORS COPYRIGHT CREDITS README ChangeLog QUICKSTART
+%doc CONTRIBUTORS CREDITS README ChangeLog QUICKSTART
%doc RELEASENOTES.html SPONSORS docs/* src/mib.txt book-full.html
%doc src/squid.conf.default src/squid.conf.documented src/mime.conf.default
%doc errors/TRANSLATORS
%attr(755,root,root) %{_libexecdir}/unlinkd
%attr(755,root,root) %{_libexecdir}/ntlm_fake_auth
%attr(755,root,root) %{_libexecdir}/basic_fake_auth
+%attr(755,root,root) %{_libexecdir}/ext_delayer_acl
+%attr(755,root,root) %{_libexecdir}/helper-mux
%attr(755,root,root) %{_libexecdir}/url_fake_rewrite
%attr(755,root,root) %{_libexecdir}/url_fake_rewrite.sh
%attr(755,root,root) %{_libexecdir}/log_file_daemon
+%attr(755,root,root) %{_libexecdir}/security_fake_certverify
+%attr(755,root,root) %{_libexecdir}/security_file_certgen
+%attr(755,root,root) %{_libexecdir}/squid-check_cache
+%attr(755,root,root) %{_libexecdir}/url_lfs_rewrite
%attr(755,root,root) %{_sbindir}/squid
%attr(754,root,root) /etc/rc.d/init.d/squid
%lang(it) %{_datadir}/squid/errors/it-*
%lang(ja) %{_datadir}/squid/errors/ja
%lang(ja) %{_datadir}/squid/errors/ja-*
+%lang(ka) %{_datadir}/squid/errors/ka
+%lang(ka) %{_datadir}/squid/errors/ka-*
%lang(ko) %{_datadir}/squid/errors/ko
%lang(ko) %{_datadir}/squid/errors/ko-*
%lang(lt) %{_datadir}/squid/errors/lt
%lang(pt) %{_datadir}/squid/errors/pt
%lang(pt) %{_datadir}/squid/errors/pt-pt
%lang(pt_BR) %{_datadir}/squid/errors/pt-br
+%lang(pt_BZ) %{_datadir}/squid/errors/pt-bz
%lang(ro) %{_datadir}/squid/errors/ro
%lang(ro) %{_datadir}/squid/errors/ro-*
%lang(ru) %{_datadir}/squid/errors/ru
%lang(vi) %{_datadir}/squid/errors/vi
%lang(vi) %{_datadir}/squid/errors/vi-*
%lang(zh_CN) %{_datadir}/squid/errors/zh-cn
+%lang(zh_CN) %{_datadir}/squid/errors/zh-han*
%lang(zh_CN) %{_datadir}/squid/errors/zh-sg
%lang(zh_CN) %{_datadir}/squid/errors/zh-tw
%lang(zh_TW) %{_datadir}/squid/errors/zh-hk
%lang(zh_TW) %{_datadir}/squid/errors/zh-mo
+%{systemdunitdir}/squid.service
%{systemdtmpfilesdir}/squid.conf
%attr(770,root,squid) %dir /var/run/squid
%ghost /var/cache/squid/swap.state
%ghost /var/cache/squid/swap.state.clean
%ghost /var/cache/squid/swap.state.last-clean
+%{_mandir}/man1/purge.1*
%{_mandir}/man1/squidclient.1*
+%{_mandir}/man8/ext_delayer_acl.8*
%{_mandir}/man8/squid.8*
+%{_mandir}/man8/helper-mux.8*
+%{_mandir}/man8/security_fake_certverify.8*
+%{_mandir}/man8/security_file_certgen.8*
+%{_mandir}/man8/url_lfs_rewrite.8*
%files cachemgr
%defattr(644,root,root,755)
%files ldap_auth
%defattr(644,root,root,755)
-%doc helpers/basic_auth/LDAP/README
%attr(755,root,root) %{_libexecdir}/basic_ldap_auth
%{_mandir}/man8/basic_ldap_auth.*
%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
%defattr(644,root,root,755)
-%doc helpers/basic_auth/SMB/ChangeLog
+%doc src/auth/basic/SMB/ChangeLog
%attr(755,root,root) %{_libexecdir}/basic_smb_auth*
%files msnt_auth
%defattr(644,root,root,755)
-%doc helpers/basic_auth/MSNT/README*
-%doc helpers/basic_auth/MSNT-multi-domain/README*
-%attr(755,root,root) %{_libexecdir}/basic_msnt_auth
-%attr(755,root,root) %{_libexecdir}/basic_msnt_multi_domain_auth
-%attr(640,root,squid) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/msntauth.conf
+#%attr(755,root,root) %{_libexecdir}/basic_msnt_multi_domain_auth
+#%{_mandir}/man8/basic_msnt_multi_domain_auth.8*
%files nis_auth
%defattr(644,root,root,755)
%files sasl_auth
%defattr(644,root,root,755)
-%doc helpers/basic_auth/SASL/basic_sasl_auth.{conf,pam}
+%doc src/auth/basic/SASL/basic_sasl_auth.{conf,pam}
%attr(755,root,root) %{_libexecdir}/basic_sasl_auth
%{_mandir}/man8/basic_sasl_auth.8*
%files kerberos_auth
%defattr(644,root,root,755)
-%doc helpers/negotiate_auth/kerberos/README
+%doc src/auth/negotiate/kerberos/README
%attr(755,root,root) %{_libexecdir}/negotiate_kerberos_auth
%attr(755,root,root) %{_libexecdir}/negotiate_kerberos_auth_test
%{_mandir}/man8/negotiate_kerberos_auth.8*
%files ntlm_auth
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libexecdir}/ntlm_smb_lm_auth
+#%attr(755,root,root) %{_libexecdir}/ntlm_smb_lm_auth
%files radius_auth
%defattr(644,root,root,755)
-%doc helpers/basic_auth/RADIUS/README
+%doc src/auth/basic/RADIUS/README
%attr(755,root,root) %{_libexecdir}/basic_radius_auth
%{_mandir}/man8/basic_radius_auth.8*
%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
%defattr(644,root,root,755)
%{_libexecdir}/basic_pop3_auth
+%{_mandir}/man8/basic_pop3_auth.8*
%files digest_edirectory_auth
%defattr(644,root,root,755)
%files ip_acl
%defattr(644,root,root,755)
-%doc helpers/external_acl/file_userip/example*
+%doc src/acl/external/file_userip/example*
%attr(755,root,root) %{_libexecdir}/ext_file_userip_acl
%{_mandir}/man8/ext_file_userip_acl.*
%defattr(644,root,root,755)
%{_libexecdir}/ext_kerberos_ldap_group_acl
+%files sql_session_acl
+%defattr(644,root,root,755)
+%{_libexecdir}/ext_sql_session_acl
+%{_mandir}/man8/ext_sql_session_acl.8*
+
+%files time_quota_acl
+%defattr(644,root,root,755)
+%{_libexecdir}/ext_time_quota_acl
+%{_mandir}/man8/ext_time_quota_acl.8*
+
+%files log_db_daemon
+%defattr(644,root,root,755)
+%{_libexecdir}/log_db_daemon
+%{_mandir}/man8/log_db_daemon.8*
+
+%files storeid_file_rewrite
+%defattr(644,root,root,755)
+%{_libexecdir}/storeid_file_rewrite
+%{_mandir}/man8/storeid_file_rewrite.8*
+
%files scripts
%defattr(644,root,root,755)
%attr(755,root,root) %{_libexecdir}/contrib
%attr(755,root,root) %{_libexecdir}/fileno-to-pathname.pl
%attr(755,root,root) %{_libexecdir}/find-alive.pl
%attr(755,root,root) %{_libexecdir}/flag_truncs.pl
-%attr(755,root,root) %{_libexecdir}/helper-mux.pl
%attr(755,root,root) %{_libexecdir}/icpserver.pl
%attr(755,root,root) %{_libexecdir}/icp-test.pl
%attr(755,root,root) %{_libexecdir}/tcp-banger.pl
projects / packages / squid.git / blobdiff