Merge pull request #18471 from Rmys/master

darktable
2026-04-07 16:06:01 +03:00
parent 5fa2f1c6ae bbdb25cd80
commit a050c8763d
3 changed files with 50 additions and 1 deletions
@@ -0,0 +1,21 @@
+From 1435feaec30ea1acbf94aaec27ce7507333ed2d7 Mon Sep 17 00:00:00 2001
+From: Pascal Obry <pascal@obry.net>
+Date: Thu, 5 Feb 2026 17:56:21 +0100
+Subject: [PATCH] Add 5.4.1 in appdata.
+
+---
+ data/org.darktable.darktable.appdata.xml.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/data/org.darktable.darktable.appdata.xml.in b/data/org.darktable.darktable.appdata.xml.in
+index 600c87b6c1e4..1a45de1eb74d 100644
+--- a/data/org.darktable.darktable.appdata.xml.in
+++ b/data/org.darktable.darktable.appdata.xml.in
+@@ -47,6 +47,7 @@
+   </screenshots>
+   <content_rating type="oars-1.1" />
+   <releases>
+    <release date="2026-02-05" version="5.4.1"/>
+     <release date="2025-12-21" version="5.4.0"/>
+     <release date="2025-08-06" version="5.2.1"/>
+     <release date="2025-06-21" version="5.2.0"/>
@@ -0,0 +1,27 @@
+diff -urNr darktable-5.4.1-orig/src/external/LibRaw/src/decompressors/losslessjpeg.cpp darktable-5.4.1/src/external/LibRaw/src/decompressors/losslessjpeg.cpp
+--- darktable-5.4.1-orig/src/external/LibRaw/src/decompressors/losslessjpeg.cpp	2026-01-09 10:59:59.000000000 +0100
+++ darktable-5.4.1/src/external/LibRaw/src/decompressors/losslessjpeg.cpp	2026-04-02 23:23:27.630825281 +0200
+@@ -361,6 +361,7 @@
+ 		nbits--;
+       }
+ 	hufftable.resize( size_t(1ULL << nbits));
+	uint32_t tsize = 1 << nbits;
+ 	for (unsigned i = 0; i < hufftable.size(); i++) hufftable[i] = 0;
+ 
+ 	int h = 0;
+@@ -371,10 +372,14 @@
+       {
+         for (int j = 0; j < (1 << (nbits - len - 1)); j++)
+         {
+-          hufftable[h] = ((len+1) << 16) | (uint8_t(huffval[pos] & 0xff) << 8) | uint8_t(shiftval[pos] & 0xff);
+          if (h >= tsize)
+			throw LIBRAW_EXCEPTION_IO_CORRUPT;
+          hufftable[h] = ((len + 1) << 16) | (uint8_t(huffval[pos] & 0xff) << 8) | uint8_t(shiftval[pos] & 0xff);
+           h++;
+         }
+         pos++;
+		if(pos >= 256)
+			throw LIBRAW_EXCEPTION_IO_CORRUPT;
+       }
+     }
+ 	if (!disable_cache)
@@ -70,7 +70,8 @@
            <Dependency>GraphicsMagick-devel</Dependency>
        </BuildDependencies>
        <Patches>
-<!--              <Patch level="1">darktable-3.4.1_libxcf-cmake.patch</Patch> -->
+             <Patch level="1">cve-2026-5318.patch</Patch>
+             <Patch level="1">0001-Add-5.4.1-in-appdata.patch</Patch>
        </Patches>
    </Source>