diff options
| author | Simon Frankenberger <simon@fraho.eu> | 2018-08-17 06:13:22 +0200 |
|---|---|---|
| committer | Andy Postnikov <apostnikov@gmail.com> | 2018-08-17 19:32:00 +0300 |
| commit | d64edf09984a2c5f0262455235f51af04a1774ab (patch) | |
| tree | 93e483576242278073bf191cacd2c5efd7a48045 /community/bareos | |
| parent | 3aa7385bcb1c7ad6b80116ab3e996b43820e346e (diff) | |
| download | aports-d64edf09984a2c5f0262455235f51af04a1774ab.tar.bz2 aports-d64edf09984a2c5f0262455235f51af04a1774ab.tar.xz | |
community/bareos: Update bareos to latest 17.2.7
Diffstat (limited to 'community/bareos')
| -rw-r--r-- | community/bareos/APKBUILD | 10 | ||||
| -rw-r--r-- | community/bareos/mariadb.patch | 21 |
2 files changed, 4 insertions, 27 deletions
diff --git a/community/bareos/APKBUILD b/community/bareos/APKBUILD index c1774aa67c..1f8c595c98 100644 --- a/community/bareos/APKBUILD +++ b/community/bareos/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=bareos -pkgver=17.2.4 -pkgrel=1 +pkgver=17.2.7 +pkgrel=0 pkgdesc="Bareos - Backup Archiving REcovery Open Sourced" url="http://www.bareos.org" arch="all" @@ -22,7 +22,6 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/Re $pkgname-sd.initd $pkgname-fd.initd path-mounted.patch - mariadb.patch " builddir="$srcdir"/${pkgname}-Release-${pkgver} @@ -124,9 +123,8 @@ trayicon() { done } -sha512sums="165bee4dcfabac7e72839831de7067b4dafd1f82dd1615d7fa08ca331b1b3efa516555e33ca2d2ef42482c9b5104769c5ef3dd40a12e1954934874b6884ea26b bareos-17.2.4.tar.gz +sha512sums="254eddacb067ef7e82b7a54bdfcbffd5cfa033fa045f697c7e5b5c28dd064b5e1ce9f6aa946282c60f59972beae0b1b7901882b77c3f71cf16efdd73934135cc bareos-17.2.7.tar.gz eb1e7072b579bf9ae21f2e351d6900abb277db64e373f4760bac8188b82929376e4a196d2c935cefe1ae4cc2c396f2fcba1a25642b26e2f92a0d008fbdc4b5f2 bareos-dir.initd c770b1d041fafef93d4eb0269ba8d9733e85ef465657fe8dd5d5c68a27ec773cec9c5c582d4a16596d95bbf6dbd3f7194dc9c0d8ed73138e9fb438fba9aa9445 bareos-sd.initd c6347079dbcef5f4a69ec0c4ecc31803520d715d599d89c6bbfbb3741a86c50d7295c30432889b13ee9c16f2feaa84b1c6ae992cfee6505d569c6493d7e85a5b bareos-fd.initd -eac4614c1b29ff0f12061837e425ae495890076021b6d1b0f1beb93501cfb905170342dac5dab69b09f825d5b9416eea25fa02e2174b5a704315c7feb08ff3d3 path-mounted.patch -fd4b06cc8f118c05afbc03238376c7c6bedaf3f564090819e3fb1ab01320c79e1515ea7a81a307648015cc98a2a14aceb67684a166b986c5314bfd23b1e5ebde mariadb.patch" +eac4614c1b29ff0f12061837e425ae495890076021b6d1b0f1beb93501cfb905170342dac5dab69b09f825d5b9416eea25fa02e2174b5a704315c7feb08ff3d3 path-mounted.patch" diff --git a/community/bareos/mariadb.patch b/community/bareos/mariadb.patch deleted file mode 100644 index 6a207ea00e..0000000000 --- a/community/bareos/mariadb.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/src/cats/mysql.c b/src/cats/mysql.c -index be910fb..7675cd4 100644 ---- a/src/cats/mysql.c -+++ b/src/cats/mysql.c -@@ -156,6 +156,7 @@ bool B_DB_MYSQL::open_database(JCR *jcr) - { - bool retval = false; - int errstat; -+ my_bool reconnect = 1; - - P(mutex); - if (m_connected) { -@@ -200,7 +201,7 @@ bool B_DB_MYSQL::open_database(JCR *jcr) - bmicrosleep(5,0); - } - -- m_instance.reconnect = 1; /* so connection does not timeout */ -+ mysql_options(&m_instance, MYSQL_OPT_RECONNECT, &reconnect); /* so connection does not timeout */ - Dmsg0(50, "mysql_real_connect done\n"); - Dmsg3(50, "db_user=%s db_name=%s db_password=%s\n", m_db_user, m_db_name, - (m_db_password == NULL) ? "(NULL)" : m_db_password); |