[bacula] fixed openssl patch
Jan Görig
jgorig at fedoraproject.org
Thu Sep 23 12:16:05 UTC 2010
commit 7f55ce93dea712b682fe09f3dbdd76c3193ebdb4
Author: Jan Görig <jgorig at redhat.com>
Date: Thu Sep 23 14:13:22 2010 +0200
fixed openssl patch
bacula-5.0.2-openssl.patch | 4 ++--
bacula.spec | 5 ++++-
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/bacula-5.0.2-openssl.patch b/bacula-5.0.2-openssl.patch
index b0fcf82..5040fe2 100644
--- a/bacula-5.0.2-openssl.patch
+++ b/bacula-5.0.2-openssl.patch
@@ -6,7 +6,7 @@ diff -up bacula-5.0.2/bacula-5.0.2/src/lib/crypto.c.openssl bacula-5.0.2/bacula-
* exists. It was not an official API.
*/
-#ifdef HAVE_OPENSSLv1
-+#ifdef OPENSSL_VERSION_NUMBER >= 0x10000000L
++#if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
#define EVP_PKEY_encrypt EVP_PKEY_encrypt_old
#define EVP_PKEY_decrypt EVP_PKEY_decrypt_old
#endif
@@ -18,7 +18,7 @@ diff -up bacula-5.0.2/bacula-5.0.2/src/lib/tls.c.openssl bacula-5.0.2/bacula-5.0
if (strcmp(extname, "subjectAltName") == 0) {
-#ifdef HAVE_OPENSSLv1
-+#ifdef OPENSSL_VERSION_NUMBER >= 0x10000000L
++#if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
const X509V3_EXT_METHOD *method;
#else
X509V3_EXT_METHOD *method;
diff --git a/bacula.spec b/bacula.spec
index d5fd1dd..7945bf8 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -8,7 +8,7 @@
Summary: Cross platform network backup for Linux, Unix, Mac and Windows
Name: bacula
Version: 5.0.3
-Release: 1%{?dist}
+Release: 2%{?dist}
# See LICENSE for details
License: GPLv2 with exceptions
Group: System Environment/Daemons
@@ -1006,6 +1006,9 @@ fi
%changelog
+* Thu Sep 23 2010 Jan Görig <jgorig at redhat.com> - 5.0.3-2
+- fixed openssl patch, thanks to Enrico Scholz
+
* Tue Aug 10 2010 Jon Ciesla <limb at jcomserv.net> - 5.0.3-1
- New upstream.
- DSOlink fix for same.
More information about the scm-commits
mailing list