From b0adb02107031e7fe90285a365a9a659fb64107b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 4 Nov 2025 10:35:26 +0100 Subject: initial package open https://github.com/mariadb-corporation/mysqlnd_ed25519/pull/1 add dependency on mysqlnd --- .gitignore | 9 +++ 1.patch | 29 ++++++++++ Makefile | 4 ++ PHPINFO | 4 ++ REFLECTION | 7 +++ composer.json | 30 ++++++++++ php-mariadb-mysqlnd-ed25519.spec | 121 +++++++++++++++++++++++++++++++++++++++ 7 files changed, 204 insertions(+) create mode 100644 .gitignore create mode 100644 1.patch create mode 100644 Makefile create mode 100644 PHPINFO create mode 100644 REFLECTION create mode 100644 composer.json create mode 100644 php-mariadb-mysqlnd-ed25519.spec diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..01f0400 --- /dev/null +++ b/.gitignore @@ -0,0 +1,9 @@ +clog +package-*.xml +*.tgz +*.tar.bz2 +*.tar.gz +*.tar.xz +*.tar.xz.asc +*.src.rpm +*/*rpm diff --git a/1.patch b/1.patch new file mode 100644 index 0000000..4ff766e --- /dev/null +++ b/1.patch @@ -0,0 +1,29 @@ +From cd67df40403292c6e120f27599fc5593e24ec432 Mon Sep 17 00:00:00 2001 +From: Remi Collet +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), diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..13af741 --- /dev/null +++ b/Makefile @@ -0,0 +1,4 @@ +SRCDIR := $(shell pwd) +NAME := $(shell basename $(SRCDIR)) +include ../../../common/Makefile + diff --git a/PHPINFO b/PHPINFO new file mode 100644 index 0000000..86c2c45 --- /dev/null +++ b/PHPINFO @@ -0,0 +1,4 @@ + +mysqlnd_ed25519 + +Version => 1.0.1 diff --git a/REFLECTION b/REFLECTION new file mode 100644 index 0000000..7bbd258 --- /dev/null +++ b/REFLECTION @@ -0,0 +1,7 @@ +Extension [ extension #103 mysqlnd_ed25519 version 1.0.1 ] { + + - Dependencies { + Dependency [ mysqlnd (Required) ] + } +} + diff --git a/composer.json b/composer.json new file mode 100644 index 0000000..8d21073 --- /dev/null +++ b/composer.json @@ -0,0 +1,30 @@ +{ + "name": "mariadb/mysqlnd_ed25519", + "description": "MariaDB ed25519 authentication plugin for mysqlnd", + "type": "php-ext", + "license": "BSD-3-Clause", + "authors": [ + { + "name": "Georg Richter", + "email": "georg@mariadb.com", + "role": "Maintainer" + } + ], + "require": { + "php": ">=8.1" + }, + "php-ext": { + "extension-name": "mysqlnd_ed25519", + "priority": 30, + "support-zts": true, + "support-nts": true, + "configure-options": [ + { + "name": "with-mysqlnd-ed25519", + "description": "Enable MariaDB ed25519 authentication support for mysqlnd", + "needs-value": false + } + ] + } +} + diff --git a/php-mariadb-mysqlnd-ed25519.spec b/php-mariadb-mysqlnd-ed25519.spec new file mode 100644 index 0000000..feb4fa1 --- /dev/null +++ b/php-mariadb-mysqlnd-ed25519.spec @@ -0,0 +1,121 @@ +# remirepo spec file for php-mariadb-mysqlnd-ed25519 +# +# SPDX-FileCopyrightText: Copyright 2025 Remi Collet +# SPDX-License-Identifier: CECILL-2.1 +# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt +# +# Please, preserve the changelog entries +# + +%{?scl:%scl_package php-mariadb-mysqlnd-ed25519} + +# Extension +%global ext_name mysqlnd_ed25519 +%global ini_name 40-%{ext_name}.ini +%global upstream_version 1.0.1 +#global upstream_prever RC1 +# PIE / packagist +%global pie_vend mariadb +%global pie_proj %{ext_name} +# Github forge +%global gh_vend mariadb-corporation +%global gh_proj %{ext_name} +%global forgeurl https://github.com/%{gh_vend}/%{gh_proj} +#global commit b3ae87353da524f33374ee0418ad48f704bb6af1 +%global tag %{upstream_version}%{?upstream_prever} + +Summary: MariaDB ed25519 authentication plugin for mysqlnd +Name: %{?scl_prefix}php-mariadb-mysqlnd-ed25519 +Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} +%forgemeta +Release: 1%{?dist} +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 +BuildRequires: %{?scl_prefix}php-mysqlnd +BuildRequires: pkgconfig(libsodium) + +Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} +Requires: %{?scl_prefix}php(api) = %{php_core_api} +Requires: %{?scl_prefix}php-mysqlnd%{?_isa} + +# Extension +Provides: %{?scl_prefix}php-%{ext_name} = %{version} +Provides: %{?scl_prefix}php-%{ext_name}%{?_isa} = %{version} +# PIE (+ underscore) +Provides: %{?scl_prefix}php-%{pie_vend}-%{pie_proj} = %{version} +Provides: %{?scl_prefix}php-%{pie_vend}-%{pie_proj}%{?_isa} = %{version} +Provides: %{?scl_prefix}php-pie(%{pie_vend}/%{pie_proj}) = %{version} + + +%description +A mysqlnd authentication plugin providing Ed25519-based authentication for PHP +when connecting to MariaDB servers. + +Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')%{?scl: as Software Collection (%{scl} by %{?scl_vendor}%{!?scl_vendor:rh})}. + + +%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_ed25519.h) +if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then + : Error: Upstream extension version is ${extver}, expecting %{version}. + exit 1 +fi + +: Create configuration file +cat << 'EOF' | tee %{ini_name} +; Enable the %{summary} +extension=%{ext_name} +EOF + + +%build +%{__phpize} +sed -e 's/INSTALL_ROOT/DESTDIR/' -i build/Makefile.global + +%configure \ + --enable-mysqlnd_ed25519 \ + --with-libdir=%{_lib} \ + --with-php-config=%{__phpconfig} + +%make_build + + +%install +%make_install + +# install config file +install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name} + + +%check +: Minimal load test for the extension +%{__php} --no-php-ini \ + --define extension=mysqlnd \ + --define extension=%{buildroot}/%{php_extdir}/%{ext_name}.so \ + --modules | grep '^%{ext_name}$' + + +%files +%license LICENSE +%doc composer.json +%doc *.md +%config(noreplace) %{php_inidir}/%{ini_name} +%{php_extdir}/%{ext_name}.so + + +%changelog +* Tue Nov 4 2025 Remi Collet - 1.0.1-1 +- initial package +- open https://github.com/mariadb-corporation/mysqlnd_ed25519/pull/1 + add dependency on mysqlnd -- cgit