diff options
| author | Remi Collet <remi@remirepo.net> | 2025-03-17 07:06:45 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2025-03-17 07:06:45 +0100 |
| commit | 301d31abb857af1ab81aaa417b1e2c4813270349 (patch) | |
| tree | dd7df3b8d76f4447fa4195a9f4478c5fb580265f | |
| parent | b1182180e855bce69aa9b6588c394e51158bfb9e (diff) | |
drop patch merged upstream
| -rw-r--r-- | 11.patch | 26 | ||||
| -rw-r--r-- | PHPINFO | 2 | ||||
| -rw-r--r-- | REFLECTION | 2 | ||||
| -rw-r--r-- | php-pecl-krb5.spec | 10 |
4 files changed, 7 insertions, 33 deletions
diff --git a/11.patch b/11.patch deleted file mode 100644 index 7895453..0000000 --- a/11.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 4e7cffdb4dbc080d12c5ba3d8fcb40e79f324a74 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Mon, 3 Mar 2025 07:36:39 +0100 -Subject: [PATCH] fix PHP 7 compatibility - ---- - negotiate_auth.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/negotiate_auth.c b/negotiate_auth.c -index 4f20770..ce88e26 100644 ---- a/negotiate_auth.c -+++ b/negotiate_auth.c -@@ -240,7 +240,12 @@ PHP_METHOD(KRB5NegotiateAuth, __construct) - #endif - - if (zchannel != NULL) { -+#if PHP_VERSION_ID < 80000 -+ Z_ADDREF_P(zchannel); -+ ZVAL_OBJ(&object->chan_bindings, Z_OBJ_P(zchannel)); -+#else - ZVAL_OBJ_COPY(&object->chan_bindings, Z_OBJ_P(zchannel)); -+#endif - } - - @@ -2,7 +2,7 @@ krb5 Kerberos 5 support => enabled -Extension version => 1.2.3 +Extension version => 1.2.4 Library version => Kerberos 5 release 1.21.3 KADM5 support => yes Import cred support => no @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #87 krb5 version 1.2.3 ] { +Extension [ <persistent> extension #87 krb5 version 1.2.4 ] { - Constants [14] { Constant [ int GSS_C_DELEG_FLAG ] { 1 } diff --git a/php-pecl-krb5.spec b/php-pecl-krb5.spec index 97f9ada..5f813d4 100644 --- a/php-pecl-krb5.spec +++ b/php-pecl-krb5.spec @@ -25,14 +25,12 @@ Summary: Kerberos authentification extension Name: %{?scl_prefix}php-pecl-%{pecl_name} -Version: 1.2.3 +Version: 1.2.4 Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: MIT URL: https://pecl.php.net/package/%{pecl_name} Source0: https://pecl.php.net/get/%{pecl_name}-%{version}.tgz -Patch0: https://patch-diff.githubusercontent.com/raw/php/pecl-authentication-krb5/pull/11.patch - BuildRequires: make BuildRequires: %{?dtsprefix}gcc BuildRequires: krb5-devel >= 1.8 @@ -80,8 +78,6 @@ These are the files needed to compile programs using the Kerberos extension. sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml cd %{sources} -%patch -P0 -p1 -b .pr11 - # Sanity check, really often broken extver=$(sed -n '/#define PHP_KRB5_VERSION/{s/.* "//;s/".*$//;p}' php_krb5.h) if test "x${extver}" != "x%{version}"; then @@ -195,6 +191,10 @@ done %changelog +* Mon Mar 17 2025 Remi Collet <remi@remirepo.net> - 1.2.4-1 +- update to 1.2.4 (no change) +- drop patch merged upstream + * Mon Mar 3 2025 Remi Collet <remi@remirepo.net> - 1.2.3-1 - update to 1.2.3 - re-license spec file to CECILL-2.1 |