OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 21-Oct-2005 09:11:08
Branch: OPENPKG_2_5_SOLID Handle: 2005102108110800
Modified files: (Branch: OPENPKG_2_5_SOLID)
openpkg-src/squid squid.spec
Log:
apply all available vendor patches, including a security fix
(CVE-2005-3258)
Summary:
Revision Changes Path
1.83.2.2 +13 -2 openpkg-src/squid/squid.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/squid/squid.spec
============================================================================
$ cvs diff -u -r1.83.2.1 -r1.83.2.2 squid.spec
--- openpkg-src/squid/squid.spec 11 Oct 2005 12:51:59 -0000 1.83.2.1
+++ openpkg-src/squid/squid.spec 21 Oct 2005 07:11:08 -0000 1.83.2.2
@@ -38,7 +38,7 @@
Group: Web
License: GPL
Version: %{V_maj}.%{V_min}.%{V_rev}
-Release: 2.5.0
+Release: 2.5.1
# package options
%option with_fsl yes
@@ -51,6 +51,17 @@
Source1: rc.squid
Source2: fsl.squid
Patch0:
http://www.squid-cache.org/Versions/v%{V_maj}/%{V_maj}.%{V_min}/bugs/squid-%{V_maj}.%{V_min}.STABLE%{V_rev}-delaypools_truncated.patch
+Patch1:
http://www.squid-cache.org/Versions/v%{V_maj}/%{V_maj}.%{V_min}/bugs/squid-%{V_maj}.%{V_min}.STABLE%{V_rev}-tcp_outgoing_xxx.patch
+Patch2:
http://www.squid-cache.org/Versions/v%{V_maj}/%{V_maj}.%{V_min}/bugs/squid-%{V_maj}.%{V_min}.STABLE%{V_rev}-ldap_auth.patch
+Patch3:
http://www.squid-cache.org/Versions/v%{V_maj}/%{V_maj}.%{V_min}/bugs/squid-%{V_maj}.%{V_min}.STABLE%{V_rev}.accel_single_host_pconn.patch
+Patch4:
http://www.squid-cache.org/Versions/v%{V_maj}/%{V_maj}.%{V_min}/bugs/squid-%{V_maj}.%{V_min}.STABLE%{V_rev}-CACHE_HTTP_PORT.patch
+Patch5:
http://www.squid-cache.org/Versions/v%{V_maj}/%{V_maj}.%{V_min}/bugs/squid-%{V_maj}.%{V_min}.STABLE%{V_rev}-CNAME.patch
+Patch6:
http://www.squid-cache.org/Versions/v%{V_maj}/%{V_maj}.%{V_min}/bugs/squid-%{V_maj}.%{V_min}.STABLE%{V_rev}-httpd_accel-internal.patch
+Patch7:
http://www.squid-cache.org/Versions/v%{V_maj}/%{V_maj}.%{V_min}/bugs/squid-%{V_maj}.%{V_min}.STABLE%{V_rev}-IMS-HEAD.patch
+Patch8:
http://www.squid-cache.org/Versions/v%{V_maj}/%{V_maj}.%{V_min}/bugs/squid-%{V_maj}.%{V_min}.STABLE%{V_rev}-redirect-CONNECT.patch
+Patch9:
http://www.squid-cache.org/Versions/v%{V_maj}/%{V_maj}.%{V_min}/bugs/squid-%{V_maj}.%{V_min}.STABLE%{V_rev}-setcookie.patch
+Patch10:
http://www.squid-cache.org/Versions/v%{V_maj}/%{V_maj}.%{V_min}/bugs/squid-%{V_maj}.%{V_min}.STABLE%{V_rev}-rfc1738_do_escape.patch
+Patch11:
http://www.squid-cache.org/Versions/v%{V_maj}/%{V_maj}.%{V_min}/bugs/squid-%{V_maj}.%{V_min}.STABLE%{V_rev}-delaypool_3_255.patch
# build information
Prefix: %{l_prefix}
@@ -86,7 +97,7 @@
%prep
%setup -q -n squid-%{V_maj}.%{V_min}.STABLE%{V_rev}
- %patch -p1
+ %patch -p1 -P 0 1 2 3 4 5 6 7 8 9 10 11
%if "%{with_ntlm}" == "yes"
%{l_shtool} subst \
-e 's;/usr/bin/perl;%{l_prefix}/bin/perl;' \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
