main/bacula-client: upgrade to 5.2.12

5 files changed, 75 insertions, 8 deletions

diff --git a/main/bacula-client/APKBUILD b/main/bacula-client/APKBUILD
index 67c08ea9a9a..5750c8a4b51 100644
--- a/main/bacula-client/APKBUILD
+++ b/main/bacula-client/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname="bacula-client"
 _realname="bacula"
-pkgver=5.2.10
+pkgver=5.2.12
 pkgrel=0
 pkgdesc="Client (File Daemon) of Bacula, a network based backup program"
 url="http://www.bacula.org"
@@ -10,16 +10,20 @@ arch="all"
 license="GPL2"
 depends=""
 makedepends="autoconf automake libstdc++ openssl-dev ncurses-dev zlib-dev"
-install="$pkgname.pre-install $pkgname.post-install"
+install="$pkgname.pre-install"
 subpackages="$pkgname-doc"
+pkgusers="bacula"
+pkggroups="bacula"
 source="http://downloads.sourceforge.net/project/$_realname/$_realname/$pkgver/$_realname-$pkgver.tar.gz
 	bacula-fd-init
 	bacula-fd-conf
 	bacula-5.0.2-config.patch
 	bacula-5.0.2-openssl.patch
 	bacula-5.0.3-Makefile.patch
-	bacula-5.0.3-log-path.patch
 	bacula-5.0.3-sqlite-priv.patch
+	bacula-5.2.3-as-needed.patch
+	bacula-5.2.3-ldflags.patch
+	bacula-5.2.3-lib-search-path.patch
 	configure.in.patch
 	cxx.patch
 	os.m4.patch"
@@ -52,13 +56,14 @@ build() {
 	 --infodir=/usr/share/info \
 	 --with-pid-dir=/var/run \
 	 --with-subsys-dir=/var/lock/subsys \
+	 --with-logdir=/var/log/bacula \
 	 --enable-largefile \
 	 --enable-client-only \
 	 --enable-smartalloc \
 	 --disable-nls \
 	 --with-openssl=/usr/include/openssl \
 	 --with-scriptdir=/etc/bacula/scripts \
-	 --with-working-dir=/var/bacula \
+	 --with-working-dir=/var/lib/bacula \
 	 --with-fd-user=root \
 	 --with-fd-group=root
 	make || return 1
@@ -69,20 +74,23 @@ package() {
 	make DESTDIR="$pkgdir" install
 
 	install -Dm755 $srcdir/bacula-fd-init \
-	 $pkgdir/etc/init.d/bacula-fd
+	 "$pkgdir"/etc/init.d/bacula-fd
 	install -Dm644 $srcdir/bacula-fd-conf \
-	 $pkgdir/etc/conf.d/bacula-fd
+	 "$pkgdir"/etc/conf.d/bacula-fd
+	chown bacula.bacula "$pkgdir"/var/lib/bacula
 	find "$pkgdir" -iname *.la -delete
 }
 
-md5sums="19207d7049cf11a54dee5585689044ec  bacula-5.2.10.tar.gz
+md5sums="b04c22b128b73359e4bbc9de06652c38  bacula-5.2.12.tar.gz
 38b0fe78acdc5e65aec3a59578e98a20  bacula-fd-init
 4500ce2d62bf9df33c07f70dc40f7b85  bacula-fd-conf
 71f7f9c041eff045b2e97d141316c059  bacula-5.0.2-config.patch
 4e310e84c7aba5b8d043758e0fa0088f  bacula-5.0.2-openssl.patch
 0ec20df57bb632ed729cfaf5d0a3ee33  bacula-5.0.3-Makefile.patch
-9bde1e9d43146af8985ff62d491d7218  bacula-5.0.3-log-path.patch
 9def0e68e3eb2f5f8b4c34108a248efd  bacula-5.0.3-sqlite-priv.patch
+5fb1ef3f9fae381b64aa3226351f91a5  bacula-5.2.3-as-needed.patch
+5ff321fee690e6a3b48ae41f9860558c  bacula-5.2.3-ldflags.patch
+fe1fe1df51c3e57343e2e7794447a763  bacula-5.2.3-lib-search-path.patch
 ebc9c2bbc9be95c920723a3f142d8e19  configure.in.patch
 1bfdbfea7a36d5503753414dffb953eb  cxx.patch
 cf7a2a4e972697f54364654c4e282b8b  os.m4.patch"
diff --git a/main/bacula-client/bacula-5.0.2-python27.patch.disabled b/main/bacula-client/bacula-5.0.2-python27.patch.disabled
new file mode 100644
index 00000000000..36543872e8a
--- /dev/null
+++ b/main/bacula-client/bacula-5.0.2-python27.patch.disabled
@@ -0,0 +1,22 @@
+--- ./configure~	2010-04-27 14:58:29.000000000 -0500
++++ ./configure	2010-07-30 11:28:47.494178663 -0500
+@@ -26255,7 +26255,7 @@
+ 		PYTHON_LIBS=`/usr/bin/python-config --libs`
+ 	     else
+ 		for python_root in /usr /usr/local /usr/sfw; do
+-		   for ver in python2.2 python2.3 python2.4 python2.5 python2.6 python3; do
++		   for ver in python2.2 python2.3 python2.4 python2.5 python2.6 python2.7 python3; do
+ 		      if test -f $python_root/include/${ver}/Python.h; then
+ 			 PYTHON_INCDIR=-I$python_root/include/${ver}
+ 			 if test -d $python_root/lib64/${ver}/config; then
+--- ./autoconf/configure.in~	2010-04-27 14:58:29.000000000 -0500
++++ ./autoconf/configure.in	2010-07-30 11:30:22.837182092 -0500
+@@ -963,7 +963,7 @@
+ 		PYTHON_LIBS=`/usr/bin/python-config --libs`
+ 	     else
+ 		for python_root in /usr /usr/local /usr/sfw; do
+-		   for ver in python2.2 python2.3 python2.4 python2.5 python2.6 python3; do
++		   for ver in python2.2 python2.3 python2.4 python2.5 python2.6 python2.7 python3; do
+ 		      if test -f $python_root/include/${ver}/Python.h; then
+ 			 PYTHON_INCDIR=-I$python_root/include/${ver}
+ 			 if test -d $python_root/lib64/${ver}/config; then
diff --git a/main/bacula-client/bacula-5.2.3-as-needed.patch b/main/bacula-client/bacula-5.2.3-as-needed.patch
new file mode 100644
index 00000000000..4b52d214cf7
--- /dev/null
+++ b/main/bacula-client/bacula-5.2.3-as-needed.patch
@@ -0,0 +1,14 @@
+# see bug #310087 
+diff -urN bacula-5.2.1.orig/src/findlib/Makefile.in bacula-5.2.1/src/findlib/Makefile.in
+--- bacula-5.2.1.orig/src/findlib/Makefile.in	2010-02-24 16:33:48.000000000 +0100
++++ bacula-5.2.1/src/findlib/Makefile.in	2010-03-22 17:37:43.772805754 +0100
+@@ -59,7 +59,7 @@
+ 
+ libbacfind.la: Makefile $(LIBBACFIND_LOBJS) 
+ 	@echo "Making $@ ..."
+-	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACFIND_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACFIND_LT_RELEASE)
++	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACFIND_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACFIND_LT_RELEASE) -L../lib -lbac $(LIBS) $(OPENSSL_LIBS)
+ 
+ Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
+ 	cd $(topdir) \
+
diff --git a/main/bacula-client/bacula-5.2.3-ldflags.patch b/main/bacula-client/bacula-5.2.3-ldflags.patch
new file mode 100644
index 00000000000..611c0683abd
--- /dev/null
+++ b/main/bacula-client/bacula-5.2.3-ldflags.patch
@@ -0,0 +1,11 @@
+# bat needs to respect LDFLAGS
+--- a/src/qt-console/bat.pro.in.orig	2010-07-20 18:28:50.000000000 +0000
++++ b/src/qt-console/bat.pro.in	2010-07-20 18:29:25.000000000 +0000
+@@ -26,6 +26,7 @@
+ QMAKE_LINK   = $${LIBTOOL_LINK} $(CXX)
+ QMAKE_INSTALL_PROGRAM = $${LIBTOOL_INSTALL} install -m @SBINPERM@ -p
+ QMAKE_CLEAN += .libs/* bat
++QMAKE_LFLAGS += @LDFLAGS@
+ 
+ qwt {
+   INCLUDEPATH += @QWT_INC@ 
diff --git a/main/bacula-client/bacula-5.2.3-lib-search-path.patch b/main/bacula-client/bacula-5.2.3-lib-search-path.patch
new file mode 100644
index 00000000000..f33964e7472
--- /dev/null
+++ b/main/bacula-client/bacula-5.2.3-lib-search-path.patch
@@ -0,0 +1,12 @@
+# If upgrading the old libraries gets linked first. So fix order of lib search path.
+--- a/src/console/Makefile.in.orig	2010-03-29 11:35:00.000000000 +0000
++++ b/src/console/Makefile.in	2010-03-29 11:45:14.000000000 +0000
+@@ -47,7 +47,7 @@
+ 
+ 
+ bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
+-	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
++	$(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \
+ 	      $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
+ 	      $(OPENSSL_LIBS)
+