diff options
| author | Remi Collet <remi@remirepo.net> | 2025-11-13 08:36:43 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2025-11-13 08:36:43 +0100 |
| commit | d737efb27f4b6e143ff3bf9335056719d895f980 (patch) | |
| tree | 51896fd02ce9393ff665891412d8109aa765003f | |
| parent | f45b05150a815e03938b0aa3fba9db5fc9c92cdc (diff) | |
drop patch merged upstream
| -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-parsec.spec | 9 |
5 files changed, 11 insertions, 36 deletions
diff --git a/1.patch b/1.patch deleted file mode 100644 index 1c96cd5..0000000 --- a/1.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 944ffc814ad6602482ca76f6f2f14f9eca68311b Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Tue, 4 Nov 2025 09:45:12 +0100 -Subject: [PATCH] add dependency on mysqlnd - ---- - php_mysqlnd_parsec.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/php_mysqlnd_parsec.c b/php_mysqlnd_parsec.c -index bf90c20..f611fbb 100644 ---- a/php_mysqlnd_parsec.c -+++ b/php_mysqlnd_parsec.c -@@ -239,8 +239,14 @@ PHP_MSHUTDOWN_FUNCTION(mysqlnd_parsec) - return SUCCESS; - } - -+static const zend_module_dep mysqlnd_parsec_deps[] = { -+ ZEND_MOD_REQUIRED("mysqlnd") -+ ZEND_MOD_END -+}; -+ - zend_module_entry mysqlnd_parsec_module_entry = { -- STANDARD_MODULE_HEADER, -+ STANDARD_MODULE_HEADER_EX, NULL, -+ mysqlnd_parsec_deps, - "mysqlnd_parsec", - NULL, - PHP_MINIT(mysqlnd_parsec), @@ -1,4 +1,4 @@ mysqlnd_parsec -Version => 1.0.0 +Version => 1.0.1 @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #103 mysqlnd_parsec version 1.0.0 ] { +Extension [ <persistent> extension #104 mysqlnd_parsec version 1.0.1 ] { - Dependencies { Dependency [ mysqlnd (Required) ] diff --git a/composer.json b/composer.json index acb9fe1..30452c1 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_parsec", diff --git a/php-mariadb-mysqlnd-parsec.spec b/php-mariadb-mysqlnd-parsec.spec index ba38821..8acffe0 100644 --- a/php-mariadb-mysqlnd-parsec.spec +++ b/php-mariadb-mysqlnd-parsec.spec @@ -12,7 +12,7 @@ # Extension %global ext_name mysqlnd_parsec %global ini_name 40-%{ext_name}.ini -%global upstream_version 1.0.0 +%global upstream_version 1.0.1 #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_parsec/pull/1.patch - BuildRequires: make BuildRequires: gcc BuildRequires: %{?scl_prefix}php-devel >= 8.1 @@ -64,7 +62,6 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO %prep %forgesetup -%patch -P0 -p1 -b .pr1 : Sanity check, really often broken extver=$(sed -n '/#define PHP_MARIADB_AUTH_PLUGIN_VERSION/{s/.* "//;s/".*$//;p}' php_mysqlnd_parsec.h) @@ -116,6 +113,10 @@ install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name} %changelog +* Thu Nov 13 2025 Remi Collet <remi@remirepo.net> - 1.0.1-1 +- update to 1.0.1 +- drop patch merged upstream + * Tue Nov 4 2025 Remi Collet <remi@remirepo.net> - 1.0.0-1 - initial package - open https://github.com/mariadb-corporation/mysqlnd_parsec/pull/1 |