diff options
Diffstat (limited to 'www/nginx')
| -rw-r--r-- | www/nginx/Makefile | 7 | ||||
| -rw-r--r-- | www/nginx/Makefile.extmod | 12 | ||||
| -rw-r--r-- | www/nginx/distinfo | 16 | ||||
| -rw-r--r-- | www/nginx/files/extra-patch-nginx-ct-LibreSSL | 20 | ||||
| -rw-r--r-- | www/nginx/files/extra-patch-ngx_stream_ssl_ct_module.c | 14 | ||||
| -rw-r--r-- | www/nginx/files/extra-patch-passenger-build-nginx.rb | 4 | ||||
| -rw-r--r-- | www/nginx/files/extra-patch-passenger-disable-telemetry | 4 | ||||
| -rw-r--r-- | www/nginx/pkg-plist | 4 |
8 files changed, 16 insertions, 65 deletions
diff --git a/www/nginx/Makefile b/www/nginx/Makefile index 1dc26d6b58b6..52b3f98d5043 100644 --- a/www/nginx/Makefile +++ b/www/nginx/Makefile @@ -1,6 +1,6 @@ PORTNAME= nginx -PORTVERSION= 1.26.3 -PORTREVISION= 3 +PORTVERSION= 1.28.0 +PORTREVISION= 2 PORTEPOCH= 3 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ @@ -270,9 +270,6 @@ 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}!; \ diff --git a/www/nginx/Makefile.extmod b/www/nginx/Makefile.extmod index b6e7184e343a..f57fbb3e5b08 100644 --- a/www/nginx/Makefile.extmod +++ b/www/nginx/Makefile.extmod @@ -2,7 +2,7 @@ OPTIONS_GROUP+= THIRDPARTYGRP # External modules (arrayvar MUST appear after devel_kit for build-dep) -OPTIONS_GROUP_THIRDPARTYGRP= AJP AWS_AUTH BROTLI CACHE_PURGE CT \ +OPTIONS_GROUP_THIRDPARTYGRP= AJP AWS_AUTH BROTLI CACHE_PURGE \ 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 \ @@ -33,12 +33,6 @@ 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 \ - ${PATCHDIR}/extra-patch-ngx_stream_ssl_ct_module.c - ECHO_GH_TUPLE= openresty:echo-nginx-module:5a402aa:echo ECHO_VARS= DSO_EXTMODS+=echo @@ -217,7 +211,7 @@ 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.15:luastream +LUASTREAM_GH_TUPLE= openresty:stream-lua-nginx-module:v0.0.16:luastream LUASTREAM_VARS= DSO_EXTMODS+=luastream LINK_GH_TUPLE= Taymindis:nginx-link-function:3.2.4:link @@ -259,7 +253,7 @@ OTEL_LIB_DEPENDS= libabsl_base.so:devel/abseil \ 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.23 +PASSENGER_NGINX_VER= 6.0.27 PASSENGER_CATEGORIES= ruby PASSENGER_USES= ruby PASSENGER_BUILD_DEPENDS=${LOCALBASE}/bin/rake:devel/rubygem-rake diff --git a/www/nginx/distinfo b/www/nginx/distinfo index 058007352bb5..b53842396779 100644 --- a/www/nginx/distinfo +++ b/www/nginx/distinfo @@ -1,12 +1,12 @@ -TIMESTAMP = 1738868642 -SHA256 (nginx-1.26.3.tar.gz) = 69ee2b237744036e61d24b836668aad3040dda461fe6f570f1787eab570c75aa -SIZE (nginx-1.26.3.tar.gz) = 1260179 +TIMESTAMP = 1746350853 +SHA256 (nginx-1.28.0.tar.gz) = c6b5c6b086c0df9d3ca3ff5e084c1d0ef909e6038279c71c1c3e985f576ff76a +SIZE (nginx-1.28.0.tar.gz) = 1280111 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.23.tar.gz) = 897555224fb11340677780d929b5099da62303b1ae15f2e7c65cd3f6d3e7920c -SIZE (passenger-6.0.23.tar.gz) = 8298217 +SHA256 (passenger-6.0.27.tar.gz) = 82c830aee98feece09e84309c2d0c6bb3f7b22a3c8e33cfe93b5e0d498615d0f +SIZE (passenger-6.0.27.tar.gz) = 7548637 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 @@ -17,8 +17,6 @@ SHA256 (google-ngx_brotli-a71f931_GH0.tar.gz) = b3312a045d5303a40d02beb34711b8ca 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 @@ -95,8 +93,8 @@ SHA256 (Taymindis-nginx-link-function-3.2.4_GH0.tar.gz) = 20c3679199ba7efe1598f0 SIZE (Taymindis-nginx-link-function-3.2.4_GH0.tar.gz) = 139656 SHA256 (openresty-lua-nginx-module-v0.10.28_GH0.tar.gz) = 634827d54de6216cb0502d14f76610788b3a3e33160e91d5578d6db0d9a34a20 SIZE (openresty-lua-nginx-module-v0.10.28_GH0.tar.gz) = 869217 -SHA256 (openresty-stream-lua-nginx-module-v0.0.15_GH0.tar.gz) = dcd5bb189e0a99f8953d3143557ff79fac6e8ca2d58d5d0aeb5515fe72b87fc6 -SIZE (openresty-stream-lua-nginx-module-v0.0.15_GH0.tar.gz) = 394165 +SHA256 (openresty-stream-lua-nginx-module-v0.0.16_GH0.tar.gz) = 3b1103cf5ee940ea94711eae1a7ccc1a161273ec9a08eb415f1d45ad385f967d +SIZE (openresty-stream-lua-nginx-module-v0.0.16_GH0.tar.gz) = 395259 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 diff --git a/www/nginx/files/extra-patch-nginx-ct-LibreSSL b/www/nginx/files/extra-patch-nginx-ct-LibreSSL deleted file mode 100644 index 9aa89a463a9d..000000000000 --- a/www/nginx/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/files/extra-patch-ngx_stream_ssl_ct_module.c b/www/nginx/files/extra-patch-ngx_stream_ssl_ct_module.c deleted file mode 100644 index b3df57b24218..000000000000 --- a/www/nginx/files/extra-patch-ngx_stream_ssl_ct_module.c +++ /dev/null @@ -1,14 +0,0 @@ ---- ../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; diff --git a/www/nginx/files/extra-patch-passenger-build-nginx.rb b/www/nginx/files/extra-patch-passenger-build-nginx.rb index 34ad92f207b2..73223329c8a7 100644 --- a/www/nginx/files/extra-patch-passenger-build-nginx.rb +++ b/www/nginx/files/extra-patch-passenger-build-nginx.rb @@ -1,5 +1,5 @@ ---- ../passenger-6.0.23/build/nginx.rb.orig 2013-10-26 18:00:00.000000000 -0400 -+++ ../passenger-6.0.23/build/nginx.rb 2016-05-09 18:21:22.426777000 -0400 +--- ../passenger-6.0.27/build/nginx.rb.orig 2013-10-26 18:00:00.000000000 -0400 ++++ ../passenger-6.0.27/build/nginx.rb 2016-05-09 18:21:22.426777000 -0400 @@ -33,13 +33,12 @@ desc "Build Nginx support files" task :nginx => [ diff --git a/www/nginx/files/extra-patch-passenger-disable-telemetry b/www/nginx/files/extra-patch-passenger-disable-telemetry index 302ae5bf765d..935f6a5425e5 100644 --- a/www/nginx/files/extra-patch-passenger-disable-telemetry +++ b/www/nginx/files/extra-patch-passenger-disable-telemetry @@ -1,5 +1,5 @@ ---- ../passenger-6.0.23/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb.orig 2018-12-03 12:23:06.980728000 -0500 -+++ ../passenger-6.0.23/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb 2018-12-03 12:23:32.978924000 -0500 +--- ../passenger-6.0.27/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb.orig 2018-12-03 12:23:06.980728000 -0500 ++++ ../passenger-6.0.27/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, diff --git a/www/nginx/pkg-plist b/www/nginx/pkg-plist index 466e656d60e0..516147771913 100644 --- a/www/nginx/pkg-plist +++ b/www/nginx/pkg-plist @@ -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%%%%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 %%DSO%%%%DRIZZLE%%libexec/nginx/ngx_http_drizzle_module.so %%DSO%%%%DYNAMIC_UPSTREAM%%libexec/nginx/ngx_http_dynamic_upstream_module.so @@ -60,7 +58,6 @@ %%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%%%%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 @@ -76,7 +73,6 @@ %%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 |