Update to version 1.3.37+30.23+2.8.28. this version has mod_rewrite buffer overflow fixed.

3 files changed, 13 insertions, 48 deletions

diff --git a/russian/apache13-modssl/Makefile b/russian/apache13-modssl/Makefile
index 40d2e8e25888..6abecd28df6d 100644
--- a/russian/apache13-modssl/Makefile
+++ b/russian/apache13-modssl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	apache+mod_ssl
 PORTVERSION=	${VERSION_APACHE}+${VERSION_RA}+${VERSION_MODSSL}
-PORTREVISION?=	1
+PORTREVISION?=	0
 CATEGORIES=	russian www security
 MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD} \
 		${MASTER_SITES_MODSSL:S/$/:modssl/} \
@@ -57,9 +57,9 @@ DOCSDIR=	${PREFIX}/share/doc/apache
 
 .include <bsd.port.pre.mk>
 
-VERSION_APACHE=	1.3.34
-VERSION_MODSSL=	2.8.25
-VERSION_RA=	30.22
+VERSION_APACHE=	1.3.37
+VERSION_MODSSL=	2.8.28
+VERSION_RA=	30.23
 
 #
 # some defaults
diff --git a/russian/apache13-modssl/distinfo b/russian/apache13-modssl/distinfo
index cb3156f34bbd..7ca9d7ee9a47 100644
--- a/russian/apache13-modssl/distinfo
+++ b/russian/apache13-modssl/distinfo
@@ -1,9 +1,9 @@
-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 (patches_1.3.34rusPL30.22.tar.gz) = 802d4dc44586bf2804d9684315168ff7
-SHA256 (patches_1.3.34rusPL30.22.tar.gz) = 30b5b37e49056d7738d15f54a55b7e79f1dd8cee269390660b34a0c4edb27be7
-SIZE (patches_1.3.34rusPL30.22.tar.gz) = 138288
+MD5 (apache_1.3.37.tar.gz) = b278f0969a9ccadeb781316e79e3520f
+SHA256 (apache_1.3.37.tar.gz) = 9f27889bfbf418b987a892160e52fd217d66391df2870f3ecac877ef565c4bfc
+SIZE (apache_1.3.37.tar.gz) = 2665370
+MD5 (mod_ssl-2.8.28-1.3.37.tar.gz) = 5e9486a86fcd4efef395f58fd795aaea
+SHA256 (mod_ssl-2.8.28-1.3.37.tar.gz) = 76437105b5b5593a7dbd8ee45af417233897dcaf910cbc337a68b0db24e35489
+SIZE (mod_ssl-2.8.28-1.3.37.tar.gz) = 820417
+MD5 (patches_1.3.37rusPL30.23.tar.gz) = b6f702913aae4624f47ce74cec18889d
+SHA256 (patches_1.3.37rusPL30.23.tar.gz) = 16f742aa531469980a80ba9f50cbb88f091bca1bb0cba457288992a4bc8f0d65
+SIZE (patches_1.3.37rusPL30.23.tar.gz) = 138315
diff --git a/russian/apache13-modssl/files/patch-secfix-CAN-2005-3352 b/russian/apache13-modssl/files/patch-secfix-CAN-2005-3352
deleted file mode 100644
index 8febc0e58935..000000000000
--- a/russian/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], "&amp;", 5);
- 	    j += 4;
-+	}
-+	else if (s[i] == '"') {
-+	    memcpy(&x[j], "&quot;", 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
-