| 1 |
commit: 75ad47ec2124ff3e8d4ddd010e89b65958b3a4d9 |
| 2 |
Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Aug 5 07:45:12 2018 +0000 |
| 4 |
Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 5 07:46:29 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75ad47ec |
| 7 |
|
| 8 |
app-backup/bacula: Add patch to work with >=dev-libs/libressl-2.7 |
| 9 |
|
| 10 |
Apply different patches according to dev-libs/libressl version (<2.7 and |
| 11 |
>=2.7) installed. |
| 12 |
|
| 13 |
Reported-by: Toralf Förster <toralf <AT> gentoo.org> |
| 14 |
Closes: https://bugs.gentoo.org/655520 |
| 15 |
Package-Manager: Portage-2.3.44, Repoman-2.3.10 |
| 16 |
|
| 17 |
app-backup/bacula/bacula-9.0.6-r3.ebuild | 8 +++++++- |
| 18 |
...ula-9.0.6-libressl.patch => bacula-9.0.6-libressl26.patch} | 0 |
| 19 |
app-backup/bacula/files/9.0.6/bacula-9.0.6-libressl27.patch | 11 +++++++++++ |
| 20 |
3 files changed, 18 insertions(+), 1 deletion(-) |
| 21 |
|
| 22 |
diff --git a/app-backup/bacula/bacula-9.0.6-r3.ebuild b/app-backup/bacula/bacula-9.0.6-r3.ebuild |
| 23 |
index f30acaa0b53..0c4d61e2a76 100644 |
| 24 |
--- a/app-backup/bacula/bacula-9.0.6-r3.ebuild |
| 25 |
+++ b/app-backup/bacula/bacula-9.0.6-r3.ebuild |
| 26 |
@@ -169,7 +169,13 @@ src_prepare() { |
| 27 |
chmod 755 src/qt-console/.libs/bat || die |
| 28 |
|
| 29 |
# fix wrong handling of libressl version |
| 30 |
- eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-libressl.patch |
| 31 |
+ # needs separate handling for <libressl-2.7 and >=libressl2.7 |
| 32 |
+ # (see bug #655520) |
| 33 |
+ if has_version "<dev-libs/libressl-2.7"; then |
| 34 |
+ eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-libressl26.patch |
| 35 |
+ else |
| 36 |
+ eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-libressl27.patch |
| 37 |
+ fi |
| 38 |
|
| 39 |
# fix bundled libtool (bug 466696) |
| 40 |
# But first move directory with M4 macros out of the way. |
| 41 |
|
| 42 |
diff --git a/app-backup/bacula/files/9.0.6/bacula-9.0.6-libressl.patch b/app-backup/bacula/files/9.0.6/bacula-9.0.6-libressl26.patch |
| 43 |
similarity index 100% |
| 44 |
rename from app-backup/bacula/files/9.0.6/bacula-9.0.6-libressl.patch |
| 45 |
rename to app-backup/bacula/files/9.0.6/bacula-9.0.6-libressl26.patch |
| 46 |
|
| 47 |
diff --git a/app-backup/bacula/files/9.0.6/bacula-9.0.6-libressl27.patch b/app-backup/bacula/files/9.0.6/bacula-9.0.6-libressl27.patch |
| 48 |
new file mode 100644 |
| 49 |
index 00000000000..b87f4b13f9f |
| 50 |
--- /dev/null |
| 51 |
+++ b/app-backup/bacula/files/9.0.6/bacula-9.0.6-libressl27.patch |
| 52 |
@@ -0,0 +1,11 @@ |
| 53 |
+--- src/lib/crypto.c.orig 2018-02-02 15:34:39.420489000 -0600 |
| 54 |
++++ src/lib/crypto.c 2018-02-02 15:35:44.000524000 -0600 |
| 55 |
+@@ -195,7 +195,7 @@ |
| 56 |
+ IMPLEMENT_ASN1_FUNCTIONS(SignatureData) |
| 57 |
+ IMPLEMENT_ASN1_FUNCTIONS(CryptoData) |
| 58 |
+ |
| 59 |
+-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) |
| 60 |
++#if ( (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) ) |
| 61 |
+ DEFINE_STACK_OF(SignerInfo); |
| 62 |
+ DEFINE_STACK_OF(RecipientInfo); |
| 63 |
+ #else |
Archives