rpms/bacula/devel bacula-5.0.2-openssl.patch, 1.1, 1.2 bacula.spec, 1.41, 1.42

[Jon Ciesla]

Author: limb

Update of /cvs/pkgs/rpms/bacula/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv31622

Modified Files:
	bacula-5.0.2-openssl.patch bacula.spec 
Log Message:
Bat fix.


bacula-5.0.2-openssl.patch:
 crypto.c |    4 ++++
 1 file changed, 4 insertions(+)

Index: bacula-5.0.2-openssl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/devel/bacula-5.0.2-openssl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- bacula-5.0.2-openssl.patch	30 Apr 2010 15:37:22 -0000	1.1
+++ bacula-5.0.2-openssl.patch	19 May 2010 15:55:24 -0000	1.2
@@ -1,18 +1,6 @@
 diff -up bacula-3.0.2/bacula-3.0.2/src/lib/crypto.c.openssl bacula-3.0.2/bacula-3.0.2/src/lib/crypto.c
 --- bacula-3.0.2/bacula-3.0.2/src/lib/crypto.c.openssl	2008-11-06 20:10:08.000000000 +0100
 +++ bacula-3.0.2/bacula-3.0.2/src/lib/crypto.c	2009-08-22 12:48:20.000000000 +0200
-@@ -316,7 +316,11 @@
-  */
- static ASN1_OCTET_STRING *openssl_cert_keyid(X509 *cert) {
-    X509_EXTENSION *ext;
-+#if (OPENSSL_VERSION_NUMBER < 0x10000000L)
-+   X509V3_EXT_METHOD *method;
-+#else
-    const X509V3_EXT_METHOD *method;
-+#endif
-    ASN1_OCTET_STRING *keyid;
-    int i;
- #if (OPENSSL_VERSION_NUMBER >= 0x0090800FL)
 @@ -973,6 +977,10 @@ void crypto_sign_free(SIGNATURE *sig)
     free (sig);
  }


Index: bacula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/devel/bacula.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- bacula.spec	30 Apr 2010 15:37:22 -0000	1.41
+++ bacula.spec	19 May 2010 15:55:24 -0000	1.42
@@ -8,7 +8,7 @@
 Summary: Cross platform network backup for Linux, Unix, Mac and Windows
 Name: bacula
 Version: 5.0.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 # See LICENSE for details
 License: GPLv2 with exceptions
 Group: System Environment/Daemons
@@ -470,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
@@ -1012,6 +1021,10 @@ fi
 
 
 %changelog
+* 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.