main/bacula: apply a bunch of patches from fedora and gentoo

and fix building with ccache

1 files changed, 47 insertions, 19 deletions

diff --git a/main/bacula/APKBUILD b/main/bacula/APKBUILD
index 94d05137db..cbdce835ac 100644
--- a/main/bacula/APKBUILD
+++ b/main/bacula/APKBUILD
@@ -2,37 +2,53 @@
 # Maintainer: Leonardo Arena <rnalrd@gmail.com>
 pkgname="bacula"
 pkgver=5.0.3
-pkgrel=6
+pkgrel=7
 pkgdesc="Enterprise ready, network based backup program"
 url="http://www.bacula.org"
 arch="all"
 license="GPL2"
 depends=""
-makedepends="autoconf libstdc++ ncurses-dev openssl-dev postgresql-dev zlib-dev"
+makedepends="autoconf ncurses-dev openssl-dev postgresql-dev zlib-dev"
 install="$pkgname.pre-install $pkgname.post-install"
 subpackages="$pkgname-doc"
 source="http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz
-bacula-dir-init
-bacula-dir-conf
-bacula-sd-init
-bacula-sd-conf
-bacula-fd-init
-bacula-fd-conf
-configure.in.patch
-os.m4.patch"
+	bacula-dir-init
+	bacula-dir-conf
+	bacula-sd-init
+	bacula-sd-conf
+	bacula-fd-init
+	bacula-fd-conf
 
+	bacula-5.0.1-dsolink.patch
+	bacula-5.0.2-config.patch
+	bacula-5.0.2-openssl.patch
+	bacula-5.0.2-python27.patch
+	bacula-5.0.3-dsolink.patch
+	bacula-5.0.3-log-path.patch
+	bacula-5.0.3-mysql55.patch
+	bacula-5.0.3-sqlite-priv.patch
+	bacula-config.patch
+	configure.in.patch
+	bacula-5.0.3-Makefile.patch
+	bacula-5.0.3-as-needed.patch
+	os.m4.patch
+	cxx.patch"
+
+_builddir="$srcdir/$pkgname-$pkgver"
 prepare () {
-	cd "$srcdir/$pkgname-$pkgver"
-	patch -p1 < ../../configure.in.patch
-	patch -p1 < ../../os.m4.patch
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+
+	cd "$_builddir"/autoconf
+	autoconf && cp configure ../
 }
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
-	export LDFLAGS=
-	# in order to do not go into an infinite loop
-	aclocal && autoconf && automake
-
 	./configure --prefix=/usr \
 	 --sysconfdir=/etc/bacula \
 	 --localstatedir=/var \
@@ -56,7 +72,7 @@ build() {
 	 --with-fd-user=root \
 	 --with-fd-group=root
 
-	make || return 1
+	make NO_ECHO= || return 1
 }
 
 package() {
@@ -92,5 +108,17 @@ b1b328013634c98119663730e3e2da7e  bacula-dir-init
 afe2f9a4d79d7d96eb9372d003d10f86  bacula-sd-conf
 6ae93e570f95fa845fa534c2d2efaac0  bacula-fd-init
 4500ce2d62bf9df33c07f70dc40f7b85  bacula-fd-conf
+eee101f1b7b6b4f2c140898db5f8123b  bacula-5.0.1-dsolink.patch
+71f7f9c041eff045b2e97d141316c059  bacula-5.0.2-config.patch
+4e310e84c7aba5b8d043758e0fa0088f  bacula-5.0.2-openssl.patch
+13e511698b5dc376e673c963a848d364  bacula-5.0.2-python27.patch
+82d3a5c113c633bf0bd86ac3590baaff  bacula-5.0.3-dsolink.patch
+9bde1e9d43146af8985ff62d491d7218  bacula-5.0.3-log-path.patch
+def9da0c090141dcef817d80c1a29fd1  bacula-5.0.3-mysql55.patch
+9def0e68e3eb2f5f8b4c34108a248efd  bacula-5.0.3-sqlite-priv.patch
+5d3c1bf25d50996e0c0c344dc2444014  bacula-config.patch
 ebc9c2bbc9be95c920723a3f142d8e19  configure.in.patch
-cf7a2a4e972697f54364654c4e282b8b  os.m4.patch"
+0ec20df57bb632ed729cfaf5d0a3ee33  bacula-5.0.3-Makefile.patch
+76267747f4d2e85e033cc6793ccb6afa  bacula-5.0.3-as-needed.patch
+cf7a2a4e972697f54364654c4e282b8b  os.m4.patch
+1bfdbfea7a36d5503753414dffb953eb  cxx.patch"