mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-01 05:45:45 +00:00
www/nginx: Update to 1.26.0
Adoption of the changes of nginx-devel during the devel phase 1.25.x Changelogs: https://nginx.org/en/CHANGES-1.26 Sponsored by: Netzkommund GmbH
This commit is contained in:
Jochen Neumeister
parent
dabd91a8fa
commit
f054a3856d
@ -1,5 +1,5 @@
|
||||
PORTNAME= nginx
|
||||
PORTREVISION= 5
|
||||
PORTREVISION= 0
|
||||
PKGNAMESUFFIX= -full
|
||||
|
||||
MAINTAINER= joneum@FreeBSD.org
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
PORTNAME= nginx
|
||||
PORTREVISION= 1
|
||||
PORTREVISION= 0
|
||||
PKGNAMESUFFIX= -naxsi
|
||||
|
||||
MAINTAINER= joneum@FreeBSD.org
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
PORTNAME= nginx
|
||||
PORTVERSION= 1.24.0
|
||||
PORTREVISION?= 17
|
||||
PORTVERSION= 1.26.0
|
||||
PORTREVISION= 0
|
||||
PORTEPOCH= 3
|
||||
CATEGORIES= www
|
||||
MASTER_SITES= https://nginx.org/download/ \
|
||||
@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
|
||||
|
||||
CONFLICTS_INSTALL= nginx-devel
|
||||
|
||||
PORTSCOUT= limit:^1\.24\.[0-9]*
|
||||
PORTSCOUT= limit:^1\.2[6-7]\.[0-9]*
|
||||
|
||||
USES= cpe
|
||||
|
||||
@ -78,11 +78,11 @@ 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 THREADS WWW
|
||||
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 MAIL MAIL_SSL STREAM \
|
||||
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
|
||||
@ -168,10 +168,7 @@ HTTP_XSLT_LIB_DEPENDS= libxml2.so:textproc/libxml2 \
|
||||
HTTP_XSLT_VARS= DSO_BASEMODS+=http_xslt_module
|
||||
HTTPV2_IMPLIES= HTTP_SSL
|
||||
HTTPV2_CONFIGURE_ON= --with-http_v2_module
|
||||
HTTPV3_CONFIGURE_ON= --build=nginx-quic \
|
||||
--with-stream_quic_module \
|
||||
--with-http_v3_module
|
||||
HTTPV3_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-httpv3:-p1
|
||||
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
|
||||
@ -191,6 +188,7 @@ 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_CONFIGURE_ON= --with-stream
|
||||
STREAM_REALIP_CONFIGURE_ON= --with-stream_realip_module
|
||||
STREAM_SSL_USES= ssl
|
||||
STREAM_SSL_CONFIGURE_ON= --with-stream_ssl_module
|
||||
@ -246,8 +244,7 @@ CFLAGS+= -DNDEBUG
|
||||
CONFIGURE_ENV+= EXTRA_PRE_CXXFLAGS="-std=c++14"
|
||||
.endif
|
||||
|
||||
.if empty(PORT_OPTIONS:MLUA) && empty(PORT_OPTIONS:MMODSECURITY3) && \
|
||||
empty(PORT_OPTIONS:MPASSENGER)
|
||||
.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"
|
||||
@ -270,9 +267,8 @@ pre-everything::
|
||||
@${ECHO_MSG}
|
||||
|
||||
post-extract-NAXSI-on:
|
||||
@${MKDIR} ${WRKDIR}/naxsi-${NAXSI_NGINX_VER}
|
||||
@${MV} ${WRKDIR}/naxsi_rules ${WRKDIR}/naxsi_src \
|
||||
${WRKDIR}/naxsi-${NAXSI_NGINX_VER}
|
||||
@${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
|
||||
@ -284,7 +280,7 @@ post-patch:
|
||||
${WRKSRC}/conf/nginx.conf
|
||||
|
||||
post-patch-BROTLI-on:
|
||||
@${REINPLACE_CMD} -E 's!^brotli=.*!brotli="${LOCALBASE}"!' ${WRKSRC_brotli}/config
|
||||
@${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_brotli}/filter/config
|
||||
|
||||
post-patch-DRIZZLE-on:
|
||||
@${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_drizzle}/config
|
||||
@ -306,22 +302,12 @@ post-patch-HTTP_AUTH_KRB5-on:
|
||||
post-patch-HTTP_TARANTOOL-on:
|
||||
@${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_nginx_tarantool}/config
|
||||
|
||||
# linker error acquire if --std=c99 defined, add "static" to inline function
|
||||
post-patch-HTTP_ZIP-on:
|
||||
@${REINPLACE_CMD} \
|
||||
's!^inline!static inline!' \
|
||||
${WRKSRC_mod_zip}/ngx_http_zip_parsers.*
|
||||
|
||||
post-patch-ICONV-on:
|
||||
@${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_iconv}/config
|
||||
|
||||
post-patch-NAXSI-on:
|
||||
@${REINPLACE_CMD} 's!MSIZE!TOK_MSIZE!g' \
|
||||
${WRKSRC_naxsi}/naxsi_src/libinjection/src/libinjection_sqli.c
|
||||
|
||||
post-patch-PASSENGER-on:
|
||||
@${REINPLACE_CMD} \
|
||||
'177,179s!true!false!' \
|
||||
'168,170s!true!false!' \
|
||||
${WRKSRC_PASSENGER}/build/basics.rb
|
||||
@${REINPLACE_CMD} \
|
||||
's!-I/usr/include/libev!!; \
|
||||
@ -340,11 +326,6 @@ post-patch-SFLOW-on:
|
||||
's!%%PREFIX%%!${LOCALBASE}!g' \
|
||||
${WRKSRC_sflow}/ngx_http_sflow_config.h
|
||||
|
||||
post-patch-VOD-on:
|
||||
@${REINPLACE_CMD} \
|
||||
's!%%PREFIX%%!${LOCALBASE}!g' \
|
||||
${WRKSRC_vod}/config
|
||||
|
||||
pre-configure-SMALL_LIGHT-on:
|
||||
( cd ${WRKSRC_small_light} && ./setup )
|
||||
|
||||
|
||||
@ -2,18 +2,18 @@
|
||||
|
||||
OPTIONS_GROUP+= THIRDPARTYGRP
|
||||
# External modules (arrayvar MUST appear after devel_kit for build-dep)
|
||||
OPTIONS_GROUP_THIRDPARTYGRP= AJP AWS_AUTH BROTLI CACHE_PURGE CLOJURE COOKIE_FLAG CT \
|
||||
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_MP4_H264 HTTP_NOTICE HTTP_PROXY_CONNECT HTTP_PUSH \
|
||||
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
|
||||
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
|
||||
@ -26,26 +26,18 @@ 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:9aec15e: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
|
||||
|
||||
CLOJURE_CATEGORIES+= java
|
||||
CLOJURE_USE= JAVA=yes JAVA_OS=native JAVA_VERSION=1.8 \
|
||||
JAVA_VENDOR=openjdk JAVA_BUILD=yes JAVA_RUN=yes
|
||||
CLOJURE_GH_TUPLE= nginx-clojure:nginx-clojure:v0.6.0:clojure
|
||||
CLOJURE_CONFIGURE_ENV= "JNI_INCS=-I${LOCALBASE}/openjdk8/include -I${LOCALBASE}/openjdk8/include/freebsd"
|
||||
CLOJURE_VARS= DSO_EXTMODS+=clojure CLOJURE_SUBDIR=/src/c
|
||||
|
||||
COOKIE_FLAG_GH_TUPLE= AirisX:nginx_cookie_flag_module:c4ff449:cookie_flag
|
||||
COOKIE_FLAG_VARS= DSO_EXTMODS+=cookie_flag
|
||||
|
||||
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
|
||||
CT_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-nginx-ct-LibreSSL \
|
||||
${PATCHDIR}/extra-patch-ngx_stream_ssl_ct_module.c
|
||||
|
||||
ECHO_GH_TUPLE= openresty:echo-nginx-module:5a402aa:echo
|
||||
ECHO_VARS= DSO_EXTMODS+=echo
|
||||
@ -61,7 +53,7 @@ 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.2:devel_kit
|
||||
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
|
||||
@ -80,7 +72,7 @@ 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:33b646d:headers_more
|
||||
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
|
||||
@ -101,10 +93,6 @@ 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_PROXY_CONNECT_GH_TUPLE= chobits:ngx_http_proxy_connect_module:75febef:mod_https_connect
|
||||
HTTP_PROXY_CONNECT_EXTRA_PATCHES= ${WRKSRC_mod_https_connect}/patch/proxy_connect_rewrite_102101.patch:-p1
|
||||
HTTP_PROXY_CONNECT_VARS= DSO_EXTMODS+=mod_https_connect
|
||||
|
||||
HTTP_DAV_EXT_IMPLIES= HTTP_DAV
|
||||
HTTP_DAV_EXT_LIB_DEPENDS= libxml2.so:textproc/libxml2 \
|
||||
libxslt.so:textproc/libxslt
|
||||
@ -145,13 +133,6 @@ 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_MP4_H264_MASTER_SITES= http://h264.code-shop.com/download/:mp4streaming
|
||||
HTTP_MP4_H264_CONFIGURE_ON= --with-cc-opt="-DLARGEFILE_SOURCE -DBUILDING_NGINX"
|
||||
HTTP_MP4_H264_DISTFILES= nginx_mod_h264_streaming-2.2.7.tar.gz:mp4streaming
|
||||
HTTP_MP4_H264_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_streaming_module.c \
|
||||
${PATCHDIR}/extra-patch-nginx_mod_h264_streaming-config
|
||||
HTTP_MP4_H264_VARS= DSO_EXTDIRS+=nginx_mod_h264_streaming-2.2.7
|
||||
|
||||
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
|
||||
@ -206,10 +187,11 @@ HTTP_VIDEO_THUMBEXTRACTOR_LIB_DEPENDS= libavformat.so:multimedia/ffmpeg \
|
||||
libavutil.so:multimedia/ffmpeg \
|
||||
libswscale.so:multimedia/ffmpeg
|
||||
HTTP_VIDEO_THUMBEXTRACTOR_USES= jpeg
|
||||
HTTP_VIDEO_THUMBEXTRACTOR_GH_TUPLE= Novetta:nginx-video-thumbextractor-module:28861f2:vte
|
||||
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= evanmiller:mod_zip:39dc908:mod_zip
|
||||
HTTP_ZIP_GH_TUPLE= vince2678:mod_zip:5b2604b:mod_zip
|
||||
HTTP_ZIP_VARS= DSO_EXTMODS+=mod_zip
|
||||
|
||||
ICONV_IMPLIES= DEVEL_KIT
|
||||
@ -251,19 +233,32 @@ MODSECURITY3_GH_TUPLE= SpiderLabs:ModSecurity-nginx:v1.0.3:modsecurity3
|
||||
MODSECURITY3_VARS= DSO_EXTMODS+=modsecurity3
|
||||
|
||||
NAXSI_NGINX_VER= 1.6
|
||||
NAXSI_MASTER_SITES= https://www.github.com/wargio/naxsi/releases/download/${NAXSI_NGINX_VER}/:naxsi
|
||||
NAXSI_DISTFILES= naxsi-${NAXSI_NGINX_VER}-src-with-deps.tar.gz:naxsi
|
||||
NAXSI_GH_TUPLE= wargio:naxsi:${NAXSI_NGINX_VER}:naxsi \
|
||||
libinjection:libinjection:4aa3894:libinjection
|
||||
NAXSI_VARS= DSO_EXTMODS+=naxsi NAXSI_SUBDIR=/naxsi_src
|
||||
WRKSRC_naxsi= ${WRKDIR}/naxsi-${NAXSI_NGINX_VER}
|
||||
NAXSI_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-naxsi-libinjection__sqli_c \
|
||||
${PATCHDIR}/extra-patch-naxsi_config
|
||||
|
||||
NJS_GH_TUPLE= nginx:njs:0.8.0:njs
|
||||
NJS_GH_TUPLE= nginx:njs:0.8.4:njs
|
||||
NJS_VARS= DSO_EXTMODS+=njs NJS_SUBDIR=/nginx
|
||||
NJS_IMPLIES= STREAM
|
||||
|
||||
NJS_XML_IMPLIES= NJS
|
||||
NJS_XML_IMPLIES= HTTP NJS
|
||||
NJS_XML_LIB_DEPENDS= libxml2.so:textproc/libxml2 \
|
||||
libxslt.so:textproc/libxslt
|
||||
|
||||
PASSENGER_NGINX_VER= 6.0.17
|
||||
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.20
|
||||
PASSENGER_CATEGORIES= ruby
|
||||
PASSENGER_USES= ruby
|
||||
PASSENGER_BUILD_DEPENDS=${LOCALBASE}/bin/rake:devel/rubygem-rake
|
||||
|
||||
@ -3,8 +3,6 @@ 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
|
||||
CLOJURE_DESC= 3rd party clojure module
|
||||
COOKIE_FLAG_DESC= 3rd party cookie_flag 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
|
||||
@ -51,10 +49,8 @@ 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_MP4_H264_DESC= 3rd party mp4/h264 module
|
||||
HTTP_NOTICE_DESC= 3rd party notice module
|
||||
HTTP_PERL_DESC= Enable http_perl module
|
||||
HTTP_PROXY_CONNECT_DESC= 3rd party https proxy connect 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
|
||||
@ -94,6 +90,7 @@ 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
|
||||
|
||||
@ -1,34 +1,26 @@
|
||||
TIMESTAMP = 1708285506
|
||||
SHA256 (nginx-1.24.0.tar.gz) = 77a2541637b92a621e3ee76776c8b7b40cf6d707e69ba53a940283e30ff2f55d
|
||||
SIZE (nginx-1.24.0.tar.gz) = 1112471
|
||||
TIMESTAMP = 1714506394
|
||||
SHA256 (nginx-1.26.0.tar.gz) = d2e6c8439d6c6db5015d8eaab2470ab52aef85a7bf363182879977e084370497
|
||||
SIZE (nginx-1.26.0.tar.gz) = 1244118
|
||||
SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae
|
||||
SIZE (nginx_mogilefs_module-1.0.4.tar.gz) = 11208
|
||||
SHA256 (nginx_mod_h264_streaming-2.2.7.tar.gz) = 6d974ba630cef59de1f60996c66b401264a345d25988a76037c2856cec756c19
|
||||
SIZE (nginx_mod_h264_streaming-2.2.7.tar.gz) = 44012
|
||||
SHA256 (ngx_http_redis-0.3.9.tar.gz) = 21f87540f0a44b23ffa5df16fb3d788bc90803b255ef14f9c26e3847a6f26f46
|
||||
SIZE (ngx_http_redis-0.3.9.tar.gz) = 13051
|
||||
SHA256 (naxsi-1.6-src-with-deps.tar.gz) = 1add95e5e473fca58b18356fd896221f98a122450d5b6e91b4352ef726f98a06
|
||||
SIZE (naxsi-1.6-src-with-deps.tar.gz) = 3352718
|
||||
SHA256 (passenger-6.0.17.tar.gz) = 385559ed1d78eb83165222d568721dcc4222bb57c1939811ecd2c4ef33937ba7
|
||||
SIZE (passenger-6.0.17.tar.gz) = 8422867
|
||||
SHA256 (passenger-6.0.20.tar.gz) = fa8d9a37edb92f4a8f064b3005b57bccf10392ce4eb067838883206060e27107
|
||||
SIZE (passenger-6.0.20.tar.gz) = 8476308
|
||||
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-9aec15e_GH0.tar.gz) = 0177b1158ff7092b9996346de28a0b296dc33addb2af4e8904794d19b4a9a808
|
||||
SIZE (google-ngx_brotli-9aec15e_GH0.tar.gz) = 16194
|
||||
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 (nginx-clojure-nginx-clojure-v0.6.0_GH0.tar.gz) = e8215cdebc3eb13f852c10e9bbbf315f2e1b75bb4dec015ca60ec29efcb86509
|
||||
SIZE (nginx-clojure-nginx-clojure-v0.6.0_GH0.tar.gz) = 786029
|
||||
SHA256 (AirisX-nginx_cookie_flag_module-c4ff449_GH0.tar.gz) = 4b8c1c1e1ed59ed85751f4bd7d68026ad5051103c8b983e05ad17eb0cdab138e
|
||||
SIZE (AirisX-nginx_cookie_flag_module-c4ff449_GH0.tar.gz) = 4713
|
||||
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.2_GH0.tar.gz) = aa961eafb8317e0eb8da37eb6e2c9ff42267edd18b56947384e719b85188f58b
|
||||
SIZE (vision5-ngx_devel_kit-v0.3.2_GH0.tar.gz) = 66551
|
||||
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
|
||||
@ -37,14 +29,14 @@ SHA256 (openresty-echo-nginx-module-5a402aa_GH0.tar.gz) = bb2a4b1a0e5ffa0203c1be
|
||||
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 (ogarrett-nginx-fips-check-module-6cb4270_GH0.tar.gz) = d52fbb0f2819cd91b710ad85e6c8b452fdca6a5d81b0694d6637adba3fc2382c
|
||||
SIZE (ogarrett-nginx-fips-check-module-6cb4270_GH0.tar.gz) = 6494
|
||||
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-33b646d_GH0.tar.gz) = 4e68ef77ce8bc3c248c04ddc112bb2230adf2de84c77430cedc8a4458ffb7369
|
||||
SIZE (openresty-headers-more-nginx-module-33b646d_GH0.tar.gz) = 28812
|
||||
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
|
||||
@ -73,8 +65,6 @@ SHA256 (nginx-modules-ngx_http_json_status_module-1d2f303_GH0.tar.gz) = fdc34e0e
|
||||
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 (chobits-ngx_http_proxy_connect_module-75febef_GH0.tar.gz) = 6169361f31607af0ec8c78b356e62c2aeb128649161d688d7ea92f4d2c1c39f9
|
||||
SIZE (chobits-ngx_http_proxy_connect_module-75febef_GH0.tar.gz) = 32645
|
||||
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
|
||||
@ -93,10 +83,10 @@ SHA256 (jaygooby-nginx-upstream-fair-10ecdcf_GH0.tar.gz) = 93f71b7cf0db9c6dbf97e
|
||||
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 (Novetta-nginx-video-thumbextractor-module-28861f2_GH0.tar.gz) = 04656da527d9e64cbdf1bf475a93193fa60324ffea160d05d4cc53c864943bc1
|
||||
SIZE (Novetta-nginx-video-thumbextractor-module-28861f2_GH0.tar.gz) = 34447
|
||||
SHA256 (evanmiller-mod_zip-39dc908_GH0.tar.gz) = bc5c3d725268abbe1c5c38de5b18a4ad9dbe5821c4afeaccabd3eec38b272be4
|
||||
SIZE (evanmiller-mod_zip-39dc908_GH0.tar.gz) = 30275
|
||||
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
|
||||
@ -109,10 +99,14 @@ SHA256 (openresty-memc-nginx-module-v0.19_GH0.tar.gz) = 8c2bdbe875e4f5225d0778bf
|
||||
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 (nginx-njs-0.8.0_GH0.tar.gz) = b98033fff6aadcbb8e108b96e80c0d94c6e2103bcbe75846b5ae0b560696084b
|
||||
SIZE (nginx-njs-0.8.0_GH0.tar.gz) = 715391
|
||||
SHA256 (opentracing-contrib-nginx-opentracing-v0.24.0_GH0.tar.gz) = 5328c5f37e0615b5252aed51b9cd40f3d14989d995ad54134076aeda4ab9b280
|
||||
SIZE (opentracing-contrib-nginx-opentracing-v0.24.0_GH0.tar.gz) = 679417
|
||||
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.4_GH0.tar.gz) = fe197e254204c15e9f1df0acf375add57be3416901ec8d7b87319dccb490f90d
|
||||
SIZE (nginx-njs-0.8.4_GH0.tar.gz) = 743910
|
||||
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
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
13
www/nginx/files/extra-patch-naxsi-libinjection__sqli_c
Normal file
13
www/nginx/files/extra-patch-naxsi-libinjection__sqli_c
Normal file
@ -0,0 +1,13 @@
|
||||
--- ../libinjection-4aa3894/src/libinjection_sqli.c.orig 2023-05-30 15:47:57.333208000 -0400
|
||||
+++ ../libinjection-4aa3894/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;
|
||||
26
www/nginx/files/extra-patch-naxsi_config
Normal file
26
www/nginx/files/extra-patch-naxsi_config
Normal file
@ -0,0 +1,26 @@
|
||||
--- ../naxsi-1.6/naxsi_src/config.orig 2023-09-27 09:43:18.644606000 -0400
|
||||
+++ ../naxsi-1.6/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
|
||||
@ -0,0 +1,25 @@
|
||||
--- ../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
|
||||
@ -1,41 +0,0 @@
|
||||
--- ../nginx_mod_h264_streaming-2.2.7/config.orig 2020-04-27 12:01:37.153986000 -0400
|
||||
+++ ../nginx_mod_h264_streaming-2.2.7/config 2020-04-27 12:16:52.832788000 -0400
|
||||
@@ -1,26 +1,19 @@
|
||||
ngx_addon_name=ngx_http_h264_streaming_module
|
||||
-HTTP_AUX_FILTER_MODULES="$HTTP_AUX_FILTER_MODULES ngx_http_h264_streaming_module"
|
||||
-CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -DBUILDING_NGINX"
|
||||
-
|
||||
-H264_STREAMING_MODULE_SOURCES="$ngx_addon_dir/src/ngx_http_h264_streaming_module.c \
|
||||
+ngx_module_name="$ngx_addon_name"
|
||||
+ngx_module_type=HTTP_AUX_FILTER
|
||||
+ngx_module_srcs="$ngx_addon_dir/src/ngx_http_h264_streaming_module.c \
|
||||
$ngx_addon_dir/src/moov.c \
|
||||
$ngx_addon_dir/src/mp4_io.c \
|
||||
$ngx_addon_dir/src/mp4_reader.c \
|
||||
$ngx_addon_dir/src/mp4_writer.c \
|
||||
$ngx_addon_dir/src/output_bucket.c \
|
||||
$ngx_addon_dir/src/output_mp4.c"
|
||||
-
|
||||
-for streaming_module_source in $H264_STREAMING_MODULE_SOURCES
|
||||
-do
|
||||
- already_included=NO
|
||||
- for ngx_addon_src in $NGX_ADDON_SRCS
|
||||
- do
|
||||
- if [ "`basename $ngx_addon_src`" = "`basename $streaming_module_source`" ]; then
|
||||
- already_included=YES
|
||||
- break
|
||||
- fi
|
||||
- done
|
||||
- if [ "$already_included" = "NO" ]; then
|
||||
- NGX_ADDON_SRCS="$NGX_ADDON_SRCS $streaming_module_source"
|
||||
- fi
|
||||
-done
|
||||
+ngx_module_deps="$ngx_addon_dir/src/mod_streaming_export.h \
|
||||
+ $ngx_addon_dir/src/moov.h \
|
||||
+ $ngx_addon_dir/src/mp4_io.h \
|
||||
+ $ngx_addon_dir/src/mp4_process.h \
|
||||
+ $ngx_addon_dir/src/mp4_reader.h \
|
||||
+ $ngx_addon_dir/src/mp4_writer.h \
|
||||
+ $ngx_addon_dir/src/output_bucket.h \
|
||||
+ $ngx_addon_dir/src/output_mp4.h"
|
||||
+. auto/module
|
||||
41
www/nginx/files/extra-patch-ngx_brotli_filter_config
Normal file
41
www/nginx/files/extra-patch-ngx_brotli_filter_config
Normal file
@ -0,0 +1,41 @@
|
||||
--- ../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 \
|
||||
@ -1,13 +0,0 @@
|
||||
--- ../nginx_mod_h264_streaming-2.2.7/src/ngx_http_streaming_module.c.orig 2010-05-24 18:04:43.000000000 +0400
|
||||
+++ ../nginx_mod_h264_streaming-2.2.7/src/ngx_http_streaming_module.c 2010-05-24 18:05:02.000000000 +0400
|
||||
@@ -155,10 +155,6 @@
|
||||
}
|
||||
|
||||
/* TODO: Win32 */
|
||||
- if (r->zero_in_uri)
|
||||
- {
|
||||
- return NGX_DECLINED;
|
||||
- }
|
||||
|
||||
rc = ngx_http_discard_request_body(r);
|
||||
|
||||
14
www/nginx/files/extra-patch-ngx_stream_ssl_ct_module.c
Normal file
14
www/nginx/files/extra-patch-ngx_stream_ssl_ct_module.c
Normal file
@ -0,0 +1,14 @@
|
||||
--- ../nginx-ct-93e9884/ngx_stream_ssl_ct_module.c.orig 2024-04-18 12:32:44.086600000 -0400
|
||||
+++ ../nginx-ct-93e9884/ngx_stream_ssl_ct_module.c 2024-04-18 12:37:40.764525000 -0400
|
||||
@@ -70,7 +70,11 @@
|
||||
|
||||
static char *ngx_stream_ssl_ct_merge_srv_conf(ngx_conf_t *cf, void *parent,
|
||||
void *child) {
|
||||
+#if nginx_version >= 1025005
|
||||
+ ngx_stream_ssl_srv_conf_t *ssl_conf = ngx_stream_conf_get_module_srv_conf(cf,
|
||||
+#else
|
||||
ngx_stream_ssl_conf_t *ssl_conf = ngx_stream_conf_get_module_srv_conf(cf,
|
||||
+#endif
|
||||
ngx_stream_ssl_module);
|
||||
|
||||
ngx_array_t *certificates;
|
||||
@ -1,5 +1,5 @@
|
||||
--- ../passenger-6.0.17/build/nginx.rb.orig 2013-10-26 18:00:00.000000000 -0400
|
||||
+++ ../passenger-6.0.17/build/nginx.rb 2016-05-09 18:21:22.426777000 -0400
|
||||
--- ../passenger-6.0.20/build/nginx.rb.orig 2013-10-26 18:00:00.000000000 -0400
|
||||
+++ ../passenger-6.0.20/build/nginx.rb 2016-05-09 18:21:22.426777000 -0400
|
||||
@@ -33,13 +33,12 @@
|
||||
desc "Build Nginx support files"
|
||||
task :nginx => [
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
--- ../passenger-6.0.17/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb.orig 2018-12-03 12:23:06.980728000 -0500
|
||||
+++ ../passenger-6.0.17/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb 2018-12-03 12:23:32.978924000 -0500
|
||||
--- ../passenger-6.0.20/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb.orig 2018-12-03 12:23:06.980728000 -0500
|
||||
+++ ../passenger-6.0.20/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,
|
||||
|
||||
@ -14,8 +14,6 @@
|
||||
%%DSO%%%%BROTLI%%libexec/nginx/ngx_http_brotli_filter_module.so
|
||||
%%DSO%%%%BROTLI%%libexec/nginx/ngx_http_brotli_static_module.so
|
||||
%%DSO%%%%CACHE_PURGE%%libexec/nginx/ngx_http_cache_purge_module.so
|
||||
%%DSO%%%%CLOJURE%%libexec/nginx/ngx_http_clojure_module.so
|
||||
%%DSO%%%%COOKIE_FLAG%%libexec/nginx/ngx_http_cookie_flag_filter_module.so
|
||||
%%DSO%%%%CT%%libexec/nginx/ngx_http_ssl_ct_module.so
|
||||
%%DSO%%%%CT%%libexec/nginx/ngx_ssl_ct_module.so
|
||||
%%DSO%%%%DEVEL_KIT%%libexec/nginx/ndk_http_module.so
|
||||
@ -41,12 +39,10 @@
|
||||
%%DSO%%%%HTTP_IP2PROXY%%libexec/nginx/ngx_http_ip2proxy_module.so
|
||||
%%DSO%%%%HTTP_JSON_STATUS%%libexec/nginx/ngx_http_json_status_module.so
|
||||
%%DSO%%%%HTTP_MOGILEFS%%libexec/nginx/ngx_http_mogilefs_module.so
|
||||
%%DSO%%%%HTTP_MP4_H264%%libexec/nginx/ngx_http_h264_streaming_module.so
|
||||
%%DSO%%%%HTTP_NOTICE%%libexec/nginx/ngx_http_notice_module.so
|
||||
%%DSO%%%%HTTP_PERL%%libexec/nginx/ngx_http_perl_module.so
|
||||
%%DSO%%%%HTTP_PUSH%%libexec/nginx/ngx_nchan_module.so
|
||||
%%DSO%%%%HTTP_PROXY_CONNECT%%libexec/nginx/ngx_http_proxy_connect_module.so
|
||||
%%DSO%%%%HTTP_PUSH_STREAM%%libexec/nginx/ngx_http_push_stream_module.so
|
||||
%%DSO%%%%HTTP_PUSH%%libexec/nginx/ngx_nchan_module.so
|
||||
%%DSO%%%%HTTP_REDIS%%libexec/nginx/ngx_http_redis_module.so
|
||||
%%DSO%%%%HTTP_SUBS_FILTER%%libexec/nginx/ngx_http_subs_filter_module.so
|
||||
%%DSO%%%%HTTP_TARANTOOL%%libexec/nginx/ngx_http_tnt_module.so
|
||||
@ -64,11 +60,12 @@
|
||||
%%DSO%%%%LINK%%libexec/nginx/ngx_http_link_func_module.so
|
||||
%%DSO%%%%LUA%%libexec/nginx/ngx_http_lua_module.so
|
||||
%%DSO%%%%LUASTREAM%%libexec/nginx/ngx_stream_lua_module.so
|
||||
%%DSO%%%%MAIL%%libexec/nginx/ngx_mail_module.so
|
||||
%%DSO%%%%MAIL%%%%CT%%libexec/nginx/ngx_mail_ssl_ct_module.so
|
||||
%%DSO%%%%MAIL%%libexec/nginx/ngx_mail_module.so
|
||||
%%DSO%%%%MEMC%%libexec/nginx/ngx_http_memc_module.so
|
||||
%%DSO%%%%MODSECURITY3%%libexec/nginx/ngx_http_modsecurity_module.so
|
||||
%%DSO%%%%NAXSI%%libexec/nginx/ngx_http_naxsi_module.so
|
||||
%%DSO%%%%OTEL%%libexec/nginx/ngx_otel_module.so
|
||||
%%DSO%%%%PASSENGER%%libexec/nginx/ngx_http_passenger_module.so
|
||||
%%DSO%%%%POSTGRES%%libexec/nginx/ngx_postgres_module.so
|
||||
%%DSO%%%%RDS_CSV%%libexec/nginx/ngx_http_rds_csv_filter_module.so
|
||||
@ -79,10 +76,10 @@
|
||||
%%DSO%%%%SHIBBOLETH%%libexec/nginx/ngx_http_shibboleth_module.so
|
||||
%%DSO%%%%SLOWFS_CACHE%%libexec/nginx/ngx_http_slowfs_module.so
|
||||
%%DSO%%%%SRCACHE%%libexec/nginx/ngx_http_srcache_filter_module.so
|
||||
%%DSO%%%%STREAM%%%%CT%%libexec/nginx/ngx_stream_ssl_ct_module.so
|
||||
%%DSO%%%%STREAM%%%%HTTP_GEOIP2%%libexec/nginx/ngx_stream_geoip2_module.so
|
||||
%%DSO%%%%STREAM%%%%NJS%%libexec/nginx/ngx_stream_js_module.so
|
||||
%%DSO%%%%STREAM%%libexec/nginx/ngx_stream_module.so
|
||||
%%DSO%%%%STREAM%%%%HTTP_GEOIP2%%libexec/nginx/ngx_stream_geoip2_module.so
|
||||
%%DSO%%%%STREAM%%%%CT%%libexec/nginx/ngx_stream_ssl_ct_module.so
|
||||
%%DSO%%%%STS%%libexec/nginx/ngx_http_stream_server_traffic_status_module.so
|
||||
%%DSO%%%%VOD%%libexec/nginx/ngx_http_vod_module.so
|
||||
%%DSO%%%%VTS%%libexec/nginx/ngx_http_vhost_traffic_status_module.so
|
||||
|
||||
Loading…
Reference in New Issue
Block a user