- updated to 3.3.9, updated squid.conf.patch for TLD

diff --git a/squid.conf.patch b/squid.conf.patch
index d9455bb66e782b11682c2bda22f0f5e8c8de74b9..2708ca83f1644dfb78744e8e456e7254acdd9687 100644 (file)
--- a/squid.conf.patch
+++ b/squid.conf.patch
@@ -1,6 +1,6 @@
---- squid.conf.default 2010-09-08 13:45:20.000000000 +0200
-+++ squid.conf 2010-09-08 17:29:24.765819003 +0200
-@@ -43,7 +43,7 @@
+--- squid.conf.orig    2013-09-21 19:26:32.702891523 +0000
++++ squid.conf 2013-09-21 19:28:56.799891871 +0000
+@@ -40,7 +40,7 @@
  # We strongly recommend the following be uncommented to protect innocent
  # web applications running on the proxy server who think the only
  # one who can access services on "localhost" is a local user
@@ -9,8 +9,8 @@
  
  #
  # INSERT YOUR OWN RULE(S) HERE TO ALLOW ACCESS FROM YOUR CLIENTS
-@@ -65,7 +65,8 @@
- hierarchy_stoplist cgi-bin ?
+@@ -59,7 +59,8 @@
+ http_port 3128
  
  # Uncomment and adjust the following to add a disk cache directory.
 -#cache_dir ufs /var/cache/squid 100 16 256
@@ -19,15 +19,13 @@
  
  # Leave coredumps in the first cache dir
  coredump_dir /var/cache/squid
-@@ -75,3 +76,12 @@
+@@ -71,3 +72,10 @@
  refresh_pattern ^gopher:      1440    0%      1440
  refresh_pattern -i (/cgi-bin/|\?) 0   0%      0
  refresh_pattern .             0       20%     4320
 +
-+# Default value for logfile_rotate is 10, but PLD uses 'logrotate',
-+# which is more configurable, to perform this task. Setting this
-+# value to '0' disables built-in log rotation and allows 'logrotate'
-+# to do it's job.
++# In TLD we are using logrotate to rotate squid logs. Disable
++# built-in log rotation.
 +logfile_rotate 0
 +
 +cache_effective_user squid

diff --git a/squid.spec b/squid.spec
index 5eb77ace34c72d54a785e46d7e3c14475f5850d6..5ffa6af66bbd4a3de0f316982feac02e529f7b71 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.13
+Version:       3.3.9
 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: 367e59c9c25da7ebbfbf7cbc36d2444e
+Source0:       http://www.squid-cache.org/Versions/v3/3.3/%{name}-%{version}.tar.bz2
+# Source0-md5: f08bffe795260cecca828331c579e0c4
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Source3:       http://squid-docs.sourceforge.net/latest/zip-files/book-full-html.zip
@@ -541,6 +541,20 @@ Moduł oparty na koncepcji sesji, śledzący zapytania i wygaszający
 sesje jeśli w określonym czasie nie widziano w ich obrębie kolejnych
 zapytań.
 
+%package sql_session_acl
+Summary:       SQL Database session lookup helper for Squid
+Summary(pl.UTF-8):     Wsparcie kontroli dostępu na podstawie bazy SQL
+Group:         Networking/Admin
+Requires:      %{name} = %{epoch}:%{version}-%{release}
+
+%description sql_session_acl
+Validates an HTTP requests access authorization with a session
+database.
+
+%description sql_session_acl -l pl.UTF-8
+Weryfikacja dostępu dla żądań HTTP na podstawie bazy SQL z danymi
+sesji.
+
 %package edirectory_userip_acl
 Summary:       Squid eDirectory IP Lookup Helper
 Summary(pl.UTF-8):     Wsparcie kontroli dostępu przez eDirectory
@@ -571,6 +585,32 @@ 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.
 
+%package time_quota_acl
+Summary:       Squid time quota external acl helper
+Summary(pl.UTF-8):     Wsparcie kontroli dostępu na podstawie czasu
+Group:         Networking/Admin
+Requires:      %{name} = %{epoch}:%{version}-%{release}
+
+%description time_quota_acl
+This ACL module allows an administrator to define and enforce time
+budgets for the users of squid (e.g. 1 hour per day).
+
+%description time_quota_acl -l pl.UTF-8
+Ten moduł ACL pozwala administratorowi zdefiniować i wymusić limity
+czasowe dla użytkowników na dostęp do proxy (np. 1 godzinna dziennie).
+
+%package log_db_daemon
+Summary:       Database logging daemon for Squid
+Summary(pl.UTF-8):     Usługa logowania do baz danych dla Squida
+Group:         Networking/Admin
+Requires:      %{name} = %{epoch}:%{version}-%{release}
+
+%description log_db_daemon
+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 scripts
 Summary:       Perl scripts for Squid
 Summary(pl.UTF-8):     Skrypty perlowe dla Squida
@@ -1024,6 +1064,11 @@ fi
 %attr(755,root,root) %{_libexecdir}/ext_session_acl
 %{_mandir}/man8/ext_session_acl.8*
 
+%files sql_session_acl
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libexecdir}/ext_sql_session_acl
+%{_mandir}/man8/ext_sql_session_acl.8*
+
 %files edirectory_userip_acl
 %defattr(644,root,root,755)
 %{_libexecdir}/ext_edirectory_userip_acl
@@ -1033,6 +1078,16 @@ fi
 %defattr(644,root,root,755)
 %{_libexecdir}/ext_kerberos_ldap_group_acl
 
+%files time_quota_acl
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libexecdir}/ext_time_quota_acl
+%{_mandir}/man8/ext_time_quota_acl.8*
+
+%files log_db_daemon
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libexecdir}/log_db_daemon
+%{_mandir}/man8/log_db_daemon.8*
+
 %files scripts
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libexecdir}/contrib