OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 01-Apr-2004 15:45:19
Branch: OPENPKG_2_0_SOLID Handle: 2004040114451900
Added files: (Branch: OPENPKG_2_0_SOLID)
openpkg-src/squid squid.patch
Modified files: (Branch: OPENPKG_2_0_SOLID)
openpkg-src/squid squid.spec
Log:
http://www.squid-cache.org/Versions/v2/2.5/bugs/#squid-2.5.STABLE4-00,
incorporate squid provided changes to accompany OpenPKG-SA-2004.009
(CAN-2004-0189), 'rfc1738_unescape() changes %00 into a NULL'
Summary:
Revision Changes Path
1.2.2.1 +15 -0 openpkg-src/squid/squid.patch
1.57.2.2 +3 -1 openpkg-src/squid/squid.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/squid/squid.patch
============================================================================
$ cvs diff -u -r0 -r1.2.2.1 squid.patch
--- /dev/null 2004-04-01 15:45:19.000000000 +0200
+++ squid.patch 2004-04-01 15:45:19.000000000 +0200
@@ -0,0 +1,15 @@
+diff -Nau lib/rfc1738.c.orig squid/lib/rfc1738.c
+Index: lib/rfc1738.c
+--- lib/rfc1738.c.orig 2004-04-01 15:01:00.000000000 +0200
++++ lib/rfc1738.c 2004-04-01 15:01:51.000000000 +0200
+@@ -195,6 +195,10 @@
+ continue;
+ }
+ if (s[j + 1] && s[j + 2]) {
++ if (s[j + 1] == '0' && s[j + 2] == '0') { /* %00 case */
++ j += 2;
++ continue;
++ }
+ hexnum[0] = s[j + 1];
+ hexnum[1] = s[j + 2];
+ hexnum[2] = '\0';
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/squid/squid.spec
============================================================================
$ cvs diff -u -r1.57.2.1 -r1.57.2.2 squid.spec
--- openpkg-src/squid/squid.spec 18 Feb 2004 14:51:52 -0000 1.57.2.1
+++ openpkg-src/squid/squid.spec 1 Apr 2004 13:45:19 -0000 1.57.2.2
@@ -39,7 +39,7 @@
Group: Web
License: GPL
Version: %{V_maj}.%{V_min}.%{V_rev}
-Release: 2.0.0
+Release: 2.0.1
# package options
%option with_fsl yes
@@ -50,6 +50,7 @@
Source0:
http://www.squid-cache.org/Versions/v%{V_maj}/%{V_maj}.%{V_min}/squid-%{V_maj}.%{V_min}.STABLE%{V_rev}.tar.gz
Source1: rc.squid
Source2: fsl.squid
+Patch0: squid.patch
# build information
Prefix: %{l_prefix}
@@ -82,6 +83,7 @@
%prep
%setup -q -n squid-%{V_maj}.%{V_min}.STABLE%{V_rev}
+ %patch -p0
%build
# configure package
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
