Skip to content

Commit ed00549

Browse files
author
osa
committed
www/nginx: update third-party lua module
While I'm here fix build when third-party naxsi module is enabled. Bump PKGREVISION.
1 parent 1f92d4e commit ed00549

3 files changed

Lines changed: 12 additions & 8 deletions

File tree

www/nginx/Makefile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# $NetBSD: Makefile,v 1.167 2024/11/16 12:07:24 wiz Exp $
1+
# $NetBSD: Makefile,v 1.168 2024/11/26 20:11:19 osa Exp $
22

33
DISTNAME= nginx-1.26.2
4-
PKGREVISION= 6
4+
PKGREVISION= 7
55
CATEGORIES= www
66
MASTER_SITES= https://nginx.org/download/
77
DISTFILES= ${DEFAULT_DISTFILES}
@@ -110,6 +110,10 @@ post-patch:
110110
.if !empty(PKG_OPTIONS:Mnginx-gssapi)
111111
${SED} -i.bak '4d;5d;6d' ${WRKDIR}/${GSSAPI_DISTNAME}/config
112112
.endif
113+
.if !empty(PKG_OPTIONS:Mnginx-naxsi)
114+
${SED} -i.bak '308,309s/MSIZE/NAXSI_MSIZE/g' \
115+
${WRKSRC}/..${NAXSI_SUBDIR}/libinjection/src/libinjection_sqli.c
116+
.endif
113117

114118
do-install:
115119
${INSTALL_PROGRAM} ${WRKSRC}/objs/nginx ${DESTDIR}${PREFIX}/sbin/nginx

www/nginx/distinfo

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$NetBSD: distinfo,v 1.125 2024/11/13 10:59:55 jperkin Exp $
1+
$NetBSD: distinfo,v 1.126 2024/11/26 20:11:19 osa Exp $
22

33
BLAKE2s (1ac658f44afc9240f13e9d6c1c9d5a7816299e8e.patch) = 6c3880dc781886fb1f4190fa9b8f1459246cc5d157aaed3b9a24cc7abaf7c5a1
44
SHA512 (1ac658f44afc9240f13e9d6c1c9d5a7816299e8e.patch) = b780bea19736f5db844f11b0b407c159cc6ba7326b50177cefde6f8ee875238d3618e50d29b132a66fe98103cb5656f33895e5989d98d4cdc26cfeaa7f12865f
@@ -18,9 +18,9 @@ Size (form-input-nginx-module-0.12.tar.gz) = 11090 bytes
1818
BLAKE2s (headers-more-nginx-module-0.37.tar.gz) = 0c41b4b1f8b3a12c9c55d4e18892592e4fa7499f98525a432ac54cc38951a725
1919
SHA512 (headers-more-nginx-module-0.37.tar.gz) = 0cc2fffe506194d439e3669644d41b7943e2c3cffa3483eb70b92067930b358d506a14646eff8362b191a11c624db29f6b53d830876929dcb4ce1c9d7b2bc40d
2020
Size (headers-more-nginx-module-0.37.tar.gz) = 29433 bytes
21-
BLAKE2s (lua-nginx-module-0.10.26.tar.gz) = a8b1a1209f11e15165db96a8459d5639debaf79e83231cf3d2640b8dcbaae20b
22-
SHA512 (lua-nginx-module-0.10.26.tar.gz) = 9abf00844ef00ce1dc5ff08d6fe4ddccf843f2ad2de6fd450854b38a66b45add71e814205dba9b19225b9165e67eb93578e83e5fe37af4e0c891e61e6a6bfb3d
23-
Size (lua-nginx-module-0.10.26.tar.gz) = 745785 bytes
21+
BLAKE2s (lua-nginx-module-0.10.27.tar.gz) = 783ce4aea55aede8fdfe3626b8207e111cdb6882f0bf03cfaead7baf871279cc
22+
SHA512 (lua-nginx-module-0.10.27.tar.gz) = ff1f7bb593a91402453709d63c95b304ef14d805f5a7f8e6689e95b93522823b80f76baced70664c9f46e9fc8da3941f153b9cf5d1dfbabfb0ee9d9bcc8151b4
23+
Size (lua-nginx-module-0.10.27.tar.gz) = 758952 bytes
2424
BLAKE2s (naxsi-1.6-src-with-deps.tar.gz) = 77344405cc235d38328223d325194eee58d0124271a9fcd785de3477a8db52ce
2525
SHA512 (naxsi-1.6-src-with-deps.tar.gz) = c41e1a51b5642af1cb640b15e9415e073692d7a3baf4d3fceae260cdf9af2a976b3090b40756ce10e162bec6efc9fbc7306569e173bfbe4aab4ac7bcbdd8a075
2626
Size (naxsi-1.6-src-with-deps.tar.gz) = 3352718 bytes

www/nginx/options.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $NetBSD: options.mk,v 1.110 2024/11/13 11:17:45 wiz Exp $
1+
# $NetBSD: options.mk,v 1.111 2024/11/26 20:11:19 osa Exp $
22

33
CODELOAD_SITE_GITHUB= https://codeload.github.com/
44

@@ -188,7 +188,7 @@ DISTFILES+= ${NDK_DISTFILE}
188188
.endif
189189

190190
.if !empty(PKG_OPTIONS:Mnginx-luajit) || make(makesum) || make(mdi) || make(distclean)
191-
LUA_VERSION= 0.10.26
191+
LUA_VERSION= 0.10.27
192192
LUA_DISTNAME= lua-nginx-module-${LUA_VERSION}
193193
LUA_DISTFILE= ${LUA_DISTNAME}.tar.gz
194194
SITES.${LUA_DISTFILE}= -${MASTER_SITE_GITHUB:=openresty/lua-nginx-module/archive/}v${LUA_VERSION}.tar.gz

0 commit comments

Comments
 (0)