- updated to 3.4.5

diff --git a/squid.spec b/squid.spec
index ee8a71c6ddf182f6f8ae4d35908e2668e00d4106..21d9d85215227e93e5f15a05af24ebb2753af6f2 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.3.10
-Release:       1
+Version:       3.4.5
+Release:       0.1
 Epoch:         7
 License:       GPL v2
 Group:         Networking/Daemons
-Source0:       http://www.squid-cache.org/Versions/v3/3.3/%{name}-%{version}.tar.xz
-# Source0-md5: 28058812d722cac303517a643e28bcb0
+Source0:       http://www.squid-cache.org/Versions/v3/3.4/%{name}-%{version}.tar.xz
+# Source0-md5: a831efb36cfbaa419f8dc7a43cba72c9
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Source3:       http://squid-docs.sourceforge.net/latest/zip-files/book-full-html.zip
@@ -39,11 +39,9 @@ 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
+Patch7:                squidv3-vary-headers-shm-hack.patch
+Patch8:                %{name}-digest_edirectory_auth.patch
 URL:           http://www.squid-cache.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -613,6 +611,23 @@ This program writes Squid access.log entries to a database.
 %description log_db_daemon -l pl.UTF-8
 Ten program zapisuje wpisy z pliku access.log Squida do bazy danych.
 
+%package storeid_file_rewrite
+Summary:       File based Store-ID helper for Squid
+Summary(pl.UTF-8):     Wsparcie dla Store-ID oparte na plikach
+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.
+
+%description storeid_file_rewrite -l pl.UTF-8
+Ten program działa jako wsparcie store_id przepisując adresy URL
+przekazywane przez proxy na identyfikatory, które mogą zostać użyte do
+osiągnięcia lepszych wyników w przypadku stron oferujących tą samą
+zawartość pod różnymi adresami URL.
+
 %package scripts
 Summary:       Perl scripts for Squid
 Summary(pl.UTF-8):     Skrypty perlowe dla Squida
@@ -653,6 +668,7 @@ Ten pakiet zawiera skrypty perlowe i dodatkowe programy dla Squida.
        --with-swapdir=/var/cache/squid \
        --with-pidfile=/var/run/squid.pid \
        --datadir=%{_datadir}/squid \
+       --disable-arch-native \
        --enable-arp-acl \
        --enable-auth \
        --enable-basic-auth-helpers \
@@ -898,6 +914,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
@@ -1090,6 +1107,11 @@ fi
 %attr(755,root,root) %{_libexecdir}/log_db_daemon
 %{_mandir}/man8/log_db_daemon.8*
 
+%files storeid_file_rewrite
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libexecdir}/storeid_file_rewrite
+%{_mandir}/man8/storeid_file_rewrite.8*
+
 %files scripts
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libexecdir}/contrib
@@ -1099,6 +1121,7 @@ fi
 %attr(755,root,root) %{_libexecdir}/cachetrace.pl
 %attr(755,root,root) %{_libexecdir}/calc-must-ids.pl
 %attr(755,root,root) %{_libexecdir}/cert_tool
+%attr(755,root,root) %{_libexecdir}/cert_valid.pl
 %attr(755,root,root) %{_libexecdir}/check_cache.pl
 %attr(755,root,root) %{_libexecdir}/fileno-to-pathname.pl
 %attr(755,root,root) %{_libexecdir}/find-alive.pl