From 0c6eca2b2d7f8b4a0616de7b51d938746d8a0e0f Mon Sep 17 00:00:00 2001
From: khorben <khorben@pkgsrc.org>
Date: Sat, 29 May 2021 19:30:57 +0000
Subject: cpuminer: update to version 2.5.1

This release adds support for bech32 addresses (BIP 173).

While there, this applies a patch from upstream to fix the build on Aarch64,
and improves the RC script provided.
---
 finance/cpuminer/Makefile              |  5 ++---
 finance/cpuminer/distinfo              | 11 ++++++-----
 finance/cpuminer/files/minerd.sh       | 20 ++++++++++++++++----
 finance/cpuminer/patches/patch-miner.h | 15 +++++++++++++++
 4 files changed, 39 insertions(+), 12 deletions(-)
 create mode 100644 finance/cpuminer/patches/patch-miner.h

diff --git a/finance/cpuminer/Makefile b/finance/cpuminer/Makefile
index e64ce7bd070..574eb724708 100644
--- a/finance/cpuminer/Makefile
+++ b/finance/cpuminer/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2021/04/21 13:24:38 adam Exp $
+# $NetBSD: Makefile,v 1.15 2021/05/29 19:30:57 khorben Exp $
 
 DISTNAME=	${GITHUB_PROJECT}-${PKGVERSION_NOREV}
-PKGNAME=	cpuminer-2.5.0
-PKGREVISION=	13
+PKGNAME=	cpuminer-2.5.1
 CATEGORIES=	finance
 MASTER_SITES=	${MASTER_SITE_GITHUB:=pooler/}
 
diff --git a/finance/cpuminer/distinfo b/finance/cpuminer/distinfo
index 00552ed0642..88d95772e14 100644
--- a/finance/cpuminer/distinfo
+++ b/finance/cpuminer/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1 2017/10/01 15:07:14 khorben Exp $
+$NetBSD: distinfo,v 1.2 2021/05/29 19:30:57 khorben Exp $
 
-SHA1 (cpuminer-2.5.0.tar.gz) = 502e7edfa3ff7fe4300065c68f660acd8fb63476
-RMD160 (cpuminer-2.5.0.tar.gz) = 954d68d8a59665364844d4c1e89e67fdb2ab9124
-SHA512 (cpuminer-2.5.0.tar.gz) = e635e346cc5dd4e5159b5d0c9dd8f44e642c626da934638a73b9da8421b70c97ce0f5671cc35be3f5ad5711c38164e7e7ed94c0b593892b32203f0527b4ffdc1
-Size (cpuminer-2.5.0.tar.gz) = 117655 bytes
+SHA1 (cpuminer-2.5.1.tar.gz) = 07d863e1e88de8387986ea9ef76dd9100d4fb409
+RMD160 (cpuminer-2.5.1.tar.gz) = f408fddd6e16ad8d54115e6b3d8fd0f0a6fae5d1
+SHA512 (cpuminer-2.5.1.tar.gz) = 9b5b34018e1b480aceb3f6e7ebea58800da6bf7f07c8effe0bb65bb4732a24686aa7db14a45f6f595df5b6d0334205c2a43f00fa576d42ef9f108ca3f519393b
+Size (cpuminer-2.5.1.tar.gz) = 118893 bytes
+SHA1 (patch-miner.h) = 58bfef90b3c600e94d5b1ff81d87eb5e6c149dbc
diff --git a/finance/cpuminer/files/minerd.sh b/finance/cpuminer/files/minerd.sh
index c102bbdb37a..1daa69bb85f 100644
--- a/finance/cpuminer/files/minerd.sh
+++ b/finance/cpuminer/files/minerd.sh
@@ -1,15 +1,27 @@
-#!/bin/sh
+#!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: minerd.sh,v 1.1 2017/10/01 15:07:14 khorben Exp $
+# $NetBSD: minerd.sh,v 1.2 2021/05/29 19:30:57 khorben Exp $
+#
+# Startup script for cpuminer
 #
-
 # PROVIDE: minerd
 # REQUIRE: DAEMON
+# KEYWORD: shutdown
+#
+# You will need to set some variables in /etc/rc.conf to start minerd:
+#
+# minerd=YES
+#
+# Optionally, "minerd_flags" contains options for the , e.g.
+#	minerd_flags="-a scrypt"		# used by Litecoin
+#	minerd_flags="-o URL"			# sets the URL of the server
+#	minerd_flags="-O username:password"	# sets the credentials to use
+# See minerd(1) for possible options.
 
 . /etc/rc.subr
 
 name="minerd"
-rcvar=$name
+rcvar=${name}
 command="@PREFIX@/bin/${name}"
 required_files="@PKG_SYSCONFDIR@/minerd.conf"
 minerd_flags="-B -S -c @PKG_SYSCONFDIR@/minerd.conf"
diff --git a/finance/cpuminer/patches/patch-miner.h b/finance/cpuminer/patches/patch-miner.h
new file mode 100644
index 00000000000..aa47afb4ae7
--- /dev/null
+++ b/finance/cpuminer/patches/patch-miner.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-miner.h,v 1.1 2021/05/29 19:30:57 khorben Exp $
+
+Fix build on Aarch64 (from upstream)
+
+--- miner.h.orig	2020-06-25 15:02:57.000000000 +0000
++++ miner.h
+@@ -137,7 +137,7 @@ void sha256_transform(uint32_t *state, c
+ void sha256d(unsigned char *hash, const unsigned char *data, int len);
+ 
+ #ifdef USE_ASM
+-#if defined(__ARM_NEON__) || defined(__ALTIVEC__) || defined(__i386__) || defined(__x86_64__)
++#if (defined(__APCS_32__) && defined(__ARM_NEON__)) || defined(__ALTIVEC__) || defined(__i386__) || defined(__x86_64__)
+ #define HAVE_SHA256_4WAY 1
+ int sha256_use_4way();
+ void sha256_init_4way(uint32_t *state);
-- 
cgit v1.2.3