diff --git a/bacula-3.0.2-openssl.patch b/bacula-3.0.2-openssl.patch index 5cc9dca..d7cfe14 100644 --- a/bacula-3.0.2-openssl.patch +++ b/bacula-3.0.2-openssl.patch @@ -24,3 +24,18 @@ diff -up bacula-3.0.2/bacula-3.0.2/src/lib/crypto.c.openssl bacula-3.0.2/bacula- /* * Create a new encryption session. * Returns: A pointer to a CRYPTO_SESSION object on success. +diff -up bacula-3.0.2/bacula-3.0.2/src/lib/tls.c.openssl bacula-3.0.2/bacula-3.0.2/src/lib/tls.c +--- bacula-3.0.2/bacula-3.0.2/src/lib/tls.c.openssl 2008-11-22 19:36:12.000000000 +0100 ++++ bacula-3.0.2/bacula-3.0.2/src/lib/tls.c 2009-08-22 15:24:30.000000000 +0200 +@@ -315,7 +315,11 @@ bool tls_postconnect_verify_host(JCR *jc + extname = OBJ_nid2sn(OBJ_obj2nid(X509_EXTENSION_get_object(ext))); + + if (strcmp(extname, "subjectAltName") == 0) { ++#if (OPENSSL_VERSION_NUMBER >= 0x10000000L) ++ const X509V3_EXT_METHOD *method; ++#else + X509V3_EXT_METHOD *method; ++#endif + STACK_OF(CONF_VALUE) *val; + CONF_VALUE *nval; + void *extstr = NULL; diff --git a/bacula.spec b/bacula.spec index a7a4b71..1545495 100644 --- a/bacula.spec +++ b/bacula.spec @@ -366,7 +366,7 @@ pushd bacula-%{version} #%patch9 -p0 #%patch11 -p0 #%patch12 -p0 -%patch13 -p1 -b .openssl +%patch13 -p2 -b .openssl # Remove execution permissions from files we're packaging as docs later on find examples -type f | xargs chmod -x