Date: Mon, 23 Oct 2017 18:49:27 +0000 (UTC) From: Bernard Spil <brnrd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r452732 - in head/www/apache24: . files Message-ID: <201710231849.v9NInRaQ000813@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brnrd Date: Mon Oct 23 18:49:27 2017 New Revision: 452732 URL: https://svnweb.freebsd.org/changeset/ports/452732 Log: www/apache24: Update to 2.4.29 - Remove patch for CVE-2017-9798 (included upstream) - Remove mod_ssl LibreSSL patches (included upstream) - Fix SSL stapling patch for LibreSSL - mod_http2 no longer experimental PR: 222814 With hat: apache Deleted: head/www/apache24/files/patch-CVE-2017-9798 head/www/apache24/files/patch-modules_ssl_mod__ssl.c head/www/apache24/files/patch-modules_ssl_ssl__engine__init.c head/www/apache24/files/patch-modules_ssl_ssl__engine__io.c head/www/apache24/files/patch-modules_ssl_ssl__engine__kernel.c head/www/apache24/files/patch-modules_ssl_ssl__engine__vars.c head/www/apache24/files/patch-modules_ssl_ssl__private.h head/www/apache24/files/patch-modules_ssl_ssl__util.c head/www/apache24/files/patch-modules_ssl_ssl__util__ssl.h Modified: head/www/apache24/Makefile head/www/apache24/Makefile.modules head/www/apache24/Makefile.options.desc head/www/apache24/distinfo head/www/apache24/files/patch-configure.in head/www/apache24/files/patch-modules_ssl_ssl__util__stapling.c Modified: head/www/apache24/Makefile ============================================================================== --- head/www/apache24/Makefile Mon Oct 23 18:27:42 2017 (r452731) +++ head/www/apache24/Makefile Mon Oct 23 18:49:27 2017 (r452732) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= apache24 -PORTVERSION= 2.4.27 -PORTREVISION= 1 +PORTVERSION= 2.4.29 CATEGORIES= www ipv6 MASTER_SITES= APACHE_HTTPD DISTNAME= httpd-${PORTVERSION} Modified: head/www/apache24/Makefile.modules ============================================================================== --- head/www/apache24/Makefile.modules Mon Oct 23 18:27:42 2017 (r452731) +++ head/www/apache24/Makefile.modules Mon Oct 23 18:49:27 2017 (r452732) @@ -87,7 +87,7 @@ CONFIGURE_ARGS+= --without-libxml2 .endif .if ${PORT_OPTIONS:MPROXY_HTTP2} && !${PORT_OPTIONS:MPROXY_BALANCER} -IGNORE= PROXY_HTTP2 needs PROXY_BALANCER +IGNORE= PROXY_HTTP2 requires PROXY_BALANCER .endif .endif # _PREMKINCLUDED Modified: head/www/apache24/Makefile.options.desc ============================================================================== --- head/www/apache24/Makefile.options.desc Mon Oct 23 18:27:42 2017 (r452731) +++ head/www/apache24/Makefile.options.desc Mon Oct 23 18:49:27 2017 (r452732) @@ -140,7 +140,7 @@ PROXY_FTP_DESC= FTP support module for mod_proxy PROXY_HCHECK_DESC= Dynamic health check of Balancer members (workers) for mod_proxy PROXY_HTML_DESC= Fix HTML Links in a Reverse Proxy PROXY_HTTP_DESC= HTTP support module for mod_proxy -PROXY_HTTP2_DESC= Experimental http2 proxy module for h2 and h2c +PROXY_HTTP2_DESC= HTTP/2 support module for h2 and h2c PROXY_SCGI_DESC= SCGI gateway module for mod_proxy PROXY_WSTUNNEL_DESC= Websockets Tunnel module for mod_proxy Modified: head/www/apache24/distinfo ============================================================================== --- head/www/apache24/distinfo Mon Oct 23 18:27:42 2017 (r452731) +++ head/www/apache24/distinfo Mon Oct 23 18:49:27 2017 (r452732) @@ -1,3 +1,3 @@ -TIMESTAMP = 1499686775 -SHA256 (apache24/httpd-2.4.27.tar.bz2) = 71fcc128238a690515bd8174d5330a5309161ef314a326ae45c7c15ed139c13a -SIZE (apache24/httpd-2.4.27.tar.bz2) = 6527394 +TIMESTAMP = 1508321657 +SHA256 (apache24/httpd-2.4.29.tar.bz2) = 777753a5a25568a2a27428b2214980564bc1c38c1abf9ccc7630b639991f7f00 +SIZE (apache24/httpd-2.4.29.tar.bz2) = 6567926 Modified: head/www/apache24/files/patch-configure.in ============================================================================== --- head/www/apache24/files/patch-configure.in Mon Oct 23 18:27:42 2017 (r452731) +++ head/www/apache24/files/patch-configure.in Mon Oct 23 18:49:27 2017 (r452732) @@ -18,14 +18,6 @@ [--enable-layout=*|\'--enable-layout=*]) dnl We must be the last to build and the first to be cleaned AP_BUILD_SRCLIB_DIRS="$AP_BUILD_SRCLIB_DIRS apr-util" -@@ -597,7 +597,6 @@ AC_ARG_ENABLE(maintainer-mode,APACHE_HEL - if test "$GCC" = "yes"; then - APR_ADDTO(CFLAGS,[-Wall -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations -Wpointer-arith]) - APACHE_ADD_GCC_CFLAG([-std=c89]) -- APACHE_ADD_GCC_CFLAG([-Werror]) - APACHE_ADD_GCC_CFLAG([-Wdeclaration-after-statement]) - APACHE_ADD_GCC_CFLAG([-Wformat]) - APACHE_ADD_GCC_CFLAG([-Wformat-security]) @@ -838,8 +837,14 @@ AC_DEFINE_UNQUOTED(HTTPD_ROOT, "${ap_pre [Root directory of the Apache install area]) AC_DEFINE_UNQUOTED(SERVER_CONFIG_FILE, "${rel_sysconfdir}/${progname}.conf", Modified: head/www/apache24/files/patch-modules_ssl_ssl__util__stapling.c ============================================================================== --- head/www/apache24/files/patch-modules_ssl_ssl__util__stapling.c Mon Oct 23 18:27:42 2017 (r452731) +++ head/www/apache24/files/patch-modules_ssl_ssl__util__stapling.c Mon Oct 23 18:49:27 2017 (r452732) @@ -5,7 +5,7 @@ issuer = sk_X509_value(extra_certs, i); if (X509_check_issued(issuer, x) == X509_V_OK) { -#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER < 0x2050000fL ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2050000fL) CRYPTO_add(&issuer->references, 1, CRYPTO_LOCK_X509); #else X509_up_ref(issuer);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201710231849.v9NInRaQ000813>