Attachment 248957 Details for Bug 277516 – www/angie: update to 1.4.1 (with modules updated to recent versions)

[patch] www/angie: update to 1.4.1 (with modules updated to recent versions)

0001-Updating-www-angie-to-1.4.1-and-friends.patch (text/plain), 10.98 KB, created by oleg on 2024-03-05 21:42:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: oleg

Created: 2024-03-05 21:42:47 UTC

Size: 10.98 KB

patch

obsolete

>From ffbaa929336ddc040f9f507f9d7f5001e98601b3 Mon Sep 17 00:00:00 2001
>From: "Oleg A. Mamontov" <oleg@mamontov.net>
>Date: Wed, 6 Mar 2024 00:39:15 +0300
>Subject: [PATCH] Updating www/angie (to 1.4.1) and friends
>
>---
> www/angie-module-auth-jwt/Makefile            |  2 +-
> www/angie-module-cache-purge/Makefile         |  2 +-
> .../files/pkg-message.in                      |  2 +-
> www/angie-module-headers-more/Makefile        |  2 +-
> www/angie-module-jwt/Makefile                 |  2 +-
> www/angie-module-lua/Makefile                 |  4 +--
> www/angie-module-ndk/Makefile                 |  2 +-
> www/angie-module-njs/Makefile                 |  2 +-
> www/angie-module-redis2/Makefile              |  2 +-
> www/angie-module-set-misc/Makefile            |  2 +-
> www/angie-module-vod/Makefile                 |  4 +--
> www/angie/Makefile                            |  3 +-
> www/angie/distinfo                            | 30 +++++++++----------
> 13 files changed, 30 insertions(+), 29 deletions(-)
>
>diff --git a/www/angie-module-auth-jwt/Makefile b/www/angie-module-auth-jwt/Makefile
>index 2ff94fbf8f2b..9f624f0ceb8f 100644
>--- a/www/angie-module-auth-jwt/Makefile
>+++ b/www/angie-module-auth-jwt/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	angie-module-auth-jwt
>-GH_TUPLE=	kjdev:nginx-auth-jwt:2a2bd643295610606734298e5afc1875203664e1:module
>+GH_TUPLE=	kjdev:nginx-auth-jwt:0.6.0:module
> 
> COMMENT=	Angie auth-jwt dynamic module
> 
>diff --git a/www/angie-module-cache-purge/Makefile b/www/angie-module-cache-purge/Makefile
>index e8628c6de22b..11d9ab5429fd 100644
>--- a/www/angie-module-cache-purge/Makefile
>+++ b/www/angie-module-cache-purge/Makefile
>@@ -1,7 +1,7 @@
> PORTNAME=	angie-module-cache-purge
> GH_TUPLE=	nginx-modules:ngx_cache_purge:2.5.3:module
> 
>-COMMENT=	Angie cache_purge dynamic module
>+COMMENT=	Angie cache-purge dynamic module
> 
> MASTERDIR=	${.CURDIR}/../../www/angie
> 
>diff --git a/www/angie-module-cache-purge/files/pkg-message.in b/www/angie-module-cache-purge/files/pkg-message.in
>index 268d7424a5a4..a12ed06b8457 100644
>--- a/www/angie-module-cache-purge/files/pkg-message.in
>+++ b/www/angie-module-cache-purge/files/pkg-message.in
>@@ -2,7 +2,7 @@
> { type: install
>   message: <<EOM
> 
>-The cache_purge dynamic module for Angie has been installed.
>+The cache-purge dynamic module for Angie has been installed.
> To enable this module, add the following to %%PREFIX%%/etc/angie/angie.conf
> and reload angie:
> 
>diff --git a/www/angie-module-headers-more/Makefile b/www/angie-module-headers-more/Makefile
>index 7f84fc23974f..cfc18717a4f0 100644
>--- a/www/angie-module-headers-more/Makefile
>+++ b/www/angie-module-headers-more/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	angie-module-headers-more
>-GH_TUPLE=	openresty:headers-more-nginx-module:v0.35:module
>+GH_TUPLE=	openresty:headers-more-nginx-module:v0.37:module
> 
> COMMENT=	Angie headers-more dynamic module
> 
>diff --git a/www/angie-module-jwt/Makefile b/www/angie-module-jwt/Makefile
>index 62ee1ce0f589..e48064dd10a9 100644
>--- a/www/angie-module-jwt/Makefile
>+++ b/www/angie-module-jwt/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	angie-module-jwt
>-GH_TUPLE=	max-lt:nginx-jwt-module:v3.2.2:module
>+GH_TUPLE=	max-lt:nginx-jwt-module:v3.4.0:module
> 
> COMMENT=	Angie JWT dynamic module
> 
>diff --git a/www/angie-module-lua/Makefile b/www/angie-module-lua/Makefile
>index c7e2c2ac91c2..53708dcf9039 100644
>--- a/www/angie-module-lua/Makefile
>+++ b/www/angie-module-lua/Makefile
>@@ -1,7 +1,7 @@
> PORTNAME=	angie-module-lua
> GH_TUPLE=	openresty:lua-nginx-module:v0.10.25:lua
> GH_TUPLE+=	openresty:stream-lua-nginx-module:v0.0.13:lua_stream
>-GH_TUPLE+=	vision5:ngx_devel_kit:v0.3.2:ndk
>+GH_TUPLE+=	vision5:ngx_devel_kit:v0.3.3:ndk
> 
> COMMENT=	Angie Lua dynamic module
> 
>@@ -17,7 +17,7 @@ CONFIGURE_ENV=	LUAJIT_INC=${LUAJIT_INCDIR} \
> 		LUAJIT_LIB=${LOCALBASE}/lib
> 
> RUN_DEPENDS=	angie-module-ndk==${PKGVERSION}:www/angie-module-ndk \
>-		lua-resty-core==0.1.27:www/lua-resty-core
>+		lua-resty-core==0.1.28:www/lua-resty-core
> 
> USES= 		luajit:luajit-openresty
> 
>diff --git a/www/angie-module-ndk/Makefile b/www/angie-module-ndk/Makefile
>index 322f78c3383f..afe5ae2fb7d8 100644
>--- a/www/angie-module-ndk/Makefile
>+++ b/www/angie-module-ndk/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	angie-module-ndk
>-GH_TUPLE=	vision5:ngx_devel_kit:v0.3.2:module
>+GH_TUPLE=	vision5:ngx_devel_kit:v0.3.3:module
> 
> COMMENT=	Angie NDK dynamic module
> 
>diff --git a/www/angie-module-njs/Makefile b/www/angie-module-njs/Makefile
>index c101bbebca10..cd7701e7981e 100644
>--- a/www/angie-module-njs/Makefile
>+++ b/www/angie-module-njs/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	angie-module-njs
>-GH_TUPLE=	nginx:njs:0.8.2:module
>+GH_TUPLE=	nginx:njs:0.8.3:module
> 
> COMMENT=	Angie NJS dynamic module
> 
>diff --git a/www/angie-module-redis2/Makefile b/www/angie-module-redis2/Makefile
>index 2ab1a5856835..63b631478e7a 100644
>--- a/www/angie-module-redis2/Makefile
>+++ b/www/angie-module-redis2/Makefile
>@@ -1,7 +1,7 @@
> PORTNAME=	angie-module-redis2
> GH_TUPLE=	openresty:redis2-nginx-module:v0.15:module
> 
>-COMMENT=	Angie redis2 dynamic module
>+COMMENT=	Angie Redis 2 dynamic module
> 
> LICENSE_FILE=	${WRKSRC_module}/README.markdown
> 
>diff --git a/www/angie-module-set-misc/Makefile b/www/angie-module-set-misc/Makefile
>index c415ae1c0668..f76bac4509bb 100644
>--- a/www/angie-module-set-misc/Makefile
>+++ b/www/angie-module-set-misc/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	angie-module-set-misc
>-GH_TUPLE=	vision5:ngx_devel_kit:v0.3.2:ndk
>+GH_TUPLE=	vision5:ngx_devel_kit:v0.3.3:ndk
> GH_TUPLE+=	openresty:set-misc-nginx-module:v0.33:module
> 
> COMMENT=	Angie set-misc dynamic module
>diff --git a/www/angie-module-vod/Makefile b/www/angie-module-vod/Makefile
>index 9b674cfcd440..3b1ca4db7fa9 100644
>--- a/www/angie-module-vod/Makefile
>+++ b/www/angie-module-vod/Makefile
>@@ -1,7 +1,7 @@
> PORTNAME=	angie-module-vod
>-GH_TUPLE=	kaltura:nginx-vod-module:1.32:module
>+GH_TUPLE=	kaltura:nginx-vod-module:1.33:module
> 
>-COMMENT=	VOD dynamic module for Angie
>+COMMENT=	Angie VOD dynamic module
> 
> LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
> 		libswscale.so:multimedia/ffmpeg
>diff --git a/www/angie/Makefile b/www/angie/Makefile
>index fc4f8cdef03e..879241b1ff46 100644
>--- a/www/angie/Makefile
>+++ b/www/angie/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME?=		angie
>-PORTVERSION=		1.3.2
>+PORTVERSION=		1.4.1
> CATEGORIES+=		www
> MASTER_SITES+=		https://download.angie.software/files/:angie
> DISTNAME=		angie-${DISTVERSIONFULL}
>@@ -110,6 +110,7 @@ CONFIGURE_ARGS=		--prefix=${PREFIX}/etc/angie \
> 			--with-mail \
> 			--with-mail_ssl_module \
> 			--with-stream \
>+			--with-stream_mqtt_preread_module \
> 			--with-stream_realip_module \
> 			--with-stream_ssl_module \
> 			--with-stream_ssl_preread_module \
>diff --git a/www/angie/distinfo b/www/angie/distinfo
>index 6fe046284bb4..d57653ba5c93 100644
>--- a/www/angie/distinfo
>+++ b/www/angie/distinfo
>@@ -1,8 +1,8 @@
>-TIMESTAMP = 1700819056
>-SHA256 (angie-1.3.2.tar.gz) = 636056d60788f8012738eed856733f7515b9cb2de0b002186c5edc820ffafb27
>-SIZE (angie-1.3.2.tar.gz) = 1483526
>-SHA256 (kjdev-nginx-auth-jwt-2a2bd643295610606734298e5afc1875203664e1_GH0.tar.gz) = fd540226223625c34d988f7bdc0a485b1e7bf76dec0e61ff8e6d9a4e585b8282
>-SIZE (kjdev-nginx-auth-jwt-2a2bd643295610606734298e5afc1875203664e1_GH0.tar.gz) = 58759
>+TIMESTAMP = 1709674681
>+SHA256 (angie-1.4.1.tar.gz) = 83a3f2bb2ba59e5b676495a2674d62606d64e8bcf99cefa09de6fc338ab7587a
>+SIZE (angie-1.4.1.tar.gz) = 1539775
>+SHA256 (kjdev-nginx-auth-jwt-0.6.0_GH0.tar.gz) = e261d896ed59628cbf8e8990ae468b89410834a67766d9e0b7fa35f705f33d8a
>+SIZE (kjdev-nginx-auth-jwt-0.6.0_GH0.tar.gz) = 70135
> SHA256 (stnoonan-spnego-http-auth-nginx-module-v1.1.1_GH0.tar.gz) = ed267444667d3f85f92d1bd910a7010e8272f4de1aa83afa39c1c97eac17dade
> SIZE (stnoonan-spnego-http-auth-nginx-module-v1.1.1_GH0.tar.gz) = 18507
> SHA256 (google-ngx_brotli-v1.0.0rc_GH0.tar.gz) = c85cdcfd76703c95aa4204ee4c2e619aa5b075cac18f428202f65552104add3b
>@@ -19,20 +19,20 @@ SHA256 (openresty-nginx-eval-module-2016.06.10_GH0.tar.gz) = 6b91d3c2c2f254ebb37
> SIZE (openresty-nginx-eval-module-2016.06.10_GH0.tar.gz) = 14188
> 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 (openresty-headers-more-nginx-module-v0.35_GH0.tar.gz) = 1a216be253bbd5bf751d572ac2f93bdb61fbc2d78078d26c1335f4637cf2360a
>-SIZE (openresty-headers-more-nginx-module-v0.35_GH0.tar.gz) = 29216
>-SHA256 (max-lt-nginx-jwt-module-v3.2.2_GH0.tar.gz) = e6c2f4d82254fb64b01c24860bbd8d535f616a6389615e152c119b2b3f5869ae
>-SIZE (max-lt-nginx-jwt-module-v3.2.2_GH0.tar.gz) = 15681
>+SHA256 (openresty-headers-more-nginx-module-v0.37_GH0.tar.gz) = cf6e169d6b350c06d0c730b0eaf4973394026ad40094cddd3b3a5b346577019d
>+SIZE (openresty-headers-more-nginx-module-v0.37_GH0.tar.gz) = 29433
>+SHA256 (max-lt-nginx-jwt-module-v3.4.0_GH0.tar.gz) = a1199d8a80a8b6dbc741f18d870107eb03604313410abdca909f37261f088cbb
>+SIZE (max-lt-nginx-jwt-module-v3.4.0_GH0.tar.gz) = 16011
> SHA256 (kjdev-nginx-keyval-0.2.0_GH0.tar.gz) = 7964ca93a1a4170a379caa7ad5dc8440d90d209e76675fe453176a80ae41a6f3
> SIZE (kjdev-nginx-keyval-0.2.0_GH0.tar.gz) = 21418
> SHA256 (openresty-lua-nginx-module-v0.10.25_GH0.tar.gz) = bc764db42830aeaf74755754b900253c233ad57498debe7a441cee2c6f4b07c2
> SIZE (openresty-lua-nginx-module-v0.10.25_GH0.tar.gz) = 725616
> SHA256 (openresty-stream-lua-nginx-module-v0.0.13_GH0.tar.gz) = 01b715754a8248cc7228e0c8f97f7488ae429d90208de0481394e35d24cef32f
> SIZE (openresty-stream-lua-nginx-module-v0.0.13_GH0.tar.gz) = 376245
>-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 (nginx-njs-0.8.2_GH0.tar.gz) = 6f17387db8df90b6e3382d280455962ff85fa2b1a32d91c2ce1fd1af5a854d72
>-SIZE (nginx-njs-0.8.2_GH0.tar.gz) = 733916
>+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 (nginx-njs-0.8.3_GH0.tar.gz) = 5e1341ee8c1dfce420ea6456475dafa7d5f4b9aed310faca32597cf4d221cfe0
>+SIZE (nginx-njs-0.8.3_GH0.tar.gz) = 735235
> SHA256 (FRiCKLE-ngx_postgres-1.0rc7_GH0.tar.gz) = c942e674a7273ab87caab4dcad626ab54852be192c29b1add50d2cb535e3cbb9
> SIZE (FRiCKLE-ngx_postgres-1.0rc7_GH0.tar.gz) = 40742
> SHA256 (openresty-redis2-nginx-module-v0.15_GH0.tar.gz) = d255571bcfb9939b78099df39cb4d42f174d789aec8c8e5e47b93942b0299438
>@@ -47,5 +47,5 @@ SHA256 (kyprizel-testcookie-nginx-module-64137c2f7e66e8866f56fdecaaf09ac10a034da
> SIZE (kyprizel-testcookie-nginx-module-64137c2f7e66e8866f56fdecaaf09ac10a034da9_GH0.tar.gz) = 20732
> SHA256 (fdintino-nginx-upload-module-2.3.0_GH0.tar.gz) = c86e318addb9c88d70fdbd58ff1f6ef6f404a93070f6db8017a1f880c97946c4
> SIZE (fdintino-nginx-upload-module-2.3.0_GH0.tar.gz) = 40139
>-SHA256 (kaltura-nginx-vod-module-1.32_GH0.tar.gz) = 958bbe7084704f9df49f8b71e8b90700591cd3edca7409f74bf0d8721621402f
>-SIZE (kaltura-nginx-vod-module-1.32_GH0.tar.gz) = 471031
>+SHA256 (kaltura-nginx-vod-module-1.33_GH0.tar.gz) = 9c9600e5da4ee02ef6820d056da9eb5f3449f715468334ddab41727b76d478d8
>+SIZE (kaltura-nginx-vod-module-1.33_GH0.tar.gz) = 471858
>-- 
>2.39.3 (Apple Git-145)
>

Actions: View | Diff

Attachments on bug 277516: 248957