packages: bacula/bacula.spec, bacula/bacula-openssl1.patch - openssl1.path ...

[jajcus]

Author: jajcus                       Date: Wed May 26 11:24:01 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- openssl1.path is back, now to actually enable the openssl1-compatibility-workaround code included in bacula sources

---- Files affected:
packages/bacula:
   bacula.spec (1.138 -> 1.139) , bacula-openssl1.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/bacula/bacula.spec
diff -u packages/bacula/bacula.spec:1.138 packages/bacula/bacula.spec:1.139
--- packages/bacula/bacula.spec:1.138	Tue May 25 15:34:23 2010
+++ packages/bacula/bacula.spec	Wed May 26 13:23:55 2010
@@ -53,6 +53,7 @@
 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
@@ -464,6 +465,7 @@
 #%patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 tar -xf %{SOURCE2} && ln -s bacula-rescue-* rescue
 
@@ -1048,6 +1050,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.139  2010/05/26 11:23:55  jajcus
+- openssl1.path is back, now to actually enable the openssl1-compatibility-workaround code included in bacula sources
+
 Revision 1.138  2010/05/25 13:34:23  glen
 - openssl1 patch outdated, won't build as can't find libbac.la
 

================================================================
Index: packages/bacula/bacula-openssl1.patch
diff -u /dev/null packages/bacula/bacula-openssl1.patch:1.3
--- /dev/null	Wed May 26 13:24:01 2010
+++ packages/bacula/bacula-openssl1.patch	Wed May 26 13:23:55 2010
@@ -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])
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bacula/bacula.spec?r1=1.138&r2=1.139&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bacula/bacula-openssl1.patch?r1=1.2&r2=1.3&f=u