diff --git a/.cvsignore b/.cvsignore index 968bf8d..54439b1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,3 @@ squid-2.5.STABLE5.tar.bz2 squid-2.5.STABLE6.tar.bz2 +squid-2.5.STABLE7.tar.bz2 diff --git a/sources b/sources index 4420c75..d642824 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7fd964ac27b43b613d6b981cc702a29e squid-2.5.STABLE6.tar.bz2 +bf63e34906c68d716896eec0351108dc squid-2.5.STABLE7.tar.bz2 diff --git a/squid.spec b/squid.spec index ed9394c..79ff1eb 100644 --- a/squid.spec +++ b/squid.spec @@ -4,8 +4,8 @@ Summary: The Squid proxy caching server. Name: squid -Version: 2.5.STABLE6 -Release: 3 +Version: 2.5.STABLE7 +Release: 1 Epoch: 7 License: GPL Group: System Environment/Daemons @@ -17,55 +17,18 @@ Source4: squid.sysconfig Source5: squid.pam Source98: perl-requires-squid.sh ## Source99: filter-requires-squid.sh -Patch1: squid-2.5.STABLE3-config.patch +Patch1: squid-2.5.STABLE7-config.patch #Patch2: squid-perlpath.patch Patch3: squid-2.5.STABLE4-location.patch -Patch4: squid-2.5.STABLE3-build.patch +Patch4: squid-2.5.STABLE7-build.patch Patch5: squid-2.5.STABLE4-perlpath.patch Patch6: squid-2.5.STABLE5-pipe.patch -# This is from upstream, but out of order. . . -Patch7: squid-2.5.STABLE6-SNMP_core_dump.patch -Patch8: squid-2.5.STABLE6-nonbl.patch +Patch7: squid-2.5.STABLE6-nonbl.patch +Patch8: squid-2.5.STABLE6-close.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.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.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.STABLE6-CONNECT.patch -Patch131: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE6-balance_on_multiple_ip.patch +Patch100: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE7-half_closed_POST.patch +Patch101: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE7-LDAP_version_documentation.patch +Patch102: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE7_req_resp_header.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root Prereq: /sbin/chkconfig logrotate shadow-utils @@ -94,45 +57,12 @@ lookup program (dnsserver), a program for retrieving FTP data %patch5 -p1 -b .perlpath %patch6 -p1 -b .pipe -%patch7 -p1 - -%patch8 -p1 -b .nonbl +%patch7 -p1 -b .nonbl +%patch8 -p1 -b .close %patch100 -p1 %patch101 -p1 %patch102 -p1 -%patch103 -p1 -%patch104 -p1 -%patch105 -p1 -%patch106 -p1 -%patch107 -p1 -%patch108 -p1 -%patch109 -p1 - -%patch110 -p1 -%patch111 -p1 -%patch112 -p1 -%patch113 -p1 -%patch114 -p1 -b .initgroups -%patch115 -p1 -%patch116 -p1 -%patch117 -p1 -%patch118 -p1 -%patch119 -p1 - -%patch120 -p1 -%patch121 -p1 -%patch122 -p1 -%patch123 -p1 -%patch124 -p1 -%patch125 -p1 -%patch126 -p1 -%patch127 -p1 -%patch128 -p1 -%patch129 -p1 -b .program-prefix - -%patch130 -p1 -%patch131 -p1 %build export CFLAGS="-fPIE -Os -g -pipe -fsigned-char" ; export LDFLAGS=-pie ; @@ -349,6 +279,12 @@ if [ "$1" -ge "1" ] ; then fi %changelog +* Mon Oct 25 2004 Jay Fenlason 7:2.5.STABLE7-1 +- new upstream version, with 3 upstream patches. + Updated the -build and -config patches +- Include patch from Ulrich Drepper to more + intelligently close all file descriptors. + * Mon Oct 18 2004 Jay Fenlason 7:2.5.STABLE6-3 - include patch from Ulrich Drepper to stop problems with O_NONBLOCK. This closes #136049