pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/www/freenginx
Module Name: pkgsrc
Committed By: osa
Date: Thu Apr 23 15:38:11 UTC 2026
Modified Files:
pkgsrc/www/freenginx: Makefile PLIST distinfo options.mk
Added Files:
pkgsrc/www/freenginx/patches: extra-patch-auto-quickjs
Log Message:
www/freenginx: sync with www/freenginx-devel
- update third-party modules
- enable quickjs for njs
Bump PKGREVISION.
Sponsored by: tipi.work
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/freenginx/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/freenginx/PLIST
cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/freenginx/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/freenginx/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/www/freenginx/patches/extra-patch-auto-quickjs
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/www/freenginx/Makefile
diff -u pkgsrc/www/freenginx/Makefile:1.4 pkgsrc/www/freenginx/Makefile:1.5
--- pkgsrc/www/freenginx/Makefile:1.4 Tue Apr 14 14:42:57 2026
+++ pkgsrc/www/freenginx/Makefile Thu Apr 23 15:38:10 2026
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2026/04/14 14:42:57 osa Exp $
+# $NetBSD: Makefile,v 1.5 2026/04/23 15:38:10 osa Exp $
DISTNAME= freenginx-1.30.0
+PKGREVISION= 1
CATEGORIES= www
MASTER_SITES= https://freenginx.org/download/
DISTFILES= ${DEFAULT_DISTFILES}
@@ -112,6 +113,9 @@ post-patch:
${SED} -i.bak '308,309s/MSIZE/NAXSI_MSIZE/g' \
${WRKSRC}/..${NAXSI_SUBDIR}/libinjection/src/libinjection_sqli.c
.endif
+.if !empty(PKG_OPTIONS:Mnginx-njs)
+ cd ${WRKSRC} && ${PATCH} < ${PATCHDIR}/extra-patch-auto-quickjs
+.endif
.if !empty(PKG_OPTIONS:Mnginx-upload)
cd ${WRKSRC} && ${PATCH} < ${PATCHDIR}/extra-patch-ngx_http_upload_module.c
.endif
Index: pkgsrc/www/freenginx/PLIST
diff -u pkgsrc/www/freenginx/PLIST:1.1 pkgsrc/www/freenginx/PLIST:1.2
--- pkgsrc/www/freenginx/PLIST:1.1 Thu Dec 25 18:57:20 2025
+++ pkgsrc/www/freenginx/PLIST Thu Apr 23 15:38:10 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2025/12/25 18:57:20 osa Exp $
+@comment $NetBSD: PLIST,v 1.2 2026/04/23 15:38:10 osa Exp $
${PLIST.dso}${PLIST.ndk}libexec/freenginx/ndk_http_module.so
${PLIST.dso}${PLIST.arrayvar}libexec/freenginx/ngx_http_array_var_module.so
${PLIST.dso}${PLIST.brotli}libexec/freenginx/ngx_http_brotli_filter_module.so
@@ -9,6 +9,7 @@ ${PLIST.dso}${PLIST.dav}libexec/freengin
${PLIST.dso}${PLIST.echo}libexec/freenginx/ngx_http_echo_module.so
${PLIST.dso}${PLIST.encses}libexec/freenginx/ngx_http_encrypted_session_module.so
${PLIST.dso}${PLIST.forminput}libexec/freenginx/ngx_http_form_input_module.so
+${PLIST.dso}${PLIST.geoip}libexec/freenginx/ngx_http_geoip_module.so
${PLIST.dso}${PLIST.geoip2}libexec/freenginx/ngx_http_geoip2_module.so
${PLIST.dso}${PLIST.headmore}libexec/freenginx/ngx_http_headers_more_filter_module.so
${PLIST.dso}${PLIST.imagefilter}libexec/freenginx/ngx_http_image_filter_module.so
@@ -24,6 +25,7 @@ ${PLIST.dso}${PLIST.vts}libexec/freengin
${PLIST.dso}${PLIST.mail}libexec/freenginx/ngx_mail_module.so
${PLIST.dso}${PLIST.nchan}libexec/freenginx/ngx_nchan_module.so
${PLIST.dso}${PLIST.rtmp}libexec/freenginx/ngx_rtmp_module.so
+${PLIST.dso}${PLIST.geoip}libexec/freenginx/ngx_stream_geoip_module.so
${PLIST.dso}${PLIST.geoip2}libexec/freenginx/ngx_stream_geoip2_module.so
${PLIST.dso}${PLIST.njs}libexec/freenginx/ngx_stream_js_module.so
${PLIST.dso}${PLIST.stream}libexec/freenginx/ngx_stream_module.so
Index: pkgsrc/www/freenginx/distinfo
diff -u pkgsrc/www/freenginx/distinfo:1.3 pkgsrc/www/freenginx/distinfo:1.4
--- pkgsrc/www/freenginx/distinfo:1.3 Tue Apr 14 14:42:57 2026
+++ pkgsrc/www/freenginx/distinfo Thu Apr 23 15:38:10 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2026/04/14 14:42:57 osa Exp $
+$NetBSD: distinfo,v 1.4 2026/04/23 15:38:10 osa Exp $
BLAKE2s (array-var-nginx-module-0.06.tar.gz) = fa6ad2a2ce3c3eba3f69287b224e9c01fcaca29a083394ab74f2f655d3e2138b
SHA512 (array-var-nginx-module-0.06.tar.gz) = bc72158856a1be18a26ee04c6b5b0f0a20bcce688610a493bf31e2a133e7eb12e11f7c18197a09a72b1513f6a08348ee5281b9d5b84cf43603539040ebd23c26
@@ -42,30 +42,30 @@ Size (ngx_devel_kit-0.3.4.tar.gz) = 6647
BLAKE2s (ngx_http_geoip2_module-3.4.tar.gz) = eb14ed670788d4cc46037719ebab29e1c0da53cadbb0da10198e76255d924273
SHA512 (ngx_http_geoip2_module-3.4.tar.gz) = 18dea21e5ae2647bea1fc448058a1b773c936917245edef8d861d5e23ed92e9a3b1ec4ef43ffb2ece7b5899d787910adcf4fbd39f84d7e8d7c54759e2fee5b72
Size (ngx_http_geoip2_module-3.4.tar.gz) = 8877 bytes
-BLAKE2s (njs-0.9.6.tar.gz) = 7df07ae7b484042b400e93d6039424164a7aa0689ecba4771092f69771058b52
-SHA512 (njs-0.9.6.tar.gz) = 8696be2cc676308bd409cc1ed2c19d7e71dbd162cc13e8b679e813b7a66690a7ab0071057fc9d4ca242a6e1e5bc216fbf07f58f309e4c6f44182a2eeb82380fc
-Size (njs-0.9.6.tar.gz) = 953437 bytes
+BLAKE2s (njs-0.9.7.tar.gz) = 9e8d8f5d92bf07bb1e77025991faa373b6d798b7a9698a3fb3c74a4117fdc3b7
+SHA512 (njs-0.9.7.tar.gz) = 934543b80eaa4f54b53d4605b8f9e26251c2179629778ad178c0f87fc04e44172e45fdfc0c9ba03961899c00984549b2c1e935864ab27ab8bedb243fc4e585a5
+Size (njs-0.9.7.tar.gz) = 966988 bytes
BLAKE2s (openresty-echo-nginx-module-b0f344b_GH.tar.gz) = e1ed241e7d3e57024f666bc8489f83575664121a01ef9424b7d7bf4a1f8cdc3f
SHA512 (openresty-echo-nginx-module-b0f344b_GH.tar.gz) = ef5150094fda342eec018273eb312b16fb7731474e96865374c98dafe7a507fcf9c7e5fd2766d3296afb11e0348e4b20a973d20303052a71bdec7c92bd088d38
Size (openresty-echo-nginx-module-b0f344b_GH.tar.gz) = 53548 bytes
BLAKE2s (openresty-lua-nginx-module-971cc14_GH.tar.gz) = 21f221c61426ce0d704505264dfcb3abcb1c82bcc06a470e8ef971aba2061b23
SHA512 (openresty-lua-nginx-module-971cc14_GH.tar.gz) = bd07820933ddeb98fd163a6a62158ca1f588994ff61bc6c47be1472f2388c68a5531c52eb45d891dc831048a223f55bb477485ed10781f2d9854eed73fbe4ad3
Size (openresty-lua-nginx-module-971cc14_GH.tar.gz) = 892616 bytes
-BLAKE2s (osokin-ngx_http_redis-59eb1c3_GH.tar.gz) = 4970dcfa8b4d51dde1e21b326a0c2a9feda370df9b7081e5e6e480bcfad63607
-SHA512 (osokin-ngx_http_redis-59eb1c3_GH.tar.gz) = 63a488f95167dcd3b87cfc687e68e99beb33766c3f91bbf2eea9d7427e806941d445fa969fcdfae741b6566ef0dc9f95c1be53ce398d6f6d80ea31399f383943
-Size (osokin-ngx_http_redis-59eb1c3_GH.tar.gz) = 12696 bytes
+BLAKE2s (osokin-ngx_http_redis-0.4.1_GH.tar.gz) = ea36b366411ab60c3a1ec3348b6d78c1d70560a1e6889199c243d8f5c9e09544
+SHA512 (osokin-ngx_http_redis-0.4.1_GH.tar.gz) = ec77a35f4e66c4f6165009854f54889335fc2f3c80c8505d6659712b8a1774d24077b1880ac3ddd07f1bdfd3d37f5dc10391435d58e98ca01d8a379d56e84a0a
+Size (osokin-ngx_http_redis-0.4.1_GH.tar.gz) = 14419 bytes
BLAKE2s (set-misc-nginx-module-0.33.tar.gz) = 306eb7a96ce5650c7e97a91e9cdba48d154d10cf6445d31193ffab889054d893
SHA512 (set-misc-nginx-module-0.33.tar.gz) = 1ff4c947538a5bd5f9d6adcd87b37f2702f5cc90e3342bc08359cbe8f290b705a3a2daa3dedfb1df3ce4bc19478c8fcac07081c4a53a804fc2862d50078278dc
Size (set-misc-nginx-module-0.33.tar.gz) = 30084 bytes
-BLAKE2s (stnoonan-spnego-http-auth-nginx-module-c3dbfbd_GH.tar.gz) = 76f527ac4bab43ad329540fd745139bc13a13a49ed5f13dd72423c853643a0e4
-SHA512 (stnoonan-spnego-http-auth-nginx-module-c3dbfbd_GH.tar.gz) = 0042034ef11f034e1d4eb271212bccfeb755f81f71ea5eba48220a1b3cabd5c7631a18efe97caa51f402315775ab5cc24c88eb25f1c4bf77637436a24353119f
-Size (stnoonan-spnego-http-auth-nginx-module-c3dbfbd_GH.tar.gz) = 33090 bytes
+BLAKE2s (stnoonan-spnego-http-auth-nginx-module-59f5670_GH.tar.gz) = 4208240aff79bf3fca94827d890d77f7e0c72ff886172029e7baf4682d451493
+SHA512 (stnoonan-spnego-http-auth-nginx-module-59f5670_GH.tar.gz) = a66b1b90d099f3cf288f4f84a336b4a63a251e0ddea7ba4fd1d785f75c2e0c4b4ea50d676c3e3f1f47889d56abfb2281cfd253aec6ff7785b88ae4f7784f5493
+Size (stnoonan-spnego-http-auth-nginx-module-59f5670_GH.tar.gz) = 33397 bytes
BLAKE2s (vozlt-nginx-module-sts-3c10d42_GH.tar.gz) = f04e586b926c030c8b8461823d3a0a38257c1b88f42012a0386826b6e1d0d6be
SHA512 (vozlt-nginx-module-sts-3c10d42_GH.tar.gz) = f9253c5f71f28ac5e99a47e07ccb4136ea160399469cd3bfe026a9ff56e9a1ed94f612b3e66db369ada5d98fd1e9372bfdee9b6d76d9727d0c06189be7d9257d
Size (vozlt-nginx-module-sts-3c10d42_GH.tar.gz) = 352431 bytes
-BLAKE2s (vozlt-nginx-module-vts-d65ce17_GH.tar.gz) = 842922f5bb98f7fee5cb1edb13b6a1cb6c8a24351a54cc7a7f7ab670f400d786
-SHA512 (vozlt-nginx-module-vts-d65ce17_GH.tar.gz) = 795b176a1628eff9a8a87e7ab1c8c24539650be2df3c6e0964cae398e36dba4948ba3a72d406b6df62061b30e26910ca5d0c8ef8b1e3d035e8de74d5489ec0ea
-Size (vozlt-nginx-module-vts-d65ce17_GH.tar.gz) = 184993 bytes
+BLAKE2s (vozlt-nginx-module-vts-d421ab0_GH.tar.gz) = 3c05e98e1a775181270b8c4f5fe1c62378aff45b9ce5d46b040900c5edc42b98
+SHA512 (vozlt-nginx-module-vts-d421ab0_GH.tar.gz) = 51e676d0f18507f0794604d7a29b58253fd9d3845e37b7d2f207617ca64dd8e99b00607fdaf43abf25b977e50aed60020ba8358e416db04c9755ee5c08e01ded
+Size (vozlt-nginx-module-vts-d421ab0_GH.tar.gz) = 246647 bytes
SHA1 (patch-auto_cc_conf) = 5e6a479ba419cd16dedeb3b4c47dc685d126ef6a
SHA1 (patch-auto_install) = 3b3a0f9f4c005b707664554fa57a58c9e3b7de60
SHA1 (patch-conf_nginx.conf) = d2ca1954e9682b9d0007cc02e5841e3986ecf5c1
Index: pkgsrc/www/freenginx/options.mk
diff -u pkgsrc/www/freenginx/options.mk:1.2 pkgsrc/www/freenginx/options.mk:1.3
--- pkgsrc/www/freenginx/options.mk:1.2 Tue Apr 14 14:38:09 2026
+++ pkgsrc/www/freenginx/options.mk Thu Apr 23 15:38:10 2026
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2026/04/14 14:38:09 osa Exp $
+# $NetBSD: options.mk,v 1.3 2026/04/23 15:38:10 osa Exp $
CODELOAD_SITE_GITHUB= https://codeload.github.com/
@@ -14,7 +14,7 @@ PKG_SUPPORTED_OPTIONS+= nginx-stream-ssl
PKG_SUGGESTED_OPTIONS= nginx-auth-request nginx-brotli nginx-gzip nginx-http2 nginx-http3 nginx-memcache
PKG_SUGGESTED_OPTIONS+= nginx-realip nginx-slice nginx-status nginx-ssl nginx-uwsgi
-PLIST_VARS+= arrayvar brotli cprg dav dso echo encses forminput geoip2
+PLIST_VARS+= arrayvar brotli cprg dav dso echo encses forminput geoip geoip2
PLIST_VARS+= gssapi headmore imagefilter lua mail naxsi nchan ndk njs
PLIST_VARS+= perl redis rtmp setmisc stream sts upload uwsgi vts
@@ -140,12 +140,16 @@ CONFIGURE_ARGS+= --with-http_flv_module
.if !empty(PKG_OPTIONS:Mnginx-geoip)
.include "../../net/GeoIP/buildlink3.mk"
+.include "../../geography/libmaxminddb/buildlink3.mk"
CONFIGURE_ARGS+= --with-http_geoip_module
SUBST_CLASSES+= fix-geo
SUBST_STAGE.fix-geo= pre-configure
SUBST_FILES.fix-geo= auto/lib/geoip/conf
SUBST_SED.fix-geo= -e 's,/usr/pkg,${BUILDLINK_PREFIX.GeoIP},g'
SUBST_NOOP_OK.fix-geo= yes
+DSO_BASEMODS+= http_geoip_module
+DSO_BASEMODS+= stream_geoip_module
+PLIST.geoip= yes
.endif
.if !empty(PKG_OPTIONS:Mnginx-http2)
@@ -181,7 +185,7 @@ CONFIGURE_ARGS+= --with-http_realip_modu
.if !empty(PKG_OPTIONS:Mnginx-redis) || make(makesum) || make(mdi) || make(distclean)
REDIS_GH_ACCOUNT= osokin
REDIS_GH_PROJECT= ngx_http_redis
-REDIS_VERSION= 59eb1c3
+REDIS_VERSION= 0.4.1
REDIS_DISTNAME= ${REDIS_GH_PROJECT}-${REDIS_VERSION}
REDIS_DISTFILE= ${REDIS_GH_ACCOUNT}-${REDIS_DISTNAME}_GH.tar.gz
SITES.${REDIS_DISTFILE}= -${CODELOAD_SITE_GITHUB:=${REDIS_GH_ACCOUNT}/${REDIS_GH_PROJECT}/tar.gz/${REDIS_VERSION}?dummy=${REDIS_DISTFILE}}
@@ -383,7 +387,7 @@ PLIST.rtmp= yes
.endif
.if !empty(PKG_OPTIONS:Mnginx-njs) || make(makesum) || make(mdi) || make(distclean)
-NJS_VERSION= 0.9.6
+NJS_VERSION= 0.9.7
NJS_DISTNAME= njs-${NJS_VERSION}
NJS_DISTFILE= ${NJS_DISTNAME}.tar.gz
SITES.${NJS_DISTFILE}= -${MASTER_SITE_GITHUB:=nginx/njs/archive/}${NJS_VERSION}.tar.gz
@@ -391,6 +395,7 @@ DISTFILES+= ${NJS_DISTFILE}
DSO_EXTMODS+= njs
NJS_SUBDIR= /nginx
PLIST.njs= yes
+.include "../../lang/quickjs/buildlink3.mk"
. if !empty(PKG_OPTIONS:Mnginx-njs-xml)
.include "../../textproc/libxslt/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
@@ -415,7 +420,7 @@ PLIST.upload= yes
.if !empty(PKG_OPTIONS:Mnginx-gssapi) || make(makesum) || make(mdi) || make(distclean)
GSSAPI_GH_ACCOUNT= stnoonan
GSSAPI_GH_PROJECT= spnego-http-auth-nginx-module
-GSSAPI_VERSION= c3dbfbd
+GSSAPI_VERSION= 59f5670
GSSAPI_DISTNAME= ${GSSAPI_GH_PROJECT}-${GSSAPI_VERSION}
GSSAPI_DISTFILE= ${GSSAPI_GH_ACCOUNT}-${GSSAPI_DISTNAME}_GH.tar.gz
SITES.${GSSAPI_DISTFILE}= -${CODELOAD_SITE_GITHUB:=${GSSAPI_GH_ACCOUNT}/${GSSAPI_GH_PROJECT}/tar.gz/${GSSAPI_VERSION}?dummy=${GSSAPI_DISTFILE}}
@@ -439,7 +444,7 @@ PLIST.sts= yes
.if !empty(PKG_OPTIONS:Mnginx-vts) || make(makesum) || make(mdi) || make(distclean)
VTS_GH_ACCOUNT= vozlt
VTS_GH_PROJECT= nginx-module-vts
-VTS_VERSION= d65ce17
+VTS_VERSION= d421ab0
VTS_DISTNAME= ${VTS_GH_PROJECT}-${VTS_VERSION}
VTS_DISTFILE= ${VTS_GH_ACCOUNT}-${VTS_DISTNAME}_GH.tar.gz
SITES.${VTS_DISTFILE}= -${CODELOAD_SITE_GITHUB:=${VTS_GH_ACCOUNT}/${VTS_GH_PROJECT}/tar.gz/${VTS_VERSION}?dummy=${VTS_DISTFILE}}
Added files:
Index: pkgsrc/www/freenginx/patches/extra-patch-auto-quickjs
diff -u /dev/null pkgsrc/www/freenginx/patches/extra-patch-auto-quickjs:1.1
--- /dev/null Thu Apr 23 15:38:11 2026
+++ pkgsrc/www/freenginx/patches/extra-patch-auto-quickjs Thu Apr 23 15:38:10 2026
@@ -0,0 +1,15 @@
+--- ../njs-0.9.7/auto/quickjs.orig 2026-02-07 10:37:18.963401856 -0500
++++ ../njs-0.9.7/auto/quickjs 2026-02-07 10:38:27.281755406 -0500
+@@ -42,9 +42,9 @@
+ fi
+
+ if [ $njs_found = no ]; then
+- njs_feature="QuickJS library -I/usr/include/quickjs/ -L/usr/lib/quickjs/ -lquickjs"
+- njs_feature_incs="$NJS_QUICKJS_DEFAULT_INCS /usr/include/quickjs/"
+- njs_feature_libs="-L/usr/lib/quickjs/ -lquickjs -lm -ldl -lpthread"
++ njs_feature="QuickJS library -I/usr/pkg/include/quickjs -L/usr/pkg/lib -lquickjs"
++ njs_feature_incs="$NJS_QUICKJS_DEFAULT_INCS /usr/include/quickjs"
++ njs_feature_libs="-L/usr/pkg/lib -lquickjs -lm -ldl -lpthread"
+
+ . auto/feature
+ fi
Home |
Main Index |
Thread Index |
Old Index