diff options
| -rw-r--r-- | metadata/repository_mask.conf | 9 | ||||
| -rw-r--r-- | packages/app-backup/bacula/bacula.exlib | 4 | ||||
| -rw-r--r-- | packages/app-backup/bacula/files/5.2.3/bacula-5.2.3-openssl-1.patch | 29 |
3 files changed, 9 insertions, 33 deletions
diff --git a/metadata/repository_mask.conf b/metadata/repository_mask.conf index 8b3f04b..d907aee 100644 --- a/metadata/repository_mask.conf +++ b/metadata/repository_mask.conf @@ -1,4 +1,5 @@ ( + app-backup/bacula[~scm] dev-util/codelite[~scm] media-gfx/nomacs[~scm] net-libs/stem[~scm] @@ -22,3 +23,11 @@ *description = [ Mask scm version, package does not respect exherbo package rules, kept for reference ] ]] +( + app-backup/bacula[>=9.4] +) +[[ + *date = [ 25 Mar 2019 ] + *token = broken + *description = [ at least MySQL SQL databases support broken in version 9.4.x ] +]] diff --git a/packages/app-backup/bacula/bacula.exlib b/packages/app-backup/bacula/bacula.exlib index f018a8e..c7f24d6 100644 --- a/packages/app-backup/bacula/bacula.exlib +++ b/packages/app-backup/bacula/bacula.exlib @@ -82,10 +82,6 @@ DEPENDENCIES=" " WORK="${WORK}"/bacula -# -p0 "${FILES}"/5.2.3/${PN}-5.2.3-openssl-1.patch -# "${FILES}"/libressl-build-fix.patch - -# "${FILES}"/libressl-build-fix.patch DEFAULT_SRC_PREPARE_PATCHES=( -p1 "${FILES}"/bacula-fix-configure-bat.patch diff --git a/packages/app-backup/bacula/files/5.2.3/bacula-5.2.3-openssl-1.patch b/packages/app-backup/bacula/files/5.2.3/bacula-5.2.3-openssl-1.patch deleted file mode 100644 index b2811be..0000000 --- a/packages/app-backup/bacula/files/5.2.3/bacula-5.2.3-openssl-1.patch +++ /dev/null @@ -1,29 +0,0 @@ -Source: Gentoo distribution -Reason: fix build with openssl >= 1.1 -Upstream: http://cvs.fedoraproject.org/viewvc/rpms/bacula/devel/bacula-5.0.2-openssl.patch?revision=1.3&view=markup - -http://bugs.gentoo.org/328701 -http://cvs.fedoraproject.org/viewvc/rpms/bacula/devel/bacula-5.0.2-openssl.patch?revision=1.3&view=markup - ---- src/lib/crypto.c -+++ src/lib/crypto.c -@@ -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 ---- src/lib/tls.c -+++ src/lib/tls.c -@@ -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; |