From d759c083ce5eb9f3de8aa921c8792af3048a3d07 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Tue, 20 Jul 2021 22:08:09 +0300
Subject: [PATCH] nginx: update to 1.20.1.

---
 .../fix-libressl-stapling-issues.patch        | 27 -------------------
 srcpkgs/nginx/template                        | 21 ++++++++++++---
 2 files changed, 17 insertions(+), 31 deletions(-)
 delete mode 100644 srcpkgs/nginx/patches/fix-libressl-stapling-issues.patch

diff --git a/srcpkgs/nginx/patches/fix-libressl-stapling-issues.patch b/srcpkgs/nginx/patches/fix-libressl-stapling-issues.patch
deleted file mode 100644
index 4bb73f5ebb26..000000000000
--- a/srcpkgs/nginx/patches/fix-libressl-stapling-issues.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-ref: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=237757#c5
---- a/src/event/ngx_event_openssl_stapling.c.org  2019-05-12 23:56:58.526833000 +0200
-+++ b/src/event/ngx_event_openssl_stapling.c      2019-05-13 01:31:53.737800000 +0200
-@@ -298,7 +298,10 @@
-     SSL_CTX_select_current_cert(ssl->ctx, cert);
- #endif
-
--#ifdef SSL_CTRL_GET_EXTRA_CHAIN_CERTS
-+#ifdef SSL_CTX_get0_chain_certs
-+    /* OpenSSL 1.0.2+ */
-+    SSL_CTX_get0_chain_certs(ssl->ctx, &chain);
-+#elif SSL_CTRL_GET_EXTRA_CHAIN_CERTS
-     /* OpenSSL 1.0.1+ */
-     SSL_CTX_get_extra_chain_certs(ssl->ctx, &chain);
- #else
-@@ -655,7 +658,10 @@
-     SSL_CTX_select_current_cert(staple->ssl_ctx, ctx->cert);
- #endif
-
--#ifdef SSL_CTRL_GET_EXTRA_CHAIN_CERTS
-+#ifdef SSL_CTX_get0_chain_certs
-+    /* OpenSSL 1.0.2+ */
-+    SSL_CTX_get0_chain_certs(staple->ssl_ctx, &chain);
-+#elif SSL_CTRL_GET_EXTRA_CHAIN_CERTS
-     /* OpenSSL 1.0.1+ */
-     SSL_CTX_get_extra_chain_certs(staple->ssl_ctx, &chain);
- #else
diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index 73b460d23e53..e7df48d82ade 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -1,16 +1,24 @@
 # Template file for 'nginx'
 pkgname=nginx
-version=1.18.0
-revision=6
+version=1.20.1
+revision=1
+_tests_commit=feb754918372
+create_wrksrc=yes
+build_wrksrc="nginx-${version}"
 build_style=gnu-makefile
 hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
 makedepends="${hostmakedepends}"
+checkdepends="perl perl-IO-Socket-SSL which"
 short_desc="High performance web and reverse proxy server"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://nginx.org"
-distfiles="https://nginx.org/download/nginx-${version}.tar.gz"
-checksum=4c373e7ab5bf91d34a4f11a0c9496561061ba5eee6020db272a17a7228d35f99
+distfiles="https://nginx.org/download/nginx-${version}.tar.gz
+ https://hg.nginx.org/nginx-tests/archive/${_tests_commit}.tar.gz"
+checksum="e462e11533d5c30baa05df7652160ff5979591d291736cfa5edb9fd2edb48c49
+ 6166ed3a9202ad4065a83fa5c8f3a39d71bba9aa983b00652b7b1332291e3355"
+# tests fail when nginx run as root and there is no nginx user
+make_check=ci-skip
 
 # NOTE:
 # On update, the pregenerated header file for ARM may need synchronization.
@@ -94,6 +102,11 @@ pre_build() {
 	sed -i 's/-lcrypt/$(LDFLAGS) &/' objs/Makefile
 }
 
+do_check() {
+	TEST_NGINX_BINARY="$PWD/objs/nginx" \
+		prove "../${pkgname}-tests-${_tests_commit}"
+}
+
 post_install() {
 	sed -e 's|\<user\s\+\w\+;|user html;|g' \
 		-e '44s|html|/usr/share/nginx/html|' \