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: 14-Dec-2005 21:17:26
Branch: OPENPKG_2_3_SOLID Handle: 2005121420172500
Modified files: (Branch: OPENPKG_2_3_SOLID)
openpkg-src/apache apache.patch apache.spec
Log:
Security Fix (CVE-2005-3352)
Summary:
Revision Changes Path
1.18.2.2 +41 -0 openpkg-src/apache/apache.patch
1.285.2.8 +1 -1 openpkg-src/apache/apache.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.patch
============================================================================
$ cvs diff -u -r1.18.2.1 -r1.18.2.2 apache.patch
--- openpkg-src/apache/apache.patch 18 Oct 2005 08:07:04 -0000 1.18.2.1
+++ openpkg-src/apache/apache.patch 14 Dec 2005 20:17:25 -0000 1.18.2.2
@@ -116,3 +116,44 @@
}
else {
ap_kill_timeout(r);
+
+-----------------------------------------------------------------------------
+
+Security Fix (CVE-2005-3352)
+
+Index: apache_1.3.33/src/main/util.c
+--- apache_1.3.33/src/main/util.c.orig 2004-11-24 20:10:19 +0100
++++ apache_1.3.33/src/main/util.c 2005-12-14 21:06:57 +0100
+@@ -1722,6 +1722,8 @@
+ j += 3;
+ else if (s[i] == '&')
+ j += 4;
++ else if (s[i] == '"')
++ j += 5;
+
+ if (j == 0)
+ return ap_pstrndup(p, s, i);
+@@ -1740,6 +1742,10 @@
+ memcpy(&x[j], "&", 5);
+ j += 4;
+ }
++ else if (s[i] == '"') {
++ memcpy(&x[j], """, 6);
++ j += 5;
++ }
+ else
+ x[j] = s[i];
+
+Index: apache_1.3.33/src/modules/standard/mod_imap.c
+--- apache_1.3.33/src/modules/standard/mod_imap.c.orig 2004-11-24
20:10:19 +0100
++++ apache_1.3.33/src/modules/standard/mod_imap.c 2005-12-14 21:06:57
+0100
+@@ -328,7 +328,7 @@
+ if (!strcasecmp(value, "referer")) {
+ referer = ap_table_get(r->headers_in, "Referer");
+ if (referer && *referer) {
+- return ap_pstrdup(r->pool, referer);
++ return ap_escape_html(r->pool, referer);
+ }
+ else {
+ /* XXX: This used to do *value = '\0'; ... which is totally bogus
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
============================================================================
$ cvs diff -u -r1.285.2.7 -r1.285.2.8 apache.spec
--- openpkg-src/apache/apache.spec 3 Dec 2005 18:16:14 -0000
1.285.2.7
+++ openpkg-src/apache/apache.spec 14 Dec 2005 20:17:25 -0000
1.285.2.8
@@ -66,7 +66,7 @@
Group: Web
License: ASF
Version: %{V_apache}
-Release: 2.3.6
+Release: 2.3.7
# package options (suexec related)
%option with_suexec yes
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
