Download raw body.
nginx.conf: don't patch in obsolete syntax
The patched-in 'ssl on' in nginx.conf no longer works:
Syntax: ssl on | off;
[...]
This directive was made obsolete in version 1.15.0 and was removed in
version 1.25.1. The ssl parameter of the listen directive should be used
instead.
https://nginx.org/en/docs/http/ngx_http_ssl_module.html#ssl
This fixes this one aspect, but maybe someone more familiar with nginx
wants to clean the config up a bit more.
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/nginx/Makefile,v
diff -u -p -r1.176 Makefile
--- Makefile 27 Apr 2024 07:24:04 -0000 1.176
+++ Makefile 16 May 2024 18:41:09 -0000
@@ -41,6 +41,8 @@ PKGNAME-passenger= nginx-passenger-${VER
PKGNAME-rtmp= nginx-rtmp-${VERSION}
PKGNAME-securelink= nginx-securelink-${VERSION}
+REVISION-main= 0
+
ONLY_FOR_ARCHS-passenger= aarch64 amd64 arm i386
SITES= https://nginx.org/download/
Index: patches/patch-conf_nginx_conf
===================================================================
RCS file: /cvs/ports/www/nginx/patches/patch-conf_nginx_conf,v
diff -u -p -r1.9 patch-conf_nginx_conf
--- patches/patch-conf_nginx_conf 11 Mar 2022 20:10:10 -0000 1.9
+++ patches/patch-conf_nginx_conf 16 May 2024 18:21:36 -0000
@@ -1,5 +1,6 @@
---- conf/nginx.conf.orig Tue Oct 18 17:03:13 2016
-+++ conf/nginx.conf Thu Nov 3 14:30:06 2016
+Index: conf/nginx.conf
+--- conf/nginx.conf.orig
++++ conf/nginx.conf
@@ -1,30 +1,35 @@
+# Take note of http://wiki.nginx.org/Pitfalls
@@ -100,7 +101,7 @@
# include fastcgi_params;
#}
-@@ -85,33 +98,26 @@ http {
+@@ -85,11 +98,7 @@ http {
# listen 8000;
# listen somename:8080;
# server_name somename alias another.alias;
@@ -113,17 +114,14 @@
#}
- # HTTPS server
- #
+@@ -98,20 +107,16 @@ http {
#server {
-- # listen 443 ssl;
-+ # listen 443;
+ # listen 443 ssl;
# server_name localhost;
+ # root /var/www/htdocs;
- # ssl_certificate cert.pem;
- # ssl_certificate_key cert.key;
-+ # ssl on;
+ # ssl_certificate /etc/ssl/server.crt;
+ # ssl_certificate_key /etc/ssl/private/server.key;
Index: patches/patch-lua-nginx-module_config
===================================================================
RCS file: /cvs/ports/www/nginx/patches/patch-lua-nginx-module_config,v
diff -u -p -r1.1 patch-lua-nginx-module_config
--- patches/patch-lua-nginx-module_config 5 Oct 2023 09:55:47 -0000 1.1
+++ patches/patch-lua-nginx-module_config 16 May 2024 18:19:31 -0000
@@ -1,6 +1,7 @@
---- lua-nginx-module/config.orig Tue Oct 3 22:18:35 2023
-+++ lua-nginx-module/config Tue Oct 3 22:21:42 2023
-@@ -181,7 +181,7 @@
+Index: lua-nginx-module/config
+--- lua-nginx-module/config.orig
++++ lua-nginx-module/config
+@@ -181,7 +181,7 @@ END
if [ $NGX_RPATH = YES ]; then
ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -llua -lm"
else
nginx.conf: don't patch in obsolete syntax