From owner-svn-ports-head@freebsd.org Tue Sep 19 12:29:34 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 98141E10EA9; Tue, 19 Sep 2017 12:29:34 +0000 (UTC) (envelope-from zi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 678567DF1A; Tue, 19 Sep 2017 12:29:34 +0000 (UTC) (envelope-from zi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8JCTXfo034714; Tue, 19 Sep 2017 12:29:33 GMT (envelope-from zi@FreeBSD.org) Received: (from zi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8JCTXvO034712; Tue, 19 Sep 2017 12:29:33 GMT (envelope-from zi@FreeBSD.org) Message-Id: <201709191229.v8JCTXvO034712@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zi set sender to zi@FreeBSD.org using -f From: Ryan Steinmetz Date: Tue, 19 Sep 2017 12:29:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r450118 - in head/www/apache22: . files X-SVN-Group: ports-head X-SVN-Commit-Author: zi X-SVN-Commit-Paths: in head/www/apache22: . files X-SVN-Commit-Revision: 450118 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Sep 2017 12:29:34 -0000 Author: zi Date: Tue Sep 19 12:29:33 2017 New Revision: 450118 URL: https://svnweb.freebsd.org/changeset/ports/450118 Log: - Add backport of patch for CVE-2017-9798 - Bump PORTREVISION Approved by: ports-secteam (with hat) Security: 76b085e2-9d33-11e7-9260-000c292ee6b8 Added: head/www/apache22/files/patch-CVE-2017-9798 (contents, props changed) Modified: head/www/apache22/Makefile Modified: head/www/apache22/Makefile ============================================================================== --- head/www/apache22/Makefile Tue Sep 19 12:23:01 2017 (r450117) +++ head/www/apache22/Makefile Tue Sep 19 12:29:33 2017 (r450118) @@ -2,7 +2,7 @@ PORTNAME= apache22 PORTVERSION= 2.2.34 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= www ipv6 MASTER_SITES= APACHE_HTTPD DISTNAME= httpd-${PORTVERSION} Added: head/www/apache22/files/patch-CVE-2017-9798 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/apache22/files/patch-CVE-2017-9798 Tue Sep 19 12:29:33 2017 (r450118) @@ -0,0 +1,21 @@ +CVE-2017-9798 + +Backport from https://svn.apache.org/viewvc?view=revision&revision=1807655 + +diff --git a/server/core.c b/server/core.c +index f61699e..d24542e 100644 +--- server/core.c ++++ server/core.c +@@ -1809,6 +1809,12 @@ AP_CORE_DECLARE_NONSTD(const char *) ap_limit_section(cmd_parms *cmd, + /* method has not been registered yet, but resorce restriction + * is always checked before method handling, so register it. + */ ++ if (cmd->pool == cmd->temp_pool) { ++ /* In .htaccess, we can't globally register new methods. */ ++ return apr_psprintf(cmd->pool, "Could not register method '%s' " ++ "for %s from .htaccess configuration", ++ method, cmd->cmd->name); ++ } + methnum = ap_method_register(cmd->pool, method); + } +