community/bareos: upgrade to 17.2.4

- subpackage bareos-bat has been removed, according with the README.md:
"BAT has been removed. Please use bareos-webui instead."

1 files changed, 11 insertions, 42 deletions

diff --git a/community/bareos/APKBUILD b/community/bareos/APKBUILD
index 924ed97fb5..3ea1eb760a 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=16.2.6
-pkgrel=1
+pkgver=17.2.4
+pkgrel=0
 pkgdesc="Bareos - Backup Archiving REcovery Open Sourced"
 url="http://www.bareos.org"
 arch="all"
@@ -11,10 +11,10 @@ options="!check"
 license="AGPL3"
 depends="perl"
 makedepends="file libtool libintl libpcap-dev lzo-dev \
-	sqlite-dev postgresql-dev libressl-dev mariadb-dev acl-dev \
-	qt-dev python2-dev readline-dev ncurses-dev jansson-dev"
+	sqlite-dev postgresql-dev gnutls-dev mariadb-dev acl-dev \
+	qt-dev python-dev readline-dev ncurses-dev jansson-dev"
 install="$pkgname.pre-install $pkgname.post-install"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-bat $pkgname-trayicon"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-trayicon"
 pkgusers=$pkgname
 pkggroups=$pkgname
 source="$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/Release/$pkgver.tar.gz
@@ -46,7 +46,6 @@ build() {
 		--with-pid-dir=/run/$pkgname \
 		--with-logdir=/var/log/$pkgname \
 		--with-subsys-dir=/var/lock \
-		--enable-bat \
 		--enable-smartalloc \
 		--enable-largefile \
 		--enable-readline \
@@ -67,8 +66,9 @@ build() {
 		--with-postgresql \
 		--with-mysql \
 		--with-sqlite3 \
-		--with-openssl \
+		--with-gnutls \
 		--with-python \
+		--without-openssl \
 		--without-systemd \
 		--with-dir-user=$pkgname \
 		--with-dir-group=$pkgname \
@@ -82,7 +82,9 @@ build() {
 package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir" install
-
+	mkdir -p "$pkgdir"/usr/sbin
+	mkdir -p "$pkgdir"/usr/bin
+	
 	local daemon; for daemon in dir sd fd; do
 		install -Dm755 "$srcdir"/$pkgname-$daemon.initd \
 			"$pkgdir"/etc/init.d/$pkgname-$daemon
@@ -94,39 +96,6 @@ package() {
 	# Fix job to use shell script instead of perl script
 	sed -i -e 's/make_catalog_backup.pl/make_catalog_backup/' \
 		"$pkgdir"/etc/bareos/bareos-dir.d/job/BackupCatalog.conf
-
-	# Remove unneeded scripts
-	rm "$pkgdir"/usr/sbin/bareos \
-		"$pkgdir"/usr/sbin/bconsole "$pkgdir"/usr/sbin/bregex \
-		"$pkgdir"/usr/sbin/bsmtp "$pkgdir"/usr/sbin/bwild \
-		"$pkgdir"/etc/$pkgname/scripts/bareos \
-		"$pkgdir"/etc/$pkgname/scripts/bconsole \
-		"$pkgdir"/etc/$pkgname/scripts/btraceback* \
-		"$pkgdir"/etc/$pkgname/scripts/bareos-ctl-* \
-		"$pkgdir"/etc/$pkgname/scripts/bareos_config \
-		"$pkgdir"/etc/$pkgname/scripts/make_catalog_backup.pl
-
-	# Fix premissions
-	chown :$pkgname "$pkgdir"/etc/$pkgname/scripts/* \
-		"$pkgdir"/etc/$pkgname/*.conf \
-		"$pkgdir"/usr/sbin/* \
-		"$pkgdir"/usr/bin/*
-	chown $pkgname:$pkgname -R "$pkgdir"/etc/$pkgname/bareos-*.d \
-		"$pkgdir"/var/lib/$pkgname \
-		"$pkgdir"/var/log/$pkgname
-}
-
-bat() {
-	local dir name=${subpkgname#$pkgname-}
-	depends="$pkgname"
-	pkgdesc="$pkgdesc (qt administration tool)"
-	mkdir -p "$subpkgdir"/etc/$pkgname "$subpkgdir"/usr/bin
-	for dir in applications pixmaps; do
-		mkdir -p "$subpkgdir"/usr/share/$dir
-		mv "$pkgdir"/usr/share/$dir/$name.* "$subpkgdir"/usr/share/$dir
-	done
-	mv "$pkgdir"/etc/$pkgname/$name.* "$subpkgdir"/etc/$pkgname
-	mv "$pkgdir"/usr/bin/$name "$subpkgdir"/usr/bin
 }
 
 trayicon() {
@@ -146,7 +115,7 @@ trayicon() {
 	done
 }
 
-sha512sums="f379fd1d568260b1ad3c426b7b80b1d33a1b078db1aa03b847a4e1dc262cf0155419f20f7105bc095167bb5e64169d5e6b0bcfa3e3913d5e4b5f8f23f4fde750  bareos-16.2.6.tar.gz
+sha512sums="165bee4dcfabac7e72839831de7067b4dafd1f82dd1615d7fa08ca331b1b3efa516555e33ca2d2ef42482c9b5104769c5ef3dd40a12e1954934874b6884ea26b  bareos-17.2.4.tar.gz
 eb1e7072b579bf9ae21f2e351d6900abb277db64e373f4760bac8188b82929376e4a196d2c935cefe1ae4cc2c396f2fcba1a25642b26e2f92a0d008fbdc4b5f2  bareos-dir.initd
 c770b1d041fafef93d4eb0269ba8d9733e85ef465657fe8dd5d5c68a27ec773cec9c5c582d4a16596d95bbf6dbd3f7194dc9c0d8ed73138e9fb438fba9aa9445  bareos-sd.initd
 c6347079dbcef5f4a69ec0c4ecc31803520d715d599d89c6bbfbb3741a86c50d7295c30432889b13ee9c16f2feaa84b1c6ae992cfee6505d569c6493d7e85a5b  bareos-fd.initd