Hi,
here's an update to latest nginx
stable: https://nginx.org/en/CHANGES-1.18
updated the authldap module git checkout while here, tried updating the
lua module but 0.11.15 failed to properly detect luajit (or something)
so i've left that bit aside for now.
runs fine here in light testing, more feedback/testing of course
welcome.
Landry
? nginx-1.18.0.diff
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/nginx/Makefile,v
retrieving revision 1.142
diff -u -r1.142 Makefile
--- Makefile 12 Feb 2020 14:34:05 -0000 1.142
+++ Makefile 20 May 2020 07:32:15 -0000
@@ -16,12 +16,10 @@
COMMENT-passenger= nginx passenger (ruby/python/nodejs) integration module
COMMENT-rtmp= nginx module for RTMP streaming
-VERSION= 1.16.1
+VERSION= 1.18.0
DISTNAME= nginx-${VERSION}
CATEGORIES= www
-REVISION= 1
-REVISION-rtmp= 2
VERSION-rtmp= 1.2.1
PKGNAME-main= ${DISTNAME}
@@ -50,7 +48,7 @@
openresty headers-more-nginx-module v0.33 \
openresty lua-nginx-module v0.10.11 \
nbs-system naxsi 0.55.3 \
- kvspb nginx-auth-ldap
42d195d7a7575ebab1c369ad3fc5d78dc2c2669c \
+ kvspb nginx-auth-ldap
83c059b73566c2ee9cbda920d91b66657cf120b7 \
arut nginx-rtmp-module v${VERSION-rtmp} \
simpl ngx_devel_kit v0.3.0 \
leev ngx_http_geoip2_module 3.3
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/nginx/distinfo,v
retrieving revision 1.73
diff -u -r1.73 distinfo
--- distinfo 6 Nov 2019 13:05:49 -0000 1.73
+++ distinfo 20 May 2020 07:32:15 -0000
@@ -2,8 +2,8 @@
SHA256 (lua-nginx-module-v0.10.11.tar.gz) =
wPuR/P0cbn3sNMpkgm74H/66/e9hdNJURnY284BWZiY=
SHA256 (naxsi-0.55.3.tar.gz) = CzyV0lB3Lcia2LSeR8HgJMWuLHbAz/pEXp/gXE3RNJU=
SHA256 (nginx-1.16.1-chroot.patch) =
ohNkspocgL7QnBX7q8Kgv2lgrN0ndgLKd0v5nSCLQRU=
-SHA256 (nginx-1.16.1.tar.gz) = 8RwqbdHTUVc28DJIV5V9st6YvoYkYbWlQqOsYYjb4ys=
-SHA256 (nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz) =
gNbM6amHfVHewvhaEc580l7b0tYFwovChofsxWlSKe4=
+SHA256 (nginx-1.18.0.tar.gz) = TDc+erW/kdNKTxGgyUllYQYbpe7mAg2ycqF6cijTX5k=
+SHA256 (nginx-auth-ldap-83c059b73566c2ee9cbda920d91b66657cf120b7.tar.gz) =
aQxOW9sq4ZsP7nXNNW0YATRo20cmFrYJeloLvjRshGQ=
SHA256 (nginx-rtmp-module-v1.2.1.tar.gz) =
h6pZdACwtaBSdO4tI9jLgiThJoYiegq+MdeDs6ZF6jc=
SHA256 (ngx_devel_kit-v0.3.0.tar.gz) =
iOBamainQZBm9a51lm+x78QJutRSLRSYbaB0VUrmFhk=
SHA256 (ngx_http_geoip2_module-3.3.tar.gz) =
QTeEOMgz4xOhiGnQxKcnBLSDXDCsr3/WgBOrZzL/eKc=
@@ -11,8 +11,8 @@
SIZE (lua-nginx-module-v0.10.11.tar.gz) = 616653
SIZE (naxsi-0.55.3.tar.gz) = 187416
SIZE (nginx-1.16.1-chroot.patch) = 8220
-SIZE (nginx-1.16.1.tar.gz) = 1032630
-SIZE (nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz) = 18457
+SIZE (nginx-1.18.0.tar.gz) = 1039530
+SIZE (nginx-auth-ldap-83c059b73566c2ee9cbda920d91b66657cf120b7.tar.gz) = 18542
SIZE (nginx-rtmp-module-v1.2.1.tar.gz) = 519919
SIZE (ngx_devel_kit-v0.3.0.tar.gz) = 66455
SIZE (ngx_http_geoip2_module-3.3.tar.gz) = 8509
Index: patches/patch-man_nginx_8
===================================================================
RCS file: /cvs/ports/www/nginx/patches/patch-man_nginx_8,v
retrieving revision 1.4
diff -u -r1.4 patch-man_nginx_8
--- patches/patch-man_nginx_8 19 Jun 2015 05:41:35 -0000 1.4
+++ patches/patch-man_nginx_8 20 May 2020 07:32:15 -0000
@@ -1,10 +1,11 @@
$OpenBSD: patch-man_nginx_8,v 1.4 2015/06/19 05:41:35 robert Exp $
---- man/nginx.8.orig Tue Jun 16 10:49:41 2015
-+++ man/nginx.8 Tue Jun 16 19:38:14 2015
-@@ -91,6 +91,23 @@ referenced in the configuration file.
- Same as
- .Fl t ,
- but additionally dump configuration files to standard output.
+Index: man/nginx.8
+--- man/nginx.8.orig
++++ man/nginx.8
+@@ -92,6 +92,23 @@ Do not run, just test the configuration file.
+ .Nm
+ checks the configuration file syntax and then tries to open files
+ referenced in the configuration file.
+.It Fl u
+By default
+.Nm
Index: patches/patch-nginx-auth-ldap_ngx_http_auth_ldap_module_c
===================================================================
RCS file:
/cvs/ports/www/nginx/patches/patch-nginx-auth-ldap_ngx_http_auth_ldap_module_c,v
retrieving revision 1.1
diff -u -r1.1 patch-nginx-auth-ldap_ngx_http_auth_ldap_module_c
--- patches/patch-nginx-auth-ldap_ngx_http_auth_ldap_module_c 28 Sep 2018
14:36:16 -0000 1.1
+++ patches/patch-nginx-auth-ldap_ngx_http_auth_ldap_module_c 20 May 2020
07:32:15 -0000
@@ -6,7 +6,7 @@
Index: nginx-auth-ldap/ngx_http_auth_ldap_module.c
--- nginx-auth-ldap/ngx_http_auth_ldap_module.c.orig
+++ nginx-auth-ldap/ngx_http_auth_ldap_module.c
-@@ -1333,23 +1333,12 @@ ngx_http_auth_ldap_ssl_handshake_handler(ngx_connectio
+@@ -1337,23 +1337,12 @@ ngx_http_auth_ldap_ssl_handshake_handler(ngx_connectio
char *hostname = c->server->ludpp->lud_host;
addr_verified = X509_check_host(cert, hostname, 0, 0, 0);
Index: pkg/PLIST-geoip2
===================================================================
RCS file: /cvs/ports/www/nginx/pkg/PLIST-geoip2,v
retrieving revision 1.1
diff -u -r1.1 PLIST-geoip2
--- pkg/PLIST-geoip2 6 Nov 2019 13:05:49 -0000 1.1
+++ pkg/PLIST-geoip2 20 May 2020 07:32:15 -0000
@@ -1,3 +1,3 @@
@comment $OpenBSD: PLIST-geoip2,v 1.1 2019/11/06 13:05:49 sthen Exp $
-ngx_http_geoip2_module.so
-ngx_stream_geoip2_module.so
+@so ngx_http_geoip2_module.so
+@so ngx_stream_geoip2_module.so
Index: pkg/PLIST-headers_more
===================================================================
RCS file: /cvs/ports/www/nginx/pkg/PLIST-headers_more,v
retrieving revision 1.1
diff -u -r1.1 PLIST-headers_more
--- pkg/PLIST-headers_more 14 Nov 2017 16:43:09 -0000 1.1
+++ pkg/PLIST-headers_more 20 May 2020 07:32:15 -0000
@@ -1,2 +1,2 @@
@comment $OpenBSD: PLIST-headers_more,v 1.1 2017/11/14 16:43:09 jeremy Exp $
-ngx_http_headers_more_filter_module.so
+@so ngx_http_headers_more_filter_module.so
Index: pkg/PLIST-image_filter
===================================================================
RCS file: /cvs/ports/www/nginx/pkg/PLIST-image_filter,v
retrieving revision 1.1
diff -u -r1.1 PLIST-image_filter
--- pkg/PLIST-image_filter 4 Nov 2016 22:13:43 -0000 1.1
+++ pkg/PLIST-image_filter 20 May 2020 07:32:15 -0000
@@ -1,2 +1,2 @@
@comment $OpenBSD: PLIST-image_filter,v 1.1 2016/11/04 22:13:43 jeremy Exp $
-ngx_http_image_filter_module.so
+@so ngx_http_image_filter_module.so
Index: pkg/PLIST-ldap_auth
===================================================================
RCS file: /cvs/ports/www/nginx/pkg/PLIST-ldap_auth,v
retrieving revision 1.1
diff -u -r1.1 PLIST-ldap_auth
--- pkg/PLIST-ldap_auth 28 Sep 2018 14:36:17 -0000 1.1
+++ pkg/PLIST-ldap_auth 20 May 2020 07:32:15 -0000
@@ -1,2 +1,2 @@
@comment $OpenBSD: PLIST-ldap_auth,v 1.1 2018/09/28 14:36:17 sthen Exp $
-ngx_http_auth_ldap_module.so
+@so ngx_http_auth_ldap_module.so
Index: pkg/PLIST-lua
===================================================================
RCS file: /cvs/ports/www/nginx/pkg/PLIST-lua,v
retrieving revision 1.1
diff -u -r1.1 PLIST-lua
--- pkg/PLIST-lua 4 Nov 2016 22:13:43 -0000 1.1
+++ pkg/PLIST-lua 20 May 2020 07:32:15 -0000
@@ -1,3 +1,3 @@
@comment $OpenBSD: PLIST-lua,v 1.1 2016/11/04 22:13:43 jeremy Exp $
-ndk_http_module.so
-ngx_http_lua_module.so
+@so ndk_http_module.so
+@so ngx_http_lua_module.so
Index: pkg/PLIST-mailproxy
===================================================================
RCS file: /cvs/ports/www/nginx/pkg/PLIST-mailproxy,v
retrieving revision 1.1
diff -u -r1.1 PLIST-mailproxy
--- pkg/PLIST-mailproxy 4 Nov 2016 22:13:43 -0000 1.1
+++ pkg/PLIST-mailproxy 20 May 2020 07:32:15 -0000
@@ -1,2 +1,2 @@
@comment $OpenBSD: PLIST-mailproxy,v 1.1 2016/11/04 22:13:43 jeremy Exp $
-ngx_mail_module.so
+@so ngx_mail_module.so
Index: pkg/PLIST-naxsi
===================================================================
RCS file: /cvs/ports/www/nginx/pkg/PLIST-naxsi,v
retrieving revision 1.2
diff -u -r1.2 PLIST-naxsi
--- pkg/PLIST-naxsi 25 Apr 2019 14:56:32 -0000 1.2
+++ pkg/PLIST-naxsi 20 May 2020 07:32:15 -0000
@@ -2,4 +2,4 @@
share/nginx/naxsi_core.rules
@sample ${SYSCONFDIR}/nginx/naxsi_core.rules
@cwd ${NGINX_DIR}/modules
-ngx_http_naxsi_module.so
+@so ngx_http_naxsi_module.so
Index: pkg/PLIST-passenger
===================================================================
RCS file: /cvs/ports/www/nginx/pkg/PLIST-passenger,v
retrieving revision 1.1
diff -u -r1.1 PLIST-passenger
--- pkg/PLIST-passenger 4 Nov 2016 22:13:43 -0000 1.1
+++ pkg/PLIST-passenger 20 May 2020 07:32:15 -0000
@@ -1,2 +1,2 @@
@comment $OpenBSD: PLIST-passenger,v 1.1 2016/11/04 22:13:43 jeremy Exp $
-ngx_http_passenger_module.so
+@so ngx_http_passenger_module.so
Index: pkg/PLIST-perl
===================================================================
RCS file: /cvs/ports/www/nginx/pkg/PLIST-perl,v
retrieving revision 1.4
diff -u -r1.4 PLIST-perl
--- pkg/PLIST-perl 25 Apr 2019 14:56:32 -0000 1.4
+++ pkg/PLIST-perl 20 May 2020 07:32:15 -0000
@@ -2,7 +2,7 @@
${P5ARCH}/
${P5ARCH}/auto/
${P5ARCH}/auto/nginx/
-${P5ARCH}/auto/nginx/nginx.so
+@so ${P5ARCH}/auto/nginx/nginx.so
${P5ARCH}/nginx.pm
@cwd ${NGINX_DIR}/modules
-ngx_http_perl_module.so
+@so ngx_http_perl_module.so
Index: pkg/PLIST-rtmp
===================================================================
RCS file: /cvs/ports/www/nginx/pkg/PLIST-rtmp,v
retrieving revision 1.1
diff -u -r1.1 PLIST-rtmp
--- pkg/PLIST-rtmp 25 Aug 2019 12:22:04 -0000 1.1
+++ pkg/PLIST-rtmp 20 May 2020 07:32:15 -0000
@@ -1,2 +1,2 @@
@comment $OpenBSD: PLIST-rtmp,v 1.1 2019/08/25 12:22:04 solene Exp $
-ngx_rtmp_module.so
+@so ngx_rtmp_module.so
Index: pkg/PLIST-stream
===================================================================
RCS file: /cvs/ports/www/nginx/pkg/PLIST-stream,v
retrieving revision 1.1
diff -u -r1.1 PLIST-stream
--- pkg/PLIST-stream 4 Nov 2016 22:13:43 -0000 1.1
+++ pkg/PLIST-stream 20 May 2020 07:32:15 -0000
@@ -1,2 +1,2 @@
@comment $OpenBSD: PLIST-stream,v 1.1 2016/11/04 22:13:43 jeremy Exp $
-ngx_stream_module.so
+@so ngx_stream_module.so
Index: pkg/PLIST-xslt
===================================================================
RCS file: /cvs/ports/www/nginx/pkg/PLIST-xslt,v
retrieving revision 1.1
diff -u -r1.1 PLIST-xslt
--- pkg/PLIST-xslt 4 Nov 2016 22:13:43 -0000 1.1
+++ pkg/PLIST-xslt 20 May 2020 07:32:15 -0000
@@ -1,2 +1,2 @@
@comment $OpenBSD: PLIST-xslt,v 1.1 2016/11/04 22:13:43 jeremy Exp $
-ngx_http_xslt_filter_module.so
+@so ngx_http_xslt_filter_module.so
