diff --git a/srcpkgs/nginx/files/ngx_auto_config.h.aarch64 b/srcpkgs/nginx/files/ngx_auto_config.h.aarch64 index 19056b8b078..40370007953 100644 --- a/srcpkgs/nginx/files/ngx_auto_config.h.aarch64 +++ b/srcpkgs/nginx/files/ngx_auto_config.h.aarch64 @@ -1,4 +1,4 @@ -#define NGX_CONFIGURE " --prefix=/etc/nginx --conf-path=/etc/nginx/nginx.conf --sbin-path=/usr/bin/nginx --pid-path=/run/nginx.pid --lock-path=/var/lock/nginx.lock --user=nginx --group=nginx --http-log-path=/var/log/nginx/access.log --error-log-path=/var/log/nginx/error.log --http-client-body-temp-path=/var/tmp/nginx/client-body --http-proxy-temp-path=/var/tmp/nginx/proxy --http-fastcgi-temp-path=/var/tmp/nginx/fastcgi --http-scgi-temp-path=/var/tmp/nginx/scgi --http-uwsgi-temp-path=/var/tmp/nginx/uwsgi --with-mail --with-mail_ssl_module --with-pcre-jit --with-file-aio --with-http_gunzip_module --with-http_v2_module --with-http_dav_module --with-http_gzip_static_module --with-http_realip_module --with-http_ssl_module --with-http_stub_status_module --with-http_sub_module --with-http_geoip_module --with-stream --with-stream_realip_module --with-stream_ssl_module --with-stream_ssl_preread_module --with-stream_geoip_module --with-http_slice_module" +#define NGX_CONFIGURE " --prefix=/etc/nginx --conf-path=/etc/nginx/nginx.conf --with-compat --sbin-path=/usr/bin/nginx --pid-path=/run/nginx.pid --lock-path=/var/lock/nginx.lock --user=nginx --group=nginx --http-log-path=/var/log/nginx/access.log --error-log-path=/var/log/nginx/error.log --http-client-body-temp-path=/var/tmp/nginx/client-body --http-proxy-temp-path=/var/tmp/nginx/proxy --http-fastcgi-temp-path=/var/tmp/nginx/fastcgi --http-scgi-temp-path=/var/tmp/nginx/scgi --http-uwsgi-temp-path=/var/tmp/nginx/uwsgi --with-mail --with-mail_ssl_module --with-pcre-jit --with-file-aio --with-http_gunzip_module --with-http_v2_module --with-http_dav_module --with-http_gzip_static_module --with-http_realip_module --with-http_ssl_module --with-http_stub_status_module --with-http_sub_module --with-http_geoip_module --with-stream --with-stream_realip_module --with-stream_ssl_module --with-stream_ssl_preread_module --with-stream_geoip_module --with-http_slice_module" #ifndef NGX_HAVE_GCC_ATOMIC #define NGX_HAVE_GCC_ATOMIC 1 @@ -40,6 +40,16 @@ #endif +#ifndef NGX_HAVE_EVENTFD +#define NGX_HAVE_EVENTFD 1 +#endif + + +#ifndef NGX_HAVE_SYS_EVENTFD_H +#define NGX_HAVE_SYS_EVENTFD_H 1 +#endif + + #ifndef NGX_HAVE_O_PATH #define NGX_HAVE_O_PATH 1 #endif @@ -268,11 +278,6 @@ #endif -#ifndef NGX_SYS_NERR -#define NGX_SYS_NERR 1000 -#endif - - #ifndef NGX_HAVE_LOCALTIME_R #define NGX_HAVE_LOCALTIME_R 1 #endif @@ -453,6 +458,46 @@ #endif +#ifndef NGX_COMPAT +#define NGX_COMPAT 1 +#endif + + +#ifndef NGX_HTTP_GZIP +#define NGX_HTTP_GZIP 1 +#endif + + +#ifndef NGX_HTTP_DAV +#define NGX_HTTP_DAV 1 +#endif + + +#ifndef NGX_HTTP_REALIP +#define NGX_HTTP_REALIP 1 +#endif + + +#ifndef NGX_HTTP_X_FORWARDED_FOR +#define NGX_HTTP_X_FORWARDED_FOR 1 +#endif + + +#ifndef NGX_HTTP_HEADERS +#define NGX_HTTP_HEADERS 1 +#endif + + +#ifndef NGX_HTTP_UPSTREAM_ZONE +#define NGX_HTTP_UPSTREAM_ZONE 1 +#endif + + +#ifndef NGX_STREAM_UPSTREAM_ZONE +#define NGX_STREAM_UPSTREAM_ZONE 1 +#endif + + #ifndef NGX_PCRE #define NGX_PCRE 1 #endif diff --git a/srcpkgs/nginx/files/ngx_auto_config.h.armv6l b/srcpkgs/nginx/files/ngx_auto_config.h.armv6l index f32af78d12b..ab1be86207e 100644 --- a/srcpkgs/nginx/files/ngx_auto_config.h.armv6l +++ b/srcpkgs/nginx/files/ngx_auto_config.h.armv6l @@ -1,9 +1,4 @@ -#define NGX_CONFIGURE " --prefix=/etc/nginx --conf-path=/etc/nginx/nginx.conf --sbin-path=/usr/bin/nginx --pid-path=/run/nginx.pid --lock-path=/var/lock/nginx.lock --user=nginx --group=nginx --http-log-path=/var/log/nginx/access.log --error-log-path=/var/log/nginx/error.log --http-client-body-temp-path=/var/tmp/nginx/client-body --http-proxy-temp-path=/var/tmp/nginx/proxy --http-fastcgi-temp-path=/var/tmp/nginx/fastcgi --http-scgi-temp-path=/var/tmp/nginx/scgi --http-uwsgi-temp-path=/var/tmp/nginx/uwsgi --with-mail --with-mail_ssl_module --with-pcre-jit --with-file-aio --with-http_gunzip_module --with-http_v2_module --with-http_dav_module --with-http_gzip_static_module --with-http_realip_module --with-http_ssl_module --with-http_stub_status_module --with-http_sub_module --with-http_geoip_module --with-stream --with-stream_realip_module --with-stream_ssl_module --with-stream_ssl_preread_module --with-stream_geoip_module" - -#ifndef NGX_COMPILER -#define NGX_COMPILER "gcc 9.2.0 (GCC) " -#endif - +#define NGX_CONFIGURE " --prefix=/etc/nginx --conf-path=/etc/nginx/nginx.conf --with-compat --sbin-path=/usr/bin/nginx --pid-path=/run/nginx.pid --lock-path=/var/lock/nginx.lock --user=nginx --group=nginx --http-log-path=/var/log/nginx/access.log --error-log-path=/var/log/nginx/error.log --http-client-body-temp-path=/var/tmp/nginx/client-body --http-proxy-temp-path=/var/tmp/nginx/proxy --http-fastcgi-temp-path=/var/tmp/nginx/fastcgi --http-scgi-temp-path=/var/tmp/nginx/scgi --http-uwsgi-temp-path=/var/tmp/nginx/uwsgi --with-mail --with-mail_ssl_module --with-pcre-jit --with-file-aio --with-http_gunzip_module --with-http_v2_module --with-http_dav_module --with-http_gzip_static_module --with-http_realip_module --with-http_ssl_module --with-http_stub_status_module --with-http_sub_module --with-http_geoip_module --with-stream --with-stream_realip_module --with-stream_ssl_module --with-stream_ssl_preread_module --with-stream_geoip_module --with-http_slice_module" #ifndef NGX_HAVE_GCC_ATOMIC #define NGX_HAVE_GCC_ATOMIC 1 @@ -45,6 +40,16 @@ #endif +#ifndef NGX_HAVE_EVENTFD +#define NGX_HAVE_EVENTFD 1 +#endif + + +#ifndef NGX_HAVE_SYS_EVENTFD_H +#define NGX_HAVE_SYS_EVENTFD_H 1 +#endif + + #ifndef NGX_HAVE_O_PATH #define NGX_HAVE_O_PATH 1 #endif @@ -273,11 +278,6 @@ #endif -#ifndef NGX_SYS_NERR -#define NGX_SYS_NERR 135 -#endif - - #ifndef NGX_HAVE_LOCALTIME_R #define NGX_HAVE_LOCALTIME_R 1 #endif @@ -328,6 +328,11 @@ #endif +#ifndef NGX_HAVE_FIONREAD +#define NGX_HAVE_FIONREAD 1 +#endif + + #ifndef NGX_HAVE_GMTOFF #define NGX_HAVE_GMTOFF 1 #endif @@ -453,6 +458,46 @@ #endif +#ifndef NGX_COMPAT +#define NGX_COMPAT 1 +#endif + + +#ifndef NGX_HTTP_GZIP +#define NGX_HTTP_GZIP 1 +#endif + + +#ifndef NGX_HTTP_DAV +#define NGX_HTTP_DAV 1 +#endif + + +#ifndef NGX_HTTP_REALIP +#define NGX_HTTP_REALIP 1 +#endif + + +#ifndef NGX_HTTP_X_FORWARDED_FOR +#define NGX_HTTP_X_FORWARDED_FOR 1 +#endif + + +#ifndef NGX_HTTP_HEADERS +#define NGX_HTTP_HEADERS 1 +#endif + + +#ifndef NGX_HTTP_UPSTREAM_ZONE +#define NGX_HTTP_UPSTREAM_ZONE 1 +#endif + + +#ifndef NGX_STREAM_UPSTREAM_ZONE +#define NGX_STREAM_UPSTREAM_ZONE 1 +#endif + + #ifndef NGX_PCRE #define NGX_PCRE 1 #endif diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template index 23feed77caf..4c946a91076 100644 --- a/srcpkgs/nginx/template +++ b/srcpkgs/nginx/template @@ -1,7 +1,7 @@ # Template file for 'nginx' pkgname=nginx version=1.20.2 -revision=1 +revision=2 _tests_commit=18ac4d9e5a2a create_wrksrc=yes build_wrksrc="nginx-${version}" @@ -10,7 +10,7 @@ hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)" makedepends="${hostmakedepends}" checkdepends="perl perl-IO-Socket-SSL perl-GD perl-FCGI which" short_desc="High performance web and reverse proxy server" -maintainer="Orphaned " +maintainer="Duncaen " license="BSD-2-Clause" homepage="https://nginx.org" distfiles="https://nginx.org/download/nginx-${version}.tar.gz