diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2011-04-05 08:28:08 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2011-04-05 08:28:08 +0000 |
| commit | c29443257269098790d08cc09755d4f5d63462d7 (patch) | |
| tree | f5b8ba690e182c4e4ab19fc9a879ab7b7fd5f9f9 /main/bacula/bacula-5.0.2-openssl.patch | |
| parent | 656d909f25b1a54e42c60f3eb1bf16ea39ae638e (diff) | |
| download | aports-fcolista-c29443257269098790d08cc09755d4f5d63462d7.tar.bz2 aports-fcolista-c29443257269098790d08cc09755d4f5d63462d7.tar.xz | |
main/bacula: apply a bunch of patches from fedora and gentoo
and fix building with ccache
Diffstat (limited to 'main/bacula/bacula-5.0.2-openssl.patch')
| -rw-r--r-- | main/bacula/bacula-5.0.2-openssl.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/main/bacula/bacula-5.0.2-openssl.patch b/main/bacula/bacula-5.0.2-openssl.patch new file mode 100644 index 0000000000..a71d8d5467 --- /dev/null +++ b/main/bacula/bacula-5.0.2-openssl.patch @@ -0,0 +1,24 @@ +diff -up bacula-5.0.2/src/lib/crypto.c.openssl bacula-5.0.2/bacula-5.0.2/src/lib/crypto.c +--- bacula-5.0.2/src/lib/crypto.c.openssl 2010-04-27 21:58:29.000000000 +0200 ++++ bacula-5.0.2/src/lib/crypto.c 2010-06-01 17:51:52.846894465 +0200 +@@ -51,7 +51,7 @@ + * For OpenSSL version 1.x, EVP_PKEY_encrypt no longer + * exists. It was not an official API. + */ +-#ifdef HAVE_OPENSSLv1 ++#if (OPENSSL_VERSION_NUMBER >= 0x10000000L) + #define EVP_PKEY_encrypt EVP_PKEY_encrypt_old + #define EVP_PKEY_decrypt EVP_PKEY_decrypt_old + #endif +diff -up bacula-5.0.2/bacula-5.0.2/src/lib/tls.c.openssl bacula-5.0.2/bacula-5.0.2/src/lib/tls.c +--- bacula-5.0.2/src/lib/tls.c.openssl 2010-04-27 21:58:29.000000000 +0200 ++++ bacula-5.0.2/src/lib/tls.c 2010-06-01 17:52:15.535769446 +0200 +@@ -315,7 +315,7 @@ bool tls_postconnect_verify_host(JCR *jc + extname = OBJ_nid2sn(OBJ_obj2nid(X509_EXTENSION_get_object(ext))); + + if (strcmp(extname, "subjectAltName") == 0) { +-#ifdef HAVE_OPENSSLv1 ++#if (OPENSSL_VERSION_NUMBER >= 0x10000000L) + const X509V3_EXT_METHOD *method; + #else + X509V3_EXT_METHOD *method; |