diff options
| author |   Thomas Beierlein <tomjbe@gentoo.org> | 2010-07-19 09:10:09 +0000 |
|---|---|---|
| committer | Thomas Beierlein <tomjbe@gentoo.org> | 2010-07-19 09:10:09 +0000 |
| commit | f029997a8a83e13671e6537f7d26e1c2ddedf023 (patch) | |
| tree | 5f05bf731046387c5eb45f1db01681972637ac87 | |
| parent | Version bump. (diff) | |
| download | gentoo-2-f029997a8a83e13671e6537f7d26e1c2ddedf023.tar.gz gentoo-2-f029997a8a83e13671e6537f7d26e1c2ddedf023.tar.bz2 gentoo-2-f029997a8a83e13671e6537f7d26e1c2ddedf023.zip | |
Fix openssl-1 patch to work for openssl<1.0.0. See Bug #328785
(Portage version: 2.1.8.3/cvs/Linux i686)
| -rw-r--r-- | app-backup/bacula/ChangeLog | 6 | ||||
| -rw-r--r-- | app-backup/bacula/files/5.0.2/bacula-5.0.2-openssl-1.patch | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/app-backup/bacula/ChangeLog b/app-backup/bacula/ChangeLog index 2fab7cc73f7d..6081296a45af 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.94 2010/07/17 09:41:18 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v 1.95 2010/07/19 09:10:09 tomjbe Exp $ + + 19 Jul 2010; Thomas Beierlein <tomjbe@gentoo.org> + files/5.0.2/bacula-5.0.2-openssl-1.patch: + Fix openssl-1 patch to work for openssl<1.0.0. See Bug #328785 17 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> bacula-3.0.3.ebuild, +files/3.0.3/bacula-3.0.3-openssl-1.patch: diff --git a/app-backup/bacula/files/5.0.2/bacula-5.0.2-openssl-1.patch b/app-backup/bacula/files/5.0.2/bacula-5.0.2-openssl-1.patch index b7424b689306..58d26316ca7d 100644 --- a/app-backup/bacula/files/5.0.2/bacula-5.0.2-openssl-1.patch +++ b/app-backup/bacula/files/5.0.2/bacula-5.0.2-openssl-1.patch @@ -8,7 +8,7 @@ http://cvs.fedoraproject.org/viewvc/rpms/bacula/devel/bacula-5.0.2-openssl.patch * exists. It was not an official API. */ -#ifdef HAVE_OPENSSLv1 -+#ifdef OPENSSL_VERSION_NUMBER >= 0x10000000L ++#if (OPENSSL_VERSION_NUMBER >= 0x10000000L) #define EVP_PKEY_encrypt EVP_PKEY_encrypt_old #define EVP_PKEY_decrypt EVP_PKEY_decrypt_old #endif @@ -19,7 +19,7 @@ http://cvs.fedoraproject.org/viewvc/rpms/bacula/devel/bacula-5.0.2-openssl.patch if (strcmp(extname, "subjectAltName") == 0) { -#ifdef HAVE_OPENSSLv1 -+#ifdef OPENSSL_VERSION_NUMBER >= 0x10000000L ++#if (OPENSSL_VERSION_NUMBER >= 0x10000000L) const X509V3_EXT_METHOD *method; #else X509V3_EXT_METHOD *method; |