From f6bac9b95f3635f797510c988a93607eca4e6c49 Mon Sep 17 00:00:00 2001 From: Xavier Beaudouin Date: Wed, 4 Sep 2024 16:25:31 +0200 Subject: [PATCH] Removed --- www/nginx-devel_test/Makefile | 382 --------------- www/nginx-devel_test/Makefile.extmod | 326 ------------- www/nginx-devel_test/Makefile.options.desc | 117 ----- www/nginx-devel_test/distinfo | 141 ------ ...xtra-patch-calio-iconv-nginx-module-config | 19 - .../extra-patch-naxsi-libinjection__sqli_c | 13 - .../files/extra-patch-naxsi_config | 26 - .../files/extra-patch-nginx-ct-LibreSSL | 20 - ...xtra-patch-nginx-http-footer-filter-config | 12 - .../extra-patch-nginx-link-function-config | 42 -- .../files/extra-patch-nginx-notice-config | 13 - ...a-patch-nginx-thumbextractor-module-config | 25 - .../extra-patch-nginx_mogilefs_module-config | 13 - .../extra-patch-ngx_brotli_filter_config | 41 -- .../extra-patch-ngx_http_auth_ldap_module.c | 10 - .../extra-patch-ngx_http_dav_ext_module.c | 15 - ...a-patch-ngx_http_json_status_module-config | 12 - .../extra-patch-ngx_http_mogilefs_module.c | 12 - .../extra-patch-ngx_http_notice_module.c | 11 - .../files/extra-patch-ngx_http_redis_module.c | 34 -- .../files/extra-patch-ngx_http_sflow_config.c | 10 - .../files/extra-patch-ngx_http_sflow_config.h | 11 - .../files/extra-patch-ngx_http_sflow_module.c | 59 --- .../extra-patch-ngx_http_tarantool-config | 24 - ...tra-patch-ngx_http_uploadprogress_module.c | 73 --- .../files/extra-patch-ngx_link_func_module.c | 11 - .../files/extra-patch-ngx_postgres-config | 19 - ...atch-openresty-drizzle-nginx-module-config | 42 -- .../extra-patch-passenger-build-nginx.rb | 33 -- .../extra-patch-passenger-disable-telemetry | 11 - .../extra-patch-rds-csv-nginx-module-config | 15 - .../extra-patch-rds-json-nginx-module-config | 15 - ...patch-spnego-http-auth-nginx-module-config | 14 - ...tp-modules-ngx_http_upstream_hash_module.c | 44 -- ...modules-ngx_http_upstream_ip_hash_module.c | 28 -- ...ules-ngx_http_upstream_least_conn_module.c | 46 -- ...h-src-http-ngx_http_upstream_round_robin.c | 101 ---- ...h-src-http-ngx_http_upstream_round_robin.h | 14 - ...c_http_modules_ngx_http_slice_read_ahead.c | 456 ------------------ .../files/extra-patch-xss-nginx-module-config | 15 - www/nginx-devel_test/files/nginx.in | 158 ------ .../files/patch-conf-nginx.conf | 47 -- www/nginx-devel_test/files/pkg-message.in | 25 - www/nginx-devel_test/pkg-descr | 8 - www/nginx-devel_test/pkg-plist | 104 ---- 45 files changed, 2667 deletions(-) delete mode 100644 www/nginx-devel_test/Makefile delete mode 100644 www/nginx-devel_test/Makefile.extmod delete mode 100644 www/nginx-devel_test/Makefile.options.desc delete mode 100644 www/nginx-devel_test/distinfo delete mode 100644 www/nginx-devel_test/files/extra-patch-calio-iconv-nginx-module-config delete mode 100644 www/nginx-devel_test/files/extra-patch-naxsi-libinjection__sqli_c delete mode 100644 www/nginx-devel_test/files/extra-patch-naxsi_config delete mode 100644 www/nginx-devel_test/files/extra-patch-nginx-ct-LibreSSL delete mode 100644 www/nginx-devel_test/files/extra-patch-nginx-http-footer-filter-config delete mode 100644 www/nginx-devel_test/files/extra-patch-nginx-link-function-config delete mode 100644 www/nginx-devel_test/files/extra-patch-nginx-notice-config delete mode 100644 www/nginx-devel_test/files/extra-patch-nginx-thumbextractor-module-config delete mode 100644 www/nginx-devel_test/files/extra-patch-nginx_mogilefs_module-config delete mode 100644 www/nginx-devel_test/files/extra-patch-ngx_brotli_filter_config delete mode 100644 www/nginx-devel_test/files/extra-patch-ngx_http_auth_ldap_module.c delete mode 100644 www/nginx-devel_test/files/extra-patch-ngx_http_dav_ext_module.c delete mode 100644 www/nginx-devel_test/files/extra-patch-ngx_http_json_status_module-config delete mode 100644 www/nginx-devel_test/files/extra-patch-ngx_http_mogilefs_module.c delete mode 100644 www/nginx-devel_test/files/extra-patch-ngx_http_notice_module.c delete mode 100644 www/nginx-devel_test/files/extra-patch-ngx_http_redis_module.c delete mode 100644 www/nginx-devel_test/files/extra-patch-ngx_http_sflow_config.c delete mode 100644 www/nginx-devel_test/files/extra-patch-ngx_http_sflow_config.h delete mode 100644 www/nginx-devel_test/files/extra-patch-ngx_http_sflow_module.c delete mode 100644 www/nginx-devel_test/files/extra-patch-ngx_http_tarantool-config delete mode 100644 www/nginx-devel_test/files/extra-patch-ngx_http_uploadprogress_module.c delete mode 100644 www/nginx-devel_test/files/extra-patch-ngx_link_func_module.c delete mode 100644 www/nginx-devel_test/files/extra-patch-ngx_postgres-config delete mode 100644 www/nginx-devel_test/files/extra-patch-openresty-drizzle-nginx-module-config delete mode 100644 www/nginx-devel_test/files/extra-patch-passenger-build-nginx.rb delete mode 100644 www/nginx-devel_test/files/extra-patch-passenger-disable-telemetry delete mode 100644 www/nginx-devel_test/files/extra-patch-rds-csv-nginx-module-config delete mode 100644 www/nginx-devel_test/files/extra-patch-rds-json-nginx-module-config delete mode 100644 www/nginx-devel_test/files/extra-patch-spnego-http-auth-nginx-module-config delete mode 100644 www/nginx-devel_test/files/extra-patch-src-http-modules-ngx_http_upstream_hash_module.c delete mode 100644 www/nginx-devel_test/files/extra-patch-src-http-modules-ngx_http_upstream_ip_hash_module.c delete mode 100644 www/nginx-devel_test/files/extra-patch-src-http-modules-ngx_http_upstream_least_conn_module.c delete mode 100644 www/nginx-devel_test/files/extra-patch-src-http-ngx_http_upstream_round_robin.c delete mode 100644 www/nginx-devel_test/files/extra-patch-src-http-ngx_http_upstream_round_robin.h delete mode 100644 www/nginx-devel_test/files/extra-patch-src_http_modules_ngx_http_slice_read_ahead.c delete mode 100644 www/nginx-devel_test/files/extra-patch-xss-nginx-module-config delete mode 100644 www/nginx-devel_test/files/nginx.in delete mode 100644 www/nginx-devel_test/files/patch-conf-nginx.conf delete mode 100644 www/nginx-devel_test/files/pkg-message.in delete mode 100644 www/nginx-devel_test/pkg-descr delete mode 100644 www/nginx-devel_test/pkg-plist diff --git a/www/nginx-devel_test/Makefile b/www/nginx-devel_test/Makefile deleted file mode 100644 index ca3cc68..0000000 --- a/www/nginx-devel_test/Makefile +++ /dev/null @@ -1,382 +0,0 @@ -PORTNAME?= nginx -PORTVERSION= 1.25.4 -PORTREVISION= 6 -CATEGORIES= www -MASTER_SITES= https://nginx.org/download/ \ - LOCAL/osa -PKGNAMESUFFIX?= -devel -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} - -MAINTAINER?= osa@FreeBSD.org -COMMENT?= Robust and small WWW server -WWW= https://nginx.com/ - -LICENSE?= BSD2CLAUSE -LICENSE_FILE?= ${WRKSRC}/LICENSE - -CONFLICTS_INSTALL= nginx - -PORTSCOUT= limit:^1\.2[4-5]\.[0-9]* - -USES= cpe - -CPE_VENDOR= f5 -CPE_PRODUCT= nginx -USE_GITHUB= nodefault - -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-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" \ - --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} \ - --with-compat \ - --with-pcre -ALL_TARGET= - -PLIST_SUB+= NGINX_TMPDIR=${NGINX_TMPDIR} NGINX_LOGDIR=${NGINX_LOGDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} - -USERS?= ${WWWOWN} -GROUPS?=${WWWGRP} - -NO_OPTIONS_SORT= yes - -OPTIONS_GROUP= HTTPGRP MAILGRP STREAMGRP -# Modules that are part of the base nginx distribution -OPTIONS_GROUP_HTTPGRP= GOOGLE_PERFTOOLS HTTP HTTP_ADDITION HTTP_AUTH_REQ \ - HTTP_CACHE HTTP_DAV HTTP_DEGRADATION HTTP_FLV HTTP_GUNZIP_FILTER \ - HTTP_GZIP_STATIC HTTP_IMAGE_FILTER HTTP_MP4 HTTP_PERL \ - HTTP_RANDOM_INDEX HTTP_REALIP HTTP_SECURE_LINK HTTP_SLICE HTTP_SSL \ - HTTP_STATUS HTTP_SUB HTTP_XSLT HTTPV2 HTTPV3 HTTPV3_BORING HTTPV3_LSSL \ - HTTPV3_QTLS - -OPTIONS_GROUP_MAILGRP= MAIL MAIL_IMAP MAIL_POP3 MAIL_SMTP MAIL_SSL - -OPTIONS_GROUP_STREAMGRP= STREAM STREAM_REALIP STREAM_SSL \ - STREAM_SSL_PREREAD - -OPTIONS_DEFINE= DEBUG DEBUGLOG DSO FILE_AIO IPV6 NJS NJS_XML OTEL THREADS WWW -OPTIONS_DEFAULT?= DSO FILE_AIO HTTP HTTP_ADDITION HTTP_AUTH_REQ HTTP_CACHE \ - HTTP_DAV HTTP_FLV HTTP_GUNZIP_FILTER HTTP_GZIP_STATIC HTTP_MP4 \ - HTTP_RANDOM_INDEX HTTP_REALIP HTTP_SECURE_LINK HTTP_SLICE HTTP_SSL \ - HTTP_STATUS HTTP_SUB HTTPV2 HTTPV3 MAIL MAIL_SSL STREAM \ - STREAM_REALIP STREAM_SSL STREAM_SSL_PREREAD THREADS WWW - -LIB_DEPENDS+= libpcre2-8.so:devel/pcre2 - -OPTIONS_RADIO+= GSSAPI -OPTIONS_RADIO_GSSAPI= GSSAPI_HEIMDAL GSSAPI_MIT -GSSAPI_HEIMDAL_USES= gssapi:heimdal,flags -GSSAPI_MIT_USES= gssapi:mit - -OPTIONS_SUB= yes - -.include "Makefile.options.desc" - -.for opt in ${OPTIONS_GROUP_MAILGRP:NMAIL} -${opt}_IMPLIES= MAIL -.endfor - -.for opt in ${OPTIONS_GROUP_HTTPGRP:NHTTP} WWW -${opt}_IMPLIES= HTTP -.endfor - -.for opt in ${OPTIONS_GROUP_STREAMGRP:NSTREAM} -${opt}_IMPLIES= STREAM -.endfor - -GSSAPI_HEIMDAL_IMPLIES= HTTP_AUTH_KRB5 -GSSAPI_MIT_IMPLIES= HTTP_AUTH_KRB5 - -# If the target is makesum, make sure that every distfile is fetched. -.if ${.TARGETS:Mmakesum} -OPTIONS_DEFAULT= ${OPTIONS_DEFINE} ${OPTIONS_GROUP_HTTPGRP} \ - ${OPTIONS_GROUP_MAILGRP} ${OPTIONS_GROUP_STREAMGRP} \ - ${OPTIONS_GROUP_THIRDPARTYGRP} -.endif - -# Non-module options handling -DEBUG_CFLAGS= -g -DEBUG_VARS= STRIP=#do not strip if nginx with debug information -DEBUGLOG_CONFIGURE_ON= --with-debug -DSO_CONFIGURE_ON= --modules-path=${MODULESDIR} -DSO_VARS= MODULESDIR=${PREFIX}/libexec/${PORTNAME} -FILE_AIO_CONFIGURE_ON= --with-file-aio -IPV6_CONFIGURE_OFF= --with-cc-opt="-DNGX_HAVE_INET6=0 -I ${LOCALBASE}/include" -THREADS_CONFIGURE_ON= --with-threads - -# Bundled modules -GOOGLE_PERFTOOLS_LIB_DEPENDS= libprofiler.so:devel/google-perftools -GOOGLE_PERFTOOLS_CONFIGURE_ON= --with-google_perftools_module -HTTP_CONFIGURE_ON= --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} -HTTP_CONFIGURE_OFF= --without-http -HTTP_ADDITION_CONFIGURE_ON= --with-http_addition_module -HTTP_AUTH_REQ_CONFIGURE_ON= --with-http_auth_request_module -HTTP_CACHE_CONFIGURE_OFF= --without-http-cache -HTTP_DAV_CONFIGURE_ON= --with-http_dav_module -HTTP_DEGRADATION_CONFIGURE_ON= --with-http_degradation_module -HTTP_FLV_CONFIGURE_ON= --with-http_flv_module -HTTP_GZIP_STATIC_CONFIGURE_ON= --with-http_gzip_static_module -HTTP_GUNZIP_FILTER_CONFIGURE_ON=--with-http_gunzip_module -HTTP_IMAGE_FILTER_LIB_DEPENDS= libgd.so:graphics/gd -HTTP_IMAGE_FILTER_VARS= DSO_BASEMODS+=http_image_filter_module -HTTP_MP4_CONFIGURE_ON= --with-http_mp4_module -HTTP_PERL_CATEGORIES= perl5 -HTTP_PERL_USES= perl5 -# Fix build failure on clang >= 12 -HTTP_PERL_CFLAGS= -Wno-compound-token-split-by-macro -HTTP_PERL_VARS= DSO_BASEMODS+=http_perl_module -HTTP_RANDOM_INDEX_CONFIGURE_ON= --with-http_random_index_module -HTTP_REALIP_CONFIGURE_ON= --with-http_realip_module -HTTP_SECURE_LINK_CONFIGURE_ON= --with-http_secure_link_module -HTTP_SLICE_CONFIGURE_ON= --with-http_slice_module -HTTP_SSL_CONFIGURE_ON= --with-http_ssl_module -HTTP_SSL_USES= ssl -HTTP_STATUS_CONFIGURE_ON= --with-http_stub_status_module -HTTP_SUB_CONFIGURE_ON= --with-http_sub_module -HTTP_XSLT_CONFIGURE_ON= --with-http_xslt_module -HTTP_XSLT_LIB_DEPENDS= libxml2.so:textproc/libxml2 \ - libxslt.so:textproc/libxslt -HTTP_XSLT_VARS= DSO_BASEMODS+=http_xslt_module -HTTPV2_IMPLIES= HTTP_SSL -HTTPV2_CONFIGURE_ON= --with-http_v2_module -HTTPV3_CONFIGURE_ON= --with-http_v3_module -HTTPV3_BORING_BUILD_DEPENDS= ${LOCALBASE}/bin/bssl:security/boringssl -HTTPV3_BORING_RUN_DEPENDS= ${LOCALBASE}/bin/bssl:security/boringssl -HTTPV3_BORING_IMPLIES= HTTPV3 -HTTPV3_BORING_PREVENTS= HTTPV3_LSSL HTTPV3_QTLS -HTTPV3_LSSL_BUILD_DEPENDS= ${LOCALBASE}/include/tls.h:security/libressl-devel -HTTPV3_LSSL_BUILD_DEPENDS= ${LOCALBASE}/include/tls.h:security/libressl-devel -HTTPV3_LSSL_IMPLIES= HTTPV3 -HTTPV3_LSSL_PREVENTS= HTTPV3_BORING HTTPV3_QTLS -HTTPV3_QTLS_BUILD_DEPENDS= ${LOCALBASE}/include/openssl/quic.h:security/openssl-quictls -HTTPV3_QTLS_RUN_DEPENDS= ${LOCALBASE}/include/openssl/quic.h:security/openssl-quictls -HTTPV3_QTLS_IMPLIES= HTTPV3 -HTTPV3_QTLS_PREVENTS= HTTPV3_BORING HTTPV3_LSSL -MAIL_VARS= DSO_BASEMODS+=mail -MAIL_IMAP_CONFIGURE_OFF= --without-mail_imap_module -MAIL_POP3_CONFIGURE_OFF= --without-mail_pop3_module -MAIL_SMTP_CONFIGURE_OFF= --without-mail_smtp_module -MAIL_SSL_USES= ssl -MAIL_SSL_CONFIGURE_ON= --with-mail_ssl_module -STREAM_VARS= DSO_BASEMODS+=stream -STREAM_REALIP_CONFIGURE_ON= --with-stream_realip_module -STREAM_SSL_USES= ssl -STREAM_SSL_CONFIGURE_ON= --with-stream_ssl_module -STREAM_SSL_PREREAD_CONFIGURE_ON=--with-stream_ssl_preread_module - -### External modules -.include "Makefile.extmod" - -.include - -.if ${PORT_OPTIONS:MDSO} -_addbasemod= =dynamic -_addextmod= add-dynamic-module -.else -_addextmod= add-module -.endif - -.for mod in ${DSO_BASEMODS} -CONFIGURE_ARGS+= --with-${mod}${_addbasemod} -.endfor - -# Some modules depend on other being there before, for example, devel_kit needs -# to be there before a few other. -.for mod in ${FIRST_DSO_EXTMODS} -CONFIGURE_ARGS+= --${_addextmod}=${WRKSRC_${mod}}${${mod:tu}_SUBDIR} -.endfor - -.for mod in ${DSO_EXTMODS} -CONFIGURE_ARGS+= --${_addextmod}=${WRKSRC_${mod}}${${mod:tu}_SUBDIR} -.endfor -# For non-GitHub hosted modules -.for moddir in ${DSO_EXTDIRS} -CONFIGURE_ARGS+= --${_addextmod}=${WRKDIR}/${moddir} -.endfor - -.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:MHTTP_AUTH_KRB5} && (empty(PORT_OPTIONS:MGSSAPI_HEIMDAL) && empty(PORT_OPTIONS:MGSSAPI_MIT)) -IGNORE= required at least GSSAPI_HEIMDAL or \ - GSSAPI_MIT to be defined. Please do \ - 'make config' again -.endif - -.if ${PORT_OPTIONS:MPASSENGER} && empty(PORT_OPTIONS:MDEBUG) -CONFIGURE_ENV+= OPTIMIZE="yes" -CFLAGS+= -DNDEBUG -.endif - -.if ${PORT_OPTIONS:MPASSENGER} -CONFIGURE_ENV+= EXTRA_PRE_CXXFLAGS="-std=c++14" -.endif - -.if empty(PORT_OPTIONS:MMODSECURITY3) && empty(PORT_OPTIONS:MPASSENGER) -CONFIGURE_ARGS+= --with-ld-opt="-L ${LOCALBASE}/lib" -.else -CONFIGURE_ARGS+= --with-ld-opt="-L ${LOCALBASE}/lib -lpcre" -LIB_DEPENDS+= libpcre.so:devel/pcre -.endif - -.if ${PORT_OPTIONS:MNJS} && empty(PORT_OPTIONS:MNJS_XML) -CONFIGURE_ENV+= NJS_LIBXSLT=NO -NJS_CONFIGURE_ARGS= --no-libxml2 -.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-NAXSI-on: - @${RMDIR} ${WRKSRC_naxsi}/naxsi_src/libinjection - @${LN} -s ${WRKSRC_libinjection} ${WRKSRC_naxsi}/naxsi_src/libinjection - -pre-patch-HTTPV3-on: - @${MV} ${WRKSRC}/README ${WRKSRC}/README.1st - -post-patch: - @${REINPLACE_CMD} 's!%%HTTP_PORT%%!${HTTP_PORT}!; \ - s!%%PREFIX%%!${PREFIX}!; \ - s!%%NGINX_ERRORLOG%%!${NGINX_ERRORLOG}!' \ - ${WRKSRC}/conf/nginx.conf - -post-patch-BROTLI-on: - @${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_brotli}/filter/config - -post-patch-DRIZZLE-on: - @${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_drizzle}/config - -post-patch-FASTDFS-on: - @${REINPLACE_CMD} \ - 's!%%PREFIX%%!${PREFIX}!g;s!%%LOCALBASE%%!${LOCALBASE}!g' \ - ${WRKSRC_fastdfs}/src/config - -post-patch-GRIDFS-on: - @${REINPLACE_CMD} 's!\/usr!${LOCALBASE}!g' \ - ${WRKSRC_gridfs}/nginx-gridfs/config - -post-patch-HTTP_AUTH_KRB5-on: - @${REINPLACE_CMD} 's!%%GSSAPILIBS%%!${GSSAPILIBS}!g; \ - s!%%GSSAPIINCDIR%%!${GSSAPIINCDIR}!g; \ - s!%%GSSAPILIBDIR%%!${GSSAPILIBDIR}!g' ${WRKSRC_auth_krb5}/config - -post-patch-HTTP_TARANTOOL-on: - @${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_nginx_tarantool}/config - -post-patch-ICONV-on: - @${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_iconv}/config - -post-patch-PASSENGER-on: - @${REINPLACE_CMD} \ - '168,170s!true!false!' \ - ${WRKSRC_PASSENGER}/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!!' \ - ${WRKSRC_PASSENGER}/build/common_library.rb - -post-patch-POSTGRES-on: - @${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_postgres}/config - -post-patch-SFLOW-on: - @${REINPLACE_CMD} \ - 's!%%PREFIX%%!${LOCALBASE}!g' \ - ${WRKSRC_sflow}/ngx_http_sflow_config.h - -pre-configure-SMALL_LIGHT-on: - ( cd ${WRKSRC_small_light} && ./setup ) - -do-configure-NJS-on: - ( cd ${WRKSRC_njs} && ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} ${NJS_CONFIGURE_ARGS} ) - -.if !target(do-install) -do-install: - ${MKDIR} ${STAGEDIR}${ETCDIR} - ${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 - -do-install-HTTP_PERL-on: - ${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}/ - -# Install dynamic modules -do-install-DSO-on: - ${MKDIR} ${STAGEDIR}${MODULESDIR} - (cd ${WRKSRC}/objs/ && ${FIND} . -name '*.so' -maxdepth 1 -type f \ - -exec ${INSTALL_PROGRAM} {} ${STAGEDIR}${MODULESDIR} \;) - -do-install-LINK-on: - ${INSTALL_DATA} ${WRKSRC_link}/src/ngx_link_func_module.h ${STAGEDIR}${PREFIX}/include - -do-install-NAXSI-on: - ${INSTALL_DATA} \ - ${WRKDIR}/naxsi-${NAXSI_NGINX_VER}/naxsi_rules/naxsi_core.rules \ - ${STAGEDIR}${ETCDIR} -.endif - -.if !target(post-install) -post-install: - ${MKDIR} ${STAGEDIR}${PREFIX}/share/vim/vimfiles - cd ${WRKSRC}/contrib/vim && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share/vim/vimfiles - ${INSTALL_MAN} ${WRKSRC}/objs/nginx.8 ${STAGEDIR}${PREFIX}/share/man/man8 - ${CAT} ${WRKSRC}/conf/nginx.conf >> ${STAGEDIR}${ETCDIR}/nginx.conf-dist - -post-install-WWW-on: - ${MKDIR} ${STAGEDIR}${PREFIX}/www/nginx-dist - (cd ${WRKSRC}/html && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/www/nginx-dist && \ - ${TOUCH} ${STAGEDIR}${PREFIX}/www/nginx-dist/EXAMPLE_DIRECTORY-DONT_ADD_OR_TOUCH_ANYTHING) -.endif - -.include diff --git a/www/nginx-devel_test/Makefile.extmod b/www/nginx-devel_test/Makefile.extmod deleted file mode 100644 index 47dfb3d..0000000 --- a/www/nginx-devel_test/Makefile.extmod +++ /dev/null @@ -1,326 +0,0 @@ -### External modules - -OPTIONS_GROUP+= THIRDPARTYGRP -# External modules (arrayvar MUST appear after devel_kit for build-dep) -OPTIONS_GROUP_THIRDPARTYGRP= AJP AWS_AUTH BROTLI CACHE_PURGE CT \ - DEVEL_KIT ARRAYVAR DRIZZLE DYNAMIC_UPSTREAM ECHO ENCRYPTSESSION \ - FIPS_CHECK FORMINPUT GRIDFS HEADERS_MORE HTTP_ACCEPT_LANGUAGE HTTP_AUTH_DIGEST \ - HTTP_AUTH_KRB5 HTTP_AUTH_LDAP HTTP_AUTH_PAM HTTP_DAV_EXT HTTP_EVAL \ - HTTP_FANCYINDEX HTTP_FOOTER HTTP_GEOIP2 HTTP_IP2LOCATION HTTP_IP2PROXY \ - HTTP_JSON_STATUS HTTP_MOGILEFS HTTP_NOTICE HTTP_PUSH \ - HTTP_PUSH_STREAM HTTP_REDIS HTTP_SLICE_AHEAD HTTP_SUBS_FILTER HTTP_TARANTOOL \ - HTTP_UPLOAD HTTP_UPLOAD_PROGRESS HTTP_UPSTREAM_CHECK HTTP_UPSTREAM_FAIR \ - HTTP_UPSTREAM_STICKY HTTP_VIDEO_THUMBEXTRACTOR HTTP_ZIP ICONV LET LINK LUA LUASTREAM MEMC \ - MODSECURITY3 NAXSI PASSENGER POSTGRES RDS_CSV RDS_JSON \ - REDIS2 RTMP SET_MISC SFLOW SHIBBOLETH SLOWFS_CACHE SRCACHE STS \ - VOD VTS XSS WEBSOCKIFY - -AJP_GH_TUPLE= msva:nginx_ajp_module:fcbb2cc:ajp -AJP_VARS= DSO_EXTMODS+=ajp - -ARRAYVAR_IMPLIES= DEVEL_KIT -ARRAYVAR_GH_TUPLE= openresty:array-var-nginx-module:v0.05:arrayvar -ARRAYVAR_VARS= DSO_EXTMODS+=arrayvar - -AWS_AUTH_GH_TUPLE= anomalizer:ngx_aws_auth:21931b2:aws_auth -AWS_AUTH_VARS= DSO_EXTMODS+=aws_auth - -BROTLI_LIB_DEPENDS= libbrotlicommon.so:archivers/brotli -BROTLI_GH_TUPLE= google:ngx_brotli:a71f931:brotli -BROTLI_VARS= DSO_EXTMODS+=brotli -BROTLI_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_brotli_filter_config - -CACHE_PURGE_GH_TUPLE= nginx-modules:ngx_cache_purge:a84b0f3:cache_purge -CACHE_PURGE_VARS= DSO_EXTMODS+=cache_purge - -CT_IMPLIES= HTTP_SSL -CT_GH_TUPLE= grahamedgecombe:nginx-ct:93e9884:ct -CT_VARS= DSO_EXTMODS+=ct -CT_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-nginx-ct-LibreSSL - -ECHO_GH_TUPLE= openresty:echo-nginx-module:5a402aa:echo -ECHO_VARS= DSO_EXTMODS+=echo - -DRIZZLE_LIB_DEPENDS= libdrizzle.so:databases/libdrizzle -DRIZZLE_CONFIGURE_ENV= LIBDRIZZLE_INC=${LOCALBASE}/include \ - LIBDRIZZLE_LIB=${LOCALBASE}/lib -DRIZZLE_GH_TUPLE= openresty:drizzle-nginx-module:3504fc6:drizzle -DRIZZLE_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-openresty-drizzle-nginx-module-config -DRIZZLE_VARS= DSO_EXTMODS+=drizzle - -DYNAMIC_UPSTREAM_IMPLIES= STREAM -DYNAMIC_UPSTREAM_GH_TUPLE= ZigzagAK:ngx_dynamic_upstream:960eef2:dynamic_upstream -DYNAMIC_UPSTREAM_VARS= DSO_EXTMODS+=dynamic_upstream - -DEVEL_KIT_GH_TUPLE= vision5:ngx_devel_kit:v0.3.3:devel_kit -DEVEL_KIT_VARS= FIRST_DSO_EXTMODS+=devel_kit - -ENCRYPTSESSION_IMPLIES= DEVEL_KIT -ENCRYPTSESSION_GH_TUPLE= openresty:encrypted-session-nginx-module:v0.09:encryptsession -ENCRYPTSESSION_VARS= DSO_EXTMODS+=encryptsession - -FIPS_CHECK_GH_TUPLE= ogarrett:nginx-fips-check-module:6cb4270:fipscheck -FIPS_CHECK_VARS= DSO_EXTMODS+=fipscheck - -FORMINPUT_IMPLIES= DEVEL_KIT -FORMINPUT_GH_TUPLE= calio:form-input-nginx-module:v0.12:forminput -FORMINPUT_VARS= DSO_EXTMODS+=forminput - -GRIDFS_GH_TUPLE= nieoding:nginx-gridfs:059bdc3:gridfs -GRIDFS_LIB_DEPENDS= libbson-1.0.so:devel/libbson \ - libmongoc-1.0.so:devel/mongo-c-driver -GRIDFS_VARS= DSO_EXTMODS+=gridfs GRIDFS_SUBDIR=/nginx-gridfs - -HEADERS_MORE_GH_TUPLE= openresty:headers-more-nginx-module:06dc0be:headers_more -HEADERS_MORE_VARS= DSO_EXTMODS+=headers_more - -HTTP_ACCEPT_LANGUAGE_GH_TUPLE= dvershinin:nginx_accept_language_module:5683967:accept_language -HTTP_ACCEPT_LANGUAGE_VARS= DSO_EXTMODS+=accept_language - -HTTP_AUTH_DIGEST_GH_TUPLE= atomx:nginx-http-auth-digest:274490c:auth_digest -HTTP_AUTH_DIGEST_VARS= DSO_EXTMODS+=auth_digest - -HTTP_AUTH_KRB5_GH_TUPLE= stnoonan:spnego-http-auth-nginx-module:3575542:auth_krb5 -HTTP_AUTH_KRB5_VARS= DSO_EXTMODS+=auth_krb5 -HTTP_AUTH_KRB5_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-spnego-http-auth-nginx-module-config - -HTTP_AUTH_LDAP_GH_TUPLE= kvspb:nginx-auth-ldap:83c059b:http_auth_ldap -HTTP_AUTH_LDAP_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_auth_ldap_module.c -HTTP_AUTH_LDAP_VARS= DSO_EXTMODS+=http_auth_ldap -HTTP_AUTH_LDAP_USES= ldap - -HTTP_AUTH_PAM_GH_TUPLE= sto:ngx_http_auth_pam_module:v1.5.3:auth_pam -HTTP_AUTH_PAM_VARS= DSO_EXTMODS+=auth_pam - -HTTP_DAV_EXT_IMPLIES= HTTP_DAV -HTTP_DAV_EXT_LIB_DEPENDS= libxml2.so:textproc/libxml2 \ - libxslt.so:textproc/libxslt -HTTP_DAV_EXT_GH_TUPLE= arut:nginx-dav-ext-module:v3.0.0:dav_ext -HTTP_DAV_EXT_VARS= DSO_EXTMODS+=dav_ext -HTTP_DAV_EXT_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_dav_ext_module.c - -HTTP_EVAL_GH_TUPLE= openresty:nginx-eval-module:582bd25:eval -HTTP_EVAL_VARS= DSO_EXTMODS+=eval - -HTTP_FANCYINDEX_GH_TUPLE= aperezdc:ngx-fancyindex:v0.5.2:fancyindex -HTTP_FANCYINDEX_VARS= DSO_EXTMODS+=fancyindex - -HTTP_FOOTER_GH_TUPLE= alibaba:nginx-http-footer-filter:1.2.2:footer -HTTP_FOOTER_VARS= DSO_EXTMODS+=footer -HTTP_FOOTER_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-nginx-http-footer-filter-config - -HTTP_GEOIP2_GH_TUPLE= leev:ngx_http_geoip2_module:3.4:geoip2 -HTTP_GEOIP2_CFLAGS= -I${LOCALBASE}/include -HTTP_GEOIP2_VARS= DSO_EXTMODS+=geoip2 -HTTP_GEOIP2_LIB_DEPENDS= libmaxminddb.so:net/libmaxminddb - -HTTP_IP2LOCATION_GH_TUPLE= ip2location:ip2location-nginx:2df35fb:ip2location -HTTP_IP2LOCATION_LIB_DEPENDS= libIP2Location.so:net/ip2location -HTTP_IP2LOCATION_VARS= DSO_EXTMODS+=ip2location - -HTTP_IP2PROXY_GH_TUPLE= ip2location:ip2proxy-nginx:02ce447:ip2proxy -HTTP_IP2PROXY_LIB_DEPENDS= libIP2Proxy.so:net/ip2proxy -HTTP_IP2PROXY_VARS= DSO_EXTMODS+=ip2proxy - -HTTP_JSON_STATUS_GH_TUPLE= nginx-modules:ngx_http_json_status_module:1d2f303:json_status -HTTP_JSON_STATUS_VARS= DSO_EXTMODS+=json_status -HTTP_JSON_STATUS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_json_status_module-config - -HTTP_MOGILEFS_MASTER_SITES= http://www.grid.net.ru/nginx/download/:mogilefs -HTTP_MOGILEFS_DISTFILES= nginx_mogilefs_module-1.0.4.tar.gz:mogilefs -HTTP_MOGILEFS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_mogilefs_module.c \ - ${PATCHDIR}/extra-patch-nginx_mogilefs_module-config -HTTP_MOGILEFS_VARS= DSO_EXTDIRS+=nginx_mogilefs_module-1.0.4 - -HTTP_NOTICE_GH_TUPLE= kr:nginx-notice:3c95966:notice -HTTP_NOTICE_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_notice_module.c \ - ${PATCHDIR}/extra-patch-nginx-notice-config -HTTP_NOTICE_VARS= DSO_EXTMODS+=notice - -HTTP_PUSH_GH_TUPLE= slact:nchan:v1.3.6:push -HTTP_PUSH_VARS= DSO_EXTMODS+=push - -HTTP_PUSH_STREAM_GH_TUPLE= wandenberg:nginx-push-stream-module:8c02220:pushstream -HTTP_PUSH_STREAM_VARS= DSO_EXTMODS+=pushstream - -HTTP_REDIS_MASTER_SITES= LOCAL/osa:redis -HTTP_REDIS_DISTFILES= ngx_http_redis-0.3.9.tar.gz:redis -HTTP_REDIS_VARS= DSO_EXTDIRS+=ngx_http_redis-0.3.9 -HTTP_REDIS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_redis_module.c - -HTTP_SLICE_AHEAD_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src_http_modules_ngx_http_slice_read_ahead.c - -HTTP_SUBS_FILTER_GH_TUPLE= yaoweibin:ngx_http_substitutions_filter_module:c6f825f:subs_filter -HTTP_SUBS_FILTER_VARS= DSO_EXTMODS+=subs_filter - -HTTP_TARANTOOL_LIB_DEPENDS= libmsgpuck.so:devel/msgpuck \ - libyajl.so:devel/yajl -HTTP_TARANTOOL_GH_TUPLE= tarantool:nginx_upstream_module:aeb8696:nginx_tarantool -HTTP_TARANTOOL_VARS= DSO_EXTMODS+=nginx_tarantool -HTTP_TARANTOOL_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_tarantool-config - -HTTP_UPLOAD_GH_TUPLE= fdintino:nginx-upload-module:643b4c1:upload -HTTP_UPLOAD_VARS= DSO_EXTMODS+=upload - -HTTP_UPLOAD_PROGRESS_GH_TUPLE= masterzen:nginx-upload-progress-module:68b3ab3:uploadprogress -HTTP_UPLOAD_PROGRESS_VARS= DSO_EXTMODS+=uploadprogress -HTTP_UPLOAD_PROGRESS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_uploadprogress_module.c - -HTTP_UPSTREAM_CHECK_GH_TUPLE= yaoweibin:nginx_upstream_check_module:9aecf15:upstreamcheck -HTTP_UPSTREAM_CHECK_CONFIGURE_ON= --add-module=${WRKSRC_upstreamcheck} -HTTP_UPSTREAM_CHECK_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 - -HTTP_UPSTREAM_FAIR_GH_TUPLE= jaygooby:nginx-upstream-fair:10ecdcf:upstreamfair -HTTP_UPSTREAM_FAIR_VARS= DSO_EXTMODS+=upstreamfair - -HTTP_UPSTREAM_STICKY_IMPLIES= HTTP_SSL -HTTP_UPSTREAM_STICKY_GH_TUPLE= dvershinin:nginx-sticky-module-ng:2753211:upstreamsticky -HTTP_UPSTREAM_STICKY_VARS= DSO_EXTMODS+=upstreamsticky - -HTTP_VIDEO_THUMBEXTRACTOR_LIB_DEPENDS= libavformat.so:multimedia/ffmpeg \ - libavcodec.so:multimedia/ffmpeg \ - libavutil.so:multimedia/ffmpeg \ - libswscale.so:multimedia/ffmpeg -HTTP_VIDEO_THUMBEXTRACTOR_USES= jpeg -HTTP_VIDEO_THUMBEXTRACTOR_GH_TUPLE= wandenberg:nginx-video-thumbextractor-module:e81f850:vte -HTTP_VIDEO_THUMBEXTRACTOR_VARS= DSO_EXTMODS+=vte -HTTP_VIDEO_THUMBEXTRACTOR_EXTRA_PATCHES=${PATCHDIR}/extra-patch-nginx-thumbextractor-module-config - -HTTP_ZIP_GH_TUPLE= vince2678:mod_zip:5b2604b:mod_zip -HTTP_ZIP_VARS= DSO_EXTMODS+=mod_zip - -ICONV_IMPLIES= DEVEL_KIT -ICONV_USES= iconv -ICONV_GH_TUPLE= calio:iconv-nginx-module:v0.14:iconv -ICONV_VARS= DSO_EXTMODS+=iconv -ICONV_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-calio-iconv-nginx-module-config - -LET_GH_TUPLE= baysao:nginx-let-module:c1f23aa:let -LET_VARS= DSO_EXTMODS+=let - -LUA_IMPLIES= DEVEL_KIT -LUA_LIB_DEPENDS= libluajit-5.1.so:lang/luajit-openresty -LUA_RUN_DEPENDS= lua-resty-core>0:www/lua-resty-core -LUA_CONFIGURE_ENV= LUAJIT_INC=${LOCALBASE}/include/luajit-2.1 \ - LUAJIT_LIB=${LOCALBASE}/lib -LUA_GH_TUPLE= openresty:lua-nginx-module:v0.10.26:lua -LUA_VARS= DSO_EXTMODS+=lua - -LUASTREAM_IMPLIES= DEVEL_KIT -LUASTREAM_LIB_DEPENDS= libluajit-5.1.so:lang/luajit-openresty -LUASTREAM_RUN_DEPENDS= lua-resty-core>0:www/lua-resty-core -LUASTREAM_CONFIGURE_ENV=LUAJIT_INC=${LOCALBASE}/include/luajit-2.1 \ - LUAJIT_LIB=${LOCALBASE}/lib -LUASTREAM_GH_TUPLE= openresty:stream-lua-nginx-module:v0.0.14:luastream -LUASTREAM_VARS= DSO_EXTMODS+=luastream - -LINK_GH_TUPLE= Taymindis:nginx-link-function:3.2.4:link -LINK_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-nginx-link-function-config \ - ${PATCHDIR}/extra-patch-ngx_link_func_module.c -LINK_VARS= DSO_EXTMODS+=link - -MEMC_GH_TUPLE= openresty:memc-nginx-module:v0.19:memc -MEMC_VARS= DSO_EXTMODS+=memc - -MODSECURITY3_IMPLIES= HTTP_ADDITION HTTP_IMAGE_FILTER HTTP_GUNZIP_FILTER HTTP_XSLT -MODSECURITY3_LIB_DEPENDS= libmodsecurity.so:security/modsecurity3 -MODSECURITY3_GH_TUPLE= SpiderLabs:ModSecurity-nginx:v1.0.3:modsecurity3 -MODSECURITY3_VARS= DSO_EXTMODS+=modsecurity3 - -NAXSI_NGINX_VER= 1.6 -NAXSI_GH_TUPLE= wargio:naxsi:${NAXSI_NGINX_VER}:naxsi \ - libinjection:libinjection:4aa3894:libinjection -NAXSI_VARS= DSO_EXTMODS+=naxsi NAXSI_SUBDIR=/naxsi_src -NAXSI_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-naxsi-libinjection__sqli_c \ - ${PATCHDIR}/extra-patch-naxsi_config - -NJS_GH_TUPLE= nginx:njs:0.8.2:njs -NJS_VARS= DSO_EXTMODS+=njs NJS_SUBDIR=/nginx - -NJS_XML_IMPLIES= NJS -NJS_XML_LIB_DEPENDS= libxml2.so:textproc/libxml2 \ - libxslt.so:textproc/libxslt - -OTEL_GH_TUPLE= osokin:nginx-otel:8f0857d:otel -OTEL_VARS= DSO_EXTMODS+=otel OTEL_SUBDIR=/ -OTEL_LIB_DEPENDS= libabsl_base.so:devel/abseil \ - libcares.so:dns/c-ares \ - libgrpc.so:devel/grpc \ - libopentelemetry_common.so:devel/opentelemetry-cpp \ - libprotobuf.so:devel/protobuf \ - libre2.so:devel/re2 -OTEL_BUILD_DEPENDS= ${LOCALBASE}/include/opentelemetry/proto/common/v1/common.proto:devel/opentelemetry-proto -OTEL_CONFIGURE_ENV+= NGX_OTEL_PROTO_DIR=${PREFIX}/include - -PASSENGER_NGINX_VER= 6.0.19 -PASSENGER_CATEGORIES= ruby -PASSENGER_USES= ruby -PASSENGER_BUILD_DEPENDS=${LOCALBASE}/bin/rake:devel/rubygem-rake -PASSENGER_RAKE_BIN= ${LOCALBASE}/bin/rake -PASSENGER_MASTER_SITES= https://s3.amazonaws.com/phusion-passenger/releases/:passenger -PASSENGER_DISTFILES= passenger-${PASSENGER_NGINX_VER}.tar.gz:passenger -PASSENGER_VARS= WRKSRC_passenger=${WRKDIR}/passenger-${PASSENGER_NGINX_VER} \ - DSO_EXTDIRS+=passenger-${PASSENGER_NGINX_VER}/src/nginx_module -PASSENGER_EXTRA_PATCHES=${PATCHDIR}/extra-patch-passenger-build-nginx.rb \ - ${PATCHDIR}/extra-patch-passenger-disable-telemetry - -POSTGRES_USES= pgsql -POSTGRES_GH_TUPLE= konstruxi:ngx_postgres:8aa7359:postgres -POSTGRES_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_postgres-config -POSTGRES_VARS= DSO_EXTMODS+=postgres - -RDS_CSV_GH_TUPLE= openresty:rds-csv-nginx-module:v0.09:rdscsv -RDS_CSV_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-rds-csv-nginx-module-config -RDS_CSV_VARS= DSO_EXTMODS+=rdscsv - -RDS_JSON_GH_TUPLE= openresty:rds-json-nginx-module:v0.15:rdsjson -RDS_JSON_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-rds-json-nginx-module-config -RDS_JSON_VARS= DSO_EXTMODS+=rdsjson - -REDIS2_GH_TUPLE= openresty:redis2-nginx-module:v0.15:redis2 -REDIS2_VARS= DSO_EXTMODS+=redis2 - -RTMP_GH_TUPLE= arut:nginx-rtmp-module:v1.2.2:rtmp -RTMP_VARS= DSO_EXTMODS+=rtmp - -SET_MISC_IMPLIES= DEVEL_KIT -SET_MISC_GH_TUPLE= openresty:set-misc-nginx-module:3937e7b:setmisc -SET_MISC_VARS= DSO_EXTMODS+=setmisc - -SFLOW_GH_TUPLE= sflow:nginx-sflow-module:543c72a:sflow -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 - -SHIBBOLETH_GH_TUPLE= nginx-shib:nginx-http-shibboleth:be12df5:shibboleth -SHIBBOLETH_VARS= DSO_EXTMODS+=shibboleth - -SLOWFS_CACHE_GH_TUPLE= baysao:ngx_slowfs_cache:d011a18:slowfs_cache -SLOWFS_CACHE_VARS= DSO_EXTMODS+=slowfs_cache - -SRCACHE_GH_TUPLE= openresty:srcache-nginx-module:be22ac0:srcache -SRCACHE_VARS= DSO_EXTMODS+=srcache - -STS_IMPLIES= STREAM -STS_GH_TUPLE= vozlt:nginx-module-sts:3c10d42:sts -STS_VARS= DSO_EXTMODS+=sts - -VOD_GH_TUPLE= kaltura:nginx-vod-module:1.31:vod -VOD_LIB_DEPENDS= libxml2.so:textproc/libxml2 \ - libavutil.so:multimedia/ffmpeg -VOD_USES= iconv -VOD_VARS= DSO_EXTMODS+=vod - -VTS_GH_TUPLE= vozlt:nginx-module-vts:bf64dbf:vts -VTS_VARS= DSO_EXTMODS+=vts - -XSS_GH_TUPLE= openresty:xss-nginx-module:v0.06:xss -XSS_VARS= DSO_EXTMODS+=xss -XSS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-xss-nginx-module-config - -WEBSOCKIFY_GH_TUPLE= tg123:websockify-nginx-module:c11bc9a:websockify -WEBSOCKIFY_VARS= DSO_EXTMODS+=websockify diff --git a/www/nginx-devel_test/Makefile.options.desc b/www/nginx-devel_test/Makefile.options.desc deleted file mode 100644 index 9ab1054..0000000 --- a/www/nginx-devel_test/Makefile.options.desc +++ /dev/null @@ -1,117 +0,0 @@ -AJP_DESC= 3rd party ajp module -ARRAYVAR_DESC= 3rd party array_var module -AWS_AUTH_DESC= 3rd party aws auth module -BROTLI_DESC= 3rd party brotli module -CACHE_PURGE_DESC= 3rd party cache_purge module -CT_DESC= 3rd party cert_transparency module (SSL req.) -DEBUGLOG_DESC= Enable debug log (--with-debug) -DEVEL_KIT_DESC= 3rd party Nginx Development Kit module -DRIZZLE_DESC= 3rd party drizzle module -DSO_DESC= Enable dynamic modules support -DYNAMIC_UPSTREAM_DESC= 3rd party dynamic_upstream module -ECHO_DESC= 3rd party echo module -ENCRYPTSESSION_DESC= 3rd party encrypted_session module -FILE_AIO_DESC= Enable file aio -FIPS_CHECK_DESC= 3rd party fips_check module -FORMINPUT_DESC= 3rd party form_input module -GOOGLE_PERFTOOLS_DESC= Enable google perftools module -GRIDFS_DESC= 3rd party gridfs module -GSSAPI_DESC= GSSAPI implementation (imply HTTP_AUTH_KRB5) -HEADERS_MORE_DESC= 3rd party headers_more module -HTTPGRP_DESC= Modules that require HTTP module -HTTPV2_DESC= Enable HTTP/2 protocol support (SSL req.) -HTTPV3_DESC= Enable HTTP/3 protocol support -HTTPV3_BORING_DESC= Use security/boringssl -HTTPV3_LSSL_DESC= Use security/libressl-devel -HTTPV3_QTLS_DESC= Use security/openssl-quictls -HTTP_ACCEPT_LANGUAGE_DESC= 3rd party accept_language module -HTTP_ADDITION_DESC= Enable http_addition 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_AUTH_REQ_DESC= Enable http_auth_request module -HTTP_CACHE_DESC= Enable http_cache module -HTTP_DAV_DESC= Enable http_webdav module -HTTP_DAV_EXT_DESC= 3rd party webdav_ext module -HTTP_DEGRADATION_DESC= Enable http_degradation module -HTTP_DESC= Enable HTTP module -HTTP_EVAL_DESC= 3rd party eval module -HTTP_FANCYINDEX_DESC= 3rd party http_fancyindex module -HTTP_FLV_DESC= Enable http_flv module -HTTP_FOOTER_DESC= 3rd party http_footer module -HTTP_GEOIP2_DESC= 3rd party geoip2 module -HTTP_GUNZIP_FILTER_DESC= Enable http_gunzip_filter module -HTTP_GZIP_STATIC_DESC= Enable http_gzip_static module -HTTP_IMAGE_FILTER_DESC= Enable http_image_filter module -HTTP_IP2LOCATION_DESC= 3rd party ip2location-nginx module -HTTP_IP2PROXY_DESC= 3rd party ip2proxy-nginx module -HTTP_JSON_STATUS_DESC= 3rd party http_json_status module -HTTP_MOGILEFS_DESC= 3rd party mogilefs module -HTTP_MP4_DESC= Enable http_mp4 module -HTTP_NOTICE_DESC= 3rd party notice module -HTTP_PERL_DESC= Enable http_perl module -HTTP_PUSH_DESC= 3rd party push module -HTTP_PUSH_STREAM_DESC= 3rd party push stream module -HTTP_RANDOM_INDEX_DESC= Enable http_random_index module -HTTP_REALIP_DESC= Enable http_realip module -HTTP_REDIS_DESC= 3rd party http_redis module -HTTP_SECURE_LINK_DESC= Enable http_secure_link module -HTTP_SLICE_DESC= Enable http_slice module -HTTP_SLICE_AHEAD_DESC= 3rd party http_slice_ahead module -HTTP_SSL_DESC= Enable http_ssl module -HTTP_STATUS_DESC= Enable http_stub_status module -HTTP_SUBS_FILTER_DESC= 3rd party subs filter module -HTTP_SUB_DESC= Enable http_sub 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_DESC= 3rd party video module support -HTTP_VIDEO_THUMBEXTRACTOR_DESC= 3rd party video_thumbextractor module -HTTP_XSLT_DESC= Enable http_xslt module -HTTP_ZIP_DESC= 3rd party http_zip module -ICONV_DESC= 3rd party iconv module -IPV6_DESC= Enable IPv6 support -LET_DESC= 3rd party let module -LINK_DESC= 3rd party link function module -LUA_DESC= 3rd party lua module -LUASTREAM_DESC= 3rd party lua stream module -MAILGRP_DESC= Modules that require MAIL 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 -MEMC_DESC= 3rd party memc (memcached) module -MODSECURITY3_DESC= 3rd party modsecurity3 module -NAXSI_DESC= 3rd party naxsi module -NJS_DESC= Enable javascript (NJS) module -NJS_XML_DESC= Enable XML functionality in NJS module -OTEL_DESC= Enable OpenTELemetry 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 -SRCACHE_DESC= 3rd party srcache module -STREAMGRP_DESC= Modules that require STREAM module -STREAM_DESC= Enable stream module -STREAM_REALIP_DESC= Enable stream_realip module -STREAM_SSL_DESC= Enable stream_ssl module (SSL req.) -STREAM_SSL_PREREAD_DESC= Enable stream_ssl_preread module (SSL req.) -STS_DESC= 3rd party sts module -THREADS_DESC= Enable threads support -THIRDPARTYGRP_DESC= Third-party modules -VOD_DESC= 3rd party vod module -VTS_DESC= 3rd party vts module -WWW_DESC= Enable html sample files -XSS_DESC= 3rd party xss module -WEBSOCKIFY_DESC= 3rd party websockify module diff --git a/www/nginx-devel_test/distinfo b/www/nginx-devel_test/distinfo deleted file mode 100644 index fb4c13f..0000000 --- a/www/nginx-devel_test/distinfo +++ /dev/null @@ -1,141 +0,0 @@ -TIMESTAMP = 1709239742 -SHA256 (nginx-1.25.4.tar.gz) = 760729901acbaa517996e681ee6ea259032985e37c2768beef80df3a877deed9 -SIZE (nginx-1.25.4.tar.gz) = 1236273 -SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae -SIZE (nginx_mogilefs_module-1.0.4.tar.gz) = 11208 -SHA256 (ngx_http_redis-0.3.9.tar.gz) = 21f87540f0a44b23ffa5df16fb3d788bc90803b255ef14f9c26e3847a6f26f46 -SIZE (ngx_http_redis-0.3.9.tar.gz) = 13051 -SHA256 (passenger-6.0.19.tar.gz) = 70eee7fecb8a6197517db3b6d134a839768a5388d5d08343e9e020910769b392 -SIZE (passenger-6.0.19.tar.gz) = 8426094 -SHA256 (msva-nginx_ajp_module-fcbb2cc_GH0.tar.gz) = 522e94c59f5783f281d868ede2adf325bf2f8ffb9e62cf8451d4b9ac0516916c -SIZE (msva-nginx_ajp_module-fcbb2cc_GH0.tar.gz) = 110807 -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 (anomalizer-ngx_aws_auth-21931b2_GH0.tar.gz) = d8a2422da96a638e9a911e4edb592954d9c0fe1576456fec9809ef4e2a0a863d -SIZE (anomalizer-ngx_aws_auth-21931b2_GH0.tar.gz) = 15580 -SHA256 (google-ngx_brotli-a71f931_GH0.tar.gz) = b3312a045d5303a40d02beb34711b8ca27f7b72d647e9ee2012a8eddd14d9b22 -SIZE (google-ngx_brotli-a71f931_GH0.tar.gz) = 16376 -SHA256 (nginx-modules-ngx_cache_purge-a84b0f3_GH0.tar.gz) = ddfd4fdd99075d906b7b75c49f56ec96b76df7951dfa54502e0f83890447031f -SIZE (nginx-modules-ngx_cache_purge-a84b0f3_GH0.tar.gz) = 17162 -SHA256 (grahamedgecombe-nginx-ct-93e9884_GH0.tar.gz) = 72fdd125b9207cdda135f368095f85b943a78a4ff004d1cd217972e12b1571b2 -SIZE (grahamedgecombe-nginx-ct-93e9884_GH0.tar.gz) = 7224 -SHA256 (vision5-ngx_devel_kit-v0.3.3_GH0.tar.gz) = faa2fcd5168b10764d35081356511d5f84db5c526a1aa4b6add2db94b6853b2b -SIZE (vision5-ngx_devel_kit-v0.3.3_GH0.tar.gz) = 66561 -SHA256 (openresty-drizzle-nginx-module-3504fc6_GH0.tar.gz) = 86076735597f14db28cffabc0ab1f233cd51aab7cf112c56e267783e7814fc65 -SIZE (openresty-drizzle-nginx-module-3504fc6_GH0.tar.gz) = 51596 -SHA256 (ZigzagAK-ngx_dynamic_upstream-960eef2_GH0.tar.gz) = 86e7c6ed6dba2d4c5f5b87ecb91f25ccdb7a08b8a88236e632114f830b9e354b -SIZE (ZigzagAK-ngx_dynamic_upstream-960eef2_GH0.tar.gz) = 23003 -SHA256 (openresty-echo-nginx-module-5a402aa_GH0.tar.gz) = bb2a4b1a0e5ffa0203c1be854e663fc92cee0d7b5e0f7a38c0e163ae9124a38f -SIZE (openresty-echo-nginx-module-5a402aa_GH0.tar.gz) = 53336 -SHA256 (openresty-encrypted-session-nginx-module-v0.09_GH0.tar.gz) = fe9b95acf9726aefd71bf0aca6c11bee007f1da67e64be9b21a7131f0ed75ba6 -SIZE (openresty-encrypted-session-nginx-module-v0.09_GH0.tar.gz) = 11847 -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 (ogarrett-nginx-fips-check-module-6cb4270_GH0.tar.gz) = d52fbb0f2819cd91b710ad85e6c8b452fdca6a5d81b0694d6637adba3fc2382c -SIZE (ogarrett-nginx-fips-check-module-6cb4270_GH0.tar.gz) = 6494 -SHA256 (nieoding-nginx-gridfs-059bdc3_GH0.tar.gz) = 9b059b5ae7b602d12d32d5ebe2700827ea625f22c0fb3b9956242e11de63845b -SIZE (nieoding-nginx-gridfs-059bdc3_GH0.tar.gz) = 4674 -SHA256 (openresty-headers-more-nginx-module-06dc0be_GH0.tar.gz) = 883b1e31d59f3eb1e76b34259711ad65a3443102973dcf22df329397f3d5eaa4 -SIZE (openresty-headers-more-nginx-module-06dc0be_GH0.tar.gz) = 29438 -SHA256 (dvershinin-nginx_accept_language_module-5683967_GH0.tar.gz) = a58feb576f2231498b8a3863d3c6fba45c7d48bc48735fa714e07a7bfbedb6e3 -SIZE (dvershinin-nginx_accept_language_module-5683967_GH0.tar.gz) = 3425 -SHA256 (atomx-nginx-http-auth-digest-274490c_GH0.tar.gz) = 0839c33c2f8d519f92daae274f62cf87eb68415d562c6500ee3e3721ce80557c -SIZE (atomx-nginx-http-auth-digest-274490c_GH0.tar.gz) = 17815 -SHA256 (stnoonan-spnego-http-auth-nginx-module-3575542_GH0.tar.gz) = 6d710f97bef58b2d5dc54445c0e48103786425f6d4ab18cf30a2168904d0ba62 -SIZE (stnoonan-spnego-http-auth-nginx-module-3575542_GH0.tar.gz) = 24680 -SHA256 (kvspb-nginx-auth-ldap-83c059b_GH0.tar.gz) = e76e9e117ad51af578a68fa7a30c256178796bb271fa77f01c93281a92b09921 -SIZE (kvspb-nginx-auth-ldap-83c059b_GH0.tar.gz) = 18547 -SHA256 (sto-ngx_http_auth_pam_module-v1.5.3_GH0.tar.gz) = 882018fea8d6955ab3fe294aafa8ebb1fdff4eac313c29583fef02c6de76fae7 -SIZE (sto-ngx_http_auth_pam_module-v1.5.3_GH0.tar.gz) = 7084 -SHA256 (arut-nginx-dav-ext-module-v3.0.0_GH0.tar.gz) = d2499d94d82d4e4eac8425d799e52883131ae86a956524040ff2fd230ef9f859 -SIZE (arut-nginx-dav-ext-module-v3.0.0_GH0.tar.gz) = 14558 -SHA256 (openresty-nginx-eval-module-582bd25_GH0.tar.gz) = 014bedb2b334ba8e8e23b4c660590357f8055dbed7b9b017e4cc2937876a8822 -SIZE (openresty-nginx-eval-module-582bd25_GH0.tar.gz) = 14849 -SHA256 (aperezdc-ngx-fancyindex-v0.5.2_GH0.tar.gz) = c3dd84d8ba0b8daeace3041ef5987e3fb96e9c7c17df30c9ffe2fe3aa2a0ca31 -SIZE (aperezdc-ngx-fancyindex-v0.5.2_GH0.tar.gz) = 29052 -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-3.4_GH0.tar.gz) = ad72fc23348d715a330994984531fab9b3606e160483236737f9a4a6957d9452 -SIZE (leev-ngx_http_geoip2_module-3.4_GH0.tar.gz) = 8877 -SHA256 (ip2location-ip2location-nginx-2df35fb_GH0.tar.gz) = 86d6d6d6b4437ecc621c5aac7bd5475dffd33afb70a51c5ea3c7f341ded46efb -SIZE (ip2location-ip2location-nginx-2df35fb_GH0.tar.gz) = 5462 -SHA256 (ip2location-ip2proxy-nginx-02ce447_GH0.tar.gz) = edbafe23087f019364f9d1c1c615fdbc5116ec727c49bf442e3e4b39441fc4cc -SIZE (ip2location-ip2proxy-nginx-02ce447_GH0.tar.gz) = 5177 -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-v1.3.6_GH0.tar.gz) = ba0b7cc6b710a20ce1ed2554caf56154035291aaf115e407d7a6bb699fde42df -SIZE (slact-nchan-v1.3.6_GH0.tar.gz) = 761436 -SHA256 (wandenberg-nginx-push-stream-module-8c02220_GH0.tar.gz) = ab4fbe236e8bc500f0c5e13403d6a0e2e4e4ec17b81e0fcedaf669b4339626a6 -SIZE (wandenberg-nginx-push-stream-module-8c02220_GH0.tar.gz) = 196720 -SHA256 (yaoweibin-ngx_http_substitutions_filter_module-c6f825f_GH0.tar.gz) = 4ab034f2e056148469b440394e1664c46405712ef27bc4f3197e42bf7df8460e -SIZE (yaoweibin-ngx_http_substitutions_filter_module-c6f825f_GH0.tar.gz) = 94062 -SHA256 (tarantool-nginx_upstream_module-aeb8696_GH0.tar.gz) = 514aa57155c73c2e3f7bdfe00c580183df343f2fa4b34e77f040cf6557caffae -SIZE (tarantool-nginx_upstream_module-aeb8696_GH0.tar.gz) = 75708 -SHA256 (fdintino-nginx-upload-module-643b4c1_GH0.tar.gz) = a5bb48589b5c242683da33a9f1acc7847acc3ce4f2c4213ea524858aa789a6e9 -SIZE (fdintino-nginx-upload-module-643b4c1_GH0.tar.gz) = 42571 -SHA256 (masterzen-nginx-upload-progress-module-68b3ab3_GH0.tar.gz) = 35b506e57e19e780e01ecc7c3c31a64473c35e4a022f5a3f98092a60cd1c1602 -SIZE (masterzen-nginx-upload-progress-module-68b3ab3_GH0.tar.gz) = 17322 -SHA256 (yaoweibin-nginx_upstream_check_module-9aecf15_GH0.tar.gz) = 4404c64e845e19feeb07a37976347987892a8e8680a961f793ff0d3ef96c07f4 -SIZE (yaoweibin-nginx_upstream_check_module-9aecf15_GH0.tar.gz) = 130039 -SHA256 (jaygooby-nginx-upstream-fair-10ecdcf_GH0.tar.gz) = 93f71b7cf0db9c6dbf97e3ee11cf8efbc149946c0949d7abd19c74c7620eea50 -SIZE (jaygooby-nginx-upstream-fair-10ecdcf_GH0.tar.gz) = 10433 -SHA256 (dvershinin-nginx-sticky-module-ng-2753211_GH0.tar.gz) = e4a533dfa214ea28122301aeebbb1a38e1d1972edb7ee9bc72271c14f2693005 -SIZE (dvershinin-nginx-sticky-module-ng-2753211_GH0.tar.gz) = 120676 -SHA256 (wandenberg-nginx-video-thumbextractor-module-e81f850_GH0.tar.gz) = 9113f887a8740fe72614ee32f481177d33e9542c3b0625627da19a1c4f3da2cb -SIZE (wandenberg-nginx-video-thumbextractor-module-e81f850_GH0.tar.gz) = 2710072 -SHA256 (vince2678-mod_zip-5b2604b_GH0.tar.gz) = 4fe63be3b842882494152e586f0b87e73f51bfbfd801b78f033c71a011cba789 -SIZE (vince2678-mod_zip-5b2604b_GH0.tar.gz) = 29559 -SHA256 (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = b8b9f355c05c0790226512f6732348a2404d48531688a1fc04ce6768163bf462 -SIZE (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = 13133 -SHA256 (baysao-nginx-let-module-c1f23aa_GH0.tar.gz) = 7393809d5d8877812da1bd5b5fbd1d8b00bc85e71f2f387c344f007773e49050 -SIZE (baysao-nginx-let-module-c1f23aa_GH0.tar.gz) = 20617 -SHA256 (Taymindis-nginx-link-function-3.2.4_GH0.tar.gz) = 20c3679199ba7efe1598f03b2fa0b13591226363c8dd7930d7f02702cd5abada -SIZE (Taymindis-nginx-link-function-3.2.4_GH0.tar.gz) = 139656 -SHA256 (openresty-lua-nginx-module-v0.10.26_GH0.tar.gz) = a75983287a2bdc5e964ace56a51b215dc2ec996639d4916cd393d6ebba94b565 -SIZE (openresty-lua-nginx-module-v0.10.26_GH0.tar.gz) = 745785 -SHA256 (openresty-memc-nginx-module-v0.19_GH0.tar.gz) = 8c2bdbe875e4f5225d0778bfb09a2668f9281d7de6218c7b462a7ba2cee06fe8 -SIZE (openresty-memc-nginx-module-v0.19_GH0.tar.gz) = 34654 -SHA256 (SpiderLabs-ModSecurity-nginx-v1.0.3_GH0.tar.gz) = 32a42256616cc674dca24c8654397390adff15b888b77eb74e0687f023c8751b -SIZE (SpiderLabs-ModSecurity-nginx-v1.0.3_GH0.tar.gz) = 34063 -SHA256 (wargio-naxsi-1.6_GH0.tar.gz) = e5920fdd09cae155b89eb21a94a21c029ebfdb056c284130221525be54044aae -SIZE (wargio-naxsi-1.6_GH0.tar.gz) = 1116227 -SHA256 (libinjection-libinjection-4aa3894_GH0.tar.gz) = ededea133e89e238ef2e60d0d62ef7ef9e741449eed8c5d856007132505bcd5b -SIZE (libinjection-libinjection-4aa3894_GH0.tar.gz) = 2218294 -SHA256 (nginx-njs-0.8.2_GH0.tar.gz) = 6f17387db8df90b6e3382d280455962ff85fa2b1a32d91c2ce1fd1af5a854d72 -SIZE (nginx-njs-0.8.2_GH0.tar.gz) = 733916 -SHA256 (osokin-nginx-otel-8f0857d_GH0.tar.gz) = bbf93813928460bdaf78f752f74ecc6c34d13078e97fdffcaa29dbd8689314fc -SIZE (osokin-nginx-otel-8f0857d_GH0.tar.gz) = 30197 -SHA256 (konstruxi-ngx_postgres-8aa7359_GH0.tar.gz) = c69ad4495de7c7883ebc23e1e6c4cc83a4ac6a7fddd4d5c12e49d33b65f7c50b -SIZE (konstruxi-ngx_postgres-8aa7359_GH0.tar.gz) = 48544 -SHA256 (openresty-rds-csv-nginx-module-v0.09_GH0.tar.gz) = 896be99c0cad50218417800a159e43ec088d6b58c099472ed3b3d7f179d6c0ea -SIZE (openresty-rds-csv-nginx-module-v0.09_GH0.tar.gz) = 20531 -SHA256 (openresty-rds-json-nginx-module-v0.15_GH0.tar.gz) = eaf18f60e981ea2442a7902689a26eba6cf6f36ebee712feeb1f4429eb654bdc -SIZE (openresty-rds-json-nginx-module-v0.15_GH0.tar.gz) = 34744 -SHA256 (openresty-redis2-nginx-module-v0.15_GH0.tar.gz) = d255571bcfb9939b78099df39cb4d42f174d789aec8c8e5e47b93942b0299438 -SIZE (openresty-redis2-nginx-module-v0.15_GH0.tar.gz) = 25471 -SHA256 (arut-nginx-rtmp-module-v1.2.2_GH0.tar.gz) = 07f19b7bffec5e357bb8820c63e5281debd45f5a2e6d46b1636d9202c3e09d78 -SIZE (arut-nginx-rtmp-module-v1.2.2_GH0.tar.gz) = 519934 -SHA256 (openresty-set-misc-nginx-module-3937e7b_GH0.tar.gz) = cb3a4675ab6b8741e5847cf5bc41ee3f6ec5cbceec53188f9ae96e48feea17c5 -SIZE (openresty-set-misc-nginx-module-3937e7b_GH0.tar.gz) = 29335 -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-be12df5_GH0.tar.gz) = aff9830b5de78dd9ce32cd2c55c5cf9173c99fe1a1d2190407c96668e7517bab -SIZE (nginx-shib-nginx-http-shibboleth-be12df5_GH0.tar.gz) = 23872 -SHA256 (baysao-ngx_slowfs_cache-d011a18_GH0.tar.gz) = 6ae8abb01a2aff788e75ec68621cb0159148a6f73730a84b30b0bdbc6cdc1758 -SIZE (baysao-ngx_slowfs_cache-d011a18_GH0.tar.gz) = 11186 -SHA256 (openresty-srcache-nginx-module-be22ac0_GH0.tar.gz) = 5753d1ffe87b5d6f5b7a0696667bb5ff1388738136fdee26ba55bc33f5796061 -SIZE (openresty-srcache-nginx-module-be22ac0_GH0.tar.gz) = 51029 -SHA256 (vozlt-nginx-module-sts-3c10d42_GH0.tar.gz) = 748b67ceb82b3b843ae915bf7863fd08b7c2427c045e5ec540242d050f7b30d0 -SIZE (vozlt-nginx-module-sts-3c10d42_GH0.tar.gz) = 352431 -SHA256 (kaltura-nginx-vod-module-1.31_GH0.tar.gz) = ace04201cf2d2b1a3e5e732a22b92225b8ce61a494df9cc7f79d97efface8952 -SIZE (kaltura-nginx-vod-module-1.31_GH0.tar.gz) = 470904 -SHA256 (vozlt-nginx-module-vts-bf64dbf_GH0.tar.gz) = d2782c75e39cb2ecf68453922b43ab2295adb6a35fa6a0f9c14173f70d22d7b1 -SIZE (vozlt-nginx-module-vts-bf64dbf_GH0.tar.gz) = 180394 -SHA256 (tg123-websockify-nginx-module-c11bc9a_GH0.tar.gz) = aca454bffcee2476dc92682ebfb8c0378a271fda178be7e945d648419d220758 -SIZE (tg123-websockify-nginx-module-c11bc9a_GH0.tar.gz) = 14646 -SHA256 (openresty-xss-nginx-module-v0.06_GH0.tar.gz) = 0b12bbc53a41f3e3d6df419c173b8c87434be3e6cd255a8193aa91345a2de6cf -SIZE (openresty-xss-nginx-module-v0.06_GH0.tar.gz) = 12448 -SHA256 (openresty-stream-lua-nginx-module-v0.0.14_GH0.tar.gz) = 8e2ff6ad5f91127da3c01757e7e654f1addf9769450d9159601d2cc153953c47 -SIZE (openresty-stream-lua-nginx-module-v0.0.14_GH0.tar.gz) = 381313 diff --git a/www/nginx-devel_test/files/extra-patch-calio-iconv-nginx-module-config b/www/nginx-devel_test/files/extra-patch-calio-iconv-nginx-module-config deleted file mode 100644 index fe9b12d..0000000 --- a/www/nginx-devel_test/files/extra-patch-calio-iconv-nginx-module-config +++ /dev/null @@ -1,19 +0,0 @@ ---- ../iconv-nginx-module-0.14/config.orig 2013-04-16 17:57:17.000000000 -0700 -+++ ../iconv-nginx-module-0.14/config 2013-05-01 17:16:28.134624745 -0700 -@@ -39,12 +39,12 @@ - fi - - if [ $ngx_found = no ]; then -- ngx_feature="libiconv in /usr/local/" -- ngx_feature_path="/usr/local/include" -+ ngx_feature="libiconv in %%PREFIX%%/" -+ ngx_feature_path="%%PREFIX%%/include" - if [ $NGX_RPATH = YES ]; then -- ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -liconv" -+ ngx_feature_libs="-R%%PREFIX%%/lib -L%%PREFIX%%/lib -liconv" - else -- ngx_feature_libs="-L/usr/local/lib -liconv" -+ ngx_feature_libs="-L%%PREFIX%%/lib -liconv" - fi - . auto/feature - fi diff --git a/www/nginx-devel_test/files/extra-patch-naxsi-libinjection__sqli_c b/www/nginx-devel_test/files/extra-patch-naxsi-libinjection__sqli_c deleted file mode 100644 index 9aeec39..0000000 --- a/www/nginx-devel_test/files/extra-patch-naxsi-libinjection__sqli_c +++ /dev/null @@ -1,13 +0,0 @@ ---- ../libinjection-51f3a96/src/libinjection_sqli.c.orig 2023-05-30 15:47:57.333208000 -0400 -+++ ../libinjection-51f3a96/src/libinjection_sqli.c 2023-05-30 15:49:52.273873000 -0400 -@@ -305,8 +303,8 @@ - static void st_assign(stoken_t * st, const char stype, - size_t pos, size_t len, const char* value) - { -- const size_t MSIZE = LIBINJECTION_SQLI_TOKEN_SIZE; -- size_t last = len < MSIZE ? len : (MSIZE - 1); -+ const size_t NAXSI_MSIZE = LIBINJECTION_SQLI_TOKEN_SIZE; -+ size_t last = len < NAXSI_MSIZE ? len : (NAXSI_MSIZE - 1); - st->type = (char) stype; - st->pos = pos; - st->len = last; diff --git a/www/nginx-devel_test/files/extra-patch-naxsi_config b/www/nginx-devel_test/files/extra-patch-naxsi_config deleted file mode 100644 index a73cf8f..0000000 --- a/www/nginx-devel_test/files/extra-patch-naxsi_config +++ /dev/null @@ -1,26 +0,0 @@ ---- ../naxsi-1.5/naxsi_src/config.orig 2023-09-27 09:43:18.644606000 -0400 -+++ ../naxsi-1.5/naxsi_src/config 2023-09-27 09:44:37.585970000 -0400 -@@ -24,11 +24,6 @@ - " - - # try to use libinjection as system library --LIBINJECTION_CFLAGS="$(pkg-config --cflags libinjection)" --LIBINJECTION_LIBS="$(pkg-config --libs libinjection)" --LIBINJECTION_FOUND="$?" -- --if [ "$LIBINJECTION_FOUND" != "0" ]; then - if [ ! -d "$ngx_addon_dir/libinjection/src/" ]; then - echo "Cannot find 'libinjection' submodule." - exit 1; -@@ -43,11 +38,6 @@ - naxsi_sources="$naxsi_sources $ngx_addon_dir/libinjection_ngxbuild/$src_file" - done; - CFLAGS="$CFLAGS -DLIBINJECTION_VERSION=0 -I$ngx_addon_dir/libinjection_ngxbuild/" --else -- echo "Using system libinjection" -- CFLAGS="$CFLAGS $LIBINJECTION_CFLAGS" -- ngx_feature_libs="$LIBINJECTION_LIBS" --fi - - # NGINX module condfiguration. - ngx_addon_name=naxsi diff --git a/www/nginx-devel_test/files/extra-patch-nginx-ct-LibreSSL b/www/nginx-devel_test/files/extra-patch-nginx-ct-LibreSSL deleted file mode 100644 index 9aa89a4..0000000 --- a/www/nginx-devel_test/files/extra-patch-nginx-ct-LibreSSL +++ /dev/null @@ -1,20 +0,0 @@ ---- ../nginx-ct-93e9884/ngx_ssl_ct_module.c.orig 2017-07-23 08:03:35.000000000 -0400 -+++ ../nginx-ct-93e9884/ngx_ssl_ct_module.c 2018-04-24 16:58:27.698435000 -0400 -@@ -158,7 +158,7 @@ - #endif - } - --#ifndef OPENSSL_IS_BORINGSSL -+#if !defined(OPENSSL_IS_BORINGSSL) && !defined(LIBRESSL_VERSION_NUMBER) - /* add OpenSSL TLS extension */ - # if OPENSSL_VERSION_NUMBER >= 0x10101000L - int context = SSL_EXT_CLIENT_HELLO -@@ -183,7 +183,7 @@ - return NGX_CONF_OK; - } - --#ifndef OPENSSL_IS_BORINGSSL -+#if !defined(OPENSSL_IS_BORINGSSL) && !defined(LIBRESSL_VERSION_NUMBER) - # if OPENSSL_VERSION_NUMBER >= 0x10101000L - int ngx_ssl_ct_ext_cb(SSL *s, unsigned int ext_type, unsigned int context, - const unsigned char **out, size_t *outlen, X509 *x, size_t chainidx, diff --git a/www/nginx-devel_test/files/extra-patch-nginx-http-footer-filter-config b/www/nginx-devel_test/files/extra-patch-nginx-http-footer-filter-config deleted file mode 100644 index 880856c..0000000 --- a/www/nginx-devel_test/files/extra-patch-nginx-http-footer-filter-config +++ /dev/null @@ -1,12 +0,0 @@ ---- ../nginx-http-footer-filter-1.2.2/config.orig 2020-04-24 08:37:44.671689000 -0400 -+++ ../nginx-http-footer-filter-1.2.2/config 2020-04-24 08:44:41.868601000 -0400 -@@ -1,3 +1,7 @@ - ngx_addon_name=ngx_http_footer_filter_module --HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES ngx_http_footer_filter_module" --NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_footer_filter_module.c" -+ngx_module_type=HTTP_FILTER -+ngx_module_name="$ngx_addon_name" -+ -+ngx_module_srcs="$ngx_addon_dir/ngx_http_footer_filter_module.c" -+ -+. auto/module diff --git a/www/nginx-devel_test/files/extra-patch-nginx-link-function-config b/www/nginx-devel_test/files/extra-patch-nginx-link-function-config deleted file mode 100644 index 725490e..0000000 --- a/www/nginx-devel_test/files/extra-patch-nginx-link-function-config +++ /dev/null @@ -1,42 +0,0 @@ ---- ../nginx-link-function-3.2.4/config.orig 2020-10-12 22:32:47.000000000 -0400 -+++ ../nginx-link-function-3.2.4/config 2020-11-13 12:26:56.186032000 -0500 -@@ -15,24 +15,6 @@ - #echo "#define NGINX_HTTP_HTTP_LINK_FUNC_VERSION \""$HTTP_LINK_FUNC_VERSION"\"" > $NGX_OBJS/ngx_vod_version.h - - --# ngx_link_func_module headers --# to Test this in order to share the header file to other client instead of just depend on it owns --ngx_feature="ngx_http_link_func" --ngx_feature_name="NGX_HAVE_HTTP_LINK_FUNC_HEADERS" --ngx_feature_run=no --ngx_feature_incs="#include " --ngx_feature_path= --ngx_feature_libs= --# ngx_feature_exit_if_not_found=yes --ngx_feature_test="int ngx_link_func_module_current_version_=ngx_link_func_module_version_34;" --. auto/feature -- --if [ $ngx_found != yes ]; then --echo "ngx_link_func_module.h not found or version not aligned in your system c header path, please copy latest ngx_link_func_module.h to your /usr/include or /usr/local/include or relavent header search path with read and write permission given." --echo "e.g install -m 644 ../nginx-link-function/src/ngx_link_func_module.h /usr/local/include/" --echo --exit 1 --else - cat $ngx_addon_dir/build_test_resources/sanity_test_raw_parse.t > $ngx_addon_dir/t/sanity.t - if [ $USE_THREADS = YES ]; then - cat $ngx_addon_dir/build_test_resources/sanity_test_aio_parse.t >> $ngx_addon_dir/t/sanity.t -@@ -42,13 +24,12 @@ - if [ $USE_THREADS = YES ]; then - cat $ngx_addon_dir/build_test_resources/sanity_test_subrequest_aio_parse.t >> $ngx_addon_dir/t/sanity.t - fi --fi - ABSOLUTE_NGX_LINKFUNC_CURRENT_PATH="$( cd "$ngx_addon_dir" ; pwd -P )" - if [ "$NGX_SYSTEM" = "Darwin" ]; then - clang -dynamiclib -o $ngx_addon_dir/t/liblinkfuntest.dylib -fPIC $ngx_addon_dir/build_test_resources/linkfuntest.c -Wl,-undefined,dynamic_lookup - sed -i '' "s@NGINX_HTTP_LINK_FUNC_TEST_LIB_PATH@$ABSOLUTE_NGX_LINKFUNC_CURRENT_PATH/t/liblinkfuntest.dylib@g" $ngx_addon_dir/t/sanity.t - else --if [ "$NGX_PLATFORM" != win32 ]; then -+if [ "$NGX_PLATFORM" = win32 ]; then - cc -shared -o $ngx_addon_dir/t/liblinkfuntest.so -fPIC $ngx_addon_dir/build_test_resources/linkfuntest.c - sed -i "s@NGINX_HTTP_LINK_FUNC_TEST_LIB_PATH@$ABSOLUTE_NGX_LINKFUNC_CURRENT_PATH/t/liblinkfuntest.so@g" $ngx_addon_dir/t/sanity.t - fi diff --git a/www/nginx-devel_test/files/extra-patch-nginx-notice-config b/www/nginx-devel_test/files/extra-patch-nginx-notice-config deleted file mode 100644 index cd333a1..0000000 --- a/www/nginx-devel_test/files/extra-patch-nginx-notice-config +++ /dev/null @@ -1,13 +0,0 @@ ---- ../nginx-notice-3c95966/config.orig 2020-04-25 18:03:28.543102000 -0400 -+++ ../nginx-notice-3c95966/config 2020-04-25 18:04:14.387235000 -0400 -@@ -1,3 +1,8 @@ - ngx_addon_name=ngx_http_notice_module --HTTP_MODULES="$HTTP_MODULES ngx_http_notice_module" --NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_notice_module.c" -+ -+ngx_module_name="$ngx_addon_name" -+ngx_module_type=HTTP -+ -+ngx_module_srcs="$ngx_addon_dir/ngx_http_notice_module.c" -+ -+. auto/module diff --git a/www/nginx-devel_test/files/extra-patch-nginx-thumbextractor-module-config b/www/nginx-devel_test/files/extra-patch-nginx-thumbextractor-module-config deleted file mode 100644 index 6324fd9..0000000 --- a/www/nginx-devel_test/files/extra-patch-nginx-thumbextractor-module-config +++ /dev/null @@ -1,25 +0,0 @@ ---- ../nginx-video-thumbextractor-module-e81f850/config.orig 2024-02-22 08:49:55.972829000 -0500 -+++ ../nginx-video-thumbextractor-module-e81f850/config 2024-02-22 08:50:05.036983000 -0500 -@@ -1,9 +1,14 @@ - ngx_addon_name=ngx_http_video_thumbextractor_module --ngx_feature_libs="-lavformat -lavcodec -lavutil -lavfilter -lswscale -lswresample -lpostproc -ljpeg" --HTTP_AUX_FILTER_MODULES="$HTTP_AUX_FILTER_MODULES $ngx_addon_name" --CORE_INCS="$CORE_INCS \ -- $ngx_addon_dir/src \ -- $ngx_addon_dir/include" --NGX_ADDON_SRCS="$NGX_ADDON_SRCS \ -- ${ngx_addon_dir}/src/ngx_http_video_thumbextractor_module.c" --CORE_LIBS="$CORE_LIBS $ngx_feature_libs" -+ngx_module_libs="-lavformat -lavcodec -lavutil -lavfilter -lswscale -lswresample -lpostproc -ljpeg" -+ngx_module_incs="$ngx_addon_dir/include $ngx_addon_dir/src" -+ -+if test -n "$ngx_module_link"; then -+ ngx_module_type=HTTP -+ ngx_module_name=$ngx_addon_name -+ ngx_module_srcs="${ngx_addon_dir}/src/ngx_http_video_thumbextractor_module.c" -+ . auto/module -+else -+ HTTP_MODULES="$HTTP_MODULES $ngx_addon_name" -+ NGX_ADDON_SRCS="$NGX_ADDON_SRCS \ -+ ${ngx_addon_dir}/src/ngx_http_video_thumbextractor_module.c" -+fi diff --git a/www/nginx-devel_test/files/extra-patch-nginx_mogilefs_module-config b/www/nginx-devel_test/files/extra-patch-nginx_mogilefs_module-config deleted file mode 100644 index 48a67ff..0000000 --- a/www/nginx-devel_test/files/extra-patch-nginx_mogilefs_module-config +++ /dev/null @@ -1,13 +0,0 @@ ---- ../nginx_mogilefs_module-1.0.4/config.orig 2020-04-25 17:51:45.544308000 -0400 -+++ ../nginx_mogilefs_module-1.0.4/config 2020-04-25 17:54:01.862958000 -0400 -@@ -1,3 +1,8 @@ - ngx_addon_name=ngx_http_mogilefs_module --HTTP_MODULES="$HTTP_MODULES ngx_http_mogilefs_module" --NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_mogilefs_module.c" -+ -+ngx_module_name="$ngx_addon_name" -+ngx_module_type=HTTP -+ -+ngx_module_srcs="$ngx_addon_dir/ngx_http_mogilefs_module.c" -+ -+. auto/module diff --git a/www/nginx-devel_test/files/extra-patch-ngx_brotli_filter_config b/www/nginx-devel_test/files/extra-patch-ngx_brotli_filter_config deleted file mode 100644 index dfac8cf..0000000 --- a/www/nginx-devel_test/files/extra-patch-ngx_brotli_filter_config +++ /dev/null @@ -1,41 +0,0 @@ ---- ../ngx_brotli-a71f931/filter/config.orig 2023-09-30 13:17:01.637746000 -0400 -+++ ../ngx_brotli-a71f931/filter/config 2023-09-30 13:23:51.839920000 -0400 -@@ -42,33 +42,16 @@ - ngx_module_type=HTTP_FILTER - ngx_module_name=ngx_http_brotli_filter_module - --brotli="$ngx_addon_dir/deps/brotli/c" --if [ ! -f "$brotli/include/brotli/encode.h" ]; then --cat << END -+BROTLI_ENC_H="%%PREFIX%%/include/brotli/encode.h \ -+ %%PREFIX%%/include/brotli/port.h \ -+ %%PREFIX%%/include/brotli/types.h" - --$0: error: \ --Brotli library is missing from the $brotli directory. - --Please make sure that the git submodule has been checked out: -- -- cd $ngx_addon_dir && git submodule update --init && cd $PWD -- --END -- exit 1 --fi -- --BROTLI_OUTPUT_DIRECTORY="$brotli/../out" --BROTLI_ENC_H="$brotli/include/brotli/encode.h \ -- $brotli/include/brotli/port.h \ -- $brotli/include/brotli/types.h" -- -- --ngx_module_incs="$brotli/include" -+ngx_module_incs="$BROTLI_ENC_H" - ngx_module_deps="$BROTLI_ENC_H" - ngx_module_srcs="$BROTLI_MODULE_SRC_DIR/ngx_http_brotli_filter_module.c" --ngx_module_libs="-L$BROTLI_OUTPUT_DIRECTORY -lbrotlienc -lbrotlicommon -lm" -+ngx_module_libs="-L%%PREFIX%%/lib -lbrotlienc -lbrotlicommon -lm" - ngx_module_order="$ngx_module_name \ -- ngx_pagespeed \ - ngx_http_postpone_filter_module \ - ngx_http_ssi_filter_module \ - ngx_http_charset_filter_module \ diff --git a/www/nginx-devel_test/files/extra-patch-ngx_http_auth_ldap_module.c b/www/nginx-devel_test/files/extra-patch-ngx_http_auth_ldap_module.c deleted file mode 100644 index d8bc2f7..0000000 --- a/www/nginx-devel_test/files/extra-patch-ngx_http_auth_ldap_module.c +++ /dev/null @@ -1,10 +0,0 @@ ---- ../nginx-auth-ldap-83c059b/ngx_http_auth_ldap_module.c.orig 2022-08-21 17:04:57.754760000 +0300 -+++ ../nginx-auth-ldap-83c059b/ngx_http_auth_ldap_module.c 2022-08-21 17:08:46.939318000 +0300 -@@ -1779,6 +1779,7 @@ - } - - r->headers_out.www_authenticate->hash = 1; -+ r->headers_out.www_authenticate->next = NULL; - r->headers_out.www_authenticate->key.len = sizeof("WWW-Authenticate") - 1; - r->headers_out.www_authenticate->key.data = (u_char *) "WWW-Authenticate"; - r->headers_out.www_authenticate->value = *realm; diff --git a/www/nginx-devel_test/files/extra-patch-ngx_http_dav_ext_module.c b/www/nginx-devel_test/files/extra-patch-ngx_http_dav_ext_module.c deleted file mode 100644 index cf66be9..0000000 --- a/www/nginx-devel_test/files/extra-patch-ngx_http_dav_ext_module.c +++ /dev/null @@ -1,15 +0,0 @@ ---- ../nginx-dav-ext-module-3.0.0/ngx_http_dav_ext_module.c 2018-12-17 11:45:12.000000000 +0300 -+++ ../nginx-dav-ext-module-3.0.0/ngx_http_dav_ext_module.c 2020-03-13 01:20:47.498199000 +0300 -@@ -896,10 +896,9 @@ - ngx_cpystrn(last, name.data, name.len + 1); - - if (ngx_de_info(filename, &dir) == NGX_FILE_ERROR) { -- ngx_log_error(NGX_LOG_CRIT, r->connection->log, ngx_errno, -+ ngx_log_error(NGX_LOG_ERR, r->connection->log, ngx_errno, - ngx_de_info_n " \"%s\" failed", filename); -- rc = NGX_HTTP_INTERNAL_SERVER_ERROR; -- break; -+ continue; - } - } - diff --git a/www/nginx-devel_test/files/extra-patch-ngx_http_json_status_module-config b/www/nginx-devel_test/files/extra-patch-ngx_http_json_status_module-config deleted file mode 100644 index 84c4a62..0000000 --- a/www/nginx-devel_test/files/extra-patch-ngx_http_json_status_module-config +++ /dev/null @@ -1,12 +0,0 @@ ---- ../ngx_http_json_status_module-1d2f303/config.orig 2020-04-25 16:16:47.024292000 -0400 -+++ ../ngx_http_json_status_module-1d2f303/config 2020-04-25 16:18:39.461340000 -0400 -@@ -1,4 +1,6 @@ - ngx_addon_name=ngx_http_json_status_module --HTTP_MODULES="$HTTP_MODULES ngx_http_json_status_module" --NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_json_status_module.c" --NGX_ADDON_DEPS="$NGX_ADDON_DEPS $ngx_addon_dir/ngx_http_json_status_module.h" -+ngx_module_name="$ngx_addon_name" -+ngx_module_type=HTTP -+ngx_module_srcs="$ngx_addon_dir/ngx_http_json_status_module.c" -+ngx_module_deps="$ngx_addon_dir/ngx_http_json_status_module.h" -+. auto/module diff --git a/www/nginx-devel_test/files/extra-patch-ngx_http_mogilefs_module.c b/www/nginx-devel_test/files/extra-patch-ngx_http_mogilefs_module.c deleted file mode 100644 index 4234838..0000000 --- a/www/nginx-devel_test/files/extra-patch-ngx_http_mogilefs_module.c +++ /dev/null @@ -1,12 +0,0 @@ ---- ../nginx_mogilefs_module-1.0.4/ngx_http_mogilefs_module.c.orig 2015-04-21 21:16:22.251692000 +0300 -+++ ../nginx_mogilefs_module-1.0.4/ngx_http_mogilefs_module.c 2015-04-21 21:16:39.460724000 +0300 -@@ -316,9 +316,6 @@ - - u->peer.log = r->connection->log; - u->peer.log_error = NGX_ERROR_ERR; --#if (NGX_THREADS) -- u->peer.lock = &r->connection->lock; --#endif - - u->output.tag = (ngx_buf_tag_t) &ngx_http_mogilefs_module; - diff --git a/www/nginx-devel_test/files/extra-patch-ngx_http_notice_module.c b/www/nginx-devel_test/files/extra-patch-ngx_http_notice_module.c deleted file mode 100644 index d62135e..0000000 --- a/www/nginx-devel_test/files/extra-patch-ngx_http_notice_module.c +++ /dev/null @@ -1,11 +0,0 @@ ---- ../nginx-notice-3c95966/ngx_http_notice_module.c.orig 2009-07-16 18:37:57.000000000 +0200 -+++ ../nginx-notice-3c95966/ngx_http_notice_module.c 2009-07-16 08:09:38.000000000 +0200 -@@ -153,7 +153,7 @@ - return NGX_HTTP_NOT_ALLOWED; - } - -- rc = ngx_http_discard_body(r); -+ rc = ngx_http_discard_request_body(r); - - if (rc != NGX_OK && rc != NGX_AGAIN) { - return rc; diff --git a/www/nginx-devel_test/files/extra-patch-ngx_http_redis_module.c b/www/nginx-devel_test/files/extra-patch-ngx_http_redis_module.c deleted file mode 100644 index 3dacd39..0000000 --- a/www/nginx-devel_test/files/extra-patch-ngx_http_redis_module.c +++ /dev/null @@ -1,34 +0,0 @@ ---- ../ngx_http_redis-0.3.9/ngx_http_redis_module.c.orig 2022-07-10 22:10:19.031893000 -0400 -+++ ../ngx_http_redis-0.3.9/ngx_http_redis_module.c 2022-07-10 22:09:41.271731000 -0400 -@@ -562,7 +562,7 @@ - /* if defined gzip_flag... */ - if (rlcf->gzip_flag) { - /* hash init */ -- h = ngx_list_push(&r->upstream->headers_in.headers); -+ h = ngx_list_push(&r->headers_out.headers); - if (h == NULL) { - return NGX_ERROR; - } -@@ -571,19 +571,11 @@ - * add Content-Encoding header for future gunzipping - * with ngx_http_gunzip_filter module - */ -- h->hash = ngx_hash(ngx_hash(ngx_hash(ngx_hash( -- ngx_hash(ngx_hash(ngx_hash( -- ngx_hash(ngx_hash(ngx_hash( -- ngx_hash(ngx_hash(ngx_hash( -- ngx_hash(ngx_hash('c', 'o'), 'n'), 't'), 'e'), -- 'n'), 't'), '-'), 'e'), 'n'), 'c'), 'o'), -- 'd'), 'i'), 'n'), 'g'); -+ h->hash = 1; -+ h->next = NULL; - ngx_str_set(&h->key, "Content-Encoding"); - ngx_str_set(&h->value, "gzip"); -- h->lowcase_key = (u_char*) "content-encoding"; --#if (NGX_HTTP_GZIP) -- u->headers_in.content_encoding = h; --#endif -+ r->headers_out.content_encoding = h; - } - - /* try to find end of string */ diff --git a/www/nginx-devel_test/files/extra-patch-ngx_http_sflow_config.c b/www/nginx-devel_test/files/extra-patch-ngx_http_sflow_config.c deleted file mode 100644 index 3e3eaa2..0000000 --- a/www/nginx-devel_test/files/extra-patch-ngx_http_sflow_config.c +++ /dev/null @@ -1,10 +0,0 @@ ---- ../nginx-sflow-module-543c72a/ngx_http_sflow_config.c.orig 2012-06-07 04:52:57.000000000 +0400 -+++ ../nginx-sflow-module-543c72a/ngx_http_sflow_config.c 2012-06-07 04:59:18.000000000 +0400 -@@ -26,7 +26,6 @@ - ngx_log_error(NGX_LOG_ERR, log, 0, "getaddrinfo() failed: %s", gai_strerror(err)); - switch(err) { - case EAI_NONAME: break; -- case EAI_NODATA: break; - case EAI_AGAIN: break; // loop and try again? - default: ngx_log_error(NGX_LOG_ERR, log, 0, "getaddrinfo() error: %s", gai_strerror(err)); break; - } diff --git a/www/nginx-devel_test/files/extra-patch-ngx_http_sflow_config.h b/www/nginx-devel_test/files/extra-patch-ngx_http_sflow_config.h deleted file mode 100644 index 6b90d4e..0000000 --- a/www/nginx-devel_test/files/extra-patch-ngx_http_sflow_config.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ../nginx-sflow-module-543c72a/ngx_http_sflow_config.h.orig 2012-07-31 21:36:49.000000000 +0400 -+++ ../nginx-sflow-module-543c72a/ngx_http_sflow_config.h 2012-07-31 21:37:20.000000000 +0400 -@@ -17,7 +17,7 @@ - -----------------___________________________------------------ - */ - --#define SFWB_DEFAULT_CONFIGFILE "/etc/hsflowd.auto" -+#define SFWB_DEFAULT_CONFIGFILE "%%PREFIX%%/etc/hsflowd.auto" - #define SFWB_SEPARATORS " \t\r\n=" - #define SFWB_QUOTES "'\" \t\r\n" - /* SFWB_MAX LINE LEN must be enough to hold the whole list of targets */ diff --git a/www/nginx-devel_test/files/extra-patch-ngx_http_sflow_module.c b/www/nginx-devel_test/files/extra-patch-ngx_http_sflow_module.c deleted file mode 100644 index e6b4bad..0000000 --- a/www/nginx-devel_test/files/extra-patch-ngx_http_sflow_module.c +++ /dev/null @@ -1,59 +0,0 @@ ---- ../nginx-sflow-module-543c72a/ngx_http_sflow_module.c.orig 2014-09-24 18:20:41.000000000 -0400 -+++ ../nginx-sflow-module-543c72a/ngx_http_sflow_module.c 2016-08-06 21:26:24.515559000 -0400 -@@ -8,9 +8,6 @@ - #include - #include - --#if (NGX_THREADS) --#include --#endif - - #include "ngx_http_sflow_api.h" - #include "ngx_http_sflow_config.h" -@@ -74,18 +71,10 @@ - /* keep log ptr for callbacks */ - ngx_log_t *log; - --#if (NGX_THREADS) -- ngx_mutex_t *mut; --#define SFWB_LOCK(_s) ngx_mutex_lock((_s)->mut) --#define SFWB_UNLOCK(_s) ngx_mutex_unlock((_s)->mut) --#define SFWB_INC_CTR(_c) ngx_atomic_fetch_add(&(_c), 1) --#define SFWB_COUNTDOWN(_c) (ngx_atomic_fetch_add(&(_c), -1) == 1) --#else - #define SFWB_LOCK(_s) /* no-op */ - #define SFWB_UNLOCK(_s) /* no-op */ - #define SFWB_INC_CTR(_c) (_c)++ - #define SFWB_COUNTDOWN(_c) (--(_c) == 0) --#endif - - /* skip countdown is handled per-worker to reduce lock contention. - * If all processes sample at 1:N it's the same as having only one -@@ -645,13 +634,8 @@ - { - sm->random_seed = ((sm->random_seed * 32719) + 3) % 32749; - ngx_atomic_t next_skip = (sm->random_seed % ((2 * sm->sampling_rate) - 1)) + 1; --#if (NGX_THREADS) -- ngx_atomic_int_t test_skip = ngx_atomic_fetch_add(&sm->sflow_skip, next_skip); -- return (test_skip + next_skip); --#else - sm->sflow_skip = next_skip; - return next_skip; --#endif - } - - /*_________________---------------------------__________________ -@@ -864,13 +848,6 @@ - { - ngx_log_debug0(NGX_LOG_DEBUG_HTTP, cf->log, 0, "sflow: sfwb_init()"); - --#if (NGX_THREADS) -- /* a mutex to lock the sFlow agent when taking a sample (only needed if there -- * is more that one worker thread - right now it seems like threads are not even -- * an option in the configure script) -- */ -- sm->mut = ngx_mutex_init(cf->log, 0); --#endif - - /* look up some vars by name and cache the index numbers -- see ngx_http_variables.c */ - ngx_str_t str_uri = ngx_string("request_uri"); /* the "unparsed" variant */ diff --git a/www/nginx-devel_test/files/extra-patch-ngx_http_tarantool-config b/www/nginx-devel_test/files/extra-patch-ngx_http_tarantool-config deleted file mode 100644 index 196a813..0000000 --- a/www/nginx-devel_test/files/extra-patch-ngx_http_tarantool-config +++ /dev/null @@ -1,24 +0,0 @@ ---- ../nginx_upstream_module-aeb8696/config.orig 2017-09-18 11:54:00.000000000 -0400 -+++ ../nginx_upstream_module-aeb8696/config 2017-12-04 21:56:41.978227000 -0500 -@@ -7,18 +7,10 @@ - $ngx_addon_dir/third_party \ - " - --test -f $ngx_addon_dir/third_party/yajl/build/yajl-2.1.0/lib/libyajl_s.a && --test -f $ngx_addon_dir/third_party/msgpuck/libmsgpuck.a && { -- libs=" \ -- $ngx_addon_dir/third_party/yajl/build/yajl-2.1.0/lib/libyajl_s.a \ -- $ngx_addon_dir/third_party/msgpuck/libmsgpuck.a \ -- " -- -- include_paths="${include_paths} \ -- $ngx_addon_dir/third_party/msgpuck \ -- $ngx_addon_dir/third_party/yajl/build/yajl-2.1.0/include \ -+include_paths="${include_paths} \ -+ %%PREFIX%%/include/msgpuck \ -+ %%PREFIX%%/include/yajl \ - " --} - - module_src_dir="$ngx_addon_dir/src" - diff --git a/www/nginx-devel_test/files/extra-patch-ngx_http_uploadprogress_module.c b/www/nginx-devel_test/files/extra-patch-ngx_http_uploadprogress_module.c deleted file mode 100644 index 5dfbdbf..0000000 --- a/www/nginx-devel_test/files/extra-patch-ngx_http_uploadprogress_module.c +++ /dev/null @@ -1,73 +0,0 @@ ---- ../nginx-upload-progress-module-68b3ab3/ngx_http_uploadprogress_module.c.orig 2021-12-24 10:53:38.000000000 -0500 -+++ ../nginx-upload-progress-module-68b3ab3/ngx_http_uploadprogress_module.c 2022-07-10 22:24:32.435330000 -0400 -@@ -559,12 +559,12 @@ - ngx_chain_t out; - ngx_int_t rc, found=0, done=0, err_status=0; - off_t rest=0, length=0; -- ngx_uint_t len, i; -+ ngx_uint_t len; - ngx_slab_pool_t *shpool; - ngx_http_uploadprogress_conf_t *upcf; - ngx_http_uploadprogress_ctx_t *ctx; - ngx_http_uploadprogress_node_t *up; -- ngx_table_elt_t *expires, *cc, **ccp; -+ ngx_table_elt_t *expires, *cc; - ngx_http_uploadprogress_state_t state; - ngx_http_uploadprogress_template_t *t; - -@@ -637,6 +637,7 @@ - } - - r->headers_out.expires = expires; -+ expires->next = NULL; - - expires->hash = 1; - expires->key.len = sizeof("Expires") - 1; -@@ -646,37 +647,30 @@ - len = sizeof("Mon, 28 Sep 1970 06:00:00 GMT"); - expires->value.len = len - 1; - -- ccp = r->headers_out.cache_control.elts; -- if (ccp == NULL) { -+ cc = r->headers_out.cache_control; - -- if (ngx_array_init(&r->headers_out.cache_control, r->pool, -- 1, sizeof(ngx_table_elt_t *)) -- != NGX_OK) { -- return NGX_HTTP_INTERNAL_SERVER_ERROR; -- } -+ if (cc == NULL) { - -- ccp = ngx_array_push(&r->headers_out.cache_control); -- if (ccp == NULL) { -- return NGX_HTTP_INTERNAL_SERVER_ERROR; -- } -- - cc = ngx_list_push(&r->headers_out.headers); - if (cc == NULL) { -+ expires->hash = 0; - return NGX_HTTP_INTERNAL_SERVER_ERROR; - } - -+ r->headers_out.cache_control = cc; -+ cc->next = NULL; -+ - cc->hash = 1; - cc->key.len = sizeof("Cache-Control") - 1; - cc->key.data = (u_char *) "Cache-Control"; - -- *ccp = cc; -- - } else { -- for (i = 1; i < r->headers_out.cache_control.nelts; i++) { -- ccp[i]->hash = 0; -+ for (cc = cc->next; cc; cc = cc->next) { -+ cc->hash = 0; - } - -- cc = ccp[0]; -+ cc = r->headers_out.cache_control; -+ cc->next = NULL; - } - - expires->value.data = (u_char *) "Thu, 01 Jan 1970 00:00:01 GMT"; diff --git a/www/nginx-devel_test/files/extra-patch-ngx_link_func_module.c b/www/nginx-devel_test/files/extra-patch-ngx_link_func_module.c deleted file mode 100644 index 31348a3..0000000 --- a/www/nginx-devel_test/files/extra-patch-ngx_link_func_module.c +++ /dev/null @@ -1,11 +0,0 @@ ---- ../nginx-link-function-3.2.4/src/ngx_link_func_module.c.orig 2020-01-24 10:32:50.550797000 -0500 -+++ ../nginx-link-function-3.2.4/src/ngx_link_func_module.c 2020-01-24 10:33:17.135348000 -0500 -@@ -35,7 +35,7 @@ - #include - #include - #include --#include -+#include "ngx_link_func_module.h" - - #define MODULE_NAME "nginx_link_function" - diff --git a/www/nginx-devel_test/files/extra-patch-ngx_postgres-config b/www/nginx-devel_test/files/extra-patch-ngx_postgres-config deleted file mode 100644 index 8c26c0f..0000000 --- a/www/nginx-devel_test/files/extra-patch-ngx_postgres-config +++ /dev/null @@ -1,19 +0,0 @@ ---- ../ngx_postgres-8aa7359/config.orig 2015-05-26 20:52:25.649166000 +0300 -+++ ../ngx_postgres-8aa7359/config 2015-05-26 20:53:10.331122000 +0300 -@@ -48,12 +48,12 @@ - - if [ $ngx_found = no ]; then - # FreeBSD -- ngx_feature="libpq library in /usr/local/" -- ngx_feature_path="/usr/local/include" -+ ngx_feature="libpq library in %%PREFIX%%/" -+ ngx_feature_path="%%PREFIX%%/include" - if [ $NGX_RPATH = YES ]; then -- ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -lpq" -+ ngx_feature_libs="-R%%PREFIX%%/lib -L%%PREFIX%%/lib -lpq" - else -- ngx_feature_libs="-L/usr/local/lib -lpq" -+ ngx_feature_libs="-L%%PREFIX%%/lib -lpq" - fi - . auto/feature - fi diff --git a/www/nginx-devel_test/files/extra-patch-openresty-drizzle-nginx-module-config b/www/nginx-devel_test/files/extra-patch-openresty-drizzle-nginx-module-config deleted file mode 100644 index 294d22a..0000000 --- a/www/nginx-devel_test/files/extra-patch-openresty-drizzle-nginx-module-config +++ /dev/null @@ -1,42 +0,0 @@ ---- ../drizzle-nginx-module-3504fc6/config.orig 2020-01-22 18:04:58.000000000 -0500 -+++ ../drizzle-nginx-module-3504fc6/config 2020-04-24 06:23:01.264872000 -0400 -@@ -34,12 +34,12 @@ - - if [ $ngx_found = no ]; then - # FreeBSD, OpenBSD -- ngx_feature="libdrizzle library in /usr/local/" -- ngx_feature_path="/usr/local/include/libdrizzle-1.0" -+ ngx_feature="libdrizzle library in %%PREFIX%%" -+ ngx_feature_path="%%PREFIX%%/include/libdrizzle" - if [ $NGX_RPATH = YES ]; then -- ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -ldrizzle" -+ ngx_feature_libs="-R%%PREFIX%%/lib -L%%PREFIX%%/lib -ldrizzle" - else -- ngx_feature_libs="-L/usr/local/lib -ldrizzle" -+ ngx_feature_libs="-L%%PREFIX%%/lib -ldrizzle" - fi - . auto/feature - fi -@@ -80,8 +80,19 @@ - fi - - ngx_addon_name=ngx_http_drizzle_module --HTTP_MODULES="$HTTP_MODULES ngx_http_drizzle_module" --NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/src/ngx_http_drizzle_module.c $ngx_addon_dir/src/ngx_http_drizzle_handler.c $ngx_addon_dir/src/ngx_http_drizzle_processor.c $ngx_addon_dir/src/ngx_http_drizzle_upstream.c $ngx_addon_dir/src/ngx_http_drizzle_util.c $ngx_addon_dir/src/ngx_http_drizzle_output.c $ngx_addon_dir/src/ngx_http_drizzle_keepalive.c $ngx_addon_dir/src/ngx_http_drizzle_quoting.c $ngx_addon_dir/src/ngx_http_drizzle_checker.c" --NGX_ADDON_DEPS="$NGX_ADDON_DEPS $ngx_addon_dir/src/ddebug.h $ngx_addon_dir/src/ngx_http_drizzle_module.h $ngx_addon_dir/src/ngx_http_drizzle_handler.h $ngx_addon_dir/src/ngx_http_drizzle_processor.h $ngx_addon_dir/src/ngx_http_drizzle_upstream.h $ngx_addon_dir/src/ngx_http_drizzle_util.h $ngx_addon_dir/src/ngx_http_drizzle_output.h $ngx_addon_dir/src/resty_dbd_stream.h $ngx_addon_dir/src/ngx_http_drizzle_keepalive.h $ngx_addon_dir/src/ngx_http_drizzle_quoting.h $ngx_addon_dir/src/ngx_http_drizzle_checker.h" -+if test -n "$ngx_module_link"; then -+ ngx_module_type=HTTP -+ ngx_module_name=$ngx_addon_name -+ ngx_module_srcs="$ngx_addon_dir/src/ngx_http_drizzle_module.c $ngx_addon_dir/src/ngx_http_drizzle_handler.c $ngx_addon_dir/src/ngx_http_drizzle_processor.c $ngx_addon_dir/src/ngx_http_drizzle_upstream.c $ngx_addon_dir/src/ngx_http_drizzle_util.c $ngx_addon_dir/src/ngx_http_drizzle_output.c $ngx_addon_dir/src/ngx_http_drizzle_keepalive.c $ngx_addon_dir/src/ngx_http_drizzle_quoting.c $ngx_addon_dir/src/ngx_http_drizzle_checker.c" -+ ngx_module_incs="$ngx_addon_dir/src/ddebug.h $ngx_addon_dir/src/ngx_http_drizzle_module.h $ngx_addon_dir/src/ngx_http_drizzle_handler.h $ngx_addon_dir/src/ngx_http_drizzle_processor.h $ngx_addon_dir/src/ngx_http_drizzle_upstream.h $ngx_addon_dir/src/ngx_http_drizzle_util.h $ngx_addon_dir/src/ngx_http_drizzle_output.h $ngx_addon_dir/src/resty_dbd_stream.h $ngx_addon_dir/src/ngx_http_drizzle_keepalive.h $ngx_addon_dir/src/ngx_http_drizzle_quoting.h $ngx_addon_dir/src/ngx_http_drizzle_checker.h" -+ ngx_module_deps= -+ ngx_module_libs="-L%%PREFIX%%/lib -ldrizzle" -+ -+ . auto/module -+else -+ HTTP_MODULES="$HTTP_MODULES ngx_http_drizzle_module" -+ NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/src/ngx_http_drizzle_module.c $ngx_addon_dir/src/ngx_http_drizzle_handler.c $ngx_addon_dir/src/ngx_http_drizzle_processor.c $ngx_addon_dir/src/ngx_http_drizzle_upstream.c $ngx_addon_dir/src/ngx_http_drizzle_util.c $ngx_addon_dir/src/ngx_http_drizzle_output.c $ngx_addon_dir/src/ngx_http_drizzle_keepalive.c $ngx_addon_dir/src/ngx_http_drizzle_quoting.c $ngx_addon_dir/src/ngx_http_drizzle_checker.c" -+ NGX_ADDON_DEPS="$NGX_ADDON_DEPS $ngx_addon_dir/src/ddebug.h $ngx_addon_dir/src/ngx_http_drizzle_module.h $ngx_addon_dir/src/ngx_http_drizzle_handler.h $ngx_addon_dir/src/ngx_http_drizzle_processor.h $ngx_addon_dir/src/ngx_http_drizzle_upstream.h $ngx_addon_dir/src/ngx_http_drizzle_util.h $ngx_addon_dir/src/ngx_http_drizzle_output.h $ngx_addon_dir/src/resty_dbd_stream.h $ngx_addon_dir/src/ngx_http_drizzle_keepalive.h $ngx_addon_dir/src/ngx_http_drizzle_quoting.h $ngx_addon_dir/src/ngx_http_drizzle_checker.h" -+fi - - have=NGX_DRIZZLE_MODULE . auto/have diff --git a/www/nginx-devel_test/files/extra-patch-passenger-build-nginx.rb b/www/nginx-devel_test/files/extra-patch-passenger-build-nginx.rb deleted file mode 100644 index 69a629c..0000000 --- a/www/nginx-devel_test/files/extra-patch-passenger-build-nginx.rb +++ /dev/null @@ -1,33 +0,0 @@ ---- ../passenger-6.0.19/build/nginx.rb.orig 2013-10-26 18:00:00.000000000 -0400 -+++ ../passenger-6.0.19/build/nginx.rb 2016-05-09 18:21:22.426777000 -0400 -@@ -33,13 +33,12 @@ - desc "Build Nginx support files" - task :nginx => [ - :nginx_without_native_support, -- NATIVE_SUPPORT_TARGET -+ LIBBOOST_OXT, - ].compact - - desc "Build Nginx support files, including objects suitable for dynamic linking against Nginx" - task 'nginx:as_dynamic_module' => [ - :nginx_dynamic_without_native_support, -- NATIVE_SUPPORT_TARGET - ].compact - - # Workaround for https://github.com/jimweirich/rake/issues/274 -@@ -47,7 +46,6 @@ - - task :nginx_without_native_support => [ - auto_generated_sources, -- AGENT_TARGET, - COMMON_LIBRARY.only(*NGINX_LIBS_SELECTOR).link_objects - ].flatten - -@@ -55,7 +53,6 @@ - # it also creates a namespace:clean task to clean up the output_dir - task :nginx_dynamic_without_native_support => [ - auto_generated_sources, -- AGENT_TARGET, - define_libboost_oxt_task("nginx", NGINX_DYNAMIC_OUTPUT_DIR + "libboost_oxt", "-fPIC"), - COMMON_LIBRARY.only(*NGINX_LIBS_SELECTOR). - set_namespace("nginx").set_output_dir(NGINX_DYNAMIC_OUTPUT_DIR + "module_libpassenger_common").define_tasks("-fPIC"). diff --git a/www/nginx-devel_test/files/extra-patch-passenger-disable-telemetry b/www/nginx-devel_test/files/extra-patch-passenger-disable-telemetry deleted file mode 100644 index 108a983..0000000 --- a/www/nginx-devel_test/files/extra-patch-passenger-disable-telemetry +++ /dev/null @@ -1,11 +0,0 @@ ---- ../passenger-6.0.19/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb.orig 2018-12-03 12:23:06.980728000 -0500 -+++ ../passenger-6.0.19/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb 2018-12-03 12:23:32.978924000 -0500 -@@ -204,7 +204,7 @@ - :name => 'passenger_disable_anonymous_telemetry', - :scope => :global, - :type => :flag, -- :default => false, -+ :default => true, - :context => [:main], - :struct => 'NGX_HTTP_MAIN_CONF_OFFSET' - }, diff --git a/www/nginx-devel_test/files/extra-patch-rds-csv-nginx-module-config b/www/nginx-devel_test/files/extra-patch-rds-csv-nginx-module-config deleted file mode 100644 index 040c78a..0000000 --- a/www/nginx-devel_test/files/extra-patch-rds-csv-nginx-module-config +++ /dev/null @@ -1,15 +0,0 @@ ---- ../rds-csv-nginx-module-0.09/config.orig 2020-04-25 11:37:21.896900000 -0400 -+++ ../rds-csv-nginx-module-0.09/config 2020-04-25 11:39:06.371176000 -0400 -@@ -1,5 +1,9 @@ - ngx_addon_name=ngx_http_rds_csv_filter_module --HTTP_AUX_FILTER_MODULES="$HTTP_AUX_FILTER_MODULES ngx_http_rds_csv_filter_module" --NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/src/ngx_http_rds_csv_filter_module.c $ngx_addon_dir/src/ngx_http_rds_csv_processor.c $ngx_addon_dir/src/ngx_http_rds_csv_util.c $ngx_addon_dir/src/ngx_http_rds_csv_output.c" --NGX_ADDON_DEPS="$NGX_ADDON_DEPS $ngx_addon_dir/src/ddebug.h $ngx_addon_dir/src/resty_dbd_stream.h $ngx_addon_dir/src/ngx_http_rds_csv_filter_module.h $ngx_addon_dir/src/ngx_http_rds_csv_processor.h $ngx_addon_dir/src/ngx_http_rds_csv_util.h $ngx_addon_dir/src/ngx_http_rds.h $ngx_addon_dir/src/resty_dbd_stream.h $ngx_addon_dir/src/ngx_http_rds_csv_output.h $ngx_addon_dir/src/ngx_http_rds_utils.h" - -+ngx_module_name="$ngx_addon_name" -+ngx_module_type=HTTP_FILTER -+ -+ngx_module_srcs="$ngx_addon_dir/src/ngx_http_rds_csv_filter_module.c $ngx_addon_dir/src/ngx_http_rds_csv_processor.c $ngx_addon_dir/src/ngx_http_rds_csv_util.c $ngx_addon_dir/src/ngx_http_rds_csv_output.c" -+ngx_module_deps="$ngx_addon_dir/src/ddebug.h $ngx_addon_dir/src/resty_dbd_stream.h $ngx_addon_dir/src/ngx_http_rds_csv_filter_module.h $ngx_addon_dir/src/ngx_http_rds_csv_processor.h $ngx_addon_dir/src/ngx_http_rds_csv_util.h $ngx_addon_dir/src/ngx_http_rds.h $ngx_addon_dir/src/resty_dbd_stream.h $ngx_addon_dir/src/ngx_http_rds_csv_output.h $ngx_addon_dir/src/ngx_http_rds_utils.h" -+ -+. auto/module diff --git a/www/nginx-devel_test/files/extra-patch-rds-json-nginx-module-config b/www/nginx-devel_test/files/extra-patch-rds-json-nginx-module-config deleted file mode 100644 index f3252ac..0000000 --- a/www/nginx-devel_test/files/extra-patch-rds-json-nginx-module-config +++ /dev/null @@ -1,15 +0,0 @@ ---- ../rds-json-nginx-module-0.15/config.orig 2020-04-25 11:39:29.003855000 -0400 -+++ ../rds-json-nginx-module-0.15/config 2020-04-25 11:40:18.345148000 -0400 -@@ -1,5 +1,9 @@ - ngx_addon_name=ngx_http_rds_json_filter_module --HTTP_AUX_FILTER_MODULES="$HTTP_AUX_FILTER_MODULES ngx_http_rds_json_filter_module" --NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/src/ngx_http_rds_json_filter_module.c $ngx_addon_dir/src/ngx_http_rds_json_processor.c $ngx_addon_dir/src/ngx_http_rds_json_util.c $ngx_addon_dir/src/ngx_http_rds_json_output.c $ngx_addon_dir/src/ngx_http_rds_json_handler.c" --NGX_ADDON_DEPS="$NGX_ADDON_DEPS $ngx_addon_dir/src/ddebug.h $ngx_addon_dir/src/resty_dbd_stream.h $ngx_addon_dir/src/ngx_http_rds_json_filter_module.h $ngx_addon_dir/src/ngx_http_rds_json_processor.h $ngx_addon_dir/src/ngx_http_rds_json_util.h $ngx_addon_dir/src/ngx_http_rds.h $ngx_addon_dir/src/resty_dbd_stream.h $ngx_addon_dir/src/ngx_http_rds_json_output.h $ngx_addon_dir/src/ngx_http_rds_utils.h $ngx_addon_dir/src/ngx_http_rds_json_handler.h" - -+ngx_module_name="$ngx_addon_name" -+ngx_module_type=HTTP_FILTER -+ -+ngx_module_srcs="$ngx_addon_dir/src/ngx_http_rds_json_filter_module.c $ngx_addon_dir/src/ngx_http_rds_json_processor.c $ngx_addon_dir/src/ngx_http_rds_json_util.c $ngx_addon_dir/src/ngx_http_rds_json_output.c $ngx_addon_dir/src/ngx_http_rds_json_handler.c" -+ngx_module_deps="$ngx_addon_dir/src/ddebug.h $ngx_addon_dir/src/resty_dbd_stream.h $ngx_addon_dir/src/ngx_http_rds_json_filter_module.h $ngx_addon_dir/src/ngx_http_rds_json_processor.h $ngx_addon_dir/src/ngx_http_rds_json_util.h $ngx_addon_dir/src/ngx_http_rds.h $ngx_addon_dir/src/resty_dbd_stream.h $ngx_addon_dir/src/ngx_http_rds_json_output.h $ngx_addon_dir/src/ngx_http_rds_utils.h $ngx_addon_dir/src/ngx_http_rds_json_handler.h" -+ -+. auto/module diff --git a/www/nginx-devel_test/files/extra-patch-spnego-http-auth-nginx-module-config b/www/nginx-devel_test/files/extra-patch-spnego-http-auth-nginx-module-config deleted file mode 100644 index a54e89e..0000000 --- a/www/nginx-devel_test/files/extra-patch-spnego-http-auth-nginx-module-config +++ /dev/null @@ -1,14 +0,0 @@ ---- ../spnego-http-auth-nginx-module-3575542/config.orig 2020-08-27 07:59:28.423636000 -0400 -+++ ../spnego-http-auth-nginx-module-3575542/config 2020-08-27 08:01:42.152121000 -0400 -@@ -1,8 +1,9 @@ - ngx_addon_name=ngx_http_auth_spnego_module --ngx_feature_libs="-lgssapi_krb5 -lkrb5 -lcom_err" -+ngx_feature_libs="-L%%GSSAPILIBDIR%% %%GSSAPILIBS%%" -+ngx_module_incs="%%GSSAPIINCDIR%%" - - if uname -o | grep -q FreeBSD; then -- ngx_feature_libs="$ngx_feature_libs -lgssapi" -+ ngx_feature_libs="$ngx_feature_libs" - fi - - if uname -a | grep -q NetBSD; then diff --git a/www/nginx-devel_test/files/extra-patch-src-http-modules-ngx_http_upstream_hash_module.c b/www/nginx-devel_test/files/extra-patch-src-http-modules-ngx_http_upstream_hash_module.c deleted file mode 100644 index 9267e59..0000000 --- a/www/nginx-devel_test/files/extra-patch-src-http-modules-ngx_http_upstream_hash_module.c +++ /dev/null @@ -1,44 +0,0 @@ ---- src/http/modules/ngx_http_upstream_hash_module.c.orig 2016-02-24 14:53:24 UTC -+++ src/http/modules/ngx_http_upstream_hash_module.c -@@ -9,6 +9,9 @@ - #include - #include - -+#if (NGX_HTTP_UPSTREAM_CHECK) -+#include "ngx_http_upstream_check_module.h" -+#endif - - typedef struct { - uint32_t hash; -@@ -235,6 +238,15 @@ ngx_http_upstream_get_hash_peer(ngx_peer - goto next; - } - -+#if (NGX_HTTP_UPSTREAM_CHECK) -+ ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0, -+ "get hash peer, check_index: %ui", -+ peer->check_index); -+ if (ngx_http_upstream_check_peer_down(peer->check_index)) { -+ goto next; -+ } -+#endif -+ - if (peer->max_fails - && peer->fails >= peer->max_fails - && now - peer->checked <= peer->fail_timeout) -@@ -535,6 +547,15 @@ ngx_http_upstream_get_chash_peer(ngx_pee - continue; - } - -+#if (NGX_HTTP_UPSTREAM_CHECK) -+ ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0, -+ "get consistent_hash peer, check_index: %ui", -+ peer->check_index); -+ if (ngx_http_upstream_check_peer_down(peer->check_index)) { -+ continue; -+ } -+#endif -+ - if (peer->server.len != server->len - || ngx_strncmp(peer->server.data, server->data, server->len) - != 0) diff --git a/www/nginx-devel_test/files/extra-patch-src-http-modules-ngx_http_upstream_ip_hash_module.c b/www/nginx-devel_test/files/extra-patch-src-http-modules-ngx_http_upstream_ip_hash_module.c deleted file mode 100644 index 176876b..0000000 --- a/www/nginx-devel_test/files/extra-patch-src-http-modules-ngx_http_upstream_ip_hash_module.c +++ /dev/null @@ -1,28 +0,0 @@ ---- src/http/modules/ngx_http_upstream_ip_hash_module.c.orig 2016-02-24 14:53:24 UTC -+++ src/http/modules/ngx_http_upstream_ip_hash_module.c -@@ -9,6 +9,9 @@ - #include - #include - -+#if (NGX_HTTP_UPSTREAM_CHECK) -+#include "ngx_http_upstream_check_module.h" -+#endif - - typedef struct { - /* the round robin data must be first */ -@@ -205,6 +208,15 @@ ngx_http_upstream_get_ip_hash_peer(ngx_p - goto next; - } - -+#if (NGX_HTTP_UPSTREAM_CHECK) -+ ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0, -+ "get ip_hash peer, check_index: %ui", -+ peer->check_index); -+ if (ngx_http_upstream_check_peer_down(peer->check_index)) { -+ goto next; -+ } -+#endif -+ - if (peer->max_fails - && peer->fails >= peer->max_fails - && now - peer->checked <= peer->fail_timeout) diff --git a/www/nginx-devel_test/files/extra-patch-src-http-modules-ngx_http_upstream_least_conn_module.c b/www/nginx-devel_test/files/extra-patch-src-http-modules-ngx_http_upstream_least_conn_module.c deleted file mode 100644 index 84f88fd..0000000 --- a/www/nginx-devel_test/files/extra-patch-src-http-modules-ngx_http_upstream_least_conn_module.c +++ /dev/null @@ -1,46 +0,0 @@ ---- src/http/modules/ngx_http_upstream_least_conn_module.c.orig 2016-02-24 14:53:24 UTC -+++ src/http/modules/ngx_http_upstream_least_conn_module.c -@@ -9,6 +9,9 @@ - #include - #include - -+#if (NGX_HTTP_UPSTREAM_CHECK) -+#include "ngx_http_upstream_check_module.h" -+#endif - - static ngx_int_t ngx_http_upstream_init_least_conn_peer(ngx_http_request_t *r, - ngx_http_upstream_srv_conf_t *us); -@@ -148,6 +151,16 @@ ngx_http_upstream_get_least_conn_peer(ng - continue; - } - -+#if (NGX_HTTP_UPSTREAM_CHECK) -+ ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0, -+ "get least_conn peer, check_index: %ui", -+ peer->check_index); -+ -+ if (ngx_http_upstream_check_peer_down(peer->check_index)) { -+ continue; -+ } -+#endif -+ - if (peer->max_fails - && peer->fails >= peer->max_fails - && now - peer->checked <= peer->fail_timeout) -@@ -199,6 +212,16 @@ ngx_http_upstream_get_least_conn_peer(ng - continue; - } - -+#if (NGX_HTTP_UPSTREAM_CHECK) -+ ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0, -+ "get least_conn peer, check_index: %ui", -+ peer->check_index); -+ -+ if (ngx_http_upstream_check_peer_down(peer->check_index)) { -+ continue; -+ } -+#endif -+ - if (peer->conns * best->weight != best->conns * peer->weight) { - continue; - } diff --git a/www/nginx-devel_test/files/extra-patch-src-http-ngx_http_upstream_round_robin.c b/www/nginx-devel_test/files/extra-patch-src-http-ngx_http_upstream_round_robin.c deleted file mode 100644 index e5012b0..0000000 --- a/www/nginx-devel_test/files/extra-patch-src-http-ngx_http_upstream_round_robin.c +++ /dev/null @@ -1,101 +0,0 @@ ---- src/http/ngx_http_upstream_round_robin.c.orig 2016-02-24 14:53:24 UTC -+++ src/http/ngx_http_upstream_round_robin.c -@@ -9,6 +9,9 @@ - #include - #include - -+#if (NGX_HTTP_UPSTREAM_CHECK) -+#include "ngx_http_upstream_check_module.h" -+#endif - - #define ngx_http_upstream_tries(p) ((p)->number \ - + ((p)->next ? (p)->next->number : 0)) -@@ -96,7 +99,14 @@ ngx_http_upstream_init_round_robin(ngx_c - peer[n].fail_timeout = server[i].fail_timeout; - peer[n].down = server[i].down; - peer[n].server = server[i].name; -- -+#if (NGX_HTTP_UPSTREAM_CHECK) -+ if (!server[i].down) { -+ peer[n].check_index = -+ ngx_http_upstream_check_add_peer(cf, us, &server[i].addrs[j]); -+ } else { -+ peer[n].check_index = (ngx_uint_t) NGX_ERROR; -+ } -+#endif - *peerp = &peer[n]; - peerp = &peer[n].next; - n++; -@@ -159,7 +169,15 @@ ngx_http_upstream_init_round_robin(ngx_c - peer[n].fail_timeout = server[i].fail_timeout; - peer[n].down = server[i].down; - peer[n].server = server[i].name; -- -+#if (NGX_HTTP_UPSTREAM_CHECK) -+ if (!server[i].down) { -+ peer[n].check_index = -+ ngx_http_upstream_check_add_peer(cf, us, &server[i].addrs[j]); -+ } -+ else { -+ peer[n].check_index = (ngx_uint_t) NGX_ERROR; -+ } -+#endif - *peerp = &peer[n]; - peerp = &peer[n].next; - n++; -@@ -225,6 +243,9 @@ ngx_http_upstream_init_round_robin(ngx_c - peer[i].current_weight = 0; - peer[i].max_fails = 1; - peer[i].fail_timeout = 10; -+#if (NGX_HTTP_UPSTREAM_CHECK) -+ peer[i].check_index = (ngx_uint_t) NGX_ERROR; -+#endif - *peerp = &peer[i]; - peerp = &peer[i].next; - } -@@ -339,6 +360,9 @@ ngx_http_upstream_create_round_robin_pee - peer[0].current_weight = 0; - peer[0].max_fails = 1; - peer[0].fail_timeout = 10; -+#if (NGX_HTTP_UPSTREAM_CHECK) -+ peer[0].check_index = (ngx_uint_t) NGX_ERROR; -+#endif - peers->peer = peer; - - } else { -@@ -381,6 +405,9 @@ ngx_http_upstream_create_round_robin_pee - peer[i].current_weight = 0; - peer[i].max_fails = 1; - peer[i].fail_timeout = 10; -+#if (NGX_HTTP_UPSTREAM_CHECK) -+ peer[i].check_index = (ngx_uint_t) NGX_ERROR; -+#endif - *peerp = &peer[i]; - peerp = &peer[i].next; - } -@@ -441,6 +468,12 @@ ngx_http_upstream_get_round_robin_peer(n - goto failed; - } - -+#if (NGX_HTTP_UPSTREAM_CHECK) -+ if (ngx_http_upstream_check_peer_down(peer->check_index)) { -+ goto failed; -+ } -+#endif -+ - rrp->current = peer; - - } else { -@@ -542,6 +575,12 @@ ngx_http_upstream_get_peer(ngx_http_upst - continue; - } - -+#if (NGX_HTTP_UPSTREAM_CHECK) -+ if (ngx_http_upstream_check_peer_down(peer->check_index)) { -+ continue; -+ } -+#endif -+ - if (peer->max_fails - && peer->fails >= peer->max_fails - && now - peer->checked <= peer->fail_timeout) diff --git a/www/nginx-devel_test/files/extra-patch-src-http-ngx_http_upstream_round_robin.h b/www/nginx-devel_test/files/extra-patch-src-http-ngx_http_upstream_round_robin.h deleted file mode 100644 index 84c99aa..0000000 --- a/www/nginx-devel_test/files/extra-patch-src-http-ngx_http_upstream_round_robin.h +++ /dev/null @@ -1,14 +0,0 @@ ---- 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_msec_t slow_start; - ngx_msec_t start_time; - diff --git a/www/nginx-devel_test/files/extra-patch-src_http_modules_ngx_http_slice_read_ahead.c b/www/nginx-devel_test/files/extra-patch-src_http_modules_ngx_http_slice_read_ahead.c deleted file mode 100644 index b9eb1f2..0000000 --- a/www/nginx-devel_test/files/extra-patch-src_http_modules_ngx_http_slice_read_ahead.c +++ /dev/null @@ -1,456 +0,0 @@ ---- src/http/modules/ngx_http_slice_filter_module.c.orig 2019-04-23 13:12:58 UTC -+++ src/http/modules/ngx_http_slice_filter_module.c -@@ -2,6 +2,10 @@ - /* - * Copyright (C) Roman Arutyunyan - * Copyright (C) Nginx, Inc. -+ * Copyright (C) Carey Gister -+ * Copyright (C) Metapeer, Inc. -+ * -+ * Retrieve slices with an optional look-a-head of N slices where N is a float value. - */ - - -@@ -9,13 +13,25 @@ - #include - #include - -+/* -+ * Location Configuration -- size is size of a slice, read_a_heads is number of -+ * blocks to look a head: 0, will not limit the number of blocks. Blocks will be -+ * retrieved as quickly as GETs can be issued and returned. -+ */ - - typedef struct { - size_t size; -+ float read_a_heads; - } ngx_http_slice_loc_conf_t; - - - typedef struct { -+ size_t requested_bytes; -+ size_t received_bytes; -+ size_t skipped_first_slice; -+} ngx_http_slice_read_a_head_t; -+ -+typedef struct { - off_t start; - off_t end; - ngx_str_t range; -@@ -23,6 +39,7 @@ typedef struct { - unsigned last:1; - unsigned active:1; - ngx_http_request_t *sr; -+ ngx_http_slice_read_a_head_t *read_a_head; - } ngx_http_slice_ctx_t; - - -@@ -46,6 +63,8 @@ static char *ngx_http_slice_merge_loc_conf(ngx_conf_t - void *child); - static ngx_int_t ngx_http_slice_add_variables(ngx_conf_t *cf); - static ngx_int_t ngx_http_slice_init(ngx_conf_t *cf); -+static char * ngx_conf_set_float_slot(ngx_conf_t *cf, ngx_command_t *cmd, -+ void *conf); - - - static ngx_command_t ngx_http_slice_filter_commands[] = { -@@ -57,6 +76,13 @@ static ngx_command_t ngx_http_slice_filter_commands[] - offsetof(ngx_http_slice_loc_conf_t, size), - NULL }, - -+ { ngx_string("slice_read_ahead"), -+ NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, -+ ngx_conf_set_float_slot, -+ NGX_HTTP_LOC_CONF_OFFSET, -+ offsetof(ngx_http_slice_loc_conf_t, read_a_heads), -+ NULL }, -+ - ngx_null_command - }; - -@@ -102,11 +128,11 @@ static ngx_int_t - ngx_http_slice_header_filter(ngx_http_request_t *r) - { - off_t end; -- ngx_int_t rc; -+ ngx_int_t rc, rc1; - ngx_table_elt_t *h; - ngx_http_slice_ctx_t *ctx; - ngx_http_slice_loc_conf_t *slcf; -- ngx_http_slice_content_range_t cr; -+ ngx_http_slice_content_range_t cr, cr1; - - ctx = ngx_http_get_module_ctx(r, ngx_http_slice_filter_module); - if (ctx == NULL) { -@@ -187,6 +213,23 @@ ngx_http_slice_header_filter(ngx_http_request_t *r) - rc = ngx_http_next_header_filter(r); - - if (r != r->main) { -+ if (ctx->read_a_head != NULL) { -+ ngx_log_debug5(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, -+ "http slice header (subrequest) requested_bytes: %uz, size: %uz, range: %O/%O, end: %O", -+ ctx->read_a_head->requested_bytes, slcf->size, cr.start, -+ cr.end, end); -+ -+ if (end != cr.start) { -+ ctx->read_a_head->requested_bytes += -+ ngx_min(slcf->size, -+ (size_t) end - (size_t) cr.start); -+ } -+ -+ ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, -+ "http slice header (subrequest) new requested_bytes: %uz, size: %uz", -+ ctx->read_a_head->requested_bytes, slcf->size); -+ } -+ - return rc; - } - -@@ -201,8 +244,68 @@ ngx_http_slice_header_filter(ngx_http_request_t *r) - ctx->end = r->headers_out.content_offset - + r->headers_out.content_length_n; - -+ /* Update requested bytes for the new chunk. */ -+ if (ctx->read_a_head != NULL) { -+ ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, -+ "http slice header (main request, partial) requested_bytes: %uz, size: %uz, start/end (%O/%O)", -+ ctx->read_a_head->requested_bytes, slcf->size, -+ ctx->start, ctx->end); -+ -+ if (ctx->end != ctx->start) { -+ ctx->read_a_head->requested_bytes += -+ ngx_min(slcf->size, -+ (size_t) ctx->end - (size_t) ctx->start); -+ } -+ -+ ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, -+ "http slice header (main request, partial) new requested_bytes: %uz, size: %uz, start/end (%O/%O)", -+ ctx->read_a_head->requested_bytes, slcf->size, ctx->start, ctx->end); -+ -+ /* Parse the new Content-Range, which may have been set by the Range -+ filter. If the start changed, then adjust the requested_byte count -+ by the difference between the slice start and the actual start. -+ These bytes will never be received. */ -+ -+ rc1 = ngx_http_slice_parse_content_range(r, &cr1); -+ ngx_log_debug(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, -+ "http slice header (main request, partial): rc1: %d", -+ rc1); -+ -+ if (rc1 == NGX_OK) { -+ ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, -+ "http slice header (main request, partial new content range) cr1.start: %uz, cr1.end: %uz", -+ cr1.start, cr1.end); -+ -+ if (cr1.start != cr.start) { -+ ctx->read_a_head->skipped_first_slice = -+ cr1.start - (slcf->size * (cr1.start / slcf->size)); -+ -+ ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, -+ "http slice header (main request, partial) new cr.start: %uz, initial start: %uz, skipped first slice: %uz", -+ cr1.start, cr.start, -+ ctx->read_a_head->skipped_first_slice); -+ } -+ } -+ } - } else { - ctx->end = cr.complete_length; -+ -+ /* Update the requested bytes for the new chunk. */ -+ if (ctx->read_a_head != NULL) { -+ ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, -+ "http slice header (main request, full) requested_bytes: %uz, size: %uz, start/end (%O/%O)", -+ ctx->read_a_head->requested_bytes, slcf->size, ctx->start, ctx->end); -+ -+ if (ctx->end != ctx->start) { -+ ctx->read_a_head->requested_bytes += -+ ngx_min(slcf->size, -+ (size_t) ctx->end - (size_t) ctx->start); -+ } -+ -+ ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, -+ "http slice header (main request, full) new requested_bytes: %uz, size: %uz, start/end (%O/%O)", -+ ctx->read_a_head->requested_bytes, slcf->size, ctx->start, ctx->end); -+ } - } - - return rc; -@@ -216,14 +319,31 @@ ngx_http_slice_body_filter(ngx_http_request_t *r, ngx_ - ngx_chain_t *cl; - ngx_http_slice_ctx_t *ctx; - ngx_http_slice_loc_conf_t *slcf; -+ size_t received, read_a_head_window, read_a_head_size; - - ctx = ngx_http_get_module_ctx(r, ngx_http_slice_filter_module); - -- if (ctx == NULL || r != r->main) { -+ if (ctx == NULL) { - return ngx_http_next_body_filter(r, in); - } - -+ if (r != r->main) { -+ if (ctx->read_a_head != NULL) { -+ received = 0; -+ for (cl = in; cl; cl = cl->next) { -+ received = received + ngx_buf_size(cl->buf); -+ } -+ -+ ctx->read_a_head->received_bytes += received; -+ } -+ -+ return ngx_http_next_body_filter(r, in); -+ } -+ -+ /* For the main request */ -+ received = 0; - for (cl = in; cl; cl = cl->next) { -+ received = received + ngx_buf_size(cl->buf); - if (cl->buf->last_buf) { - cl->buf->last_buf = 0; - cl->buf->last_in_chain = 1; -@@ -232,6 +352,10 @@ ngx_http_slice_body_filter(ngx_http_request_t *r, ngx_ - } - } - -+ if (ctx->read_a_head != NULL) { -+ ctx->read_a_head->received_bytes += received; -+ } -+ - rc = ngx_http_next_body_filter(r, in); - - if (rc == NGX_ERROR || !ctx->last) { -@@ -258,6 +382,20 @@ ngx_http_slice_body_filter(ngx_http_request_t *r, ngx_ - return rc; - } - -+ slcf = ngx_http_get_module_loc_conf(r, ngx_http_slice_filter_module); -+ -+ if (ctx->read_a_head != NULL) { -+ read_a_head_size = (size_t) (slcf->size * slcf->read_a_heads); -+ read_a_head_window = r->connection->sent + read_a_head_size; -+ -+ if ((r->connection->sent != 0) && -+ ((read_a_head_window + ctx->read_a_head->skipped_first_slice) < ctx->read_a_head->requested_bytes)) { -+ ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, -+ "http slice body filter defer subrequest: returning NGX_AGAIN"); -+ return NGX_AGAIN; -+ } -+ } -+ - if (ngx_http_subrequest(r, &r->uri, &r->args, &ctx->sr, NULL, - NGX_HTTP_SUBREQUEST_CLONE) - != NGX_OK) -@@ -267,8 +405,6 @@ ngx_http_slice_body_filter(ngx_http_request_t *r, ngx_ - - ngx_http_set_ctx(ctx->sr, ctx, ngx_http_slice_filter_module); - -- slcf = ngx_http_get_module_loc_conf(r, ngx_http_slice_filter_module); -- - ctx->range.len = ngx_sprintf(ctx->range.data, "bytes=%O-%O", ctx->start, - ctx->start + (off_t) slcf->size - 1) - - ctx->range.data; -@@ -287,6 +423,7 @@ ngx_http_slice_parse_content_range(ngx_http_request_t - ngx_http_slice_content_range_t *cr) - { - off_t start, end, complete_length, cutoff, cutlim; -+ ssize_t len; - u_char *p; - ngx_table_elt_t *h; - -@@ -300,6 +437,7 @@ ngx_http_slice_parse_content_range(ngx_http_request_t - } - - p = h->value.data + 6; -+ len = h->value.len - 6; - - cutoff = NGX_MAX_OFF_T_VALUE / 10; - cutlim = NGX_MAX_OFF_T_VALUE % 10; -@@ -308,56 +446,62 @@ ngx_http_slice_parse_content_range(ngx_http_request_t - end = 0; - complete_length = 0; - -- while (*p == ' ') { p++; } -+ while ((*p == ' ') && (len != 0)) { p++; len--; } - -- if (*p < '0' || *p > '9') { -+ if ((len == 0) || (*p < '0' || *p > '9')) { - return NGX_ERROR; - } - -- while (*p >= '0' && *p <= '9') { -+ while ((len != 0) && (*p >= '0' && *p <= '9')) { - if (start >= cutoff && (start > cutoff || *p - '0' > cutlim)) { - return NGX_ERROR; - } - - start = start * 10 + (*p++ - '0'); -+ len--; - } - -- while (*p == ' ') { p++; } -+ while ((len != 0) && (*p == ' ')) { p++; len--; } - -- if (*p++ != '-') { -+ if ((len == 0) || (*p++ != '-')) { - return NGX_ERROR; - } - -- while (*p == ' ') { p++; } -+ len--; - -- if (*p < '0' || *p > '9') { -+ while ((len != 0) && (*p == ' ')) { p++; len--; } -+ -+ if ((len == 0) || (*p < '0' || *p > '9')) { - return NGX_ERROR; - } - -- while (*p >= '0' && *p <= '9') { -+ while ((len != 0) && (*p >= '0' && *p <= '9')) { - if (end >= cutoff && (end > cutoff || *p - '0' > cutlim)) { - return NGX_ERROR; - } - - end = end * 10 + (*p++ - '0'); -+ len--; - } - - end++; - -- while (*p == ' ') { p++; } -+ while ((len != 0) && (*p == ' ')) { p++; len--; } - -- if (*p++ != '/') { -+ if ((len == 0) || (*p++ != '/')) { - return NGX_ERROR; - } - -- while (*p == ' ') { p++; } -+ len--; - -- if (*p != '*') { -+ while ((len != 0) && (*p == ' ')) { p++; len--; } -+ -+ if ((len != 0) && (*p != '*')) { - if (*p < '0' || *p > '9') { - return NGX_ERROR; - } - -- while (*p >= '0' && *p <= '9') { -+ while ((len != 0) && (*p >= '0' && *p <= '9')) { - if (complete_length >= cutoff - && (complete_length > cutoff || *p - '0' > cutlim)) - { -@@ -365,16 +509,18 @@ ngx_http_slice_parse_content_range(ngx_http_request_t - } - - complete_length = complete_length * 10 + (*p++ - '0'); -+ len--; - } - - } else { - complete_length = -1; - p++; -+ len--; - } - -- while (*p == ' ') { p++; } -+ while ((len != 0) && (*p == ' ')) { p++; len--; } - -- if (*p != '\0') { -+ if (len != 0) { - return NGX_ERROR; - } - -@@ -390,9 +536,10 @@ static ngx_int_t - ngx_http_slice_range_variable(ngx_http_request_t *r, - ngx_http_variable_value_t *v, uintptr_t data) - { -- u_char *p; -- ngx_http_slice_ctx_t *ctx; -- ngx_http_slice_loc_conf_t *slcf; -+ u_char *p; -+ ngx_http_slice_ctx_t *ctx; -+ ngx_http_slice_loc_conf_t *slcf; -+ ngx_http_slice_read_a_head_t *read_a_head; - - ctx = ngx_http_get_module_ctx(r, ngx_http_slice_filter_module); - -@@ -414,6 +561,15 @@ ngx_http_slice_range_variable(ngx_http_request_t *r, - return NGX_ERROR; - } - -+ if (slcf->read_a_heads != 0.0) { -+ read_a_head = ngx_pcalloc(r->pool, sizeof(ngx_http_slice_read_a_head_t)); -+ if (read_a_head == NULL) { -+ return NGX_ERROR; -+ } -+ -+ ctx->read_a_head = read_a_head; -+ } -+ - ngx_http_set_ctx(r, ctx, ngx_http_slice_filter_module); - - p = ngx_pnalloc(r->pool, sizeof("bytes=-") - 1 + 2 * NGX_OFF_T_LEN); -@@ -488,6 +644,39 @@ ngx_http_slice_get_start(ngx_http_request_t *r) - } - - -+static char * -+ngx_conf_set_float_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) -+{ -+ char *p = conf; -+ float *np; -+ ngx_str_t *value; -+ ngx_conf_post_t *post; -+ ngx_int_t val; -+ -+ np = (float *) (p + cmd->offset); -+ -+ if (*np != (float) NGX_CONF_UNSET) { -+ return "is duplicate"; -+ } -+ -+ value = cf->args->elts; -+ val = ngx_atofp(value[1].data, value[1].len, 3); -+ -+ *np = (float) val / 1000.0; -+ -+ if (*np == (float) NGX_ERROR) { -+ return "invalid number"; -+ } -+ -+ if (cmd->post) { -+ post = cmd->post; -+ return post->post_handler(cf, post, np); -+ } -+ -+ return NGX_CONF_OK; -+} -+ -+ - static void * - ngx_http_slice_create_loc_conf(ngx_conf_t *cf) - { -@@ -499,6 +688,7 @@ ngx_http_slice_create_loc_conf(ngx_conf_t *cf) - } - - slcf->size = NGX_CONF_UNSET_SIZE; -+ slcf->read_a_heads = (float) NGX_CONF_UNSET; - - return slcf; - } -@@ -511,6 +701,13 @@ ngx_http_slice_merge_loc_conf(ngx_conf_t *cf, void *pa - ngx_http_slice_loc_conf_t *conf = child; - - ngx_conf_merge_size_value(conf->size, prev->size, 0); -+ ngx_conf_merge_value(conf->read_a_heads, prev->read_a_heads, 0.0); -+ -+ if (conf->read_a_heads < 0.0) { -+ ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "read a head must be >= 0"); -+ return NGX_CONF_ERROR; -+ } -+ - - return NGX_CONF_OK; - } diff --git a/www/nginx-devel_test/files/extra-patch-xss-nginx-module-config b/www/nginx-devel_test/files/extra-patch-xss-nginx-module-config deleted file mode 100644 index c5dc537..0000000 --- a/www/nginx-devel_test/files/extra-patch-xss-nginx-module-config +++ /dev/null @@ -1,15 +0,0 @@ ---- ../xss-nginx-module-0.06/config.orig 2020-04-24 17:13:57.596040000 -0400 -+++ ../xss-nginx-module-0.06/config 2020-04-24 17:18:16.438437000 -0400 -@@ -1,5 +1,9 @@ - ngx_addon_name=ngx_http_xss_filter_module --HTTP_AUX_FILTER_MODULES="$HTTP_AUX_FILTER_MODULES ngx_http_xss_filter_module" --NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/src/ngx_http_xss_filter_module.c $ngx_addon_dir/src/ngx_http_xss_util.c" --NGX_ADDON_DEPS="$NGX_ADDON_DEPS $ngx_addon_dir/src/ddebug.h $ngx_addon_dir/src/ngx_http_xss_filter_module.h $ngx_addon_dir/src/ngx_http_xss_util.h" - -+ngx_module_name="$ngx_addon_name" -+ngx_module_type=HTTP_FILTER -+ -+ngx_module_srcs="$ngx_addon_dir/src/ngx_http_xss_filter_module.c $ngx_addon_dir/src/ngx_http_xss_util.c" -+ngx_module_deps="$ngx_addon_dir/src/ddebug.h $ngx_addon_dir/src/ngx_http_xss_filter_module.h $ngx_addon_dir/src/ngx_http_xss_util.h" -+ -+. auto/module diff --git a/www/nginx-devel_test/files/nginx.in b/www/nginx-devel_test/files/nginx.in deleted file mode 100644 index 652468a..0000000 --- a/www/nginx-devel_test/files/nginx.in +++ /dev/null @@ -1,158 +0,0 @@ -#!/bin/sh - -# PROVIDE: nginx -# REQUIRE: LOGIN cleanvar -# KEYWORD: shutdown - -# -# Add the following lines to /etc/rc.conf to enable nginx: -# nginx_enable (bool): Set to "NO" by default. -# Set it to "YES" to enable nginx -# nginx_profiles (str): Set to "" by default. -# Define your profiles here. -# nginx_pid_prefix (str): Set to "" by default. -# When using profiles manually assign value to "nginx_" -# for prevent collision with other PIDs names. -# nginxlimits_enable (bool): Set to "NO" by default. -# Set it to yes to run `limits $limits_args` -# just before nginx starts. -# nginx_reload_quiet (bool): Set to "NO" by default. -# Set it to yes to suppress info output when testng config. -# nginx_flags (str): Set to "" by default. -# Extra flags passed to start command. -# nginxlimits_args (str): Default to "-e -U %%WWWOWN%%" -# Arguments of pre-start limits run. -# nginx_http_accept_enable (bool): Set to "NO" by default. -# Set to yes to check for accf_http kernel module -# on start-up and load if not loaded. -# nginx_sig_stop (str): Default to "TERM" - -. /etc/rc.subr - -name="nginx" -rcvar=nginx_enable - -start_precmd="nginx_prestart" -stop_precmd="nginx_prestop" -restart_precmd="nginx_checkconfig" -reload_precmd="nginx_checkconfig" -configtest_cmd="nginx_checkconfig" -gracefulstop_cmd="nginx_gracefulstop" -upgrade_precmd="nginx_checkconfig" -upgrade_cmd="nginx_upgrade" -command="%%PREFIX%%/sbin/nginx" -_pidprefix="%%NGINX_RUNDIR%%" -pidfile="${_pidprefix}/${name}.pid" -_tmpprefix="%%NGINX_TMPDIR%%" -required_files=%%PREFIX%%/etc/nginx/nginx.conf -extra_commands="reload configtest upgrade gracefulstop" - -[ -z "$nginx_enable" ] && nginx_enable="NO" -[ -z "$nginxlimits_enable" ] && nginxlimits_enable="NO" -[ -z "$nginxlimits_args" ] && nginxlimits_args="-e -U %%WWWOWN%%" -[ -z "$nginx_http_accept_enable" ] && nginx_http_accept_enable="NO" -[ -z "$nginx_reload_quiet" ] && nginx_reload_quiet="NO" - -load_rc_config $name - -if [ -n "$2" ]; then - profile="$2" - if [ "x${nginx_profiles}" != "x" ]; then - pidfile="${_pidprefix}/${nginx_pid_prefix}${profile}.pid" - eval nginx_configfile="\${nginx_${profile}_configfile:-}" - if [ "x${nginx_configfile}" = "x" ]; then - echo "You must define a configuration file (nginx_${profile}_configfile)" - exit 1 - fi - required_files="${nginx_configfile}" - eval nginx_enable="\${nginx_${profile}_enable:-${nginx_enable}}" - eval nginx_flags="\${nginx_${profile}_flags:-${nginx_flags}}" - eval nginxlimits_enable="\${nginxlimits_${profile}_enable:-${nginxlimits_enable}}" - eval nginxlimits_args="\${nginxlimits_${profile}_args:-${nginxlimits_args}}" - nginx_flags="-c ${nginx_configfile} -g \"pid ${pidfile};\" ${nginx_flags}" - else - echo "$0: extra argument ignored" - fi -else - if [ "x${nginx_profiles}" != "x" -a "x$1" != "x" ]; then - for profile in ${nginx_profiles}; do - echo "===> nginx profile: ${profile}" - %%PREFIX%%/etc/rc.d/nginx $1 ${profile} - retcode="$?" - if [ "0${retcode}" -ne 0 ]; then - failed="${profile} (${retcode}) ${failed:-}" - else - success="${profile} ${success:-}" - fi - done - exit 0 - fi -fi - -# tmpfs(5) -nginx_checktmpdir() -{ - if [ ! -d ${_tmpprefix} ] ; then - install -d -o %%WWWOWN%% -g %%WWWGRP%% -m 755 ${_tmpprefix} - fi -} - -nginx_checkconfig() -{ - nginx_checktmpdir - - if checkyesno nginx_reload_quiet; then - eval ${command} ${nginx_flags} -t -q - else - echo "Performing sanity check on nginx configuration:" - eval ${command} ${nginx_flags} -t - fi -} - -nginx_gracefulstop() -{ - echo "Performing a graceful stop:" - sig_stop="QUIT" - run_rc_command ${rc_prefix}stop $rc_extra_args || return 1 -} - -nginx_upgrade() -{ - echo "Upgrading nginx binary:" - - reload_precmd="" - sig_reload="USR2" - run_rc_command ${rc_prefix}reload $rc_extra_args || return 1 - - sleep 1 - - echo "Stopping old binary:" - - sig_reload="QUIT" - pidfile="$pidfile.oldbin" - run_rc_command ${rc_prefix}reload $rc_extra_args || return 1 -} - -nginx_prestart() -{ - if checkyesno nginx_http_accept_enable - then - required_modules="$required_modules accf_http accf_data" - fi - - nginx_checkconfig - - if checkyesno nginxlimits_enable - then - eval `/usr/bin/limits ${nginxlimits_args}` 2>/dev/null - else - return 0 - fi -} - -nginx_prestop() -{ - sig_stop="${nginx_sig_stop:-TERM}" -} - -run_rc_command "$1" diff --git a/www/nginx-devel_test/files/patch-conf-nginx.conf b/www/nginx-devel_test/files/patch-conf-nginx.conf deleted file mode 100644 index fb38c9c..0000000 --- a/www/nginx-devel_test/files/patch-conf-nginx.conf +++ /dev/null @@ -1,47 +0,0 @@ ---- conf/nginx.conf.orig 2016-09-06 14:56:32 UTC -+++ conf/nginx.conf -@@ -2,9 +2,14 @@ - #user nobody; - worker_processes 1; - --#error_log logs/error.log; --#error_log logs/error.log notice; --#error_log logs/error.log info; -+# This default error log path is compiled-in to make sure configuration parsing -+# errors are logged somewhere, especially during unattended boot when stderr -+# isn't normally logged anywhere. This path will be touched on every nginx -+# start regardless of error log location configured here. See -+# https://trac.nginx.org/nginx/ticket/147 for more info. -+# -+#error_log %%NGINX_ERRORLOG%%; -+# - - #pid logs/nginx.pid; - -@@ -33,7 +38,7 @@ http { - #gzip on; - - server { -- listen 80; -+ listen %%HTTP_PORT%%; - server_name localhost; - - #charset koi8-r; -@@ -41,7 +46,7 @@ http { - #access_log logs/host.access.log main; - - location / { -- root html; -+ root %%PREFIX%%/www/nginx; - index index.html index.htm; - } - -@@ -51,7 +56,7 @@ http { - # - error_page 500 502 503 504 /50x.html; - location = /50x.html { -- root html; -+ root %%PREFIX%%/www/nginx-dist; - } - - # proxy the PHP scripts to Apache listening on 127.0.0.1:80 diff --git a/www/nginx-devel_test/files/pkg-message.in b/www/nginx-devel_test/files/pkg-message.in deleted file mode 100644 index adde280..0000000 --- a/www/nginx-devel_test/files/pkg-message.in +++ /dev/null @@ -1,25 +0,0 @@ -[ -{ type: install - message: <