--- www/apache24/Makefile (revision 465240) +++ www/apache24/Makefile (working copy) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= apache24 -PORTVERSION= 2.4.29 -PORTREVISION= 2 +PORTVERSION= 2.4.33 CATEGORIES= www ipv6 MASTER_SITES= APACHE_HTTPD DISTNAME= httpd-${PORTVERSION} @@ -65,6 +64,12 @@ HEARTMONITOR_IMPLIES= WATCHDOG STATUS LBMETHOD_HEARTBEAT_IMPLIES= WATCHDOG STATUS HEARTMONITOR PROXY_HCHECK_IMPLIES= WATCHDOG +.for module in ${PROXY_ENABLED_MODULES:NPROXY} ${PROXY_DISABLED_MODULES} +${module}_IMPLIES= PROXY +.endfor +.for module in ${SESSION_ENABLED_MODULES:NSESSION} ${SESSION_DISABLED_MODULES} +${module}_IMPLIES= SESSION +.endfor # MPM MPM_PREFORK_CONFIGURE_ON= --with-mpm=prefork @@ -85,6 +90,12 @@ LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit LUA_CONFIGURE_WITH= lua LUA_USES= lua +MD_CONFIGURE_ON= --with-curl=${LOCALBASE} \ + --with-jansson=${LOCALBASE} \ + --with-openssl=${OPENSSLBASE} +MD_LIB_DEPENDS= libcurl.so:ftp/curl \ + libjansson.so:devel/jansson +MD_USES= ssl PROXY_HTTP2_CONFIGURE_ON= --with-nghttp2=${LOCALBASE} PROXY_HTTP2_LIB_DEPENDS= libnghttp2.so:www/libnghttp2 SOCACHE_DC_CONFIGURE_ON= --with-distcache=${LOCALBASE} @@ -121,7 +132,6 @@ --with-port=${WITH_HTTP_PORT} \ --with-sslport=${WITH_SSL_PORT} \ --with-expat=${LOCALBASE} \ - --with-iconv=${ICONV_PREFIX} \ --enable-http \ --with-pcre=${LOCALBASE} \ --with-apr=${APR_CONFIG} \ @@ -155,11 +165,13 @@ SUB_FILES+= pkg-message .endif +pre-extract-SUEXEC-on: + @${ECHO_CMD} "" + @${ECHO_CMD} "suexec builds with user '${USERS}' and docroot '${PREFIX}/www' by default," + @${ECHO_CMD} "use SUEXEC_DOCROOT and SUEXEC_USERDIR in /etc/make.conf to adjust." + @${ECHO_CMD} "" + post-extract: -# remove possible leftover .svn directories in the sources - @${FIND} ${WRKSRC} -type d -name .svn -print | ${XARGS} ${RM} -r -# limit grep results ... - @${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 # make sure the configure script contains our patches, preserve the original script for comparsion -${MV} -v ${WRKSRC}/configure ${WRKSRC}/configure.upstream @@ -183,7 +195,7 @@ @${ECHO_MSG} " You can check your modules configuration by using make show-modules" @${ECHO_MSG} "" # silence autotools - -${MV} -v ${WRKSRC}/configure.in ${WRKSRC}/configure.ac + -@${MV} -v ${WRKSRC}/configure.in ${WRKSRC}/configure.ac 2>/dev/null post-configure: @FTPUSERS=`${EGREP} -v '^#' /etc/ftpusers| ${TR} -s "\n" " "` ;\ --- www/apache24/Makefile.options (revision 465230) +++ www/apache24/Makefile.options (working copy) @@ -11,8 +11,9 @@ # 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_WSTUNNEL + 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= @@ -54,7 +55,7 @@ WATCHDOG XML2ENC MOST_DISABLED_MODULES:= \ - AUTHNZ_LDAP BROTLI IDENT LDAP LUA SOCACHE_DC SUEXEC + AUTHNZ_LDAP BROTLI IDENT LDAP LUA MD SOCACHE_DC SUEXEC # enable/disable additional PROXY/SESSION modules META_MODULES= PROXY SESSION @@ -70,15 +71,15 @@ # =================================================================================== #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_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_GROUP_EXAMPLE= ${EXAMPLE_MODULES} -OPTIONS_RADIO= SHARED_MPM -OPTIONS_RADIO_SHARED_MPM= MPM_SHARED +OPTIONS_RADIO= MPM_SHARED +OPTIONS_RADIO_MPM_SHARED= MPM_SHARED OPTIONS_SINGLE= DEFAULT_MPM OPTIONS_SINGLE_DEFAULT_MPM= MPM_PREFORK MPM_WORKER MPM_EVENT --- www/apache24/Makefile.options.desc (revision 465230) +++ www/apache24/Makefile.options.desc (working copy) @@ -119,6 +119,7 @@ LUA_DESC= Apache Lua Framework MACRO_DESC= Define and use macros in configuration files +MD_DESC= Managing domains across virtual hosts, certificate provisioning via the ACME protocol MIME_DESC= Mapp file-ext. to MIME (recommended) MIME_MAGIC_DESC= Automagically determining MIME type @@ -142,6 +143,7 @@ PROXY_HTTP_DESC= HTTP support module for mod_proxy PROXY_HTTP2_DESC= HTTP/2 support module for h2 and h2c PROXY_SCGI_DESC= SCGI gateway module for mod_proxy +PROXY_UWSGI_DESC= UWSGI gateway module for mod_proxy PROXY_WSTUNNEL_DESC= Websockets Tunnel module for mod_proxy RATELIMIT_DESC= Output Bandwidth Limiting --- www/apache24/distinfo (revision 465230) +++ www/apache24/distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1508321657 -SHA256 (apache24/httpd-2.4.29.tar.bz2) = 777753a5a25568a2a27428b2214980564bc1c38c1abf9ccc7630b639991f7f00 -SIZE (apache24/httpd-2.4.29.tar.bz2) = 6567926 +TIMESTAMP = 1521377807 +SHA256 (apache24/httpd-2.4.33.tar.bz2) = de02511859b00d17845b9abdd1f975d5ccb5d0b280c567da5bf2ad4b70846f05 +SIZE (apache24/httpd-2.4.33.tar.bz2) = 6934765 --- www/apache24/files/patch-configure.in (revision 465230) +++ www/apache24/files/patch-configure.in (working copy) @@ -1,23 +1,5 @@ --- 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", --- www/apache24/files/patch-modules_md_md__crypt.c (nonexistent) +++ www/apache24/files/patch-modules_md_md__crypt.c (working copy) @@ -0,0 +1,11 @@ +--- modules/md/md_crypt.c.orig 2018-01-30 10:20:50 UTC ++++ modules/md/md_crypt.c +@@ -471,7 +471,7 @@ apr_status_t md_pkey_gen(md_pkey_t **ppk + } + } + +-#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 --- www/apache24/files/patch-modules_ssl_ssl__private.h (nonexistent) +++ www/apache24/files/patch-modules_ssl_ssl__private.h (working copy) @@ -0,0 +1,11 @@ +--- modules/ssl/ssl_private.h.orig 2018-03-23 14:22:26 UTC ++++ modules/ssl/ssl_private.h +@@ -123,7 +123,7 @@ + #define MODSSL_SSL_METHOD_CONST + #endif + +-#if defined(LIBRESSL_VERSION_NUMBER) ++#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L + /* Missing from LibreSSL */ + #if LIBRESSL_VERSION_NUMBER < 0x2060000f + #define SSL_CTRL_SET_MIN_PROTO_VERSION 123 --- www/apache24/pkg-plist (revision 465230) +++ www/apache24/pkg-plist (working copy) @@ -157,6 +157,7 @@ %%MOD_LOGIO%%libexec/apache24/mod_logio.so %%MOD_LUA%%libexec/apache24/mod_lua.so %%MOD_MACRO%%libexec/apache24/mod_macro.so +%%MOD_MD%%libexec/apache24/mod_md.so %%MOD_MIME%%libexec/apache24/mod_mime.so %%MOD_MIME_MAGIC%%libexec/apache24/mod_mime_magic.so %%MPM_SHARED%%libexec/apache24/mod_mpm_event.so @@ -180,6 +181,7 @@ %%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_UWSGI%%libexec/apache24/mod_proxy_uwsgi.so %%MOD_PROXY_WSTUNNEL%%libexec/apache24/mod_proxy_wstunnel.so %%MOD_RATELIMIT%%libexec/apache24/mod_ratelimit.so %%MOD_REFLECTOR%%libexec/apache24/mod_reflector.so @@ -251,6 +253,8 @@ %%DATADIR%%/misc/index.html @postexec [ -f %D/%%WWWDIR%%/data/index.html ] || cp %D/%%DATADIR%%/misc/index.html %D/%%WWWDIR%%/data/index.html @(,,0400) %%WWWDIR%%/cgi-bin/printenv +@comment %%WWWDIR%%/cgi-bin/printenv.vbs +@comment %%WWWDIR%%/cgi-bin/printenv.wsf @(,,0400) %%WWWDIR%%/cgi-bin/test-cgi %%WWWDIR%%/error/HTTP_BAD_GATEWAY.html.var %%WWWDIR%%/error/HTTP_BAD_REQUEST.html.var