Index: www/apache24/Makefile =================================================================== --- www/apache24/Makefile +++ www/apache24/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= apache24 -PORTVERSION= 2.4.33 -PORTREVISION= 1 +PORTVERSION= 2.4.34 CATEGORIES= www ipv6 MASTER_SITES= APACHE_HTTPD DISTNAME= httpd-${PORTVERSION} @@ -67,21 +66,23 @@ 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} +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_CONFIGURE_ENV= LUA_CFLAGS="-I${LUA_INCDIR}" \ - LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER}" + LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER}" LUA_CONFIGURE_WITH= lua=${LOCALBASE} -LUA_USES= lua +LUA_USES= lua MD_CONFIGURE_ON= --with-curl=${LOCALBASE} \ - --with-jansson=${LOCALBASE} \ - --with-openssl=${OPENSSLBASE} + --with-jansson=${LOCALBASE} \ + --with-ssl=${OPENSSLBASE} MD_LIB_DEPENDS= libcurl.so:ftp/curl \ - libjansson.so:devel/jansson -MD_USES= ssl + libjansson.so:devel/jansson +MD_USES= ssl PROXY_HTML_USE= GNOME=libxml2 PROXY_HTTP2_CONFIGURE_ON= --with-nghttp2=${LOCALBASE} PROXY_HTTP2_LIB_DEPENDS= libnghttp2.so:www/libnghttp2 @@ -91,9 +92,7 @@ # 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 ETC_SUBDIRS= Includes envvars.d extra modules.d @@ -110,9 +109,6 @@ 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} \ Index: www/apache24/distinfo =================================================================== --- www/apache24/distinfo +++ www/apache24/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1521377807 -SHA256 (apache24/httpd-2.4.33.tar.bz2) = de02511859b00d17845b9abdd1f975d5ccb5d0b280c567da5bf2ad4b70846f05 -SIZE (apache24/httpd-2.4.33.tar.bz2) = 6934765 +TIMESTAMP = 1531769087 +SHA256 (apache24/httpd-2.4.34.tar.bz2) = fa53c95631febb08a9de41fd2864cfff815cf62d9306723ab0d4b8d7aa1638f0 +SIZE (apache24/httpd-2.4.34.tar.bz2) = 6942969 Index: www/apache24/files/patch-modules_md_md__crypt.c =================================================================== --- www/apache24/files/patch-modules_md_md__crypt.c +++ www/apache24/files/patch-modules_md_md__crypt.c @@ -1,11 +1,13 @@ ---- modules/md/md_crypt.c.orig 2018-01-30 10:20:50 UTC +See also https://github.com/icing/mod_md/issues/96 + +--- modules/md/md_crypt.c.orig 2018-06-29 11:53:50 UTC +++ modules/md/md_crypt.c -@@ -471,7 +471,7 @@ apr_status_t md_pkey_gen(md_pkey_t **ppk - } - } +@@ -52,7 +52,7 @@ --#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) - - #ifndef NID_tlsfeature - #define NID_tlsfeature 1020 + #if defined(LIBRESSL_VERSION_NUMBER) + /* Missing from LibreSSL */ +-#define MD_USE_OPENSSL_PRE_1_1_API (LIBRESSL_VERSION_NUMBER < 0x2080000f) ++#define MD_USE_OPENSSL_PRE_1_1_API (LIBRESSL_VERSION_NUMBER < 0x2070000f) + #else /* defined(LIBRESSL_VERSION_NUMBER) */ + #define MD_USE_OPENSSL_PRE_1_1_API (OPENSSL_VERSION_NUMBER < 0x10100000L) + #endif Index: www/apache24/pkg-descr =================================================================== --- www/apache24/pkg-descr +++ www/apache24/pkg-descr @@ -6,4 +6,4 @@ The 2.x branch of Apache Web Server includes several improvements like threading, use of APR, native IPv6 and SSL support, and many more. -WWW: http://httpd.apache.org/ +WWW: https://httpd.apache.org/