summaryrefslogtreecommitdiff
path: root/www/nginx/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'www/nginx/Makefile')
-rw-r--r--www/nginx/Makefile111
1 files changed, 45 insertions, 66 deletions
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 5df1d9d6be11..152a8d36b932 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= nginx
-PORTVERSION= 1.10.3
-PORTREVISION= 1
+PORTVERSION= 1.12.0
PORTEPOCH= 2
CATEGORIES= www
MASTER_SITES= http://nginx.org/download/
@@ -27,7 +26,6 @@ OPTIONS_DEFINE= \
DEBUG \
DEBUGLOG \
FILE_AIO \
- IPV6 \
GOOGLE_PERFTOOLS \
HTTP \
HTTP_ADDITION \
@@ -59,6 +57,7 @@ OPTIONS_DEFINE= \
NJS \
STREAM \
STREAM_SSL \
+ STREAM_SSL_PREREAD \
THREADS \
WWW \
AJP \
@@ -122,8 +121,6 @@ OPTIONS_DEFINE= \
SLOWFS_CACHE \
SMALL_LIGHT \
SRCACHE \
- STATSD \
- UDPLOG \
X11 \
XRID_HEADER \
XSS
@@ -132,7 +129,8 @@ OPTIONS_DEFAULT?=DSO FILE_AIO HTTP HTTP_ADDITION HTTP_AUTH_REQ HTTP_CACHE \
HTTP_DAV HTTP_FLV HTTP_GZIP_STATIC HTTP_GUNZIP_FILTER \
HTTP_MP4 HTTP_RANDOM_INDEX HTTP_REALIP HTTP_SECURE_LINK \
HTTP_SLICE HTTP_REWRITE HTTP_SSL HTTP_STATUS HTTP_SUB \
- HTTPV2 MAIL MAIL_SSL STREAM STREAM_SSL THREADS WWW
+ HTTPV2 MAIL MAIL_SSL STREAM STREAM_SSL STREAM_SSL_PREREAD \
+ THREADS WWW
DSO_DESC= Enable dynamic modules support
DEBUG_DESC= Build with debugging support
@@ -169,6 +167,7 @@ HTTPV2_DESC= Enable HTTP/2 protocol support (SSL req.)
NJS_DESC= Enable http_javascript module
STREAM_DESC= Enable stream module
STREAM_SSL_DESC= Enable stream_ssl module (SSL req.)
+STREAM_SSL_PREREAD_DESC= Enable stream_ssl_preread module (SSL req.)
THREADS_DESC= Enable threads support
WWW_DESC= Enable html sample files
AJP_DESC= 3rd party ajp module
@@ -232,8 +231,6 @@ SHIBBOLETH_DESC= 3rd party shibboleth module
SLOWFS_CACHE_DESC= 3rd party slowfs_cache module
SMALL_LIGHT_DESC= 3rd party small_light module
SRCACHE_DESC= 3rd party srcache module
-STATSD_DESC= 3rd party statsd module
-UDPLOG_DESC= 3rd party udplog (syslog) module
X11_DESC= graphics/ImageMagick[-nox11] dependency
XRID_HEADER_DESC= 3rd party x-rid header module
XSS_DESC= 3rd party xss module
@@ -310,11 +307,6 @@ CONFIGURE_ARGS+=--with-debug
CONFIGURE_ARGS+=--with-file-aio
.endif
-.if ${PORT_OPTIONS:MIPV6}
-CONFIGURE_ARGS+=--with-ipv6
-CATEGORIES+= ipv6
-.endif
-
.if ${PORT_OPTIONS:MGOOGLE_PERFTOOLS}
LIB_DEPENDS+= libprofiler.so:devel/google-perftools
CONFIGURE_ARGS+=--with-google_perftools_module
@@ -341,6 +333,7 @@ NGINX_ACCESSKEY_VERSION= 2.0.3
MASTER_SITES+= LOCAL/osa:accesskey
DISTFILES+= nginx-accesskey-${NGINX_ACCESSKEY_VERSION}.tar.gz:accesskey
CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx-accesskey-${NGINX_ACCESSKEY_VERSION}
+IGNORE= ACCESSKEY: a patch requires
.endif
.if ${PORT_OPTIONS:MHTTP_ADDITION}
@@ -356,14 +349,16 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_auth_digest}
.endif
.if ${PORT_OPTIONS:MHTTP_AUTH_KRB5}
-GIT_HTTP_AUTH_KRB5_VERSION= c85a38c
+GIT_HTTP_AUTH_KRB5_VERSION= 0c6ff3f
GH_ACCOUNT+= stnoonan:auth_krb5
GH_PROJECT+= spnego-http-auth-nginx-module:auth_krb5
GH_TAGNAME+= ${GIT_HTTP_AUTH_KRB5_VERSION}:auth_krb5
CONFIGURE_ARGS+=--add-module=${WRKSRC_auth_krb5}
-EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-spnego-http-auth-nginx-module-config
-# TODO: Provide optional dependence on Kerberos implementations from ports
-USES+= gssapi:base,flags
+#EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-spnego-http-auth-nginx-module-config
+#OPTIONS_RADIO+= GSSAPI
+#OPTIONS_RADIO_GSSAPI+= GSSAPI_HEIMDAL GSSAPI_MIT
+#GSSAPI_HEIMDAL_USES= gssapi:heimdal,flags
+#GSSAPI_MIT_USES= gssapi:mit
.endif
.if ${PORT_OPTIONS:MHTTP_AUTH_LDAP}
@@ -432,6 +427,7 @@ GH_PROJECT+= nginx-clojure:clojure
GH_TAGNAME+= v${NGINX_CLOJURE_VERSION}:clojure
CONFIGURE_ENV+= "JNI_INCS=-I${LOCALBASE}/openjdk8/include -I${LOCALBASE}/openjdk8/include/freebsd"
CONFIGURE_ARGS+=--add-module=${WRKSRC_clojure}/src/c
+EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src-c-ngx_http_clojure_socket.c
.endif
.if ${PORT_OPTIONS:MCT}
@@ -461,6 +457,7 @@ CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_echo}
.else
CONFIGURE_ARGS+=--add-module=${WRKSRC_echo}
.endif
+EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_echo_request_info.c
.endif
.if ${PORT_OPTIONS:MFASTDFS}
@@ -709,8 +706,8 @@ CONFIGURE_ARGS+=--with-http_sub_module
.endif
.if ${PORT_OPTIONS:MHTTP_UPLOAD}
-GIT_UPLOAD_VERSION= aba1e3f34c
-GH_ACCOUNT+= vkholodkov:upload
+GIT_UPLOAD_VERSION= 72ec037
+GH_ACCOUNT+= Austinb:upload
GH_PROJECT+= nginx-upload-module:upload
GH_TAGNAME+= ${GIT_UPLOAD_VERSION}:upload
CONFIGURE_ARGS+=--add-module=${WRKSRC_upload}
@@ -739,13 +736,14 @@ EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src-http-modules-ngx_http_upstream_hash_
.endif
.if !empty(PORT_OPTIONS:MHTTP_UPSTREAM_FAIR)
-NGINX_UPSTREAM_FAIR_VERSION= 20090923
-MASTER_SITES+= LOCAL/osa:upstreamfair
-DISTFILES+= nginx_upstream_fair-${NGINX_UPSTREAM_FAIR_VERSION}.tar.gz:upstreamfair
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx_upstream_fair-${NGINX_UPSTREAM_FAIR_VERSION}
-.if !empty(PORT_OPTIONS:MHTTP_UPSTREAM_CHECK)
-EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_upstream_fair_module.c
-.endif
+NGINX_UPSTREAM_FAIR_VERSION= b5be36f
+GH_ACCOUNT+= cryptofuture:upstreamfair
+GH_PROJECT+= nginx-upstream-fair:upstreamfair
+GH_TAGNAME+= ${NGINX_UPSTREAM_FAIR_VERSION}:upstreamfair
+CONFIGURE_ARGS+=--add-module=${WRKSRC_upstreamfair}
+#.if !empty(PORT_OPTIONS:MHTTP_UPSTREAM_CHECK)
+#EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_upstream_fair_module.c
+#.endif
.endif
.if ${PORT_OPTIONS:MHTTP_UPSTREAM_STICKY}
@@ -754,6 +752,7 @@ NGINX_UPSTREAM_STICKY_VERSION= 08a395c66e42
MASTER_SITES+= https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/:upstreamsticky
DISTFILES+= ${NGINX_UPSTREAM_STICKY_VERSION}.tar.gz:upstreamsticky
CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx-goodies-nginx-sticky-module-ng-${NGINX_UPSTREAM_STICKY_VERSION}/
+EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_sticky_misc.c
.endif
.if ${PORT_OPTIONS:MHTTP_VIDEO_THUMBEXTRACTOR}
@@ -779,8 +778,8 @@ CONFIGURE_ARGS+=--with-http_xslt_module
.endif
.if ${PORT_OPTIONS:MHTTP_ZIP}
-NGINX_ZIP_VERSION= ca0b345
-GH_ACCOUNT+= evanmiller:mod_zip
+NGINX_ZIP_VERSION= 74ef235
+GH_ACCOUNT+= anthonyryan1:mod_zip
GH_PROJECT+= mod_zip:mod_zip
GH_TAGNAME+= ${NGINX_ZIP_VERSION}:mod_zip
CONFIGURE_ARGS+=--add-module=${WRKDIR}/mod_zip-${NGINX_ZIP_VERSION}
@@ -795,7 +794,8 @@ GH_ACCOUNT+= openresty:drizzle
GH_PROJECT+= drizzle-nginx-module:drizzle
GH_TAGNAME+= v${NGINX_DRIZZLE_VERSION}:drizzle
CONFIGURE_ARGS+=--add-module=${WRKSRC_drizzle}
-EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-openresty-drizzle-nginx-module-config
+EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-openresty-drizzle-nginx-module-config \
+ ${PATCHDIR}/extra-patch-ngx_http_drizzle_upstream.c
.endif
.if ${PORT_OPTIONS:MDYNAMIC_UPSTREAM}
@@ -808,6 +808,7 @@ CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_dyn_upstream}
.else
CONFIGURE_ARGS+=--add-module=${WRKSRC_dyn_upstream}
.endif
+EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_inet_slab.c
.endif
.if ${PORT_OPTIONS:MARRAYVAR} || ${PORT_OPTIONS:MENCRYPTSESSION} || ${PORT_OPTIONS:MFORMINPUT} || ${PORT_OPTIONS:MICONV} || ${PORT_OPTIONS:MLUA} || ${PORT_OPTIONS:MSET_MISC}
@@ -847,7 +848,7 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_let}
LIB_DEPENDS+= libluajit-5.1.so:lang/luajit
CONFIGURE_ENV+= "LUAJIT_INC=${LOCALBASE}/include/luajit-2.0"
CONFIGURE_ENV+= "LUAJIT_LIB=${LOCALBASE}/lib"
-NGINX_LUA_VERSION= 0.10.7
+NGINX_LUA_VERSION= 0.10.8
GH_ACCOUNT+= openresty:lua
GH_PROJECT+= lua-nginx-module:lua
GH_TAGNAME+= v${NGINX_LUA_VERSION}:lua
@@ -856,6 +857,10 @@ CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_lua}
.else
CONFIGURE_ARGS+=--add-module=${WRKSRC_lua}
.endif
+EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_lua_common.h \
+ ${PATCHDIR}/extra-patch-ngx_http_lua_headers.c \
+ ${PATCHDIR}/extra-patch-ngx_http_lua_headers.h \
+ ${PATCHDIR}/extra-patch-ngx_http_lua_module.c
.endif
.if ${PORT_OPTIONS:MMEMC}
@@ -864,6 +869,7 @@ GH_ACCOUNT+= openresty:memc
GH_PROJECT+= memc-nginx-module:memc
GH_TAGNAME+= v${NGINX_MEMC_VERSION}:memc
CONFIGURE_ARGS+=--add-module=${WRKSRC_memc}
+EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_memc_util.c
.endif
.if ${PORT_OPTIONS:MMODSECURITY}
@@ -879,7 +885,8 @@ USES+= pkgconfig shebangfix
MASTER_SITES+= http://www.modsecurity.org/tarball/${NGINX_MODSECURITY_VERSION:S/RC/rc/}/:modsecurity
DISTFILES+= modsecurity-${NGINX_MODSECURITY_VERSION}.tar.gz:modsecurity
CONFIGURE_ARGS+=--add-module=${WRKDIR}/modsecurity-${NGINX_MODSECURITY_VERSION}/nginx/modsecurity
-EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-nginx-modsecurity-configure
+EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-nginx-modsecurity-configure \
+ ${PATCHDIR}/extra-patch-ngx_http_modsecurity.c
.endif
.if ${PORT_OPTIONS:MNAXSI}
@@ -922,7 +929,8 @@ GH_ACCOUNT+= FRiCKLE:postgres
GH_PROJECT+= ngx_postgres:postgres
GH_TAGNAME+= ${NGINX_POSTGRES_VERSION}:postgres
CONFIGURE_ARGS+=--add-module=${WRKSRC_postgres}
-EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_postgres-config
+EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_postgres-config \
+ ${PATCHDIR}/extra-patch-ngx_postgres_module.c
.endif
.if ${PORT_OPTIONS:MRDS_CSV}
@@ -947,6 +955,7 @@ GH_ACCOUNT+= openresty:redis2
GH_PROJECT+= redis2-nginx-module:redis2
GH_TAGNAME+= v${NGINX_REDIS2_VERSION}:redis2
CONFIGURE_ARGS+=--add-module=${WRKSRC_redis2}
+EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_redis2_util.c
.endif
.if ${PORT_OPTIONS:MRTMP}
@@ -1016,22 +1025,6 @@ GH_TAGNAME+= v${NGINX_SRCACHE_VERSION}:srcache
CONFIGURE_ARGS+=--add-module=${WRKSRC_srcache}
.endif
-.if ${PORT_OPTIONS:MSTATSD}
-NGINX_STATSD_VERSION= b756a12
-GH_ACCOUNT+= zebrafishlabs:statsd
-GH_PROJECT+= nginx-statsd:statsd
-GH_TAGNAME+= ${NGINX_STATSD_VERSION}:statsd
-CONFIGURE_ARGS+=--add-module=${WRKSRC_statsd}
-.endif
-
-.if ${PORT_OPTIONS:MUDPLOG}
-NGINX_UDPLOG_VERSION= 1.0.0
-MASTER_SITES+= http://www.grid.net.ru/nginx/download/:udplog
-DISTFILES+= nginx_udplog_module-${NGINX_UDPLOG_VERSION}.tar.gz:udplog
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx_udplog_module-${NGINX_UDPLOG_VERSION}
-EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_udplog_module.c
-.endif
-
.if ${PORT_OPTIONS:MXRID_HEADER}
GIT_XRID_VERSION= 0daa3cc
GH_ACCOUNT+= gabor:xrid
@@ -1057,7 +1050,7 @@ CONFIGURE_ARGS+=--with-http_v2_module
.if ${PORT_OPTIONS:MNJS}
GH_ACCOUNT+= nginx:njs
GH_PROJECT+= njs:njs
-GH_TAGNAME+= f7d2d6f:njs
+GH_TAGNAME+= 753ebe6:njs
.if !empty(PORT_OPTIONS:MDSO)
CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_njs}/nginx
.else
@@ -1075,6 +1068,9 @@ CONFIGURE_ARGS+=--with-stream
NGINX_OPENSSL= yes
USE_HTTP_SSL= yes
CONFIGURE_ARGS+=--with-stream_ssl_module
+.if ${PORT_OPTIONS:MSTREAM_SSL_PREREAD}
+CONFIGURE_ARGS+=--with-stream_ssl_preread_module
+.endif
.endif
.endif
@@ -1166,9 +1162,6 @@ GROUPS?=${WWWGRP}
.if defined(NGINX_OPENSSL)
USES+= ssl
-.if ${SSL_DEFAULT:Mopenssl-devel}
-BROKEN= Does not build with openssl-devel
-.endif
.endif
pre-everything::
@@ -1253,20 +1246,6 @@ post-patch:
's!%%PREFIX%%!${LOCALBASE}!g' \
${WRKDIR}/nginx-sflow-module-${NGINX_SFLOW_VERSION}/ngx_http_sflow_config.h
.endif
-.if ${PORT_OPTIONS:MSTATSD}
- @${REINPLACE_CMD} \
- 's!ngx_udp_connection_t!ngx_resolver_connection_t!g; \
- s!uc->connection!uc->udp!g; \
- s!e->udp_connection->connection!e->udp_connection->udp!g' \
- ${WRKSRC_statsd}/ngx_http_statsd.c
-.endif
-.if ${PORT_OPTIONS:MUDPLOG}
- @${REINPLACE_CMD} \
- 's!ngx_udp_connection_t!ngx_resolver_connection_t!g; \
- s!uc->connection!uc->udp!g; \
- s!e->udp_connection->connection!e->udp_connection->udp!g' \
- ${WRKDIR}/nginx_udplog_module-${NGINX_UDPLOG_VERSION}/ngx_http_udplog_module.c
-.endif
.if ${PORT_OPTIONS:MICONV}
@${REINPLACE_CMD} \
's!%%PREFIX%%!${LOCALBASE}!g' \
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-16 10:39:50 +0000