Attachment #191753 for bug #226647

Lines 1-8 Link Here

(-)www/apache24/Makefile (-8 / +20 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= apache24	3	PORTNAME= apache24
4	PORTVERSION= 2.4.29	4	PORTVERSION= 2.4.33
5	PORTREVISION= 2
6	CATEGORIES= www ipv6	5	CATEGORIES= www ipv6
7	MASTER_SITES= APACHE_HTTPD	6	MASTER_SITES= APACHE_HTTPD
8	DISTNAME= httpd-${PORTVERSION}	7	DISTNAME= httpd-${PORTVERSION}
Lines 65-70 Link Here
65	HEARTMONITOR_IMPLIES= WATCHDOG STATUS	64	HEARTMONITOR_IMPLIES= WATCHDOG STATUS
66	LBMETHOD_HEARTBEAT_IMPLIES= WATCHDOG STATUS HEARTMONITOR	65	LBMETHOD_HEARTBEAT_IMPLIES= WATCHDOG STATUS HEARTMONITOR
67	PROXY_HCHECK_IMPLIES= WATCHDOG	66	PROXY_HCHECK_IMPLIES= WATCHDOG
		67	.for module in ${PROXY_ENABLED_MODULES:NPROXY} ${PROXY_DISABLED_MODULES}
		68	${module}_IMPLIES= PROXY
		69	.endfor
		70	.for module in ${SESSION_ENABLED_MODULES:NSESSION} ${SESSION_DISABLED_MODULES}
		71	${module}_IMPLIES= SESSION
		72	.endfor
68		73
69	# MPM	74	# MPM
70	MPM_PREFORK_CONFIGURE_ON= --with-mpm=prefork	75	MPM_PREFORK_CONFIGURE_ON= --with-mpm=prefork
Lines 85-90 Link Here
85	LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit	90	LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit
86	LUA_CONFIGURE_WITH= lua	91	LUA_CONFIGURE_WITH= lua
87	LUA_USES= lua	92	LUA_USES= lua
		93	MD_CONFIGURE_ON= --with-curl=${LOCALBASE} \
		94	--with-jansson=${LOCALBASE} \
		95	--with-openssl=${OPENSSLBASE}
		96	MD_LIB_DEPENDS= libcurl.so:ftp/curl \
		97	libjansson.so:devel/jansson
		98	MD_USES= ssl
88	PROXY_HTTP2_CONFIGURE_ON= --with-nghttp2=${LOCALBASE}	99	PROXY_HTTP2_CONFIGURE_ON= --with-nghttp2=${LOCALBASE}
89	PROXY_HTTP2_LIB_DEPENDS= libnghttp2.so:www/libnghttp2	100	PROXY_HTTP2_LIB_DEPENDS= libnghttp2.so:www/libnghttp2
90	SOCACHE_DC_CONFIGURE_ON= --with-distcache=${LOCALBASE}	101	SOCACHE_DC_CONFIGURE_ON= --with-distcache=${LOCALBASE}
Lines 121-127 Link Here
121	--with-port=${WITH_HTTP_PORT} \	132	--with-port=${WITH_HTTP_PORT} \
122	--with-sslport=${WITH_SSL_PORT} \	133	--with-sslport=${WITH_SSL_PORT} \
123	--with-expat=${LOCALBASE} \	134	--with-expat=${LOCALBASE} \
124	--with-iconv=${ICONV_PREFIX} \
125	--enable-http \	135	--enable-http \
126	--with-pcre=${LOCALBASE} \	136	--with-pcre=${LOCALBASE} \
127	--with-apr=${APR_CONFIG} \	137	--with-apr=${APR_CONFIG} \
Lines 155-165 Link Here
155	SUB_FILES+= pkg-message	165	SUB_FILES+= pkg-message
156	.endif	166	.endif
157		167
		168	pre-extract-SUEXEC-on:
		169	@${ECHO_CMD} ""
		170	@${ECHO_CMD} "suexec builds with user '${USERS}' and docroot '${PREFIX}/www' by default,"
		171	@${ECHO_CMD} "use SUEXEC_DOCROOT and SUEXEC_USERDIR in /etc/make.conf to adjust."
		172	@${ECHO_CMD} ""
		173
158	post-extract:	174	post-extract:
159	# remove possible leftover .svn directories in the sources
160	@${FIND} ${WRKSRC} -type d -name .svn -print \| ${XARGS} ${RM} -r
161	# limit grep results ...
162	@${FIND} ${WRKSRC} -type f $ -name 'NWGNU' -o -name '.ds?' -o -name '.dep' -o -name '.mak' -o -name '.win' -o -name '.vbs' -o -name '*.wsf' $ -delete
163	# make sure the configure script contains our patches, preserve the original script for comparsion	175	# make sure the configure script contains our patches, preserve the original script for comparsion
164	-${MV} -v ${WRKSRC}/configure ${WRKSRC}/configure.upstream	176	-${MV} -v ${WRKSRC}/configure ${WRKSRC}/configure.upstream
165		177
Lines 183-189 Link Here
183	@${ECHO_MSG} " You can check your modules configuration by using make show-modules"	195	@${ECHO_MSG} " You can check your modules configuration by using make show-modules"
184	@${ECHO_MSG} ""	196	@${ECHO_MSG} ""
185	# silence autotools	197	# silence autotools
186	-${MV} -v ${WRKSRC}/configure.in ${WRKSRC}/configure.ac	198	-@${MV} -v ${WRKSRC}/configure.in ${WRKSRC}/configure.ac 2>/dev/null
187		199
188	post-configure:	200	post-configure:
189	@FTPUSERS=`${EGREP} -v '^#' /etc/ftpusers\| ${TR} -s "\n" " "` ;\	201	@FTPUSERS=`${EGREP} -v '^#' /etc/ftpusers\| ${TR} -s "\n" " "` ;\





# mod_proxy_html and xml2enc depending on libxml2
PROXY_ENABLED_MODULES= \
	PROXY_AJP PROXY_BALANCER PROXY_CONNECT PROXY_EXPRESS PROXY_FCGI \
	PROXY_HTTP2 PROXY_FDPASS PROXY_FTP PROXY_HCHECK PROXY_HTML PROXY_HTTP \
	PROXY_SCGI PROXY_UWSGI PROXY_WSTUNNEL

PROXY_DISABLED_MODULES=


	WATCHDOG XML2ENC

MOST_DISABLED_MODULES:= \
	AUTHNZ_LDAP BROTLI IDENT LDAP LUA MD SOCACHE_DC SUEXEC

#     enable/disable additional PROXY/SESSION modules
META_MODULES=	PROXY SESSION

# ===================================================================================
#NO_OPTIONS_SORT=	yes

OPTIONS_MULTI=		${META_MODULES}
OPTIONS_MULTI_PROXY=	${PROXY_ENABLED_MODULES} ${PROXY_DISABLED_MODULES}
OPTIONS_MULTI_SESSION=	${SESSION_ENABLED_MODULES} ${SESSION_DISABLED_MODULES}

OPTIONS_GROUP=		EXAMPLE
OPTIONS_GROUP_EXAMPLE=	${EXAMPLE_MODULES}

OPTIONS_RADIO=		MPM_SHARED
OPTIONS_RADIO_MPM_SHARED=	MPM_SHARED

OPTIONS_SINGLE=			DEFAULT_MPM
OPTIONS_SINGLE_DEFAULT_MPM=	MPM_PREFORK MPM_WORKER MPM_EVENT

Lines 119-124 Link Here

(-)www/apache24/Makefile.options.desc (+2 lines)
119	LUA_DESC= Apache Lua Framework	119	LUA_DESC= Apache Lua Framework
120		120
121	MACRO_DESC= Define and use macros in configuration files	121	MACRO_DESC= Define and use macros in configuration files
		122	MD_DESC= Managing domains across virtual hosts, certificate provisioning via the ACME protocol
122	MIME_DESC= Mapp file-ext. to MIME (recommended)	123	MIME_DESC= Mapp file-ext. to MIME (recommended)
123	MIME_MAGIC_DESC= Automagically determining MIME type	124	MIME_MAGIC_DESC= Automagically determining MIME type
124		125
Lines 142-147 Link Here
142	PROXY_HTTP_DESC= HTTP support module for mod_proxy	143	PROXY_HTTP_DESC= HTTP support module for mod_proxy
143	PROXY_HTTP2_DESC= HTTP/2 support module for h2 and h2c	144	PROXY_HTTP2_DESC= HTTP/2 support module for h2 and h2c
144	PROXY_SCGI_DESC= SCGI gateway module for mod_proxy	145	PROXY_SCGI_DESC= SCGI gateway module for mod_proxy
		146	PROXY_UWSGI_DESC= UWSGI gateway module for mod_proxy
145	PROXY_WSTUNNEL_DESC= Websockets Tunnel module for mod_proxy	147	PROXY_WSTUNNEL_DESC= Websockets Tunnel module for mod_proxy
146		148
147	RATELIMIT_DESC= Output Bandwidth Limiting	149	RATELIMIT_DESC= Output Bandwidth Limiting

Lines 1-3 Link Here

(-)www/apache24/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1508321657	1	TIMESTAMP = 1521377807
2	SHA256 (apache24/httpd-2.4.29.tar.bz2) = 777753a5a25568a2a27428b2214980564bc1c38c1abf9ccc7630b639991f7f00	2	SHA256 (apache24/httpd-2.4.33.tar.bz2) = de02511859b00d17845b9abdd1f975d5ccb5d0b280c567da5bf2ad4b70846f05
3	SIZE (apache24/httpd-2.4.29.tar.bz2) = 6567926	3	SIZE (apache24/httpd-2.4.33.tar.bz2) = 6934765




--- configure.in.orig	2016-12-02 11:36:06 UTC
+++ configure.in
@@ -111,7 +111,7 @@ fi
 
 if test "$apr_found" = "reconfig"; then
   APR_SUBDIR_CONFIG(srclib/apr,
-                    [$apache_apr_flags --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir --datadir=$datadir --with-installbuilddir=$installbuilddir],
+                    [$apache_apr_flags --prefix=$prefix],
                     [--enable-layout=*|\'--enable-layout=*])
   dnl We must be the first to build and the last to be cleaned
   AP_BUILD_SRCLIB_DIRS="apr $AP_BUILD_SRCLIB_DIRS"
@@ -177,7 +177,7 @@ esac  
 
 if test "$apu_found" = "reconfig"; then
   APR_SUBDIR_CONFIG(srclib/apr-util,
-                    [--with-apr=../apr --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir],
+                    [--with-apr=../apr --prefix=$prefix],
                     [--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"
@@ -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",

Line 0 Link Here

(-)www/apache24/files/patch-modules_md_md__crypt.c (+11 lines)
	1	--- modules/md/md_crypt.c.orig 2018-01-30 10:20:50 UTC
	2	+++ modules/md/md_crypt.c
	3	@@ -471,7 +471,7 @@ apr_status_t md_pkey_gen(md_pkey_t **ppk
	4	}
	5	}
	6
	7	-#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined(LIBRESSL_VERSION_NUMBER)
	8	+#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
	9
	10	#ifndef NID_tlsfeature
	11	#define NID_tlsfeature 1020

Line 0 Link Here

(-)www/apache24/files/patch-modules_ssl_ssl__private.h (+11 lines)
	1	--- modules/ssl/ssl_private.h.orig 2018-03-23 14:22:26 UTC
	2	+++ modules/ssl/ssl_private.h
	3	@@ -123,7 +123,7 @@
	4	#define MODSSL_SSL_METHOD_CONST
	5	#endif
	6
	7	-#if defined(LIBRESSL_VERSION_NUMBER)
	8	+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L
	9	/* Missing from LibreSSL */
	10	#if LIBRESSL_VERSION_NUMBER < 0x2060000f
	11	#define SSL_CTRL_SET_MIN_PROTO_VERSION 123

Return to bug 226647

Lines 11-18 Link Here

(-)www/apache24/Makefile.options (-9 / +10 lines)
11		11
12	# mod_proxy_html and xml2enc depending on libxml2	12	# mod_proxy_html and xml2enc depending on libxml2
13	PROXY_ENABLED_MODULES= \	13	PROXY_ENABLED_MODULES= \
14	PROXY_AJP PROXY_BALANCER PROXY_CONNECT PROXY_EXPRESS PROXY_FCGI PROXY_HTTP2 \	14	PROXY_AJP PROXY_BALANCER PROXY_CONNECT PROXY_EXPRESS PROXY_FCGI \
15	PROXY_FDPASS PROXY_FTP PROXY_HCHECK PROXY_HTML PROXY_HTTP PROXY_SCGI PROXY_WSTUNNEL	15	PROXY_HTTP2 PROXY_FDPASS PROXY_FTP PROXY_HCHECK PROXY_HTML PROXY_HTTP \
		16	PROXY_SCGI PROXY_UWSGI PROXY_WSTUNNEL
16		17
17	PROXY_DISABLED_MODULES=	18	PROXY_DISABLED_MODULES=
18		19
Lines 54-60 Link Here
54	WATCHDOG XML2ENC	55	WATCHDOG XML2ENC
55		56
56	MOST_DISABLED_MODULES:= \	57	MOST_DISABLED_MODULES:= \
57	AUTHNZ_LDAP BROTLI IDENT LDAP LUA SOCACHE_DC SUEXEC	58	AUTHNZ_LDAP BROTLI IDENT LDAP LUA MD SOCACHE_DC SUEXEC
58		59
59	# enable/disable additional PROXY/SESSION modules	60	# enable/disable additional PROXY/SESSION modules
60	META_MODULES= PROXY SESSION	61	META_MODULES= PROXY SESSION
Lines 70-84 Link Here
70	# ===================================================================================	71	# ===================================================================================
71	#NO_OPTIONS_SORT= yes	72	#NO_OPTIONS_SORT= yes
72		73
73	OPTIONS_MULTI:= ${META_MODULES}	74	OPTIONS_MULTI= ${META_MODULES}
74	OPTIONS_MULTI_PROXY:= ${PROXY_ENABLED_MODULES} ${PROXY_DISABLED_MODULES}	75	OPTIONS_MULTI_PROXY= ${PROXY_ENABLED_MODULES} ${PROXY_DISABLED_MODULES}
75	OPTIONS_MULTI_SESSION:= ${SESSION_ENABLED_MODULES} ${SESSION_DISABLED_MODULES}	76	OPTIONS_MULTI_SESSION= ${SESSION_ENABLED_MODULES} ${SESSION_DISABLED_MODULES}
76		77
77	OPTIONS_GROUP= EXAMPLE	78	OPTIONS_GROUP= EXAMPLE
78	OPTIONS_GROUP_EXAMPLE:= ${EXAMPLE_MODULES}	79	OPTIONS_GROUP_EXAMPLE= ${EXAMPLE_MODULES}
79		80
80	OPTIONS_RADIO= SHARED_MPM	81	OPTIONS_RADIO= MPM_SHARED
81	OPTIONS_RADIO_SHARED_MPM= MPM_SHARED	82	OPTIONS_RADIO_MPM_SHARED= MPM_SHARED
82		83
83	OPTIONS_SINGLE= DEFAULT_MPM	84	OPTIONS_SINGLE= DEFAULT_MPM
84	OPTIONS_SINGLE_DEFAULT_MPM= MPM_PREFORK MPM_WORKER MPM_EVENT	85	OPTIONS_SINGLE_DEFAULT_MPM= MPM_PREFORK MPM_WORKER MPM_EVENT

Lines 1-23 Link Here

(-)www/apache24/files/patch-configure.in (-18 lines)
1	--- configure.in.orig 2016-12-02 11:36:06 UTC	1	--- configure.in.orig 2016-12-02 11:36:06 UTC
2	+++ configure.in	2	+++ configure.in
3	@@ -111,7 +111,7 @@ fi
4
5	if test "$apr_found" = "reconfig"; then
6	APR_SUBDIR_CONFIG(srclib/apr,
7	- [$apache_apr_flags --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir --datadir=$datadir --with-installbuilddir=$installbuilddir],
8	+ [$apache_apr_flags --prefix=$prefix],
9	[--enable-layout=\|\'--enable-layout=])
10	dnl We must be the first to build and the last to be cleaned
11	AP_BUILD_SRCLIB_DIRS="apr $AP_BUILD_SRCLIB_DIRS"
12	@@ -177,7 +177,7 @@ esac
13
14	if test "$apu_found" = "reconfig"; then
15	APR_SUBDIR_CONFIG(srclib/apr-util,
16	- [--with-apr=../apr --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir],
17	+ [--with-apr=../apr --prefix=$prefix],
18	[--enable-layout=\|\'--enable-layout=])
19	dnl We must be the last to build and the first to be cleaned
20	AP_BUILD_SRCLIB_DIRS="$AP_BUILD_SRCLIB_DIRS apr-util"
21	@@ -838,8 +837,14 @@ AC_DEFINE_UNQUOTED(HTTPD_ROOT, "${ap_pre	3	@@ -838,8 +837,14 @@ AC_DEFINE_UNQUOTED(HTTPD_ROOT, "${ap_pre
22	[Root directory of the Apache install area])	4	[Root directory of the Apache install area])
23	AC_DEFINE_UNQUOTED(SERVER_CONFIG_FILE, "${rel_sysconfdir}/${progname}.conf",	5	AC_DEFINE_UNQUOTED(SERVER_CONFIG_FILE, "${rel_sysconfdir}/${progname}.conf",

Lines 157-162 Link Here

(-)www/apache24/pkg-plist (+4 lines)
157	%%MOD_LOGIO%%libexec/apache24/mod_logio.so	157	%%MOD_LOGIO%%libexec/apache24/mod_logio.so
158	%%MOD_LUA%%libexec/apache24/mod_lua.so	158	%%MOD_LUA%%libexec/apache24/mod_lua.so
159	%%MOD_MACRO%%libexec/apache24/mod_macro.so	159	%%MOD_MACRO%%libexec/apache24/mod_macro.so
		160	%%MOD_MD%%libexec/apache24/mod_md.so
160	%%MOD_MIME%%libexec/apache24/mod_mime.so	161	%%MOD_MIME%%libexec/apache24/mod_mime.so
161	%%MOD_MIME_MAGIC%%libexec/apache24/mod_mime_magic.so	162	%%MOD_MIME_MAGIC%%libexec/apache24/mod_mime_magic.so
162	%%MPM_SHARED%%libexec/apache24/mod_mpm_event.so	163	%%MPM_SHARED%%libexec/apache24/mod_mpm_event.so
Lines 180-185 Link Here
180	%%MOD_PROXY_HTTP%%libexec/apache24/mod_proxy_http.so	181	%%MOD_PROXY_HTTP%%libexec/apache24/mod_proxy_http.so
181	%%MOD_PROXY_HTTP2%%libexec/apache24/mod_proxy_http2.so	182	%%MOD_PROXY_HTTP2%%libexec/apache24/mod_proxy_http2.so
182	%%MOD_PROXY_SCGI%%libexec/apache24/mod_proxy_scgi.so	183	%%MOD_PROXY_SCGI%%libexec/apache24/mod_proxy_scgi.so
		184	%%MOD_PROXY_UWSGI%%libexec/apache24/mod_proxy_uwsgi.so
183	%%MOD_PROXY_WSTUNNEL%%libexec/apache24/mod_proxy_wstunnel.so	185	%%MOD_PROXY_WSTUNNEL%%libexec/apache24/mod_proxy_wstunnel.so
184	%%MOD_RATELIMIT%%libexec/apache24/mod_ratelimit.so	186	%%MOD_RATELIMIT%%libexec/apache24/mod_ratelimit.so
185	%%MOD_REFLECTOR%%libexec/apache24/mod_reflector.so	187	%%MOD_REFLECTOR%%libexec/apache24/mod_reflector.so
Lines 251-256 Link Here
251	%%DATADIR%%/misc/index.html	253	%%DATADIR%%/misc/index.html
252	@postexec [ -f %D/%%WWWDIR%%/data/index.html ] \|\| cp %D/%%DATADIR%%/misc/index.html %D/%%WWWDIR%%/data/index.html	254	@postexec [ -f %D/%%WWWDIR%%/data/index.html ] \|\| cp %D/%%DATADIR%%/misc/index.html %D/%%WWWDIR%%/data/index.html
253	@(,,0400) %%WWWDIR%%/cgi-bin/printenv	255	@(,,0400) %%WWWDIR%%/cgi-bin/printenv
		256	@comment %%WWWDIR%%/cgi-bin/printenv.vbs
		257	@comment %%WWWDIR%%/cgi-bin/printenv.wsf
254	@(,,0400) %%WWWDIR%%/cgi-bin/test-cgi	258	@(,,0400) %%WWWDIR%%/cgi-bin/test-cgi
255	%%WWWDIR%%/error/HTTP_BAD_GATEWAY.html.var	259	%%WWWDIR%%/error/HTTP_BAD_GATEWAY.html.var
256	%%WWWDIR%%/error/HTTP_BAD_REQUEST.html.var	260	%%WWWDIR%%/error/HTTP_BAD_REQUEST.html.var