aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Postnikov <apostnikov@gmail.com>2024-02-28 13:04:39 +0100
committerAndy Postnikov <apostnikov@gmail.com>2024-02-28 13:21:50 +0100
commit7c0fd7ed797b5263f6ef2156d8458f7129283fe7 (patch)
tree8b8d089e1ac276dcc1d29e4fda1eda133b7e64e5
parentee7889b84f9a8e9f2e86daf232c79770c3790377 (diff)
community/unit: upgrade to 1.32.0
-rw-r--r--community/unit/APKBUILD10
-rw-r--r--community/unit/fix-php-log.patch36
2 files changed, 4 insertions, 42 deletions
diff --git a/community/unit/APKBUILD b/community/unit/APKBUILD
index cb28e1296d9..7ccc1a1f1fc 100644
--- a/community/unit/APKBUILD
+++ b/community/unit/APKBUILD
@@ -2,8 +2,8 @@
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
# Maintainer: Andy Postnikov <apostnikov@gmail.com>
pkgname=unit
-pkgver=1.31.1
-pkgrel=3
+pkgver=1.32.0
+pkgrel=0
pkgdesc="NGINX Unit is a dynamic web application server"
url="https://unit.nginx.org/"
arch="all"
@@ -33,12 +33,11 @@ pkgusers="$pkgname"
pkggroups="$pkgname"
install="$pkgname.pre-install"
subpackages="$pkgname-openrc $pkgname-tools::noarch $pkgname-doc"
-source="https://unit.nginx.org/download/unit-$pkgver.tar.gz
+source="https://sources.nginx.org/unit/unit-$pkgver.tar.gz
$pkgname.initd
$pkgname.confd
$pkgname.logrotate
phpver.patch
- fix-php-log.patch
"
for _mod in perl php$_phpver1 php$_phpver2 php$_phpver3 python3 ruby; do
@@ -134,10 +133,9 @@ _module() {
}
sha512sums="
-28e5f1e88b9e5e21c5094f901227e193137c120e4af3f2950e113d118a301cabb17abf9f0fea8fc8893f36f6e9ae09f86bbf7a323999da34e71e42615937c57c unit-1.31.1.tar.gz
+52b1c8d6d07db927a4836e854a1372f27230b03ddb09bc8203c4c8433e8391e4bf35d62de3f37e91cde3680d19c183e3f871d5e22fba20343548946b44be466c unit-1.32.0.tar.gz
76ca55b0b697361c9799a57414d88c36bc59458af8154f7c4275302ad7694bef4ba4a295685956dd5472d8508bac8e1d1977ff7ff4f46cc443f63ea3e3c35d55 unit.initd
f85112726dfcace2b6d94b10669615fef517f5aa10ac858890dd9f5c868a6e2569500f7411f758fcb24c98c9630760d36a74bd33ea510ab0f8ca8cd6cb1fb1e8 unit.confd
723e465162dfdb31881680200221542add414e54ef4f4f1fc57e91b7b57777dfb21c2eee4727ecbba0c1943bb77a2597cc0225b16e334c38258c296d15b1df74 unit.logrotate
2fe9966f54fd5d23316810b0260d966e2093c303d8a9ecea693971fe2243c579ed5db0e41e01fc01e56801387bd19cc72f5b26c45d21e5d48084e9ded384965b phpver.patch
-ea05f53207774cda5186cb2629df10a6cd1d762cb718b7eb4e2d2370747236cdad5e9d557c72e028e60ed029c119616139c068f0056628be768eb503990f46f1 fix-php-log.patch
"
diff --git a/community/unit/fix-php-log.patch b/community/unit/fix-php-log.patch
deleted file mode 100644
index 51fcca10aaf..00000000000
--- a/community/unit/fix-php-log.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Patch-Source: https://github.com/nginx/unit/commit/919cae7ff95a3ce5878731a8d23f34c75489d3b4
-From 919cae7ff95a3ce5878731a8d23f34c75489d3b4 Mon Sep 17 00:00:00 2001
-From: Andrew Clayton <a.clayton@nginx.com>
-Date: Wed, 15 Nov 2023 03:34:49 +0000
-Subject: [PATCH] PHP: Fix a possible file-pointer leak.
-
-In nxt_php_execute() it is possible we could bail out before cleaning up
-the FILE * representing the PHP script to execute.
-
-At this point we only need to call fclose(3) on it.
-
-We could have possibly moved the opening of this file to later in the
-function, but it is probably good to bail out as early as possible if we
-can't open it.
-
-This was found by Coverity.
-
-Fixes: bebc03c72 ("PHP: Implement better error handling.")
-Signed-off-by: Andrew Clayton <a.clayton@nginx.com>
----
- src/nxt_php_sapi.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/nxt_php_sapi.c b/src/nxt_php_sapi.c
-index ba000fc02..77117533f 100644
---- a/src/nxt_php_sapi.c
-+++ b/src/nxt_php_sapi.c
-@@ -1225,6 +1225,8 @@ nxt_php_execute(nxt_php_run_ctx_t *ctx, nxt_unit_request_t *r)
- nxt_unit_req_debug(ctx->req, "php_request_startup() failed");
-
- nxt_unit_request_done(ctx->req, NXT_UNIT_ERROR);
-+ fclose(fp);
-+
- return;
- }
-