diff options
| author | Remi Collet <remi@remirepo.net> | 2025-11-13 08:36:54 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2025-11-13 08:36:54 +0100 |
| commit | c7815bad4ff05320cf4372c54f8fdd888962759a (patch) | |
| tree | e770b297648261d9717cb10cb8bbe94335f270ef | |
| parent | b0adb02107031e7fe90285a365a9a659fb64107b (diff) | |
drop patch merged upstream
open https://github.com/mariadb-corporation/mysqlnd_ed25519/pull/2 fix version
| -rw-r--r-- | 1.patch | 29 | ||||
| -rw-r--r-- | PHPINFO | 2 | ||||
| -rw-r--r-- | REFLECTION | 2 | ||||
| -rw-r--r-- | composer.json | 5 | ||||
| -rw-r--r-- | php-mariadb-mysqlnd-ed25519.spec | 12 |
5 files changed, 14 insertions, 36 deletions
diff --git a/1.patch b/1.patch deleted file mode 100644 index 4ff766e..0000000 --- a/1.patch +++ /dev/null @@ -1,29 +0,0 @@ -From cd67df40403292c6e120f27599fc5593e24ec432 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Tue, 4 Nov 2025 09:59:04 +0100 -Subject: [PATCH] add dependency on mysqlnd - ---- - php_mysqlnd_ed25519.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/php_mysqlnd_ed25519.c b/php_mysqlnd_ed25519.c -index f705eee..a3b9cc0 100644 ---- a/php_mysqlnd_ed25519.c -+++ b/php_mysqlnd_ed25519.c -@@ -152,8 +152,14 @@ PHP_MSHUTDOWN_FUNCTION(mysqlnd_ed25519) - return SUCCESS; - } - -+static const zend_module_dep mysqlnd_ed25519_deps[] = { -+ ZEND_MOD_REQUIRED("mysqlnd") -+ ZEND_MOD_END -+}; -+ - zend_module_entry mysqlnd_ed25519_module_entry = { -- STANDARD_MODULE_HEADER, -+ STANDARD_MODULE_HEADER_EX, NULL, -+ mysqlnd_ed25519_deps, - "mysqlnd_ed25519", - NULL, - PHP_MINIT(mysqlnd_ed25519), @@ -1,4 +1,4 @@ mysqlnd_ed25519 -Version => 1.0.1 +Version => 1.0.2 @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #103 mysqlnd_ed25519 version 1.0.1 ] { +Extension [ <persistent> extension #103 mysqlnd_ed25519 version 1.0.2 ] { - Dependencies { Dependency [ mysqlnd (Required) ] diff --git a/composer.json b/composer.json index 8d21073..6fc12f7 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,10 @@ } ], "require": { - "php": ">=8.1" + "php": ">=8.2" + }, + "suggest": { + "ext-mysqlnd": "*" }, "php-ext": { "extension-name": "mysqlnd_ed25519", diff --git a/php-mariadb-mysqlnd-ed25519.spec b/php-mariadb-mysqlnd-ed25519.spec index feb4fa1..b0bfd04 100644 --- a/php-mariadb-mysqlnd-ed25519.spec +++ b/php-mariadb-mysqlnd-ed25519.spec @@ -12,7 +12,7 @@ # Extension %global ext_name mysqlnd_ed25519 %global ini_name 40-%{ext_name}.ini -%global upstream_version 1.0.1 +%global upstream_version 1.0.2 #global upstream_prever RC1 # PIE / packagist %global pie_vend mariadb @@ -33,8 +33,6 @@ License: BSD-3-Clause URL: %{forgeurl} Source0: %{forgesource} -Patch0: https://patch-diff.githubusercontent.com/raw/mariadb-corporation/mysqlnd_ed25519/pull/1.patch - BuildRequires: make BuildRequires: gcc BuildRequires: %{?scl_prefix}php-devel >= 8.1 @@ -63,7 +61,8 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO %prep %forgesetup -%patch -P0 -p1 -b .pr1 + +sed -e '/PHP_MARIADB_AUTH_PLUGIN_VERSION/s/1.0.1/%{upstream_version}/' -i php_mysqlnd_ed25519.h : Sanity check, really often broken extver=$(sed -n '/#define PHP_MARIADB_AUTH_PLUGIN_VERSION/{s/.* "//;s/".*$//;p}' php_mysqlnd_ed25519.h) @@ -115,6 +114,11 @@ install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name} %changelog +* Thu Nov 13 2025 Remi Collet <remi@remirepo.net> - 1.0.2-1 +- update to 1.0.2 +- drop patch merged upstream +- open https://github.com/mariadb-corporation/mysqlnd_ed25519/pull/2 fix version + * Tue Nov 4 2025 Remi Collet <remi@remirepo.net> - 1.0.1-1 - initial package - open https://github.com/mariadb-corporation/mysqlnd_ed25519/pull/1 |