Skip to content

Commit 947a91a

Browse files
author
ceedii
committed
Fix libdero build for CPUs with no AVX2 support
Fix major security vulnerability for "NuGet" libraries: "Npgsql" & "Microsoft.Extensions.Caching.Memory"
1 parent 69de0d3 commit 947a91a

File tree

9 files changed

+12
-6
lines changed

9 files changed

+12
-6
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
[Rr]elease/
99
x64/
1010
build/
11+
build.backup/
1112
[Bb]in/
1213
[Oo]bj/
1314
*.VC.db

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,4 +239,5 @@ To support this project you can become a [sponsor]( https://github.com/sponsors/
239239
* CCX: `ccx7S4B3gBeH1SGWCfqZp3NM7Vavg7H3S8ovJn8fU4bwC4vU7ChWfHtbNzifhrpbJ74bMDxj4KZFTcznTfsucCEg1Kgv7zbNgs`
240240
* FIRO: `a5AsoTSkfPHQ3SUmR6binG1XW7oQQoFNU1`
241241
* ERGO: `9gYyuZzaSw3TiCtUkSRuS3XVDUv41EFs3dtNCFGqiEwHqpb7gkF`
242+
* WART: `7795fc0fe93e7e4e232a212f00bdc8885c580a5666d39a0d`
242243
* XMR: `483zaHtMRfM7rw1dXgebhWaRR8QLgAF6w4BomAV319FVVHfdbYTLVuBRc4pQgRAnRpfy6CXvvwngK4Lo3mRKE29RRx3Jb5c`

build-debian-11.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ sudo apt-get update; \
55
sudo apt-get -y install wget
66

77
# add dotnet repo
8-
sudo wget https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
8+
wget https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
99
sudo dpkg -i packages-microsoft-prod.deb
1010
rm packages-microsoft-prod.deb
1111

build-debian-12.sh

100644100755
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ sudo apt-get update; \
55
sudo apt-get -y install wget
66

77
# add dotnet repo
8-
sudo wget https://packages.microsoft.com/config/debian/12/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
8+
wget https://packages.microsoft.com/config/debian/12/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
99
sudo dpkg -i packages-microsoft-prod.deb
1010
rm packages-microsoft-prod.deb
1111

build-ubuntu-22.04.sh

100644100755
File mode changed.

src/Miningcore.Tests/Miningcore.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
3939
<PackageReference Include="Microsoft.Reactive.Testing" Version="5.0.0" />
4040
<PackageReference Include="NLog" Version="5.2.8" />
41-
<PackageReference Include="Npgsql" Version="8.0.2" />
41+
<PackageReference Include="Npgsql" Version="8.0.3" />
4242
<PackageReference Include="NSubstitute" Version="4.4.0" />
4343
<PackageReference Include="xunit" Version="2.4.2" />
4444
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">

src/Miningcore/Miningcore.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
</PackageReference>
5252
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.0" />
5353
<PackageReference Include="Newtonsoft.Json.Schema" Version="3.0.15" />
54-
<PackageReference Include="Npgsql" Version="8.0.2" />
54+
<PackageReference Include="Npgsql" Version="8.0.3" />
5555
<PackageReference Include="NSwag.AspNetCore" Version="14.0.2" />
5656
<PackageReference Include="NSwag.CodeGeneration.CSharp" Version="14.0.2" />
5757
<PackageReference Include="NSwag.MSBuild" Version="14.0.2">
@@ -67,7 +67,7 @@
6767
<PackageReference Include="JetBrains.Annotations" Version="2023.3.0" />
6868
<PackageReference Include="MailKit" Version="3.5.0" />
6969
<PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.0.2" />
70-
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
70+
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
7171
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
7272
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
7373
<PackageReference Include="NBitcoin" Version="7.0.36" />

src/Miningcore/Program.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -636,6 +636,7 @@ private static void Logo()
636636
Console.WriteLine(" CCX - ccx7S4B3gBeH1SGWCfqZp3NM7Vavg7H3S8ovJn8fU4bwC4vU7ChWfHtbNzifhrpbJ74bMDxj4KZFTcznTfsucCEg1Kgv7zbNgs");
637637
Console.WriteLine(" FIRO - a5AsoTSkfPHQ3SUmR6binG1XW7oQQoFNU1");
638638
Console.WriteLine(" ERGO - 9gYyuZzaSw3TiCtUkSRuS3XVDUv41EFs3dtNCFGqiEwHqpb7gkF");
639+
Console.WriteLine(" WART - 7795fc0fe93e7e4e232a212f00bdc8885c580a5666d39a0d");
639640
Console.WriteLine(" XMR - 483zaHtMRfM7rw1dXgebhWaRR8QLgAF6w4BomAV319FVVHfdbYTLVuBRc4pQgRAnRpfy6CXvvwngK4Lo3mRKE29RRx3Jb5c");
640641
Console.WriteLine();
641642
}

src/Native/libdero/Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,10 @@ OBJECTS = include/highwayhash/arch_specific.o include/highwayhash/c_bindings.o i
2626
include/libsais/libsais.o
2727

2828
ifeq ($(UNAME_P),x86_64)
29-
OBJECTS += include/highwayhash/hh_avx2.o include/highwayhash/hh_sse41.o
29+
ifneq (,$(findstring -DHAVE_AVX2,$(HAVE_FEATURE)))
30+
OBJECTS += include/highwayhash/hh_avx2.o
31+
endif
32+
OBJECTS += include/highwayhash/hh_sse41.o
3033
else ifneq ($($(UNAME_P),aarch64),$($(UNAME_P),arm64))
3134
OBJECTS += include/highwayhash/hh_neon.o
3235
else

0 commit comments

Comments
 (0)