From 6419b68c59964b09973615cddb66c7b8bd107bc9 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 4 Aug 2022 15:18:25 +0200
Subject: add patch for aarch64 from

  https://github.com/DomBlack/php-scrypt/pull/59
---
 59.patch             | 21 +++++++++++++++++++++
 php-pecl-scrypt.spec | 17 +++++++++--------
 2 files changed, 30 insertions(+), 8 deletions(-)
 create mode 100644 59.patch

diff --git a/59.patch b/59.patch
new file mode 100644
index 0000000..15aa416
--- /dev/null
+++ b/59.patch
@@ -0,0 +1,21 @@
+From 16a810d4ec8ce7538afe1537fc162f44536dd83d Mon Sep 17 00:00:00 2001
+From: Cody Logan <clpo13@gmail.com>
+Date: Tue, 24 Aug 2021 13:25:57 -0700
+Subject: [PATCH] nosse version needs to include php_scrypt.h as well
+
+---
+ crypto/crypto_scrypt-nosse.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/crypto/crypto_scrypt-nosse.c b/crypto/crypto_scrypt-nosse.c
+index 98968b0..114ce0a 100644
+--- a/crypto/crypto_scrypt-nosse.c
++++ b/crypto/crypto_scrypt-nosse.c
+@@ -45,6 +45,7 @@
+ #include "sysendian.h"
+ 
+ #include "crypto_scrypt.h"
++#include "php_scrypt.h"
+ 
+ static void blkcpy(uint8_t *, uint8_t *, size_t);
+ static void blkxor(uint8_t *, uint8_t *, size_t);
diff --git a/php-pecl-scrypt.spec b/php-pecl-scrypt.spec
index e0bc2f2..fdc861a 100644
--- a/php-pecl-scrypt.spec
+++ b/php-pecl-scrypt.spec
@@ -1,6 +1,6 @@
 # remirepo spec file for php-pecl-scrypt
 #
-# Copyright (c) 2013-2020 Remi Collet
+# Copyright (c) 2013-2022 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -22,14 +22,16 @@
 Summary:        Scrypt hashing function
 Name:           %{?sub_prefix}php-pecl-%{pecl_name}
 Version:        1.4.2
-Release:        9%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release:        10%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 License:        BSD
 Group:          Development/Languages
 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/DomBlack/php-scrypt/pull/56.patch
+Patch1:         https://patch-diff.githubusercontent.com/raw/DomBlack/php-scrypt/pull/59.patch
 
+BuildRequires:  make
 BuildRequires:  %{?dtsprefix}gcc
 BuildRequires:  %{?scl_prefix}php-devel > 5.3
 BuildRequires:  %{?scl_prefix}php-pear
@@ -61,12 +63,6 @@ Obsoletes:      php80-pecl-%{pecl_name} <= %{version}
 %endif
 %endif
 
-%if 0%{?fedora} < 20 && 0%{?rhel} < 7
-# Filter shared private
-%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$}
-%{?filter_setup}
-%endif
-
 
 %description
 A PHP wrapper to Colin Percival's scrypt implementation.
@@ -85,6 +81,7 @@ sed -e 's/role="test"/role="src"/' \
 
 cd NTS
 %patch0 -p1 -b .pr
+%patch1 -p1 -b .pr
 
 # Sanity check, really often broken
 extver=$(sed -n '/#define PHP_SCRYPT_VERSION/{s/.* "//;s/".*$//;p}' php_scrypt.h)
@@ -217,6 +214,10 @@ REPORT_EXIT_STATUS=1 \
 
 
 %changelog
+* Thu Aug  4 2022 Remi Collet <remi@remirepo.net> - 1.4.2-10
+- add patch for aarch64 from
+  https://github.com/DomBlack/php-scrypt/pull/59
+
 * Tue Oct  6 2020 Remi Collet <remi@remirepo.net> - 1.4.2-9
 - add patch for PHP 8 from
   https://github.com/DomBlack/php-scrypt/pull/56
-- 
cgit