From b13b8a4a1dce582d6f2c5011ce84babf12899755 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 27 Mar 2026 09:14:57 +0100 Subject: Update to 1.1.1 drop patch merged upstream drop pear/pecl dependency sources from github --- 2.patch | 29 ---------------------------- PHPINFO | 7 +++++++ REFLECTION | 2 +- php-pecl-ssdeep.spec | 54 ++++++++++++++++++++++++++++------------------------ 4 files changed, 37 insertions(+), 55 deletions(-) delete mode 100644 2.patch create mode 100644 PHPINFO diff --git a/2.patch b/2.patch deleted file mode 100644 index 69a001d..0000000 --- a/2.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 369e87e7469fd3e30bf46cff9f12f0d5bfc9e611 Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Fri, 4 Sep 2020 14:47:29 +0200 -Subject: [PATCH] fix for PHP 8 - ---- - ssdeep.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/ssdeep.c b/ssdeep.c -index 00e91e5..4dee7e2 100644 ---- a/ssdeep.c -+++ b/ssdeep.c -@@ -48,6 +48,15 @@ - #include "php_ssdeep.h" - #include - -+/* For PHP 8 */ -+#ifndef TSRMLS_D -+#define TSRMLS_D void -+#define TSRMLS_DC -+#define TSRMLS_C -+#define TSRMLS_CC -+#define TSRMLS_FETCH() -+#endif -+ - /* True global resources - no need for thread safety here */ - ZEND_BEGIN_ARG_INFO_EX(arginfo_ssdeep_fuzzy_hash, 0, 0, 1) - ZEND_ARG_INFO(0, to_hash) diff --git a/PHPINFO b/PHPINFO new file mode 100644 index 0000000..3f9e610 --- /dev/null +++ b/PHPINFO @@ -0,0 +1,7 @@ + +ssdeep + +ssdeep Module => enabled +version => 1.1.1 +By => Simon Holywell +http://www.simonholywell.com diff --git a/REFLECTION b/REFLECTION index 43e691c..ec69c82 100644 --- a/REFLECTION +++ b/REFLECTION @@ -1,4 +1,4 @@ -Extension [ extension #124 ssdeep version 1.1.0 ] { +Extension [ extension #123 ssdeep version 1.1.1 ] { - Functions { Function [ function ssdeep_fuzzy_hash ] { diff --git a/php-pecl-ssdeep.spec b/php-pecl-ssdeep.spec index 6e1155b..4abff11 100644 --- a/php-pecl-ssdeep.spec +++ b/php-pecl-ssdeep.spec @@ -3,9 +3,9 @@ # # Fedora spec file for php-pecl-ssdeep # -# Copyright (c) 2014-2024 Remi Collet -# License: CC-BY-SA-4.0 -# http://creativecommons.org/licenses/by-sa/4.0/ +# SPDX-FileCopyrightText: Copyright 2014-2026 Remi Collet +# SPDX-License-Identifier: CECILL-2.1 +# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt # # Please, preserve the changelog entries # @@ -21,32 +21,39 @@ %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} %global pecl_name ssdeep %global ini_name 40-%{pecl_name}.ini -%global sources %{pecl_name}-%{version} +%global sources %{gh_proj}-%{version} %global _configure ../%{sources}/configure -Summary: Wrapper for libfuzzy library +# Github forge +%global gh_vend php +%global gh_proj pecl-text-ssdeep +%global forgeurl https://github.com/%{gh_vend}/%{gh_proj} +%global tag %{version} + Name: %{?scl_prefix}php-pecl-%{pecl_name} -Version: 1.1.0 -Release: 13%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Summary: Wrapper for libfuzzy library License: BSD-2-Clause -URL: https://pecl.php.net/package/%{pecl_name} -Source0: https://pecl.php.net/get/%{sources}.tgz - -Patch0: https://patch-diff.githubusercontent.com/raw/php/pecl-text-ssdeep/pull/2.patch +Version: 1.1.1 +Release: 1%{?dist} +%forgemeta +URL: %{forgeurl} +Source0: %{forgesource} BuildRequires: make BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel -BuildRequires: %{?scl_prefix}php-pear BuildRequires: ssdeep-devel > 2.5 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} +# No PIE for now %description @@ -69,16 +76,8 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO %prep %setup -q -c -[ -f package2.xml ] && mv package2.xml package.xml - -# 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 -b .pr2 - # Sanity check, really often broken extver=$(sed -n '/# *define PHP_SSDEEP_VERSION/{s/.* "//;s/".*$//;p}' php_ssdeep.h) if test "x${extver}" != "x%{version}%{?versuf}"; then @@ -134,9 +133,6 @@ cd ../ZTS # install config file 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 - %if %{with_zts} %make_install -C ZTS @@ -176,8 +172,10 @@ REPORT_EXIT_STATUS=1 \ %files %license %{sources}/LICENSE -%doc %{pecl_docdir}/%{pecl_name} -%{pecl_xmldir}/%{name}.xml +%doc %{sources}/CREDITS +%doc %{sources}/README +%doc %{sources}/examples + %config(noreplace) %{php_inidir}/%{ini_name} %{php_extdir}/%{pecl_name}.so @@ -188,6 +186,12 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Fri Mar 27 2026 Remi Collet - 1.1.1-1 +- Update to 1.1.1 +- drop patch merged upstream +- drop pear/pecl dependency +- sources from github + * Wed Aug 30 2023 Remi Collet - 1.1.0-13 - rebuild for PHP 8.3.0RC1 -- cgit