- openssl1.path is back, now to actually enable the openssl1-compatibility-workaround...

Changed files:
    bacula-openssl1.patch -> 1.3
    bacula.spec -> 1.139

diff --git a/bacula-openssl1.patch b/bacula-openssl1.patch
new file mode 100644 (file)
index 0000000..7d62f40
--- /dev/null
+++ b/bacula-openssl1.patch
@@ -0,0 +1,12 @@
+diff -dur -x '*~' bacula-5.0.2.orig/autoconf/configure.in bacula-5.0.2/autoconf/configure.in
+--- bacula-5.0.2.orig/autoconf/configure.in    2010-05-26 12:46:22.437922997 +0200
++++ bacula-5.0.2/autoconf/configure.in 2010-05-26 13:08:22.688284981 +0200
+@@ -1209,7 +1209,7 @@
+    OPENSSL_LIBS=""
+    OPENSSL_INC=""
+ else
+-   AC_CHECK_LIB(ssl, EVP_PKEY_encrypt_old, AC_DEFINE(HAVE_OPENSSLv1, 1, [Set if have OpenSSL version 1.x]))
++   AC_DEFINE(HAVE_OPENSSLv1, 1, [Set if have OpenSSL version 1.x])
+ fi  
+ 
+ AC_MSG_RESULT([$support_tls])

diff --git a/bacula.spec b/bacula.spec
index 26554fefc59585de6f78a46dae0e111338e909bb..338ee501b4bbaaf7becd495998c7ae5a471742c8 100644 (file)
--- a/bacula.spec
+++ b/bacula.spec
@@ -52,6 +52,7 @@ Patch5:               %{name}-desktop.patch
 Patch6:                %{name}-64bitbuild_fix.patch
 Patch7:                %{name}-dbi_fixes.patch
 Patch8:                %{name}-dbi_dbcheck.patch
+Patch9:                %{name}-openssl1.patch
 URL:           http://www.bacula.org/
 BuildRequires: acl-devel
 BuildRequires: autoconf
@@ -463,6 +464,7 @@ Nagios plugin to check bacula.
 #%patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 tar -xf %{SOURCE2} && ln -s bacula-rescue-* rescue