[pkg-bacula-commits] [bacula] 01/01: Use correct version of patch "crypto-remove-most-of-OpenSSL-initcallbacks-for-1.1"

[Carsten Leonhardt]

This is an automated email from the git hooks/post-receive script.

leo pushed a commit to branch openssl1.1
in repository bacula.

commit 076171a7e5be9ee52205d7266e4751f40cbf5a83
Author: Carsten Leonhardt <leo at debian.org>
Date:   Sun Nov 12 23:50:09 2017 +0100

    Use correct version of patch "crypto-remove-most-of-OpenSSL-initcallbacks-for-1.1"
---
 debian/changelog                                      |  7 +++++++
 ...remove-most-of-OpenSSL-initcallbacks-for-1.1.patch | 19 +++++++++++--------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 40427dc..6768d1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+bacula (9.0.5+dfsg-3+exp1) experimental; urgency=medium
+
+  * Use correct version of patch
+    "crypto-remove-most-of-OpenSSL-initcallbacks-for-1.1"
+
+ -- Carsten Leonhardt <leo at debian.org>  Sun, 12 Nov 2017 23:43:07 +0100
+
 bacula (9.0.5+dfsg-3+exp) experimental; urgency=medium
 
   * Add patches to support OpenSSL 1.1 kindly contributed by Sebastian
diff --git a/debian/patches/openssl1.1_1001-crypto-remove-most-of-OpenSSL-initcallbacks-for-1.1.patch b/debian/patches/openssl1.1_1001-crypto-remove-most-of-OpenSSL-initcallbacks-for-1.1.patch
index 6de2169..c0987ad 100644
--- a/debian/patches/openssl1.1_1001-crypto-remove-most-of-OpenSSL-initcallbacks-for-1.1.patch
+++ b/debian/patches/openssl1.1_1001-crypto-remove-most-of-OpenSSL-initcallbacks-for-1.1.patch
@@ -1,4 +1,4 @@
-From 7eb1f97ca3a154818ff42e3259899fbc94140fbc Mon Sep 17 00:00:00 2001
+From b24350f437064af4564d7b07263eb88b2de82a44 Mon Sep 17 00:00:00 2001
 From: Sebastian Andrzej Siewior <sebastian at breakpoint.cc>
 Date: Thu, 9 Nov 2017 21:55:20 +0100
 Subject: [PATCH] crypto: remove most of OpenSSL initcallbacks for 1.1
@@ -23,12 +23,12 @@ the maintainer to make a decision, I just point it out.
 
 Signed-off-by: Sebastian Andrzej Siewior <sebastian at breakpoint.cc>
 ---
- src/lib/openssl.c | 33 ++++++++++++++++++---------------
+ src/lib/openssl.c | 35 +++++++++++++++++++----------------
  src/lib/openssl.h |  4 ----
- 2 files changed, 18 insertions(+), 19 deletions(-)
+ 2 files changed, 19 insertions(+), 20 deletions(-)
 
 diff --git a/src/lib/openssl.c b/src/lib/openssl.c
-index 64b0e96009a7..d43b3c1344d5 100644
+index 64b0e96009a7..23ac946cfaee 100644
 --- a/src/lib/openssl.c
 +++ b/src/lib/openssl.c
 @@ -41,15 +41,6 @@
@@ -119,14 +119,17 @@ index 64b0e96009a7..d43b3c1344d5 100644
  {
     // ***FIXME***
     // Implement PRNG state save
-@@ -262,6 +261,7 @@ int openssl_save_prng (void)
+@@ -262,8 +261,9 @@ int openssl_save_prng (void)
   */
  int init_crypto (void)
  {
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-    int stat;
+-   int stat;
++   int stat = 0;
  
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
     if ((stat = openssl_init_threads()) != 0) {
+       berrno be;
+       Jmsg1(NULL, M_ABORT, 0,
 @@ -278,6 +278,7 @@ int init_crypto (void)
  
     /* Register OpenSSL ciphers and digests */
@@ -167,5 +170,5 @@ index 597517a4fd68..9374a581c735 100644
  
  #endif /* __OPENSSL_H_ */
 -- 
-2.15.0
+2.15.0.rc0
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bacula/bacula.git