From dbcfdd68eae8703ebf70bc20839c2cd72275b6880661a3c38117bb1354fd17e7 Mon Sep 17 00:00:00 2001 From: Christian Wittmer Date: Wed, 25 Dec 2013 21:46:51 +0000 Subject: [PATCH] Accepting request 212267 from home:computersalat:devel:proxy update to 3.3.11 OBS-URL: https://build.opensuse.org/request/show/212267 OBS-URL: https://build.opensuse.org/package/show/server:proxy/squid?expand=0&rev=47 --- RELEASENOTES.html | 19 +++++----- squid-3.3.11.tar.bz2 | 3 ++ squid-3.3.11.tar.bz2.asc | 20 +++++++++++ squid-3.3.9.tar.bz2 | 3 -- squid-3.3.9.tar.bz2.asc | 20 ----------- squid-compiled_without_RPM_OPT_FLAGS.patch | 2 +- squid-config.patch | 8 ++--- squid.changes | 41 ++++++++++++++++++++++ squid.spec | 40 ++++++--------------- 9 files changed, 90 insertions(+), 66 deletions(-) create mode 100644 squid-3.3.11.tar.bz2 create mode 100644 squid-3.3.11.tar.bz2.asc delete mode 100644 squid-3.3.9.tar.bz2 delete mode 100644 squid-3.3.9.tar.bz2.asc diff --git a/RELEASENOTES.html b/RELEASENOTES.html index 51075da..61e03c9 100644 --- a/RELEASENOTES.html +++ b/RELEASENOTES.html @@ -2,10 +2,10 @@ - Squid 3.3.9 release notes + Squid 3.3.11 release notes -

Squid 3.3.9 release notes

+

Squid 3.3.11 release notes

Squid Developers

@@ -56,7 +56,7 @@ for Applied Network Research and members of the Web Caching community.

1. Notice

-

The Squid Team are pleased to announce the release of Squid-3.3.9.

+

The Squid Team are pleased to announce the release of Squid-3.3.11.

This new release is available for download from http://www.squid-cache.org/Versions/v3/3.3/ or the mirrors.

@@ -246,6 +246,12 @@ to happen. The request_header_add option supports fast ACLs only.

+
cache_miss_revalidate
+

Whether Squid is to pass-through If-Modified-Since and If-None-Match headers on cache MISS. +Revalidation requests can prevent cache gathering objects to HIT on.

+

Based on the Squid-2.7 ignore_ims_on_miss feature.

+

IMPORTANT: the meaning for on/off values has changed along with the name since 2.7.

+
request_header_add

New directive to add custom headers on HTTP traffic sent to upstream servers.

@@ -302,8 +308,8 @@ and allow with client-first. However an upgrade to server-

- -

There are no removed squid.conf options in Squid-3.3.

+
ignore_ims_on_miss
+

This option has been replaced by the cache_miss_revalidate feature.

@@ -403,9 +409,6 @@ This configure option is now needed to disable it. Previously it did nothing.

external_refresh_check

Not yet ported from 2.7

-
ignore_ims_on_miss
-

Not yet ported from 2.7

-
location_rewrite_access

Not yet ported from 2.6

diff --git a/squid-3.3.11.tar.bz2 b/squid-3.3.11.tar.bz2 new file mode 100644 index 0000000..18a825a --- /dev/null +++ b/squid-3.3.11.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6b314cd706693522f01d5ab1930f3aa7a9b03a913bc0e699def16cca8d15ea54 +size 2989941 diff --git a/squid-3.3.11.tar.bz2.asc b/squid-3.3.11.tar.bz2.asc new file mode 100644 index 0000000..87c1551 --- /dev/null +++ b/squid-3.3.11.tar.bz2.asc @@ -0,0 +1,20 @@ +File: squid-3.3.11.tar.bz2 +Date: Sat Nov 30 14:12:34 UTC 2013 +Size: 2989941 +MD5 : abf2b0fe128f73f5dc157e7e917949e0 +SHA1: f99627f9f5c76cc2ddf6e14e4a3e955963801b6f +Key : 0xFF5CF463 + fingerprint = EA31 CC5E 9488 E516 8D2D CC5E B268 E706 FF5C F463 + keyring = http://www.squid-cache.org/pgp.asc + keyserver = subkeys.pgp.net +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.15 (GNU/Linux) + +iQEcBAABAgAGBQJSmfXuAAoJELJo5wb/XPRjaqcIAKvTzz9frodyUOeuop5W2yZx +s3knaI5ZyM7dsXYdDUixto5Q1+a8wIUAvZzCp2sLij3QQTKZJAxgmQ8Tztl/sgKI +NbHJSJxAtibNOGKBfCqCDurcNfmn2kLZJPxJXx3gulEP5O7rTdKVoZq/1vyj/rvv +rnzZBP2HZ5fnXNRfs7UPrOzMLmg423zXzsDnRjj69xy6w0dXpObDP5tb32jNmOLg +zRvk3lw4mtpWJ5kGZ4BbwPpO9i2MT94M9YupjL/doNbbiAt2nutGfGuLgPcmsCwA +fpb74hKIM20ON8A7XypeyX6eNeYn4nkRBSuzEX/sPWQUyq0BMxheCEZRboGCnvo= +=rlWB +-----END PGP SIGNATURE----- diff --git a/squid-3.3.9.tar.bz2 b/squid-3.3.9.tar.bz2 deleted file mode 100644 index e1372f8..0000000 --- a/squid-3.3.9.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2bb048725745de755f35a84133e25c7db0d56f4cc7002962e84b80091866eb45 -size 2988736 diff --git a/squid-3.3.9.tar.bz2.asc b/squid-3.3.9.tar.bz2.asc deleted file mode 100644 index 1b17f81..0000000 --- a/squid-3.3.9.tar.bz2.asc +++ /dev/null @@ -1,20 +0,0 @@ -File: squid-3.3.9.tar.bz2 -Date: Wed Sep 11 04:32:33 UTC 2013 -Size: 2988736 -MD5 : f08bffe795260cecca828331c579e0c4 -SHA1: ac75d1bef17988e3ad95ee6761d7785f5aca9cd7 -Key : 0xFF5CF463 - fingerprint = EA31 CC5E 9488 E516 8D2D CC5E B268 E706 FF5C F463 - keyring = http://www.squid-cache.org/pgp.asc - keyserver = subkeys.pgp.net ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.12 (GNU/Linux) - -iQEcBAABAgAGBQJSL/QNAAoJELJo5wb/XPRjZZwH/jVAL6QGnufPlSZ4oIZEga29 -YHMuLKkAmBt6lp67MoNLHTthSsISiSLb7VvmIfSiNZxbSrt69PP0B+aWnM9O0rK6 -F+9YqgcPkoCAcOzf/SbVb0wm7kM41aYu3SvIJIgQu784KX1AJ3dyUTlb//Sfa0l7 -dcztRGIAihSkx3spf/1ALXq6f3MwKncFMs0l84x989luAS/jSte2Z+27s6aCK2eU -4KvPPTmts5hpd6xvnX/Y1leye42c+MPpGc6XzsBzCJ2xlXOd75hZyrbOrSd5VR7t -+QVC98qVBW2QgQHHXlVG+TQCT75/go01mUpw3YeFMAf1HC6AATddGD2/6tN9roU= -=mvR8 ------END PGP SIGNATURE----- diff --git a/squid-compiled_without_RPM_OPT_FLAGS.patch b/squid-compiled_without_RPM_OPT_FLAGS.patch index 017e976..abfde4a 100644 --- a/squid-compiled_without_RPM_OPT_FLAGS.patch +++ b/squid-compiled_without_RPM_OPT_FLAGS.patch @@ -15,7 +15,7 @@ Index: src/Makefile.in =================================================================== --- src/Makefile.in.orig +++ src/Makefile.in -@@ -7295,7 +7295,7 @@ cache_cf.o: cf_parser.cci +@@ -7306,7 +7306,7 @@ cache_cf.o: cf_parser.cci # cf_gen builds the configuration files. cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES) cf_gen_defines.cci diff --git a/squid-config.patch b/squid-config.patch index 6991785..d17343b 100644 --- a/squid-config.patch +++ b/squid-config.patch @@ -2,7 +2,7 @@ Index: src/cf.data.pre =================================================================== --- src/cf.data.pre.orig +++ src/cf.data.pre -@@ -1195,6 +1195,8 @@ http_access deny manager +@@ -1196,6 +1196,8 @@ http_access deny manager # Adapt localnet in the ACL section to list your (internal) IP networks # from where browsing should be allowed http_access allow localnet @@ -11,7 +11,7 @@ Index: src/cf.data.pre http_access allow localhost # And finally deny all other access to this proxy -@@ -3143,6 +3145,10 @@ DOC_START +@@ -3144,6 +3146,10 @@ DOC_START Instead, if you want Squid to use the entire disk drive, subtract 20% and use that value. @@ -22,7 +22,7 @@ Index: src/cf.data.pre 'L1' is the number of first-level subdirectories which will be created under the 'Directory'. The default is 16. -@@ -3276,7 +3282,7 @@ DOC_START +@@ -3277,7 +3283,7 @@ DOC_START NOCOMMENT_START # Uncomment and adjust the following to add a disk cache directory. @@ -31,7 +31,7 @@ Index: src/cf.data.pre NOCOMMENT_END DOC_END -@@ -3889,7 +3895,7 @@ DOC_END +@@ -3890,7 +3896,7 @@ DOC_END NAME: logfile_rotate TYPE: int diff --git a/squid.changes b/squid.changes index b1ead67..6ca2560 100644 --- a/squid.changes +++ b/squid.changes @@ -1,3 +1,44 @@ +------------------------------------------------------------------- +Wed Dec 25 21:29:38 UTC 2013 - chris@computersalat.de + +- Changes to squid-3.3.11 (01 Dec 2013): + * Regression Bug 3936: error-details.txt parse error with OpenSSL since 3.3.9 + * Bug 3972: Segfault when getting the deny_info page ID after a reconfigure + * Bug 3970: max_filedescriptors disabled due to missing setrlimit + * Bug 3967: ipc/Kid.cc compilation failure: 'time' was not declared in this scope + * Bug 3960: DEAD cache_peer are not revived + * Bug 3956: xstrndup: tried to dup a NULL pointer + * Bug 3906: Filedescriptor leaks in SNMP + * Bug 3782: Digest authentication not obeying nonce_max_count + * HTTP/1.1: Make header parser obey relaxed_header_parser + * HTTP/1.1: Re-compute Range response content offset after an FTP response was adapted + * SMP: Replace blocking sleep(3) and close UDS socket on failures + * Windows: fix several compile errors +- Changes to squid-3.3.10 (03 Nov 2013): + * Bug 3929: request_header_add not working for tunnel requests + * Bug 3923: cbdata and undefined behavior due to dynamic runtime enumeration + * Bug 3918: Self Test Failures on Mac OS X 10.8 + * Bug 3887: tcp_outgoing_tos not working for IPv6 + * Bug 3836: Fix issues with automake 1.13+ and make check + * Bug 3480: StoreEntry::kickProducer() segfaults in store_client::copy() + * Fix pinning hierarchy log information + * Fix close idle client connections associated with closed idle pinned connections. + * Fix cbdata 'error: expression result unused' errors + * Avoid "hot idle": A series of rapid select() calls with zero timeout. + * Append Connection:close to OPTIONS requests when icap_persistent_connections is off + * ntlm_fake_auth: pass DOMAIN data to Squid in original case + * kerberos_ldap_group: fix LDAP string duplication + * Use IPv6 localhost nameserver on DNS configuration errors + * Add cache_miss_revalidate + * ... and several portability improvements +- modified patches: + * squid-compiled_without_RPM_OPT_FLAGS.patch + * squid-config.patch +- fix build for SLE (libxml2-devel vs pkgconfig(libxml2)) +- fix changed files + * bindir/purge + * bindir/squidclient + ------------------------------------------------------------------- Sat Sep 28 17:56:52 UTC 2013 - chris@computersalat.de diff --git a/squid.spec b/squid.spec index b807c9f..a3d8c13 100644 --- a/squid.spec +++ b/squid.spec @@ -23,7 +23,7 @@ Name: squid Summary: Squid Version 3.3 WWW Proxy Server License: GPL-2.0+ Group: Productivity/Networking/Web/Proxy -Version: 3.3.9 +Version: 3.3.11 Release: 0 Url: http://www.squid-cache.org/Versions/v3/3.3 Source0: http://www.squid-cache.org/Versions/v3/3.3/%{name}-%{version}.tar.bz2 @@ -71,8 +71,10 @@ BuildRequires: db-devel BuildRequires: cyrus-sasl-devel BuildRequires: ed BuildRequires: expat +BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gpg-offline +BuildRequires: krb5-devel BuildRequires: libcap-devel BuildRequires: libexpat-devel BuildRequires: libtool @@ -82,21 +84,10 @@ BuildRequires: openssl-devel BuildRequires: pam-devel BuildRequires: pkgconfig BuildRequires: sharutils -# -%if 0%{?sles_version} == 9 -BuildRequires: heimdal-devel -%else -BuildRequires: krb5-devel -%endif -# -%if 0%{?suse_version} > 1030 || 0%{?fedora_version} > 8 -BuildRequires: fdupes -%endif -# -%if 0%{?suse_version} >= 1130 -BuildRequires: pkgconfig(libxml-2.0) -%else +%if 0%{?suse_version} < 1220 BuildRequires: libxml2-devel +%else +BuildRequires: pkgconfig(libxml-2.0) %endif %if 0%{?suse_version} > 1140 @@ -149,22 +140,14 @@ chmod a-x CREDITS export CFLAGS="%{optflags} -fPIE -fPIC -DOPENSSL_LOAD_CONF" export CXXFLAGS="%{optflags} -fPIE -fPIC -DOPENSSL_LOAD_CONF" export LDFLAGS='-Wl,-z,relro,-z,now -pie' -./configure \ -%if 0%{?suse_version} == 1110 +%configure \ --disable-strict-error-checking \ -%endif - --prefix=/usr \ --sysconfdir=%{squidconfdir} \ - --bindir=/usr/sbin \ - --sbindir=/usr/sbin \ - --localstatedir=/var \ --libexecdir=/usr/sbin \ --datadir=/usr/share/squid \ - --mandir=%{_mandir} \ - --libdir=%{_libdir} \ --sharedstatedir=/var/squid \ --with-logdir=/var/log/squid \ - --with-pidfile=/var/run/squid.pid \ + --with-pidfile=/run/squid.pid \ --with-dl \ --enable-disk-io \ --enable-storeio \ @@ -315,9 +298,6 @@ fi %verifyscript %verify_permissions -e /usr/sbin/pam_auth -%clean -rm -rf %{buildroot} - %files %defattr(-,root,root) %doc CONTRIBUTORS COPYING COPYRIGHT CREDITS ChangeLog @@ -353,6 +333,8 @@ rm -rf %{buildroot} %config %{_datadir}/%{name}/mib.txt %{_datadir}/%{name}/mime.conf %{_datadir}/%{name}/mime.conf.default +%{_bindir}/purge +%{_bindir}/squidclient %{_sbindir}/basic_db_auth %{_sbindir}/basic_fake_auth %{_sbindir}/basic_getpwnam_auth @@ -388,10 +370,8 @@ rm -rf %{buildroot} %{_sbindir}/ntlm_fake_auth %{_sbindir}/ntlm_smb_lm_auth %{_sbindir}/pinger -%{_sbindir}/purge %{_sbindir}/rc%{name} %{_sbindir}/%{name} -%{_sbindir}/squidclient %{_sbindir}/unlinkd %{_sbindir}/url_fake_rewrite %{_sbindir}/url_fake_rewrite.sh