rpms/bacula
7
0
Fork 0
Code Issues Pull Requests Releases Activity

fixed openssl patch

Browse Source
This commit is contained in:
Jan Görig 2010-09-23 14:13:22 +02:00
parent d3f21207e1
commit 7f55ce93de
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bacula-5.0.2-openssl.patch
View File

@ -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. * exists. It was not an official API.
*/ */
-#ifdef HAVE_OPENSSLv1 -#ifdef HAVE_OPENSSLv1
+#ifdef OPENSSL_VERSION_NUMBER >= 0x10000000L +#if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
#define EVP_PKEY_encrypt EVP_PKEY_encrypt_old #define EVP_PKEY_encrypt EVP_PKEY_encrypt_old
#define EVP_PKEY_decrypt EVP_PKEY_decrypt_old #define EVP_PKEY_decrypt EVP_PKEY_decrypt_old
#endif #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) { if (strcmp(extname, "subjectAltName") == 0) {
-#ifdef HAVE_OPENSSLv1 -#ifdef HAVE_OPENSSLv1
+#ifdef OPENSSL_VERSION_NUMBER >= 0x10000000L +#if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
const X509V3_EXT_METHOD *method; const X509V3_EXT_METHOD *method;
#else #else
X509V3_EXT_METHOD *method; X509V3_EXT_METHOD *method;

5
bacula.spec
View File

@ -8,7 +8,7 @@
Summary: Cross platform network backup for Linux, Unix, Mac and Windows Summary: Cross platform network backup for Linux, Unix, Mac and Windows
Name: bacula Name: bacula
Version: 5.0.3 Version: 5.0.3
Release: 1%{?dist} Release: 2%{?dist}
# See LICENSE for details # See LICENSE for details
License: GPLv2 with exceptions License: GPLv2 with exceptions
Group: System Environment/Daemons Group: System Environment/Daemons
@ -1006,6 +1006,9 @@ fi
%changelog %changelog
* Thu Sep 23 2010 Jan Görig <jgorig@redhat.com> - 5.0.3-2
- fixed openssl patch, thanks to Enrico Scholz
* Tue Aug 10 2010 Jon Ciesla <limb@jcomserv.net> - 5.0.3-1 * Tue Aug 10 2010 Jon Ciesla <limb@jcomserv.net> - 5.0.3-1
- New upstream. - New upstream.
- DSOlink fix for same. - DSOlink fix for same.