Attachment #195246 for bug #229802




# $FreeBSD$

PORTNAME=	apache24
PORTVERSION=	2.4.34
PORTREVISION=	1
CATEGORIES=	www ipv6
MASTER_SITES=	APACHE_HTTPD
DISTNAME=	httpd-${PORTVERSION}

USERS=		www
GROUPS=		www

WITH_HTTP_PORT?=	80
WITH_SSL_PORT?=		443

.include "${.CURDIR}/Makefile.options"
.include "${.CURDIR}/Makefile.options.desc"
OPTIONS_SUB=	yes

AUTHNZ_LDAP_CONFIGURE_ON=	--enable-authnz-ldap
BROTLI_CONFIGURE_WITH=		brotli=${LOCALBASE}
BROTLI_LIB_DEPENDS=		libbrotlicommon.so:archivers/brotli
HTTP2_CONFIGURE_ON=		--with-nghttp2=${LOCALBASE} \
				--with-ssl=${OPENSSLBASE}
HTTP2_LIB_DEPENDS=		libnghttp2.so:www/libnghttp2
HTTP2_USES=			ssl
IPV4_MAPPED_CONFIGURE_ENABLE=	v4-mapped
LDAP_CONFIGURE_ON=		--enable-ldap=shared
LUAJIT_LIB_DEPENDS=		libluajit-5.1.so:lang/luajit

LUA_USES=			lua
MD_CONFIGURE_ON=		--with-curl=${LOCALBASE} \
				--with-jansson=${LOCALBASE} \
				--with-ssl=${OPENSSLBASE}
MD_LIB_DEPENDS=			libcurl.so:ftp/curl \
				libjansson.so:devel/jansson
MD_USES=			ssl

PROXY_HTTP2_LIB_DEPENDS=	libnghttp2.so:www/libnghttp2
SOCACHE_DC_CONFIGURE_ON=	--with-distcache=${LOCALBASE}
SOCACHE_DC_LIB_DEPENDS=		libdistcache.so:security/distcache
XML2ENC_USE=			GNOME=libxml2

# Note: OpenSSL version (base/ports) depends how devel/apr1 was built
#  apu-1-config --(includes|ldflags) and apr_rules.mk
SSL_CFLAGS=			-I${OPENSSLINC}
SSL_CONFIGURE_ON=		--with-ssl=${OPENSSLBASE}
SSL_LDFLAGS=			-L${OPENSSLLIB}
SSL_USES=			ssl
XML2ENC_USE=			GNOME=libxml2

ETC_SUBDIRS=		Includes envvars.d extra modules.d



CONFIGURE_ARGS+=--prefix=${PREFIX_RELDEST} \
		--enable-layout=FreeBSD \
		--with-port=${WITH_HTTP_PORT} \
		--with-sslport=${WITH_SSL_PORT} \
		--with-expat=${LOCALBASE} \
		--enable-http \
		--with-pcre=${LOCALBASE} \
		--with-apr=${APR_CONFIG} \

.endif

.if ${PORT_OPTIONS:MAUTH_BASIC} && empty(PORT_OPTIONS:MAUTHZ*)
IGNORE=	AUTH_BASIC needs at least one AUTHZ provider
.endif

# Non options-NG option handling

CONFIGURE_ARGS+=	--without-libxml2
.endif

# WITH_STATIC_SUPPORT, WITH_DEBUG, WITH_EXCEPTION_HOOK
# Only to be used for special builds
.if defined(WITH_STATIC_SUPPORT)
CONFIGURE_ARGS+=	--enable-static-support

Lines 1-3 Link Here

(-)www/apache24/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1521377807	1	TIMESTAMP = 1531769087
2	SHA256 (apache24/httpd-2.4.33.tar.bz2) = de02511859b00d17845b9abdd1f975d5ccb5d0b280c567da5bf2ad4b70846f05	2	SHA256 (apache24/httpd-2.4.34.tar.bz2) = fa53c95631febb08a9de41fd2864cfff815cf62d9306723ab0d4b8d7aa1638f0
3	SIZE (apache24/httpd-2.4.33.tar.bz2) = 6934765	3	SIZE (apache24/httpd-2.4.34.tar.bz2) = 6942969

Lines 1-11 Link Here

(-)www/apache24/files/patch-modules_md_md__crypt.c (-9 / +17 lines)
1	--- modules/md/md_crypt.c.orig 2018-01-30 10:20:50 UTC	1	Upstream https://svn.apache.org/viewvc?view=revision&revision=1836096
		2
		3	On the 2.4.x branch:
		4
		5	merge r1836095 from trunk:
		6	* using the, hopefully correct, ever elusive libressl version numbering check
		7	for the new openssl API calls, fixes PR 62548.
		8
		9	--- modules/md/md_crypt.c.orig 2018-06-29 11:53:50 UTC
2	+++ modules/md/md_crypt.c	10	+++ modules/md/md_crypt.c
3	@@ -471,7 +471,7 @@ apr_status_t md_pkey_gen(md_pkey_t **ppk	11	@@ -52,7 +52,7 @@
4	}
5	}
6		12
7	-#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined(LIBRESSL_VERSION_NUMBER)	13	#if defined(LIBRESSL_VERSION_NUMBER)
8	+#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)	14	/* Missing from LibreSSL */
9		15	-#define MD_USE_OPENSSL_PRE_1_1_API (LIBRESSL_VERSION_NUMBER < 0x2080000f)
10	#ifndef NID_tlsfeature	16	+#define MD_USE_OPENSSL_PRE_1_1_API (LIBRESSL_VERSION_NUMBER < 0x2070000f)
11	#define NID_tlsfeature 1020	17	#else /* defined(LIBRESSL_VERSION_NUMBER) */
		18	#define MD_USE_OPENSSL_PRE_1_1_API (OPENSSL_VERSION_NUMBER < 0x10100000L)
		19	#endif

Lines 6-9 Link Here

(-)www/apache24/pkg-descr (-1 / +1 lines)
6	The 2.x branch of Apache Web Server includes several improvements like	6	The 2.x branch of Apache Web Server includes several improvements like
7	threading, use of APR, native IPv6 and SSL support, and many more.	7	threading, use of APR, native IPv6 and SSL support, and many more.
8		8
9	WWW: http://httpd.apache.org/	9	WWW: https://httpd.apache.org/

Lines 20-23 Link Here

(-)www/apache24/pkg-message (-1 lines)
20	and merge missing modules/instructions into httpd.conf!	20	and merge missing modules/instructions into httpd.conf!
21		21
22	!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!	22	!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
23

Lines 253-259 Link Here

(-)www/apache24/pkg-plist (-1 / +1 lines)
253	%%DATADIR%%/misc/index.html	253	%%DATADIR%%/misc/index.html
254	@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
255	@(,,0400) %%WWWDIR%%/cgi-bin/printenv	255	@(,,0400) %%WWWDIR%%/cgi-bin/printenv
256	@comment %%WWWDIR%%/cgi-bin/printenv.vbs	256	@comment %%WWWDIR%%/cgi-bin/printenv.vbs
257	@comment %%WWWDIR%%/cgi-bin/printenv.wsf	257	@comment %%WWWDIR%%/cgi-bin/printenv.wsf
258	@(,,0400) %%WWWDIR%%/cgi-bin/test-cgi	258	@(,,0400) %%WWWDIR%%/cgi-bin/test-cgi
259	%%WWWDIR%%/error/HTTP_BAD_GATEWAY.html.var	259	%%WWWDIR%%/error/HTTP_BAD_GATEWAY.html.var

Return to bug 229802

Lines 1-8 Link Here

(-)www/apache24/Makefile (-16 / +8 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= apache24	3	PORTNAME= apache24
4	PORTVERSION= 2.4.33	4	PORTVERSION= 2.4.34
5	PORTREVISION= 1
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 35-43 Link Here
35	USERS= www	34	USERS= www
36	GROUPS= www	35	GROUPS= www
37		36
38	WITH_HTTP_PORT?= 80
39	WITH_SSL_PORT?= 443
40
41	.include "${.CURDIR}/Makefile.options"	37	.include "${.CURDIR}/Makefile.options"
42	.include "${.CURDIR}/Makefile.options.desc"	38	.include "${.CURDIR}/Makefile.options.desc"
43	OPTIONS_SUB= yes	39	OPTIONS_SUB= yes
Lines 67-74 Link Here
67	AUTHNZ_LDAP_CONFIGURE_ON= --enable-authnz-ldap	63	AUTHNZ_LDAP_CONFIGURE_ON= --enable-authnz-ldap
68	BROTLI_CONFIGURE_WITH= brotli=${LOCALBASE}	64	BROTLI_CONFIGURE_WITH= brotli=${LOCALBASE}
69	BROTLI_LIB_DEPENDS= libbrotlicommon.so:archivers/brotli	65	BROTLI_LIB_DEPENDS= libbrotlicommon.so:archivers/brotli
70	HTTP2_CONFIGURE_ON= --with-nghttp2=${LOCALBASE}	66	HTTP2_CONFIGURE_ON= --with-nghttp2=${LOCALBASE} \
		67	--with-ssl=${OPENSSLBASE}
71	HTTP2_LIB_DEPENDS= libnghttp2.so:www/libnghttp2	68	HTTP2_LIB_DEPENDS= libnghttp2.so:www/libnghttp2
		69	HTTP2_USES= ssl
72	IPV4_MAPPED_CONFIGURE_ENABLE= v4-mapped	70	IPV4_MAPPED_CONFIGURE_ENABLE= v4-mapped
73	LDAP_CONFIGURE_ON= --enable-ldap=shared	71	LDAP_CONFIGURE_ON= --enable-ldap=shared
74	LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit	72	LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit
Lines 78-84 Link Here
78	LUA_USES= lua	76	LUA_USES= lua
79	MD_CONFIGURE_ON= --with-curl=${LOCALBASE} \	77	MD_CONFIGURE_ON= --with-curl=${LOCALBASE} \
80	--with-jansson=${LOCALBASE} \	78	--with-jansson=${LOCALBASE} \
81	--with-openssl=${OPENSSLBASE}	79	--with-ssl=${OPENSSLBASE}
82	MD_LIB_DEPENDS= libcurl.so:ftp/curl \	80	MD_LIB_DEPENDS= libcurl.so:ftp/curl \
83	libjansson.so:devel/jansson	81	libjansson.so:devel/jansson
84	MD_USES= ssl	82	MD_USES= ssl
Lines 87-100 Link Here
87	PROXY_HTTP2_LIB_DEPENDS= libnghttp2.so:www/libnghttp2	85	PROXY_HTTP2_LIB_DEPENDS= libnghttp2.so:www/libnghttp2
88	SOCACHE_DC_CONFIGURE_ON= --with-distcache=${LOCALBASE}	86	SOCACHE_DC_CONFIGURE_ON= --with-distcache=${LOCALBASE}
89	SOCACHE_DC_LIB_DEPENDS= libdistcache.so:security/distcache	87	SOCACHE_DC_LIB_DEPENDS= libdistcache.so:security/distcache
90	XML2ENC_USE= GNOME=libxml2
91
92	# Note: OpenSSL version (base/ports) depends how devel/apr1 was built	88	# Note: OpenSSL version (base/ports) depends how devel/apr1 was built
93	# apu-1-config --(includes\|ldflags) and apr_rules.mk	89	# apu-1-config --(includes\|ldflags) and apr_rules.mk
94	SSL_CFLAGS= -I${OPENSSLINC}
95	SSL_CONFIGURE_ON= --with-ssl=${OPENSSLBASE}	90	SSL_CONFIGURE_ON= --with-ssl=${OPENSSLBASE}
96	SSL_LDFLAGS= -L${OPENSSLLIB}
97	SSL_USES= ssl	91	SSL_USES= ssl
		92	XML2ENC_USE= GNOME=libxml2
98		93
99	ETC_SUBDIRS= Includes envvars.d extra modules.d	94	ETC_SUBDIRS= Includes envvars.d extra modules.d
100		95
Lines 110-118 Link Here
110		105
111	CONFIGURE_ARGS+=--prefix=${PREFIX_RELDEST} \	106	CONFIGURE_ARGS+=--prefix=${PREFIX_RELDEST} \
112	--enable-layout=FreeBSD \	107	--enable-layout=FreeBSD \
113	--with-port=${WITH_HTTP_PORT} \
114	--with-sslport=${WITH_SSL_PORT} \
115	--with-expat=${LOCALBASE} \
116	--enable-http \	108	--enable-http \
117	--with-pcre=${LOCALBASE} \	109	--with-pcre=${LOCALBASE} \
118	--with-apr=${APR_CONFIG} \	110	--with-apr=${APR_CONFIG} \
Lines 155-161 Link Here
155	.endif	147	.endif
156		148
157	.if ${PORT_OPTIONS:MAUTH_BASIC} && empty(PORT_OPTIONS:MAUTHZ*)	149	.if ${PORT_OPTIONS:MAUTH_BASIC} && empty(PORT_OPTIONS:MAUTHZ*)
158	IGNORE= AUTH_BASIC need at least one AUTHZ provider	150	IGNORE= AUTH_BASIC needs at least one AUTHZ provider
159	.endif	151	.endif
160		152
161	# Non options-NG option handling	153	# Non options-NG option handling
Lines 165-171 Link Here
165	CONFIGURE_ARGS+= --without-libxml2	157	CONFIGURE_ARGS+= --without-libxml2
166	.endif	158	.endif
167		159
168	# WITH_STATIC_SUPPORT, WITH_DEBUG, WITH_EXCEPTION_HOOK	160	# WITH_STATIC_SUPPORT, WITH_DEBUG, WITH_EXCEPTION_HOOK
169	# Only to be used for special builds	161	# Only to be used for special builds
170	.if defined(WITH_STATIC_SUPPORT)	162	.if defined(WITH_STATIC_SUPPORT)
171	CONFIGURE_ARGS+= --enable-static-support	163	CONFIGURE_ARGS+= --enable-static-support