Maintenance update of the Apache HTTPD 2 port to version 2.2.25.
Fixes CVE-2013-1896, a DoS attack which affects Subversion servers.
Full changelog: http://www.apache.org/dist/httpd/CHANGES_2.2.25
ok?
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/apache-httpd/Makefile,v
retrieving revision 1.37
diff -u -p -r1.37 Makefile
--- Makefile 20 Jun 2013 06:54:37 -0000 1.37
+++ Makefile 12 Jul 2013 01:06:53 -0000
@@ -2,10 +2,9 @@
COMMENT= apache HTTP server
-V= 2.2.23
+V= 2.2.25
PKGNAME= apache-httpd-${V}
DISTNAME= httpd-${V}
-REVISION= 1
CATEGORIES= www net
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/apache-httpd/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- distinfo 18 Oct 2012 08:12:16 -0000 1.13
+++ distinfo 12 Jul 2013 01:07:27 -0000
@@ -1,2 +1,2 @@
-SHA256 (httpd-2.2.23.tar.gz) = InyFpcV/LtrgxcVMaMzBJ/Bvbnz/U0DvoA3gT0Y/o6Q=
-SIZE (httpd-2.2.23.tar.gz) = 7374712
+SHA256 (httpd-2.2.25.tar.gz) = tkG0US8oCqpWjqsJCrUv3qholPnvIvOEgRpFcvxAW/M=
+SIZE (httpd-2.2.25.tar.gz) = 7445734
Index: patches/patch-modules_ssl_ssl_engine_io_c
===================================================================
RCS file: patches/patch-modules_ssl_ssl_engine_io_c
diff -N patches/patch-modules_ssl_ssl_engine_io_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-modules_ssl_ssl_engine_io_c 12 Jul 2013 01:26:07 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- modules/ssl/ssl_engine_io.c.orig Fri Jul 12 03:24:16 2013
++++ modules/ssl/ssl_engine_io.c Fri Jul 12 03:25:04 2013
+@@ -1079,7 +1079,9 @@ static int ssl_io_filter_connect(ssl_filter_ctx_t *fil
+ * IPv4 and IPv6 addresses are not permitted".)
+ */
+ if (hostname_note &&
++#ifndef OPENSSL_NO_SSL2
+ sc->proxy->protocol != SSL_PROTOCOL_SSLV2 &&
++#endif
+ sc->proxy->protocol != SSL_PROTOCOL_SSLV3 &&
+ apr_ipsubnet_create(&ip, hostname_note, NULL,
+ c->pool) != APR_SUCCESS) {
