summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2022-05-18 07:26:19 +0200
committerRemi Collet <remi@php.net>2022-05-18 07:26:19 +0200
commite0df849c59097bf7aa0254be8abdf879ca60e8a4 (patch)
tree9d9bde4a3281793e6e24a2e7a7e0c386ffd92d14
parent4db8b1e839864c8fc3c488f097ff692b1cc49416 (diff)
fix segfault when overriding sp.configuration_file
from https://github.com/jvoisin/snuffleupagus/pull/422 fix ZTS build from https://github.com/jvoisin/snuffleupagus/pull/423/
-rw-r--r--php-snuffleupagus.spec11
1 files changed, 10 insertions, 1 deletions
diff --git a/php-snuffleupagus.spec b/php-snuffleupagus.spec
index 2fce251..818dee2 100644
--- a/php-snuffleupagus.spec
+++ b/php-snuffleupagus.spec
@@ -35,13 +35,15 @@ Version: 0.8.1
%if 0%{?gh_date}
Release: 2%{gh_date}.%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
%else
-Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
%endif
License: LGPLv3
Group: Development/Languages
URL: https://github.com/%{gh_owner}/%{gh_project}
Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{pkg_name}-%{version}-%{gh_short}.tar.gz
+Patch0: upstream.patch
+
BuildRequires: %{?dtsprefix}gcc
BuildRequires: %{?scl_prefix}php-devel > 7
BuildRequires: pcre-devel
@@ -84,6 +86,7 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
%prep
%setup -q -n %{gh_project}-%{gh_commit}
+%patch0 -p1 -b .up
cd src
# Sanity check, really often broken
@@ -230,6 +233,12 @@ REPORT_EXIT_STATUS=1 \
%changelog
+* Wed May 18 2022 Remi Collet <remi@remirepo.net> - 0.8.0-2
+- fix segfault when overriding sp.configuration_file
+ from https://github.com/jvoisin/snuffleupagus/pull/422
+- fix ZTS build
+ from https://github.com/jvoisin/snuffleupagus/pull/423/
+
* Mon May 16 2022 Remi Collet <remi@remirepo.net> - 0.8.0-1
- update to 0.8.0
- open https://github.com/jvoisin/snuffleupagus/issues/418 bad version