From 8c1964d0d960380a11958a6adf42e5513b5521be Mon Sep 17 00:00:00 2001
From: Tanguy Pruvot <tanguy.pruvot@gmail.com>
Date: Fri, 18 May 2018 12:52:10 +0200
Subject: [PATCH] lyra2z: prevent filenames with different cases

+ rename blake2 to blake2s and reorder algo makefile
---
 stratum/algos/{Lyra2z.c => Lyra2-z.c} |  0
 stratum/algos/{Lyra2z.h => Lyra2-z.h} |  0
 stratum/algos/{blake2.c => blake2s.c} |  0
 stratum/algos/{blake2.h => blake2s.h} |  0
 stratum/algos/lyra2z.c                |  2 +-
 stratum/algos/makefile                | 21 ++++++++++-----------
 stratum/stratum.h                     |  2 +-
 7 files changed, 12 insertions(+), 13 deletions(-)
 rename stratum/algos/{Lyra2z.c => Lyra2-z.c} (100%)
 rename stratum/algos/{Lyra2z.h => Lyra2-z.h} (100%)
 rename stratum/algos/{blake2.c => blake2s.c} (100%)
 rename stratum/algos/{blake2.h => blake2s.h} (100%)

diff --git a/stratum/algos/Lyra2z.c b/stratum/algos/Lyra2-z.c
similarity index 100%
rename from stratum/algos/Lyra2z.c
rename to stratum/algos/Lyra2-z.c
diff --git a/stratum/algos/Lyra2z.h b/stratum/algos/Lyra2-z.h
similarity index 100%
rename from stratum/algos/Lyra2z.h
rename to stratum/algos/Lyra2-z.h
diff --git a/stratum/algos/blake2.c b/stratum/algos/blake2s.c
similarity index 100%
rename from stratum/algos/blake2.c
rename to stratum/algos/blake2s.c
diff --git a/stratum/algos/blake2.h b/stratum/algos/blake2s.h
similarity index 100%
rename from stratum/algos/blake2.h
rename to stratum/algos/blake2s.h
diff --git a/stratum/algos/lyra2z.c b/stratum/algos/lyra2z.c
index b83b838..0d946de 100644
--- a/stratum/algos/lyra2z.c
+++ b/stratum/algos/lyra2z.c
@@ -3,7 +3,7 @@
 #include <string.h>
 #include <stdio.h>
 
-#include "Lyra2z.h"
+#include "Lyra2-z.h"
 
 #include <sha3/sph_blake.h>
 
diff --git a/stratum/algos/makefile b/stratum/algos/makefile
index e2a7141..d7c296f 100644
--- a/stratum/algos/makefile
+++ b/stratum/algos/makefile
@@ -8,19 +8,18 @@ CXXFLAGS = -O2 -I.. -march=native
 CFLAGS= $(CXXFLAGS) -std=gnu99
 LDFLAGS=-O2 -lgmp
 
-SOURCES=lyra2re.c lyra2v2.c Lyra2.c lyra2z.c Lyra2z.c Sponge.c allium.c \
-	blake.c scrypt.c c11.c x11.c x12.c x13.c sha256.c sha256t.c jha.c keccak.c deep.c tribus.c  \
-	hsr14.c sm3.c \
-	x14.c x15.c x17.c nist5.c fresh.c quark.c neoscrypt.c scryptn.c qubit.c skein.c groestl.c \
-	bitcore.c timetravel.c x16r.c x16s.c xevan.c bastion.c hmq17.c \
-	skein2.c zr5.c bmw.c luffa.c pentablake.c whirlpool.c whirlpoolx.c blakecoin.c \
-	blake2.c \
-	yescrypt.c yescrypt-opt.c sha256_Y.c lbry.c \
-	m7m.c magimath.cpp velvet.c \
+SOURCES=lyra2re.c lyra2v2.c Lyra2.c lyra2z.c Lyra2-z.c Sponge.c allium.c \
+	c11.c x11.c x12.c x13.c hsr14.c sm3.c x14.c x15.c x17.c \
+	blake.c blakecoin.c blake2s.c jha.c keccak.c lbry.c tribus.c \
+	deep.c fresh.c groestl.c neoscrypt.c nist5.c quark.c qubit.c skein.c skein2.c \
+	bitcore.c timetravel.c x11evo.c x16r.c x16s.c xevan.c bastion.c hmq17.c \
+	bmw.c luffa.c pentablake.c vitalium.c whirlpool.c whirlpoolx.c zr5.c \
+	scrypt.c scryptn.c sha256.c sha256t.c \
+	yescrypt.c yescrypt-opt.c sha256_Y.c \
+	a5a.c a5amath.c m7m.c magimath.cpp velvet.c \
 	argon2a.c ar2/blake2b.c ar2/argon2.c ar2/ref.c ar2/cores.c ar2/ar2-scrypt-jane.c \
-	a5a.c a5amath.c \
 	hive.c pomelo.c \
-	phi.c polytimos.c skunk.c sib.c veltor.c gost.c x11evo.c vitalium.c
+	phi.c polytimos.c skunk.c sib.c veltor.c gost.c
 
 OBJECTS=$(SOURCES:%.c=%.o) $(SOURCES:%.cpp=%.o)
 OUTPUT=libalgos.a
diff --git a/stratum/stratum.h b/stratum/stratum.h
index fdbf124..b4b6fe7 100644
--- a/stratum/stratum.h
+++ b/stratum/stratum.h
@@ -170,7 +170,7 @@ void sha256_double_hash_hex(const char *input, char *output, unsigned int len);
 #include "algos/lyra2z.h"
 #include "algos/blake.h"
 #include "algos/blakecoin.h"
-#include "algos/blake2.h"
+#include "algos/blake2s.h"
 #include "algos/qubit.h"
 #include "algos/groestl.h"
 #include "algos/jha.h"