Fix libdero build for CPUs with no AVX2 support

Fix major security vulnerability for "NuGet" libraries: "Npgsql" & "Microsoft.Extensions.Caching.Memory"
blackmennewstyle · Oct 16, 2024 · 947a91a · 947a91a
1 parent 69de0d3
commit 947a91a
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,7 @@
 [Rr]elease/
 x64/
 build/
+build.backup/
 [Bb]in/
 [Oo]bj/
 *.VC.db

diff --git a/README.md b/README.md
@@ -239,4 +239,5 @@ To support this project you can become a [sponsor]( https://github.com/sponsors/
 * CCX:  `ccx7S4B3gBeH1SGWCfqZp3NM7Vavg7H3S8ovJn8fU4bwC4vU7ChWfHtbNzifhrpbJ74bMDxj4KZFTcznTfsucCEg1Kgv7zbNgs`
 * FIRO: `a5AsoTSkfPHQ3SUmR6binG1XW7oQQoFNU1`
 * ERGO: `9gYyuZzaSw3TiCtUkSRuS3XVDUv41EFs3dtNCFGqiEwHqpb7gkF`
+* WART:  `7795fc0fe93e7e4e232a212f00bdc8885c580a5666d39a0d`
 * XMR:  `483zaHtMRfM7rw1dXgebhWaRR8QLgAF6w4BomAV319FVVHfdbYTLVuBRc4pQgRAnRpfy6CXvvwngK4Lo3mRKE29RRx3Jb5c`
diff --git a/build-debian-11.sh b/build-debian-11.sh
@@ -5,7 +5,7 @@ sudo apt-get update; \
   sudo apt-get -y install wget
 
 # add dotnet repo
-sudo wget https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
+wget https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
 sudo dpkg -i packages-microsoft-prod.deb
 rm packages-microsoft-prod.deb
 

diff --git a/build-debian-12.sh b/build-debian-12.sh
@@ -5,7 +5,7 @@ sudo apt-get update; \
   sudo apt-get -y install wget
 
 # add dotnet repo
-sudo wget https://packages.microsoft.com/config/debian/12/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
+wget https://packages.microsoft.com/config/debian/12/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
 sudo dpkg -i packages-microsoft-prod.deb
 rm packages-microsoft-prod.deb
 

diff --git a/build-ubuntu-22.04.sh b/build-ubuntu-22.04.sh
diff --git a/src/Miningcore.Tests/Miningcore.Tests.csproj b/src/Miningcore.Tests/Miningcore.Tests.csproj
@@ -38,7 +38,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
     <PackageReference Include="Microsoft.Reactive.Testing" Version="5.0.0" />
     <PackageReference Include="NLog" Version="5.2.8" />
-    <PackageReference Include="Npgsql" Version="8.0.2" />
+    <PackageReference Include="Npgsql" Version="8.0.3" />
     <PackageReference Include="NSubstitute" Version="4.4.0" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">

diff --git a/src/Miningcore/Miningcore.csproj b/src/Miningcore/Miningcore.csproj
@@ -51,7 +51,7 @@
         </PackageReference>
         <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.0" />
         <PackageReference Include="Newtonsoft.Json.Schema" Version="3.0.15" />
-        <PackageReference Include="Npgsql" Version="8.0.2" />
+        <PackageReference Include="Npgsql" Version="8.0.3" />
         <PackageReference Include="NSwag.AspNetCore" Version="14.0.2" />
         <PackageReference Include="NSwag.CodeGeneration.CSharp" Version="14.0.2" />
         <PackageReference Include="NSwag.MSBuild" Version="14.0.2">
@@ -67,7 +67,7 @@
         <PackageReference Include="JetBrains.Annotations" Version="2023.3.0" />
         <PackageReference Include="MailKit" Version="3.5.0" />
         <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.0.2" />
-        <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
         <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
         <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
         <PackageReference Include="NBitcoin" Version="7.0.36" />

diff --git a/src/Miningcore/Program.cs b/src/Miningcore/Program.cs
@@ -636,6 +636,7 @@ private static void Logo()
         Console.WriteLine(" CCX  - ccx7S4B3gBeH1SGWCfqZp3NM7Vavg7H3S8ovJn8fU4bwC4vU7ChWfHtbNzifhrpbJ74bMDxj4KZFTcznTfsucCEg1Kgv7zbNgs");
         Console.WriteLine(" FIRO - a5AsoTSkfPHQ3SUmR6binG1XW7oQQoFNU1");
         Console.WriteLine(" ERGO - 9gYyuZzaSw3TiCtUkSRuS3XVDUv41EFs3dtNCFGqiEwHqpb7gkF");
+        Console.WriteLine(" WART - 7795fc0fe93e7e4e232a212f00bdc8885c580a5666d39a0d");
         Console.WriteLine(" XMR  - 483zaHtMRfM7rw1dXgebhWaRR8QLgAF6w4BomAV319FVVHfdbYTLVuBRc4pQgRAnRpfy6CXvvwngK4Lo3mRKE29RRx3Jb5c");
         Console.WriteLine();
     }

diff --git a/src/Native/libdero/Makefile b/src/Native/libdero/Makefile
@@ -26,7 +26,10 @@ OBJECTS = include/highwayhash/arch_specific.o include/highwayhash/c_bindings.o i
         include/libsais/libsais.o 
 
 ifeq ($(UNAME_P),x86_64)
-        OBJECTS += include/highwayhash/hh_avx2.o include/highwayhash/hh_sse41.o 
+        ifneq (,$(findstring -DHAVE_AVX2,$(HAVE_FEATURE)))
+                OBJECTS += include/highwayhash/hh_avx2.o 
+        endif
+        OBJECTS += include/highwayhash/hh_sse41.o 
 else ifneq ($($(UNAME_P),aarch64),$($(UNAME_P),arm64))
         OBJECTS += include/highwayhash/hh_neon.o 
 else
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,7 @@ @@
     [Rr]elease/
     x64/
     build/
+    build.backup/
     [Bb]in/
     [Oo]bj/
     *.VC.db
@@ Expand Down @@