From 49dbf5f419c91b71ef67bf6a469c5df972197249 Mon Sep 17 00:00:00 2001 From: fenlason Date: Tue, 28 Sep 2004 20:20:51 +0000 Subject: [PATCH] Upgrade to 2.5.STABLE6 This closes #133970, #133931, #131728, #128143, #126726 - Change the permissions on /etc/squid/squid.conf to 640. This closes bugzilla #125007 --- .cvsignore | 1 + sources | 2 +- squid.spec | 85 ++++++++++++++++++++++++++++++------------------------ 3 files changed, 50 insertions(+), 38 deletions(-) diff --git a/.cvsignore b/.cvsignore index 7cce5e1..968bf8d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ squid-2.5.STABLE5.tar.bz2 +squid-2.5.STABLE6.tar.bz2 diff --git a/sources b/sources index 52101f5..4420c75 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -45ed1b1cd492e3f529085d09c3ffc1b8 squid-2.5.STABLE5.tar.bz2 +7fd964ac27b43b613d6b981cc702a29e squid-2.5.STABLE6.tar.bz2 diff --git a/squid.spec b/squid.spec index d535f4d..45b568a 100644 --- a/squid.spec +++ b/squid.spec @@ -4,8 +4,8 @@ Summary: The Squid proxy caching server. Name: squid -Version: 2.5.STABLE5 -Release: 5 +Version: 2.5.STABLE6 +Release: 1 Epoch: 7 License: GPL Group: System Environment/Daemons @@ -24,41 +24,45 @@ Patch4: squid-2.5.STABLE3-build.patch Patch5: squid-2.5.STABLE4-perlpath.patch Patch6: squid-2.5.STABLE5-pipe.patch -Patch100: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-ntlm_assert.patch -Patch101: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-ldap.patch -Patch102: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-helper_warning.patch -Patch103: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-pkgconfig.patch -Patch104: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-vary.patch -Patch105: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-lin22_poll.patch -Patch106: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-version.patch -Patch107: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-deny_info.patch -Patch108: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-CONNECT_timeout.patch -Patch109: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-cache_swap_log.patch +Patch100: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE6-ufs_no_valid_dir.patch +Patch101: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE6-ldap_helpers.patch +Patch102: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE6-concurrent_dns_lookups.patch +Patch103: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE6-request_header_max_size.patch +Patch104: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE6-partial_hit_is_miss.patch +Patch105: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE6-HEAD.patch +Patch106: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE6-ufs_create_error.patch +Patch107: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE6-basic_auth_caseinsensitive.patch +Patch108: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE6-active_requests_delaypool.patch +Patch109: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE6-client_db_gc.patch -Patch110: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-ntlm_warning.patch -Patch111: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-rfc1035NameUnpack.patch -Patch112: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-digest_blank.patch -Patch113: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-post_assert.patch -Patch114: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-spelling.patch -Patch115: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-digest_ERR.patch -Patch116: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-turkish_ERR_DNS_FAIL.patch -Patch117: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-vary_negatively.patch -Patch118: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-range_offset_limit.patch -Patch119: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-large_cache_mem.patch +Patch110: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE6-ntlmtruncated.patch +Patch111: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE6-grammar.patch +Patch112: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE6-errorpage_quote.patch +Patch113: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE6-heap_segfault.patch +# 114 had to be modified to work with patch-2 +#Patch114: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE6-initgroups.patch +Patch114: squid-2.5.STABLE6-initgroups.patch +Patch115: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE6-external_acl_newlines.patch +Patch116: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE6-ntlm_fetch_string.patch +Patch117: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE6-ntlm_noreuse_leak.patch +Patch118: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE6-ntlm_challengereuse_leak.patch +Patch119: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE6-rotate_error.patch -Patch120: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-least-load.patch -Patch121: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-cacheCurrentUnlinkRequests.patch -Patch122: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-debug_client_ip.patch -Patch123: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-openbsd_m88k.patch -Patch124: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-ftp_html_doctype.patch -Patch125: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-dns_localhost.patch -Patch126: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-msnt_auth_doc.patch -Patch127: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-va_copy.patch -Patch128: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-CONNECT_log_size.patch -Patch129: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-proxy_abuse.patch +Patch120: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE6-digest_crash.patch +Patch121: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE6-acl_times.patch +Patch122: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE6-http_header_range.patch +Patch123: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE6-Content-Disposition.patch +Patch124: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE6-freebsd_arp_nowarning.patch +Patch125: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE6-huge_tcp_windows.patch +Patch126: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE6-arbitrary_headers.patch +Patch127: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE6-ncsa_auth_lineendings.patch +Patch128: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE6-basic_auth_caseinsensitive-2.patch +# 119 had to be modified +#Patch129: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE6-program-prefix.patch +Patch129: squid-2.5.STABLE6-program-prefix.patch -Patch130: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-sasl_auth_SASL2.patch -Patch131: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-ntlm_auth_overflow.patch +Patch130: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE6-CONNECT.patch +Patch131: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE6-balance_on_multiple_ip.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root Prereq: /sbin/chkconfig logrotate shadow-utils @@ -102,7 +106,7 @@ lookup program (dnsserver), a program for retrieving FTP data %patch111 -p1 %patch112 -p1 %patch113 -p1 -%patch114 -p1 +%patch114 -p1 -b .initgroups %patch115 -p1 %patch116 -p1 %patch117 -p1 @@ -118,7 +122,7 @@ lookup program (dnsserver), a program for retrieving FTP data %patch126 -p1 %patch127 -p1 %patch128 -p1 -%patch129 -p1 +%patch129 -p1 -b .program-prefix %patch130 -p1 %patch131 -p1 @@ -202,7 +206,7 @@ rm -rf $RPM_BUILD_ROOT %attr(750,squid,squid) %dir /var/log/squid %attr(750,squid,squid) %dir /var/spool/squid %attr(644,root,root) /etc/pam.d/squid -%config(noreplace) /etc/squid/squid.conf +%config(noreplace) %attr(640,root,squid) /etc/squid/squid.conf %config(noreplace) /etc/squid/mime.conf %config(noreplace) /etc/sysconfig/squid %config(noreplace) /etc/squid/msntauth.conf @@ -338,6 +342,13 @@ if [ "$1" -ge "1" ] ; then fi %changelog +* Tue Sep 28 2004 Jay Fenlason 7:2.5.STABLE6-1 +- New upstream version, with 32 upstream patches. + This closes #133970, #133931, #131728, #128143, #126726 + +- Change the permissions on /etc/squid/squid.conf to 640. This closes + bugzilla #125007 + * Mon Jun 28 2004 Jay Fenlason 7:2.5STABLE5-5 - Merge current upstream patches. - Fix the -pipe patch to have the correct name of the winbind pipe.