summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2021-11-18 16:39:28 +0100
committerRemi Collet <remi@php.net>2021-11-18 16:39:28 +0100
commit99a3fed19e4861c484f5f4cc8e0fa9ee218ca0f0 (patch)
treef9e04d30c1ceb0536e32f5f7928328b0bf423d0c
parenta3211358265bfafa5089300210c9be11fc43ff7c (diff)
update to 1.26.0HEADmaster
-rw-r--r--unit-build.patch25
-rw-r--r--unit-php.spec12
2 files changed, 6 insertions, 31 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-php.spec b/unit-php.spec
index 5904298..ee68f90 100644
--- a/unit-php.spec
+++ b/unit-php.spec
@@ -9,7 +9,7 @@
%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})
%undefine _debugsource_packages
@@ -34,16 +34,14 @@ Requires: %{scl_prefix}php-embedded
%endif
Name: %{?scl_prefix}%{project}-php
-Version: 1.25.0
-Release: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Version: 1.26.0
+Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
Summary: PHP module for NGINX Unit
License: ASL 2.0
URL: https://unit.nginx.org/
Source0: https://github.com/%{gh_owner}/%{project}/archive/%{gh_commit}/%{project}-%{version}-%{gh_short}.tar.gz
-Patch1: unit-build.patch
-
BuildRequires: make
BuildRequires: %{?dtsprefix}gcc
BuildRequires: %{?scl_prefix}php-devel
@@ -64,7 +62,6 @@ and NGINX unit %{version}.
%prep
%setup -qn %{project}-%{gh_commit}
-%patch1 -p1 -b .build
%build
@@ -125,6 +122,9 @@ make %{modname}-install DESTDIR=%{buildroot}
%changelog
+* Thu Nov 18 2021 Remi Collet <remi@remirepo.net> - 1.26.0-1
+- update to 1.26.0
+
* Fri Sep 3 2021 Remi Collet <remi@remirepo.net> - 1.25.0-3
- fix build with recent glibc using patch from
https://github.com/nginx/unit/pull/576