FreeBSD Bugzilla – Attachment 254785 Details for
Bug 282394
www/angie*: Update to 1.7.0
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Combined patch for angie and module uplift
0001-Revised-combined-angie-and-module-patch-for-1.7.0.patch (text/plain), 14.19 KB, created by
Jason Tubnor
on 2024-10-31 03:42:42 UTC
(
hide
)
Description:
Combined patch for angie and module uplift
Filename:
MIME Type:
Creator:
Jason Tubnor
Created:
2024-10-31 03:42:42 UTC
Size:
14.19 KB
patch
obsolete
>From f9cdc1f7293c1c280a602a0983b7fcb3aefeadcf Mon Sep 17 00:00:00 2001 >From: Jason Tubnor <jason@tubnor.net> >Date: Thu, 31 Oct 2024 14:35:13 +1100 >Subject: [PATCH] Revised combined angie and module patch for version uplift to > 1.7.0 and associated module refresh On branch my_branch Changes to be > committed: modified: www/angie-module-auth-jwt/Makefile modified: > www/angie-module-headers-more/Makefile modified: > www/angie-module-jwt/Makefile modified: www/angie-module-keyval/Makefile > modified: www/angie-module-lua/Makefile modified: > www/angie-module-lua/files/patch-lua-config modified: > www/angie-module-lua/files/patch-stream-lua-config modified: > www/angie-module-ndk/Makefile modified: www/angie-module-njs/Makefile > modified: www/angie-module-set-misc/Makefile modified: > www/angie-module-vod/Makefile modified: www/angie/Makefile modified: > www/angie/distinfo modified: www/angie/pkg-plist > >--- > www/angie-module-auth-jwt/Makefile | 2 +- > www/angie-module-headers-more/Makefile | 2 +- > www/angie-module-jwt/Makefile | 2 +- > www/angie-module-keyval/Makefile | 2 +- > www/angie-module-lua/Makefile | 8 ++-- > www/angie-module-lua/files/patch-lua-config | 4 +- > .../files/patch-stream-lua-config | 25 ++++------- > www/angie-module-ndk/Makefile | 2 +- > www/angie-module-njs/Makefile | 2 +- > www/angie-module-set-misc/Makefile | 2 +- > www/angie-module-vod/Makefile | 2 +- > www/angie/Makefile | 4 +- > www/angie/distinfo | 42 +++++++++---------- > www/angie/pkg-plist | 1 - > 14 files changed, 45 insertions(+), 55 deletions(-) > >diff --git a/www/angie-module-auth-jwt/Makefile b/www/angie-module-auth-jwt/Makefile >index 2ff94fbf8f2b..e1789c89bc70 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:3ec16e9d8af12fd705408813e87adc8c1480c6cf:module > > COMMENT= Angie auth-jwt dynamic module > >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..334ef95bd734 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.2:module > > COMMENT= Angie JWT dynamic module > >diff --git a/www/angie-module-keyval/Makefile b/www/angie-module-keyval/Makefile >index 50e804b07a44..432310743eb8 100644 >--- a/www/angie-module-keyval/Makefile >+++ b/www/angie-module-keyval/Makefile >@@ -1,5 +1,5 @@ > PORTNAME= angie-module-keyval >-GH_TUPLE= kjdev:nginx-keyval:0.2.0:module >+GH_TUPLE= kjdev:nginx-keyval:0.3.0:module > > COMMENT= Angie keyval dynamic module > >diff --git a/www/angie-module-lua/Makefile b/www/angie-module-lua/Makefile >index c7e2c2ac91c2..90d9be880e78 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= openresty:lua-nginx-module:v0.10.27:lua >+GH_TUPLE+= openresty:stream-lua-nginx-module:v0.0.15:lua_stream >+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.29:www/lua-resty-core > > USES= luajit:luajit-openresty > >diff --git a/www/angie-module-lua/files/patch-lua-config b/www/angie-module-lua/files/patch-lua-config >index 46b570724957..0e784e33c855 100644 >--- a/www/angie-module-lua/files/patch-lua-config >+++ b/www/angie-module-lua/files/patch-lua-config >@@ -1,5 +1,5 @@ >---- ../lua-nginx-module-0.10.25/config.orig >-+++ ../lua-nginx-module-0.10.25/config >+--- ../lua-nginx-module-0.10.27/config.orig >++++ ../lua-nginx-module-0.10.27/config > @@ -45,9 +45,9 @@ > NGX_TEST_LD_OPT="$ngx_lua_opt_L $NGX_TEST_LD_OPT" > >diff --git a/www/angie-module-lua/files/patch-stream-lua-config b/www/angie-module-lua/files/patch-stream-lua-config >index ef3c1ea1033c..d2ee7706d26d 100644 >--- a/www/angie-module-lua/files/patch-stream-lua-config >+++ b/www/angie-module-lua/files/patch-stream-lua-config >@@ -1,8 +1,8 @@ >---- ../stream-lua-nginx-module-0.0.13/config.orig >-+++ ../stream-lua-nginx-module-0.0.13/config >-@@ -45,9 +45,9 @@ >+--- ../stream-lua-nginx-module-0.0.15/config.orig 2024-08-20 18:19:24.000000000 +1000 >++++ ../stream-lua-nginx-module-0.0.15/config 2024-10-30 13:30:52.694713000 +1100 >+@@ -45,9 +45,9 @@ if [ -n "$LUAJIT_INC" -o -n "$LUAJIT_LIB" ]; then > NGX_TEST_LD_OPT="$ngx_lua_opt_L $NGX_TEST_LD_OPT" >- >+ > if [ $NGX_RPATH = YES ]; then > - ngx_feature_libs="-R$LUAJIT_LIB $ngx_lua_opt_L -lluajit-5.1 $luajit_ld_opt" > + ngx_feature_libs="-R$LUAJIT_LIB $ngx_lua_opt_L -lluajit-5.1 -lpcre $luajit_ld_opt" >@@ -10,11 +10,11 @@ > - ngx_feature_libs="$ngx_lua_opt_L -lluajit-5.1 $luajit_ld_opt" > + ngx_feature_libs="$ngx_lua_opt_L -lluajit-5.1 -lpcre $luajit_ld_opt" > fi >- >+ > . auto/feature >-@@ -71,9 +71,9 @@ >+@@ -71,9 +71,9 @@ if [ -n "$LUAJIT_INC" -o -n "$LUAJIT_LIB" ]; then > NGX_TEST_LD_OPT="$ngx_lua_opt_L $NGX_TEST_LD_OPT" >- >+ > if [ $NGX_RPATH = YES ]; then > - ngx_feature_libs="-R$LUAJIT_LIB $ngx_lua_opt_L -lluajit-5.1 $luajit_ld_opt" > + ngx_feature_libs="-R$LUAJIT_LIB $ngx_lua_opt_L -lluajit-5.1 -lpcre $luajit_ld_opt" >@@ -22,14 +22,5 @@ > - ngx_feature_libs="$ngx_lua_opt_L -lluajit-5.1 $luajit_ld_opt" > + ngx_feature_libs="$ngx_lua_opt_L -lluajit-5.1 -lpcre $luajit_ld_opt" > fi >- >+ > . auto/feature >-@@ -436,7 +436,7 @@ >- . auto/feature >- >- if [ $ngx_found = yes ]; then >-- CORE_LIBS="-Wl,--require-defined=pcre_version $CORE_LIBS" >-+ : >- fi >- ;; >- esac >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..4a5bf60ea940 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.7:module > > COMMENT= Angie NJS dynamic module > >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..794908d2d342 100644 >--- a/www/angie-module-vod/Makefile >+++ b/www/angie-module-vod/Makefile >@@ -1,5 +1,5 @@ > 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 > >diff --git a/www/angie/Makefile b/www/angie/Makefile >index 0935cefed343..2c1ff4e05e00 100644 >--- a/www/angie/Makefile >+++ b/www/angie/Makefile >@@ -1,5 +1,5 @@ > PORTNAME?= angie >-PORTVERSION= 1.3.2 >+PORTVERSION= 1.7.0 > CATEGORIES+= www > MASTER_SITES+= https://download.angie.software/files/:angie > DISTNAME= angie-${DISTVERSIONFULL} >@@ -159,7 +159,7 @@ 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 README.rst >+.for i in CHANGES CHANGES.ru > ${INSTALL_MAN} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} > .endfor > >diff --git a/www/angie/distinfo b/www/angie/distinfo >index 6fe046284bb4..d80da811e3ff 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 = 1730250772 >+SHA256 (angie-1.7.0.tar.gz) = 0797e6e01815fdb30bbc9f703800387c9c8b2c601131a9c39509a33d73f21c01 >+SIZE (angie-1.7.0.tar.gz) = 1624508 >+SHA256 (kjdev-nginx-auth-jwt-3ec16e9d8af12fd705408813e87adc8c1480c6cf_GH0.tar.gz) = 05417a26b9f9b77e507e46247013b7131c265b4f0d1c26094f6fd603738b09f7 >+SIZE (kjdev-nginx-auth-jwt-3ec16e9d8af12fd705408813e87adc8c1480c6cf_GH0.tar.gz) = 73955 > 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 (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 (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.2_GH0.tar.gz) = c8c8a01c27e3aab853ddd437c119b9a3fcd1f111c1627ad200a0277b19505ff9 >+SIZE (max-lt-nginx-jwt-module-v3.4.2_GH0.tar.gz) = 16453 >+SHA256 (kjdev-nginx-keyval-0.3.0_GH0.tar.gz) = c4e5d2a03ead32cfccb9f04f01a8cdf664f5deca3f677c13b1509bff832cf2c7 >+SIZE (kjdev-nginx-keyval-0.3.0_GH0.tar.gz) = 24150 >+SHA256 (openresty-lua-nginx-module-v0.10.27_GH0.tar.gz) = a0a5e616c4a0a32e48899d12242fed5a371f69a85f11ff274a87a2f02f419876 >+SIZE (openresty-lua-nginx-module-v0.10.27_GH0.tar.gz) = 758952 >+SHA256 (openresty-stream-lua-nginx-module-v0.0.15_GH0.tar.gz) = ecf5c2afd345149cef19bf2e3e196bf1c514ca85e778f853f80a379284b70de1 >+SIZE (openresty-stream-lua-nginx-module-v0.0.15_GH0.tar.gz) = 394192 >+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.7_GH0.tar.gz) = e959b01637d6684387347cc6dea073949467193d273f58062129e52b110aefa2 >+SIZE (nginx-njs-0.8.7_GH0.tar.gz) = 880217 > 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 >diff --git a/www/angie/pkg-plist b/www/angie/pkg-plist >index 28b3b43178bd..4f1d8cbb5921 100644 >--- a/www/angie/pkg-plist >+++ b/www/angie/pkg-plist >@@ -13,7 +13,6 @@ sbin/angie > share/man/man8/angie.8.gz > %%DOCSDIR%%/CHANGES > %%DOCSDIR%%/CHANGES.ru >-%%DOCSDIR%%/README.rst > > @sample %%ETCDIR%%/angie.conf.sample > @sample %%ETCDIR%%/fastcgi.conf.sample >-- >2.47.0 >
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=254785">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 282394
:
254631
|
254632
| 254785