diff options
Diffstat (limited to 'science/orthanc/files')
4 files changed, 17 insertions, 15 deletions
diff --git a/science/orthanc/files/orthanc.in b/science/orthanc/files/orthanc.in index 85d6af45d8a1..9cbe3d1cd321 100644 --- a/science/orthanc/files/orthanc.in +++ b/science/orthanc/files/orthanc.in @@ -23,13 +23,13 @@ desc="Lightweight DICOM server for healthcare and medical research" load_rc_config $name : ${orthanc_enable:=NO} -: ${orthanc_flags="%%ETCDIR%%/orthanc.json"} +: ${orthanc_config="%%ETCDIR%%/orthanc.json"} start_precmd=orthanc_prestart pidfile=/var/run/orthanc.pid procname=%%PREFIX%%/sbin/Orthanc command=/usr/sbin/daemon -command_args=" -f -p ${pidfile} -u orthanc ${procname} ${orthanc_flags}" +command_args=" --output-file /var/log/orthanc --sighup --child-pidfile ${pidfile} --user orthanc ${procname} ${orthanc_flags} ${orthanc_config}" orthanc_prestart() { diff --git a/science/orthanc/files/patch-OrthancFramework_Sources_Images_JpegWriter.cpp b/science/orthanc/files/patch-OrthancFramework_Sources_Images_JpegWriter.cpp deleted file mode 100644 index 59b845085092..000000000000 --- a/science/orthanc/files/patch-OrthancFramework_Sources_Images_JpegWriter.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- OrthancFramework/Sources/Images/JpegWriter.cpp.orig 2024-12-17 16:33:40 UTC -+++ OrthancFramework/Sources/Images/JpegWriter.cpp -@@ -187,7 +187,7 @@ namespace Orthanc - **/ - unsigned long size; - #else -- size_t size; -+ unsigned long size; - #endif - - if (setjmp(jerr.GetJumpBuffer())) diff --git a/science/orthanc/files/patch-OrthancServer_Resources_Configuration.json b/science/orthanc/files/patch-OrthancServer_Resources_Configuration.json index f6b4af632e2e..212fadfde386 100644 --- a/science/orthanc/files/patch-OrthancServer_Resources_Configuration.json +++ b/science/orthanc/files/patch-OrthancServer_Resources_Configuration.json @@ -5,13 +5,13 @@ // raw DICOM instances). Backslashes must be either escaped by // doubling them, or replaced by forward slashes "/". - "StorageDirectory" : "OrthancStorage", -+ "StorageDirectory" : "/var/db/orthanc/db-v5", ++ "StorageDirectory" : "/var/db/orthanc/db/db-v5", // Path to the directory that holds the SQLite index (if unset, the // value of StorageDirectory is used). This index could be stored on // a RAM-drive or a SSD device for performance reasons. - "IndexDirectory" : "OrthancStorage", -+ "IndexDirectory" : "/var/db/orthanc/db-v5", ++ "IndexDirectory" : "/var/db/orthanc/db/db-v5", // Path to the directory where Orthanc stores its large temporary // files. The content of this folder can be safely deleted once diff --git a/science/orthanc/files/patch-OrthancServer_Sources_Database_PrepareDatabase.sql b/science/orthanc/files/patch-OrthancServer_Sources_Database_PrepareDatabase.sql new file mode 100644 index 000000000000..ffe19920c2b0 --- /dev/null +++ b/science/orthanc/files/patch-OrthancServer_Sources_Database_PrepareDatabase.sql @@ -0,0 +1,13 @@ +--- OrthancServer/Sources/Database/PrepareDatabase.sql.orig 2025-08-11 16:02:50 UTC ++++ OrthancServer/Sources/Database/PrepareDatabase.sql +@@ -160,4 +160,9 @@ -- The "1" corresponds to the "GlobalProperty_Database + + -- Set the version of the database schema + -- The "1" corresponds to the "GlobalProperty_DatabaseSchemaVersion" enumeration +-INSERT INTO GlobalProperties VALUES (1, "6"); ++-- Upstream code has (1, "6"), which causes startup to fail on FreeBSD ++-- E1023 08:43:05.328003 MAIN Connection.cpp:169] SQLite execute error: no such column: "6" - should this be a string literal in single-quotes? (1) ++-- Apparently due to sqlite 3.41+ being stricter about string literals ++-- Debian packages currently uses 3.34 ++-- https://orthanc.uclouvain.be/bugs/show_bug.cgi?id=227 ++INSERT INTO GlobalProperties VALUES (1, 6); |