rpms/bacula/devel bacula-5.0.2-openssl.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 bacula.spec, 1.40, 1.41 sources, 1.12, 1.13

[Jon Ciesla]

Author: limb

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

Modified Files:
	.cvsignore bacula.spec sources 
Added Files:
	bacula-5.0.2-openssl.patch 
Log Message:
5.0.2.  Fixes an sd bug per slankes.


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

--- NEW FILE bacula-5.0.2-openssl.patch ---
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);
 }
 
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+#define EVP_PKEY_decrypt EVP_PKEY_decrypt_old
+#define EVP_PKEY_encrypt EVP_PKEY_encrypt_old
+#endif
 /*
  * Create a new encryption session.
  *  Returns: A pointer to a CRYPTO_SESSION object on success.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	18 Mar 2010 15:49:34 -0000	1.13
+++ .cvsignore	30 Apr 2010 15:37:22 -0000	1.14
@@ -1,2 +1,2 @@
-bacula-5.0.1.tar.gz
-bacula-docs-5.0.1.tar.bz2
+bacula-5.0.2.tar.gz
+bacula-docs-5.0.2.tar.bz2


Index: bacula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/devel/bacula.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- bacula.spec	18 Mar 2010 15:49:34 -0000	1.40
+++ bacula.spec	30 Apr 2010 15:37:22 -0000	1.41
@@ -7,7 +7,7 @@
 
 Summary: Cross platform network backup for Linux, Unix, Mac and Windows
 Name: bacula
-Version: 5.0.1
+Version: 5.0.2
 Release: 1%{?dist}
 # See LICENSE for details
 License: GPLv2 with exceptions
@@ -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
@@ -1010,6 +1012,10 @@ fi
 
 
 %changelog
+* 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/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	18 Mar 2010 15:49:34 -0000	1.12
+++ sources	30 Apr 2010 15:37:22 -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