kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

www/nginx*: update to the latest stable version - 1.24.0

Browse source 
The new stable version incorporating new features and bug fixes from
the 1.23.x mainline branch, including improved handling of multiple
header lines with identical names, memory usage optimization in
configurations with SSL proxying, better sanity checking of the
listen directive protocol parameters, TLSv1.3 protocol enabled by
default, automatic rotation of TLS session tickets encryption keys
when using shared memory in the ssl_session_cache directive, and more.

Syncronize www/nginx and www/nginx-devel ports, including:
o) merge recent versions of third-party modules from
   www/nginx-devel to www/nginx;
o) syncronize patches between www/nginx and www/nginx-devel;
o) syncronize MESSAGE;
o) remove needless patches;
o) move pcre2 support to the main Makefile, remove `pcre'
   option and devel/pcre support for the both whole ports,
   but keep it for the third-party `lua' module;
o) update naxsi third-party module to its recent commit.
This commit is contained in:
osa 2023-04-18 18:41:59 +00:00
parent 0fa21fedde
commit 78331e3f0d
12 changed files with 106 additions and 160 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
www/nginx-devel/MESSAGE
View file

@ -1,9 +1,9 @@
===========================================================================
$NetBSD: MESSAGE,v 1.1 2013/02/22 17:06:54 imil Exp $
$NetBSD: MESSAGE,v 1.2 2023/04/18 18:42:00 osa Exp $
Consider adding something like following lines to /etc/newsyslog.conf:
${NGINX_LOGDIR}/access.log ${NGINX_USER}:${NGINX_GROUP} 640 7 * 24 Z ${NGINX_PIDDIR}/nginx.pid SIGUSR1
${NGINX_LOGDIR}/error.log ${NGINX_USER}:${NGINX_GROUP} 640 7 * 24 Z ${NGINX_PIDDIR}/nginx.pid SIGUSR1
${NGINX_LOGDIR}/access.log ${NGINX_USER}:${NGINX_GROUP} 640 7 * 24 ZB ${NGINX_PIDDIR}/nginx.pid SIGUSR1
${NGINX_LOGDIR}/error.log ${NGINX_USER}:${NGINX_GROUP} 640 7 * 24 ZB ${NGINX_PIDDIR}/nginx.pid SIGUSR1
===========================================================================

18
www/nginx-devel/Makefile
View file

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.99 2023/04/13 16:45:47 osa Exp $
# $NetBSD: Makefile,v 1.100 2023/04/18 18:42:00 osa Exp $
DISTNAME= nginx-1.23.4
PKGREVISION= 1
DISTNAME= nginx-1.24.0
PKGNAME= ${DISTNAME:S/-/-devel-/1}
CATEGORIES= www
MASTER_SITES= https://nginx.org/download/
@ -49,6 +48,13 @@ CONFIGURE_ARGS+= --http-client-body-temp-path=${NGINX_DATADIR}/client_body_temp
CONFIGURE_ARGS+= --http-proxy-temp-path=${NGINX_DATADIR}/proxy_temp
CONFIGURE_ARGS+= --http-fastcgi-temp-path=${NGINX_DATADIR}/fstcgi_temp
CONFIGURE_ARGS+= --http-scgi-temp-path=${NGINX_DATADIR}/scgi_temp
CONFIGURE_ARGS+= --with-pcre
SUBST_CLASSES+= fix-pcre2
SUBST_STAGE.fix-pcre2= pre-configure
SUBST_FILES.fix-pcre2= auto/lib/pcre/conf
SUBST_SED.fix-pcre2= -e 's,/usr/pkg,${BUILDLINK_PREFIX.pcre2},g'
SUBST_NOOP_OK.fix-pcre2=yes
PKG_SYSCONFSUBDIR= nginx
@ -96,11 +102,6 @@ SOEXT= so
.endif
PLIST_SUBST+= SOEXT=${SOEXT}
post-patch:
.if !empty(PKG_OPTIONS:Mnaxsi)
(cd ${WRKSRC}/ && patch <${PATCHDIR}/extra-patch-naxsi_runtime.c)
.endif
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/objs/nginx ${DESTDIR}${PREFIX}/sbin/nginx
.for file in ${EGFILES}
@ -125,5 +126,6 @@ do-install:
-exec ${INSTALL_PROGRAM} {} ${DESTDIR}${PREFIX}/libexec/nginx \;)
.endif
.include "../../devel/pcre2/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

17
www/nginx-devel/distinfo
View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.90 2023/04/13 16:45:47 osa Exp $
$NetBSD: distinfo,v 1.91 2023/04/18 18:42:00 osa Exp $
BLAKE2s (array-var-nginx-module-0.06.tar.gz) = fa6ad2a2ce3c3eba3f69287b224e9c01fcaca29a083394ab74f2f655d3e2138b
SHA512 (array-var-nginx-module-0.06.tar.gz) = bc72158856a1be18a26ee04c6b5b0f0a20bcce688610a493bf31e2a133e7eb12e11f7c18197a09a72b1513f6a08348ee5281b9d5b84cf43603539040ebd23c26
@ -18,15 +18,15 @@ Size (headers-more-nginx-module-0.34.tar.gz) = 28827 bytes
BLAKE2s (lua-nginx-module-0.10.24.tar.gz) = 9523e4b9ba5fec4ce7919ea6a65d561fc4094bddf83186827cf46a063d1ade8f
SHA512 (lua-nginx-module-0.10.24.tar.gz) = 1959ef30d616f957847484c0bc32cc072206fbb8cf4da84a52529eb9bbd270f53a1b718716cb410aff2e0cae5d1833bc74bed80257c36ae82ba7caf872665c9d
Size (lua-nginx-module-0.10.24.tar.gz) = 724961 bytes
BLAKE2s (nbs-system-naxsi-29793dc_GH.tar.gz) = 561b875a1d01bef80a45580268a56f90ef7dfd74acfa01a7ab1ab667486e4abb
SHA512 (nbs-system-naxsi-29793dc_GH.tar.gz) = 8c943daa14ee9a0d308bf6425e28123860bdd5db269ad0e481126915538fa3fcdf6607e1692b7819c9eec4a1206ec19060f5b85ee11d93e713f60a8870fc5d26
Size (nbs-system-naxsi-29793dc_GH.tar.gz) = 236932 bytes
BLAKE2s (nbs-system-naxsi-d714f16_GH.tar.gz) = ca56821b8bfac03429fc8adaf30302ac70c31b48b865918139ecdacb24eb4156
SHA512 (nbs-system-naxsi-d714f16_GH.tar.gz) = 84abd90f3971450b9413546809332e263c4332b625a0b51f8b342adb407e1e5bc81a2b0b75e2d50e87d63d20d0c3f271391c9d4821f0d01069a133b066bfb05b
Size (nbs-system-naxsi-d714f16_GH.tar.gz) = 236940 bytes
BLAKE2s (nchan-1.3.0.tar.gz) = fd45ccebd86c9808522dabefb8c202747f428ed04b46225282f344fbfd52f0b2
SHA512 (nchan-1.3.0.tar.gz) = c8cd3eb0b06fc0f17b5a9013d32f5a6d5a8252015b3ac27fbf74a7a1b97bc7ae78c5c8cdd7372e36f5f9d137b59635f007d836746282c85c4a972b6984ba2bef
Size (nchan-1.3.0.tar.gz) = 745161 bytes
BLAKE2s (nginx-1.23.4.tar.gz) = bf30f7ee181033f19fdd3b7198e7d50378e1b37977d70088d91fa043a467376d
SHA512 (nginx-1.23.4.tar.gz) = 542a53cae32bf5c7d4d09a4940793e603e0b3c7a8a4ca2bcec84e64bc298fcf0e58297338d1ae0cd28889c4a3e359f3f48532b0addaf7d223f796ed81c3054e8
Size (nginx-1.23.4.tar.gz) = 1112403 bytes
BLAKE2s (nginx-1.24.0.tar.gz) = 05ecd7f1710da91508b7bc0db8632b1347f6f1b87aecf7633e76e8f65f95569a
SHA512 (nginx-1.24.0.tar.gz) = 1114e37de5664a8109c99cfb2faa1f42ff8ac63c932bcf3780d645e5ed32c0b2ac446f80305b4465994c8f9430604968e176ae464fd80f632d1cb2c8f6007ff3
Size (nginx-1.24.0.tar.gz) = 1112471 bytes
BLAKE2s (nginx-dav-ext-module-3.0.0.tar.gz) = 8e823ffd605d4fca00eb3ca92a0954ca35fb178397e0b990fea7d47580ee582f
SHA512 (nginx-dav-ext-module-3.0.0.tar.gz) = d0193ba90f1ef46c4e470630c4394bdf99d94fd2e3bd8be6cb2ba1655ec59944b1269025f032b79dc2c6dad366e54389ef6a6da2ddeb91d535a4027f2162fbde
Size (nginx-dav-ext-module-3.0.0.tar.gz) = 14558 bytes
@ -51,6 +51,7 @@ Size (njs-0.7.12.tar.gz) = 662554 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
SHA1 (patch-auto_cc_conf) = 5e6a479ba419cd16dedeb3b4c47dc685d126ef6a
SHA1 (patch-auto_install) = 3b3a0f9f4c005b707664554fa57a58c9e3b7de60
SHA1 (patch-conf_nginx.conf) = ee9fbc3838cc006f6e1cddddadf6603f4941d171
SHA1 (patch-conf_nginx.conf) = c87c76604a5aae64f8c039f90f9291e3134f64e0
SHA1 (patch-src_event_modules_ngx__eventport__module.c) = c8e919f48d68bd5bffc4ad11d9c79dc6da3a0de2

38
www/nginx-devel/options.mk
View file

@ -1,4 +1,4 @@
# $NetBSD: options.mk,v 1.17 2023/04/13 16:45:47 osa Exp $
# $NetBSD: options.mk,v 1.18 2023/04/18 18:42:00 osa Exp $
CODELOAD_SITE_GITHUB= https://codeload.github.com/
@ -11,14 +11,11 @@ PKG_SUPPORTED_OPTIONS+= naxsi njs perl push realip rtmp
PKG_SUPPORTED_OPTIONS+= secure-link set-misc slice ssl status
PKG_SUPPORTED_OPTIONS+= stream-ssl-preread sub upload uwsgi
PKG_SUGGESTED_OPTIONS= auth-request gzip http2 memcache pcre realip
PKG_SUGGESTED_OPTIONS= auth-request gzip http2 memcache realip
PKG_SUGGESTED_OPTIONS+= slice status ssl uwsgi
PKG_OPTIONS_LEGACY_OPTS+= v2:http2
PKG_OPTIONS_OPTIONAL_GROUPS= pcre
PKG_OPTIONS_GROUP.pcre= pcre pcre2
PLIST_VARS+= arrayvar cprg dav dso echo encses forminput geoip2
PLIST_VARS+= headmore imagefilter lua mail naxsi nchan ndk njs
PLIST_VARS+= perl rtmp setmisc stream upload uwsgi
@ -38,7 +35,7 @@ _addextmod= add-module
.if !empty(PKG_OPTIONS:Mnaxsi) || make(makesum) || make(mdi) || make(distclean)
NAXSI_GH_ACCOUNT= nbs-system
NAXSI_GH_PROJECT= naxsi
NAXSI_VERSION= 29793dc
NAXSI_VERSION= d714f16
NAXSI_DISTNAME= ${NAXSI_GH_PROJECT}-${NAXSI_VERSION}
NAXSI_DISTFILE= ${NAXSI_GH_ACCOUNT}-${NAXSI_DISTNAME}_GH.tar.gz
SITES.${NAXSI_DISTFILE}= -${CODELOAD_SITE_GITHUB:=${NAXSI_GH_ACCOUNT}/${NAXSI_GH_PROJECT}/tar.gz/${NAXSI_VERSION}?dummy=${NAXSI_DISTFILE}}
@ -63,32 +60,6 @@ SUBST_SED.fix-ssl= -e 's,/usr/pkg,${BUILDLINK_PREFIX.openssl},g'
SUBST_NOOP_OK.fix-ssl= yes
.endif
.if !empty(PKG_OPTIONS:Mpcre)
.include "../../devel/pcre/buildlink3.mk"
CONFIGURE_ARGS+= --with-pcre
CONFIGURE_ARGS+= --without-pcre2
SUBST_CLASSES+= fix-pcre
SUBST_STAGE.fix-pcre= pre-configure
SUBST_FILES.fix-pcre= auto/lib/pcre/conf
SUBST_SED.fix-pcre= -e 's,/usr/pkg,${BUILDLINK_PREFIX.pcre},g'
SUBST_NOOP_OK.fix-pcre= yes
.endif
.if !empty(PKG_OPTIONS:Mpcre2)
.include "../../devel/pcre2/buildlink3.mk"
CONFIGURE_ARGS+= --with-pcre
SUBST_CLASSES+= fix-pcre2
SUBST_STAGE.fix-pcre2= pre-configure
SUBST_FILES.fix-pcre2= auto/lib/pcre/conf
SUBST_SED.fix-pcre2= -e 's,/usr/pkg,${BUILDLINK_PREFIX.pcre2},g'
SUBST_NOOP_OK.fix-pcre2=yes
.endif
.if empty(PKG_OPTIONS:Mpcre) && empty(PKG_OPTIONS:Mpcre2)
CONFIGURE_ARGS+= --without-pcre
CONFIGURE_ARGS+= --without-http_rewrite_module
.endif
.if !empty(PKG_OPTIONS:Mdav) || make(makesum) || make(mdi) || make(distclean)
DAV_VERSION= 3.0.0
DAV_DISTNAME= nginx-dav-ext-module-3.0.0
@ -169,6 +140,7 @@ LUA_DISTNAME= lua-nginx-module-${LUA_VERSION}
LUA_DISTFILE= ${LUA_DISTNAME}.tar.gz
SITES.${LUA_DISTFILE}= -${MASTER_SITE_GITHUB:=openresty/lua-nginx-module/archive/}v${LUA_VERSION}.tar.gz
DISTFILES+= ${LUA_DISTFILE}
.include "../../devel/pcre/buildlink3.mk"
.include "../../lang/LuaJIT2/buildlink3.mk"
DEPENDS+= lua-resty-core>=0.1.26:../../www/lua-resty-core
DEPENDS+= lua-resty-lrucache>=0.13:../../www/lua-resty-lrucache
@ -337,7 +309,7 @@ PLIST.rtmp= yes
NJS_VERSION= 0.7.12
NJS_DISTNAME= njs-${NJS_VERSION}
NJS_DISTFILE= ${NJS_DISTNAME}.tar.gz
NJS_CONFIGURE_ARGS= --no-libxml2 --no-pcre2
NJS_CONFIGURE_ARGS= --no-libxml2
SITES.${NJS_DISTFILE}= -${MASTER_SITE_GITHUB:=nginx/njs/archive/}${NJS_VERSION}.tar.gz
DISTFILES+= ${NJS_DISTFILE}
DSO_EXTMODS+= njs

23
www/nginx-devel/patches/extra-patch-naxsi_runtime.c
View file

@ -1,23 +0,0 @@
--- ../naxsi-29793dc/naxsi_src/naxsi_runtime.c.orig 2022-07-10 18:11:39.685243000 -0400
+++ ../naxsi-29793dc/naxsi_src/naxsi_runtime.c 2022-07-10 18:14:53.935554000 -0400
@@ -9,6 +9,11 @@
#include "naxsi_macros.h"
#include "naxsi_net.h"
+#if (NGX_PCRE2)
+#include <pcre2.h>
+#else
+#include <pcre.h>
+#endif
/* used to store locations during the configuration time.
then, accessed by the hashtable building feature during "init" time. */
@@ -181,7 +186,7 @@
unsigned char*
ngx_utf8_check(ngx_str_t* str);
-#if defined nginx_version && (nginx_version >= 1021005)
+#if (NGX_PCRE2)
/*
* variables to use pcre2
*/

15
www/nginx-devel/patches/patch-auto_cc_conf Normal file
View file

@ -0,0 +1,15 @@
$NetBSD: patch-auto_cc_conf,v 1.1 2023/04/18 18:42:00 osa Exp $
Add support for LDFLAGS
--- auto/cc/conf.orig 2017-07-11 13:24:06.000000000 +0000
+++ auto/cc/conf
@@ -3,7 +3,7 @@
# Copyright (C) Nginx, Inc.
-LINK="\$(CC)"
+LINK="\$(CC) \$(LDFLAGS)"
MAIN_LINK=
MODULE_LINK="-shared"

26
www/nginx-devel/patches/patch-conf_nginx.conf
View file

@ -1,10 +1,6 @@
$NetBSD: patch-conf_nginx.conf,v 1.1 2013/12/05 15:04:06 imil Exp $
This patch provides config file adapted to pkgsrc settings.
--- conf/nginx.conf.orig 2013-11-19 10:03:47.000000000 +0000
--- conf/nginx.conf.orig 2014-04-24 12:52:24.000000000 +0000
+++ conf/nginx.conf
@@ -1,28 +1,23 @@
@@ -1,28 +1,29 @@
-#user nobody;
+user %%NGINX_USER%% %%NGINX_GROUP%%;
@ -15,8 +11,12 @@ This patch provides config file adapted to pkgsrc settings.
-#error_log logs/error.log info;
-
-#pid logs/nginx.pid;
-
-
+#error_log %%NGINX_LOGDIR%%/error.log;
+#error_log %%NGINX_LOGDIR%%/error.log notice;
+#error_log %%NGINX_LOGDIR%%/error.log info;
+#pid %%NGINX_PIDDIR%%/nginx.pid;
events {
+ # After increasing this value You probably should increase limit
+ # of file descriptors (for example in start_precmd in startup script)
@ -38,7 +38,7 @@ This patch provides config file adapted to pkgsrc settings.
sendfile on;
#tcp_nopush on;
@@ -38,10 +33,10 @@ http {
@@ -38,10 +39,10 @@ http {
#charset koi8-r;
@ -51,7 +51,7 @@ This patch provides config file adapted to pkgsrc settings.
index index.html index.htm;
}
@@ -51,7 +46,7 @@ http {
@@ -51,7 +52,7 @@ http {
#
error_page 500 502 503 504 /50x.html;
location = /50x.html {
@ -60,7 +60,7 @@ This patch provides config file adapted to pkgsrc settings.
}
# proxy the PHP scripts to Apache listening on 127.0.0.1:80
@@ -67,7 +62,7 @@ http {
@@ -67,7 +68,7 @@ http {
# fastcgi_pass 127.0.0.1:9000;
# fastcgi_index index.php;
# fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name;
@ -69,7 +69,7 @@ This patch provides config file adapted to pkgsrc settings.
#}
# deny access to .htaccess files, if Apache's document root
@@ -87,7 +82,7 @@ http {
@@ -87,7 +88,7 @@ http {
# server_name somename alias another.alias;
# location / {
@ -78,7 +78,7 @@ This patch provides config file adapted to pkgsrc settings.
# index index.html index.htm;
# }
#}
@@ -109,7 +104,7 @@ http {
@@ -109,7 +110,7 @@ http {
# ssl_prefer_server_ciphers on;
# location / {

15
www/nginx/Makefile
View file

@ -1,9 +1,8 @@
# $NetBSD: Makefile,v 1.132 2023/04/13 16:45:47 osa Exp $
# $NetBSD: Makefile,v 1.133 2023/04/18 18:41:59 osa Exp $
DISTNAME= nginx-1.22.1
PKGREVISION= 7
DISTNAME= nginx-1.24.0
CATEGORIES= www
MASTER_SITES= http://nginx.org/download/
MASTER_SITES= https://nginx.org/download/
DISTFILES= ${DEFAULT_DISTFILES}
MAINTAINER= osa@NetBSD.org
@ -48,6 +47,13 @@ CONFIGURE_ARGS+= --http-client-body-temp-path=${NGINX_DATADIR}/client_body_temp
CONFIGURE_ARGS+= --http-proxy-temp-path=${NGINX_DATADIR}/proxy_temp
CONFIGURE_ARGS+= --http-fastcgi-temp-path=${NGINX_DATADIR}/fstcgi_temp
CONFIGURE_ARGS+= --http-scgi-temp-path=${NGINX_DATADIR}/scgi_temp
CONFIGURE_ARGS+= --with-pcre
SUBST_CLASSES+= fix-pcre2
SUBST_STAGE.fix-pcre2= pre-configure
SUBST_FILES.fix-pcre2= auto/lib/pcre/conf
SUBST_SED.fix-pcre2= -e 's,/usr/pkg,${BUILDLINK_PREFIX.pcre2},g'
SUBST_NOOP_OK.fix-pcre2=yes
PKG_SYSCONFSUBDIR= nginx
@ -119,5 +125,6 @@ do-install:
-exec ${INSTALL_PROGRAM} {} ${DESTDIR}${PREFIX}/libexec/nginx \;)
.endif
.include "../../devel/pcre2/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

42
www/nginx/distinfo
View file

@ -1,32 +1,32 @@
$NetBSD: distinfo,v 1.105 2023/04/13 16:45:47 osa Exp $
$NetBSD: distinfo,v 1.106 2023/04/18 18:41:59 osa Exp $
BLAKE2s (array-var-nginx-module-0.05.tar.gz) = 2f9af1e0eb209b7c20aa58cd8ec2afb1eb1cc122c5f4ea169e34131c463c1c26
SHA512 (array-var-nginx-module-0.05.tar.gz) = 7c9fa9b76bc7cd2473ceae6d5ffb8de26993be9293ea967908d6c4550e086affa7016df4c936fb0b79f1142dc0aa1a5f2058d417e6433b5a3497a45d7e866e84
Size (array-var-nginx-module-0.05.tar.gz) = 11280 bytes
BLAKE2s (echo-nginx-module-0.62.tar.gz) = 8dc4bfc7e905f35b12cd432dca98067b03fd6f2cffd36ffe93158738ab5d32dc
SHA512 (echo-nginx-module-0.62.tar.gz) = 240896b1c559a71ca6ca87136d8535edd25b1d65ebb80d46080ad41c09ed1cec9737828f9efe260782294d660cea66cf402f4e75bba3fed26f3a94de0ae2f89b
Size (echo-nginx-module-0.62.tar.gz) = 53329 bytes
BLAKE2s (array-var-nginx-module-0.06.tar.gz) = fa6ad2a2ce3c3eba3f69287b224e9c01fcaca29a083394ab74f2f655d3e2138b
SHA512 (array-var-nginx-module-0.06.tar.gz) = bc72158856a1be18a26ee04c6b5b0f0a20bcce688610a493bf31e2a133e7eb12e11f7c18197a09a72b1513f6a08348ee5281b9d5b84cf43603539040ebd23c26
Size (array-var-nginx-module-0.06.tar.gz) = 12005 bytes
BLAKE2s (echo-nginx-module-0.63.tar.gz) = 851331998dffdd3dfa9873c2cce5ae81bf7522047c6066fe805b5c74abb62a08
SHA512 (echo-nginx-module-0.63.tar.gz) = c325ac4e3f3f735739e156d8c7ada503b34475c62533b4830231ff1b42c25cb0c841aae06b3448b589c2ab35da8d211436ed194d6fd062cad925af8152c5e789
Size (echo-nginx-module-0.63.tar.gz) = 53421 bytes
BLAKE2s (encrypted-session-nginx-module-0.09.tar.gz) = 696be087d7aa0144d212f2753423489677e78ba3bb97dbfeb30cadbe08cd7b0a
SHA512 (encrypted-session-nginx-module-0.09.tar.gz) = 399ce2690e85ee27802e8031954a1a3aa3fdc9246e17323a72a298d235931a8dbebdcb121ac8788e074872df0ef5b5a8a3d512b17fbe860b38f696ce42de3655
Size (encrypted-session-nginx-module-0.09.tar.gz) = 11847 bytes
BLAKE2s (form-input-nginx-module-0.12.tar.gz) = b08fc95c3e15bfdc0846e2d1e8157171954f353bd301f4ac4aca56113620e91d
SHA512 (form-input-nginx-module-0.12.tar.gz) = 1c5c5ab74156cac09da44a2dcdd84f7c03c9919a23a847e63613e00e3781ecd73d5ad12446174b4fdef9d064257a31570a8dbcccc00d8266f7048e3dcde0362e
Size (form-input-nginx-module-0.12.tar.gz) = 11090 bytes
BLAKE2s (headers-more-nginx-module-0.33.tar.gz) = f5eeb6e12026236b9d4ab78866e33d5a81ed5f86344641407ce3a4f8b3310afd
SHA512 (headers-more-nginx-module-0.33.tar.gz) = 13165b1b8d4be281b8bd2404fa48d456013d560bace094c81da08a35dc6a4f025a809a3ae3a42be6bbf67abbcbe41e0730aba06f905220f3baeb01e1192a7d37
Size (headers-more-nginx-module-0.33.tar.gz) = 28130 bytes
BLAKE2s (lua-nginx-module-0.10.22.tar.gz) = 745f552a68bdccc5a3ea869970ebaad7dcf7c850b41124233871ea2168d58761
SHA512 (lua-nginx-module-0.10.22.tar.gz) = 03e2504e8bc80efaf4af819ed9345285ca42ceecc647eda225e3be3b1e3617435f3949aa8034341955d8cce4826af9d1a8615b914109834f6b6b20e78be35ef9
Size (lua-nginx-module-0.10.22.tar.gz) = 690975 bytes
BLAKE2s (naxsi-1.3.tar.gz) = d3c819d8fbd2a896c56138f028b92fa4b26a51168ff24334f76e3d1d07626927
SHA512 (naxsi-1.3.tar.gz) = d7aac69b5eceeb1b0db4741201159ade1e0e7f6f7c3e8c4afa2f8959c6c00c3b5285d5185747c2fb0b1400efda02e96799836315e7e492bb4a059b14acb2142d
Size (naxsi-1.3.tar.gz) = 235626 bytes
BLAKE2s (headers-more-nginx-module-0.34.tar.gz) = 3456270e8df3c2a16fefbc3f57aa085415b5e0614e8ffff418adc5dc12d3cc99
SHA512 (headers-more-nginx-module-0.34.tar.gz) = 2c0c140feeb29f0154a223dc3020ff956f894d63e0232a7bc0ca33fcb26f8b807bda868159ae30b6cac7456ec25b831c3d299ea18e234202ae5d14c1ff471a4b
Size (headers-more-nginx-module-0.34.tar.gz) = 28827 bytes
BLAKE2s (lua-nginx-module-0.10.24.tar.gz) = 9523e4b9ba5fec4ce7919ea6a65d561fc4094bddf83186827cf46a063d1ade8f
SHA512 (lua-nginx-module-0.10.24.tar.gz) = 1959ef30d616f957847484c0bc32cc072206fbb8cf4da84a52529eb9bbd270f53a1b718716cb410aff2e0cae5d1833bc74bed80257c36ae82ba7caf872665c9d
Size (lua-nginx-module-0.10.24.tar.gz) = 724961 bytes
BLAKE2s (nbs-system-naxsi-d714f16_GH.tar.gz) = ca56821b8bfac03429fc8adaf30302ac70c31b48b865918139ecdacb24eb4156
SHA512 (nbs-system-naxsi-d714f16_GH.tar.gz) = 84abd90f3971450b9413546809332e263c4332b625a0b51f8b342adb407e1e5bc81a2b0b75e2d50e87d63d20d0c3f271391c9d4821f0d01069a133b066bfb05b
Size (nbs-system-naxsi-d714f16_GH.tar.gz) = 236940 bytes
BLAKE2s (nchan-1.3.0.tar.gz) = fd45ccebd86c9808522dabefb8c202747f428ed04b46225282f344fbfd52f0b2
SHA512 (nchan-1.3.0.tar.gz) = c8cd3eb0b06fc0f17b5a9013d32f5a6d5a8252015b3ac27fbf74a7a1b97bc7ae78c5c8cdd7372e36f5f9d137b59635f007d836746282c85c4a972b6984ba2bef
Size (nchan-1.3.0.tar.gz) = 745161 bytes
BLAKE2s (nginx-1.22.1.tar.gz) = aada12ce0d9f0b9bf5b1ef0c814855a5cf7199061fa6f9f288eb667cde77ca82
SHA512 (nginx-1.22.1.tar.gz) = 1d468dcfa9bbd348b8a5dc514ac1428a789e73a92384c039b73a51ce376785f74bf942872c5594a9fcda6bbf44758bd727ce15ac2395f1aa989c507014647dcc
Size (nginx-1.22.1.tar.gz) = 1073948 bytes
BLAKE2s (nginx-1.24.0.tar.gz) = 05ecd7f1710da91508b7bc0db8632b1347f6f1b87aecf7633e76e8f65f95569a
SHA512 (nginx-1.24.0.tar.gz) = 1114e37de5664a8109c99cfb2faa1f42ff8ac63c932bcf3780d645e5ed32c0b2ac446f80305b4465994c8f9430604968e176ae464fd80f632d1cb2c8f6007ff3
Size (nginx-1.24.0.tar.gz) = 1112471 bytes
BLAKE2s (nginx-dav-ext-module-3.0.0.tar.gz) = 8e823ffd605d4fca00eb3ca92a0954ca35fb178397e0b990fea7d47580ee582f
SHA512 (nginx-dav-ext-module-3.0.0.tar.gz) = d0193ba90f1ef46c4e470630c4394bdf99d94fd2e3bd8be6cb2ba1655ec59944b1269025f032b79dc2c6dad366e54389ef6a6da2ddeb91d535a4027f2162fbde
Size (nginx-dav-ext-module-3.0.0.tar.gz) = 14558 bytes
@ -51,7 +51,7 @@ Size (njs-0.7.12.tar.gz) = 662554 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
SHA1 (patch-aa) = 47f0c19b47b115f00ea6e9432d5bb12058c3bc1c
SHA1 (patch-ab) = 7d126a4372aa8575ef01a4bfd9aec9898861c763
SHA1 (patch-auto_cc_conf) = 5e6a479ba419cd16dedeb3b4c47dc685d126ef6a
SHA1 (patch-auto_install) = 3b3a0f9f4c005b707664554fa57a58c9e3b7de60
SHA1 (patch-conf_nginx.conf) = c87c76604a5aae64f8c039f90f9291e3134f64e0
SHA1 (patch-src_event_modules_ngx__eventport__module.c) = c8e919f48d68bd5bffc4ad11d9c79dc6da3a0de2

56
www/nginx/options.mk
View file

@ -1,4 +1,6 @@
# $NetBSD: options.mk,v 1.90 2023/04/13 16:45:47 osa Exp $
# $NetBSD: options.mk,v 1.91 2023/04/18 18:41:59 osa Exp $
CODELOAD_SITE_GITHUB= https://codeload.github.com/
PKG_OPTIONS_VAR= PKG_OPTIONS.nginx
PKG_SUPPORTED_OPTIONS= array-var auth-request cache-purge dav debug
@ -9,14 +11,11 @@ PKG_SUPPORTED_OPTIONS+= naxsi njs perl push realip rtmp
PKG_SUPPORTED_OPTIONS+= secure-link set-misc slice ssl status
PKG_SUPPORTED_OPTIONS+= stream-ssl-preread sub upload uwsgi
PKG_SUGGESTED_OPTIONS= auth-request gzip http2 memcache pcre realip
PKG_SUGGESTED_OPTIONS= auth-request gzip http2 memcache realip
PKG_SUGGESTED_OPTIONS+= slice status ssl uwsgi
PKG_OPTIONS_LEGACY_OPTS+= v2:http2
PKG_OPTIONS_OPTIONAL_GROUPS= pcre
PKG_OPTIONS_GROUP.pcre= pcre pcre2
PLIST_VARS+= arrayvar cprg dav dso echo encses forminput geoip2
PLIST_VARS+= headmore imagefilter lua mail naxsi nchan ndk njs
PLIST_VARS+= perl rtmp setmisc stream upload uwsgi
@ -34,10 +33,12 @@ _addextmod= add-module
# documentation says naxsi must be the first module
.if !empty(PKG_OPTIONS:Mnaxsi) || make(makesum) || make(mdi) || make(distclean)
NAXSI_VERSION= 1.3
NAXSI_DISTNAME= naxsi-${NAXSI_VERSION}
NAXSI_DISTFILE= ${NAXSI_DISTNAME}.tar.gz
SITES.${NAXSI_DISTFILE}= -${MASTER_SITE_GITHUB:=nbs-system/naxsi/archive/}${NAXSI_VERSION}.tar.gz
NAXSI_GH_ACCOUNT= nbs-system
NAXSI_GH_PROJECT= naxsi
NAXSI_VERSION= d714f16
NAXSI_DISTNAME= ${NAXSI_GH_PROJECT}-${NAXSI_VERSION}
NAXSI_DISTFILE= ${NAXSI_GH_ACCOUNT}-${NAXSI_DISTNAME}_GH.tar.gz
SITES.${NAXSI_DISTFILE}= -${CODELOAD_SITE_GITHUB:=${NAXSI_GH_ACCOUNT}/${NAXSI_GH_PROJECT}/tar.gz/${NAXSI_VERSION}?dummy=${NAXSI_DISTFILE}}
DISTFILES+= ${NAXSI_DISTFILE}
PLIST.naxsi= yes
DSO_EXTMODS+= naxsi
@ -59,32 +60,6 @@ SUBST_SED.fix-ssl= -e 's,/usr/pkg,${BUILDLINK_PREFIX.openssl},g'
SUBST_NOOP_OK.fix-ssl= yes
.endif
.if !empty(PKG_OPTIONS:Mpcre)
.include "../../devel/pcre/buildlink3.mk"
CONFIGURE_ARGS+= --with-pcre
CONFIGURE_ARGS+= --without-pcre2
SUBST_CLASSES+= fix-pcre
SUBST_STAGE.fix-pcre= pre-configure
SUBST_FILES.fix-pcre= auto/lib/pcre/conf
SUBST_SED.fix-pcre= -e 's,/usr/pkg,${BUILDLINK_PREFIX.pcre},g'
SUBST_NOOP_OK.fix-pcre= yes
.endif
.if !empty(PKG_OPTIONS:Mpcre2)
.include "../../devel/pcre2/buildlink3.mk"
CONFIGURE_ARGS+= --with-pcre
SUBST_CLASSES+= fix-pcre2
SUBST_STAGE.fix-pcre2= pre-configure
SUBST_FILES.fix-pcre2= auto/lib/pcre/conf
SUBST_SED.fix-pcre2= -e 's,/usr/pkg,${BUILDLINK_PREFIX.pcre2},g'
SUBST_NOOP_OK.fix-pcre2=yes
.endif
.if empty(PKG_OPTIONS:Mpcre) && empty(PKG_OPTIONS:Mpcre2)
CONFIGURE_ARGS+= --without-pcre
CONFIGURE_ARGS+= --without-http_rewrite_module
.endif
.if !empty(PKG_OPTIONS:Mdav) || make(makesum) || make(mdi) || make(distclean)
DAV_VERSION= 3.0.0
DAV_DISTNAME= nginx-dav-ext-module-3.0.0
@ -160,11 +135,12 @@ DISTFILES+= ${NDK_DISTFILE}
.endif
.if !empty(PKG_OPTIONS:Mluajit) || make(makesum) || make(mdi) || make(distclean)
LUA_VERSION= 0.10.22
LUA_VERSION= 0.10.24
LUA_DISTNAME= lua-nginx-module-${LUA_VERSION}
LUA_DISTFILE= ${LUA_DISTNAME}.tar.gz
SITES.${LUA_DISTFILE}= -${MASTER_SITE_GITHUB:=openresty/lua-nginx-module/archive/}v${LUA_VERSION}.tar.gz
DISTFILES+= ${LUA_DISTFILE}
.include "../../devel/pcre/buildlink3.mk"
.include "../../lang/LuaJIT2/buildlink3.mk"
DEPENDS+= lua-resty-core>=0.1.26:../../www/lua-resty-core
DEPENDS+= lua-resty-lrucache>=0.13:../../www/lua-resty-lrucache
@ -175,7 +151,7 @@ PLIST.lua= yes
.endif
.if !empty(PKG_OPTIONS:Mecho) || make(makesum) || make(mdi) || make(distclean)
ECHOMOD_VERSION= 0.62
ECHOMOD_VERSION= 0.63
ECHOMOD_DISTNAME= echo-nginx-module-${ECHOMOD_VERSION}
ECHOMOD_DISTFILE= ${ECHOMOD_DISTNAME}.tar.gz
SITES.${ECHOMOD_DISTFILE}= -${MASTER_SITE_GITHUB:=openresty/echo-nginx-module/archive/}v${ECHOMOD_VERSION}.tar.gz
@ -206,7 +182,7 @@ PLIST.geoip2= yes
.endif
.if !empty(PKG_OPTIONS:Marray-var) || make(makesum) || make(mdi) || make(distclean)
ARRAYVAR_VERSION= 0.05
ARRAYVAR_VERSION= 0.06
ARRAYVAR_DISTNAME= array-var-nginx-module-${ARRAYVAR_VERSION}
ARRAYVAR_DISTFILE= ${ARRAYVAR_DISTNAME}.tar.gz
SITES.${ARRAYVAR_DISTFILE}= -${MASTER_SITE_GITHUB:=openresty/array-var-nginx-module/archive/}v${ARRAYVAR_VERSION}.tar.gz
@ -236,7 +212,7 @@ PLIST.forminput= yes
.endif
.if !empty(PKG_OPTIONS:Mheaders-more) || make(makesum) || make(mdi) || make(distclean)
HEADMORE_VERSION= 0.33
HEADMORE_VERSION= 0.34
HEADMORE_DISTNAME= headers-more-nginx-module-${HEADMORE_VERSION}
HEADMORE_DISTFILE= ${HEADMORE_DISTNAME}.tar.gz
SITES.${HEADMORE_DISTFILE}= -${MASTER_SITE_GITHUB:=openresty/headers-more-nginx-module/archive/}v${HEADMORE_VERSION}.tar.gz
@ -333,7 +309,7 @@ PLIST.rtmp= yes
NJS_VERSION= 0.7.12
NJS_DISTNAME= njs-${NJS_VERSION}
NJS_DISTFILE= ${NJS_DISTNAME}.tar.gz
NJS_CONFIGURE_ARGS= --no-libxml2 --no-pcre2
NJS_CONFIGURE_ARGS= --no-libxml2
SITES.${NJS_DISTFILE}= -${MASTER_SITE_GITHUB:=nginx/njs/archive/}${NJS_VERSION}.tar.gz
DISTFILES+= ${NJS_DISTFILE}
DSO_EXTMODS+= njs

6
www/nginx/patches/patch-ab → www/nginx/patches/patch-auto_install
View file

@ -1,8 +1,8 @@
$NetBSD: patch-ab,v 1.3 2016/06/15 14:49:11 fhajny Exp $
$NetBSD: patch-auto_install,v 1.1 2023/04/18 18:41:59 osa Exp $
Workaround for /bin/sh bug on NetBSD
Do not create PID directory.
--- auto/install.orig 2016-05-31 13:47:01.000000000 +0000
--- auto/install.orig 2016-05-31 13:43:50.000000000 +0000
+++ auto/install
@@ -148,9 +148,6 @@ install: build $NGX_INSTALL_PERL_MODULES
|| cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PATH'

4
www/nginx/patches/patch-aa → www/nginx/patches/patch-conf_nginx.conf
View file

@ -1,7 +1,3 @@
$NetBSD: patch-aa,v 1.4 2014/04/27 11:05:45 rodent Exp $
This patch provides config file adapted to pkgsrc settings.
--- conf/nginx.conf.orig 2014-04-24 12:52:24.000000000 +0000
+++ conf/nginx.conf
@@ -1,28 +1,29 @@