From ec5664ecf2d1d57f371df647cf2b2769e95de8f6 Mon Sep 17 00:00:00 2001
From: Andy Postnikov <apostnikov@gmail.com>
Date: Wed, 18 Sep 2024 03:17:13 +0200
Subject: [PATCH] testing/unit-php84: upgrade to 1.33.0

---
 testing/unit-php84/APKBUILD            | 11 ++++---
 testing/unit-php84/fix-tls-tests.patch | 40 --------------------------
 2 files changed, 5 insertions(+), 46 deletions(-)
 delete mode 100644 testing/unit-php84/fix-tls-tests.patch

diff --git a/testing/unit-php84/APKBUILD b/testing/unit-php84/APKBUILD
index df47c819845..a2efa3c68c7 100644
--- a/testing/unit-php84/APKBUILD
+++ b/testing/unit-php84/APKBUILD
@@ -2,7 +2,7 @@
 # Contributor: Jakub Jirutka <jakub@jirutka.cz>
 # Maintainer: Andy Postnikov <apostnikov@gmail.com>
 pkgname=unit-php84
-pkgver=1.32.1
+pkgver=1.33.0
 pkgrel=0
 pkgdesc="PHP 8.4 module for NGINX Unit"
 url="https://unit.nginx.org/"
@@ -21,15 +21,15 @@ checkdepends="procps-ng
 	py3-pytest
 	php$_phpver-opcache
 	"
-source="https://unit.nginx.org/download/unit-$pkgver.tar.gz
-	fix-tls-tests.patch
-	"
+#source="https://unit.nginx.org/download/unit-$pkgver.tar.gz"
+source="unit-$pkgver.tar.gz::https://github.com/nginx/unit/archive/refs/tags/$pkgver.tar.gz"
 builddir="$srcdir/unit-$pkgver"
 
 build() {
 	./configure \
 		--prefix="/usr" \
 		--localstatedir="/var" \
+		--runstatedir="/run" \
 		--statedir="/var/lib/unit" \
 		--control="unix:/run/control.unit.sock" \
 		--pid="/run/unit.pid" \
@@ -66,6 +66,5 @@ package() {
 }
 
 sha512sums="
-159b36f7afb8857188c9b64ee192e18d6990da3733caafcfb684b98e3f5182a7589ed2439f32af0cd3c763a3fa73f061f5a73ef01894182b1c12a4cd324c528a  unit-1.32.1.tar.gz
-aae610dd2e8056d278397af708926a8e24f282158dc539182f9dfd44582f6b8bba1a57df7769539572f4268db305d84f12eb9fe07dfeec9a8781a6f66ca28386  fix-tls-tests.patch
+2135fc9f6b1ae6e764c7da770e1a924cd8223f6a042229ac41cf84086f748e11503ad2bf84684dc0f141bcc1846b8fec7d03df49129a63df930d14c8afec98aa  unit-1.33.0.tar.gz
 "
diff --git a/testing/unit-php84/fix-tls-tests.patch b/testing/unit-php84/fix-tls-tests.patch
deleted file mode 100644
index fa8e35179c6..00000000000
--- a/testing/unit-php84/fix-tls-tests.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Patch-Source: https://github.com/nginx/unit/commit/a625a0b1f0d822b3224b7b29565fe9733b634afd
-From a625a0b1f0d822b3224b7b29565fe9733b634afd Mon Sep 17 00:00:00 2001
-From: Andrei Zeliankou <zelenkov@nginx.com>
-Date: Mon, 8 Apr 2024 02:18:37 +0100
-Subject: [PATCH] Tests: compatibility with OpenSSL 3.2.0
-
-OpenSSL 3.2.0 generates X.509v3 certificates by default. These
-certificates, even self-signed, cannot sign other certificates unless
-"CA:TRUE" is explicitly set in the basicConstraints extension.
-As a result, tests attempting this are currently failing.
-
-Fix is to provide "CA:TRUE" in the basicConstraints for self-signed root
-certificates used in "openssl ca" commands.
-
-Closes: https://github.com/nginx/unit/issues/1202
-Tested-by: Andrew Clayton <a.clayton@nginx.com>
-Reviewed-by: Andrew Clayton <a.clayton@nginx.com>
----
- test/unit/applications/tls.py | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/test/unit/applications/tls.py b/test/unit/applications/tls.py
-index 75354dd91..b48293be6 100644
---- a/test/unit/applications/tls.py
-+++ b/test/unit/applications/tls.py
-@@ -85,9 +85,13 @@ def openssl_conf(self, rewrite=False, alt_names=None):
- default_bits = 2048
- encrypt_key = no
- distinguished_name = req_distinguished_name
-+x509_extensions = myca_extensions
- 
- {a_sec if alt_names else ""}
--[ req_distinguished_name ]'''
-+[ req_distinguished_name ]
-+
-+[ myca_extensions ]
-+basicConstraints = critical,CA:TRUE'''
-             )
- 
-     def load(self, script, name=None):