Mon Jul 20 18:28:59 2015 UTC ()
Changes with Apache 2.2.31
  *) Correct win32 build issues for mod_proxy exports, OpenSSL 1.0.x headers.

Changes with Apache 2.2.30 (not released)
  *) SECURITY: CVE-2015-3183 (cve.mitre.org)
     core: Fix chunk header parsing defect.
     Remove apr_brigade_flatten(), buffering and duplicated code from
     the HTTP_IN filter, parse chunks in a single pass with zero copy.
     Limit accepted chunk-size to 2^63-1 and be strict about chunk-ext
     authorized characters.

  *) http: Fix LimitRequestBody checks when there is no more bytes to read.

  *) core: Allow spaces after chunk-size for compatibility with implementations
     using a pre-filled buffer.

  *) mod_ssl: bring SNI behavior into better conformance with RFC 6066:
     no longer send warning-level unrecognized_name(112) alerts.

  *) http: Make ap_die() robust against any HTTP error code and not modify
     response status (finally logged) when nothing is to be done.

  *) core, modules: Avoid error response/document handling by the core if some
     handler or input filter already did it while reading the request (causing
     a double response body).

  *) FreeBSD: Disable IPv4-mapped listening sockets by default for versions
     5+ instead of just for FreeBSD 5.

  *) mod_proxy: use the original (non absolute) form of the request-line's URI
     for requests embedded in CONNECT payloads used to connect SSL backends via
     a ProxyRemote forward-proxy.

  *) mpm_winnt: Accept utf-8 (Unicode) service names and descriptions for
     internationalization.

  *) mod_log_config: Implement logging for sub second timestamps and
     request end time.

  *) mod_log_config: Ensure that time data is consistent if multiple
     duration patterns are used in combination, e.g. %D and %{ms}T.

  *) mod_log_config: Add "%{UNIT}T" format to output request duration in
     seconds, milliseconds or microseconds depending on UNIT ("s", "ms", "us").

  *) In alignment with RFC 7525, the default recommended SSLCipherSuite
     and SSLProxyCipherSuite now exclude RC4 as well as MD5. Also, the
     default recommended SSLProtocol and SSLProxyProtocol directives now
     exclude SSLv3. Existing configurations must be adjusted by the
     administrator.

  *) core: Avoid potential use of uninitialized (NULL) request data in
     request line error path.

  *) mod_proxy_http: Use the "Connection: close" header for requests to
     backends not recycling connections (disablereuse), including the default
     reverse and forward proxies.

  *) mod_proxy: Add ap_connection_reusable() for checking if a connection
     is reusable as of this point in processing.

  *) mod_proxy: Reuse proxy/balancer workers' parameters and scores across
     graceful restarts, even if new workers are added, old ones removed, or
     the order changes.

  *) mod_ssl: 'SSLProtocol ALL' was being ignored in virtual host context.

  *) mod_ssl: Improve handling of ephemeral DH and ECDH keys by
     allowing custom parameters to be configured via SSLCertificateFile,
     and by adding standardized DH parameters for 1024/2048/3072/4096 bits.
     Unless custom parameters are configured, the standardized parameters
     are applied based on the certificate's RSA/DSA key size.

  *) mod_ssl: drop support for export-grade ciphers with ephemeral RSA
     keys, and unconditionally disable aNULL, eNULL and EXP ciphers
     (not overridable via SSLCipherSuite).

  *) mod_ssl: Add support for configuring persistent TLS session ticket
     encryption/decryption keys (useful for clustered environments).

  *) SSLProtocol and SSLCipherSuite recommendations in the example/default
     conf/extra/httpd-ssl.conf file are now global in scope, affecting all
     VirtualHosts (matching 2.4 default configuration).

  *) mod_authn_dbd: Fix lifetime of DB lookup entries independently of the
     selected DB engine.

  *) Turn static function get_server_name_for_url() into public
     ap_get_server_name_for_url() and use it where appropriate. This
     fixes mod_rewrite generating invalid URLs for redirects to IPv6
     literal addresses.

  *) dav_validate_request: avoid validating locks and ETags when there are
     no If headers providing them on a resource we aren't modifying.

  *) mod_ssl: New directive SSLSessionTickets (On|Off).
     The directive controls the use of TLS session tickets (RFC 5077),
     default value is "On" (unchanged behavior).
     Session ticket creation uses a random key created during web
     server startup and recreated during restarts. No other key
     recreation mechanism is available currently. Therefore using session
     tickets without restarting the web server with an appropriate frequency
     (e.g. daily) compromises perfect forward secrecy.

  *) mod_deflate: Define APR_INT32_MAX when it is missing so to be able to
     compile against APR-1.2.x (minimum required version).

  *) mod_reqtimeout: Don't let pipelining checks interfere with the timeouts
     computed for subsequent requests.


(adam)
diff -r1.104 -r1.105 pkgsrc/www/apache22/Makefile
diff -r1.61 -r1.62 pkgsrc/www/apache22/distinfo
diff -r1.1 -r0 pkgsrc/www/apache22/patches/patch-modules_ssl_ssl__engine__dh.c

cvs diff -r1.104 -r1.105 pkgsrc/www/apache22/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/apache22/Attic/Makefile 2015/06/12 10:51:48 1.104
+++ pkgsrc/www/apache22/Attic/Makefile 2015/07/20 18:28:59 1.105
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1# $NetBSD: Makefile,v 1.104 2015/06/12 10:51:48 wiz Exp $ 1# $NetBSD: Makefile,v 1.105 2015/07/20 18:28:59 adam Exp $
2 2
3DISTNAME= httpd-2.2.29 3DISTNAME= httpd-2.2.31
4PKGNAME= ${DISTNAME:S/httpd/apache/} 4PKGNAME= ${DISTNAME:S/httpd/apache/}
5PKGREVISION= 2 
6CATEGORIES= www 5CATEGORIES= www
7MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} \ 6MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} \
8 http://archive.apache.org/dist/httpd/ \ 7 http://archive.apache.org/dist/httpd/ \
9 http://archive.eu.apache.org/dist/httpd/ 8 http://archive.eu.apache.org/dist/httpd/
10EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
11 10
12MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
13HOMEPAGE= http://httpd.apache.org/ 12HOMEPAGE= http://httpd.apache.org/
14COMMENT= Apache HTTP (Web) server, version 2.2 13COMMENT= Apache HTTP (Web) server, version 2.2
15LICENSE= apache-2.0 14LICENSE= apache-2.0
16 15
17BUILD_DEFS+= IPV6_READY 16BUILD_DEFS+= IPV6_READY
18BUILD_DEFS+= VARBASE 17BUILD_DEFS+= VARBASE
@@ -200,30 +199,26 @@ DEPENDS+= ${ap_depend} @@ -200,30 +199,26 @@ DEPENDS+= ${ap_depend}
200. endif 199. endif
201. endfor 200. endfor
202. endif 201. endif
203. if defined(AP_CFG_ARGS.${ap_mod}) && !empty(AP_CFG_ARGS.${ap_mod}) 202. if defined(AP_CFG_ARGS.${ap_mod}) && !empty(AP_CFG_ARGS.${ap_mod})
204CONFIGURE_ARGS+= ${AP_CFG_ARGS.${ap_mod}} 203CONFIGURE_ARGS+= ${AP_CFG_ARGS.${ap_mod}}
205. endif 204. endif
206. endfor 205. endfor
207.endif 206.endif
208 207
209post-extract: 208post-extract:
210 ${TOUCH} ${WRKSRC}/build/libtool 209 ${TOUCH} ${WRKSRC}/build/libtool
211 ${ECHO} "" >> ${WRKSRC}/docs/conf/extra/httpd-languages.conf.in 210 ${ECHO} "" >> ${WRKSRC}/docs/conf/extra/httpd-languages.conf.in
212 211
213pre-build: 
214 ${ECHO} "===> Generating unique DH group to mitigate Logjam attack (this will take a while)" 
215 (cd ${WRKSRC}/modules/ssl && ${PERL5} ssl_engine_dh.c) 
216 
217post-build: 212post-build:
218 ${SED} "s#@PKG_SYSCONFDIR@#${PKG_SYSCONFDIR}#g" \ 213 ${SED} "s#@PKG_SYSCONFDIR@#${PKG_SYSCONFDIR}#g" \
219 < ${FILESDIR}/mkcert.sh > ${WRKDIR}/mkcert 214 < ${FILESDIR}/mkcert.sh > ${WRKDIR}/mkcert
220 215
221INSTALL_TARGET= install-conf install 216INSTALL_TARGET= install-conf install
222INSTALL_MAKE_FLAGS+= sysconfdir="${EGDIR}" 217INSTALL_MAKE_FLAGS+= sysconfdir="${EGDIR}"
223 218
224post-install: 219post-install:
225 ${LN} -sf ${LOCALBASE}/libexec/apr/libtool ${DESTDIR}${PREFIX}/share/httpd/build 220 ${LN} -sf ${LOCALBASE}/libexec/apr/libtool ${DESTDIR}${PREFIX}/share/httpd/build
226 ${LN} -sf ${SBINDIR}/envvars-std ${DESTDIR}${SBINDIR}/envvars 221 ${LN} -sf ${SBINDIR}/envvars-std ${DESTDIR}${SBINDIR}/envvars
227 222
228 ${INSTALL_SCRIPT} ${WRKDIR}/mkcert ${DESTDIR}${PREFIX}/sbin 223 ${INSTALL_SCRIPT} ${WRKDIR}/mkcert ${DESTDIR}${PREFIX}/sbin
229 224

cvs diff -r1.61 -r1.62 pkgsrc/www/apache22/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/www/apache22/Attic/distinfo 2015/05/22 09:20:20 1.61
+++ pkgsrc/www/apache22/Attic/distinfo 2015/07/20 18:28:59 1.62
@@ -1,20 +1,19 @@ @@ -1,20 +1,19 @@
1$NetBSD: distinfo,v 1.61 2015/05/22 09:20:20 sborrill Exp $ 1$NetBSD: distinfo,v 1.62 2015/07/20 18:28:59 adam Exp $
2 2
3SHA1 (httpd-2.2.29.tar.bz2) = 1d6a8fbc1391d358cc6fe430edc16222b97258d5 3SHA1 (httpd-2.2.31.tar.bz2) = e3b55387112206307ba76526820a2627472f3787
4RMD160 (httpd-2.2.29.tar.bz2) = c9a823f038a6a1cbfd94cd9bdd067edd26cf7a3b 4RMD160 (httpd-2.2.31.tar.bz2) = 5b073f5f556c74e19eba8e40faa5c5fa308e018a
5Size (httpd-2.2.29.tar.bz2) = 5625498 bytes 5Size (httpd-2.2.31.tar.bz2) = 5610489 bytes
6SHA1 (patch-aa) = e0bfdf6bc9cb034bea46a390a12a5508e363c9a7 6SHA1 (patch-aa) = e0bfdf6bc9cb034bea46a390a12a5508e363c9a7
7SHA1 (patch-ab) = 365cc3b0ac2d9d68ccb94f5699fe168a1c9b0150 7SHA1 (patch-ab) = 365cc3b0ac2d9d68ccb94f5699fe168a1c9b0150
8SHA1 (patch-ac) = 515043b5c215d49fe8f6d3191b502c978e2a2dad 8SHA1 (patch-ac) = 515043b5c215d49fe8f6d3191b502c978e2a2dad
9SHA1 (patch-ad) = 088d6ff0e7a8acfe70b4f85a6ce58d42c935fd13 9SHA1 (patch-ad) = 088d6ff0e7a8acfe70b4f85a6ce58d42c935fd13
10SHA1 (patch-ae) = 86b307d6eefef232b6223afc3f69e64be40bd913 10SHA1 (patch-ae) = 86b307d6eefef232b6223afc3f69e64be40bd913
11SHA1 (patch-ag) = 78dcb023f524ef65928b529320932c9664ec0d01 11SHA1 (patch-ag) = 78dcb023f524ef65928b529320932c9664ec0d01
12SHA1 (patch-ai) = 4ebc3bd580a298973928eb6d13d2ce745eac0312 12SHA1 (patch-ai) = 4ebc3bd580a298973928eb6d13d2ce745eac0312
13SHA1 (patch-al) = 56b9f5c2f6fd01fe5067f9210e328cbf674c68f1 13SHA1 (patch-al) = 56b9f5c2f6fd01fe5067f9210e328cbf674c68f1
14SHA1 (patch-am) = ab4a2f7e5a1a3064e908b61157e7fd349c0b0c08 14SHA1 (patch-am) = ab4a2f7e5a1a3064e908b61157e7fd349c0b0c08
15SHA1 (patch-aw) = ca53d67beeb2c2c4d9adb04d3d79e24a8c427fd4 15SHA1 (patch-aw) = ca53d67beeb2c2c4d9adb04d3d79e24a8c427fd4
16SHA1 (patch-docs_man_apxs.8) = 70797ea73ae6379492971bec1106a8427ae7fdaa 16SHA1 (patch-docs_man_apxs.8) = 70797ea73ae6379492971bec1106a8427ae7fdaa
17SHA1 (patch-lock.c) = 770ca03f1cb4421879bd5baa5a7c30cc91acb6e1 17SHA1 (patch-lock.c) = 770ca03f1cb4421879bd5baa5a7c30cc91acb6e1
18SHA1 (patch-modules_proxy_mod_proxy_connect.c) = b2b5d0242a92c7bf20b14c16d8cd3abae42f3746 18SHA1 (patch-modules_proxy_mod_proxy_connect.c) = b2b5d0242a92c7bf20b14c16d8cd3abae42f3746
19SHA1 (patch-modules_ssl_ssl__engine__dh.c) = fc37a639ecfbade0cf8a4fc684d7ec3b92949897 
20SHA1 (patch-repos.c) = 0e0361b91d4b0fe6c7c55a12fdfd2e6aacc710e1 19SHA1 (patch-repos.c) = 0e0361b91d4b0fe6c7c55a12fdfd2e6aacc710e1

File Deleted: pkgsrc/www/apache22/patches/Attic/patch-modules_ssl_ssl__engine__dh.c