Mercurial > hg > orthanc

changeset 3806:b100555c4d6a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix for libp11
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 02 Apr 2020 17:08:43 +0200
parents cdb429340112
children 2f28c7eb2776
files Resources/LinuxStandardBaseToolchain.cmake Resources/Patches/libp11-0.4.0.patch
diffstat 2 files changed, 27 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/Resources/LinuxStandardBaseToolchain.cmake	Thu Apr 02 16:45:20 2020 +0200
+++ b/Resources/LinuxStandardBaseToolchain.cmake	Thu Apr 02 17:08:43 2020 +0200
@@ -1,4 +1,12 @@
-# LSB_CC=gcc-4.8 LSB_CXX=g++-4.8 cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=../Resources/LinuxStandardBaseToolchain.cmake -DUSE_LEGACY_JSONCPP=ON -DUSE_LEGACY_LIBICU=ON -DBOOST_LOCALE_BACKEND=icu -G Ninja
+#
+# Full build, as used on the BuildBot CIS:
+#
+#   $ LSB_CC=gcc-4.8 LSB_CXX=g++-4.8 cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=../Resources/LinuxStandardBaseToolchain.cmake -DUSE_LEGACY_JSONCPP=ON -DUSE_LEGACY_LIBICU=ON -DBOOST_LOCALE_BACKEND=icu -DENABLE_PKCS11=ON -G Ninja
+#
+# Or, more lightweight version (without libp11 and ICU):
+#
+#   $ LSB_CC=gcc-4.8 LSB_CXX=g++-4.8 cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=../Resources/LinuxStandardBaseToolchain.cmake -DUSE_LEGACY_JSONCPP=ON -G Ninja
+#
 
 INCLUDE(CMakeForceCompiler)
 
--- a/Resources/Patches/libp11-0.4.0.patch	Thu Apr 02 16:45:20 2020 +0200
+++ b/Resources/Patches/libp11-0.4.0.patch	Thu Apr 02 17:08:43 2020 +0200
@@ -1,6 +1,6 @@
 diff -urEb libp11-0.4.0.orig/src/atfork.c libp11-0.4.0/src/atfork.c
---- libp11-0.4.0.orig/src/atfork.c	2020-03-05 20:48:55.447852662 +0100
-+++ libp11-0.4.0/src/atfork.c	2020-03-05 20:49:05.983770656 +0100
+--- libp11-0.4.0.orig/src/atfork.c	2020-04-02 17:03:55.340634019 +0200
++++ libp11-0.4.0/src/atfork.c	2020-04-02 17:04:10.152619121 +0200
 @@ -25,7 +25,7 @@
  #include <sys/stat.h>
  #include <sys/types.h>
@@ -11,8 +11,8 @@
  #ifdef __sun
  # pragma fini(lib_deinit)
 diff -urEb libp11-0.4.0.orig/src/engine.h libp11-0.4.0/src/engine.h
---- libp11-0.4.0.orig/src/engine.h	2020-03-05 20:48:55.447852662 +0100
-+++ libp11-0.4.0/src/engine.h	2020-03-05 20:49:05.983770656 +0100
+--- libp11-0.4.0.orig/src/engine.h	2020-04-02 17:03:55.340634019 +0200
++++ libp11-0.4.0/src/engine.h	2020-04-02 17:04:10.152619121 +0200
 @@ -29,7 +29,7 @@
  #define _ENGINE_PKCS11_H
  
@@ -23,8 +23,8 @@
  
  #include "libp11.h"
 diff -urEb libp11-0.4.0.orig/src/libp11-int.h libp11-0.4.0/src/libp11-int.h
---- libp11-0.4.0.orig/src/libp11-int.h	2020-03-05 20:48:55.447852662 +0100
-+++ libp11-0.4.0/src/libp11-int.h	2020-03-05 20:49:05.983770656 +0100
+--- libp11-0.4.0.orig/src/libp11-int.h	2020-04-02 17:03:55.340634019 +0200
++++ libp11-0.4.0/src/libp11-int.h	2020-04-02 17:04:10.152619121 +0200
 @@ -20,7 +20,7 @@
  #define _LIBP11_INT_H
  
@@ -35,13 +35,15 @@
  
  #include "libp11.h"
 diff -urEb libp11-0.4.0.orig/src/p11_key.c libp11-0.4.0/src/p11_key.c
---- libp11-0.4.0.orig/src/p11_key.c	2020-03-05 20:48:55.447852662 +0100
-+++ libp11-0.4.0/src/p11_key.c	2020-03-05 20:49:24.959625180 +0100
-@@ -21,6 +21,10 @@
+--- libp11-0.4.0.orig/src/p11_key.c	2020-04-02 17:03:55.340634019 +0200
++++ libp11-0.4.0/src/p11_key.c	2020-04-02 17:05:39.892516032 +0200
+@@ -21,6 +21,12 @@
  #include <string.h>
  #include <openssl/bn.h>
  
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L // OpenSSL 1.0.2
++#if OPENSSL_VERSION_NUMBER >= 0x10100105L // File renamed in OpenSSL 1.1.1e
++#  include <crypto/rsa/rsa_local.h>
++#elif OPENSSL_VERSION_NUMBER >= 0x10100000L // OpenSSL 1.0.2
 +#  include <crypto/rsa/rsa_locl.h>
 +#endif
 +
@@ -49,13 +51,15 @@
  #define strncasecmp strnicmp
  #endif
 diff -urEb libp11-0.4.0.orig/src/p11_rsa.c libp11-0.4.0/src/p11_rsa.c
---- libp11-0.4.0.orig/src/p11_rsa.c	2020-03-05 20:48:55.447852662 +0100
-+++ libp11-0.4.0/src/p11_rsa.c	2020-03-05 20:49:20.095662204 +0100
-@@ -27,6 +27,10 @@
+--- libp11-0.4.0.orig/src/p11_rsa.c	2020-04-02 17:03:55.340634019 +0200
++++ libp11-0.4.0/src/p11_rsa.c	2020-04-02 17:05:49.176504198 +0200
+@@ -27,6 +27,12 @@
  #include <openssl/evp.h>
  #include <openssl/rsa.h>
  
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L // OpenSSL 1.0.2
++#if OPENSSL_VERSION_NUMBER >= 0x10100105L // File renamed in OpenSSL 1.1.1e
++#  include <crypto/rsa/rsa_local.h>
++#elif OPENSSL_VERSION_NUMBER >= 0x10100000L // OpenSSL 1.0.2
 +#  include <crypto/rsa/rsa_locl.h>
 +#endif
 +