From owner-svn-ports-head@FreeBSD.ORG Sun Nov 24 19:56:28 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 52A7CC9A; Sun, 24 Nov 2013 19:56:28 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 41BCD2253; Sun, 24 Nov 2013 19:56:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAOJuSZg075239; Sun, 24 Nov 2013 19:56:28 GMT (envelope-from ohauer@svn.freebsd.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAOJuRDJ075188; Sun, 24 Nov 2013 19:56:27 GMT (envelope-from ohauer@svn.freebsd.org) Message-Id: <201311241956.rAOJuRDJ075188@svn.freebsd.org> From: Olli Hauer Date: Sun, 24 Nov 2013 19:56:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r334783 - in head/www/apache22: . files X-SVN-Group: ports-head 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.16 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: Sun, 24 Nov 2013 19:56:28 -0000 Author: ohauer Date: Sun Nov 24 19:56:26 2013 New Revision: 334783 URL: http://svnweb.freebsd.org/changeset/ports/334783 Log: - update to 2.2.26 - add new directory for modules (APACHEETCDIR/modules.d) New modules can be registered here with a simple file that contains the LoadModule directives. Additonal Maintaines can write instructions to the conf file and keep pkg-message short. As bonus the config file can be installed like every other config file with a .sample extention so modules are not disabled during pkg upgrades. Module config files should begin with three digits followed by '_' e.g. 100_php5.conf. The load order can be controlled via the three digits. Please wait some time before adopting the new directory so users have time to update and adjust axisting configs Changes with Apache 2.2.26 *) mod_dav: dav_resource->uri treated as unencoded. This was an unnecessary ABI changed introduced in 2.2.25 PR 55397. [Ben Reser] *) mod_dav: Do not validate locks against parent collection of COPY source URI. PR 55304. [Ben Reser] *) mod_ssl: Check SNI hostname against Host header case-insensitively. PR 49491. [Mayank Agrawal ] *) mod_ssl: enable support for ECC keys and ECDH ciphers. Tested against OpenSSL 1.0.0b3. [Vipul Gupta vipul.gupta sun.com, Sander Temme, Stefan Fritsch] *) mod_ssl: Change default for SSLCompression to off, as compression causes security issues in most setups. (The so called "CRIME" attack). [Stefan Fritsch] *) mod_ssl: Fix compilation error when OpenSSL does not contain support for SSLv2. Problem was introduced in 2.2.25. PR 55194. [Rainer Jung, Kaspar Brand] *) mod_dav: Fix double encoding of URIs in XML and Location header (caused by unintential ABI change in 2.2.25). PR 55397. [Ben Reser] Added: head/www/apache22/files/README_modules.d (contents, props changed) Deleted: head/www/apache22/files/patch-bug-55306 Modified: head/www/apache22/Makefile head/www/apache22/distinfo head/www/apache22/files/patch-docs__conf__httpd.conf.in head/www/apache22/pkg-plist Modified: head/www/apache22/Makefile ============================================================================== --- head/www/apache22/Makefile Sun Nov 24 19:48:42 2013 (r334782) +++ head/www/apache22/Makefile Sun Nov 24 19:56:26 2013 (r334783) @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= apache22 -PORTVERSION= 2.2.25 -PORTREVISION?= 1 +PORTVERSION= 2.2.26 +#PORTREVISION?= 1 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} DISTNAME= httpd-${PORTVERSION} @@ -62,7 +62,7 @@ SUEXEC_USERDIR_EXTRA_PATCHES= ${FILESDIR .include -ETC_SUBDIRS= Includes envvars.d extra +ETC_SUBDIRS= Includes envvars.d extra modules.d .if ! ${PORT_OPTIONS:MDOCS} MAKE_ENV+= NOPORTDOCS=yes @@ -151,7 +151,8 @@ post-configure: post-install: @${MKDIR} ${ETC_SUBDIRS:S|^|${STAGEDIR}${ETCDIR}/|} - @${INSTALL_DATA} ${FILESDIR}/no-accf.conf ${STAGEDIR}${ETCDIR}/Includes/ + ${INSTALL_DATA} ${FILESDIR}/no-accf.conf ${STAGEDIR}${ETCDIR}/Includes/ + ${INSTALL_DATA} ${FILESDIR}/README_modules.d ${STAGEDIR}/${ETCDIR}/modules.d/ .if ${PORT_OPTIONS:MLOG_FORENSIC} @${INSTALL_SCRIPT} ${WRKSRC}/support/check_forensic ${STAGEDIR}${PREFIX}/sbin Modified: head/www/apache22/distinfo ============================================================================== --- head/www/apache22/distinfo Sun Nov 24 19:48:42 2013 (r334782) +++ head/www/apache22/distinfo Sun Nov 24 19:56:26 2013 (r334783) @@ -1,2 +1,2 @@ -SHA256 (apache22/httpd-2.2.25.tar.bz2) = 4bcaf3524796a514b31aa5c64ce80b0cdb484bab5735416de29d00f6d50fa65a -SIZE (apache22/httpd-2.2.25.tar.bz2) = 5524905 +SHA256 (apache22/httpd-2.2.26.tar.bz2) = af908e3dd5673f1c6f0ccc615e11d435e77517940af00e518e68ea25284b42b6 +SIZE (apache22/httpd-2.2.26.tar.bz2) = 5390190 Added: head/www/apache22/files/README_modules.d ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/apache22/files/README_modules.d Sun Nov 24 19:56:26 2013 (r334783) @@ -0,0 +1,14 @@ +# =================================================== +# Directory for third party module config files. +# +# Modules can be disabled by adding a '#' in front +# of the "LoadModule" line e.g. "#LoadModule" +# +# Files are automatically included if the name +# begins with a three digit number followed by '_' +# and ending in '.conf' e.g. '080_mod_php.conf' +# +# Maintainers can also include instructions how to +# use the module (instead pkg-message). +# + Modified: head/www/apache22/files/patch-docs__conf__httpd.conf.in ============================================================================== --- head/www/apache22/files/patch-docs__conf__httpd.conf.in Sun Nov 24 19:48:42 2013 (r334782) +++ head/www/apache22/files/patch-docs__conf__httpd.conf.in Sun Nov 24 19:56:26 2013 (r334783) @@ -1,5 +1,15 @@ --- ./docs/conf/httpd.conf.in.orig 2007-12-21 06:43:00.000000000 -0500 +++ ./docs/conf/httpd.conf.in 2010-05-06 19:37:54.224731824 -0400 +@@ -54,6 +54,9 @@ + # + @@LoadModule@@ + ++# Third party modules ++Include @rel_sysconfdir@/modules.d/[0-9][0-9][0-9]_*.conf ++ + + + # @@ -63,8 +63,8 @@ # It is usually good practice to create a dedicated user and group for # running httpd, as with most system services. Modified: head/www/apache22/pkg-plist ============================================================================== --- head/www/apache22/pkg-plist Sun Nov 24 19:48:42 2013 (r334782) +++ head/www/apache22/pkg-plist Sun Nov 24 19:56:26 2013 (r334783) @@ -4,6 +4,7 @@ @exec mkdir -p %D/%%ETCDIR%%/extra @exec mkdir -p %D/%%ETCDIR%%/Includes %%ETCDIR%%/Includes/no-accf.conf +%%ETCDIR%%/modules.d/README_modules.d include/apache22/ap_compat.h include/apache22/ap_config.h include/apache22/ap_config_auto.h @@ -475,6 +476,7 @@ sbin/split-logfile @dirrmtry libexec/apache22 @dirrmtry include/apache22 @unexec rm -f %D/%%ETCDIR%%/httpd.conf.bak 2> /dev/null || true +@dirrmtry %%ETCDIR%%/modules.d @dirrmtry %%ETCDIR%%/extra @dirrmtry %%ETCDIR%%/envvars.d @dirrmtry %%ETCDIR%%/Includes