summaryrefslogtreecommitdiffstats
path: root/unit.spec
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2022-02-11 15:44:57 +0100
committerRemi Collet <remi@php.net>2022-02-11 15:44:57 +0100
commitd9333ff8a007bf93c5566bbda1362b70ce547e05 (patch)
tree46e66324a76479b05d207f6662d971d06fafdd97 /unit.spec
parent423f98550f2c5c567bce20f274f6b33ed4f2f1da (diff)
fix build error with GCC 12 using workaround to
https://github.com/nginx/unit/issues/639
Diffstat (limited to 'unit.spec')
-rw-r--r--unit.spec20
1 files changed, 14 insertions, 6 deletions
diff --git a/unit.spec b/unit.spec
index 39c2743..eb99906 100644
--- a/unit.spec
+++ b/unit.spec
@@ -11,13 +11,13 @@
%global gh_owner nginx
%global project unit
-%global gh_commit 3f9d5872692b9ce617abdd82e69609897631b531
+%global gh_commit 8b954d833110c70f641561fd141b27b2b72a5022
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
Name: unit
Summary: NGINX Unit application server
-Version: 1.26.0
-Release: 3%{?dist}
+Version: 1.26.1
+Release: 2%{?dist}
License: ASL 2.0
URL: https://unit.nginx.org/
@@ -33,8 +33,9 @@ Patch0: %{project}-syspol.patch
# Workaround for OpenSSL 3.0
# https://github.com/nginx/unit/pull/598
Patch1: %{project}-openssl3.patch
-# https://github.com/nginx/unit/issues/600
-Patch2: %{project}-upstream.patch
+# Woraroung use-afer-free
+# https://github.com/nginx/unit/issues/639
+Patch2: %{project}-gcc12.patch
BuildRequires: make
BuildRequires: gcc
@@ -70,7 +71,7 @@ Library and include files required for NGINX Unit modules development.
%setup -qn %{project}-%{gh_commit}
%patch0 -p1 -b .syspol
%patch1 -p1 -b .openssl3
-%patch2 -p1 -b .stop
+%patch2 -p1 -b .gcc12
cp pkg/rpm/rpmbuild/SOURCES/unit.example.config example.config
@@ -194,6 +195,13 @@ BANNER
%changelog
+* Fri Feb 11 2022 Remi Collet <remi@remirepo.net> - 1.26.1-2
+- fix build error with GCC 12 using workaround to
+ https://github.com/nginx/unit/issues/639
+
+* Thu Dec 2 2021 Remi Collet <remi@remirepo.net> - 1.26.1-1
+- update to 1.26.1
+
* Mon Nov 22 2021 Remi Collet <remi@remirepo.net> - 1.26.0-3
- add patch proposal for https://github.com/nginx/unit/issues/600