aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorLeonardo Arena <rnalrd@alpinelinux.org>2018-11-16 12:29:48 +0000
committerLeonardo Arena <rnalrd@alpinelinux.org>2018-11-16 12:30:24 +0000
commit3e242f1e2745cb7e746a57b0c71d7c79108282c4 (patch)
treea1ea90ea784a0164208c12423fd672403f3c3820 /main
parentf48646803e19fc951369fcd4cdd2bbbbcd12a30c (diff)
downloadaports-3e242f1e2745cb7e746a57b0c71d7c79108282c4.tar.bz2
aports-3e242f1e2745cb7e746a57b0c71d7c79108282c4.tar.xz
main/bacula: upgrade to 9.2.2
Diffstat (limited to 'main')
-rw-r--r--main/bacula/APKBUILD10
-rw-r--r--main/bacula/libressl.patch22
2 files changed, 4 insertions, 28 deletions
diff --git a/main/bacula/APKBUILD b/main/bacula/APKBUILD
index 11ef5ed4b4..978ab78b3c 100644
--- a/main/bacula/APKBUILD
+++ b/main/bacula/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Ɓukasz Jendrysik <scadu@yandex.com>
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=bacula
-pkgver=9.2.1
-pkgrel=1
+pkgver=9.2.2
+pkgrel=0
pkgdesc="Enterprise ready, network based backup program"
url="http://www.bacula.org"
arch="all"
@@ -21,7 +21,6 @@ source="https://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkg
bacula-sd.initd
bacula-fd.initd
bacula-7.4.0-path-mounted.patch
- libressl.patch
"
options="!check" #no test suite provided
builddir="$srcdir/$pkgname-$pkgver"
@@ -171,9 +170,8 @@ client() {
install -d -o $pkgname -g $pkgname "$subpkgdir"/$_bworkdir
}
-sha512sums="6b14372fb505a4c5e084b96154c764b20e173504e335813cfffd406eb1739a301a5352047696501a11fcc297381a9fbed6e0e8714ad62998f02edbd9e0ff8d1b bacula-9.2.1.tar.gz
+sha512sums="390ac0ad205c3694fe02c6842740b188bde0be469d0a9b89388d3f75746c7cca6a536a2386e06a5069c84863f28dae3449250ff71e63b9ff14e8f7b074df1708 bacula-9.2.2.tar.gz
e3ea78c7b920ab33c94c715f9375cf8dc52fd963a526827941c3d6de619c999e00f01ac102d3260e4de457de50af146ab014862174b14524862c92e00908f765 bacula-dir.initd
60f174799ad15b0f5ea94bc578d3a58681e45b8306c059c4d7e78bc3c7edfcff95f8a551495d0af5a94dc645e96d1aa36d4c378f0dfd871e38b0c9b64b82da26 bacula-sd.initd
3887a65972f6a82b2b7b93521e534b8347a5ed9da36c9645eb2bf5eb683b6e0e3ee0613b048b7d2ec725e890ec0513afb2197adfd2bf5d91108dce3b23662c07 bacula-fd.initd
-2d3757236aacca421261a8866ff04b5b0151538e1462559bd1240119b1bece1d456acbba9fee86dbc6aaec7af2a52eb2c0b7490c5f371b7deb478731c74342ff bacula-7.4.0-path-mounted.patch
-b953cfe1bc04c86fe0843eadf5d39178f2f4b8e696b4ac3c2ec265b3bcfc11cd92a990222571e432e5893962e8b44fdf1c6d19fb3b20122178fc56fc8d46f11b libressl.patch"
+2d3757236aacca421261a8866ff04b5b0151538e1462559bd1240119b1bece1d456acbba9fee86dbc6aaec7af2a52eb2c0b7490c5f371b7deb478731c74342ff bacula-7.4.0-path-mounted.patch"
diff --git a/main/bacula/libressl.patch b/main/bacula/libressl.patch
deleted file mode 100644
index 76dac74590..0000000000
--- a/main/bacula/libressl.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/lib/crypto.c
-+++ b/src/lib/crypto.c
-@@ -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
---- a/src/lib/tls.c
-+++ b/src/lib/tls.c
-@@ -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());
-