rpms/bacula/F-13 bacula-5.0.2-openssl.patch, NONE, 1.1 bacula.spec, 1.40, 1.41 sources, 1.12, 1.13

[Jon Ciesla]

Author: limb

Update of /cvs/pkgs/rpms/bacula/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv16335

Modified Files:
	bacula.spec sources 
Added Files:
	bacula-5.0.2-openssl.patch 
Log Message:
Multiple fixes, new upstream.


bacula-5.0.2-openssl.patch:
 crypto.c |    2 +-
 tls.c    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE bacula-5.0.2-openssl.patch ---
diff -up bacula-5.0.2/bacula-5.0.2/src/lib/crypto.c.openssl bacula-5.0.2/bacula-5.0.2/src/lib/crypto.c
--- bacula-5.0.2/bacula-5.0.2/src/lib/crypto.c.openssl	2010-04-27 21:58:29.000000000 +0200
+++ bacula-5.0.2/bacula-5.0.2/src/lib/crypto.c	2010-06-01 17:51:52.846894465 +0200
@@ -51,7 +51,7 @@
  * For OpenSSL version 1.x, EVP_PKEY_encrypt no longer
  *  exists.  It was not an official API.
  */
-#ifdef HAVE_OPENSSLv1
+#ifdef OPENSSL_VERSION_NUMBER >= 0x10000000L
 #define EVP_PKEY_encrypt EVP_PKEY_encrypt_old
 #define EVP_PKEY_decrypt EVP_PKEY_decrypt_old
 #endif
diff -up bacula-5.0.2/bacula-5.0.2/src/lib/tls.c.openssl bacula-5.0.2/bacula-5.0.2/src/lib/tls.c
--- bacula-5.0.2/bacula-5.0.2/src/lib/tls.c.openssl	2010-04-27 21:58:29.000000000 +0200
+++ bacula-5.0.2/bacula-5.0.2/src/lib/tls.c	2010-06-01 17:52:15.535769446 +0200
@@ -315,7 +315,7 @@ bool tls_postconnect_verify_host(JCR *jc
          extname = OBJ_nid2sn(OBJ_obj2nid(X509_EXTENSION_get_object(ext)));
 
          if (strcmp(extname, "subjectAltName") == 0) {
-#ifdef HAVE_OPENSSLv1
+#ifdef OPENSSL_VERSION_NUMBER >= 0x10000000L
             const X509V3_EXT_METHOD *method;
 #else
             X509V3_EXT_METHOD *method;


Index: bacula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/F-13/bacula.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- bacula.spec	18 Mar 2010 16:12:35 -0000	1.40
+++ bacula.spec	1 Jun 2010 19:40:32 -0000	1.41
@@ -7,8 +7,8 @@
 
 Summary: Cross platform network backup for Linux, Unix, Mac and Windows
 Name: bacula
-Version: 5.0.1
-Release: 1%{?dist}
+Version: 5.0.2
+Release: 3%{?dist}
 # See LICENSE for details
 License: GPLv2 with exceptions
 Group: System Environment/Daemons
@@ -39,8 +39,9 @@ Patch3: bacula-pamd.patch
 #Patch10: bacula-web-smarty.patch
 #Patch11: bacula-2.4.3-orphaned-jobs.patch
 #Patch12: bacula-2.4.3-python26.patch
-Patch13: bacula-3.0.2-openssl.patch
+#Patch13: bacula-3.0.2-openssl.patch
 Patch14: bacula-5.0.1-dsolink.patch
+Patch15: bacula-5.0.2-openssl.patch
 URL: http://www.bacula.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: openssl-devel, atk-devel, ncurses-devel, pango-devel, perl
@@ -367,8 +368,9 @@ pushd bacula-%{version}
 #%patch9 -p0
 #%patch11 -p0
 #%patch12 -p0
-%patch13 -p2 -b .openssl
+#%patch13 -p2 -b .openssl
 %patch14 -p2
+%patch15 -p2 -b .openssl
 
 # Remove execution permissions from files we're packaging as docs later on
 find examples -type f | xargs chmod -x
@@ -468,6 +470,15 @@ pushd bacula-sqlite
 	echo 'depending on your release version you are building on.'
 	exit 1
 %endif
+
+#Regen bat qt project file and build
+pushd src
+pushd qt-console
+/usr/bin/qmake-qt4
+make
+popd
+popd
+
 popd
 
 # Build MySQL director
@@ -1010,6 +1021,17 @@ fi
 
 
 %changelog
+* Tue Jun 01 2010 Jon Ciesla <limb at jcomserv.net - 5.0.2-3
+- Corrected ssl patch, court. jgorig.
+
+* Wed May 19 2010 Jon Ciesla <limb at jcomserv.net - 5.0.2-2
+- Corrected bat build, BZ 593149.
+- Corrected ssl patch.
+
+* Thu Apr 29 2010 Jon Ciesla <limb at jcomserv.net - 5.0.2-1
+- New upstream, 5.0.2.
+- Updated openssl patch.
+
 * Thu Feb 25 2010 Jon Ciesla <limb at jcomserv.net - 5.0.1-1
 - New upstream, 5.0.1.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/F-13/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	18 Mar 2010 16:12:35 -0000	1.12
+++ sources	1 Jun 2010 19:40:32 -0000	1.13
@@ -1,2 +1,2 @@
-beb9f8da196b3c9ffb0356f087dbdb99  bacula-5.0.1.tar.gz
-ce2ef0dca50ab916fd6701b53b7bb4df  bacula-docs-5.0.1.tar.bz2
+e9204d2e772f12662de28da3327853de  bacula-5.0.2.tar.gz
+7a6afbf592dde4fae0240d82ed3cb10d  bacula-docs-5.0.2.tar.bz2