diff options
| author | Remi Collet <remi@remirepo.net> | 2025-08-27 10:50:51 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2025-08-27 10:50:51 +0200 |
| commit | 8b6b57bf3ffbb63604b49adcbaf93d5eacda41a0 (patch) | |
| tree | f562ac661e15bb93c9c479d7947ab592b4d99b66 | |
| parent | 484715a036526f11f2e75aba3703bff2d63c6bbd (diff) | |
re-license spec file to CECILL-2.1
| -rw-r--r-- | PHPINFO | 2 | ||||
| -rw-r--r-- | REFLECTION | 2 | ||||
| -rw-r--r-- | php-snuffleupagus.spec | 33 |
3 files changed, 22 insertions, 15 deletions
@@ -2,7 +2,7 @@ snuffleupagus snuffleupagus support => enabled -Version => 0.11.0 +Version => 0.12.0 Valid config => yes Directive => Local Value => Master Value @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #94 snuffleupagus version 0.11.0 ] { +Extension [ <persistent> extension #111 snuffleupagus version 0.12.0 ] { - INI { Entry [ sp.configuration_file <SYSTEM> ] diff --git a/php-snuffleupagus.spec b/php-snuffleupagus.spec index d2263b7..26330e7 100644 --- a/php-snuffleupagus.spec +++ b/php-snuffleupagus.spec @@ -1,8 +1,8 @@ # remirepo spec file for php-snuffleupagus # -# Copyright (c) 2018-2024 Remi Collet -# License: CC-BY-SA-4.0 -# http://creativecommons.org/licenses/by-sa/4.0/ +# SPDX-FileCopyrightText: Copyright 201825 Remi Collet +# SPDX-License-Identifier: CECILL-2.1 +# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt # # Please, preserve the changelog entries # @@ -16,7 +16,7 @@ %bcond_without tests -%global gh_commit 0ba0c07bc7c9cba401e061ae86ee4adcf9655be9 +%global gh_commit 1c7598c432551d0c49c2c57f249ccd5ccabce638 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner jvoisin %global gh_project snuffleupagus @@ -31,7 +31,7 @@ Summary: Security module for PHP Name: %{?scl_prefix}php-snuffleupagus -Version: 0.11.0 +Version: 0.12.0 %if 0%{?gh_date} Release: 1%{gh_date}.%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} %else @@ -44,7 +44,6 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit} BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel >= 7.0 -BuildRequires: pcre-devel # For tests/upload_validation_real.phpt # BuildRequires: %%{?scl_prefix}php-vld BuildRequires: %{?scl_prefix}php-curl @@ -110,9 +109,6 @@ EOF cat << 'EOF' | tee %{pecl_name}-default.rules # Default rules see https://snuffleupagus.readthedocs.io/config.html - -# Don't report about EOL version -sp.global.show_old_php_warning.disable(); EOF @@ -121,13 +117,16 @@ EOF cd %{sources} %{__phpize} +[ -f Makefile.global ] && GLOBAL=Makefile.global || GLOBAL=build/Makefile.global +sed -e 's/INSTALL_ROOT/DESTDIR/' -i $GLOBAL cd ../NTS %configure \ --with-php-config=%{__phpconfig} \ --with-libdir=%{_lib} \ --enable-snuffleupagus -make %{?_smp_mflags} + +%make_build %if %{with_zts} cd ../ZTS @@ -135,7 +134,8 @@ cd ../ZTS --with-php-config=%{__ztsphpconfig} \ --with-libdir=%{_lib} \ --enable-snuffleupagus -make %{?_smp_mflags} + +%make_build %endif @@ -144,13 +144,13 @@ make %{?_smp_mflags} # Install the NTS stuff -make -C NTS install INSTALL_ROOT=%{buildroot} +%make_install -C NTS install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name} install -D -m 644 %{pecl_name}-default.rules %{buildroot}%{php_inidir}/%{pecl_name}-default.rules %if %{with_zts} # Install the ZTS stuff -make -C ZTS install INSTALL_ROOT=%{buildroot} +%make_install -C ZTS install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name} %endif @@ -212,6 +212,13 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Wed Aug 27 2025 Remi Collet <remi@remirepo.net> - 0.12.0-1 +- update to 0.12.0 +- re-license spec file to CECILL-2.1 + +* Tue Nov 26 2024 Remi Collet <remi@remirepo.net> - 0.11.0-2 +- drop BR on pcre-devel + * Fri Sep 6 2024 Remi Collet <remi@remirepo.net> - 0.11.0-1 - update to 0.11.0 |