bacula-scm: switched to 9.4 branch

3 files changed, 2 insertions, 92 deletions

diff --git a/packages/app-backup/bacula/bacula.exlib b/packages/app-backup/bacula/bacula.exlib
index 87f951e..1eb71a9 100644
--- a/packages/app-backup/bacula/bacula.exlib
+++ b/packages/app-backup/bacula/bacula.exlib
@@ -5,7 +5,7 @@
 
 SCM_REPOSITORY="http://git.bacula.org/bacula.git"
 if ever is_scm; then
-    SCM_BRANCH="Branch-9.2"
+    SCM_BRANCH="Branch-9.4"
 else
     SCM_TAG="Release-${PV}"
 fi
@@ -84,15 +84,8 @@ DEPENDENCIES="
 WORK="${WORK}"/bacula
 
 DEFAULT_SRC_PREPARE_PATCHES=(
-#    -p0 "${FILES}"/7.2.0/${PN}-7.2.0-doc.patch
-#    -p1 "${FILES}"/5.2.3/${PN}-5.2.3-as-needed.patch
-#    -p0 "${FILES}"/9.0.2/${PN}-9.0.2-lib-search-path.patch
     -p0 "${FILES}"/5.2.3/${PN}-5.2.3-openssl-1.patch
-#    "${FILES}/bacula-fix-sonames.patch"
-#    "${FILES}"/7.0.2/${PN}-7.0.2-depend.patch
-    -p0 "${FILES}"/9.0.6/${PN}-9.0.6-libressl.patch
-    -p1 "${FILES}"/bacula-libressl-2.7.patch
-    "${FILES}"/bacula-fix-configure-bat.patch
+    -p1 "${FILES}"/bacula-fix-configure-bat.patch
 )
 
 DEFAULT_SRC_CONFIGURE_PARAMS=(
diff --git a/packages/app-backup/bacula/files/9.0.6/bacula-9.0.6-libressl.patch b/packages/app-backup/bacula/files/9.0.6/bacula-9.0.6-libressl.patch
deleted file mode 100644
index 6dc5fbf..0000000
--- a/packages/app-backup/bacula/files/9.0.6/bacula-9.0.6-libressl.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Source: Gentoo distribution
-Reason: Fix build with libressl
-Upstream: Unknwon status
-
---- src/lib/crypto.c.orig       2018-02-02 15:34:39.420489000 -0600
-+++ src/lib/crypto.c    2018-02-02 15:35:44.000524000 -0600
-@@ -195,7 +195,7 @@
- IMPLEMENT_ASN1_FUNCTIONS(SignatureData)
- IMPLEMENT_ASN1_FUNCTIONS(CryptoData)
-
--#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
-+#if ( (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) )
- DEFINE_STACK_OF(SignerInfo);
- DEFINE_STACK_OF(RecipientInfo);
- #else
---- src/lib/openssl-compat.h.orig       2018-02-02 15:26:04.182557000 -0600
-+++ src/lib/openssl-compat.h    2018-02-02 15:27:50.229100000 -0600
-@@ -1,7 +1,7 @@
- #ifndef __OPENSSL_COPMAT__H__
- #define __OPENSSL_COPMAT__H__
-
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+#if ( (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) )
- static inline int EVP_PKEY_up_ref(EVP_PKEY *pkey)
- {
-        CRYPTO_add(&pkey->references, 1, CRYPTO_LOCK_EVP_PKEY);
---- src/lib/openssl.c.orig	2018-02-16 08:36:24.092583000 -0600
-+++ src/lib/openssl.c	2018-02-16 08:37:23.795454000 -0600
-@@ -69,7 +69,7 @@
-    }
- }
- 
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+#if ( (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) )
- /* Array of mutexes for use with OpenSSL static locking */
- static pthread_mutex_t *mutexes;
- 
-@@ -263,7 +263,7 @@
- {
-    int stat = 0;
- 
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+#if ( (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) )
-    if ((stat = openssl_init_threads()) != 0) {
-       berrno be;
-       Jmsg1(NULL, M_ABORT, 0,
-@@ -310,7 +310,7 @@
-       Jmsg0(NULL, M_ERROR, 0, _("Failed to save OpenSSL PRNG\n"));
-    }
- 
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+#if ( (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) )
-    openssl_cleanup_threads();
- 
-    /* Free libssl and libcrypto error strings */
---- src/lib/tls.c.orig	2017-11-21 18:37:16.000000000 +0100
-+++ src/lib/tls.c	2018-04-16 20:00:54.082000000 +0200
-@@ -116,7 +116,7 @@
-    ctx = (TLS_CONTEXT *)malloc(sizeof(TLS_CONTEXT));
- 
-    /* Allocate our OpenSSL TLS Context */
--#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
-+#if ( (OPENSSL_VERSION_NUMBER >= 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) )
-    /* Allows SSLv3, TLSv1, TLSv1.1 and TLSv1.2 protocols */
-    ctx->openssl = SSL_CTX_new(TLS_method());
- 
diff --git a/packages/app-backup/bacula/files/bacula-libressl-2.7.patch b/packages/app-backup/bacula/files/bacula-libressl-2.7.patch
deleted file mode 100644
index ee042cc..0000000
--- a/packages/app-backup/bacula/files/bacula-libressl-2.7.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Source: written by Gluzskiy Alexandr <sss@sss.chaoslab.ru>
-Reason: fix build with libressl >= 2.7
-Upstream: not reported
-
-diff --git a/src/lib/openssl-compat.h b/src/lib/openssl-compat.h
-index e811a4b97..e547bd9a2 100644
---- a/src/lib/openssl-compat.h
-+++ b/src/lib/openssl-compat.h
-@@ -1,7 +1,7 @@
- #ifndef __OPENSSL_COPMAT__H__
- #define __OPENSSL_COPMAT__H__
- 
--#if ( (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) )
-+#if ( (OPENSSL_VERSION_NUMBER < 0x10100000L) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000 ) )
- static inline int EVP_PKEY_up_ref(EVP_PKEY *pkey)
- {
- 	CRYPTO_add(&pkey->references, 1, CRYPTO_LOCK_EVP_PKEY);