wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-04-16 06:07:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

nginx: update to 1.26.1.

Browse source
This commit is contained in:
Duncaen 2024-05-30 03:23:06 +02:00
parent 7f59356178
commit 6f25ca7ec3
No known key found for this signature in database
GPG key ID: 335C1D17EC3D6E35
7 changed files with 308 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
srcpkgs/nginx/files/ngx_auto_config.h.aarch64
View file

@ -1,4 +1,4 @@
#define NGX_CONFIGURE " --prefix=/etc/nginx --conf-path=/etc/nginx/nginx.conf --sbin-path=/usr/bin/nginx --modules-path=/usr/lib/nginx/modules --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/lib/nginx/tmp/client-body --http-proxy-temp-path=/var/lib/nginx/tmp/proxy --http-fastcgi-temp-path=/var/lib/nginx/tmp/fastcgi --http-scgi-temp-path=/var/lib/nginx/tmp/scgi --http-uwsgi-temp-path=/var/lib/nginx/tmp/uwsgi --with-compat --with-file-aio --with-http_dav_module --with-http_gunzip_module --with-http_gzip_static_module --with-http_realip_module --with-http_ssl_module --with-http_slice_module --with-http_stub_status_module --with-http_sub_module --with-http_v2_module --with-http_xslt_module=dynamic --with-http_geoip_module=dynamic --with-http_perl_module=dynamic --with-stream=dynamic --with-stream_geoip_module=dynamic --with-stream_realip_module --with-stream_ssl_module --with-stream_ssl_preread_module --with-mail --with-mail_ssl_module --with-pcre-jit --with-threads --add-dynamic-module=../njs-0.7.7/nginx"
#define NGX_CONFIGURE " --prefix=/etc/nginx --conf-path=/etc/nginx/nginx.conf --sbin-path=/usr/bin/nginx --modules-path=/usr/lib/nginx/modules --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/lib/nginx/tmp/client-body --http-proxy-temp-path=/var/lib/nginx/tmp/proxy --http-fastcgi-temp-path=/var/lib/nginx/tmp/fastcgi --http-scgi-temp-path=/var/lib/nginx/tmp/scgi --http-uwsgi-temp-path=/var/lib/nginx/tmp/uwsgi --with-compat --with-file-aio --with-http_auth_request_module --with-http_dav_module --with-http_gunzip_module --with-http_gzip_static_module --with-http_realip_module --with-http_ssl_module --with-http_slice_module --with-http_stub_status_module --with-http_sub_module --with-http_v2_module --with-http_v3_module --with-http_xslt_module=dynamic --with-http_geoip_module=dynamic --with-http_perl_module=dynamic --with-openssl-opt=enable-ktls --with-stream=dynamic --with-stream_geoip_module=dynamic --with-stream_realip_module --with-stream_ssl_module --with-stream_ssl_preread_module --with-mail --with-mail_ssl_module --with-pcre-jit --with-threads --add-dynamic-module=../njs-0.8.4/nginx"
#ifndef NGX_HAVE_GCC_ATOMIC
#define NGX_HAVE_GCC_ATOMIC 1
@ -85,6 +85,21 @@
#endif
#ifndef NGX_HAVE_BPF
#define NGX_HAVE_BPF 1
#endif
#ifndef NGX_HAVE_SO_COOKIE
#define NGX_HAVE_SO_COOKIE 1
#endif
#ifndef NGX_HAVE_UDP_SEGMENT
#define NGX_HAVE_UDP_SEGMENT 1
#endif
#ifndef NGX_ALIGNMENT
#define NGX_ALIGNMENT 16
#endif
@ -163,6 +178,21 @@
#endif
#ifndef NGX_HAVE_IP_MTU_DISCOVER
#define NGX_HAVE_IP_MTU_DISCOVER 1
#endif
#ifndef NGX_HAVE_IPV6_MTU_DISCOVER
#define NGX_HAVE_IPV6_MTU_DISCOVER 1
#endif
#ifndef NGX_HAVE_IPV6_DONTFRAG
#define NGX_HAVE_IPV6_DONTFRAG 1
#endif
#ifndef NGX_HAVE_DEFERRED_ACCEPT
#define NGX_HAVE_DEFERRED_ACCEPT 1
#endif
@ -388,8 +418,8 @@
#endif
#ifndef NGX_HTTP_HEADERS
#define NGX_HTTP_HEADERS 1
#ifndef NGX_HTTP_V3
#define NGX_HTTP_V3 1
#endif
@ -463,6 +493,26 @@
#endif
#ifndef NJS_HAVE_OPENSSL
#define NJS_HAVE_OPENSSL 1
#endif
#ifndef NJS_HAVE_XML
#define NJS_HAVE_XML 1
#endif
#ifndef NJS_HAVE_ZLIB
#define NJS_HAVE_ZLIB 1
#endif
#ifndef NGX_QUIC_BPF
#define NGX_QUIC_BPF 1
#endif
#ifndef NGX_COMPAT
#define NGX_COMPAT 1
#endif
@ -523,6 +573,16 @@
#endif
#ifndef NGX_QUIC_OPENSSL_COMPAT
#define NGX_QUIC_OPENSSL_COMPAT 1
#endif
#ifndef NGX_QUIC
#define NGX_QUIC 1
#endif
#ifndef NGX_ZLIB
#define NGX_ZLIB 1
#endif

66
srcpkgs/nginx/files/ngx_auto_config.h.armv6l
View file

@ -1,4 +1,4 @@
#define NGX_CONFIGURE " --prefix=/etc/nginx --conf-path=/etc/nginx/nginx.conf --sbin-path=/usr/bin/nginx --modules-path=/usr/lib/nginx/modules --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/lib/nginx/tmp/client-body --http-proxy-temp-path=/var/lib/nginx/tmp/proxy --http-fastcgi-temp-path=/var/lib/nginx/tmp/fastcgi --http-scgi-temp-path=/var/lib/nginx/tmp/scgi --http-uwsgi-temp-path=/var/lib/nginx/tmp/uwsgi --with-compat --with-file-aio --with-http_dav_module --with-http_gunzip_module --with-http_gzip_static_module --with-http_realip_module --with-http_ssl_module --with-http_slice_module --with-http_stub_status_module --with-http_sub_module --with-http_v2_module --with-http_xslt_module=dynamic --with-http_geoip_module=dynamic --with-http_perl_module=dynamic --with-stream=dynamic --with-stream_geoip_module=dynamic --with-stream_realip_module --with-stream_ssl_module --with-stream_ssl_preread_module --with-mail --with-mail_ssl_module --with-pcre-jit --with-threads --add-dynamic-module=../njs-0.7.7/nginx"
#define NGX_CONFIGURE " --prefix=/etc/nginx --conf-path=/etc/nginx/nginx.conf --sbin-path=/usr/bin/nginx --modules-path=/usr/lib/nginx/modules --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/lib/nginx/tmp/client-body --http-proxy-temp-path=/var/lib/nginx/tmp/proxy --http-fastcgi-temp-path=/var/lib/nginx/tmp/fastcgi --http-scgi-temp-path=/var/lib/nginx/tmp/scgi --http-uwsgi-temp-path=/var/lib/nginx/tmp/uwsgi --with-compat --with-file-aio --with-http_auth_request_module --with-http_dav_module --with-http_gunzip_module --with-http_gzip_static_module --with-http_realip_module --with-http_ssl_module --with-http_slice_module --with-http_stub_status_module --with-http_sub_module --with-http_v2_module --with-http_v3_module --with-http_xslt_module=dynamic --with-http_geoip_module=dynamic --with-http_perl_module=dynamic --with-openssl-opt=enable-ktls --with-stream=dynamic --with-stream_geoip_module=dynamic --with-stream_realip_module --with-stream_ssl_module --with-stream_ssl_preread_module --with-mail --with-mail_ssl_module --with-pcre-jit --with-threads --add-dynamic-module=../njs-0.8.4/nginx"
#ifndef NGX_HAVE_GCC_ATOMIC
#define NGX_HAVE_GCC_ATOMIC 1
@ -90,6 +90,21 @@
#endif
#ifndef NGX_HAVE_BPF
#define NGX_HAVE_BPF 1
#endif
#ifndef NGX_HAVE_SO_COOKIE
#define NGX_HAVE_SO_COOKIE 1
#endif
#ifndef NGX_HAVE_UDP_SEGMENT
#define NGX_HAVE_UDP_SEGMENT 1
#endif
#ifndef NGX_CPU_CACHE_LINE
#define NGX_CPU_CACHE_LINE 32
#endif
@ -163,6 +178,21 @@
#endif
#ifndef NGX_HAVE_IP_MTU_DISCOVER
#define NGX_HAVE_IP_MTU_DISCOVER 1
#endif
#ifndef NGX_HAVE_IPV6_MTU_DISCOVER
#define NGX_HAVE_IPV6_MTU_DISCOVER 1
#endif
#ifndef NGX_HAVE_IPV6_DONTFRAG
#define NGX_HAVE_IPV6_DONTFRAG 1
#endif
#ifndef NGX_HAVE_DEFERRED_ACCEPT
#define NGX_HAVE_DEFERRED_ACCEPT 1
#endif
@ -388,8 +418,8 @@
#endif
#ifndef NGX_HTTP_HEADERS
#define NGX_HTTP_HEADERS 1
#ifndef NGX_HTTP_V3
#define NGX_HTTP_V3 1
#endif
@ -463,6 +493,26 @@
#endif
#ifndef NJS_HAVE_OPENSSL
#define NJS_HAVE_OPENSSL 1
#endif
#ifndef NJS_HAVE_XML
#define NJS_HAVE_XML 1
#endif
#ifndef NJS_HAVE_ZLIB
#define NJS_HAVE_ZLIB 1
#endif
#ifndef NGX_QUIC_BPF
#define NGX_QUIC_BPF 1
#endif
#ifndef NGX_COMPAT
#define NGX_COMPAT 1
#endif
@ -523,6 +573,16 @@
#endif
#ifndef NGX_QUIC_OPENSSL_COMPAT
#define NGX_QUIC_OPENSSL_COMPAT 1
#endif
#ifndef NGX_QUIC
#define NGX_QUIC 1
#endif
#ifndef NGX_ZLIB
#define NGX_ZLIB 1
#endif

66
srcpkgs/nginx/files/ngx_auto_config.h.riscv64
View file

@ -1,4 +1,4 @@
#define NGX_CONFIGURE " --prefix=/etc/nginx --conf-path=/etc/nginx/nginx.conf --sbin-path=/usr/bin/nginx --modules-path=/usr/lib/nginx/modules --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/lib/nginx/tmp/client-body --http-proxy-temp-path=/var/lib/nginx/tmp/proxy --http-fastcgi-temp-path=/var/lib/nginx/tmp/fastcgi --http-scgi-temp-path=/var/lib/nginx/tmp/scgi --http-uwsgi-temp-path=/var/lib/nginx/tmp/uwsgi --with-compat --with-file-aio --with-http_dav_module --with-http_gunzip_module --with-http_gzip_static_module --with-http_realip_module --with-http_ssl_module --with-http_slice_module --with-http_stub_status_module --with-http_sub_module --with-http_v2_module --with-http_xslt_module=dynamic --with-http_geoip_module=dynamic --with-http_perl_module=dynamic --with-stream=dynamic --with-stream_geoip_module=dynamic --with-stream_realip_module --with-stream_ssl_module --with-stream_ssl_preread_module --with-mail --with-mail_ssl_module --with-pcre-jit --with-threads --add-dynamic-module=../njs-0.7.7/nginx"
#define NGX_CONFIGURE " --prefix=/etc/nginx --conf-path=/etc/nginx/nginx.conf --sbin-path=/usr/bin/nginx --modules-path=/usr/lib/nginx/modules --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/lib/nginx/tmp/client-body --http-proxy-temp-path=/var/lib/nginx/tmp/proxy --http-fastcgi-temp-path=/var/lib/nginx/tmp/fastcgi --http-scgi-temp-path=/var/lib/nginx/tmp/scgi --http-uwsgi-temp-path=/var/lib/nginx/tmp/uwsgi --with-compat --with-file-aio --with-http_auth_request_module --with-http_dav_module --with-http_gunzip_module --with-http_gzip_static_module --with-http_realip_module --with-http_ssl_module --with-http_slice_module --with-http_stub_status_module --with-http_sub_module --with-http_v2_module --with-http_v3_module --with-http_xslt_module=dynamic --with-http_geoip_module=dynamic --with-http_perl_module=dynamic --with-openssl-opt=enable-ktls --with-stream=dynamic --with-stream_geoip_module=dynamic --with-stream_realip_module --with-stream_ssl_module --with-stream_ssl_preread_module --with-mail --with-mail_ssl_module --with-pcre-jit --with-threads --add-dynamic-module=../njs-0.8.4/nginx"
#ifndef NGX_HAVE_GCC_ATOMIC
#define NGX_HAVE_GCC_ATOMIC 1
@ -90,6 +90,21 @@
#endif
#ifndef NGX_HAVE_BPF
#define NGX_HAVE_BPF 1
#endif
#ifndef NGX_HAVE_SO_COOKIE
#define NGX_HAVE_SO_COOKIE 1
#endif
#ifndef NGX_HAVE_UDP_SEGMENT
#define NGX_HAVE_UDP_SEGMENT 1
#endif
#ifndef NGX_CPU_CACHE_LINE
#define NGX_CPU_CACHE_LINE 32
#endif
@ -163,6 +178,21 @@
#endif
#ifndef NGX_HAVE_IP_MTU_DISCOVER
#define NGX_HAVE_IP_MTU_DISCOVER 1
#endif
#ifndef NGX_HAVE_IPV6_MTU_DISCOVER
#define NGX_HAVE_IPV6_MTU_DISCOVER 1
#endif
#ifndef NGX_HAVE_IPV6_DONTFRAG
#define NGX_HAVE_IPV6_DONTFRAG 1
#endif
#ifndef NGX_HAVE_DEFERRED_ACCEPT
#define NGX_HAVE_DEFERRED_ACCEPT 1
#endif
@ -388,8 +418,8 @@
#endif
#ifndef NGX_HTTP_HEADERS
#define NGX_HTTP_HEADERS 1
#ifndef NGX_HTTP_V3
#define NGX_HTTP_V3 1
#endif
@ -463,6 +493,26 @@
#endif
#ifndef NJS_HAVE_OPENSSL
#define NJS_HAVE_OPENSSL 1
#endif
#ifndef NJS_HAVE_XML
#define NJS_HAVE_XML 1
#endif
#ifndef NJS_HAVE_ZLIB
#define NJS_HAVE_ZLIB 1
#endif
#ifndef NGX_QUIC_BPF
#define NGX_QUIC_BPF 1
#endif
#ifndef NGX_COMPAT
#define NGX_COMPAT 1
#endif
@ -523,6 +573,16 @@
#endif
#ifndef NGX_QUIC_OPENSSL_COMPAT
#define NGX_QUIC_OPENSSL_COMPAT 1
#endif
#ifndef NGX_QUIC
#define NGX_QUIC 1
#endif
#ifndef NGX_ZLIB
#define NGX_ZLIB 1
#endif

44
srcpkgs/nginx/files/njs_auto_config.h.aarch64
View file

@ -12,11 +12,6 @@
#endif
#ifndef NJS_TEST262
#define NJS_TEST262 1
#endif
#ifndef NJS_INT_SIZE
#define NJS_INT_SIZE 4
#endif
@ -112,6 +107,16 @@
#endif
#ifndef NJS_HAVE_GCC_ATTRIBUTE_FALLTHROUGH
#define NJS_HAVE_GCC_ATTRIBUTE_FALLTHROUGH 1
#endif
#ifndef NJS_HAVE_GCC_ATTRIBUTE_NO_SANITIZE
#define NJS_HAVE_GCC_ATTRIBUTE_NO_SANITIZE 1
#endif
#ifndef NJS_HAVE_CLOCK_MONOTONIC
#define NJS_HAVE_CLOCK_MONOTONIC 1
#endif
@ -137,6 +142,11 @@
#endif
#ifndef NJS_HAVE_COMPUTED_GOTO
#define NJS_HAVE_COMPUTED_GOTO 1
#endif
#ifndef NJS_HAVE_EXPLICIT_BZERO
#define NJS_HAVE_EXPLICIT_BZERO 1
#endif
@ -148,7 +158,7 @@
#ifndef NJS_PCRE2_VERSION
#define NJS_PCRE2_VERSION 10.39
#define NJS_PCRE2_VERSION 10.42
#endif
@ -158,6 +168,26 @@
#ifndef NJS_OPENSSL_VERSION
#define NJS_OPENSSL_VERSION "OpenSSL 1.1.1q 5 Jul 2022"
#define NJS_OPENSSL_VERSION "OpenSSL 3.3.0 9 Apr 2024"
#endif
#ifndef NJS_HAVE_LIBXML2
#define NJS_HAVE_LIBXML2 1
#endif
#ifndef NJS_LIBXML2_VERSION
#define NJS_LIBXML2_VERSION "2.12.6"
#endif
#ifndef NJS_HAVE_ZLIB
#define NJS_HAVE_ZLIB 1
#endif
#ifndef NJS_ZLIB_VERSION
#define NJS_ZLIB_VERSION "1.3.1"
#endif

44
srcpkgs/nginx/files/njs_auto_config.h.armv6l
View file

@ -12,11 +12,6 @@
#endif
#ifndef NJS_TEST262
#define NJS_TEST262 1
#endif
#ifndef NJS_INT_SIZE
#define NJS_INT_SIZE 4
#endif
@ -107,6 +102,16 @@
#endif
#ifndef NJS_HAVE_GCC_ATTRIBUTE_FALLTHROUGH
#define NJS_HAVE_GCC_ATTRIBUTE_FALLTHROUGH 1
#endif
#ifndef NJS_HAVE_GCC_ATTRIBUTE_NO_SANITIZE
#define NJS_HAVE_GCC_ATTRIBUTE_NO_SANITIZE 1
#endif
#ifndef NJS_HAVE_CLOCK_MONOTONIC
#define NJS_HAVE_CLOCK_MONOTONIC 1
#endif
@ -132,6 +137,11 @@
#endif
#ifndef NJS_HAVE_COMPUTED_GOTO
#define NJS_HAVE_COMPUTED_GOTO 1
#endif
#ifndef NJS_HAVE_EXPLICIT_BZERO
#define NJS_HAVE_EXPLICIT_BZERO 1
#endif
@ -143,7 +153,7 @@
#ifndef NJS_PCRE2_VERSION
#define NJS_PCRE2_VERSION 10.39
#define NJS_PCRE2_VERSION 10.42
#endif
@ -153,6 +163,26 @@
#ifndef NJS_OPENSSL_VERSION
#define NJS_OPENSSL_VERSION "OpenSSL 1.1.1q 5 Jul 2022"
#define NJS_OPENSSL_VERSION "OpenSSL 3.3.0 9 Apr 2024"
#endif
#ifndef NJS_HAVE_LIBXML2
#define NJS_HAVE_LIBXML2 1
#endif
#ifndef NJS_LIBXML2_VERSION
#define NJS_LIBXML2_VERSION "2.12.6"
#endif
#ifndef NJS_HAVE_ZLIB
#define NJS_HAVE_ZLIB 1
#endif
#ifndef NJS_ZLIB_VERSION
#define NJS_ZLIB_VERSION "1.3.1"
#endif

44
srcpkgs/nginx/files/njs_auto_config.h.riscv64
View file

@ -12,11 +12,6 @@
#endif
#ifndef NJS_TEST262
#define NJS_TEST262 1
#endif
#ifndef NJS_INT_SIZE
#define NJS_INT_SIZE 4
#endif
@ -112,6 +107,16 @@
#endif
#ifndef NJS_HAVE_GCC_ATTRIBUTE_FALLTHROUGH
#define NJS_HAVE_GCC_ATTRIBUTE_FALLTHROUGH 1
#endif
#ifndef NJS_HAVE_GCC_ATTRIBUTE_NO_SANITIZE
#define NJS_HAVE_GCC_ATTRIBUTE_NO_SANITIZE 1
#endif
#ifndef NJS_HAVE_CLOCK_MONOTONIC
#define NJS_HAVE_CLOCK_MONOTONIC 1
#endif
@ -137,6 +142,11 @@
#endif
#ifndef NJS_HAVE_COMPUTED_GOTO
#define NJS_HAVE_COMPUTED_GOTO 1
#endif
#ifndef NJS_HAVE_EXPLICIT_BZERO
#define NJS_HAVE_EXPLICIT_BZERO 1
#endif
@ -148,7 +158,7 @@
#ifndef NJS_PCRE2_VERSION
#define NJS_PCRE2_VERSION 10.39
#define NJS_PCRE2_VERSION 10.42
#endif
@ -158,6 +168,26 @@
#ifndef NJS_OPENSSL_VERSION
#define NJS_OPENSSL_VERSION "OpenSSL 1.1.1s 1 Nov 2022"
#define NJS_OPENSSL_VERSION "OpenSSL 3.3.0 9 Apr 2024"
#endif
#ifndef NJS_HAVE_LIBXML2
#define NJS_HAVE_LIBXML2 1
#endif
#ifndef NJS_LIBXML2_VERSION
#define NJS_LIBXML2_VERSION "2.12.6"
#endif
#ifndef NJS_HAVE_ZLIB
#define NJS_HAVE_ZLIB 1
#endif
#ifndef NJS_ZLIB_VERSION
#define NJS_ZLIB_VERSION "1.3.1"
#endif

15
srcpkgs/nginx/template
View file

@ -3,10 +3,10 @@
# Consider using mime.types from mime-types package
# See comments in mime-types template
pkgname=nginx
version=1.24.0
revision=5
_tests_commit=36a4563f7f00
_njs_version=0.7.12
version=1.26.1
revision=1
_tests_commit=88730862618b
_njs_version=0.8.4
create_wrksrc=yes
build_wrksrc="nginx-${version}"
build_style=gnu-makefile
@ -39,6 +39,7 @@ configure_args="--prefix=${_cfgdir}
--with-http_stub_status_module
--with-http_sub_module
--with-http_v2_module
--with-http_v3_module
--with-http_xslt_module=dynamic
--with-http_geoip_module=dynamic
--with-http_perl_module=dynamic
@ -65,9 +66,9 @@ changelog="https://nginx.org/en/CHANGES-${version%.*}"
distfiles="https://nginx.org/download/nginx-${version}.tar.gz
https://hg.nginx.org/nginx-tests/archive/${_tests_commit}.tar.gz
https://hg.nginx.org/njs/archive/${_njs_version}.tar.gz"
checksum="77a2541637b92a621e3ee76776c8b7b40cf6d707e69ba53a940283e30ff2f55d
a90641a75314427b6c02e3a5e811c66d6fe7c0cad93752a6a2725d0129e08fbf
af648336c236f625311edcd90b83f37702fadad160c2a5ed57b34656609e918a"
checksum="f9187468ff2eb159260bfd53867c25ff8e334726237acf227b9e870e53d3e36b
6cc1e4b393c4d05cef06ac16f4a38d504d0e5674fca08c7be20052fd3b07b322
8191bff8491af9169a92e30e383ef8614717b0c6d40913d83b95051031e92321"
# Tests fail when nginx run as root and there is no nginx user
make_check=ci-skip