From 255af1515a9be1e1827c33c17aa41bdb624494da Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 23 Dec 2022 23:19:42 +0100
Subject: [PATCH] nginx: update to 1.22.1.

---
 srcpkgs/nginx/patches.bak/cross.patch | 169 ++++++++++++++++++++++++++
 srcpkgs/nginx/template                |   6 +-
 2 files changed, 172 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/nginx/patches.bak/cross.patch

diff --git a/srcpkgs/nginx/patches.bak/cross.patch b/srcpkgs/nginx/patches.bak/cross.patch
new file mode 100644
index 00000000000..fff1198e8d2
--- /dev/null
+++ b/srcpkgs/nginx/patches.bak/cross.patch
@@ -0,0 +1,169 @@
+--- a/nginx-1.22.0/auto/types/sizeof
++++ b/nginx-1.22.0/auto/types/sizeof
+@@ -12,38 +12,10 @@
+ 
+ END
+ 
+-ngx_size=
+-
+-cat << END > $NGX_AUTOTEST.c
+-
+-#include <sys/types.h>
+-#include <sys/time.h>
+-$NGX_INCLUDE_UNISTD_H
+-#include <signal.h>
+-#include <stdio.h>
+-#include <sys/resource.h>
+-$NGX_INCLUDE_INTTYPES_H
+-$NGX_INCLUDE_AUTO_CONFIG_H
+-
+-int main(void) {
+-    printf("%d", (int) sizeof($ngx_type));
+-    return 0;
+-}
+-
+-END
+-
+-
+-ngx_test="$CC $CC_TEST_FLAGS $CC_AUX_FLAGS \
+-          -o $NGX_AUTOTEST $NGX_AUTOTEST.c $NGX_LD_OPT $ngx_feature_libs"
+-
+-eval "$ngx_test >> $NGX_AUTOCONF_ERR 2>&1"
+-
+-
+-if [ -x $NGX_AUTOTEST ]; then
+-    ngx_size=`$NGX_AUTOTEST`
+-    echo " $ngx_size bytes"
+-fi
++var="\${NGX_$(echo "$ngx_type" | tr ' ' '_' | tr '*' 'p' | tr 'a-z' 'A-Z' )}_SIZE"
++ngx_size=$(eval echo $var)
+ 
++echo " $ngx_size bytes"
+ 
+ case $ngx_size in
+     4)
+--- a/nginx-1.22.0/auto/unix
++++ b/nginx-1.22.0/auto/unix
+@@ -805,7 +805,7 @@
+ 
+ ngx_feature="mmap(MAP_ANON|MAP_SHARED)"
+ ngx_feature_name="NGX_HAVE_MAP_ANON"
+-ngx_feature_run=
++ngx_feature_run=no
+ ngx_feature_incs="#include <sys/mman.h>"
+ ngx_feature_path=
+ ngx_feature_libs=
+@@ -818,7 +818,7 @@
+ 
+ ngx_feature='mmap("/dev/zero", MAP_SHARED)'
+ ngx_feature_name="NGX_HAVE_MAP_DEVZERO"
+-ngx_feature_run=yes
++ngx_feature_run=no
+ ngx_feature_incs="#include <sys/mman.h>
+                   #include <sys/stat.h>
+                   #include <fcntl.h>"
+@@ -833,7 +833,7 @@
+ 
+ ngx_feature="System V shared memory"
+ ngx_feature_name="NGX_HAVE_SYSVSHM"
+-ngx_feature_run=yes
++ngx_feature_run=no
+ ngx_feature_incs="#include <sys/ipc.h>
+                   #include <sys/shm.h>"
+ ngx_feature_path=
+@@ -847,7 +847,7 @@
+ 
+ ngx_feature="POSIX semaphores"
+ ngx_feature_name="NGX_HAVE_POSIX_SEM"
+-ngx_feature_run=yes
++ngx_feature_run=no
+ ngx_feature_incs="#include <semaphore.h>"
+ ngx_feature_path=
+ ngx_feature_libs=
+--- a/nginx-1.22.0/auto/cc/conf
++++ b/nginx-1.22.0/auto/cc/conf
+@@ -183,7 +183,7 @@
+     else
+         ngx_feature="gcc builtin atomic operations"
+         ngx_feature_name=NGX_HAVE_GCC_ATOMIC
+-        ngx_feature_run=yes
++        ngx_feature_run=
+         ngx_feature_incs=
+         ngx_feature_path=
+         ngx_feature_libs=
+@@ -204,7 +204,7 @@
+     else
+         ngx_feature="C99 variadic macros"
+         ngx_feature_name="NGX_HAVE_C99_VARIADIC_MACROS"
+-        ngx_feature_run=yes
++        ngx_feature_run=no
+         ngx_feature_incs="#include <stdio.h>
+ #define var(dummy, ...)  sprintf(__VA_ARGS__)"
+         ngx_feature_path=
+@@ -218,7 +218,7 @@
+ 
+     ngx_feature="gcc variadic macros"
+     ngx_feature_name="NGX_HAVE_GCC_VARIADIC_MACROS"
+-    ngx_feature_run=yes
++    ngx_feature_run=no
+     ngx_feature_incs="#include <stdio.h>
+ #define var(dummy, args...)  sprintf(args)"
+     ngx_feature_path=
+--- a/nginx-1.22.0/auto/cc/name
++++ b/nginx-1.22.0/auto/cc/name
+@@ -7,7 +7,7 @@
+ 
+     ngx_feature="C compiler"
+     ngx_feature_name=
+-    ngx_feature_run=yes
++    ngx_feature_run=
+     ngx_feature_incs=
+     ngx_feature_path=
+     ngx_feature_libs=
+--- a/nginx-1.22.0/auto/os/linux
++++ b/nginx-1.22.0/auto/os/linux
+@@ -36,7 +36,7 @@
+ 
+ ngx_feature="epoll"
+ ngx_feature_name="NGX_HAVE_EPOLL"
+-ngx_feature_run=yes
++ngx_feature_run=no
+ ngx_feature_incs="#include <sys/epoll.h>"
+ ngx_feature_path=
+ ngx_feature_libs=
+@@ -135,7 +135,7 @@
+ CC_AUX_FLAGS="$cc_aux_flags -D_GNU_SOURCE"
+ ngx_feature="sendfile()"
+ ngx_feature_name="NGX_HAVE_SENDFILE"
+-ngx_feature_run=yes
++ngx_feature_run=no
+ ngx_feature_incs="#include <sys/sendfile.h>
+                   #include <errno.h>"
+ ngx_feature_path=
+@@ -156,7 +156,7 @@
+ CC_AUX_FLAGS="$cc_aux_flags -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64"
+ ngx_feature="sendfile64()"
+ ngx_feature_name="NGX_HAVE_SENDFILE64"
+-ngx_feature_run=yes
++ngx_feature_run=no
+ ngx_feature_incs="#include <sys/sendfile.h>
+                   #include <errno.h>"
+ ngx_feature_path=
+@@ -174,7 +174,7 @@
+ 
+ ngx_feature="prctl(PR_SET_DUMPABLE)"
+ ngx_feature_name="NGX_HAVE_PR_SET_DUMPABLE"
+-ngx_feature_run=yes
++ngx_feature_run=no
+ ngx_feature_incs="#include <sys/prctl.h>"
+ ngx_feature_path=
+ ngx_feature_libs=
+@@ -186,7 +186,7 @@
+ 
+ ngx_feature="prctl(PR_SET_KEEPCAPS)"
+ ngx_feature_name="NGX_HAVE_PR_SET_KEEPCAPS"
+-ngx_feature_run=yes
++ngx_feature_run=no
+ ngx_feature_incs="#include <sys/prctl.h>"
+ ngx_feature_path=
+ ngx_feature_libs=
diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index a28665e80e2..702e807f823 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -1,7 +1,7 @@
 # Template file for 'nginx'
 pkgname=nginx
-version=1.22.0
-revision=3
+version=1.22.1
+revision=1
 _tests_commit=18ac4d9e5a2a
 _njs_version=0.7.7
 create_wrksrc=yes
@@ -59,7 +59,7 @@ homepage="https://nginx.org"
 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="b33d569a6f11a01433a57ce17e83935e953ad4dc77cdd4d40f896c88ac26eb53
+checksum="9ebb333a9e82b952acd3e2b4aeb1d4ff6406f72491bab6cd9fe69f0dea737f31
  e34ef2f38512e1c04ee201c3b68f7ba7ec8f1537dc6a500278bc2219ab435228
  4dac9cbf071e5a7dfe135b4d87e20112d207fcbf5fb620854af8dab44ec3e7bd"
 # Tests fail when nginx run as root and there is no nginx user