diff options
| author | Remi Collet <remi@remirepo.net> | 2025-08-05 13:29:27 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2025-08-05 13:29:27 +0200 |
| commit | b84202f4b44ac60e763b6a656bfcc38bb31ba8fd (patch) | |
| tree | fcf8490c3c6a73e90a67dcf0e18cd8ce7751c600 | |
| parent | 02d774f9c3a7eaa9bf5d30462fe71b226f3dbe62 (diff) | |
drop patch merged upstream
re-license spec file to CECILL-2.1
add pie virtual provides
| -rw-r--r-- | 19.patch | 34 | ||||
| -rw-r--r-- | PHPINFO | 2 | ||||
| -rw-r--r-- | REFLECTION | 2 | ||||
| -rw-r--r-- | php-pecl-mcrypt.spec | 16 |
4 files changed, 9 insertions, 45 deletions
diff --git a/19.patch b/19.patch deleted file mode 100644 index e3fa273..0000000 --- a/19.patch +++ /dev/null @@ -1,34 +0,0 @@ -From d5a6b4bb2d9704b69ff121356e1e5a65080dfdaf Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@php.net> -Date: Wed, 10 Jul 2024 14:43:24 +0200 -Subject: [PATCH] use php_mt_rand_range for 8.4 - ---- - mcrypt.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/mcrypt.c b/mcrypt.c -index b834ffe..cf2a8d4 100644 ---- a/mcrypt.c -+++ b/mcrypt.c -@@ -38,7 +38,11 @@ - #include "php_ini.h" - #include "php_globals.h" - #include "ext/standard/info.h" -+#if PHP_VERSION_ID < 80400 - #include "ext/standard/php_rand.h" -+#else -+#include "ext/random/php_random.h" -+#endif - #include "zend_smart_str.h" - #include "php_mcrypt_filter.h" - -@@ -1414,7 +1418,7 @@ PHP_FUNCTION(mcrypt_create_iv) - } else { - n = (int)size; - while (size) { -- iv[--size] = (char) (255.0 * php_rand() / RAND_MAX); -+ iv[--size] = (char)php_mt_rand_range(0, 255); - } - } - RETVAL_STRINGL(iv, n); @@ -3,7 +3,7 @@ mcrypt mcrypt support => enabled mcrypt_filter support => enabled -Extension version => 1.0.7 +Extension version => 1.0.9 Library version => 2.5.8 Api No => 20021217 Supported ciphers => cast-128 gost rijndael-128 twofish arcfour cast-256 loki97 rijndael-192 saferplus wake blowfish-compat des rijndael-256 serpent xtea blowfish enigma rc2 tripledes @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #55 mcrypt version 1.0.7 ] { +Extension [ <persistent> extension #58 mcrypt version 1.0.9 ] { - INI { Entry [ mcrypt.algorithms_dir <ALL> ] diff --git a/php-pecl-mcrypt.spec b/php-pecl-mcrypt.spec index a1ff21c..42b4d3a 100644 --- a/php-pecl-mcrypt.spec +++ b/php-pecl-mcrypt.spec @@ -11,8 +11,8 @@ %bcond_without tests -%global pie_vend pecl -%global pie_proj mcrypt +%global pie_vend pecl +%global pie_proj mcrypt %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} %global pecl_name mcrypt %global ini_name 30-%{pecl_name}.ini @@ -21,15 +21,13 @@ Summary: Bindings for the libmcrypt library Name: %{?scl_prefix}php-pecl-mcrypt -Version: 1.0.7 -Release: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Version: 1.0.9 +Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: PHP-3.01 URL: https://pecl.php.net/package/mcrypt Source0: https://pecl.php.net/get/%{sources}.tgz -Patch0: 19.patch - BuildRequires: make BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel >= 7.2 @@ -63,8 +61,6 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd %{sources} -%patch -P0 -p1 - # Sanity check, really often broken extver=$(sed -n '/#define PHP_MCRYPT_VERSION/{s/.* "//;s/".*$//;p}' php_mcrypt.h) if test "x${extver}" != "x%{version}%{?prever}"; then @@ -176,7 +172,9 @@ TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \ %changelog -* Tue Aug 5 2025 Remi Collet <remi@remirepo.net> - 1.0.7-3 +* Tue Aug 5 2025 Remi Collet <remi@remirepo.net> - 1.0.9-1 +- update to 1.0.9 +- drop patch merged upstream - re-license spec file to CECILL-2.1 - add pie virtual provides |