packages: bacula/bacula.spec, bacula/bacula-openssl1.patch (NEW) - patch to...

[jajcus]

Author: jajcus                       Date: Wed Apr 21 19:38:52 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- patch to build with openssl-1.0.0
- Release: 3

---- Files affected:
packages/bacula:
   bacula.spec (1.134 -> 1.135) , bacula-openssl1.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/bacula/bacula.spec
diff -u packages/bacula/bacula.spec:1.134 packages/bacula/bacula.spec:1.135
--- packages/bacula/bacula.spec:1.134	Thu Mar 18 10:48:54 2010
+++ packages/bacula/bacula.spec	Wed Apr 21 21:38:47 2010
@@ -23,7 +23,7 @@
 Summary(pl.UTF-8):	Bacula - rozwiązanie do wykonywania kopii zapasowych po sieci
 Name:		bacula
 Version:	5.0.1
-Release:	2
+Release:	3
 Epoch:		0
 License:	extended GPL v2
 Group:		Networking/Utilities
@@ -49,6 +49,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
@@ -451,6 +452,7 @@
 #%patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 tar -xf %{SOURCE2} && ln -s bacula-rescue-* rescue
 
@@ -1018,6 +1020,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.135  2010/04/21 19:38:47  jajcus
+- patch to build with openssl-1.0.0
+- Release: 3
+
 Revision 1.134  2010/03/18 09:48:54  jajcus
 - the bat.conf-fixing trigger moved to the common-package. Insecure files may
 be in place even after old bat has been uninstalled

================================================================
Index: packages/bacula/bacula-openssl1.patch
diff -u /dev/null packages/bacula/bacula-openssl1.patch:1.1
--- /dev/null	Wed Apr 21 21:38:53 2010
+++ packages/bacula/bacula-openssl1.patch	Wed Apr 21 21:38:47 2010
@@ -0,0 +1,38 @@
+diff -durN bacula-5.0.1.orig/src/lib/crypto.c bacula-5.0.1/src/lib/crypto.c
+--- bacula-5.0.1.orig/src/lib/crypto.c	2010-02-24 16:33:48.000000000 +0100
++++ bacula-5.0.1/src/lib/crypto.c	2010-04-21 20:50:32.587691290 +0200
+@@ -49,6 +47,13 @@
+ #include "jcr.h"
+ #include <assert.h>
+ 
++/**
++ * For OpenSSL version 1.x, EVP_PKEY_encrypt no longer
++ *  exists.  It was not an official API.
++ */
++#define EVP_PKEY_encrypt EVP_PKEY_encrypt_old
++#define EVP_PKEY_decrypt EVP_PKEY_decrypt_old
++
+ /*
+  * Bacula ASN.1 Syntax
+  *
+@@ -309,7 +316,7 @@
+  */
+ static ASN1_OCTET_STRING *openssl_cert_keyid(X509 *cert) {
+    X509_EXTENSION *ext;
+-   X509V3_EXT_METHOD *method;
++   const X509V3_EXT_METHOD *method;
+    ASN1_OCTET_STRING *keyid;
+    int i;
+ #if (OPENSSL_VERSION_NUMBER >= 0x0090800FL)
+diff -durN bacula-5.0.1.orig/src/lib/tls.c bacula-5.0.1/src/lib/tls.c
+--- bacula-5.0.1.orig/src/lib/tls.c	2010-02-24 16:33:48.000000000 +0100
++++ bacula-5.0.1/src/lib/tls.c	2010-04-21 20:50:32.589983312 +0200
+@@ -315,7 +315,7 @@
+          extname = OBJ_nid2sn(OBJ_obj2nid(X509_EXTENSION_get_object(ext)));
+ 
+          if (strcmp(extname, "subjectAltName") == 0) {
+-            X509V3_EXT_METHOD *method;
++            const X509V3_EXT_METHOD *method;
+             STACK_OF(CONF_VALUE) *val;
+             CONF_VALUE *nval;
+             void *extstr = NULL;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bacula/bacula.spec?r1=1.134&r2=1.135&f=u