X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=squid.spec;h=7c2e2731014c51a7b729c31fd1f953035ada1449;hb=6bbc9448314c980b125fa8ae8c10ec85915fb915;hp=54b40639f89159d78d04d164c744e799e45c26cd;hpb=98801e83e6afe1a6fa26100f8a10cbb22a28ac12;p=packages%2Fsquid.git

diff --git a/squid.spec b/squid.spec
index 54b4063..7c2e273 100644
--- 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.3.11
+Version:	4.6
 Release:	2
 Epoch:		7
 License:	GPL v2
 Group:		Networking/Daemons
-Source0:	http://www.squid-cache.org/Versions/v3/3.3/%{name}-%{version}.tar.bz2
-# Source0-md5:	abf2b0fe128f73f5dc157e7e917949e0
+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
@@ -33,19 +33,17 @@ Source6:	%{name}.pamd
 Source7:	%{name}-cachemgr-apache.conf
 Source8:	%{name}.tmpfiles
 Source9:	%{name}-cachemgr-httpd.conf
-Patch0:		%{name}-fhs.patch
+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
-Patch9:		perl-5.18.patch
-Patch10:	ecap-1p0-t2.patch
+Patch7:		squidv3-vary-headers-shm-hack.patch
 URL:		http://www.squid-cache.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -55,7 +53,7 @@ BuildRequires:	db-devel
 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
@@ -65,9 +63,11 @@ BuildRequires:	openldap-devel >= 2.3.0
 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
@@ -81,8 +81,10 @@ Requires(pre):	/usr/sbin/groupadd
 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
@@ -588,8 +590,8 @@ 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.
+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
@@ -597,8 +599,18 @@ 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.
+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
@@ -614,7 +626,7 @@ Ten pakiet zawiera skrypty perlowe i dodatkowe programy dla Squida.
 
 %prep
 %setup -q -a3
-%patch0 -p1
+
 %patch1 -p1
 %patch2 -p1
 %{?with_combined_log:%patch4 -p1}
@@ -622,10 +634,7 @@ Ten pakiet zawiera skrypty perlowe i dodatkowe programy dla Squida.
 %patch5 -p1
 %endif
 %patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p0
+#%patch7 -p1
 
 %{__sed} -i -e '1s#!.*bin/perl#!%{__perl}#' {contrib,scripts}/*.pl
 
@@ -636,7 +645,9 @@ Ten pakiet zawiera skrypty perlowe i dodatkowe programy dla Squida.
 %{__autoheader}
 %{__automake}
 %configure \
+	--disable-silent-rules \
 	--disable-strict-error-checking \
+	--disable-arch-native \
 	--with-default-user=squid \
 	--with-logdir=/var/log/squid \
 	--with-swapdir=/var/cache/squid \
@@ -673,6 +684,7 @@ Ten pakiet zawiera skrypty perlowe i dodatkowe programy dla Squida.
 	--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 \
@@ -684,6 +696,8 @@ Ten pakiet zawiera skrypty perlowe i dodatkowe programy dla Squida.
 	--with-large-files \
 	--with-maxfd=32768 \
 	--with-pthreads \
+	--with-openssl \
+	--without-nettle \
 	--enable-zph-qos
 
 %{__make}
@@ -696,7 +710,8 @@ install -d $RPM_BUILD_ROOT{%{_cgidir},%{_webapps}/%{_webapp}} \
 	$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
@@ -738,6 +753,9 @@ touch $RPM_BUILD_ROOT/var/log/squid/{access,cache,store}.log
 :> $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
 
@@ -759,6 +777,7 @@ if [ "$1" = "1" ]; then
 	/sbin/service squid init >&2
 fi
 %service squid restart
+%systemd_post squid.service
 
 %preun
 if [ "$1" = "0" ]; then
@@ -768,16 +787,21 @@ 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}
 
@@ -798,7 +822,7 @@ fi
 
 %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
@@ -812,9 +836,15 @@ fi
 %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
@@ -871,6 +901,8 @@ fi
 %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
@@ -887,6 +919,7 @@ fi
 %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
@@ -909,11 +942,13 @@ fi
 %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
 
@@ -926,8 +961,14 @@ fi
 %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)
@@ -941,7 +982,6 @@ fi
 
 %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.*
 
@@ -955,16 +995,13 @@ fi
 
 %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)
@@ -977,7 +1014,7 @@ fi
 
 %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*
 
@@ -993,18 +1030,18 @@ fi
 
 %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*
 
@@ -1020,6 +1057,7 @@ fi
 %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)
@@ -1031,7 +1069,7 @@ fi
 
 %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.*
 
@@ -1067,17 +1105,22 @@ fi
 %files sql_session_acl
 %defattr(644,root,root,755)
 %{_libexecdir}/ext_sql_session_acl
-%{_mandir}/man8/ext_sql_session_acl.8.gz
+%{_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.gz
+%{_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.gz
+%{_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)
@@ -1092,7 +1135,6 @@ fi
 %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