summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2021-11-18 16:39:42 +0100
committerRemi Collet <remi@php.net>2021-11-18 16:39:42 +0100
commita9f96552032a89c02e77e4a463b3fed1a73ae4b7 (patch)
tree2c4ff65265cf676bb40d28426f78934df15319ca
parent1dca2e185976b2814ad351214618dc679a32c236 (diff)
update to 1.26.0
-rw-r--r--unit-build.patch25
-rw-r--r--unit.spec17
2 files changed, 12 insertions, 30 deletions
diff --git a/unit-build.patch b/unit-build.patch
deleted file mode 100644
index c2b0ef4..0000000
--- a/unit-build.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0125873b1dfbe6e671e3c9874ec2653f1b7832fa Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Fri, 3 Sep 2021 18:03:38 +0200
-Subject: [PATCH] fix build with recent glibc
-
----
- src/nxt_thread.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/nxt_thread.h b/src/nxt_thread.h
-index d7800cc..36e74cd 100644
---- a/src/nxt_thread.h
-+++ b/src/nxt_thread.h
-@@ -142,7 +142,7 @@ nxt_thread_yield() \
- #endif
-
-
--#if (PTHREAD_STACK_MIN)
-+#if defined(PTHREAD_STACK_MIN)
- #define NXT_THREAD_STACK_MIN PTHREAD_STACK_MIN
-
- #else
---
-2.31.1
-
diff --git a/unit.spec b/unit.spec
index e2019c9..120a570 100644
--- a/unit.spec
+++ b/unit.spec
@@ -11,13 +11,13 @@
%global gh_owner nginx
%global project unit
-%global gh_commit 66e986fc19dd12c731be5f52d0aa4cea32931b7d
+%global gh_commit 3f9d5872692b9ce617abdd82e69609897631b531
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
Name: unit
Summary: NGINX Unit application server
-Version: 1.25.0
-Release: 2%{?dist}
+Version: 1.26.0
+Release: 1%{?dist}
License: ASL 2.0
URL: https://unit.nginx.org/
@@ -30,7 +30,6 @@ Source4: unit.logrotate
# Use system crypto policy
# https://github.com/nginx/unit/pull/215
Patch0: %{project}-syspol.patch
-Patch1: %{project}-build.patch
BuildRequires: make
BuildRequires: gcc
@@ -65,10 +64,12 @@ Library and include files required for NGINX Unit modules development.
%prep
%setup -qn %{project}-%{gh_commit}
%patch0 -p1 -b .syspol
-%patch1 -p1 -b .build
cp pkg/rpm/rpmbuild/SOURCES/unit.example.config example.config
+# For OpenSSL 3.0 deprecations
+sed -e 's/-Werror//' -i ./auto/types ./auto/cc/test
+
%build
# see https://github.com/nginx/unit/issues/467
@@ -189,6 +190,12 @@ BANNER
%changelog
+* Thu Nov 18 2021 Remi Collet <remi@remirepo.net> - 1.26.0-1
+- update to 1.26.0
+
+* Sat Nov 6 2021 Remi Collet <remi@remirepo.net> - 1.25.0-3
+- EL-9 build
+
* Fri Sep 3 2021 Remi Collet <remi@remirepo.net> - 1.25.0-2
- fix build with recent glibc using patch from
https://github.com/nginx/unit/pull/576