Mercurial > hg > orthanc

changeset 5234:7363b6e7edf5 db-protobuf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
integration mainline->db-protobuf
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 04 Apr 2023 17:24:13 +0200
parents 887df8c45838 (current diff) bd25d1c33362 (diff)
children 5e0db9eac1f8
files OrthancServer/Sources/Database/StatelessDatabaseOperations.cpp
diffstat 2 files changed, 30 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancFramework/Resources/Patches/openssl-3.1.0.patch	Tue Apr 04 09:53:02 2023 +0200
+++ b/OrthancFramework/Resources/Patches/openssl-3.1.0.patch	Tue Apr 04 17:24:13 2023 +0200
@@ -1,6 +1,34 @@
+diff -urEb openssl-3.1.0.orig/crypto/riscvcap.c openssl-3.1.0/crypto/riscvcap.c
+--- openssl-3.1.0.orig/crypto/riscvcap.c	2023-03-14 13:59:07.000000000 +0100
++++ openssl-3.1.0/crypto/riscvcap.c	2023-04-04 17:18:21.018468423 +0200
+@@ -37,7 +37,8 @@
+ 
+ static void strtoupper(char *str)
+ {
+-    for (char *x = str; *x; ++x)
++    char* x;
++    for (x = str; *x; ++x)
+         *x = toupper(*x);
+ }
+ 
+@@ -51,12 +52,13 @@
+ {
+     char envstrupper[BUFLEN];
+     char buf[BUFLEN];
++    size_t i;
+ 
+     /* Convert env str to all uppercase */
+     OPENSSL_strlcpy(envstrupper, envstr, sizeof(envstrupper));
+     strtoupper(envstrupper);
+ 
+-    for (size_t i = 0; i < kRISCVNumCaps; ++i) {
++    for (i = 0; i < kRISCVNumCaps; ++i) {
+         /* Prefix capability with underscore in preparation for search */
+         BIO_snprintf(buf, BUFLEN, "_%s", RISCV_capabilities[i].name);
+         if (strstr(envstrupper, buf) != NULL) {
 diff -urEb openssl-3.1.0.orig/providers/implementations/rands/seeding/rand_unix.c openssl-3.1.0/providers/implementations/rands/seeding/rand_unix.c
---- openssl-3.1.0.orig/providers/implementations/rands/seeding/rand_unix.c	2023-04-04 09:23:30.574295136 +0200
-+++ openssl-3.1.0/providers/implementations/rands/seeding/rand_unix.c	2023-04-04 09:23:57.766784026 +0200
+--- openssl-3.1.0.orig/providers/implementations/rands/seeding/rand_unix.c	2023-03-14 13:59:07.000000000 +0100
++++ openssl-3.1.0/providers/implementations/rands/seeding/rand_unix.c	2023-04-04 17:17:43.874649403 +0200
 @@ -452,6 +452,7 @@
               * system call and this should always succeed which renders
               * this alternative but essentially identical source moot.
--- a/OrthancServer/Sources/Database/StatelessDatabaseOperations.cpp	Tue Apr 04 09:53:02 2023 +0200
+++ b/OrthancServer/Sources/Database/StatelessDatabaseOperations.cpp	Tue Apr 04 17:24:13 2023 +0200
@@ -2967,10 +2967,6 @@
                                       MetadataType metadata,
                                       const std::string& value)
       {
-        if (metadata == 15)
-        {
-          LOG(INFO) << "toto";
-        }
         content.AddMetadata(instance, metadata, value);
         instanceMetadata[metadata] = value;
       }