X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=bacula-openssl1.patch;h=7d62f4096bc61398b735abafa99717b4bfa7e1ca;hb=6f3f1b789da5be556c47d1abf65ab57c134b0ddf;hp=be40335cea350bba0d8f9d7aebaeeb67be58faa6;hpb=a37f7e26b6d3fa663c2e3eb06962b32de228e5a3;p=packages%2Fbacula.git

diff --git a/bacula-openssl1.patch b/bacula-openssl1.patch
index be40335..7d62f40 100644
--- a/bacula-openssl1.patch
+++ b/bacula-openssl1.patch
@@ -1,38 +1,12 @@
-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>
+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  
  
-+/**
-+ * 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;
+ AC_MSG_RESULT([$support_tls])