Date: Sun, 08 Feb 2026 13:58:30 +0000 From: Vladimir Druzenko <vvd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Cc: Sebastian Oswald <sko@rostwald.de> Subject: git: 544cb02a0a22 - 2026Q1 - www/angie: Update 1.11.2 => 1.11.3 (fix CVE-2026-1642, possible MITM attack) Message-ID: <69889686.3e28d.477f4717@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch 2026Q1 has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=544cb02a0a22f3cc3dacc320ca5152491950d82e commit 544cb02a0a22f3cc3dacc320ca5152491950d82e Author: Sebastian Oswald <sko@rostwald.de> AuthorDate: 2026-02-08 13:37:03 +0000 Commit: Vladimir Druzenko <vvd@FreeBSD.org> CommitDate: 2026-02-08 13:57:53 +0000 www/angie: Update 1.11.2 => 1.11.3 (fix CVE-2026-1642, possible MITM attack) Security: An attacker in a man-in-the-middle (MITM) position before a proxied server using TLS, given conditions beyond the attacker's control, could inject plaintext data into the response before the TLS handshake begins (CVE-2026-1642); the fix was ported from nginx 1.29.5. Changelog: https://en.angie.software/angie/docs/oss_changes/#angie-1-11-3 - Bump PORTREVISION in www/angie-module-*. - Fix using of ANGIE_PORTREVISION in RUN_DEPENDS for modules. - Replace INSTALL_MAN with INSTALL_DATA for documentation. - Unroll "for" loops with 1-2 items - simplify Makefile and call "INSTALL_*" 1 time instead of several. PR: 293034 Security: CVE-2026-1642 MFH: 2026Q1 (cherry picked from commit 8622849d0c2ee6d2e534f2bd12d8c6d603799f12) --- www/angie-module-auth-jwt/Makefile | 4 ++-- www/angie-module-auth-spnego/Makefile | 4 ++-- www/angie-module-auth-totp/Makefile | 4 ++-- www/angie-module-brotli/Makefile | 14 +++++++------- www/angie-module-cache-purge/Makefile | 4 ++-- www/angie-module-dav-ext/Makefile | 4 ++-- www/angie-module-echo/Makefile | 4 ++-- www/angie-module-enhanced-memcached/Makefile | 4 ++-- www/angie-module-eval/Makefile | 4 ++-- www/angie-module-geoip2/Makefile | 10 +++++----- www/angie-module-headers-more/Makefile | 4 ++-- www/angie-module-jwt/Makefile | 4 ++-- www/angie-module-keyval/Makefile | 4 ++-- www/angie-module-lua/Makefile | 12 ++++++------ www/angie-module-ndk/Makefile | 4 ++-- www/angie-module-njs/Makefile | 13 ++++++------- www/angie-module-postgres/Makefile | 4 ++-- www/angie-module-redis2/Makefile | 4 ++-- www/angie-module-set-misc/Makefile | 4 ++-- www/angie-module-subs/Makefile | 2 +- www/angie-module-testcookie/Makefile | 4 ++-- www/angie-module-upload/Makefile | 4 ++-- www/angie-module-vod/Makefile | 4 ++-- www/angie-module-zstd/Makefile | 12 +++++------- www/angie/Makefile | 20 ++++++++------------ www/angie/distinfo | 6 +++--- 26 files changed, 77 insertions(+), 84 deletions(-) diff --git a/www/angie-module-auth-jwt/Makefile b/www/angie-module-auth-jwt/Makefile index 6263d7ef3800..564e2603db18 100644 --- a/www/angie-module-auth-jwt/Makefile +++ b/www/angie-module-auth-jwt/Makefile @@ -1,6 +1,6 @@ PORTNAME= angie-module-auth-jwt MODULE_VERSION= 0.9.0 -MODULE_PORTREVISION= 2 +MODULE_PORTREVISION= 3 GH_TUPLE= kjdev:nginx-auth-jwt:${MODULE_VERSION}:module COMMENT= Angie auth-jwt dynamic module @@ -21,7 +21,7 @@ do-install: ${INSTALL_LIB} ${WRKSRC}/objs/ngx_http_auth_jwt_module.so \ ${STAGEDIR}${MODDIR} - ${INSTALL_MAN} ${WRKSRC_module}/README.md ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC_module}/README.md ${STAGEDIR}${DOCSDIR} do-install-DEBUG-on: ${INSTALL} ${COPY} -m ${_SHAREMODE} \ diff --git a/www/angie-module-auth-spnego/Makefile b/www/angie-module-auth-spnego/Makefile index 165b0dd2bbf4..aee0b0dee64d 100644 --- a/www/angie-module-auth-spnego/Makefile +++ b/www/angie-module-auth-spnego/Makefile @@ -1,6 +1,6 @@ PORTNAME= angie-module-auth-spnego MODULE_VERSION= 1.1.3 -MODULE_PORTREVISION= 2 +MODULE_PORTREVISION= 3 GH_TUPLE= stnoonan:spnego-http-auth-nginx-module:v${MODULE_VERSION}:module COMMENT= Angie auth-spnego dynamic module @@ -21,7 +21,7 @@ do-install: ${INSTALL_LIB} ${WRKSRC}/objs/ngx_http_auth_spnego_module.so \ ${STAGEDIR}${MODDIR} - ${INSTALL_MAN} ${WRKSRC_module}/README.md ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC_module}/README.md ${STAGEDIR}${DOCSDIR} do-install-DEBUG-on: ${INSTALL} ${COPY} -m ${_SHAREMODE} \ diff --git a/www/angie-module-auth-totp/Makefile b/www/angie-module-auth-totp/Makefile index 7afe3c9aadf9..f84e8133a1de 100644 --- a/www/angie-module-auth-totp/Makefile +++ b/www/angie-module-auth-totp/Makefile @@ -1,6 +1,6 @@ PORTNAME= angie-module-auth-totp MODULE_VERSION= 1.1.0 -MODULE_PORTREVISION= 2 +MODULE_PORTREVISION= 3 GH_TUPLE= 61131:nginx-http-auth-totp:${MODULE_VERSION}:module COMMENT= Angie auth-totp dynamic module @@ -17,7 +17,7 @@ do-install: ${INSTALL_LIB} ${WRKSRC}/objs/ngx_http_auth_totp_module.so \ ${STAGEDIR}${MODDIR} - ${INSTALL_MAN} ${WRKSRC_module}/README.md ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC_module}/README.md ${STAGEDIR}${DOCSDIR} do-install-DEBUG-on: ${INSTALL} ${COPY} -m ${_SHAREMODE} \ diff --git a/www/angie-module-brotli/Makefile b/www/angie-module-brotli/Makefile index 5543c218001a..9c7ff2a167a4 100644 --- a/www/angie-module-brotli/Makefile +++ b/www/angie-module-brotli/Makefile @@ -1,6 +1,6 @@ PORTNAME= angie-module-brotli MODULE_VERSION= 1.0.0rc -MODULE_PORTREVISION= 2 +MODULE_PORTREVISION= 3 GH_TUPLE= google:ngx_brotli:v${MODULE_VERSION}:module COMMENT= Angie Brotli dynamic module @@ -14,13 +14,13 @@ do-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} \ ${STAGEDIR}${MODDIR} -.for i in ngx_http_brotli_filter_module ngx_http_brotli_static_module - ${INSTALL_LIB} ${WRKSRC}/objs/${i}.so ${STAGEDIR}${MODDIR} -.endfor + ${INSTALL_LIB} ${WRKSRC}/objs/ngx_http_brotli_filter_module.so \ + ${WRKSRC}/objs/ngx_http_brotli_static_module.so \ + ${STAGEDIR}${MODDIR} -.for i in CONTRIBUTING README - ${INSTALL_MAN} ${WRKSRC_module}/${i}.md ${STAGEDIR}${DOCSDIR} -.endfor + ${INSTALL_DATA} ${WRKSRC_module}/CONTRIBUTING.md \ + ${WRKSRC_module}/README.md \ + ${STAGEDIR}${DOCSDIR} do-install-DEBUG-on: .for i in ngx_http_brotli_filter_module ngx_http_brotli_static_module diff --git a/www/angie-module-cache-purge/Makefile b/www/angie-module-cache-purge/Makefile index 37bf53793b68..eaebaff6361c 100644 --- a/www/angie-module-cache-purge/Makefile +++ b/www/angie-module-cache-purge/Makefile @@ -1,6 +1,6 @@ PORTNAME= angie-module-cache-purge MODULE_VERSION= 2.5.5 -MODULE_PORTREVISION= 1 +MODULE_PORTREVISION= 2 GH_TUPLE= nginx-modules:ngx_cache_purge:${MODULE_VERSION}:module COMMENT= Angie cache_purge dynamic module @@ -15,7 +15,7 @@ do-install: ${INSTALL_LIB} ${WRKSRC}/objs/ngx_http_cache_purge_module.so \ ${STAGEDIR}${MODDIR} - ${INSTALL_MAN} ${WRKSRC_module}/README.md ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC_module}/README.md ${STAGEDIR}${DOCSDIR} do-install-DEBUG-on: ${INSTALL} ${COPY} -m ${_SHAREMODE} \ diff --git a/www/angie-module-dav-ext/Makefile b/www/angie-module-dav-ext/Makefile index 6825fc3a1573..94be160a3507 100644 --- a/www/angie-module-dav-ext/Makefile +++ b/www/angie-module-dav-ext/Makefile @@ -1,6 +1,6 @@ PORTNAME= angie-module-dav-ext MODULE_VERSION= 3.0.0 -MODULE_PORTREVISION= 2 +MODULE_PORTREVISION= 3 GH_TUPLE= arut:nginx-dav-ext-module:v${MODULE_VERSION}:module COMMENT= Angie dav-ext dynamic module @@ -18,7 +18,7 @@ do-install: ${INSTALL_LIB} ${WRKSRC}/objs/ngx_http_dav_ext_module.so \ ${STAGEDIR}${MODDIR} - ${INSTALL_MAN} ${WRKSRC_module}/README.rst ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC_module}/README.rst ${STAGEDIR}${DOCSDIR} do-install-DEBUG-on: ${INSTALL} ${COPY} -m ${_SHAREMODE} \ diff --git a/www/angie-module-echo/Makefile b/www/angie-module-echo/Makefile index 1208f7a8010f..c4acf5feb1c9 100644 --- a/www/angie-module-echo/Makefile +++ b/www/angie-module-echo/Makefile @@ -1,6 +1,6 @@ PORTNAME= angie-module-echo MODULE_VERSION= 0.64 -MODULE_PORTREVISION= 2 +MODULE_PORTREVISION= 3 GH_TUPLE= openresty:echo-nginx-module:v${MODULE_VERSION}:module COMMENT= Angie echo dynamic module @@ -15,7 +15,7 @@ do-install: ${INSTALL_LIB} ${WRKSRC}/objs/ngx_http_echo_module.so \ ${STAGEDIR}${MODDIR} - ${INSTALL_MAN} ${WRKSRC_module}/README.markdown ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC_module}/README.markdown ${STAGEDIR}${DOCSDIR} do-install-DEBUG-on: ${INSTALL} ${COPY} -m ${_SHAREMODE} \ diff --git a/www/angie-module-enhanced-memcached/Makefile b/www/angie-module-enhanced-memcached/Makefile index 91b04687f77b..ecd3ff29bf00 100644 --- a/www/angie-module-enhanced-memcached/Makefile +++ b/www/angie-module-enhanced-memcached/Makefile @@ -1,6 +1,6 @@ PORTNAME= angie-module-enhanced-memcached MODULE_VERSION= 0.3 -MODULE_PORTREVISION= 2 +MODULE_PORTREVISION= 3 GH_TUPLE= bpaquet:ngx_http_enhanced_memcached_module:v${MODULE_VERSION}:module COMMENT= Angie enhanced memcached dynamic module @@ -18,7 +18,7 @@ do-install: ${INSTALL_LIB} ${WRKSRC}/objs/ngx_http_enhanced_memcached_module.so \ ${STAGEDIR}${MODDIR} - ${INSTALL_MAN} ${WRKSRC_module}/README.markdown ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC_module}/README.markdown ${STAGEDIR}${DOCSDIR} do-install-DEBUG-on: ${INSTALL} ${COPY} -m ${_SHAREMODE} \ diff --git a/www/angie-module-eval/Makefile b/www/angie-module-eval/Makefile index e32cbbdebd80..d8335c70a109 100644 --- a/www/angie-module-eval/Makefile +++ b/www/angie-module-eval/Makefile @@ -1,6 +1,6 @@ PORTNAME= angie-module-eval MODULE_VERSION= 2016.06.10 -MODULE_PORTREVISION= 2 +MODULE_PORTREVISION= 3 GH_TUPLE= openresty:nginx-eval-module:${MODULE_VERSION}:module COMMENT= Angie eval dynamic module @@ -18,7 +18,7 @@ do-install: ${INSTALL_LIB} ${WRKSRC}/objs/ngx_http_eval_module.so \ ${STAGEDIR}${MODDIR} - ${INSTALL_MAN} ${WRKSRC_module}/README.md ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC_module}/README.md ${STAGEDIR}${DOCSDIR} do-install-DEBUG-on: ${INSTALL} ${COPY} -m ${_SHAREMODE} \ diff --git a/www/angie-module-geoip2/Makefile b/www/angie-module-geoip2/Makefile index 184183191e8f..000481f0b066 100644 --- a/www/angie-module-geoip2/Makefile +++ b/www/angie-module-geoip2/Makefile @@ -1,6 +1,6 @@ PORTNAME= angie-module-geoip2 MODULE_VERSION= 3.4 -MODULE_PORTREVISION= 2 +MODULE_PORTREVISION= 3 GH_TUPLE= leev:ngx_http_geoip2_module:${MODULE_VERSION}:module COMMENT= Angie GeoIP2 dynamic module @@ -14,11 +14,11 @@ do-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} \ ${STAGEDIR}${MODDIR} -.for i in ngx_http_geoip2_module ngx_stream_geoip2_module - ${INSTALL_LIB} ${WRKSRC}/objs/${i}.so ${STAGEDIR}${MODDIR} -.endfor + ${INSTALL_LIB} ${WRKSRC}/objs/ngx_http_geoip2_module.so \ + ${WRKSRC}/objs/ngx_stream_geoip2_module.so \ + ${STAGEDIR}${MODDIR} - ${INSTALL_MAN} ${WRKSRC_module}/README.md ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC_module}/README.md ${STAGEDIR}${DOCSDIR} do-install-DEBUG-on: .for i in ngx_http_geoip2_module ngx_stream_geoip2_module diff --git a/www/angie-module-headers-more/Makefile b/www/angie-module-headers-more/Makefile index 0a3329af6616..fb5d2abda485 100644 --- a/www/angie-module-headers-more/Makefile +++ b/www/angie-module-headers-more/Makefile @@ -1,6 +1,6 @@ PORTNAME= angie-module-headers-more MODULE_VERSION= 0.39 -MODULE_PORTREVISION= 2 +MODULE_PORTREVISION= 3 GH_TUPLE= openresty:headers-more-nginx-module:v${MODULE_VERSION}:module COMMENT= Angie headers-more dynamic module @@ -17,7 +17,7 @@ do-install: ${INSTALL_LIB} ${WRKSRC}/objs/ngx_http_headers_more_filter_module.so \ ${STAGEDIR}${MODDIR} - ${INSTALL_MAN} ${WRKSRC_module}/README.markdown ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC_module}/README.markdown ${STAGEDIR}${DOCSDIR} do-install-DEBUG-on: ${INSTALL} ${COPY} -m ${_SHAREMODE} \ diff --git a/www/angie-module-jwt/Makefile b/www/angie-module-jwt/Makefile index f4a2c96e87a9..3d73d6cb779d 100644 --- a/www/angie-module-jwt/Makefile +++ b/www/angie-module-jwt/Makefile @@ -1,6 +1,6 @@ PORTNAME= angie-module-jwt MODULE_VERSION= 3.4.4 -MODULE_PORTREVISION= 1 +MODULE_PORTREVISION= 2 GH_TUPLE= max-lt:nginx-jwt-module:v${MODULE_VERSION}:module COMMENT= Angie JWT dynamic module @@ -22,7 +22,7 @@ do-install: ${INSTALL_LIB} ${WRKSRC}/objs/ngx_http_auth_jwt_module.so \ ${STAGEDIR}${MODDIR} - ${INSTALL_MAN} ${WRKSRC_module}/README.md ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC_module}/README.md ${STAGEDIR}${DOCSDIR} do-install-DEBUG-on: ${INSTALL} ${COPY} -m ${_SHAREMODE} \ diff --git a/www/angie-module-keyval/Makefile b/www/angie-module-keyval/Makefile index c7052a5d2fac..d818cf9debc9 100644 --- a/www/angie-module-keyval/Makefile +++ b/www/angie-module-keyval/Makefile @@ -1,6 +1,6 @@ PORTNAME= angie-module-keyval MODULE_VERSION= 0.3.0 -MODULE_PORTREVISION= 2 +MODULE_PORTREVISION= 3 GH_TUPLE= kjdev:nginx-keyval:${MODULE_VERSION}:module COMMENT= Angie keyval dynamic module @@ -19,7 +19,7 @@ do-install: ${INSTALL_LIB} ${WRKSRC}/objs/ngx_http_keyval_module.so \ ${STAGEDIR}${MODDIR} - ${INSTALL_MAN} ${WRKSRC_module}/README.md ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC_module}/README.md ${STAGEDIR}${DOCSDIR} do-install-DEBUG-on: ${INSTALL} ${COPY} -m ${_SHAREMODE} \ diff --git a/www/angie-module-lua/Makefile b/www/angie-module-lua/Makefile index 9a14b0c3dc54..fc52271cfa27 100644 --- a/www/angie-module-lua/Makefile +++ b/www/angie-module-lua/Makefile @@ -1,6 +1,6 @@ PORTNAME= angie-module-lua MODULE_VERSION= 0.10.29 -MODULE_PORTREVISION= 2 +MODULE_PORTREVISION= 3 GH_TUPLE= openresty:lua-nginx-module:v${MODULE_VERSION}:lua GH_TUPLE+= openresty:stream-lua-nginx-module:v0.0.16:lua_stream GH_TUPLE+= vision5:ngx_devel_kit:v0.3.4:ndk @@ -30,13 +30,13 @@ do-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} \ ${STAGEDIR}${MODDIR} -.for i in ngx_http_lua_module ngx_stream_lua_module - ${INSTALL_LIB} ${WRKSRC}/objs/${i}.so ${STAGEDIR}${MODDIR} -.endfor + ${INSTALL_LIB} ${WRKSRC}/objs/ngx_http_lua_module.so \ + ${WRKSRC}/objs/ngx_stream_lua_module.so \ + ${STAGEDIR}${MODDIR} - ${INSTALL_MAN} ${WRKSRC_lua}/README.markdown \ + ${INSTALL_DATA} ${WRKSRC_lua}/README.markdown \ ${STAGEDIR}${DOCSDIR}/README.lua-nginx-module.markdown - ${INSTALL_MAN} ${WRKSRC_lua_stream}/README.md \ + ${INSTALL_DATA} ${WRKSRC_lua_stream}/README.md \ ${STAGEDIR}${DOCSDIR}/README.stream-lua-nginx-module.md do-install-DEBUG-on: diff --git a/www/angie-module-ndk/Makefile b/www/angie-module-ndk/Makefile index 5ff7e0ffd22c..2f70e09b6c07 100644 --- a/www/angie-module-ndk/Makefile +++ b/www/angie-module-ndk/Makefile @@ -1,6 +1,6 @@ PORTNAME= angie-module-ndk MODULE_VERSION= 0.3.4 -MODULE_PORTREVISION= 2 +MODULE_PORTREVISION= 3 GH_TUPLE= vision5:ngx_devel_kit:v${MODULE_VERSION}:module COMMENT= Angie NDK dynamic module @@ -19,7 +19,7 @@ do-install: ${INSTALL_LIB} ${WRKSRC}/objs/ndk_http_module.so \ ${STAGEDIR}${MODDIR} - ${INSTALL_MAN} ${WRKSRC_module}/README.md ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC_module}/README.md ${STAGEDIR}${DOCSDIR} do-install-DEBUG-on: ${INSTALL} ${COPY} -m ${_SHAREMODE} \ diff --git a/www/angie-module-njs/Makefile b/www/angie-module-njs/Makefile index 6c0689db80fb..6d17910bd989 100644 --- a/www/angie-module-njs/Makefile +++ b/www/angie-module-njs/Makefile @@ -1,6 +1,6 @@ PORTNAME= angie-module-njs MODULE_VERSION= 0.9.5 -MODULE_PORTREVISION= 1 +MODULE_PORTREVISION= 2 GH_TUPLE= nginx:njs:${MODULE_VERSION}:module COMMENT= Angie NJS dynamic module @@ -19,13 +19,12 @@ do-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} \ ${STAGEDIR}${MODDIR} -.for i in ngx_http_js_module ngx_stream_js_module - ${INSTALL_LIB} ${WRKSRC}/objs/${i}.so ${STAGEDIR}${MODDIR} -.endfor + ${INSTALL_LIB} ${WRKSRC}/objs/ngx_http_js_module.so \ + ${WRKSRC}/objs/ngx_stream_js_module.so \ + ${STAGEDIR}${MODDIR} -.for i in CHANGES README.md SECURITY.md SUPPORT.md - ${INSTALL_MAN} ${WRKSRC_module}/${i} ${STAGEDIR}${DOCSDIR} -.endfor + ${INSTALL_DATA} ${CHANGES README.md SECURITY.md SUPPORT.md:L:S|^|${WRKSRC_module}/|} \ + ${STAGEDIR}${DOCSDIR} do-install-DEBUG-on: .for i in ngx_http_js_module ngx_stream_js_module diff --git a/www/angie-module-postgres/Makefile b/www/angie-module-postgres/Makefile index 0d5e659d6583..40579304087e 100644 --- a/www/angie-module-postgres/Makefile +++ b/www/angie-module-postgres/Makefile @@ -1,6 +1,6 @@ PORTNAME= angie-module-postgres MODULE_VERSION= 1.0rc7 -MODULE_PORTREVISION= 2 +MODULE_PORTREVISION= 3 GH_TUPLE= FRiCKLE:ngx_postgres:${MODULE_VERSION}:module COMMENT= Angie postgres dynamic module @@ -17,7 +17,7 @@ do-install: ${INSTALL_LIB} ${WRKSRC}/objs/ngx_postgres_module.so \ ${STAGEDIR}${MODDIR} - ${INSTALL_MAN} ${WRKSRC_module}/README.md ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC_module}/README.md ${STAGEDIR}${DOCSDIR} do-install-DEBUG-on: ${INSTALL} ${COPY} -m ${_SHAREMODE} \ diff --git a/www/angie-module-redis2/Makefile b/www/angie-module-redis2/Makefile index 4723362ede4d..65f01d91104e 100644 --- a/www/angie-module-redis2/Makefile +++ b/www/angie-module-redis2/Makefile @@ -1,6 +1,6 @@ PORTNAME= angie-module-redis2 MODULE_VERSION= 0.15 -MODULE_PORTREVISION= 2 +MODULE_PORTREVISION= 3 GH_TUPLE= openresty:redis2-nginx-module:v${MODULE_VERSION}:module COMMENT= Angie redis2 dynamic module @@ -17,7 +17,7 @@ do-install: ${INSTALL_LIB} ${WRKSRC}/objs/ngx_http_redis2_module.so \ ${STAGEDIR}${MODDIR} - ${INSTALL_MAN} ${WRKSRC_module}/README.markdown ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC_module}/README.markdown ${STAGEDIR}${DOCSDIR} do-install-DEBUG-on: ${INSTALL} ${COPY} -m ${_SHAREMODE} \ diff --git a/www/angie-module-set-misc/Makefile b/www/angie-module-set-misc/Makefile index 88842ab4d327..e513bd1213dc 100644 --- a/www/angie-module-set-misc/Makefile +++ b/www/angie-module-set-misc/Makefile @@ -1,6 +1,6 @@ PORTNAME= angie-module-set-misc MODULE_VERSION= 0.3.4 -MODULE_PORTREVISION= 2 +MODULE_PORTREVISION= 3 GH_TUPLE= vision5:ngx_devel_kit:v${MODULE_VERSION}:ndk GH_TUPLE+= openresty:set-misc-nginx-module:v0.33:module @@ -21,7 +21,7 @@ do-install: ${INSTALL_LIB} ${WRKSRC}/objs/ngx_http_set_misc_module.so \ ${STAGEDIR}${MODDIR} - ${INSTALL_MAN} ${WRKSRC_module}/README.markdown ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC_module}/README.markdown ${STAGEDIR}${DOCSDIR} do-install-DEBUG-on: ${INSTALL} ${COPY} -m ${_SHAREMODE} \ diff --git a/www/angie-module-subs/Makefile b/www/angie-module-subs/Makefile index 2c78e61498af..fed5798f2dc8 100644 --- a/www/angie-module-subs/Makefile +++ b/www/angie-module-subs/Makefile @@ -15,7 +15,7 @@ do-install: ${INSTALL_LIB} ${WRKSRC}/objs/ngx_http_subs_filter_module.so \ ${STAGEDIR}${MODDIR} - ${INSTALL_MAN} ${WRKSRC_module}/README ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC_module}/README ${STAGEDIR}${DOCSDIR} do-install-DEBUG-on: ${INSTALL} ${COPY} -m ${_SHAREMODE} \ diff --git a/www/angie-module-testcookie/Makefile b/www/angie-module-testcookie/Makefile index ce926119a900..947cb4b838c9 100644 --- a/www/angie-module-testcookie/Makefile +++ b/www/angie-module-testcookie/Makefile @@ -16,8 +16,8 @@ do-install: ${INSTALL_LIB} ${WRKSRC}/objs/ngx_http_testcookie_access_module.so \ ${STAGEDIR}${MODDIR} - ${INSTALL_MAN} ${WRKSRC_module}/Changelog ${STAGEDIR}${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC_module}/README.markdown ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC_module}/Changelog \ + ${WRKSRC_module}/README.markdown ${STAGEDIR}${DOCSDIR} do-install-DEBUG-on: ${INSTALL} ${COPY} -m ${_SHAREMODE} \ diff --git a/www/angie-module-upload/Makefile b/www/angie-module-upload/Makefile index 0f76863e0800..543429485ff3 100644 --- a/www/angie-module-upload/Makefile +++ b/www/angie-module-upload/Makefile @@ -1,6 +1,6 @@ PORTNAME= angie-module-upload MODULE_VERSION= 2.3.0 -MODULE_PORTREVISION= 2 +MODULE_PORTREVISION= 3 GH_TUPLE= fdintino:nginx-upload-module:${MODULE_VERSION}:module COMMENT= Angie upload dynamic module @@ -18,7 +18,7 @@ do-install: ${INSTALL_LIB} ${WRKSRC}/objs/ngx_http_upload_module.so \ ${STAGEDIR}${MODDIR} - ${INSTALL_MAN} ${WRKSRC_module}/README.md ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC_module}/README.md ${STAGEDIR}${DOCSDIR} do-install-DEBUG-on: ${INSTALL} ${COPY} -m ${_SHAREMODE} \ diff --git a/www/angie-module-vod/Makefile b/www/angie-module-vod/Makefile index 1e987cbef36c..8248cd81de40 100644 --- a/www/angie-module-vod/Makefile +++ b/www/angie-module-vod/Makefile @@ -1,6 +1,6 @@ PORTNAME= angie-module-vod MODULE_VERSION= 1.33 -MODULE_PORTREVISION= 2 +MODULE_PORTREVISION= 3 GH_TUPLE= kaltura:nginx-vod-module:${MODULE_VERSION}:module COMMENT= VOD dynamic module for Angie @@ -20,7 +20,7 @@ do-install: ${INSTALL_LIB} ${WRKSRC}/objs/ngx_http_vod_module.so \ ${STAGEDIR}${MODDIR} - ${INSTALL_MAN} ${WRKSRC_module}/README.md ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC_module}/README.md ${STAGEDIR}${DOCSDIR} do-install-DEBUG-on: ${INSTALL} ${COPY} -m ${_SHAREMODE} \ diff --git a/www/angie-module-zstd/Makefile b/www/angie-module-zstd/Makefile index 6a0285e656a1..4f18fc8ee82d 100644 --- a/www/angie-module-zstd/Makefile +++ b/www/angie-module-zstd/Makefile @@ -1,6 +1,6 @@ PORTNAME= angie-module-zstd MODULE_VERSION= 0.1.1 -MODULE_PORTREVISION= 2 +MODULE_PORTREVISION= 3 GH_TUPLE= tokers:zstd-nginx-module:${MODULE_VERSION}:module COMMENT= Angie zstd dynamic module @@ -18,12 +18,10 @@ do-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} \ ${STAGEDIR}${MODDIR} -.for i in ngx_http_zstd_static_module ngx_http_zstd_filter_module - ${INSTALL_LIB} ${WRKSRC}/objs/${i}.so ${STAGEDIR}${MODDIR} -.endfor + ${INSTALL_LIB} ${WRKSRC}/objs/ngx_http_zstd_static_module.so \ + ${WRKSRC}/objs/ngx_http_zstd_filter_module.so \ + ${STAGEDIR}${MODDIR} -.for i in README.md - ${INSTALL_MAN} ${WRKSRC_module}/${i} ${STAGEDIR}${DOCSDIR} -.endfor + ${INSTALL_DATA} ${WRKSRC_module}/README.md ${STAGEDIR}${DOCSDIR} .include "${MASTERDIR}/Makefile" diff --git a/www/angie/Makefile b/www/angie/Makefile index 6720a814558c..ebfe76d4fb98 100644 --- a/www/angie/Makefile +++ b/www/angie/Makefile @@ -1,6 +1,6 @@ PORTNAME?= angie -ANGIE_VERSION= 1.11.2 -ANGIE_PORTREVISION= 1 +ANGIE_VERSION= 1.11.3 +ANGIE_PORTREVISION= 0 CATEGORIES+= www MASTER_SITES+= https://download.angie.software/files/:angie DISTNAME= angie-${ANGIE_VERSION} @@ -38,10 +38,10 @@ BUILD_DEPENDS+= pcre2>=0:devel/pcre2 # The following makes sure module ports are rebuild if angie gets updated. # However, pkg does not obey RUN_DEPENDS on updates, therefore we need to # also bump MODULE_PORTREVISION for every single www/angie-module* port. -. if defined(ANGIE_PORTREVISION) -RUN_DEPENDS+= angie==${ANGIE_VERSION}_${ANGIE_PORTREVISION}:www/angie -. else +. if ${ANGIE_PORTREVISION} == 0 RUN_DEPENDS+= angie==${ANGIE_VERSION}:www/angie +. else +RUN_DEPENDS+= angie==${ANGIE_VERSION}_${ANGIE_PORTREVISION}:www/angie . endif ALL_TARGET?= modules CONFIGURE_ADD?= --add-dynamic-module=${WRKSRC_module} @@ -186,25 +186,21 @@ do-install: ${LN} -fs angie-nodebug ${STAGEDIR}${PREFIX}/sbin/angie ${INSTALL_MAN} ${WRKSRC}/objs/angie.8 ${STAGEDIR}${PREFIX}/share/man/man8 -. for i in CHANGES CHANGES.ru - ${INSTALL_MAN} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} -. endfor + ${INSTALL_DATA} ${WRKSRC}/CHANGES ${WRKSRC}/CHANGES.ru ${STAGEDIR}${DOCSDIR} . for i in fastcgi.conf fastcgi_params mime.types scgi_params uwsgi_params ${INSTALL_DATA} ${WRKSRC}/conf/${i} ${STAGEDIR}${ETCDIR}/${i}.sample . endfor ${INSTALL_DATA} ${WRKSRC}/conf/prometheus_all.conf \ ${STAGEDIR}${ETCDIR}/prometheus_all.conf.sample - ${INSTALL_DATA} ${WRKDIR}/angie.conf.sample \ ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKDIR}/default.conf.sample \ ${STAGEDIR}${ETCDIR}/http.d ${INSTALL_DATA} ${WRKDIR}/example.conf.sample \ ${STAGEDIR}${ETCDIR}/stream.d -. for i in 50x.html index.html - ${INSTALL_DATA} ${WRKSRC}/html/${i} ${STAGEDIR}${WWWDIR}/html/${i} -. endfor + ${INSTALL_DATA} ${WRKSRC}/html/50x.html ${WRKSRC}/html/index.html \ + ${STAGEDIR}${WWWDIR}/html do-install-DEBUG-on: ${INSTALL} ${COPY} -m ${BINMODE} ${WRKSRC_DEBUG}/objs/angie \ diff --git a/www/angie/distinfo b/www/angie/distinfo index b6374964ee9a..e6baad9d6b78 100644 --- a/www/angie/distinfo +++ b/www/angie/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1770195350 -SHA256 (angie-1.11.2.tar.gz) = 3abea91bb94c973b394a2425e4a617c8d5623ba7fcd8fb562e32184570ecbc47 -SIZE (angie-1.11.2.tar.gz) = 1881931 +TIMESTAMP = 1770492463 +SHA256 (angie-1.11.3.tar.gz) = 08fa99d18a90f738674b300f64867406045ad5c518e952cd24e3ffdb0c14117d +SIZE (angie-1.11.3.tar.gz) = 1882221 SHA256 (61131-nginx-http-auth-totp-1.1.0_GH0.tar.gz) = d36d2b75a3b239e63ec060ef9ccfa6b89acbceb74b7c93e47550c1f75ac4857e SIZE (61131-nginx-http-auth-totp-1.1.0_GH0.tar.gz) = 9813 SHA256 (kjdev-nginx-auth-jwt-0.9.0_GH0.tar.gz) = d7c72634261a053afaacc2cb762eccf9ce4c462ca738ad0c4809eb964ddf3c0chome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69889686.3e28d.477f4717>