3 files changed, 12 insertions, 47 deletions

diff --git a/www/apache13-modssl/Makefile b/www/apache13-modssl/Makefile
index f47e6c9f9785..9160d107d1a9 100644
--- a/www/apache13-modssl/Makefile
+++ b/www/apache13-modssl/Makefile
@@ -36,10 +36,10 @@ PATCH_DEPENDS=	${BUILD_DEPENDS}
 CONFLICTS?=	apache+ipv6-1.* apache+ssl-1.* apache-1.* apache-2.* \
 		apache_fp-1.* caudium-devel-1.* caudium10-1.* caudium12-* \
 		ru-apache+mod_ssl-1.* ru-apache-1.* thttpd-2.* w3c-httpd-3.*
-VERSION_APACHE=	1.3.34
-VERSION_MODSSL=	2.8.25
+VERSION_APACHE=	1.3.35
+VERSION_MODSSL=	2.8.26
 VERSION_MODSNMP=	1.3.14.13
-VERSION_MODACCEL=	1.0.31
+VERSION_MODACCEL=	1.0.34
 VERSION_MODDEFLATE=	1.0.21
 USE_OPENSSL=	yes
 HAS_CONFIGURE=	yes
diff --git a/www/apache13-modssl/distinfo b/www/apache13-modssl/distinfo
index 73b4ebf07438..9ffc46cc5fa3 100644
--- a/www/apache13-modssl/distinfo
+++ b/www/apache13-modssl/distinfo
@@ -1,15 +1,15 @@
-MD5 (apache_1.3.34.tar.gz) = 9978cc552b423f0015c1052d23ab619e
-SHA256 (apache_1.3.34.tar.gz) = ceed243f4f98e4323b48e5f7f80e306d1abb00c592e18de5575983db42d6f8d4
-SIZE (apache_1.3.34.tar.gz) = 2468056
-MD5 (mod_ssl-2.8.25-1.3.34.tar.gz) = 1ef2a6cb47573444779b2fd10502514b
-SHA256 (mod_ssl-2.8.25-1.3.34.tar.gz) = 832b240157666efdbdfc1a2fd593ee4eebbc9441ec48ece8276660092b974d07
-SIZE (mod_ssl-2.8.25-1.3.34.tar.gz) = 820352
+MD5 (apache_1.3.35.tar.gz) = 31f99663028828a8b56633e255ee634e
+SHA256 (apache_1.3.35.tar.gz) = ec9d1822cd275622776d8013abd0f533eb29d4f78d0a39c98ececef2a2c964fd
+SIZE (apache_1.3.35.tar.gz) = 2472434
+MD5 (mod_ssl-2.8.26-1.3.35.tar.gz) = c8eab590c6feb2eef800db29b0b22213
+SHA256 (mod_ssl-2.8.26-1.3.35.tar.gz) = b7aee63058bf1d547ef431c8eb6c993a17a1a7a94c325af6b21fb4e39d5d75c1
+SIZE (mod_ssl-2.8.26-1.3.35.tar.gz) = 820387
 MD5 (mod_snmp_1.3.14.13.tar.gz) = c6bcbbba1ee2ead2dcdcc6a687c234d1
 SHA256 (mod_snmp_1.3.14.13.tar.gz) = 49962e8c9455e97dca3bba5f1b84ed97214bf42b5cb27b797dea1b8d931cb8ba
 SIZE (mod_snmp_1.3.14.13.tar.gz) = 91125
-MD5 (mod_accel-1.0.31.tar.gz) = edc31714cc6dc8d24396cb4ddf2ae2f6
-SHA256 (mod_accel-1.0.31.tar.gz) = d22f413c3bddaf1919962ee519b1d1fd264df172012fb10f413d9ce5c100d169
-SIZE (mod_accel-1.0.31.tar.gz) = 85443
+MD5 (mod_accel-1.0.34.tar.gz) = fb702adb897aff02ba373029b6ca8496
+SHA256 (mod_accel-1.0.34.tar.gz) = 2fd19cf00f544814bfd707f17a7939d28d64c697b30a87034f284d8e7143c407
+SIZE (mod_accel-1.0.34.tar.gz) = 85200
 MD5 (mod_deflate-1.0.21.tar.gz) = ece1de9b066592c89a6f2b2fec27a00a
 SHA256 (mod_deflate-1.0.21.tar.gz) = 95385dd44bb65308290f3abdef56ef96ba47074bac68be7e3f489e5541669a3b
 SIZE (mod_deflate-1.0.21.tar.gz) = 32505
diff --git a/www/apache13-modssl/files/patch-secfix-CAN-2005-3352 b/www/apache13-modssl/files/patch-secfix-CAN-2005-3352
deleted file mode 100644
index 8febc0e58935..000000000000
--- a/www/apache13-modssl/files/patch-secfix-CAN-2005-3352
+++ /dev/null
@@ -1,35 +0,0 @@
---- src/main/util.c (original)
-+++ src/main/util.c Mon Dec 12 08:36:54 2005
-@@ -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);
-@@ -1739,6 +1741,10 @@
- 	else if (s[i] == '&') {
- 	    memcpy(&x[j], "&", 5);
- 	    j += 4;
-+	}
-+	else if (s[i] == '"') {
-+	    memcpy(&x[j], """, 6);
-+	    j += 5;
- 	}
- 	else
- 	    x[j] = s[i];
-
---- src/modules/standard/mod_imap.c (original)
-+++ src/modules/standard/mod_imap.c Mon Dec 12 08:36:54 2005
-@@ -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
-