View | Details | Raw Unified | Return to bug 282394 | Differences between
and this patch

Collapse All | Expand All

(-)b/www/angie-module-auth-jwt/Makefile (-1 / +1 lines)
Lines 1-5 Link Here
1
PORTNAME=	angie-module-auth-jwt
1
PORTNAME=	angie-module-auth-jwt
2
GH_TUPLE=	kjdev:nginx-auth-jwt:2a2bd643295610606734298e5afc1875203664e1:module
2
GH_TUPLE=	kjdev:nginx-auth-jwt:3ec16e9d8af12fd705408813e87adc8c1480c6cf:module
3
3
4
COMMENT=	Angie auth-jwt dynamic module
4
COMMENT=	Angie auth-jwt dynamic module
5
5
(-)b/www/angie-module-headers-more/Makefile (-1 / +1 lines)
Lines 1-5 Link Here
1
PORTNAME=	angie-module-headers-more
1
PORTNAME=	angie-module-headers-more
2
GH_TUPLE=	openresty:headers-more-nginx-module:v0.35:module
2
GH_TUPLE=	openresty:headers-more-nginx-module:v0.37:module
3
3
4
COMMENT=	Angie headers-more dynamic module
4
COMMENT=	Angie headers-more dynamic module
5
5
(-)b/www/angie-module-jwt/Makefile (-1 / +1 lines)
Lines 1-5 Link Here
1
PORTNAME=	angie-module-jwt
1
PORTNAME=	angie-module-jwt
2
GH_TUPLE=	max-lt:nginx-jwt-module:v3.2.2:module
2
GH_TUPLE=	max-lt:nginx-jwt-module:v3.4.2:module
3
3
4
COMMENT=	Angie JWT dynamic module
4
COMMENT=	Angie JWT dynamic module
5
5
(-)b/www/angie-module-keyval/Makefile (-1 / +1 lines)
Lines 1-5 Link Here
1
PORTNAME=	angie-module-keyval
1
PORTNAME=	angie-module-keyval
2
GH_TUPLE=	kjdev:nginx-keyval:0.2.0:module
2
GH_TUPLE=	kjdev:nginx-keyval:0.3.0:module
3
3
4
COMMENT=	Angie keyval dynamic module
4
COMMENT=	Angie keyval dynamic module
5
5
(-)b/www/angie-module-lua/Makefile (-4 / +4 lines)
Lines 1-7 Link Here
1
PORTNAME=	angie-module-lua
1
PORTNAME=	angie-module-lua
2
GH_TUPLE=	openresty:lua-nginx-module:v0.10.25:lua
2
GH_TUPLE=	openresty:lua-nginx-module:v0.10.27:lua
3
GH_TUPLE+=	openresty:stream-lua-nginx-module:v0.0.13:lua_stream
3
GH_TUPLE+=	openresty:stream-lua-nginx-module:v0.0.15:lua_stream
4
GH_TUPLE+=	vision5:ngx_devel_kit:v0.3.2:ndk
4
GH_TUPLE+=	vision5:ngx_devel_kit:v0.3.3:ndk
5
5
6
COMMENT=	Angie Lua dynamic module
6
COMMENT=	Angie Lua dynamic module
7
7
Lines 17-23 CONFIGURE_ENV= LUAJIT_INC=${LUAJIT_INCDIR} \ Link Here
17
		LUAJIT_LIB=${LOCALBASE}/lib
17
		LUAJIT_LIB=${LOCALBASE}/lib
18
18
19
RUN_DEPENDS=	angie-module-ndk==${PKGVERSION}:www/angie-module-ndk \
19
RUN_DEPENDS=	angie-module-ndk==${PKGVERSION}:www/angie-module-ndk \
20
		lua-resty-core==0.1.27:www/lua-resty-core
20
		lua-resty-core>=0.1.29:www/lua-resty-core
21
21
22
USES= 		luajit:luajit-openresty
22
USES= 		luajit:luajit-openresty
23
23
(-)b/www/angie-module-lua/files/patch-lua-config (-2 / +2 lines)
Lines 1-5 Link Here
1
--- ../lua-nginx-module-0.10.25/config.orig
1
--- ../lua-nginx-module-0.10.27/config.orig
2
+++ ../lua-nginx-module-0.10.25/config
2
+++ ../lua-nginx-module-0.10.27/config
3
@@ -45,9 +45,9 @@
3
@@ -45,9 +45,9 @@
4
         NGX_TEST_LD_OPT="$ngx_lua_opt_L $NGX_TEST_LD_OPT"
4
         NGX_TEST_LD_OPT="$ngx_lua_opt_L $NGX_TEST_LD_OPT"
5
5
(-)b/www/angie-module-lua/files/patch-stream-lua-config (-17 / +8 lines)
Lines 1-8 Link Here
1
--- ../stream-lua-nginx-module-0.0.13/config.orig
1
--- ../stream-lua-nginx-module-0.0.15/config.orig	2024-08-20 18:19:24.000000000 +1000
2
+++ ../stream-lua-nginx-module-0.0.13/config
2
+++ ../stream-lua-nginx-module-0.0.15/config	2024-10-30 13:30:52.694713000 +1100
3
@@ -45,9 +45,9 @@
3
@@ -45,9 +45,9 @@ if [ -n "$LUAJIT_INC" -o -n "$LUAJIT_LIB" ]; then
4
         NGX_TEST_LD_OPT="$ngx_lua_opt_L $NGX_TEST_LD_OPT"
4
         NGX_TEST_LD_OPT="$ngx_lua_opt_L $NGX_TEST_LD_OPT"
5
5
 
6
         if [ $NGX_RPATH = YES ]; then
6
         if [ $NGX_RPATH = YES ]; then
7
-            ngx_feature_libs="-R$LUAJIT_LIB $ngx_lua_opt_L -lluajit-5.1 $luajit_ld_opt"
7
-            ngx_feature_libs="-R$LUAJIT_LIB $ngx_lua_opt_L -lluajit-5.1 $luajit_ld_opt"
8
+            ngx_feature_libs="-R$LUAJIT_LIB $ngx_lua_opt_L -lluajit-5.1 -lpcre $luajit_ld_opt"
8
+            ngx_feature_libs="-R$LUAJIT_LIB $ngx_lua_opt_L -lluajit-5.1 -lpcre $luajit_ld_opt"
Lines 10-20 Link Here
10
-            ngx_feature_libs="$ngx_lua_opt_L -lluajit-5.1 $luajit_ld_opt"
10
-            ngx_feature_libs="$ngx_lua_opt_L -lluajit-5.1 $luajit_ld_opt"
11
+            ngx_feature_libs="$ngx_lua_opt_L -lluajit-5.1 -lpcre $luajit_ld_opt"
11
+            ngx_feature_libs="$ngx_lua_opt_L -lluajit-5.1 -lpcre $luajit_ld_opt"
12
         fi
12
         fi
13
13
 
14
         . auto/feature
14
         . auto/feature
15
@@ -71,9 +71,9 @@
15
@@ -71,9 +71,9 @@ if [ -n "$LUAJIT_INC" -o -n "$LUAJIT_LIB" ]; then
16
             NGX_TEST_LD_OPT="$ngx_lua_opt_L $NGX_TEST_LD_OPT"
16
             NGX_TEST_LD_OPT="$ngx_lua_opt_L $NGX_TEST_LD_OPT"
17
17
 
18
             if [ $NGX_RPATH = YES ]; then
18
             if [ $NGX_RPATH = YES ]; then
19
-                ngx_feature_libs="-R$LUAJIT_LIB $ngx_lua_opt_L -lluajit-5.1 $luajit_ld_opt"
19
-                ngx_feature_libs="-R$LUAJIT_LIB $ngx_lua_opt_L -lluajit-5.1 $luajit_ld_opt"
20
+                ngx_feature_libs="-R$LUAJIT_LIB $ngx_lua_opt_L -lluajit-5.1 -lpcre $luajit_ld_opt"
20
+                ngx_feature_libs="-R$LUAJIT_LIB $ngx_lua_opt_L -lluajit-5.1 -lpcre $luajit_ld_opt"
Lines 22-35 Link Here
22
-                ngx_feature_libs="$ngx_lua_opt_L -lluajit-5.1 $luajit_ld_opt"
22
-                ngx_feature_libs="$ngx_lua_opt_L -lluajit-5.1 $luajit_ld_opt"
23
+                ngx_feature_libs="$ngx_lua_opt_L -lluajit-5.1 -lpcre $luajit_ld_opt"
23
+                ngx_feature_libs="$ngx_lua_opt_L -lluajit-5.1 -lpcre $luajit_ld_opt"
24
             fi
24
             fi
25
25
 
26
             . auto/feature
26
             . auto/feature
27
@@ -436,7 +436,7 @@
28
             . auto/feature
29
30
             if [ $ngx_found = yes ]; then
31
-                CORE_LIBS="-Wl,--require-defined=pcre_version $CORE_LIBS"
32
+                :
33
             fi
34
         ;;
35
     esac
(-)b/www/angie-module-ndk/Makefile (-1 / +1 lines)
Lines 1-5 Link Here
1
PORTNAME=	angie-module-ndk
1
PORTNAME=	angie-module-ndk
2
GH_TUPLE=	vision5:ngx_devel_kit:v0.3.2:module
2
GH_TUPLE=	vision5:ngx_devel_kit:v0.3.3:module
3
3
4
COMMENT=	Angie NDK dynamic module
4
COMMENT=	Angie NDK dynamic module
5
5
(-)b/www/angie-module-njs/Makefile (-1 / +1 lines)
Lines 1-5 Link Here
1
PORTNAME=	angie-module-njs
1
PORTNAME=	angie-module-njs
2
GH_TUPLE=	nginx:njs:0.8.2:module
2
GH_TUPLE=	nginx:njs:0.8.7:module
3
3
4
COMMENT=	Angie NJS dynamic module
4
COMMENT=	Angie NJS dynamic module
5
5
(-)b/www/angie-module-set-misc/Makefile (-1 / +1 lines)
Lines 1-5 Link Here
1
PORTNAME=	angie-module-set-misc
1
PORTNAME=	angie-module-set-misc
2
GH_TUPLE=	vision5:ngx_devel_kit:v0.3.2:ndk
2
GH_TUPLE=	vision5:ngx_devel_kit:v0.3.3:ndk
3
GH_TUPLE+=	openresty:set-misc-nginx-module:v0.33:module
3
GH_TUPLE+=	openresty:set-misc-nginx-module:v0.33:module
4
4
5
COMMENT=	Angie set-misc dynamic module
5
COMMENT=	Angie set-misc dynamic module
(-)b/www/angie-module-vod/Makefile (-1 / +1 lines)
Lines 1-5 Link Here
1
PORTNAME=	angie-module-vod
1
PORTNAME=	angie-module-vod
2
GH_TUPLE=	kaltura:nginx-vod-module:1.32:module
2
GH_TUPLE=	kaltura:nginx-vod-module:1.33:module
3
3
4
COMMENT=	VOD dynamic module for Angie
4
COMMENT=	VOD dynamic module for Angie
5
5
(-)b/www/angie/Makefile (-2 / +2 lines)
Lines 1-5 Link Here
1
PORTNAME?=		angie
1
PORTNAME?=		angie
2
PORTVERSION=		1.3.2
2
PORTVERSION=		1.7.0
3
CATEGORIES+=		www
3
CATEGORIES+=		www
4
MASTER_SITES+=		https://download.angie.software/files/:angie
4
MASTER_SITES+=		https://download.angie.software/files/:angie
5
DISTNAME=		angie-${DISTVERSIONFULL}
5
DISTNAME=		angie-${DISTVERSIONFULL}
Lines 159-165 do-install: Link Here
159
	${LN} -fs angie-nodebug ${STAGEDIR}${PREFIX}/sbin/angie
159
	${LN} -fs angie-nodebug ${STAGEDIR}${PREFIX}/sbin/angie
160
160
161
	${INSTALL_MAN} ${WRKSRC}/objs/angie.8 ${STAGEDIR}${PREFIX}/share/man/man8
161
	${INSTALL_MAN} ${WRKSRC}/objs/angie.8 ${STAGEDIR}${PREFIX}/share/man/man8
162
.for i in CHANGES CHANGES.ru README.rst
162
.for i in CHANGES CHANGES.ru
163
	${INSTALL_MAN} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
163
	${INSTALL_MAN} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
164
.endfor
164
.endfor
165
165
(-)b/www/angie/distinfo (-21 / +21 lines)
Lines 1-8 Link Here
1
TIMESTAMP = 1700819056
1
TIMESTAMP = 1730250772
2
SHA256 (angie-1.3.2.tar.gz) = 636056d60788f8012738eed856733f7515b9cb2de0b002186c5edc820ffafb27
2
SHA256 (angie-1.7.0.tar.gz) = 0797e6e01815fdb30bbc9f703800387c9c8b2c601131a9c39509a33d73f21c01
3
SIZE (angie-1.3.2.tar.gz) = 1483526
3
SIZE (angie-1.7.0.tar.gz) = 1624508
4
SHA256 (kjdev-nginx-auth-jwt-2a2bd643295610606734298e5afc1875203664e1_GH0.tar.gz) = fd540226223625c34d988f7bdc0a485b1e7bf76dec0e61ff8e6d9a4e585b8282
4
SHA256 (kjdev-nginx-auth-jwt-3ec16e9d8af12fd705408813e87adc8c1480c6cf_GH0.tar.gz) = 05417a26b9f9b77e507e46247013b7131c265b4f0d1c26094f6fd603738b09f7
5
SIZE (kjdev-nginx-auth-jwt-2a2bd643295610606734298e5afc1875203664e1_GH0.tar.gz) = 58759
5
SIZE (kjdev-nginx-auth-jwt-3ec16e9d8af12fd705408813e87adc8c1480c6cf_GH0.tar.gz) = 73955
6
SHA256 (stnoonan-spnego-http-auth-nginx-module-v1.1.1_GH0.tar.gz) = ed267444667d3f85f92d1bd910a7010e8272f4de1aa83afa39c1c97eac17dade
6
SHA256 (stnoonan-spnego-http-auth-nginx-module-v1.1.1_GH0.tar.gz) = ed267444667d3f85f92d1bd910a7010e8272f4de1aa83afa39c1c97eac17dade
7
SIZE (stnoonan-spnego-http-auth-nginx-module-v1.1.1_GH0.tar.gz) = 18507
7
SIZE (stnoonan-spnego-http-auth-nginx-module-v1.1.1_GH0.tar.gz) = 18507
8
SHA256 (google-ngx_brotli-v1.0.0rc_GH0.tar.gz) = c85cdcfd76703c95aa4204ee4c2e619aa5b075cac18f428202f65552104add3b
8
SHA256 (google-ngx_brotli-v1.0.0rc_GH0.tar.gz) = c85cdcfd76703c95aa4204ee4c2e619aa5b075cac18f428202f65552104add3b
Lines 19-38 SHA256 (openresty-nginx-eval-module-2016.06.10_GH0.tar.gz) = 6b91d3c2c2f254ebb37 Link Here
19
SIZE (openresty-nginx-eval-module-2016.06.10_GH0.tar.gz) = 14188
19
SIZE (openresty-nginx-eval-module-2016.06.10_GH0.tar.gz) = 14188
20
SHA256 (leev-ngx_http_geoip2_module-3.4_GH0.tar.gz) = ad72fc23348d715a330994984531fab9b3606e160483236737f9a4a6957d9452
20
SHA256 (leev-ngx_http_geoip2_module-3.4_GH0.tar.gz) = ad72fc23348d715a330994984531fab9b3606e160483236737f9a4a6957d9452
21
SIZE (leev-ngx_http_geoip2_module-3.4_GH0.tar.gz) = 8877
21
SIZE (leev-ngx_http_geoip2_module-3.4_GH0.tar.gz) = 8877
22
SHA256 (openresty-headers-more-nginx-module-v0.35_GH0.tar.gz) = 1a216be253bbd5bf751d572ac2f93bdb61fbc2d78078d26c1335f4637cf2360a
22
SHA256 (openresty-headers-more-nginx-module-v0.37_GH0.tar.gz) = cf6e169d6b350c06d0c730b0eaf4973394026ad40094cddd3b3a5b346577019d
23
SIZE (openresty-headers-more-nginx-module-v0.35_GH0.tar.gz) = 29216
23
SIZE (openresty-headers-more-nginx-module-v0.37_GH0.tar.gz) = 29433
24
SHA256 (max-lt-nginx-jwt-module-v3.2.2_GH0.tar.gz) = e6c2f4d82254fb64b01c24860bbd8d535f616a6389615e152c119b2b3f5869ae
24
SHA256 (max-lt-nginx-jwt-module-v3.4.2_GH0.tar.gz) = c8c8a01c27e3aab853ddd437c119b9a3fcd1f111c1627ad200a0277b19505ff9
25
SIZE (max-lt-nginx-jwt-module-v3.2.2_GH0.tar.gz) = 15681
25
SIZE (max-lt-nginx-jwt-module-v3.4.2_GH0.tar.gz) = 16453
26
SHA256 (kjdev-nginx-keyval-0.2.0_GH0.tar.gz) = 7964ca93a1a4170a379caa7ad5dc8440d90d209e76675fe453176a80ae41a6f3
26
SHA256 (kjdev-nginx-keyval-0.3.0_GH0.tar.gz) = c4e5d2a03ead32cfccb9f04f01a8cdf664f5deca3f677c13b1509bff832cf2c7
27
SIZE (kjdev-nginx-keyval-0.2.0_GH0.tar.gz) = 21418
27
SIZE (kjdev-nginx-keyval-0.3.0_GH0.tar.gz) = 24150
28
SHA256 (openresty-lua-nginx-module-v0.10.25_GH0.tar.gz) = bc764db42830aeaf74755754b900253c233ad57498debe7a441cee2c6f4b07c2
28
SHA256 (openresty-lua-nginx-module-v0.10.27_GH0.tar.gz) = a0a5e616c4a0a32e48899d12242fed5a371f69a85f11ff274a87a2f02f419876
29
SIZE (openresty-lua-nginx-module-v0.10.25_GH0.tar.gz) = 725616
29
SIZE (openresty-lua-nginx-module-v0.10.27_GH0.tar.gz) = 758952
30
SHA256 (openresty-stream-lua-nginx-module-v0.0.13_GH0.tar.gz) = 01b715754a8248cc7228e0c8f97f7488ae429d90208de0481394e35d24cef32f
30
SHA256 (openresty-stream-lua-nginx-module-v0.0.15_GH0.tar.gz) = ecf5c2afd345149cef19bf2e3e196bf1c514ca85e778f853f80a379284b70de1
31
SIZE (openresty-stream-lua-nginx-module-v0.0.13_GH0.tar.gz) = 376245
31
SIZE (openresty-stream-lua-nginx-module-v0.0.15_GH0.tar.gz) = 394192
32
SHA256 (vision5-ngx_devel_kit-v0.3.2_GH0.tar.gz) = aa961eafb8317e0eb8da37eb6e2c9ff42267edd18b56947384e719b85188f58b
32
SHA256 (vision5-ngx_devel_kit-v0.3.3_GH0.tar.gz) = faa2fcd5168b10764d35081356511d5f84db5c526a1aa4b6add2db94b6853b2b
33
SIZE (vision5-ngx_devel_kit-v0.3.2_GH0.tar.gz) = 66551
33
SIZE (vision5-ngx_devel_kit-v0.3.3_GH0.tar.gz) = 66561
34
SHA256 (nginx-njs-0.8.2_GH0.tar.gz) = 6f17387db8df90b6e3382d280455962ff85fa2b1a32d91c2ce1fd1af5a854d72
34
SHA256 (nginx-njs-0.8.7_GH0.tar.gz) = e959b01637d6684387347cc6dea073949467193d273f58062129e52b110aefa2
35
SIZE (nginx-njs-0.8.2_GH0.tar.gz) = 733916
35
SIZE (nginx-njs-0.8.7_GH0.tar.gz) = 880217
36
SHA256 (FRiCKLE-ngx_postgres-1.0rc7_GH0.tar.gz) = c942e674a7273ab87caab4dcad626ab54852be192c29b1add50d2cb535e3cbb9
36
SHA256 (FRiCKLE-ngx_postgres-1.0rc7_GH0.tar.gz) = c942e674a7273ab87caab4dcad626ab54852be192c29b1add50d2cb535e3cbb9
37
SIZE (FRiCKLE-ngx_postgres-1.0rc7_GH0.tar.gz) = 40742
37
SIZE (FRiCKLE-ngx_postgres-1.0rc7_GH0.tar.gz) = 40742
38
SHA256 (openresty-redis2-nginx-module-v0.15_GH0.tar.gz) = d255571bcfb9939b78099df39cb4d42f174d789aec8c8e5e47b93942b0299438
38
SHA256 (openresty-redis2-nginx-module-v0.15_GH0.tar.gz) = d255571bcfb9939b78099df39cb4d42f174d789aec8c8e5e47b93942b0299438
Lines 47-51 SHA256 (kyprizel-testcookie-nginx-module-64137c2f7e66e8866f56fdecaaf09ac10a034da Link Here
47
SIZE (kyprizel-testcookie-nginx-module-64137c2f7e66e8866f56fdecaaf09ac10a034da9_GH0.tar.gz) = 20732
47
SIZE (kyprizel-testcookie-nginx-module-64137c2f7e66e8866f56fdecaaf09ac10a034da9_GH0.tar.gz) = 20732
48
SHA256 (fdintino-nginx-upload-module-2.3.0_GH0.tar.gz) = c86e318addb9c88d70fdbd58ff1f6ef6f404a93070f6db8017a1f880c97946c4
48
SHA256 (fdintino-nginx-upload-module-2.3.0_GH0.tar.gz) = c86e318addb9c88d70fdbd58ff1f6ef6f404a93070f6db8017a1f880c97946c4
49
SIZE (fdintino-nginx-upload-module-2.3.0_GH0.tar.gz) = 40139
49
SIZE (fdintino-nginx-upload-module-2.3.0_GH0.tar.gz) = 40139
50
SHA256 (kaltura-nginx-vod-module-1.32_GH0.tar.gz) = 958bbe7084704f9df49f8b71e8b90700591cd3edca7409f74bf0d8721621402f
50
SHA256 (kaltura-nginx-vod-module-1.33_GH0.tar.gz) = 9c9600e5da4ee02ef6820d056da9eb5f3449f715468334ddab41727b76d478d8
51
SIZE (kaltura-nginx-vod-module-1.32_GH0.tar.gz) = 471031
51
SIZE (kaltura-nginx-vod-module-1.33_GH0.tar.gz) = 471858
(-)b/www/angie/pkg-plist (-2 lines)
Lines 13-19 sbin/angie Link Here
13
share/man/man8/angie.8.gz
13
share/man/man8/angie.8.gz
14
%%DOCSDIR%%/CHANGES
14
%%DOCSDIR%%/CHANGES
15
%%DOCSDIR%%/CHANGES.ru
15
%%DOCSDIR%%/CHANGES.ru
16
%%DOCSDIR%%/README.rst
17
16
18
@sample %%ETCDIR%%/angie.conf.sample
17
@sample %%ETCDIR%%/angie.conf.sample
19
@sample %%ETCDIR%%/fastcgi.conf.sample
18
@sample %%ETCDIR%%/fastcgi.conf.sample
20
- 

Return to bug 282394