- Update to 1.3.37-1.57

4 files changed, 7 insertions, 56 deletions

diff --git a/www/apache13-ssl/Makefile b/www/apache13-ssl/Makefile
index ecb957853d1d..5753d1ee51a1 100644
--- a/www/apache13-ssl/Makefile
+++ b/www/apache13-ssl/Makefile
@@ -9,7 +9,6 @@
 
 PORTNAME=	apache+ssl
 PORTVERSION=	${APACHE_VERSION}.${APACHE_SSL_VERSION}
-PORTREVISION=	2
 CATEGORIES=	www security
 MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD} \
 		${MASTER_SITES_APACHE_SSL:S/$/:ssl/}
@@ -32,7 +31,7 @@ CONFLICTS=	apache+mod_ssl-1.* apache+mod_ssl+ipv6-1.* apache+mod_ssl+modsnmp-1.*
 		caudium-devel-1.* caudium10-1.* caudium12-* \
 		ru-apache+mod_ssl-1.* ru-apache-1.* thttpd-2.*
 
-APACHE_VERSION=		1.3.34
+APACHE_VERSION=		1.3.37
 APACHE_SSL_VERSION=	1.57
 USE_OPENSSL=		yes
 USE_PERL5=		yes
diff --git a/www/apache13-ssl/distinfo b/www/apache13-ssl/distinfo
index 0a1046d0c01b..28dc60f621c1 100644
--- a/www/apache13-ssl/distinfo
+++ b/www/apache13-ssl/distinfo
@@ -1,6 +1,6 @@
-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 (apache_1.3.34+ssl_1.57.tar.gz) = 4c4f51af630fd128ce696c58a70797a3
-SHA256 (apache_1.3.34+ssl_1.57.tar.gz) = 7a0d984b6d0c78e81c4bbae5d51913c53272c07b3de2344ee3e0eecc1fba5f70
-SIZE (apache_1.3.34+ssl_1.57.tar.gz) = 57626
+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 (apache_1.3.37+ssl_1.57.tar.gz) = 3fc7a553ede7cda3cfa3247139e32a51
+SHA256 (apache_1.3.37+ssl_1.57.tar.gz) = 42e51fc453bbf510fc3d0b7e1c2dd529ad7593ee2a13eb80e12a7e1cfa8cd9b5
+SIZE (apache_1.3.37+ssl_1.57.tar.gz) = 57593
diff --git a/www/apache13-ssl/files/patch-secfix-CAN-2005-3352 b/www/apache13-ssl/files/patch-secfix-CAN-2005-3352
deleted file mode 100644
index 8febc0e58935..000000000000
--- a/www/apache13-ssl/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
-
diff --git a/www/apache13-ssl/files/patch-secfix-CVE-2006-3747 b/www/apache13-ssl/files/patch-secfix-CVE-2006-3747
deleted file mode 100644
index fc06bed772bb..000000000000
--- a/www/apache13-ssl/files/patch-secfix-CVE-2006-3747
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: src/modules/standard/mod_rewrite.c
-===================================================================
---- src/modules/standard/mod_rewrite.c	(revision 421288)
-+++ src/modules/standard/mod_rewrite.c	(working copy)
-@@ -2736,7 +2736,7 @@
-             int c = 0;
- 
-             token[0] = cp = ap_pstrdup(p, cp);
--            while (*cp && c < 5) {
-+            while (*cp && c < 4) {
-                 if (*cp == '?') {
-                     token[++c] = cp + 1;
-                     *cp = '\0';