Index: head/www/nginx/Makefile =================================================================== --- head/www/nginx/Makefile (revision 439420) +++ head/www/nginx/Makefile (revision 439421) @@ -1,1376 +1,1355 @@ # Created by: Sergey A. Osokin # $FreeBSD$ PORTNAME= nginx -PORTVERSION= 1.10.3 -PORTREVISION= 1 +PORTVERSION= 1.12.0 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= http://nginx.org/download/ MASTER_SITES+= LOCAL/osa DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER?= osa@FreeBSD.org COMMENT?= Robust and small WWW server LICENSE= BSD2CLAUSE USES+= cpe CPE_VENDOR= nginx CPE_PRODUCT= nginx USE_GITHUB= nodefault NO_OPTIONS_SORT= yes OPTIONS_DEFINE= \ DSO \ DEBUG \ DEBUGLOG \ FILE_AIO \ - IPV6 \ GOOGLE_PERFTOOLS \ HTTP \ HTTP_ADDITION \ HTTP_AUTH_REQ \ HTTP_CACHE \ HTTP_DAV \ HTTP_FLV \ HTTP_GEOIP \ HTTP_GZIP_STATIC \ HTTP_GUNZIP_FILTER \ HTTP_IMAGE_FILTER \ HTTP_MP4 \ HTTP_PERL \ HTTP_RANDOM_INDEX \ HTTP_REALIP \ HTTP_REWRITE \ HTTP_SECURE_LINK \ HTTP_SLICE \ HTTP_SSL \ HTTP_STATUS \ HTTP_SUB \ HTTP_XSLT \ MAIL \ MAIL_IMAP \ MAIL_POP3 \ MAIL_SMTP \ MAIL_SSL \ HTTPV2 \ NJS \ STREAM \ STREAM_SSL \ + STREAM_SSL_PREREAD \ THREADS \ WWW \ AJP \ AWS_AUTH \ CACHE_PURGE \ CLOJURE \ CT \ ECHO \ FASTDFS \ HEADERS_MORE \ HTTP_ACCEPT_LANGUAGE \ HTTP_ACCESSKEY \ HTTP_AUTH_DIGEST \ HTTP_AUTH_KRB5 \ HTTP_AUTH_LDAP \ HTTP_AUTH_PAM \ HTTP_DAV_EXT \ HTTP_EVAL \ HTTP_FANCYINDEX \ HTTP_FOOTER \ HTTP_GEOIP2 \ HTTP_JSON_STATUS \ HTTP_MOGILEFS \ HTTP_MP4_H264 \ HTTP_NOTICE \ HTTP_PUSH \ HTTP_PUSH_STREAM \ HTTP_REDIS \ HTTP_RESPONSE \ HTTP_SUBS_FILTER \ HTTP_TARANTOOL \ HTTP_UPLOAD \ HTTP_UPLOAD_PROGRESS \ HTTP_UPSTREAM_CHECK \ HTTP_UPSTREAM_FAIR \ HTTP_UPSTREAM_STICKY \ HTTP_VIDEO_THUMBEXTRACTOR \ HTTP_ZIP \ ARRAYVAR \ BROTLI \ DRIZZLE \ DYNAMIC_UPSTREAM \ ENCRYPTSESSION \ FORMINPUT \ GRIDFS \ ICONV \ LET \ LUA \ MEMC \ MODSECURITY \ NAXSI \ PASSENGER \ POSTGRES \ RDS_CSV \ RDS_JSON \ REDIS2 \ RTMP \ SET_MISC \ SFLOW \ SHIBBOLETH \ SLOWFS_CACHE \ SMALL_LIGHT \ SRCACHE \ - STATSD \ - UDPLOG \ X11 \ XRID_HEADER \ XSS 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 DEBUGLOG_DESC= Enable debug log (--with-debug) FILE_AIO_DESC= Enable file aio GOOGLE_PERFTOOLS_DESC= Enable google perftools module HTTP_DESC= Enable HTTP module HTTP_ADDITION_DESC= Enable http_addition module HTTP_AUTH_REQ_DESC= Enable http_auth_request module HTTP_CACHE_DESC= Enable http_cache module HTTP_DAV_DESC= Enable http_webdav module HTTP_FLV_DESC= Enable http_flv module HTTP_GEOIP_DESC= Enable http_geoip module HTTP_GZIP_STATIC_DESC= Enable http_gzip_static module HTTP_GUNZIP_FILTER_DESC= Enable http_gunzip_filter module HTTP_IMAGE_FILTER_DESC= Enable http_image_filter module HTTP_MP4_DESC= Enable http_mp4 module HTTP_PERL_DESC= Enable http_perl module HTTP_RANDOM_INDEX_DESC= Enable http_random_index module HTTP_REALIP_DESC= Enable http_realip module HTTP_REWRITE_DESC= Enable http_rewrite module HTTP_SECURE_LINK_DESC= Enable http_secure_link module HTTP_SLICE_DESC= Enable http_slice module HTTP_SSL_DESC= Enable http_ssl module HTTP_STATUS_DESC= Enable http_stub_status module HTTP_SUB_DESC= Enable http_sub module HTTP_XSLT_DESC= Enable http_xslt module MAIL_DESC= Enable IMAP4/POP3/SMTP proxy module MAIL_IMAP_DESC= Enable IMAP4 proxy module MAIL_POP3_DESC= Enable POP3 proxy module MAIL_SMTP_DESC= Enable SMTP proxy module MAIL_SSL_DESC= Enable mail_ssl module 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 AWS_AUTH_DESC= 3rd party aws auth module CACHE_PURGE_DESC= 3rd party cache_purge module CLOJURE_DESC= 3rd party clojure module CT_DESC= 3rd party cert_transparency module (SSL req.) ECHO_DESC= 3rd party echo module FASTDFS_DESC= 3rd party fastdfs module HEADERS_MORE_DESC= 3rd party headers_more module HTTP_ACCEPT_LANGUAGE_DESC= 3rd party accept_language module HTTP_ACCESSKEY_DESC= 3rd party http_accesskey module HTTP_AUTH_DIGEST_DESC= 3rd party http_authdigest module HTTP_AUTH_KRB5_DESC= 3rd party http_auth_gss module HTTP_AUTH_LDAP_DESC= 3rd party http_auth_ldap module HTTP_AUTH_PAM_DESC= 3rd party http_auth_pam module HTTP_DAV_EXT_DESC= 3rd party webdav_ext module HTTP_EVAL_DESC= 3rd party eval module HTTP_FANCYINDEX_DESC= 3rd party http_fancyindex module HTTP_FOOTER_DESC= 3rd party http_footer module HTTP_GEOIP2_DESC= 3rd party geoip2 module HTTP_JSON_STATUS_DESC= 3rd party http_json_status module HTTP_MOGILEFS_DESC= 3rd party mogilefs module HTTP_MP4_H264_DESC= 3rd party mp4/h264 module HTTP_NOTICE_DESC= 3rd party notice module HTTP_PUSH_DESC= 3rd party push module HTTP_PUSH_STREAM_DESC= 3rd party push stream module HTTP_REDIS_DESC= 3rd party http_redis module HTTP_RESPONSE_DESC= 3rd party http_response module HTTP_SUBS_FILTER_DESC= 3rd party subs filter module HTTP_TARANTOOL_DESC= 3rd party tarantool upstream module HTTP_UPLOAD_DESC= 3rd party upload module HTTP_UPLOAD_PROGRESS_DESC= 3rd party uploadprogress module HTTP_UPSTREAM_CHECK_DESC= 3rd party upstream check module HTTP_UPSTREAM_FAIR_DESC= 3rd party upstream fair module HTTP_UPSTREAM_STICKY_DESC= 3rd party upstream sticky module HTTP_VIDEO_THUMBEXTRACTOR_DESC= 3rd party video_thumbextractor module HTTP_ZIP_DESC= 3rd party http_zip module ARRAYVAR_DESC= 3rd party array_var module BROTLI_DESC= 3rd party brotli module DRIZZLE_DESC= 3rd party drizzlie module DYNAMIC_UPSTREAM_DESC= 3rd party dynamic_upstream module ENCRYPTSESSION_DESC= 3rd party encrypted_session module FORMINPUT_DESC= 3rd party form_input module GRIDFS_DESC= 3rd party gridfs module ICONV_DESC= 3rd party iconv module LET_DESC= 3rd party let module LUA_DESC= 3rd party lua module MEMC_DESC= 3rd party memc (memcached) module MODSECURITY_DESC= 3rd party mod_security module NAXSI_DESC= 3rd party naxsi module PASSENGER_DESC= 3rd party passenger module POSTGRES_DESC= 3rd party postgres module RDS_CSV_DESC= 3rd party rds_csv module RDS_JSON_DESC= 3rd party rds_json module REDIS2_DESC= 3rd party redis2 module RTMP_DESC= 3rd party rtmp module SET_MISC_DESC= 3rd party set_misc module SFLOW_DESC= 3rd party sflow module 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 VIDEO_DESC= Video module support WANT_GNOME= yes .include .if ${PORT_OPTIONS:MX11} IMAGEMAGICK_LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick .else IMAGEMAGICK_LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick-nox11 .endif .if ${PORT_OPTIONS:MPASSENGER} CATEGORIES+= ruby USE_RUBY= yes BUILD_DEPENDS+= ${LOCALBASE}/bin/rake:devel/rubygem-rake RAKE_BIN= ${LOCALBASE}/bin/rake .endif NGINX_VARDIR?= /var NGINX_LOGDIR?= ${NGINX_VARDIR}/log/nginx NGINX_RUNDIR?= ${NGINX_VARDIR}/run NGINX_TMPDIR?= ${NGINX_VARDIR}/tmp/nginx HTTP_PORT?= 80 NGINX_ACCESSLOG?= ${NGINX_LOGDIR}/access.log NGINX_ERRORLOG?= ${NGINX_LOGDIR}/error.log CONFLICTS?= nginx-devel-1.* \ nginx-full-1.* \ nginx-lite-1.* \ nginx-naxsi-1.* USE_RC_SUBR= nginx SUB_FILES= pkg-message SUB_LIST+= WWWOWN=${WWWOWN} \ WWWGRP=${WWWGRP} \ NGINX_RUNDIR=${NGINX_RUNDIR} \ NGINX_TMPDIR=${NGINX_TMPDIR} \ PREFIX=${PREFIX} HAS_CONFIGURE= yes CONFIGURE_ARGS+=--prefix=${ETCDIR} \ --with-cc-opt="-I ${LOCALBASE}/include" \ --with-ld-opt="-L ${LOCALBASE}/lib" \ --conf-path=${ETCDIR}/nginx.conf \ --sbin-path=${PREFIX}/sbin/nginx \ --pid-path=${NGINX_RUNDIR}/nginx.pid \ --error-log-path=${NGINX_ERRORLOG} \ --user=${WWWOWN} --group=${WWWGRP} .if !empty(PORT_OPTIONS:MDSO) MODULESDIR= ${PREFIX}/libexec/${PORTNAME} CONFIGURE_ARGS+=--modules-path=${MODULESDIR} .endif .if empty(PORT_OPTIONS:MHTTP) && empty(PORT_OPTIONS:MMAIL) IGNORE= requires at least HTTP or MAIL to \ be defined. Please do 'make config' again .endif .if ${PORT_OPTIONS:MDEBUG} CFLAGS+= -g STRIP= #do not strip if nginx with debug information .endif .if ${PORT_OPTIONS:MDEBUGLOG} CONFIGURE_ARGS+=--with-debug .endif .if ${PORT_OPTIONS:MFILE_AIO} 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 .endif .if ${PORT_OPTIONS:MHTTP} CONFIGURE_ARGS+=--http-client-body-temp-path=${NGINX_TMPDIR}/client_body_temp \ --http-fastcgi-temp-path=${NGINX_TMPDIR}/fastcgi_temp \ --http-proxy-temp-path=${NGINX_TMPDIR}/proxy_temp \ --http-scgi-temp-path=${NGINX_TMPDIR}/scgi_temp \ --http-uwsgi-temp-path=${NGINX_TMPDIR}/uwsgi_temp \ --http-log-path=${NGINX_ACCESSLOG} .if ${PORT_OPTIONS:MHTTP_ACCEPT_LANGUAGE} GIT_ACCEPT_LANGUAGE_VERSION= 2f69842 GH_ACCOUNT+= giom:accept_language GH_PROJECT+= nginx_accept_language_module:accept_language GH_TAGNAME+= ${GIT_ACCEPT_LANGUAGE_VERSION}:accept_language CONFIGURE_ARGS+=--add-module=${WRKSRC_accept_language} .endif .if ${PORT_OPTIONS:MHTTP_ACCESSKEY} 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} CONFIGURE_ARGS+=--with-http_addition_module .endif .if ${PORT_OPTIONS:MHTTP_AUTH_DIGEST} GIT_AUTH_DIGEST_VERSION= cc61b4a GH_ACCOUNT+= atomx:auth_digest GH_PROJECT+= nginx-http-auth-digest:auth_digest GH_TAGNAME+= ${GIT_AUTH_DIGEST_VERSION}:auth_digest 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} # WWW: https://github.com/kvspb/nginx-auth-ldap GIT_HTTP_AUTH_LDAP_VERSION= dbcef31 GH_ACCOUNT+= kvspb:http_auth_ldap GH_PROJECT+= nginx-auth-ldap:http_auth_ldap GH_TAGNAME+= ${GIT_HTTP_AUTH_LDAP_VERSION}:http_auth_ldap .if !empty(PORT_OPTIONS:MDSO) CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_http_auth_ldap} .else CONFIGURE_ARGS+=--add-module=${WRKSRC_http_auth_ldap} .endif USE_OPENLDAP= yes .endif .if ${PORT_OPTIONS:MHTTP_AUTH_PAM} NGINX_AUTH_PAM_VERSION= 1.2 MASTER_SITES+= http://web.iti.upv.es/~sto/nginx/:auth_pam DISTFILES+= ngx_http_auth_pam_module-${NGINX_AUTH_PAM_VERSION}.tar.gz:auth_pam CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_http_auth_pam_module-${NGINX_AUTH_PAM_VERSION} .endif .if ${PORT_OPTIONS:MHTTP_AUTH_REQ} CONFIGURE_ARGS+=--with-http_auth_request_module .endif .if empty(PORT_OPTIONS:MHTTP_CACHE) CONFIGURE_ARGS+=--without-http-cache .endif .if ${PORT_OPTIONS:MAJP} NGINX_AJP_VERSION= bf6cd93 GH_ACCOUNT+= yaoweibin:ajp GH_PROJECT+= nginx_ajp_module:ajp GH_TAGNAME+= ${NGINX_AJP_VERSION}:ajp CONFIGURE_ARGS+=--add-module=${WRKSRC_ajp} .endif .if ${PORT_OPTIONS:MAWS_AUTH} NGINX_AWS_AUTH_VERSION= 1e62670 GH_ACCOUNT+= anomalizer:aws_auth GH_PROJECT+= ngx_aws_auth:aws_auth GH_TAGNAME+= ${NGINX_AWS_AUTH_VERSION}:aws_auth CONFIGURE_ARGS+=--add-module=${WRKSRC_aws_auth} .endif .if ${PORT_OPTIONS:MCACHE_PURGE} NGINX_CACHE_PURGE_VERSION= 2.3 MASTER_SITES+= http://labs.frickle.com/files/:cache_purge DISTFILES+= ngx_cache_purge-${NGINX_CACHE_PURGE_VERSION}.tar.gz:cache_purge CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_cache_purge-${NGINX_CACHE_PURGE_VERSION} .endif .if ${PORT_OPTIONS:MCLOJURE} CATEGORIES+= java USE_JAVA= yes JAVA_OS= native JAVA_VERSION= 1.8 JAVA_VENDOR= openjdk JAVA_BUILD= yes JAVA_RUN= yes NGINX_CLOJURE_VERSION= 0.4.4 GH_ACCOUNT+= nginx-clojure:clojure 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} GIT_CT_VERSION= 1.3.2 GH_ACCOUNT+= grahamedgecombe:ct GH_PROJECT+= nginx-ct:ct GH_TAGNAME+= v${GIT_CT_VERSION}:ct .if !empty(PORT_OPTIONS:MDSO) CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_ct} .else CONFIGURE_ARGS+=--add-module=${WRKSRC_ct} .endif NGINX_OPENSSL= yes USE_HTTP_SSL= yes .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100085 && ${SSL_DEFAULT} == base IGNORE= CT option requires OpenSSL 1.0.2, add DEFAULT_VERSIONS+=ssl=openssl to /etc/make.conf .endif .endif .if ${PORT_OPTIONS:MECHO} NGINX_ECHO_VERSION= 46334b3 GH_ACCOUNT+= openresty:echo GH_PROJECT+= echo-nginx-module:echo GH_TAGNAME+= ${NGINX_ECHO_VERSION}:echo .if !empty(PORT_OPTIONS:MDSO) 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} NGINX_FASTDFS_VERSION= 5a8110f GH_ACCOUNT+= happyfish100:fastdfs GH_PROJECT+= fastdfs-nginx-module:fastdfs GH_TAGNAME+= ${NGINX_FASTDFS_VERSION}:fastdfs EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-fastdfs-src-config BUILD_DEPENDS+= ${LOCALBASE}/include/fastcommon/logger.h:devel/libfastcommon \ ${LOCALBASE}/include/fastdfs/fdfs_client.h:ftp/fastdfs LIB_DEPENDS+= libfastcommon.so:devel/libfastcommon \ libfdfsclient.so:ftp/fastdfs CONFIGURE_ARGS+=--add-module=${WRKSRC_fastdfs}/src \ --with-cc-opt="-I ${LOCALBASE}/include/fastdfs \ -I ${LOCALBASE}/include/fastcommon" .endif .if ${PORT_OPTIONS:MHEADERS_MORE} NGINX_HEADERS_MORE_VERSION= 84241e4 GH_ACCOUNT+= openresty:headers_more GH_PROJECT+= headers-more-nginx-module:headers_more GH_TAGNAME+= ${NGINX_HEADERS_MORE_VERSION}:headers_more .if !empty(PORT_OPTIONS:MDSO) CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_headers_more} .else CONFIGURE_ARGS+=--add-module=${WRKSRC_headers_more} .endif .endif .if ${PORT_OPTIONS:MHTTP_DAV} || defined(USE_HTTP_DAV) CONFIGURE_ARGS+=--with-http_dav_module .endif .if ${PORT_OPTIONS:MHTTP_DAV_EXT} USE_HTTP_DAV= yes LIB_DEPENDS+= libexpat.so:textproc/expat2 NGINX_DAV_EXT_VERSION= 0.0.3 GH_ACCOUNT+= arut:dav_ext GH_PROJECT+= nginx-dav-ext-module:dav_ext GH_TAGNAME+= v${NGINX_DAV_EXT_VERSION}:dav_ext CONFIGURE_ARGS+=--add-module=${WRKSRC_dav_ext} .endif .if ${PORT_OPTIONS:MHTTP_EVAL} NGINX_EVAL_VERSION= 342c812 GH_ACCOUNT+= openresty:eval GH_PROJECT+= nginx-eval-module:eval GH_TAGNAME+= ${NGINX_EVAL_VERSION}:eval .if !empty(PORT_OPTIONS:MDSO) CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_eval} .else CONFIGURE_ARGS+=--add-module=${WRKSRC_eval} .endif .endif .if ${PORT_OPTIONS:MHTTP_FANCYINDEX} NGINX_FANCYINDEX_VERSION= 0.4.1 GH_ACCOUNT+= aperezdc:fancyindex GH_PROJECT+= ngx-fancyindex:fancyindex GH_TAGNAME+= v${NGINX_FANCYINDEX_VERSION}:fancyindex .if !empty(PORT_OPTIONS:MDSO) CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_fancyindex} .else CONFIGURE_ARGS+=--add-module=${WRKSRC_fancyindex} .endif .endif .if ${PORT_OPTIONS:MHTTP_FOOTER} NGINX_FOOTER_VERSION= 1.2.2 GH_ACCOUNT+= alibaba:footer GH_PROJECT+= nginx-http-footer-filter:footer GH_TAGNAME+= ${NGINX_FOOTER_VERSION}:footer CONFIGURE_ARGS+=--add-module=${WRKSRC_footer} .endif .if ${PORT_OPTIONS:MHTTP_GEOIP2} # WWW: https://github.com/leev/ngx_http_geoip2_module NGINX_HTTP_GEOIP2_VERSION= 2.0 GH_ACCOUNT+= leev:geoip2 GH_PROJECT+= ngx_http_geoip2_module:geoip2 GH_TAGNAME+= ${NGINX_HTTP_GEOIP2_VERSION}:geoip2 CFLAGS+= "-I${LOCALBASE}/include" .if !empty(PORT_OPTIONS:MDSO) CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_geoip2} .else CONFIGURE_ARGS+=--add-module=${WRKSRC_geoip2} .endif LIB_DEPENDS+= libmaxminddb.so:net/libmaxminddb .endif .if ${PORT_OPTIONS:MHTTP_FLV} CONFIGURE_ARGS+=--with-http_flv_module .endif .if ${PORT_OPTIONS:MHTTP_JSON_STATUS} NGINX_JSON_STATUS_VERSION= 1d2f303 GH_ACCOUNT+= nginx-modules:json_status GH_PROJECT+= ngx_http_json_status_module:json_status GH_TAGNAME+= ${NGINX_JSON_STATUS_VERSION}:json_status CONFIGURE_ARGS+=--add-module=${WRKSRC_json_status} .endif .if ${PORT_OPTIONS:MHTTP_GEOIP} .if !empty(PORT_OPTIONS:MDSO) CONFIGURE_ARGS+=--with-http_geoip_module=dynamic .else CONFIGURE_ARGS+=--with-http_geoip_module .endif LIB_DEPENDS+= libGeoIP.so:net/GeoIP .endif .if ${PORT_OPTIONS:MHTTP_GZIP_STATIC} CONFIGURE_ARGS+=--with-http_gzip_static_module .endif .if ${PORT_OPTIONS:MHTTP_GUNZIP_FILTER} CONFIGURE_ARGS+=--with-http_gunzip_module .endif .if ${PORT_OPTIONS:MHTTP_IMAGE_FILTER} LIB_DEPENDS+= libgd.so:graphics/gd .if !empty(PORT_OPTIONS:MDSO) CONFIGURE_ARGS+=--with-http_image_filter_module=dynamic .else CONFIGURE_ARGS+=--with-http_image_filter_module .endif .endif .if ${PORT_OPTIONS:MHTTP_MP4} CONFIGURE_ARGS+=--with-http_mp4_module .endif .if ${PORT_OPTIONS:MHTTP_MOGILEFS} NGINX_MOGILEFS_VERSION= 1.0.4 MASTER_SITES+= http://www.grid.net.ru/nginx/download/:mogilefs DISTFILES+= nginx_mogilefs_module-${NGINX_MOGILEFS_VERSION}.tar.gz:mogilefs CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx_mogilefs_module-${NGINX_MOGILEFS_VERSION} EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_mogilefs_module.c .endif .if ${PORT_OPTIONS:MHTTP_MP4_H264} NGINX_H264_VERSION= 2.2.7 MASTER_SITES+= http://h264.code-shop.com/download/:mp4streaming DISTFILES+= nginx_mod_h264_streaming-${NGINX_H264_VERSION}.tar.gz:mp4streaming CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx_mod_h264_streaming-${NGINX_H264_VERSION} EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_streaming_module.c .endif .if ${PORT_OPTIONS:MHTTP_NOTICE} GIT_NOTICE_VERSION= 3c95966 GH_ACCOUNT+= kr:notice GH_PROJECT+= nginx-notice:notice GH_TAGNAME+= ${GIT_NOTICE_VERSION}:notice CONFIGURE_ARGS+=--add-module=${WRKSRC_notice} EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_notice_module.c .endif .if ${PORT_OPTIONS:MHTTP_PERL} CATEGORIES+= perl5 .if !empty(PORT_OPTIONS:MDSO) CONFIGURE_ARGS+=--with-http_perl_module=dynamic .else CONFIGURE_ARGS+=--with-http_perl_module .endif USES+= perl5 .endif .if ${PORT_OPTIONS:MHTTP_PUSH} GIT_PUSH_VERSION= 0.99.16 GH_ACCOUNT+= slact:push GH_PROJECT+= nchan:push GH_TAGNAME+= v${GIT_PUSH_VERSION}:push CONFIGURE_ARGS+=--add-module=${WRKSRC_push} .endif .if ${PORT_OPTIONS:MHTTP_PUSH_STREAM} NGINX_PUSH_STREAM_VERSION= 0.5.1 GH_ACCOUNT+= wandenberg:pushstream GH_PROJECT+= nginx-push-stream-module:pushstream GH_TAGNAME+= ${NGINX_PUSH_STREAM_VERSION}:pushstream CONFIGURE_ARGS+=--add-module=${WRKSRC_pushstream} .endif .if ${PORT_OPTIONS:MHTTP_RANDOM_INDEX} CONFIGURE_ARGS+=--with-http_random_index_module .endif .if ${PORT_OPTIONS:MHTTP_REALIP} CONFIGURE_ARGS+=--with-http_realip_module .endif .if ${PORT_OPTIONS:MHTTP_REDIS} NGINX_REDIS_VERSION= 0.3.8 MASTER_SITES+= LOCAL/osa:redis DISTFILES+= ngx_http_redis-${NGINX_REDIS_VERSION}.tar.gz:redis .if !empty(PORT_OPTIONS:MDSO) CONFIGURE_ARGS+=--add-dynamic-module=${WRKDIR}/ngx_http_redis-${NGINX_REDIS_VERSION} .else CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_http_redis-${NGINX_REDIS_VERSION} .endif .endif .if ${PORT_OPTIONS:MHTTP_RESPONSE} NGINX_RESPONSE_VERSION= 0.3 MASTER_SITES+= http://catap.ru/downloads/nginx/:response DISTFILES+= ngx_http_response-${NGINX_RESPONSE_VERSION}.tar.gz:response CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_http_response-${NGINX_RESPONSE_VERSION} .endif .if ${PORT_OPTIONS:MHTTP_SUBS_FILTER} NGINX_HTTP_SUBS_FILTER_VERSION= 0.6.4 GH_ACCOUNT+= yaoweibin:subs_filter GH_PROJECT+= ngx_http_substitutions_filter_module:subs_filter GH_TAGNAME+= v${NGINX_HTTP_SUBS_FILTER_VERSION}:subs_filter CONFIGURE_ARGS+=--add-module=${WRKSRC_subs_filter} .endif .if ${PORT_OPTIONS:MHTTP_TARANTOOL} LIB_DEPENDS+= libmsgpuck.so:devel/msgpuck \ libyajl.so:devel/yajl GH_ACCOUNT+= tarantool:nginx_tarantool GH_PROJECT+= nginx_upstream_module:nginx_tarantool GH_TAGNAME+= 1278ee5:nginx_tarantool .if !empty(PORT_OPTIONS:MDSO) CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_nginx_tarantool} .else CONFIGURE_ARGS+=--add-module=${WRKSRC_nginx_tarantool} .endif EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_tarantool-config .endif .if ${PORT_OPTIONS:MHTTP_SECURE_LINK} CONFIGURE_ARGS+=--with-http_secure_link_module .endif .if ${PORT_OPTIONS:MHTTP_SLICE} CONFIGURE_ARGS+=--with-http_slice_module .endif .if ${PORT_OPTIONS:MHTTP_STATUS} CONFIGURE_ARGS+=--with-http_stub_status_module .endif .if ${PORT_OPTIONS:MHTTP_SUB} 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} .endif .if ${PORT_OPTIONS:MHTTP_UPLOAD_PROGRESS} NGINX_UPLOADPROGRESS_VERSION= 0.9.0 GH_ACCOUNT+= masterzen:uploadprogress GH_PROJECT+= nginx-upload-progress-module:uploadprogress GH_TAGNAME+= v${NGINX_UPLOADPROGRESS_VERSION}:uploadprogress CONFIGURE_ARGS+=--add-module=${WRKSRC_uploadprogress} .endif .if !empty(PORT_OPTIONS:MHTTP_UPSTREAM_CHECK) # WWW: https://github.com/yaoweibin/nginx_upstream_check_module NGINX_UPSTREAM_CHECK_VERSION= 10782ea GH_ACCOUNT+= yaoweibin:upstreamcheck GH_PROJECT+= nginx_upstream_check_module:upstreamcheck GH_TAGNAME+= ${NGINX_UPSTREAM_CHECK_VERSION}:upstreamcheck CONFIGURE_ARGS+=--add-module=${WRKSRC_upstreamcheck} EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src-http-modules-ngx_http_upstream_hash_module.c \ ${PATCHDIR}/extra-patch-src-http-modules-ngx_http_upstream_ip_hash_module.c \ ${PATCHDIR}/extra-patch-src-http-modules-ngx_http_upstream_least_conn_module.c \ ${PATCHDIR}/extra-patch-src-http-ngx_http_upstream_round_robin.c \ ${PATCHDIR}/extra-patch-src-http-ngx_http_upstream_round_robin.h .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 +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 -.endif .if ${PORT_OPTIONS:MHTTP_UPSTREAM_STICKY} USE_HTTP_SSL= yes 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} NGINX_VIDEO_THUMBEXTRACTOR_VERSION= 0.7.0 LIB_DEPENDS+= libavformat.so:multimedia/ffmpeg \ libavcodec.so:multimedia/ffmpeg \ libavutil.so:multimedia/ffmpeg \ libswscale.so:multimedia/ffmpeg USES+= jpeg GH_ACCOUNT+= wandenberg:vte GH_PROJECT+= nginx-video-thumbextractor-module:vte GH_TAGNAME+= ${NGINX_VIDEO_THUMBEXTRACTOR_VERSION}:vte CONFIGURE_ARGS+=--add-module=${WRKSRC_vte} .endif .if ${PORT_OPTIONS:MHTTP_XSLT} USE_GNOME+= libxml2 libxslt .if !empty(PORT_OPTIONS:MDSO) CONFIGURE_ARGS+=--with-http_xslt_module=dynamic .else CONFIGURE_ARGS+=--with-http_xslt_module .endif .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} .endif .if ${PORT_OPTIONS:MDRIZZLE} LIB_DEPENDS+= libdrizzle.so:databases/libdrizzle CONFIGURE_ENV+= "LIBDRIZZLE_INC=${LOCALBASE}/include" CONFIGURE_ENV+= "LIBDRIZZLE_LIB=${LOCALBASE}/lib" NGINX_DRIZZLE_VERSION= 0.1.9 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} NGINX_DYNAMIC_UPSTREAM_VERSION= 0.1.3 GH_ACCOUNT+= cubicdaiya:dyn_upstream GH_PROJECT+= ngx_dynamic_upstream:dyn_upstream GH_TAGNAME+= v${NGINX_DYNAMIC_UPSTREAM_VERSION}:dyn_upstream .if !empty(PORT_OPTIONS:MDSO) 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} NGINX_DEVEL_KIT_VERSION= 0.3.0 GH_ACCOUNT+= simpl:devel_kit GH_PROJECT+= ngx_devel_kit:devel_kit GH_TAGNAME+= v${NGINX_DEVEL_KIT_VERSION}:devel_kit CONFIGURE_ARGS+=--add-module=${WRKSRC_devel_kit} .endif .if ${PORT_OPTIONS:MENCRYPTSESSION} NGINX_ENCRYPTSESSION_VERSION= 0.06 GH_ACCOUNT+= openresty:encryptsession GH_PROJECT+= encrypted-session-nginx-module:encryptsession GH_TAGNAME+= v${NGINX_ENCRYPTSESSION_VERSION}:encryptsession CONFIGURE_ARGS+=--add-module=${WRKSRC_encryptsession} .endif .if ${PORT_OPTIONS:MGRIDFS} NGINX_GRIDFS_VERSION= 0.8 MONGO_C_DRIVER_VERSION= 0.3.1 GH_ACCOUNT+= mdirolf:gridfs mongodb:mongo_c GH_PROJECT+= nginx-gridfs:gridfs mongo-c-driver:mongo_c GH_TAGNAME+= v${NGINX_GRIDFS_VERSION}:gridfs v${MONGO_C_DRIVER_VERSION}:mongo_c CONFIGURE_ARGS+=--add-module=${WRKSRC_gridfs} .endif .if ${PORT_OPTIONS:MLET} NGINX_LET_VERSION= 0.0.4 GH_ACCOUNT+= arut:let GH_PROJECT+= nginx-let-module:let GH_TAGNAME+= v${NGINX_LET_VERSION}:let CONFIGURE_ARGS+=--add-module=${WRKSRC_let} .endif .if ${PORT_OPTIONS:MLUA} 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 .if !empty(PORT_OPTIONS:MDSO) 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} NGINX_MEMC_VERSION= 0.17 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} NGINX_MODSECURITY_VERSION= 2.9.1 LIB_DEPENDS+= libapr-1.so:devel/apr1 \ libcurl.so:ftp/curl \ libluajit-5.1.so:lang/luajit \ libpcre.so:devel/pcre \ libyajl.so:devel/yajl USE_APACHE= 22+ USE_GNOME+= libxml2 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} NGINX_NAXSI_VERSION= 0.54 GH_ACCOUNT+= nbs-system:naxsi GH_PROJECT+= naxsi:naxsi GH_TAGNAME+= ${NGINX_NAXSI_VERSION}:naxsi CONFIGURE_ARGS+=--add-module=${WRKDIR}/naxsi-${NGINX_NAXSI_VERSION}/naxsi_src .endif .if ${PORT_OPTIONS:MHTTP_REWRITE} || defined(USE_HTTP_REWRITE) LIB_DEPENDS+= libpcre.so:devel/pcre CONFIGURE_ARGS+=--with-pcre .else PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-nopcre CONFIGURE_ARGS+=--without-http_rewrite_module \ --without-pcre .endif .if ${PORT_OPTIONS:MPASSENGER} PASSENGER_VERSION= 5.1.2 MASTER_SITES+= http://s3.amazonaws.com/phusion-passenger/releases/:passenger DISTFILES+= passenger-${PASSENGER_VERSION}.tar.gz:passenger .if !empty(PORT_OPTIONS:MDSO) CONFIGURE_ARGS+=--add-dynamic-module=${WRKDIR}/passenger-${PASSENGER_VERSION}/src/nginx_module .else CONFIGURE_ARGS+=--add-module=${WRKDIR}/passenger-${PASSENGER_VERSION}/src/nginx_module .endif EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-passenger-build-nginx.rb .if empty(PORT_OPTIONS:MDEBUG) CONFIGURE_ENV+= OPTIMIZE="yes" CFLAGS+= -DNDEBUG .endif .endif .if ${PORT_OPTIONS:MPOSTGRES} USES+= pgsql NGINX_POSTGRES_VERSION= 1.0rc7 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} NGINX_RDS_CSV_VERSION= 0.07 GH_ACCOUNT+= openresty:rdscsv GH_PROJECT+= rds-csv-nginx-module:rdscsv GH_TAGNAME+= v${NGINX_RDS_CSV_VERSION}:rdscsv CONFIGURE_ARGS+=--add-module=${WRKSRC_rdscsv} .endif .if ${PORT_OPTIONS:MRDS_JSON} NGINX_RDS_JSON_VERSION= 0.14 GH_ACCOUNT+= openresty:rdsjson GH_PROJECT+= rds-json-nginx-module:rdsjson GH_TAGNAME+= v${NGINX_RDS_JSON_VERSION}:rdsjson CONFIGURE_ARGS+=--add-module=${WRKSRC_rdsjson} .endif .if ${PORT_OPTIONS:MREDIS2} NGINX_REDIS2_VERSION= 0.12 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} NGINX_RTMP_VERSION= 1.1.8 GH_ACCOUNT+= arut:rtmp GH_PROJECT+= nginx-rtmp-module:rtmp GH_TAGNAME+= v${NGINX_RTMP_VERSION}:rtmp CONFIGURE_ARGS+=--add-module=${WRKSRC_rtmp} .endif .if ${PORT_OPTIONS:MSET_MISC} NGINX_SET_MISC_VERSION= f808ef4 GH_ACCOUNT+= openresty:setmisc GH_PROJECT+= set-misc-nginx-module:setmisc GH_TAGNAME+= ${NGINX_SET_MISC_VERSION}:setmisc .if !empty(PORT_OPTIONS:MDSO) CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_setmisc} .else CONFIGURE_ARGS+=--add-module=${WRKSRC_setmisc} .endif .endif .if ${PORT_OPTIONS:MSFLOW} NGINX_SFLOW_VERSION= 543c72a GH_ACCOUNT+= sflow:sflow GH_PROJECT+= nginx-sflow-module:sflow GH_TAGNAME+= ${NGINX_SFLOW_VERSION}:sflow EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_sflow_config.c \ ${PATCHDIR}/extra-patch-ngx_http_sflow_config.h \ ${PATCHDIR}/extra-patch-ngx_http_sflow_module.c .endif .if ${PORT_OPTIONS:MSHIBBOLETH} GIT_SHIBBOLETH_VERSION= 4f1119b GH_ACCOUNT+= nginx-shib:shib GH_PROJECT+= nginx-http-shibboleth:shib GH_TAGNAME+= ${GIT_SHIBBOLETH_VERSION}:shib CONFIGURE_ARGS+=--add-module=${WRKSRC_shib} .endif .if ${PORT_OPTIONS:MSLOWFS_CACHE} NGINX_SLOWFS_CACHE_VERSION= 1.10 MASTER_SITES+= http://labs.frickle.com/files/:slowfs_cache DISTFILES+= ngx_slowfs_cache-${NGINX_SLOWFS_CACHE_VERSION}.tar.gz:slowfs_cache CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_slowfs_cache-${NGINX_SLOWFS_CACHE_VERSION} .endif .if ${PORT_OPTIONS:MSMALL_LIGHT} NGINX_SMALL_LIGHT_VERSION= 0.8.0 LIB_DEPENDS+= ${IMAGEMAGICK_LIB_DEPENDS} \ libpcre.so:devel/pcre GH_ACCOUNT+= cubicdaiya:small_light GH_PROJECT+= ngx_small_light:small_light GH_TAGNAME+= v${NGINX_SMALL_LIGHT_VERSION}:small_light .if !empty(PORT_OPTIONS:MDSO) CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_small_light} .else CONFIGURE_ARGS+=--add-module=${WRKSRC_small_light} .endif .endif .if ${PORT_OPTIONS:MSRCACHE} NGINX_SRCACHE_VERSION= 0.30 GH_ACCOUNT+= openresty:srcache GH_PROJECT+= srcache-nginx-module:srcache 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 GH_PROJECT+= nginx-x-rid-header:xrid GH_TAGNAME+= ${GIT_XRID_VERSION}:xrid CONFIGURE_ARGS+=--add-module=${WRKSRC_xrid} .endif .if ${PORT_OPTIONS:MXSS} NGINX_XSS_VERSION= 0.05 GH_ACCOUNT+= openresty:xss GH_PROJECT+= xss-nginx-module:xss GH_TAGNAME+= v${NGINX_XSS_VERSION}:xss CONFIGURE_ARGS+=--add-module=${WRKSRC_xss} .endif .if ${PORT_OPTIONS:MHTTPV2} NGINX_OPENSSL= yes USE_HTTP_SSL= yes CONFIGURE_ARGS+=--with-http_v2_module .endif .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 CONFIGURE_ARGS+=--add-module=${WRKSRC_njs}/nginx .endif .endif .if ${PORT_OPTIONS:MSTREAM} .if !empty(PORT_OPTIONS:MDSO) CONFIGURE_ARGS+=--with-stream=dynamic .else CONFIGURE_ARGS+=--with-stream .endif .if ${PORT_OPTIONS:MSTREAM_SSL} 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 .if ${PORT_OPTIONS:MTHREADS} CONFIGURE_ARGS+=--with-threads .endif .if ${PORT_OPTIONS:MWWW} PLIST_SUB+= WWWDATA="" .else PLIST_SUB+= WWWDATA="@comment " .endif .else CONFIGURE_ARGS+=--without-http PLIST_SUB+= WWWDATA="@comment " .endif # WITH_HTTP .if ${PORT_OPTIONS:MMAIL} .if !empty(PORT_OPTIONS:MDSO) CONFIGURE_ARGS+=--with-mail=dynamic .else CONFIGURE_ARGS+=--with-mail .endif .if empty(PORT_OPTIONS:MMAIL_IMAP) CONFIGURE_ARGS+=--without-mail_imap_module .endif .if empty(PORT_OPTIONS:MMAIL_POP3) CONFIGURE_ARGS+=--without-mail_pop3_module .endif .if empty(PORT_OPTIONS:MMAIL_SMTP) CONFIGURE_ARGS+=--without-mail_smtp_module .endif .if ${PORT_OPTIONS:MMAIL_SSL} NGINX_OPENSSL= yes CONFIGURE_ARGS+=--with-mail_ssl_module .endif .endif # WITH_MAIL .if ${PORT_OPTIONS:MHTTP_SSL} || defined(USE_HTTP_SSL) NGINX_OPENSSL= yes CONFIGURE_ARGS+=--with-http_ssl_module .endif .if ${PORT_OPTIONS:MARRAYVAR} NGINX_ARRAYVAR_VERSION= 0.05 GH_ACCOUNT+= openresty:arrayvar GH_PROJECT+= array-var-nginx-module:arrayvar GH_TAGNAME+= v${NGINX_ARRAYVAR_VERSION}:arrayvar CONFIGURE_ARGS+=--add-module=${WRKSRC_arrayvar} .endif .if ${PORT_OPTIONS:MBROTLI} NGINX_BROTLI_VERSION= ada972b LIB_DEPENDS+= libbrotlidec.so:devel/libbrotli \ libbrotlienc.so:devel/libbrotli GH_ACCOUNT+= google:brotli GH_PROJECT+= ngx_brotli:brotli GH_TAGNAME+= ${NGINX_BROTLI_VERSION}:brotli .if !empty(PORT_OPTIONS:MDSO) CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_brotli} .else CONFIGURE_ARGS+=--add-module=${WRKSRC_brotli} .endif .endif .if ${PORT_OPTIONS:MFORMINPUT} NGINX_FORMINPUT_VERSION= 0.12 GH_ACCOUNT+= calio:forminput GH_PROJECT+= form-input-nginx-module:forminput GH_TAGNAME+= v${NGINX_FORMINPUT_VERSION}:forminput CONFIGURE_ARGS+=--add-module=${WRKSRC_forminput} .endif .if ${PORT_OPTIONS:MICONV} USES+= iconv NGINX_ICONV_VERSION= 0.14 GH_ACCOUNT+= calio:iconv GH_PROJECT+= iconv-nginx-module:iconv GH_TAGNAME+= v${NGINX_ICONV_VERSION}:iconv CONFIGURE_ARGS+=--add-module=${WRKSRC_iconv} EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-calio-iconv-nginx-module-config .endif PLIST_SUB+= NGINX_TMPDIR=${NGINX_TMPDIR} NGINX_LOGDIR=${NGINX_LOGDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} USERS?= ${WWWOWN} GROUPS?=${WWWGRP} .if defined(NGINX_OPENSSL) USES+= ssl -.if ${SSL_DEFAULT:Mopenssl-devel} -BROKEN= Does not build with openssl-devel .endif -.endif pre-everything:: @${ECHO_MSG} .if ${PORT_OPTIONS:MHTTP_UPSTREAM_FAIR} @${ECHO_MSG} "Enable http_ssl module to build upstream_fair with SSL support" .endif .if ${PORT_OPTIONS:MPASSENGER} @${ECHO_MSG} "This port install Passenger module only" .endif @${ECHO_MSG} post-extract: .if ${PORT_OPTIONS:MGRIDFS} @${RMDIR} ${WRKSRC_gridfs}/mongo-c-driver/ @${MV} ${WRKSRC_mongo_c} ${WRKSRC_gridfs}/mongo-c-driver .endif post-patch: @${REINPLACE_CMD} 's!%%HTTP_PORT%%!${HTTP_PORT}!; \ s!%%PREFIX%%!${PREFIX}!; \ s!%%NGINX_ERRORLOG%%!${NGINX_ERRORLOG}!' \ ${WRKSRC}/conf/nginx.conf .if ${PORT_OPTIONS:MHTTP_ACCESSKEY} @${REINPLACE_CMD} \ '128s!NGX_OK!NGX_DECLINED!' \ ${WRKDIR}/nginx-accesskey-${NGINX_ACCESSKEY_VERSION}/ngx_http_accesskey_module.c .endif .if ${PORT_OPTIONS:MHTTP_AUTH_KRB5} @${REINPLACE_CMD} \ 's!%%GSSAPILIBS%%!${GSSAPILIBS}!' \ ${WRKSRC_auth_krb5}/config .endif .if ${PORT_OPTIONS:MHTTP_ACCESSKEY} @${REINPLACE_CMD} \ 's!$$HTTP_ACCESSKEY_MODULE!ngx_http_accesskey_module!' \ ${WRKDIR}/nginx-accesskey-${NGINX_ACCESSKEY_VERSION}/config .endif # linker error acquire if --std=c99 defined, add "static" to inline function .if ${PORT_OPTIONS:MHTTP_ZIP} @${REINPLACE_CMD} \ 's!^inline!static inline!' \ ${WRKDIR}/mod_zip-${NGINX_ZIP_VERSION}/ngx_http_zip_parsers.* .endif .if ${PORT_OPTIONS:MDRIZZLE} @${REINPLACE_CMD} \ 's!%%PREFIX%%!${LOCALBASE}!g' \ ${WRKSRC_drizzle}/config .endif .if ${PORT_OPTIONS:MFASTDFS} @${REINPLACE_CMD} \ 's!%%PREFIX%%!${PREFIX}!g; \ s!%%LOCALBASE%%!${LOCALBASE}!g' \ ${WRKSRC_fastdfs}/src/config .endif # Respect CFLAGS by remove needless --std=c99 flag .if ${PORT_OPTIONS:MGRIDFS} @${REINPLACE_CMD} \ 's!--std=c99!-DMONGO_HAVE_STDINT!' \ ${WRKSRC_gridfs}/config .endif .if ${PORT_OPTIONS:MPASSENGER} @${REINPLACE_CMD} \ '177,179s!true!false!' \ ${WRKDIR}/passenger-${PASSENGER_VERSION}/build/basics.rb @${REINPLACE_CMD} \ 's!-I/usr/include/libev!!; \ s!-lev!!; \ s!-Iext/libev!!; \ s!-I/usr/include/libeio!!; \ s!-leio!!; \ s!-Iext/libeio!!' \ ${WRKDIR}/passenger-${PASSENGER_VERSION}/build/common_library.rb .endif .if ${PORT_OPTIONS:MPOSTGRES} @${REINPLACE_CMD} \ 's!%%PREFIX%%!${LOCALBASE}!g' \ ${WRKSRC_postgres}/config .endif .if ${PORT_OPTIONS:MSFLOW} @${REINPLACE_CMD} \ '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' \ ${WRKSRC_iconv}/config .endif .if ${PORT_OPTIONS:MMODSECURITY} @${REINPLACE_CMD} \ 's!%%PREFIX%%!${LOCALBASE}!g' \ ${WRKDIR}/modsecurity-${NGINX_MODSECURITY_VERSION}/configure .endif .if ${PORT_OPTIONS:MHTTP_TARANTOOL} @${REINPLACE_CMD} \ 's!%%PREFIX%%!${LOCALBASE}!g' \ ${WRKSRC_nginx_tarantool}/config .endif pre-configure: .if ${PORT_OPTIONS:MMODSECURITY} ( cd ${WRKDIR}/modsecurity-${NGINX_MODSECURITY_VERSION} && \ CC="${CC}" ${CONFIGURE_CMD} --enable-standalone-module \ --with-pcre=${LOCALBASE} --with-yajl=${LOCALBASE} \ --with-curl=${LOCALBASE} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ) .endif .if ${PORT_OPTIONS:MSMALL_LIGHT} ( cd ${WRKSRC_small_light} && ./setup ) .endif do-build: @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} do-install: ${MKDIR} ${STAGEDIR}${ETCDIR} .if !empty(PORT_OPTIONS:MDSO) ${MKDIR} ${STAGEDIR}${MODULESDIR} .endif ${MKDIR} ${STAGEDIR}${NGINX_TMPDIR} ${MKDIR} ${STAGEDIR}${NGINX_LOGDIR} ${INSTALL_PROGRAM} ${WRKSRC}/objs/nginx ${STAGEDIR}${PREFIX}/sbin .for i in koi-utf koi-win win-utf ${INSTALL_DATA} ${WRKSRC}/conf/${i} ${STAGEDIR}${ETCDIR} .endfor .for i in fastcgi_params mime.types scgi_params uwsgi_params ${INSTALL_DATA} ${WRKSRC}/conf/${i} ${STAGEDIR}${ETCDIR}/${i}-dist .endfor .if !empty(PORT_OPTIONS:MHTTP) && !empty(PORT_OPTIONS:MWWW) ${MKDIR} ${STAGEDIR}${PREFIX}/www/nginx-dist .for i in index.html 50x.html ${INSTALL_DATA} ${WRKSRC}/html/${i} ${STAGEDIR}${PREFIX}/www/nginx-dist .endfor ${ECHO_CMD} "" >>${STAGEDIR}${PREFIX}/www/nginx-dist/EXAMPLE_DIRECTORY-DONT_ADD_OR_TOUCH_ANYTHING .endif .if !empty(PORT_OPTIONS:MHTTP) && !empty(PORT_OPTIONS:MHTTP_PERL) ${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/nginx ${INSTALL_PROGRAM} ${WRKSRC}/objs/src/http/modules/perl/blib/arch/auto/nginx/nginx.so \ ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/nginx ${INSTALL_DATA} ${WRKSRC}/objs/src/http/modules/perl/blib/lib/nginx.pm \ ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/ .endif .if ${PORT_OPTIONS:MFASTDFS} ${MKDIR} ${STAGEDIR}${PREFIX}/etc/fdfs ${INSTALL_DATA} ${WRKSRC_fastdfs}/src/mod_fastdfs.conf ${STAGEDIR}${PREFIX}/etc/fdfs/mod_fastdfs.conf.sample .endif # Install dynamic modules .if !empty(PORT_OPTIONS:MDSO) (cd ${WRKSRC}/objs/ && ${FIND} . -name '*.so' -maxdepth 1 -type f \ -exec ${INSTALL_PROGRAM} {} ${STAGEDIR}${MODULESDIR} \;) .endif .if ${PORT_OPTIONS:MNAXSI} ${INSTALL_DATA} \ ${WRKDIR}/naxsi-${NGINX_NAXSI_VERSION}/naxsi_config/naxsi_core.rules \ ${STAGEDIR}${ETCDIR} .endif post-install: .if !empty(PORT_OPTIONS:MHTTP) && !empty(PORT_OPTIONS:MHTTP_PERL) ${ECHO_CMD} ${SITE_ARCH_REL}/auto/nginx/nginx.so >> ${TMPPLIST} ${ECHO_CMD} ${SITE_ARCH_REL}/nginx.pm >> ${TMPPLIST} .endif ${INSTALL_MAN} ${WRKSRC}/objs/nginx.8 ${STAGEDIR}${MAN8PREFIX}/man/man8 .if ${PORT_OPTIONS:MNAXSI} ${ECHO_CMD} etc/nginx/naxsi_core.rules >> ${TMPPLIST} .endif .if ${PORT_OPTIONS:MFASTDFS} ${ECHO_CMD} @sample etc/fdfs/mod_fastdfs.conf.sample >> ${TMPPLIST} .endif # Add dynamic modules to the plist .if !empty(PORT_OPTIONS:MDSO) (cd ${STAGEDIR}${PREFIX} && ${FIND} ${MODULESDIR:S|${PREFIX}/||} \ ! -type d >>${TMPPLIST}) # Update nginx.conf-dist with a list of staged dynamic modules (cd ${STAGEDIR} && \ ${FIND} ${MODULESDIR:S|^/||} -type f -name '*.so' \ -exec ${ECHO_CMD} "load_module /{};" \; \ >>${STAGEDIR}${ETCDIR}/nginx.conf-dist) .endif ${CAT} ${WRKSRC}/conf/nginx.conf \ >>${STAGEDIR}${ETCDIR}/nginx.conf-dist .include Index: head/www/nginx/distinfo =================================================================== --- head/www/nginx/distinfo (revision 439420) +++ head/www/nginx/distinfo (revision 439421) @@ -1,139 +1,135 @@ -TIMESTAMP = 1487041847 -SHA256 (nginx-1.10.3.tar.gz) = 75020f1364cac459cb733c4e1caed2d00376e40ea05588fb8793076a4c69dd90 -SIZE (nginx-1.10.3.tar.gz) = 911509 +TIMESTAMP = 1492353399 +SHA256 (nginx-1.12.0.tar.gz) = b4222e26fdb620a8d3c3a3a8b955e08b713672e1bc5198d1e4f462308a795b30 +SIZE (nginx-1.12.0.tar.gz) = 980831 SHA256 (nginx-accesskey-2.0.3.tar.gz) = d9e94321e78a02de16c57f3e048fd31059fd8116ed03d6de7180f435c52502b1 SIZE (nginx-accesskey-2.0.3.tar.gz) = 2632 SHA256 (ngx_http_auth_pam_module-1.2.tar.gz) = 5a85970ba61a99f55a26d2536a11d512b39bbd622f5737d25a9a8c10db81efa9 SIZE (ngx_http_auth_pam_module-1.2.tar.gz) = 5424 SHA256 (ngx_cache_purge-2.3.tar.gz) = 279e0d8a46d3b1521fd43b3f78bc1c08b263899142a7cc5058c1c0361a92c89c SIZE (ngx_cache_purge-2.3.tar.gz) = 12248 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae SIZE (nginx_mogilefs_module-1.0.4.tar.gz) = 11208 SHA256 (nginx_mod_h264_streaming-2.2.7.tar.gz) = 6d974ba630cef59de1f60996c66b401264a345d25988a76037c2856cec756c19 SIZE (nginx_mod_h264_streaming-2.2.7.tar.gz) = 44012 SHA256 (ngx_http_redis-0.3.8.tar.gz) = 95d0ed7be40da2efc88883d72e52e5e272d2c34463583b7078e8fd6d55004934 SIZE (ngx_http_redis-0.3.8.tar.gz) = 12342 SHA256 (ngx_http_response-0.3.tar.gz) = 0835584029f053051c624adbe33a826ab0205c9d85a02af6019e6b57607e9045 SIZE (ngx_http_response-0.3.tar.gz) = 2244 -SHA256 (nginx_upstream_fair-20090923.tar.gz) = ec9ed7f856263e17faadee3dc7209932364ded4e546b829841c2454aa432450b -SIZE (nginx_upstream_fair-20090923.tar.gz) = 10024 SHA256 (08a395c66e42.tar.gz) = 53e440737ed1aff1f09fae150219a45f16add0c8d6e84546cb7d80f73ebffd90 SIZE (08a395c66e42.tar.gz) = 120603 SHA256 (modsecurity-2.9.1.tar.gz) = 958cc5a7a7430f93fac0fd6f8b9aa92fc1801efce0cda797d6029d44080a9b24 SIZE (modsecurity-2.9.1.tar.gz) = 4261212 SHA256 (passenger-5.1.2.tar.gz) = 7fb03a54650ef5e508895c9e45bc2d8151f6c4811ea6797e81f017fedddfdbab SIZE (passenger-5.1.2.tar.gz) = 5646103 SHA256 (ngx_slowfs_cache-1.10.tar.gz) = 1e81453942e5b0877de1f1f06c56ae82918ea9818255cb935bcb673c95a758a1 SIZE (ngx_slowfs_cache-1.10.tar.gz) = 11809 -SHA256 (nginx_udplog_module-1.0.0.tar.gz) = e0c0bfa524c3a675ad6c08b916d08e57ef45f9818cb8a0d848c2c83785c6e659 -SIZE (nginx_udplog_module-1.0.0.tar.gz) = 6284 SHA256 (giom-nginx_accept_language_module-2f69842_GH0.tar.gz) = 5534ca63cdfc2a7dc4e1cbf9c2d54d3ed3f0e6c86b4a95be48ec0a3f41cc1eb0 SIZE (giom-nginx_accept_language_module-2f69842_GH0.tar.gz) = 3393 SHA256 (atomx-nginx-http-auth-digest-cc61b4a_GH0.tar.gz) = e68b34e03516a4ab43006eb4c481d6bc5e813e0d40876359c606a26c5c68ccf6 SIZE (atomx-nginx-http-auth-digest-cc61b4a_GH0.tar.gz) = 16060 -SHA256 (stnoonan-spnego-http-auth-nginx-module-c85a38c_GH0.tar.gz) = b47b23a362aa338c377d6163d15abee6f33ff16bac5f86ee4d9543293fe8c4d1 -SIZE (stnoonan-spnego-http-auth-nginx-module-c85a38c_GH0.tar.gz) = 18120 +SHA256 (stnoonan-spnego-http-auth-nginx-module-0c6ff3f_GH0.tar.gz) = 3d3fed1e19a532cdd2a37726953f2b2d4e20891a44119ff6075a6b5891324d2d +SIZE (stnoonan-spnego-http-auth-nginx-module-0c6ff3f_GH0.tar.gz) = 18212 SHA256 (kvspb-nginx-auth-ldap-dbcef31_GH0.tar.gz) = 0ec4f099e50cc12a6319e37700e71540498d354831d1f09e113ee046ee0bb7b2 SIZE (kvspb-nginx-auth-ldap-dbcef31_GH0.tar.gz) = 17001 SHA256 (yaoweibin-nginx_ajp_module-bf6cd93_GH0.tar.gz) = 9e3f78ea73e2d606a95ee64fd3affa4c249f9b342e66b6b11b63061791f28316 SIZE (yaoweibin-nginx_ajp_module-bf6cd93_GH0.tar.gz) = 109704 SHA256 (anomalizer-ngx_aws_auth-1e62670_GH0.tar.gz) = db7ceef4ae22cf5bfaf5abae64830dfeef203ca85f9f40f7d1f1d90f277478c0 SIZE (anomalizer-ngx_aws_auth-1e62670_GH0.tar.gz) = 8260 SHA256 (nginx-clojure-nginx-clojure-v0.4.4_GH0.tar.gz) = 642ebf4724fa7c3efd5349e60b442ac8671497406834804c903ec548bfdcb691 SIZE (nginx-clojure-nginx-clojure-v0.4.4_GH0.tar.gz) = 603856 SHA256 (grahamedgecombe-nginx-ct-v1.3.2_GH0.tar.gz) = b4ceae549b9dbf84b2e511633982e4efeee0388e3b7a038a8bac555008a77b88 SIZE (grahamedgecombe-nginx-ct-v1.3.2_GH0.tar.gz) = 6844 SHA256 (openresty-echo-nginx-module-46334b3_GH0.tar.gz) = 00d42a5f562a0be5570110d9b70c8f2cace93b292421a6f994cf4ec76a8979f0 SIZE (openresty-echo-nginx-module-46334b3_GH0.tar.gz) = 52766 SHA256 (happyfish100-fastdfs-nginx-module-5a8110f_GH0.tar.gz) = 58daa08a5ab9b9de5459817fc088230f4092fb818b87a2cb61b217952a5af54d SIZE (happyfish100-fastdfs-nginx-module-5a8110f_GH0.tar.gz) = 17980 SHA256 (openresty-headers-more-nginx-module-84241e4_GH0.tar.gz) = d3442be9058682ed0ad1d294ab27effcb245c0a320fcf418c452dc923f714531 SIZE (openresty-headers-more-nginx-module-84241e4_GH0.tar.gz) = 27951 SHA256 (arut-nginx-dav-ext-module-v0.0.3_GH0.tar.gz) = d428a0236c933779cb40ac8c91afb19d5c25a376dc3caab825bfd543e1ee530d SIZE (arut-nginx-dav-ext-module-v0.0.3_GH0.tar.gz) = 6260 SHA256 (openresty-nginx-eval-module-342c812_GH0.tar.gz) = c45f6438474593f0cf5229160327d20c2f2d72e9c0b5c8cf9e0ef8d5295de177 SIZE (openresty-nginx-eval-module-342c812_GH0.tar.gz) = 14183 SHA256 (aperezdc-ngx-fancyindex-v0.4.1_GH0.tar.gz) = 2b00d8e0ad2a67152a9cee7b7ee67990c742d501412df912baaf1eee9bb6dc71 SIZE (aperezdc-ngx-fancyindex-v0.4.1_GH0.tar.gz) = 21130 SHA256 (alibaba-nginx-http-footer-filter-1.2.2_GH0.tar.gz) = 3493b54460c59370f9f60c6e662862752f1920fc6e684f7a66bb2b3260692813 SIZE (alibaba-nginx-http-footer-filter-1.2.2_GH0.tar.gz) = 3934 SHA256 (leev-ngx_http_geoip2_module-2.0_GH0.tar.gz) = ebb4652c4f9a2e1ee31fddefc4c93ff78e651a4b2727d3453d026bccbd708d99 SIZE (leev-ngx_http_geoip2_module-2.0_GH0.tar.gz) = 6766 SHA256 (nginx-modules-ngx_http_json_status_module-1d2f303_GH0.tar.gz) = fdc34e0e712d28f4452ce3858ba05a38cc00703f14502095189c4a1063a36997 SIZE (nginx-modules-ngx_http_json_status_module-1d2f303_GH0.tar.gz) = 6736 SHA256 (kr-nginx-notice-3c95966_GH0.tar.gz) = e829fc94178cc8c91fef15a1fc44ee7ac162c13eddc0bba4c9427aaa23386885 SIZE (kr-nginx-notice-3c95966_GH0.tar.gz) = 3343 SHA256 (slact-nchan-v0.99.16_GH0.tar.gz) = 200cc1b02931a067c3edb07243a7faac80265ce6aab37af680cf7373011efc41 SIZE (slact-nchan-v0.99.16_GH0.tar.gz) = 378626 SHA256 (wandenberg-nginx-push-stream-module-0.5.1_GH0.tar.gz) = a95f31e80120fd7324795b92a0d94c0b43e1265df7fd0f1eba11a337c1e0a626 SIZE (wandenberg-nginx-push-stream-module-0.5.1_GH0.tar.gz) = 175263 SHA256 (yaoweibin-ngx_http_substitutions_filter_module-v0.6.4_GH0.tar.gz) = ed4ddbcf0c434f4a1e97b61251a63ace759792764bd5cb79ff20efe348db8db3 SIZE (yaoweibin-ngx_http_substitutions_filter_module-v0.6.4_GH0.tar.gz) = 92230 SHA256 (tarantool-nginx_upstream_module-1278ee5_GH0.tar.gz) = 34d51afcd464582e6011a5d3abe6829c5690ddb9b50c993dfdafb4c725a4803a SIZE (tarantool-nginx_upstream_module-1278ee5_GH0.tar.gz) = 48378 -SHA256 (vkholodkov-nginx-upload-module-aba1e3f34c_GH0.tar.gz) = 62a2c4388585aec463a1cee30bc84953593a93f341dc1df61b42b452594d2a05 -SIZE (vkholodkov-nginx-upload-module-aba1e3f34c_GH0.tar.gz) = 28296 +SHA256 (Austinb-nginx-upload-module-72ec037_GH0.tar.gz) = c6d4e38ad0712c898cc53721f492f8f73acf2753cc0a0769fa34d4d6ba4e8efd +SIZE (Austinb-nginx-upload-module-72ec037_GH0.tar.gz) = 28303 SHA256 (masterzen-nginx-upload-progress-module-v0.9.0_GH0.tar.gz) = 93e29b9b437a2e34713de54c2861ea51151624aca09f73f9f44d1caaff01a6b1 SIZE (masterzen-nginx-upload-progress-module-v0.9.0_GH0.tar.gz) = 16990 SHA256 (yaoweibin-nginx_upstream_check_module-10782ea_GH0.tar.gz) = 52e6acd8c0264a59c5c948271015a59acd3cbcf91377456b7c8dc6f9feecef4a SIZE (yaoweibin-nginx_upstream_check_module-10782ea_GH0.tar.gz) = 128281 +SHA256 (cryptofuture-nginx-upstream-fair-b5be36f_GH0.tar.gz) = e765afcaab6cd1601e914039a8d00ab18eb6fe01180c58e0e4e098bc5b4d8233 +SIZE (cryptofuture-nginx-upstream-fair-b5be36f_GH0.tar.gz) = 10174 SHA256 (wandenberg-nginx-video-thumbextractor-module-0.7.0_GH0.tar.gz) = 382bb41fa739f471fdab9fbabc5384d8ec7f25b5bb0c45c153f5cc01d428abe2 SIZE (wandenberg-nginx-video-thumbextractor-module-0.7.0_GH0.tar.gz) = 2709351 -SHA256 (evanmiller-mod_zip-ca0b345_GH0.tar.gz) = babab586ebde83d3cf128eabdc3a66f922db740a43c943ffd9cd8b055acf3a5b -SIZE (evanmiller-mod_zip-ca0b345_GH0.tar.gz) = 26035 +SHA256 (anthonyryan1-mod_zip-74ef235_GH0.tar.gz) = 0d780e6fef91814fbaa577c9f7cfb7b78f6898e50c34d63f3c5d101eb45afd44 +SIZE (anthonyryan1-mod_zip-74ef235_GH0.tar.gz) = 26125 SHA256 (openresty-drizzle-nginx-module-v0.1.9_GH0.tar.gz) = aafb79d87273eec023025333c34d6d0108026a1ce2e09b20a53e8e2d9bf65080 SIZE (openresty-drizzle-nginx-module-v0.1.9_GH0.tar.gz) = 59024 SHA256 (cubicdaiya-ngx_dynamic_upstream-v0.1.3_GH0.tar.gz) = bf60cf196c86193376d11f8c7a3826994b24a48bb36943bab8a25af6e776af3b SIZE (cubicdaiya-ngx_dynamic_upstream-v0.1.3_GH0.tar.gz) = 10921 SHA256 (simpl-ngx_devel_kit-v0.3.0_GH0.tar.gz) = 88e05a99a8a7419066f5ae75966fb1efc409bad4522d14986da074554ae61619 SIZE (simpl-ngx_devel_kit-v0.3.0_GH0.tar.gz) = 66455 SHA256 (openresty-encrypted-session-nginx-module-v0.06_GH0.tar.gz) = fa6537c406cee1dc7acd6152d16dba4581d53587860a0642f1b0f7c817ee006d SIZE (openresty-encrypted-session-nginx-module-v0.06_GH0.tar.gz) = 11128 SHA256 (mdirolf-nginx-gridfs-v0.8_GH0.tar.gz) = ef843824e0aac1dd60b392802861cc06426a4bc5f87d472c7ee00b1296693f2a SIZE (mdirolf-nginx-gridfs-v0.8_GH0.tar.gz) = 18883 SHA256 (mongodb-mongo-c-driver-v0.3.1_GH0.tar.gz) = 552c54aff81c4701ace4eb1ce20c114433ee783b4b06c0105921a830c9486172 SIZE (mongodb-mongo-c-driver-v0.3.1_GH0.tar.gz) = 53024 SHA256 (arut-nginx-let-module-v0.0.4_GH0.tar.gz) = cbf6fcddc00a7e30289134bdeace12565e000cc7d4efee2d2ebb8799d0b88270 SIZE (arut-nginx-let-module-v0.0.4_GH0.tar.gz) = 20534 -SHA256 (openresty-lua-nginx-module-v0.10.7_GH0.tar.gz) = c21c8937dcdd6fc2b6a955f929e3f4d1388610f47180e60126e6dcab06786f77 -SIZE (openresty-lua-nginx-module-v0.10.7_GH0.tar.gz) = 605171 +SHA256 (openresty-lua-nginx-module-v0.10.8_GH0.tar.gz) = d67449c71051b3cc2d6dd60df0ae0d21fca08aa19c9b30c5b95ee21ff38ef8dd +SIZE (openresty-lua-nginx-module-v0.10.8_GH0.tar.gz) = 606643 SHA256 (openresty-memc-nginx-module-v0.17_GH0.tar.gz) = 25cbe3ff4931283a681260607bc91ae4a922075345d5770b293c6cd7f1e3bdcc SIZE (openresty-memc-nginx-module-v0.17_GH0.tar.gz) = 36369 SHA256 (nbs-system-naxsi-0.54_GH0.tar.gz) = 9cc2c09405bc71f78ef26a8b6d70afcea3fccbe8125df70cb0cfc480133daba5 SIZE (nbs-system-naxsi-0.54_GH0.tar.gz) = 163809 SHA256 (FRiCKLE-ngx_postgres-1.0rc7_GH0.tar.gz) = c942e674a7273ab87caab4dcad626ab54852be192c29b1add50d2cb535e3cbb9 SIZE (FRiCKLE-ngx_postgres-1.0rc7_GH0.tar.gz) = 40742 SHA256 (openresty-rds-csv-nginx-module-v0.07_GH0.tar.gz) = b204909c6fb194fe8fed7627a3733bc9598f64251dc04a5b6a5bbd612e925324 SIZE (openresty-rds-csv-nginx-module-v0.07_GH0.tar.gz) = 19444 SHA256 (openresty-rds-json-nginx-module-v0.14_GH0.tar.gz) = 99aedf222a9664484918392988cce41b1a6238240d42f8bd44f5ff102c05c36c SIZE (openresty-rds-json-nginx-module-v0.14_GH0.tar.gz) = 33496 SHA256 (openresty-redis2-nginx-module-v0.12_GH0.tar.gz) = baf5274c815a5f27854747df09ff5bcd6d82e0baa2f224a9db6450d2f3a35a4f SIZE (openresty-redis2-nginx-module-v0.12_GH0.tar.gz) = 28981 SHA256 (arut-nginx-rtmp-module-v1.1.8_GH0.tar.gz) = de5866111a5b18c9dfb1c10f3a0e84b56af77f7005a41807368f7769b8a50965 SIZE (arut-nginx-rtmp-module-v1.1.8_GH0.tar.gz) = 519647 SHA256 (openresty-set-misc-nginx-module-f808ef4_GH0.tar.gz) = 5f32c484b29b9047dfa65fd3eec511c0f7c65f0f3ec0a4e0453359cf4642d405 SIZE (openresty-set-misc-nginx-module-f808ef4_GH0.tar.gz) = 29340 SHA256 (sflow-nginx-sflow-module-543c72a_GH0.tar.gz) = 95efdb1f6cfd6c32c577707f693eb6795c6f21ae062842bf84fe762d8b842955 SIZE (sflow-nginx-sflow-module-543c72a_GH0.tar.gz) = 29504 SHA256 (nginx-shib-nginx-http-shibboleth-4f1119b_GH0.tar.gz) = c25f284bc934f59a267d319385a3e11858efef786c84b49a77d09e7f5274bbf1 SIZE (nginx-shib-nginx-http-shibboleth-4f1119b_GH0.tar.gz) = 16688 SHA256 (cubicdaiya-ngx_small_light-v0.8.0_GH0.tar.gz) = 8f513d6d3df32c3b05327d40e16efd020532a911d3eeca8015eb6271f2d4fd1c SIZE (cubicdaiya-ngx_small_light-v0.8.0_GH0.tar.gz) = 55918 SHA256 (openresty-srcache-nginx-module-v0.30_GH0.tar.gz) = e34b1ab5f5007661f73819f9c20fd6c2a46ed3e53364e9449b02ef2bd3628633 SIZE (openresty-srcache-nginx-module-v0.30_GH0.tar.gz) = 58777 -SHA256 (zebrafishlabs-nginx-statsd-b756a12_GH0.tar.gz) = 4c5886edb1fbeb0b9a83c879b4be4b15a620627a18978aef636da3feafb284fe -SIZE (zebrafishlabs-nginx-statsd-b756a12_GH0.tar.gz) = 6636 SHA256 (gabor-nginx-x-rid-header-0daa3cc_GH0.tar.gz) = de784142d867a35ecc5443fa347c2903af0935669cdf2eaa9274f5253aac2267 SIZE (gabor-nginx-x-rid-header-0daa3cc_GH0.tar.gz) = 2711 SHA256 (openresty-xss-nginx-module-v0.05_GH0.tar.gz) = 958bd8de773601d8d3138501cc4be0420f1c818a3987a70cc9c0023371e432cf SIZE (openresty-xss-nginx-module-v0.05_GH0.tar.gz) = 11477 -SHA256 (nginx-njs-f7d2d6f_GH0.tar.gz) = 67291a3ae4b98f17335f12951984bc9b1bf4f6367e4beff40638cd832d2fb281 -SIZE (nginx-njs-f7d2d6f_GH0.tar.gz) = 167815 +SHA256 (nginx-njs-753ebe6_GH0.tar.gz) = 43fc7a307ee98b9c55283374b36f1f4576cbf529a4101176cb94ab73f3110f67 +SIZE (nginx-njs-753ebe6_GH0.tar.gz) = 191124 SHA256 (openresty-array-var-nginx-module-v0.05_GH0.tar.gz) = c949d4be6f3442c8e2937046448dc8d8def25c0e0fa6f4e805144cea45eabe80 SIZE (openresty-array-var-nginx-module-v0.05_GH0.tar.gz) = 11280 SHA256 (google-ngx_brotli-ada972b_GH0.tar.gz) = d3d0e22a2629cd017280e05bd3bf05aa7b5c820ebe8c79932ce161243911e776 SIZE (google-ngx_brotli-ada972b_GH0.tar.gz) = 11128 SHA256 (calio-form-input-nginx-module-v0.12_GH0.tar.gz) = 5c1869d55897075adb3fdf840b21060dc54669a1f840a36d1539acc7e59dd106 SIZE (calio-form-input-nginx-module-v0.12_GH0.tar.gz) = 11090 SHA256 (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = b8b9f355c05c0790226512f6732348a2404d48531688a1fc04ce6768163bf462 SIZE (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = 13133 Index: head/www/nginx/files/extra-patch-ngx_http_udplog_module.c =================================================================== --- head/www/nginx/files/extra-patch-ngx_http_udplog_module.c (revision 439420) +++ head/www/nginx/files/extra-patch-ngx_http_udplog_module.c (nonexistent) @@ -1,431 +0,0 @@ ---- ../nginx_udplog_module-1.0.0/ngx_http_udplog_module.c.orig 2010-01-05 20:20:35.000000000 +0100 -+++ ../nginx_udplog_module-1.0.0/ngx_http_udplog_module.c 2011-12-02 18:31:18.000000000 +0100 -@@ -1,4 +1,3 @@ -- - /* - * Copyright (C) 2010 Valery Kholodkov - * -@@ -45,6 +44,12 @@ - } ngx_http_log_fmt_t; - - typedef struct { -+ ngx_str_t value; -+ ngx_array_t *lengths; -+ ngx_array_t *values; -+} ngx_http_log_tag_template_t; -+ -+typedef struct { - ngx_array_t formats; /* array of ngx_http_log_fmt_t */ - ngx_uint_t combined_used; /* unsigned combined_used:1 */ - } ngx_http_log_main_conf_t; -@@ -64,8 +69,7 @@ - typedef struct { - ngx_udp_endpoint_t *endpoint; - ngx_http_log_fmt_t *format; -- ngx_uint_t facility; -- ngx_uint_t severity; -+ ngx_uint_t bare:1; - } ngx_http_udplog_t; - - typedef struct { -@@ -73,8 +77,11 @@ - } ngx_http_udplog_main_conf_t; - - typedef struct { -- ngx_array_t *logs; /* array of ngx_http_udplog_t */ -- unsigned off; -+ ngx_array_t *logs; /* array of ngx_http_udplog_t */ -+ unsigned off; -+ ngx_http_log_tag_template_t *tag; -+ ngx_uint_t facility; -+ ngx_uint_t severity; - } ngx_http_udplog_conf_t; - - ngx_int_t ngx_udp_connect(ngx_udp_connection_t *uc); -@@ -88,6 +95,8 @@ - void *child); - - static char *ngx_http_udplog_set_log(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); -+static char *ngx_http_udplog_set_priority(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); -+static char *ngx_http_udplog_set_tag(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); - - static ngx_int_t ngx_http_udplog_init(ngx_conf_t *cf); - -@@ -96,12 +105,26 @@ - - { ngx_string("access_udplog"), - NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF -- |NGX_HTTP_LMT_CONF|NGX_CONF_TAKE123, -+ |NGX_HTTP_LMT_CONF|NGX_CONF_TAKE1234, - ngx_http_udplog_set_log, - NGX_HTTP_LOC_CONF_OFFSET, - 0, - NULL }, - -+ { ngx_string("udplog_priority"), -+ NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE12, -+ ngx_http_udplog_set_priority, -+ NGX_HTTP_LOC_CONF_OFFSET, -+ 0, -+ NULL }, -+ -+ { ngx_string("udplog_tag"), -+ NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, -+ ngx_http_udplog_set_tag, -+ NGX_HTTP_LOC_CONF_OFFSET, -+ offsetof(ngx_http_udplog_conf_t, tag), -+ NULL }, -+ - ngx_null_command - }; - -@@ -166,7 +189,7 @@ - { ngx_null_string, 0 } - }; - --static ngx_udplog_severity_t ngx_udplog_severity[] = { -+static ngx_udplog_severity_t ngx_udplog_severities[] = { - { ngx_string("emerg"), 0 }, - { ngx_string("alert"), 1 }, - { ngx_string("crit"), 2 }, -@@ -190,6 +213,7 @@ - u_char *line, *p; - size_t len; - ngx_uint_t i, l, pri; -+ ngx_str_t tag; - ngx_http_udplog_t *log; - ngx_http_log_op_t *op; - ngx_http_udplog_conf_t *ulcf; -@@ -205,12 +229,31 @@ - return NGX_OK; - } - -+ if(ulcf->tag != NULL) -+ { -+ if(ulcf->tag->lengths == NULL) { -+ tag = ulcf->tag->value; -+ } -+ else{ -+ if (ngx_http_script_run(r, &tag, ulcf->tag->lengths->elts, 0, ulcf->tag->values->elts) -+ == NULL) -+ { -+ return NGX_ERROR; -+ } -+ } -+ } -+ else { -+ tag.data = (u_char*)"nginx"; -+ tag.len = sizeof("nginx") - 1; -+ } -+ - time = ngx_time(); - ngx_gmtime(time, &tm); - - log = ulcf->logs->elts; -+ pri = ulcf->facility * 8 + ulcf->severity; -+ - for (l = 0; l < ulcf->logs->nelts; l++) { -- pri = log[l].facility * 8 + log[l].severity; - - if(pri > 255) { - pri = NGX_UDPLOG_FACILITY_LOCAL7 * 8 + NGX_UDPLOG_SEVERITY_INFO; -@@ -231,7 +274,8 @@ - } - } - -- len += sizeof("<255>") - 1 + sizeof("Jan 31 00:00:00") - 1 + 1 + ngx_cycle->hostname.len + 1; -+ len += sizeof("<255>") - 1 + sizeof("Jan 31 00:00:00") - 1 + 1 + ngx_cycle->hostname.len + 1 -+ + tag.len + 2; - - #if defined nginx_version && nginx_version >= 7003 - line = ngx_pnalloc(r->pool, len); -@@ -245,9 +289,12 @@ - /* - * BSD syslog message header (see RFC 3164) - */ -- p = ngx_sprintf(line, "<%ui>%s %2d %02d:%02d:%02d %V ", pri, months[tm.ngx_tm_mon - 1], tm.ngx_tm_mday, -- tm.ngx_tm_hour, tm.ngx_tm_min, tm.ngx_tm_sec, &ngx_cycle->hostname); -- -+ if(!log[l].bare){ -+ p = ngx_sprintf(line, "<%ui>%s %2d %02d:%02d:%02d %V %V: ", pri, months[tm.ngx_tm_mon - 1], tm.ngx_tm_mday, -+ tm.ngx_tm_hour, tm.ngx_tm_min, tm.ngx_tm_sec, &ngx_cycle->hostname, &tag); -+ }else{ -+ p = line; -+ } - for (i = 0; i < log[l].format->ops->nelts; i++) { - p = op[i].run(r, p, &op[i]); - } -@@ -280,10 +327,15 @@ - uc->sockaddr = endpoint->peer_addr.sockaddr; - uc->socklen = endpoint->peer_addr.socklen; - uc->server = endpoint->peer_addr.name; --#if defined nginx_version && nginx_version >= 7054 -+#if defined nginx_version && ( nginx_version >= 7054 && nginx_version < 8032 ) - uc->log = &cf->cycle->new_log; - #else - uc->log = cf->cycle->new_log; -+#if defined nginx_version && nginx_version >= 8032 -+ uc->log.handler = NULL; -+ uc->log.data = NULL; -+ uc->log.action = "logging"; -+#endif - #endif - - return NGX_OK; -@@ -320,6 +372,11 @@ - - if (uc->connection == NULL) { - if(ngx_udp_connect(uc) != NGX_OK) { -+ if(uc->connection != NULL) { -+ ngx_free_connection(uc->connection); -+ uc->connection = NULL; -+ } -+ - return NGX_ERROR; - } - -@@ -335,7 +392,11 @@ - } - - if ((size_t) n != (size_t) len) { -+#if defined nginx_version && nginx_version >= 8032 -+ ngx_log_error(NGX_LOG_CRIT, &uc->log, 0, "send() incomplete"); -+#else - ngx_log_error(NGX_LOG_CRIT, uc->log, 0, "send() incomplete"); -+#endif - return NGX_ERROR; - } - -@@ -364,6 +425,9 @@ - if (conf == NULL) { - return NGX_CONF_ERROR; - } -+ conf->off = 1; -+ conf->facility = NGX_CONF_UNSET_UINT; -+ conf->severity = NGX_CONF_UNSET_UINT; - - return conf; - } -@@ -374,37 +438,21 @@ - ngx_http_udplog_conf_t *prev = parent; - ngx_http_udplog_conf_t *conf = child; - -- ngx_http_udplog_t *log; -- ngx_http_log_fmt_t *fmt; -- ngx_http_log_main_conf_t *lmcf; -- -- if(conf->logs || conf->off) { -- return NGX_CONF_OK; -+ if(conf->tag == NULL) { -+ conf->tag = prev->tag; - } - -- conf->logs = prev->logs; -- conf->off = prev->off; -+ ngx_conf_merge_uint_value(conf->facility, -+ prev->facility, NGX_UDPLOG_FACILITY_LOCAL7); -+ ngx_conf_merge_uint_value(conf->severity, -+ prev->severity, NGX_UDPLOG_SEVERITY_INFO); - - if(conf->logs || conf->off) { - return NGX_CONF_OK; - } - -- conf->logs = ngx_array_create(cf->pool, 2, sizeof(ngx_http_udplog_t)); -- if(conf->logs == NULL) { -- return NGX_CONF_ERROR; -- } -- -- log = ngx_array_push(conf->logs); -- if(log == NULL) { -- return NGX_CONF_ERROR; -- } -- -- lmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_log_module); -- fmt = lmcf->formats.elts; -- -- /* the default "combined" format */ -- log->format = &fmt[0]; -- lmcf->combined_used = 1; -+ conf->logs = prev->logs; -+ conf->off = prev->off; - - return NGX_CONF_OK; - } -@@ -434,12 +482,6 @@ - return endpoint; - } - --static ngx_int_t --ngx_http_udplog_set_facility_and_severity(ngx_http_udplog_t *log, ngx_str_t *value) --{ -- return NGX_OK; --} -- - static char * - ngx_http_udplog_set_log(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) - { -@@ -458,6 +500,7 @@ - ulcf->off = 1; - return NGX_CONF_OK; - } -+ ulcf->off = 0; - - if (ulcf->logs == NULL) { - ulcf->logs = ngx_array_create(cf->pool, 2, sizeof(ngx_http_udplog_t)); -@@ -483,10 +526,11 @@ - - ngx_memzero(&u, sizeof(ngx_url_t)); - -- u.host = value[1]; -- u.port = 514; -+ u.url = value[1]; -+ u.default_port = 514; -+ u.no_resolve = 0; - -- if(ngx_inet_resolve_host(cf->pool, &u) != NGX_OK) { -+ if(ngx_parse_url(cf->pool, &u) != NGX_OK) { - ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "%V: %s", &u.host, u.err); - return NGX_CONF_ERROR; - } -@@ -496,7 +540,7 @@ - if(log->endpoint == NULL) { - return NGX_CONF_ERROR; - } -- -+ log->bare = 0; - if (cf->args->nelts >= 3) { - name = value[2]; - -@@ -508,14 +552,18 @@ - name.data = (u_char *) "combined"; - lmcf->combined_used = 1; - } -- -+ if (cf->args->nelts >= 4) { -+ if (ngx_strcmp(value[3].data, "bare") == 0) { -+ log->bare = 1; -+ } -+ } - fmt = lmcf->formats.elts; - for (i = 0; i < lmcf->formats.nelts; i++) { - if (fmt[i].name.len == name.len - && ngx_strcasecmp(fmt[i].name.data, name.data) == 0) - { - log->format = &fmt[i]; -- goto facility; -+ goto done; - } - } - -@@ -523,12 +571,105 @@ - "unknown log format \"%V\"", &name); - return NGX_CONF_ERROR; - --facility: -- log->facility = NGX_UDPLOG_FACILITY_LOCAL7; -- log->severity = NGX_UDPLOG_SEVERITY_INFO; -+done: -+ -+ return NGX_CONF_OK; -+} -+ -+ -+static char * -+ngx_http_udplog_set_priority(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) -+{ -+ ngx_http_udplog_conf_t *ulcf = conf; -+ ngx_str_t *value; -+ ngx_udplog_facility_t *f; -+ ngx_udplog_severity_t *s; -+ -+ value = cf->args->elts; -+ -+ f = ngx_udplog_facilities; -+ -+ while(f->name.data != NULL) { -+ if(ngx_strncmp(f->name.data, value[1].data, f->name.len) == 0) -+ break; -+ -+ f++; -+ } -+ -+ if(f->name.data != NULL) { -+ ulcf->facility = f->number; -+ } -+ else { -+ ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, -+ "unknown facility \"%V\"", &value[1]); -+ return NGX_CONF_ERROR; -+ } -+ -+ if (cf->args->nelts == 3) { -+ s = ngx_udplog_severities; -+ -+ while(s->name.data != NULL) { -+ if(ngx_strncmp(s->name.data, value[2].data, s->name.len) == 0) -+ break; -+ -+ s++; -+ } -+ -+ if(s->name.data != NULL) { -+ ulcf->severity = s->number; -+ } -+ else { -+ ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, -+ "unknown severity \"%V\"", &value[2]); -+ return NGX_CONF_ERROR; -+ } -+ } -+ -+ return NGX_CONF_OK; -+} -+ -+static char * -+ngx_http_udplog_set_tag(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) -+{ -+ ngx_int_t n; -+ ngx_str_t *value; -+ ngx_http_script_compile_t sc; -+ ngx_http_log_tag_template_t **field, *h; -+ -+ field = (ngx_http_log_tag_template_t**) (((u_char*)conf) + cmd->offset); -+ -+ value = cf->args->elts; -+ -+ if (*field == NULL) { -+ *field = ngx_palloc(cf->pool, sizeof(ngx_http_log_tag_template_t)); -+ if (*field == NULL) { -+ return NGX_CONF_ERROR; -+ } -+ } -+ -+ h = *field; -+ -+ h->value = value[1]; -+ h->lengths = NULL; -+ h->values = NULL; -+ -+ /* -+ * Compile field name -+ */ -+ n = ngx_http_script_variables_count(&value[1]); -+ -+ if (n > 0) { -+ ngx_memzero(&sc, sizeof(ngx_http_script_compile_t)); -+ -+ sc.cf = cf; -+ sc.source = &value[1]; -+ sc.lengths = &h->lengths; -+ sc.values = &h->values; -+ sc.variables = n; -+ sc.complete_lengths = 1; -+ sc.complete_values = 1; - -- if(cf->args->nelts == 4) { -- if(ngx_http_udplog_set_facility_and_severity(log, &value[3]) != NGX_OK) { -+ if (ngx_http_script_compile(&sc) != NGX_OK) { - return NGX_CONF_ERROR; - } - } Property changes on: head/www/nginx/files/extra-patch-ngx_http_udplog_module.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/nginx/files/extra-patch-ngx_http_drizzle_upstream.c =================================================================== --- head/www/nginx/files/extra-patch-ngx_http_drizzle_upstream.c (nonexistent) +++ head/www/nginx/files/extra-patch-ngx_http_drizzle_upstream.c (revision 439421) @@ -0,0 +1,17 @@ +--- ../drizzle-nginx-module-0.1.9/src/ngx_http_drizzle_upstream.c.orig 2016-11-20 15:32:37.264746000 -0500 ++++ ../drizzle-nginx-module-0.1.9/src/ngx_http_drizzle_upstream.c 2016-11-20 15:33:20.909836000 -0500 +@@ -1027,12 +1027,14 @@ + continue; + } + ++#if (nginx_version < 1011006) + if (uscfp[i]->default_port && url->default_port + && uscfp[i]->default_port != url->default_port) + { + dd("upstream_add: default_port not match"); + continue; + } ++#endif + + return uscfp[i]; + } Property changes on: head/www/nginx/files/extra-patch-ngx_http_drizzle_upstream.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/nginx/files/extra-patch-ngx_http_echo_request_info.c =================================================================== --- head/www/nginx/files/extra-patch-ngx_http_echo_request_info.c (nonexistent) +++ head/www/nginx/files/extra-patch-ngx_http_echo_request_info.c (revision 439421) @@ -0,0 +1,43 @@ +--- ../echo-nginx-module-46334b3/src/ngx_http_echo_request_info.c.orig 2017-04-15 10:03:29.616243000 -0400 ++++ ../echo-nginx-module-46334b3/src/ngx_http_echo_request_info.c 2017-04-15 10:07:41.329695000 -0400 +@@ -179,6 +179,9 @@ + ngx_int_t i, j; + ngx_buf_t *b, *first = NULL; + unsigned found; ++#if defined(nginx_version) && nginx_version >= 1011011 ++ ngx_chain_t *cl; ++#endif + ngx_connection_t *c; + ngx_http_request_t *mr; + ngx_http_connection_t *hc; +@@ -215,8 +218,15 @@ + + if (hc->nbusy) { + b = NULL; ++ ++#if defined(nginx_version) && nginx_version >= 1011011 ++ for (cl = hc->busy; cl; /* void */) { ++ b = cl->buf; ++ cl = cl->next; ++#else + for (i = 0; i < hc->nbusy; i++) { + b = hc->busy[i]; ++#endif + + if (first == NULL) { + if (mr->request_line.data >= b->pos +@@ -280,8 +290,14 @@ + } + + if (hc->nbusy) { ++#if defined(nginx_version) && nginx_version >= 1011011 ++ for (cl = hc->busy; cl; /* void */) { ++ b = cl->buf; ++ cl = cl->next; ++#else + for (i = 0; i < hc->nbusy; i++) { + b = hc->busy[i]; ++#endif + + if (!found) { + if (b != first) { Property changes on: head/www/nginx/files/extra-patch-ngx_http_echo_request_info.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/nginx/files/extra-patch-ngx_http_lua_common.h =================================================================== --- head/www/nginx/files/extra-patch-ngx_http_lua_common.h (nonexistent) +++ head/www/nginx/files/extra-patch-ngx_http_lua_common.h (revision 439421) @@ -0,0 +1,15 @@ +--- ../lua-nginx-module-0.10.8/src/ngx_http_lua_common.h.orig 2017-04-15 10:55:20.591680000 -0400 ++++ ../lua-nginx-module-0.10.8/src/ngx_http_lua_common.h 2017-04-15 10:55:50.449108000 -0400 +@@ -199,6 +199,12 @@ + of reqeusts */ + ngx_uint_t malloc_trim_req_count; + ++#if nginx_version >= 1011011 ++ /* the following 2 fields are only used by ngx.req.raw_headers() for now */ ++ ngx_buf_t **busy_buf_ptrs; ++ ngx_int_t busy_buf_ptr_count; ++#endif ++ + unsigned requires_header_filter:1; + unsigned requires_body_filter:1; + unsigned requires_capture_filter:1; Property changes on: head/www/nginx/files/extra-patch-ngx_http_lua_common.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/nginx/files/extra-patch-ngx_http_lua_headers.c =================================================================== --- head/www/nginx/files/extra-patch-ngx_http_lua_headers.c (nonexistent) +++ head/www/nginx/files/extra-patch-ngx_http_lua_headers.c (revision 439421) @@ -0,0 +1,124 @@ +--- ../lua-nginx-module-0.10.8/src/ngx_http_lua_headers.c.orig 2017-04-15 10:57:48.875770000 -0400 ++++ ../lua-nginx-module-0.10.8/src/ngx_http_lua_headers.c 2017-04-15 11:02:00.492564000 -0400 +@@ -26,6 +26,9 @@ + static int ngx_http_lua_ngx_req_header_clear(lua_State *L); + static int ngx_http_lua_ngx_req_header_set(lua_State *L); + static int ngx_http_lua_ngx_resp_get_headers(lua_State *L); ++#if nginx_version >= 1011011 ++void ngx_http_lua_ngx_raw_header_cleanup(void *data); ++#endif + + + static int +@@ -77,6 +80,11 @@ + size_t size; + ngx_buf_t *b, *first = NULL; + ngx_int_t i, j; ++#if nginx_version >= 1011011 ++ ngx_buf_t **bb; ++ ngx_chain_t *cl; ++ ngx_http_lua_main_conf_t *lmcf; ++#endif + ngx_connection_t *c; + ngx_http_request_t *r, *mr; + ngx_http_connection_t *hc; +@@ -93,6 +101,10 @@ + return luaL_error(L, "no request object found"); + } + ++#if nginx_version >= 1011011 ++ lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module); ++#endif ++ + ngx_http_lua_check_fake_request(L, r); + + mr = r->main; +@@ -109,8 +121,13 @@ + dd("hc->nbusy: %d", (int) hc->nbusy); + + if (hc->nbusy) { ++#if nginx_version >= 1011011 ++ dd("hc->busy: %p %p %p %p", hc->busy->buf->start, hc->busy->buf->pos, ++ hc->busy->buf->last, hc->busy->buf->end); ++#else + dd("hc->busy: %p %p %p %p", hc->busy[0]->start, hc->busy[0]->pos, + hc->busy[0]->last, hc->busy[0]->end); ++#endif + } + + dd("request line: %p %p", mr->request_line.data, +@@ -146,9 +163,37 @@ + dd("size: %d", (int) size); + + if (hc->nbusy) { ++#if nginx_version >= 1011011 ++ if (hc->nbusy > lmcf->busy_buf_ptr_count) { ++ if (lmcf->busy_buf_ptrs) { ++ ngx_free(lmcf->busy_buf_ptrs); ++ } ++ ++ lmcf->busy_buf_ptrs = ngx_alloc(hc->nbusy * sizeof(ngx_buf_t *), ++ r->connection->log); ++ ++ if (lmcf->busy_buf_ptrs == NULL) { ++ return luaL_error(L, "no memory"); ++ } ++ ++ lmcf->busy_buf_ptr_count = hc->nbusy; ++ } ++ ++ bb = lmcf->busy_buf_ptrs; ++ for (cl = hc->busy; cl; cl = cl->next) { ++ *bb++ = cl->buf; ++ } ++#endif + b = NULL; ++ ++#if nginx_version >= 1011011 ++ bb = lmcf->busy_buf_ptrs; ++ for (i = hc->nbusy; i > 0; i--) { ++ b = bb[i - 1]; ++#else + for (i = 0; i < hc->nbusy; i++) { + b = hc->busy[i]; ++#endif + + dd("busy buf: %d: [%.*s]", (int) i, (int) (b->pos - b->start), + b->start); +@@ -223,8 +268,15 @@ + } + + if (hc->nbusy) { ++ ++#if nginx_version >= 1011011 ++ bb = lmcf->busy_buf_ptrs; ++ for (i = hc->nbusy - 1; i >= 0; i--) { ++ b = bb[i]; ++#else + for (i = 0; i < hc->nbusy; i++) { + b = hc->busy[i]; ++#endif + + if (!found) { + if (b != first) { +@@ -1431,4 +1483,20 @@ + #endif /* NGX_LUA_NO_FFI_API */ + + ++#if nginx_version >= 1011011 ++void ++ngx_http_lua_ngx_raw_header_cleanup(void *data) ++{ ++ ngx_http_lua_main_conf_t *lmcf; ++ ++ lmcf = (ngx_http_lua_main_conf_t *) data; ++ ++ if (lmcf->busy_buf_ptrs) { ++ ngx_free(lmcf->busy_buf_ptrs); ++ lmcf->busy_buf_ptrs = NULL; ++ } ++} ++#endif ++ ++ + /* vi:set ft=c ts=4 sw=4 et fdm=marker: */ Property changes on: head/www/nginx/files/extra-patch-ngx_http_lua_headers.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/nginx/files/extra-patch-ngx_http_lua_headers.h =================================================================== --- head/www/nginx/files/extra-patch-ngx_http_lua_headers.h (nonexistent) +++ head/www/nginx/files/extra-patch-ngx_http_lua_headers.h (revision 439421) @@ -0,0 +1,12 @@ +--- ../lua-nginx-module-0.10.8/src/ngx_http_lua_headers.h.orig 2017-04-15 11:05:40.649209000 -0400 ++++ ../lua-nginx-module-0.10.8/src/ngx_http_lua_headers.h 2017-04-15 11:06:01.658936000 -0400 +@@ -15,6 +15,9 @@ + void ngx_http_lua_inject_resp_header_api(lua_State *L); + void ngx_http_lua_inject_req_header_api(lua_State *L); + void ngx_http_lua_create_headers_metatable(ngx_log_t *log, lua_State *L); ++#if nginx_version >= 1011011 ++void ngx_http_lua_ngx_raw_header_cleanup(void *data); ++#endif + + + #endif /* _NGX_HTTP_LUA_HEADERS_H_INCLUDED_ */ Property changes on: head/www/nginx/files/extra-patch-ngx_http_lua_headers.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/nginx/files/extra-patch-ngx_http_lua_module.c =================================================================== --- head/www/nginx/files/extra-patch-ngx_http_lua_module.c (nonexistent) +++ head/www/nginx/files/extra-patch-ngx_http_lua_module.c (revision 439421) @@ -0,0 +1,36 @@ +--- ../lua-nginx-module-0.10.8/src/ngx_http_lua_module.c.orig 2017-04-15 11:07:10.366543000 -0400 ++++ ../lua-nginx-module-0.10.8/src/ngx_http_lua_module.c 2017-04-15 11:08:25.640520000 -0400 +@@ -28,6 +28,7 @@ + #include "ngx_http_lua_ssl_certby.h" + #include "ngx_http_lua_ssl_session_storeby.h" + #include "ngx_http_lua_ssl_session_fetchby.h" ++#include "ngx_http_lua_headers.h" + + + static void *ngx_http_lua_create_main_conf(ngx_conf_t *cf); +@@ -624,7 +625,7 @@ + volatile ngx_cycle_t *saved_cycle; + ngx_http_core_main_conf_t *cmcf; + ngx_http_lua_main_conf_t *lmcf; +-#ifndef NGX_LUA_NO_FFI_API ++#if !defined(NGX_LUA_NO_FFI_API) || nginx_version >= 1011011 + ngx_pool_cleanup_t *cln; + #endif + +@@ -716,6 +717,16 @@ + cln->handler = ngx_http_lua_sema_mm_cleanup; + #endif + ++#if nginx_version >= 1011011 ++ cln = ngx_pool_cleanup_add(cf->pool, 0); ++ if (cln == NULL) { ++ return NGX_ERROR; ++ } ++ ++ cln->data = lmcf; ++ cln->handler = ngx_http_lua_ngx_raw_header_cleanup; ++#endif ++ + if (lmcf->lua == NULL) { + dd("initializing lua vm"); + Property changes on: head/www/nginx/files/extra-patch-ngx_http_lua_module.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/nginx/files/extra-patch-ngx_http_memc_util.c =================================================================== --- head/www/nginx/files/extra-patch-ngx_http_memc_util.c (nonexistent) +++ head/www/nginx/files/extra-patch-ngx_http_memc_util.c (revision 439421) @@ -0,0 +1,17 @@ +--- ../memc-nginx-module-0.17/src/ngx_http_memc_util.c.orig 2016-11-20 14:54:02.640140000 -0500 ++++ ../memc-nginx-module-0.17/src/ngx_http_memc_util.c 2016-11-20 14:54:34.579764000 -0500 +@@ -141,12 +141,14 @@ + continue; + } + ++#if (nginx_version < 1011006) + if (uscfp[i]->default_port && url->default_port + && uscfp[i]->default_port != url->default_port) + { + dd("upstream_add: default_port not match"); + continue; + } ++#endif + + return uscfp[i]; + } Property changes on: head/www/nginx/files/extra-patch-ngx_http_memc_util.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/nginx/files/extra-patch-ngx_http_modsecurity.c =================================================================== --- head/www/nginx/files/extra-patch-ngx_http_modsecurity.c (nonexistent) +++ head/www/nginx/files/extra-patch-ngx_http_modsecurity.c (revision 439421) @@ -0,0 +1,18 @@ +--- ../modsecurity-2.9.1/nginx/modsecurity/ngx_http_modsecurity.c.orig 2017-04-15 10:45:12.886736000 -0400 ++++ ../modsecurity-2.9.1/nginx/modsecurity/ngx_http_modsecurity.c 2017-04-15 10:45:59.921529000 -0400 +@@ -528,9 +528,15 @@ + + hc = r->http_connection; + ++#if defined(nginx_version) && nginx_version >= 1011011 ++ if (hc->free && size == cscf->large_client_header_buffers.size) { ++ ++ buf = hc->free->buf; ++#else + if (hc->nfree && size == cscf->large_client_header_buffers.size) { + + buf = hc->free[--hc->nfree]; ++#endif + + ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, + "ModSecurity: use http free large header buffer: %p %uz", Property changes on: head/www/nginx/files/extra-patch-ngx_http_modsecurity.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/nginx/files/extra-patch-ngx_http_redis2_util.c =================================================================== --- head/www/nginx/files/extra-patch-ngx_http_redis2_util.c (nonexistent) +++ head/www/nginx/files/extra-patch-ngx_http_redis2_util.c (revision 439421) @@ -0,0 +1,18 @@ +--- ../redis2-nginx-module-0.12/src/ngx_http_redis2_util.c.orig 2016-11-20 15:00:28.997903000 -0500 ++++ ../redis2-nginx-module-0.12/src/ngx_http_redis2_util.c 2016-11-20 15:00:44.173323000 -0500 +@@ -77,6 +77,7 @@ + continue; + } + ++#if (nginx_version < 1011006) + if (uscfp[i]->default_port + && url->default_port + && uscfp[i]->default_port != url->default_port) +@@ -84,6 +85,7 @@ + dd("upstream_add: default_port not match"); + continue; + } ++#endif + + return uscfp[i]; + } Property changes on: head/www/nginx/files/extra-patch-ngx_http_redis2_util.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/nginx/files/extra-patch-ngx_http_sticky_misc.c =================================================================== --- head/www/nginx/files/extra-patch-ngx_http_sticky_misc.c (nonexistent) +++ head/www/nginx/files/extra-patch-ngx_http_sticky_misc.c (revision 439421) @@ -0,0 +1,17 @@ +--- ../nginx-goodies-nginx-sticky-module-ng-08a395c66e42/ngx_http_sticky_misc.c.orig 2016-07-10 11:39:07.943834000 -0400 ++++ ../nginx-goodies-nginx-sticky-module-ng-08a395c66e42/ngx_http_sticky_misc.c 2016-07-10 11:43:05.601078000 -0400 +@@ -12,6 +12,14 @@ + + #include "ngx_http_sticky_misc.h" + ++#ifndef MD5_DIGEST_LENGTH ++ #define MD5_DIGEST_LENGTH 16 ++#endif ++#ifndef MD5_CBLOCK ++ #define MD5_CBLOCK 64 ++#endif ++ ++ + #ifndef ngx_str_set + #define ngx_str_set(str, text) (str)->len = sizeof(text) - 1; (str)->data = (u_char *) text + #endif Property changes on: head/www/nginx/files/extra-patch-ngx_http_sticky_misc.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/nginx/files/extra-patch-ngx_http_upstream_fair_module.c.n =================================================================== --- head/www/nginx/files/extra-patch-ngx_http_upstream_fair_module.c.n (nonexistent) +++ head/www/nginx/files/extra-patch-ngx_http_upstream_fair_module.c.n (revision 439421) @@ -0,0 +1,21 @@ +--- ../nginx_upstream_fair-20090923/ngx_http_upstream_fair_module.c.orig 2016-11-20 15:42:48.550372000 -0500 ++++ ../nginx_upstream_fair-20090923/ngx_http_upstream_fair_module.c 2016-11-20 15:45:24.507554000 -0500 +@@ -565,8 +565,7 @@ + + + /* an upstream implicitly defined by proxy_pass, etc. */ +- +- if (us->port == 0 && us->default_port == 0) { ++ if (us->port == 0) { + ngx_log_error(NGX_LOG_EMERG, cf->log, 0, + "no port in upstream \"%V\" in %s:%ui", + &us->host, us->file_name, us->line); +@@ -576,7 +575,7 @@ + ngx_memzero(&u, sizeof(ngx_url_t)); + + u.host = us->host; +- u.port = (in_port_t) (us->port ? us->port : us->default_port); ++ u.port = (in_port_t) us->port; + + if (ngx_inet_resolve_host(cf->pool, &u) != NGX_OK) { + if (u.err) { Property changes on: head/www/nginx/files/extra-patch-ngx_http_upstream_fair_module.c.n ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/nginx/files/extra-patch-ngx_inet_slab.c =================================================================== --- head/www/nginx/files/extra-patch-ngx_inet_slab.c (nonexistent) +++ head/www/nginx/files/extra-patch-ngx_inet_slab.c (revision 439421) @@ -0,0 +1,29 @@ +--- ../ngx_dynamic_upstream-0.1.3/src/ngx_inet_slab.c.orig 2016-05-25 19:27:27.204200000 -0400 ++++ ../ngx_dynamic_upstream-0.1.3/src/ngx_inet_slab.c 2016-05-25 19:28:07.177622000 -0400 +@@ -250,7 +250,7 @@ + return NGX_ERROR; + } + +- ngx_memcpy(sin, u->sockaddr, sizeof(struct sockaddr_in)); ++ ngx_memcpy(sin, &u->sockaddr, sizeof(struct sockaddr_in)); + + u->addrs[0].sockaddr = (struct sockaddr *) sin; + u->addrs[0].socklen = sizeof(struct sockaddr_in); +@@ -277,7 +277,7 @@ + + u->family = u->addrs[0].sockaddr->sa_family; + u->socklen = u->addrs[0].socklen; +- ngx_memcpy(u->sockaddr, u->addrs[0].sockaddr, u->addrs[0].socklen); ++ ngx_memcpy(&u->sockaddr, u->addrs[0].sockaddr, u->addrs[0].socklen); + + switch (u->family) { + +@@ -405,7 +405,7 @@ + return NGX_ERROR; + } + +- ngx_memcpy(sin6, u->sockaddr, sizeof(struct sockaddr_in6)); ++ ngx_memcpy(sin6, &u->sockaddr, sizeof(struct sockaddr_in6)); + + u->addrs[0].sockaddr = (struct sockaddr *) sin6; + u->addrs[0].socklen = sizeof(struct sockaddr_in6); Property changes on: head/www/nginx/files/extra-patch-ngx_inet_slab.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/nginx/files/extra-patch-ngx_postgres_module.c =================================================================== --- head/www/nginx/files/extra-patch-ngx_postgres_module.c (nonexistent) +++ head/www/nginx/files/extra-patch-ngx_postgres_module.c (revision 439421) @@ -0,0 +1,17 @@ +--- ../ngx_postgres-1.0rc7/src/ngx_postgres_module.c.orig 2016-11-20 15:34:25.763542000 -0500 ++++ ../ngx_postgres-1.0rc7/src/ngx_postgres_module.c 2016-11-20 15:34:41.023867000 -0500 +@@ -1320,12 +1320,14 @@ + continue; + } + ++#if (nginx_version < 1011006) + if (uscfp[i]->default_port && url->default_port + && (uscfp[i]->default_port != url->default_port)) + { + dd("default_port doesn't match"); + continue; + } ++#endif + + dd("returning"); + return uscfp[i]; Property changes on: head/www/nginx/files/extra-patch-ngx_postgres_module.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/nginx/files/extra-patch-spnego-http-auth-nginx-module-config =================================================================== --- head/www/nginx/files/extra-patch-spnego-http-auth-nginx-module-config (revision 439420) +++ head/www/nginx/files/extra-patch-spnego-http-auth-nginx-module-config (revision 439421) @@ -1,8 +1,9 @@ ---- ../spnego-http-auth-nginx-module-c85a38c/config.orig 2015-06-13 20:49:15.590751000 +0300 -+++ ../spnego-http-auth-nginx-module-c85a38c/config 2015-06-13 20:49:31.024936000 +0300 -@@ -1,4 +1,4 @@ +--- ../spnego-http-auth-nginx-module-0c6ff3f/config.orig 2017-04-15 13:07:01.159506000 -0400 ++++ ../spnego-http-auth-nginx-module-0c6ff3f/config 2017-04-15 13:07:36.283398000 -0400 +@@ -1,5 +1,5 @@ ngx_addon_name=ngx_http_auth_spnego_module - HTTP_MODULES="$HTTP_MODULES ngx_http_auth_spnego_module" - NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_auth_spnego_module.c" --CORE_LIBS="$CORE_LIBS -lgssapi_krb5 -lkrb5 -lcom_err" -+CORE_LIBS="$CORE_LIBS %%GSSAPILIBS%% -lcom_err" +-ngx_feature_libs="-lgssapi_krb5 -lkrb5 -lcom_err" ++ngx_feature_libs="%%GSSAPILIBS%% -lcom_err" + + if uname -o | grep -q FreeBSD; then + ngx_feature_libs="$ngx_feature_libs -lgssapi" Index: head/www/nginx/files/extra-patch-src-c-ngx_http_clojure_socket.c =================================================================== --- head/www/nginx/files/extra-patch-src-c-ngx_http_clojure_socket.c (nonexistent) +++ head/www/nginx/files/extra-patch-src-c-ngx_http_clojure_socket.c (revision 439421) @@ -0,0 +1,11 @@ +--- ../nginx-clojure-0.4.4/src/c/ngx_http_clojure_socket.c.orig 2016-05-24 17:39:48.898351000 -0400 ++++ ../nginx-clojure-0.4.4/src/c/ngx_http_clojure_socket.c 2016-05-25 19:23:44.584704000 -0400 +@@ -317,7 +317,7 @@ + } + u->resolved->host.data = url->host.data; + u->resolved->host.len = url->host.len; +- ngx_http_clojure_socket_upstream_connect(u, (struct sockaddr *)url->sockaddr, url->socklen); ++ ngx_http_clojure_socket_upstream_connect(u, &url->sockaddr, url->socklen); + } + + static void ngx_http_clojure_socket_upstream_connect_inner(ngx_http_clojure_socket_upstream_t *u) { Property changes on: head/www/nginx/files/extra-patch-src-c-ngx_http_clojure_socket.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/nginx/files/extra-patch-src-http-ngx_http_upstream_round_robin.h =================================================================== --- head/www/nginx/files/extra-patch-src-http-ngx_http_upstream_round_robin.h (revision 439420) +++ head/www/nginx/files/extra-patch-src-http-ngx_http_upstream_round_robin.h (revision 439421) @@ -1,13 +1,14 @@ ---- src/http/ngx_http_upstream_round_robin.h.orig 2016-02-24 14:53:24 UTC -+++ src/http/ngx_http_upstream_round_robin.h -@@ -35,6 +35,10 @@ struct ngx_http_upstream_rr_peer_s { +--- src/http/ngx_http_upstream_round_robin.h.orig 2016-10-11 11:03:02.000000000 -0400 ++++ src/http/ngx_http_upstream_round_robin.h 2016-10-11 19:56:33.262307000 -0400 +@@ -35,6 +35,11 @@ + ngx_uint_t max_fails; time_t fail_timeout; - ++ +#if (NGX_HTTP_UPSTREAM_CHECK) + ngx_uint_t check_index; +#endif + - ngx_uint_t down; /* unsigned down:1; */ + ngx_msec_t slow_start; + ngx_msec_t start_time; - #if (NGX_HTTP_SSL)