diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-07-17 09:41:18 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-07-17 09:41:18 +0000 |
| commit | 82c2f31090dd427df6ca601db17ca2689afee2e6 (patch) | |
| tree | 7adee62e140babb9331b4cb5e13c04ab3627628d /app-backup | |
| parent | stable x86, bug 328049 (diff) | |
| download | gentoo-2-82c2f31090dd427df6ca601db17ca2689afee2e6.tar.gz gentoo-2-82c2f31090dd427df6ca601db17ca2689afee2e6.tar.bz2 gentoo-2-82c2f31090dd427df6ca601db17ca2689afee2e6.zip | |
Fix building with OpenSSL >= 1.0.0 wrt #328701 by Thomas Beierlein.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'app-backup')
| -rw-r--r-- | app-backup/bacula/ChangeLog | 6 | ||||
| -rw-r--r-- | app-backup/bacula/bacula-3.0.3.ebuild | 4 | ||||
| -rw-r--r-- | app-backup/bacula/files/3.0.3/bacula-3.0.3-openssl-1.patch | 42 |
3 files changed, 50 insertions, 2 deletions
diff --git a/app-backup/bacula/ChangeLog b/app-backup/bacula/ChangeLog index 9262b44043ac..2fab7cc73f7d 100644 --- a/app-backup/bacula/ChangeLog +++ b/app-backup/bacula/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-backup/bacula # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v 1.93 2010/07/17 09:34:59 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v 1.94 2010/07/17 09:41:18 ssuominen Exp $ + + 17 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> bacula-3.0.3.ebuild, + +files/3.0.3/bacula-3.0.3-openssl-1.patch: + Fix building with OpenSSL >= 1.0.0 wrt #328701 by Thomas Beierlein. 17 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> bacula-5.0.2-r1.ebuild, +files/5.0.2/bacula-5.0.2-openssl-1.patch: diff --git a/app-backup/bacula/bacula-3.0.3.ebuild b/app-backup/bacula/bacula-3.0.3.ebuild index a02d19eb3050..00d977dc3ca9 100644 --- a/app-backup/bacula/bacula-3.0.3.ebuild +++ b/app-backup/bacula/bacula-3.0.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-3.0.3.ebuild,v 1.5 2010/06/17 21:21:43 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-3.0.3.ebuild,v 1.6 2010/07/17 09:41:18 ssuominen Exp $ EAPI="2" inherit eutils wxwidgets @@ -133,6 +133,8 @@ src_prepare() { # apply upstream patches #epatch "${FILESDIR}"/${PV}/${PV}-foo.patch + + epatch "${FILESDIR}"/${PV}/${P}-openssl-1.patch } src_configure() { diff --git a/app-backup/bacula/files/3.0.3/bacula-3.0.3-openssl-1.patch b/app-backup/bacula/files/3.0.3/bacula-3.0.3-openssl-1.patch new file mode 100644 index 000000000000..ecd187d26951 --- /dev/null +++ b/app-backup/bacula/files/3.0.3/bacula-3.0.3-openssl-1.patch @@ -0,0 +1,42 @@ +http://bugs.gentoo.org/328701 +http://cvs.fedoraproject.org/viewvc/rpms/bacula/devel/bacula-3.0.2-openssl.patch?revision=1.2&view=markup + +--- src/lib/crypto.c ++++ src/lib/crypto.c +@@ -309,7 +309,11 @@ typedef struct PEM_CB_Context { + */ + 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. +--- src/lib/tls.c ++++ src/lib/tls.c +@@ -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; |