update to 1.2.0HEADmaster

3 files changed, 32 insertions, 7 deletions

diff --git a/PHPINFO b/PHPINFO
index 36efafe..71e2bb7 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -2,9 +2,10 @@
 xpass
 
 Extended password support => enabled
-Extension version => 1.1.0
-libxcrypt version => 4.4.38
+Extension version => 1.2.0
+libxcrypt version => 4.5.2
 Author => Remi Collet
 License => PHP-3.01
 sha512 hash => yes
 yescrypt hash => yes
+sm3 hash => yes
diff --git a/REFLECTION b/REFLECTION
index 7809a2f..f7ea57f 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,6 +1,6 @@
-Extension [ <persistent> extension #129 xpass version 1.1.0 ] {
+Extension [ <persistent> extension #129 xpass version 1.2.0 ] {
 
-  - Constants [16] {
+  - Constants [20] {
     Constant [ <persistent> string CRYPT_PREFIX_STD_DES ] {  }
     Constant [ <persistent> string CRYPT_PREFIX_EXT_DES ] { _ }
     Constant [ <persistent> string CRYPT_PREFIX_MD5 ] { $1$ }
@@ -10,6 +10,8 @@ Extension [ <persistent> extension #129 xpass version 1.1.0 ] {
     Constant [ <persistent> string CRYPT_PREFIX_SCRYPT ] { $7$ }
     Constant [ <persistent> string CRYPT_PREFIX_GOST_YESCRYPT ] { $gy$ }
     Constant [ <persistent> string CRYPT_PREFIX_YESCRYPT ] { $y$ }
+    Constant [ <persistent> string CRYPT_PREFIX_SM3CRYPT ] { $sm3$ }
+    Constant [ <persistent> string CRYPT_PREFIX_SM3_YESCRYPT ] { $sm3y$ }
     Constant [ <persistent> int CRYPT_SALT_OK ] { 0 }
     Constant [ <persistent> int CRYPT_SALT_INVALID ] { 1 }
     Constant [ <persistent> int CRYPT_SALT_METHOD_DISABLED ] { 2 }
@@ -17,6 +19,8 @@ Extension [ <persistent> extension #129 xpass version 1.1.0 ] {
     Constant [ <persistent> int CRYPT_SALT_TOO_CHEAP ] { 4 }
     Constant [ <persistent> string PASSWORD_SHA512 ] { 6 }
     Constant [ <persistent> string PASSWORD_YESCRYPT ] { y }
+    Constant [ <persistent> string PASSWORD_SM3CRYPT ] { sm3 }
+    Constant [ <persistent> string PASSWORD_SM3_YESCRYPT ] { sm3y }
   }
 
   - Functions {
diff --git a/php-pecl-xpass.spec b/php-pecl-xpass.spec
index 6eab467..7db79c1 100644
--- a/php-pecl-xpass.spec
+++ b/php-pecl-xpass.spec
@@ -1,6 +1,6 @@
 # remirepo spec file for php-pecl-xpass
 #
-# SPDX-FileCopyrightText:  Copyright 2024-2025 Remi Collet
+# SPDX-FileCopyrightText:  Copyright 2024-2026 Remi Collet
 # SPDX-License-Identifier: CECILL-2.1
 # http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 #
@@ -16,7 +16,7 @@
 %global pie_proj         xpass
 %global pecl_name        xpass
 %global ini_name         40-%{pecl_name}.ini
-%global upstream_version 1.1.0
+%global upstream_version 1.2.0
 #global upstream_prever  RC1
 %global sources          %{pecl_name}-%{upstream_version}%{?upstream_prever}
 %global _configure       ../%{sources}/configure
@@ -24,7 +24,7 @@
 Summary:        Extended password extension
 Name:           %{?scl_prefix}php-pecl-%{pecl_name}
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-Release:        3%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Release:        1%{?dist}
 License:        PHP-3.01
 URL:            https://pecl.php.net/package/%{pecl_name}
 Source0:        https://pecl.php.net/get/%{sources}.tgz
@@ -48,6 +48,19 @@ Provides:       %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa}   = %{version}
 Provides:       %{?scl_prefix}php-pie(%{pie_vend}/%{pie_proj}) = %{version}
 Provides:       %{?scl_prefix}php-%{pie_vend}-%{pie_proj}      = %{version}
 
+%if 0%{?rhel} >= 10 && "%{?vendeur}" == "remi" && 0%{!?scl:1}
+%if "%{php_version}" >= "8.5"
+Obsoletes: php8.4-pecl-%{pecl_name}        <= %{version}
+Obsoletes: php8.5-pecl-%{pecl_name}        <= %{version}
+Provides:  php8.5-pecl-%{pecl_name}         = %{version}-%{release}
+Provides:  php8.5-pecl-%{pecl_name}%{?_isa} = %{version}-%{release}
+%elif "%{php_version}" >= "8.4"
+Obsoletes: php8.4-pecl-%{pecl_name}        <= %{version}
+Provides:  php8.4-pecl-%{pecl_name}         = %{version}-%{release}
+Provides:  php8.4-pecl-%{pecl_name}%{?_isa} = %{version}-%{release}
+%endif
+%endif
+
 
 %description
 This extension provides password hashing algorithms used by Linux
@@ -55,6 +68,8 @@ distributions, using extended crypt library (libxcrypt):
 
 * sha512 provided for legacy as used on some old distributions
 * yescrypt used on modern distributions
+* sm3crypt
+* sm3yescrypt
 
 It also provides additional functions from libxcrypt missing in core PHP:
 
@@ -62,6 +77,8 @@ It also provides additional functions from libxcrypt missing in core PHP:
 * crypt_gensalt
 * crypt_checksalt
 
+See PHP documentation on https://www.php.net/xpass
+
 Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')%{?scl: as Software Collection (%{scl} by %{?scl_vendor}%{!?scl_vendor:rh})}.
 
 
@@ -183,6 +200,9 @@ TEST_PHP_ARGS="-n -d extension=%{buildroot}/%{php_ztsextdir}/%{pecl_name}.so" \
 
 
 %changelog
+* Tue Jan 13 2026 Remi Collet <remi@remirepo.net> - 1.2.0-1
+- update to 1.2.0
+
 * Thu Sep 25 2025 Remi Collet <remi@remirepo.net> - 1.1.0-3
 - rebuild for PHP 8.5.0RC1