summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--PHPINFO4
-rw-r--r--REFLECTION62
-rw-r--r--php-pecl-rnp.spec53
3 files changed, 60 insertions, 59 deletions
diff --git a/PHPINFO b/PHPINFO
index 4c2b04c..b0629b5 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -3,5 +3,5 @@ rnp
rnp support => enabled
rnp extension version => 0.2.0
-rnp library version => 0.17.0
-rnp backend => Botan version 2.19.1
+rnp library version => 0.18.1
+rnp backend => Botan version 2.19.5
diff --git a/REFLECTION b/REFLECTION
index 3bec818..6ea057b 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,36 +1,36 @@
-Extension [ <persistent> extension #95 rnp version 0.2.0 ] {
+Extension [ <persistent> extension #115 rnp version 0.2.0 ] {
- Constants [30] {
- Constant [ int RNP_LOAD_SAVE_PUBLIC_KEYS ] { 1 }
- Constant [ int RNP_LOAD_SAVE_SECRET_KEYS ] { 2 }
- Constant [ int RNP_LOAD_SAVE_PERMISSIVE ] { 256 }
- Constant [ int RNP_LOAD_SAVE_SINGLE ] { 512 }
- Constant [ int RNP_LOAD_SAVE_BASE64 ] { 1024 }
- Constant [ string RNP_FEATURE_SYMM_ALG ] { symmetric algorithm }
- Constant [ string RNP_FEATURE_AEAD_ALG ] { aead algorithm }
- Constant [ string RNP_FEATURE_PROT_MODE ] { protection mode }
- Constant [ string RNP_FEATURE_PK_ALG ] { public key algorithm }
- Constant [ string RNP_FEATURE_HASH_ALG ] { hash algorithm }
- Constant [ string RNP_FEATURE_COMP_ALG ] { compression algorithm }
- Constant [ string RNP_FEATURE_CURVE ] { elliptic curve }
- Constant [ int RNP_DUMP_MPI ] { 1 }
- Constant [ int RNP_DUMP_RAW ] { 2 }
- Constant [ int RNP_DUMP_GRIP ] { 4 }
- Constant [ int RNP_JSON_DUMP_MPI ] { 1 }
- Constant [ int RNP_JSON_DUMP_RAW ] { 2 }
- Constant [ int RNP_JSON_DUMP_GRIP ] { 4 }
- Constant [ int RNP_ENCRYPT_NOWRAP ] { 1 }
- Constant [ string RNP_KEYSTORE_GPG ] { GPG }
- Constant [ string RNP_KEYSTORE_KBX ] { KBX }
- Constant [ string RNP_KEYSTORE_G10 ] { G10 }
- Constant [ int RNP_KEY_EXPORT_ARMORED ] { 1 }
- Constant [ int RNP_KEY_EXPORT_PUBLIC ] { 2 }
- Constant [ int RNP_KEY_EXPORT_SECRET ] { 4 }
- Constant [ int RNP_KEY_EXPORT_SUBKEYS ] { 8 }
- Constant [ int RNP_KEY_EXPORT_BASE64 ] { 512 }
- Constant [ int RNP_KEY_REMOVE_PUBLIC ] { 1 }
- Constant [ int RNP_KEY_REMOVE_SECRET ] { 2 }
- Constant [ int RNP_KEY_REMOVE_SUBKEYS ] { 4 }
+ Constant [ <persistent> int RNP_LOAD_SAVE_PUBLIC_KEYS ] { 1 }
+ Constant [ <persistent> int RNP_LOAD_SAVE_SECRET_KEYS ] { 2 }
+ Constant [ <persistent> int RNP_LOAD_SAVE_PERMISSIVE ] { 256 }
+ Constant [ <persistent> int RNP_LOAD_SAVE_SINGLE ] { 512 }
+ Constant [ <persistent> int RNP_LOAD_SAVE_BASE64 ] { 1024 }
+ Constant [ <persistent> string RNP_FEATURE_SYMM_ALG ] { symmetric algorithm }
+ Constant [ <persistent> string RNP_FEATURE_AEAD_ALG ] { aead algorithm }
+ Constant [ <persistent> string RNP_FEATURE_PROT_MODE ] { protection mode }
+ Constant [ <persistent> string RNP_FEATURE_PK_ALG ] { public key algorithm }
+ Constant [ <persistent> string RNP_FEATURE_HASH_ALG ] { hash algorithm }
+ Constant [ <persistent> string RNP_FEATURE_COMP_ALG ] { compression algorithm }
+ Constant [ <persistent> string RNP_FEATURE_CURVE ] { elliptic curve }
+ Constant [ <persistent> int RNP_DUMP_MPI ] { 1 }
+ Constant [ <persistent> int RNP_DUMP_RAW ] { 2 }
+ Constant [ <persistent> int RNP_DUMP_GRIP ] { 4 }
+ Constant [ <persistent> int RNP_JSON_DUMP_MPI ] { 1 }
+ Constant [ <persistent> int RNP_JSON_DUMP_RAW ] { 2 }
+ Constant [ <persistent> int RNP_JSON_DUMP_GRIP ] { 4 }
+ Constant [ <persistent> int RNP_ENCRYPT_NOWRAP ] { 1 }
+ Constant [ <persistent> string RNP_KEYSTORE_GPG ] { GPG }
+ Constant [ <persistent> string RNP_KEYSTORE_KBX ] { KBX }
+ Constant [ <persistent> string RNP_KEYSTORE_G10 ] { G10 }
+ Constant [ <persistent> int RNP_KEY_EXPORT_ARMORED ] { 1 }
+ Constant [ <persistent> int RNP_KEY_EXPORT_PUBLIC ] { 2 }
+ Constant [ <persistent> int RNP_KEY_EXPORT_SECRET ] { 4 }
+ Constant [ <persistent> int RNP_KEY_EXPORT_SUBKEYS ] { 8 }
+ Constant [ <persistent> int RNP_KEY_EXPORT_BASE64 ] { 512 }
+ Constant [ <persistent> int RNP_KEY_REMOVE_PUBLIC ] { 1 }
+ Constant [ <persistent> int RNP_KEY_REMOVE_SECRET ] { 2 }
+ Constant [ <persistent> int RNP_KEY_REMOVE_SUBKEYS ] { 4 }
}
- Functions {
diff --git a/php-pecl-rnp.spec b/php-pecl-rnp.spec
index 8f778ba..d331e63 100644
--- a/php-pecl-rnp.spec
+++ b/php-pecl-rnp.spec
@@ -9,24 +9,32 @@
%{?scl:%scl_package php-pecl-rnp}
-%bcond_without tests
-%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}}
-%global pecl_name rnp
-%global ini_name 40-%{pecl_name}.ini
+%bcond_without tests
+%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}}
+%global pecl_name rnp
+%global ini_name 40-%{pecl_name}.ini
%global upstream_version 0.2.0
#global upstream_prever a1
-%global sources %{pecl_name}-%{upstream_version}%{?upstream_prever}
+%global sources %{archivename}
%global _configure ../%{sources}/configure
-Summary: wrapper around the RNP library
-Name: %{?scl_prefix}php-pecl-%{pecl_name}
-Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-Release: 5%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+# Github forge
+%global gh_vend rnpgp
+%global gh_proj php-rnp
+%global forgeurl https://github.com/%{gh_vend}/%{gh_proj}
+%global tag v%{upstream_version}%{?upstream_prever}
+# for EL-8 to avoid TAG usage
+%global archivename %{gh_proj}-%{upstream_version}%{?upstream_prever}
+Name: %{?scl_prefix}php-pecl-%{pecl_name}
+Summary: wrapper around the RNP library
License: BSD-2-Clause
-URL: https://pecl.php.net/package/%{pecl_name}
-Source0: https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz
+Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
+Release: 6%{?dist}
+%forgemeta
+URL: %{forgeurl}
+Source0: %{forgesource}
Patch0: 11.patch
Patch1: 13.patch
@@ -34,16 +42,18 @@ Patch1: 13.patch
BuildRequires: make
BuildRequires: %{?dtsprefix}gcc
BuildRequires: %{?scl_prefix}php-devel >= 8.0
-BuildRequires: %{?scl_prefix}php-pear
BuildRequires: librnp-devel
Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api}
Requires: %{?scl_prefix}php(api) = %{php_core_api}
+# Extension
Provides: %{?scl_prefix}php-%{pecl_name} = %{version}
Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version}
+# PECL
Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version}
Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version}
+# BNo PIE for now
%description
@@ -54,10 +64,6 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
%prep
%setup -qc
-# Don't install/register tests
-sed -e 's/role="test"/role="src"/' \
- -e '/LICENSE/s/role="doc"/role="src"/' \
- -i package.xml
pushd %{sources}
%patch -P0 -p1
@@ -113,20 +119,12 @@ make %{?_smp_mflags}
make -C NTS install INSTALL_ROOT=%{buildroot}
install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name}
-# Install XML package description
-install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml
-
# Install the ZTS stuff
%if %{with_zts}
make -C ZTS install INSTALL_ROOT=%{buildroot}
install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name}
%endif
-# Documentation
-for i in $(grep 'role="doc"' package.xml | sed -e 's/^.*name="//;s/".*$//')
-do [ -f %{sources}/$i ] && install -Dpm 644 %{sources}/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i
-done
-
%check
: Minimal load test for NTS extension
@@ -152,8 +150,7 @@ TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \
%files
%license %{sources}/LICENSE
-%doc %{pecl_docdir}/%{pecl_name}
-%{pecl_xmldir}/%{name}.xml
+%doc %{sources}/CREDITS
%config(noreplace) %{php_inidir}/%{ini_name}
%{php_extdir}/%{pecl_name}.so
@@ -165,6 +162,10 @@ TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \
%changelog
+* Thu Apr 2 2026 Remi Collet <remi@remirepo.net> - 0.2.0-6
+- drop pear/pecl dependency
+- sources from github
+
* Thu Sep 25 2025 Remi Collet <remi@remirepo.net> - 0.2.0-5
- rebuild for PHP 8.5.0RC1
generated by cgit (git 2.34.1) at 2026-04-02 18:53:05 +0000