svn commit: r418093 - in branches/2016Q3/www/apache24: . files

Olli Hauer ohauer at FreeBSD.org
Tue Jul 5 16:25:05 UTC 2016 

Author: ohauer
Date: Tue Jul  5 16:25:03 2016
New Revision: 418093
URL: https://svnweb.freebsd.org/changeset/ports/418093

Log:
  MFH: r418091
  
  o update to 2.4.23
  o disable build time stamp in favor of reproducible build
  o remove obsolate scoreboard/status patch
  o s/USE_OPENSSL=yes/USES=ssl/
  o add OPTION for two new modules:
     mod_proxy_hcheck (default=on)
     mod_http2_proxy (experimental => default=off)
  
  Changelog:
   http://www.apache.org/dist/httpd/CHANGES_2.4.23
  
  Approved by:	ports-secteam (feld@)

Added:
  branches/2016Q3/www/apache24/files/extra-patch-server_buildmark.c
     - copied unchanged from r418091, head/www/apache24/files/extra-patch-server_buildmark.c
Deleted:
  branches/2016Q3/www/apache24/files/patch-server__scoreboard.c
Modified:
  branches/2016Q3/www/apache24/Makefile
  branches/2016Q3/www/apache24/Makefile.options
  branches/2016Q3/www/apache24/Makefile.options.desc
  branches/2016Q3/www/apache24/distinfo
  branches/2016Q3/www/apache24/pkg-plist
Directory Properties:
  branches/2016Q3/   (props changed)

Modified: branches/2016Q3/www/apache24/Makefile
==============================================================================
--- branches/2016Q3/www/apache24/Makefile	Tue Jul  5 16:01:46 2016	(r418092)
+++ branches/2016Q3/www/apache24/Makefile	Tue Jul  5 16:25:03 2016	(r418093)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	apache24
-PORTVERSION=	2.4.20
-PORTREVISION=	1
+PORTVERSION=	2.4.23
 CATEGORIES=	www ipv6
 MASTER_SITES=	APACHE_HTTPD
 DISTNAME=	httpd-${PORTVERSION}
@@ -50,6 +49,10 @@ APACHEDIR=	${MASTERDIR}
 WITH_HTTP_PORT?=	80
 WITH_SSL_PORT?=		443
 
+.if !defined(WITH_DEBUG)
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-server_buildmark.c
+.endif
+
 .include "${APACHEDIR}/Makefile.options"
 .include "${APACHEDIR}/Makefile.options.desc"
 
@@ -58,6 +61,7 @@ AUTHN_DBD_IMPLIES=		DBD
 HEARTBEAT_IMPLIES=		WATCHDOG STATUS
 HEARTMONITOR_IMPLIES=		WATCHDOG STATUS
 LBMETHOD_HEARTBEAT_IMPLIES=	WATCHDOG STATUS HEARTMONITOR
+PROXY_HCHECK_IMPLIES=		WATCHDOG
 
 # MPM
 MPM_PREFORK_CONFIGURE_ON=	--with-mpm=prefork
@@ -76,6 +80,8 @@ HTTP2_LIB_DEPENDS=		libnghttp2.so:www/ng
 LUAJIT_LIB_DEPENDS=		libluajit-5.1.so:lang/luajit
 LUA_CONFIGURE_WITH=		lua
 LUA_USES=			lua
+PROXY_HTTP2_CONFIGURE_ON=	--with-nghttp2=${LOCALBASE}
+PROXY_HTTP2_LIB_DEPENDS=	libnghttp2.so:www/nghttp2
 
 SOCACHE_DC_CONFIGURE_ON=	--with-distcache=${LOCALBASE}
 SOCACHE_DC_LIB_DEPENDS=		libdistcache.so:security/distcache
@@ -86,7 +92,7 @@ SOCACHE_DC_LIB_DEPENDS=		libdistcache.so
 SSL_CFLAGS=			-I${OPENSSLINC}
 SSL_CONFIGURE_ON=		--with-ssl=${OPENSSLBASE}
 SSL_LDFLAGS=			-L${OPENSSLLIB}
-SSL_USE=			OPENSSL=yes
+SSL_USES=			ssl
 
 .include <bsd.port.options.mk>
 

Modified: branches/2016Q3/www/apache24/Makefile.options
==============================================================================
--- branches/2016Q3/www/apache24/Makefile.options	Tue Jul  5 16:01:46 2016	(r418092)
+++ branches/2016Q3/www/apache24/Makefile.options	Tue Jul  5 16:25:03 2016	(r418093)
@@ -12,9 +12,10 @@
 # mod_proxy_html and xml2enc depending on libxml2
 PROXY_ENABLED_MODULES= \
 	PROXY_AJP PROXY_BALANCER PROXY_CONNECT PROXY_EXPRESS PROXY_FCGI \
-	PROXY_FDPASS PROXY_FTP PROXY_HTTP PROXY_HTML PROXY_SCGI PROXY_WSTUNNEL
+	PROXY_FDPASS PROXY_FTP PROXY_HCHECK PROXY_HTML PROXY_HTTP PROXY_SCGI PROXY_WSTUNNEL
 
-PROXY_DISABLED_MODULES=
+PROXY_DISABLED_MODULES=	\
+	PROXY_HTTP2
 
 # SESSION_CRYPTO need APR build with crypto (EVP support in APR)
 SESSION_ENABLED_MODULES= \

Modified: branches/2016Q3/www/apache24/Makefile.options.desc
==============================================================================
--- branches/2016Q3/www/apache24/Makefile.options.desc	Tue Jul  5 16:01:46 2016	(r418092)
+++ branches/2016Q3/www/apache24/Makefile.options.desc	Tue Jul  5 16:25:03 2016	(r418093)
@@ -136,8 +136,10 @@ PROXY_EXPRESS_DESC=		Dynamic mass revers
 PROXY_FCGI_DESC=		FastCGI support module for mod_proxy
 PROXY_FDPASS_DESC=		fdpass external process support module for mod_proxy
 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_SCGI_DESC=		SCGI gateway module for mod_proxy
 PROXY_WSTUNNEL_DESC=		Websockets Tunnel module for mod_proxy
 

Modified: branches/2016Q3/www/apache24/distinfo
==============================================================================
--- branches/2016Q3/www/apache24/distinfo	Tue Jul  5 16:01:46 2016	(r418092)
+++ branches/2016Q3/www/apache24/distinfo	Tue Jul  5 16:25:03 2016	(r418093)
@@ -1,2 +1,3 @@
-SHA256 (apache24/httpd-2.4.20.tar.bz2) = 0e76a375ed3dbac636f50ac39de966ece443751fe4d62392f9a360a19d94d0da
-SIZE (apache24/httpd-2.4.20.tar.bz2) = 6331344
+TIMESTAMP = 1467307196
+SHA256 (apache24/httpd-2.4.23.tar.bz2) = 0c1694b2aad7765896faf92843452ee2555b9591ae10d4f19b245f2adfe85e58
+SIZE (apache24/httpd-2.4.23.tar.bz2) = 6351875

Copied: branches/2016Q3/www/apache24/files/extra-patch-server_buildmark.c (from r418091, head/www/apache24/files/extra-patch-server_buildmark.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q3/www/apache24/files/extra-patch-server_buildmark.c	Tue Jul  5 16:25:03 2016	(r418093, copy of r418091, head/www/apache24/files/extra-patch-server_buildmark.c)
@@ -0,0 +1,15 @@
+# disable build time stamp in favor of reproducible build
+# except building with DEBUG
+==============================================================
+--- server/buildmark.c.orig	2016-07-03 16:09:18 UTC
++++ server/buildmark.c
+@@ -17,6 +17,9 @@
+ #include "ap_config.h"
+ #include "httpd.h"
+ 
++/* Allow Reproducible build, do not include build time information */
++#undef __DATE__
++
+ #if defined(__DATE__) && defined(__TIME__)
+ static const char server_built[] = __DATE__ " " __TIME__;
+ #else

Modified: branches/2016Q3/www/apache24/pkg-plist
==============================================================================
--- branches/2016Q3/www/apache24/pkg-plist	Tue Jul  5 16:01:46 2016	(r418092)
+++ branches/2016Q3/www/apache24/pkg-plist	Tue Jul  5 16:25:03 2016	(r418093)
@@ -175,7 +175,9 @@ libexec/apache24/mod_log_config.so
 %%MOD_PROXY_FDPASS%%libexec/apache24/mod_proxy_fdpass.so
 %%MOD_PROXY_FTP%%libexec/apache24/mod_proxy_ftp.so
 %%MOD_PROXY_HTML%%libexec/apache24/mod_proxy_html.so
+%%MOD_PROXY_HCHECK%%libexec/apache24/mod_proxy_hcheck.so
 %%MOD_PROXY_HTTP%%libexec/apache24/mod_proxy_http.so
+%%MOD_PROXY_HTTP2%%libexec/apache24/mod_proxy_http2.so
 %%MOD_PROXY_SCGI%%libexec/apache24/mod_proxy_scgi.so
 %%MOD_PROXY_WSTUNNEL%%libexec/apache24/mod_proxy_wstunnel.so
 %%MOD_RATELIMIT%%libexec/apache24/mod_ratelimit.so

More information about the svn-ports-branches mailing list