Import of pkgsrc-2015Q2

www/apache24/Makefile

@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.34 2015/02/02 14:45:51 adam Exp $
+# $NetBSD: Makefile,v 1.36 2015/06/12 10:51:48 wiz Exp $
 
 DISTNAME=	httpd-2.4.12
 PKGNAME=	${DISTNAME:S/httpd/apache/}
+PKGREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_APACHE:=httpd/} \
 		http://archive.apache.org/dist/httpd/ \

www/apache24/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2015/02/02 14:45:51 adam Exp $
+@comment $NetBSD: PLIST,v 1.18 2015/06/26 19:25:12 ryoon Exp $
 bin/ab
 bin/apxs
 bin/dbmmanage
@@ -98,7 +98,8 @@ lib/httpd/mod_buffer.so
 lib/httpd/mod_cache.so
 lib/httpd/mod_cache_disk.so
 lib/httpd/mod_cache_socache.so
-lib/httpd/mod_cgid.so
+${PLIST.only-prefork}lib/httpd/mod_cgi.so
+${PLIST.not-only-prefork}lib/httpd/mod_cgid.so
 lib/httpd/mod_charset_lite.so
 lib/httpd/mod_data.so
 lib/httpd/mod_dav.so

www/apache24/distinfo

@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2015/03/28 06:28:04 ryoon Exp $
+$NetBSD: distinfo,v 1.20 2015/06/11 15:38:48 taca Exp $
 
 SHA1 (httpd-2.4.12.tar.bz2) = bc4681bfd63accec8d82d3cc440fbc8264ce0f17
 RMD160 (httpd-2.4.12.tar.bz2) = 396deb95ca40f429cc3845a36b766a9fb1c2c2aa
@@ -16,3 +16,4 @@ SHA1 (patch-am) = acdf7198ae8b4353cfc70c8015a0f09de036b777
 SHA1 (patch-aw) = 43cd64df886853ef7b75b91ed20183f329fcc9df
 SHA1 (patch-include_ap__config.h) = 1d056e2d4db80ec97aaf755b6dd6aff69ed2cd96
 SHA1 (patch-server_core__filters.c) = 331672c9a65691229518f31dcdae64382b392287
+SHA1 (patch-server_protocol.c) = 73f9cfad3217784fcdc6e5c7948eefd47b2a5a42

www/apache24/options.mk

@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.9 2014/02/22 17:28:34 ryoon Exp $
+# $NetBSD: options.mk,v 1.10 2015/06/26 19:25:12 ryoon Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.apache
 PKG_SUPPORTED_OPTIONS=		lua suexec apache-mpm-event apache-mpm-prefork apache-mpm-worker
@@ -23,7 +23,7 @@ PKG_SUPPORTED_OPTIONS+=		privileges
 #	prefork		non-threaded, pre-forking web server
 #	worker		hybrid multi-threaded multi-process web server
 #
-PLIST_VARS+=		worker prefork event
+PLIST_VARS+=		worker prefork event only-prefork not-only-prefork
 
 .if !empty(PKG_OPTIONS:Mapache-mpm-event)
 MPMS+=			event
@@ -42,6 +42,15 @@ PLIST.prefork=		yes
 
 CONFIGURE_ARGS+=	--enable-mpms-shared='${MPMS}'
 MESSAGE_SUBST+=		MPMS=${MPMS:Q}
+# If only prefork mpm is supported, ...
+.if empty(PKG_OPTIONS:Mapache-mpm-event) && \
+  empty(PKG_OPTIONS:Mapache-mpm-worker) && \
+  !empty(PKG_OPTIONS:Mapache-mpm-prefork)
+CONFIGURE_ARGS+=	--with-mpm=prefork
+PLIST.only-prefork=	yes
+.else
+PLIST.not-only-prefork=	yes
+.endif
 
 BUILD_DEFS+=		APACHE_MODULES
 

www/apache24/patches/patch-server_protocol.c

@@ -0,0 +1,24 @@
+$NetBSD: patch-server_protocol.c,v 1.1 2015/06/11 15:38:48 taca Exp $
+
+Fix for CVE-2015-0253, introduced in Apache 2.4.11.
+
+--- server/protocol.c.orig	2014-11-29 09:22:43.000000000 +0000
++++ server/protocol.c
+@@ -599,8 +599,6 @@ static int read_request_line(request_rec
+              */
+             if (APR_STATUS_IS_ENOSPC(rv)) {
+                 r->status    = HTTP_REQUEST_URI_TOO_LARGE;
+-                r->proto_num = HTTP_VERSION(1,0);
+-                r->protocol  = apr_pstrdup(r->pool, "HTTP/1.0");
+             }
+             else if (APR_STATUS_IS_TIMEUP(rv)) {
+                 r->status = HTTP_REQUEST_TIME_OUT;
+@@ -608,6 +606,8 @@ static int read_request_line(request_rec
+             else if (APR_STATUS_IS_EINVAL(rv)) {
+                 r->status = HTTP_BAD_REQUEST;
+             }
++	    r->proto_num = HTTP_VERSION(1,0);
++	    r->protocol  = apr_pstrdup(r->pool, "HTTP/1.0");
+             return 0;
+         }
+     } while ((len <= 0) && (++num_blank_lines < max_blank_lines));