From a9790a403aa4d6ea82b0cac9238d63aefd0168e8 Mon Sep 17 00:00:00 2001 From: markd Date: Tue, 14 Jan 2014 10:58:17 +0000 Subject: Update bacula to 5.2.13 Important changes since last release: 19Feb13 - Fix build/configure problems with bpluginfo.c - Refactor lock_volumes so most lock a vol rather than globally - Add virtualfull-extreme test - Apply patch for chio-changer-openbsd -- Implements listall - Add bat Mac patch - Fix bug cannot run Copy/Migrate jobs from bat - Fix loading of bat translations. - Fix text input in bat. - Remove Device from show command as it is not used or updated - Fix update enabled keyword in help command - Fix update_postgresql_tables 10 to 11 - Clean after building doc binaries - Require Qt version 4.8.4 - Fix bug that OK to run? does not retry on bad response - Backport new lock calls + debug for SD - Fix bug new label ignored when first is duplicate. - Pull src/lib changes from master - Pull SD files from master - Turn off prune-test - Add logdir and bsrdir to regression config - Add bsrdir and logdir to regress-config - Changed default directories from /var/bacula to /opt/bacula - Make spool size max message more explicit - Display more info when maximum spool size is reached - Fix TERM defs for Solaris 11 in conio.c - Allow group to cd to sysconfdir - Make sysconfdir belong to Bacula user/group and exclude others - Fix Virtual Full file close bug -- race condition - Enhance mount message to include read/append - Improve vol_mgr swap messages - Enhance output of Using Device to include for read/write - Add jobid to Pmsg output - Fix bug input validation on delete of jobs. - Fix bug Authorization Errors false - Add workaround for where autoprune and reload are in deadlock - Allow conf file quoted strings to be used in a list - Make bfgets handle very long lines - Avoid seg fault by checking for NULL client -- reported by Arno - Fix bug MailOnSuccess get executed on error. - Fix missing index on Media table - Fix bug no message storage on closed database connection. - Fix bug Fix problem with MySQL with big Base jobs. - Reduce wait time in regression RunScripts - Implement a timeout on regression tests of 15 minutes - Fix .bvfs_lsfiles and .bvfs_restore to handle deleted files - Fix spooldata, accurate and ingnoreduplicate run argument - Fix messages segfault - fix about PATH_MAX on hurd - fix about MAXPATHLEN on hurd - Fix bug OpenBSD autochanger example script - Fix about MaxRunTime canceling the job too early - Fix bug Wrong values at media list in BAT - Fix race condition in close_msg that causes seg fault - Fix double unlink - More tests for freeing NULL pointers - Add MaximumConcurrentReadJobs directive to Storage resource - Add ujobid to .bvfs_get_jobids - Avoid problem when stripping a relative path - Fix about HIDDEN attribute set to parent directory during restore --- sysutils/bacula-clientonly/Makefile | 4 +--- sysutils/bacula-qt-console/Makefile | 3 +-- sysutils/bacula-tray-monitor/Makefile | 3 +-- sysutils/bacula-wx-console/Makefile | 3 +-- sysutils/bacula/Makefile | 4 +--- sysutils/bacula/Makefile.common | 4 ++-- sysutils/bacula/distinfo | 12 ++++++------ sysutils/bacula/patches/patch-src_console_conio.c | 12 ++++++------ sysutils/bacula/patches/patch-src_tools_Makefile.in | 20 ++++++++++---------- 9 files changed, 29 insertions(+), 36 deletions(-) diff --git a/sysutils/bacula-clientonly/Makefile b/sysutils/bacula-clientonly/Makefile index 2937fd7047a..4a30d9757dc 100644 --- a/sysutils/bacula-clientonly/Makefile +++ b/sysutils/bacula-clientonly/Makefile @@ -1,10 +1,8 @@ -# $NetBSD: Makefile,v 1.22 2013/04/25 20:41:33 shattered Exp $ +# $NetBSD: Makefile,v 1.23 2014/01/14 10:58:17 markd Exp $ PKGNAME= ${DISTNAME:S/-/-clientonly-/} COMMENT= The Network Backup Solution (client only) -PKGREVISION= 2 - CONFLICTS= bacula-[0-9]* bacula-client-[0-9]* DISTINFO_FILE= ${.CURDIR}/../../sysutils/bacula/distinfo diff --git a/sysutils/bacula-qt-console/Makefile b/sysutils/bacula-qt-console/Makefile index d68e0497cd2..2d095a452b1 100644 --- a/sysutils/bacula-qt-console/Makefile +++ b/sysutils/bacula-qt-console/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.31 2013/06/06 12:55:02 wiz Exp $ +# $NetBSD: Makefile,v 1.32 2014/01/14 10:58:17 markd Exp $ PKGNAME= ${DISTNAME:S/-/-qt-console-/} -PKGREVISION= 5 COMMENT= Qt-based console for Bacula - The Network Backup Solution DISTINFO_FILE= ${.CURDIR}/../../sysutils/bacula/distinfo diff --git a/sysutils/bacula-tray-monitor/Makefile b/sysutils/bacula-tray-monitor/Makefile index 4adc38f0030..03459822918 100644 --- a/sysutils/bacula-tray-monitor/Makefile +++ b/sysutils/bacula-tray-monitor/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.33 2013/10/10 14:42:31 ryoon Exp $ +# $NetBSD: Makefile,v 1.34 2014/01/14 10:58:17 markd Exp $ PKGNAME= ${DISTNAME:S/-/-tray-monitor-/} -PKGREVISION= 6 COMMENT= System tray monitor for Bacula - The Network Backup Solution DISTINFO_FILE= ${.CURDIR}/../../sysutils/bacula/distinfo diff --git a/sysutils/bacula-wx-console/Makefile b/sysutils/bacula-wx-console/Makefile index 7a12861e5d6..ecf33d707b7 100644 --- a/sysutils/bacula-wx-console/Makefile +++ b/sysutils/bacula-wx-console/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.38 2013/10/10 14:42:31 ryoon Exp $ +# $NetBSD: Makefile,v 1.39 2014/01/14 10:58:17 markd Exp $ PKGNAME= ${DISTNAME:S/-/-wx-console-/} -PKGREVISION= 6 COMMENT= Bacula wxWindows-based console DISTINFO_FILE= ${.CURDIR}/../../sysutils/bacula/distinfo diff --git a/sysutils/bacula/Makefile b/sysutils/bacula/Makefile index ae55062866f..8140b7074a8 100644 --- a/sysutils/bacula/Makefile +++ b/sysutils/bacula/Makefile @@ -1,6 +1,4 @@ -# $NetBSD: Makefile,v 1.54 2013/11/06 15:59:23 joerg Exp $ - -PKGREVISION= 10 +# $NetBSD: Makefile,v 1.55 2014/01/14 10:58:17 markd Exp $ CONFLICTS+= bacula-client-[0-9]* bacula-clientonly-[0-9]* diff --git a/sysutils/bacula/Makefile.common b/sysutils/bacula/Makefile.common index b35864a951d..4741fdca679 100644 --- a/sysutils/bacula/Makefile.common +++ b/sysutils/bacula/Makefile.common @@ -1,10 +1,10 @@ -# $NetBSD: Makefile.common,v 1.63 2013/11/06 16:00:05 joerg Exp $ +# $NetBSD: Makefile.common,v 1.64 2014/01/14 10:58:17 markd Exp $ # # used by sysutils/bacula-clientonly/Makefile # used by sysutils/bacula-tray-monitor/Makefile # used by sysutils/bacula-wx-console/Makefile -DISTNAME= bacula-5.2.12 +DISTNAME= bacula-5.2.13 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bacula/} diff --git a/sysutils/bacula/distinfo b/sysutils/bacula/distinfo index 5ad564ec5bb..5897d0436f6 100644 --- a/sysutils/bacula/distinfo +++ b/sysutils/bacula/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.48 2013/11/06 16:00:05 joerg Exp $ +$NetBSD: distinfo,v 1.49 2014/01/14 10:58:17 markd Exp $ -SHA1 (bacula-5.2.12.tar.gz) = c53cdd185f5f4075ddcca0971953319a94276c84 -RMD160 (bacula-5.2.12.tar.gz) = dd5b9f457a524acd9cdbbe0c4842670c4ee5bd5a -Size (bacula-5.2.12.tar.gz) = 4147847 bytes +SHA1 (bacula-5.2.13.tar.gz) = 30b1eb2efb515138807163d046f675eaa29fad1c +RMD160 (bacula-5.2.13.tar.gz) = bcc168143c0eec5cb5e983f765935534379f4fcf +Size (bacula-5.2.13.tar.gz) = 4243395 bytes SHA1 (patch-ac) = 4ba89bcf49ce82b527edc789e2b17a781cb8622e SHA1 (patch-ad) = ce6bc29858d13dff1a0301db95f9bfedf3e66b01 SHA1 (patch-ah) = 06452df1449ed6f06af00ed2cf9d736c40044dfb @@ -10,7 +10,7 @@ SHA1 (patch-ai) = 388e075e7ec54fb377ee9dbe8338c667efb256ee SHA1 (patch-aj) = 125d1503406474fec32e737068328cdfa718f5c2 SHA1 (patch-am) = 28536d3f0de81940773749c3704ad7aca86d374d SHA1 (patch-configure) = 710d6e4370099a5d6d23d1297864af01abcdae83 -SHA1 (patch-src_console_conio.c) = 281d1f4c972744a936733f2a0003c6b0f993904d +SHA1 (patch-src_console_conio.c) = 2c750c48b45091066edc4aa9c88f494a6c892ce4 SHA1 (patch-src_dird_Makefile.in) = fdce18aca972f26f16af90283756cd5bf5ad5831 SHA1 (patch-src_filed_Makefile.in) = c88ee648ef33c3f7c3a02b77b1d3fc3da8da088d SHA1 (patch-src_findlib_attribs.c) = a0917e500d7e937164cf59917cabd992512acd1d @@ -20,4 +20,4 @@ SHA1 (patch-src_plugins_fd_Makefile.in) = f1316cdbb66d9bc55d8adbd4b0bbde01443ccd SHA1 (patch-src_plugins_fd_fd__common.h) = 7c8419d4fa7f1fe8a07e2bc2720a4903ff324135 SHA1 (patch-src_qt-console_bat.pro.in) = 8df9381c0b35b5a3dcd237f8c017ae21d88c79ad SHA1 (patch-src_stored_Makefile.in) = 5bee8ea8a7c288a1e4baf372ef79da34c9e35284 -SHA1 (patch-src_tools_Makefile.in) = 9fbc8d0f71f34217ea29f6ae04cbd927d5ac275b +SHA1 (patch-src_tools_Makefile.in) = dca0472c31ced76b8d5a357ef968ddc3f93faf5b diff --git a/sysutils/bacula/patches/patch-src_console_conio.c b/sysutils/bacula/patches/patch-src_console_conio.c index da63086ad5a..0430ffeee43 100644 --- a/sysutils/bacula/patches/patch-src_console_conio.c +++ b/sysutils/bacula/patches/patch-src_console_conio.c @@ -1,19 +1,19 @@ -$NetBSD: patch-src_console_conio.c,v 1.1 2012/10/06 17:54:53 christos Exp $ +$NetBSD: patch-src_console_conio.c,v 1.2 2014/01/14 10:58:17 markd Exp $ - need termios.h, our term.h does not include it - t_insert_line and t_delete_line are macros in term.h; undef them ---- src/console/conio.c.orig 2012-09-13 04:51:19.000000000 -0400 -+++ src/console/conio.c 2012-10-05 11:29:38.000000000 -0400 -@@ -61,6 +61,7 @@ +--- src/console/conio.c.orig 2013-02-19 19:21:35.000000000 +0000 ++++ src/console/conio.c +@@ -64,6 +64,7 @@ - #endif + #ifdef HAVE_CONIO +#include #include #include -@@ -245,7 +246,9 @@ +@@ -250,7 +251,9 @@ static char * getnext(void); static char * getprev(void); static void putline(char *newl, int newlen); static void t_honk_horn(void); diff --git a/sysutils/bacula/patches/patch-src_tools_Makefile.in b/sysutils/bacula/patches/patch-src_tools_Makefile.in index 97a0c003eb0..9cd626b26ac 100644 --- a/sysutils/bacula/patches/patch-src_tools_Makefile.in +++ b/sysutils/bacula/patches/patch-src_tools_Makefile.in @@ -1,20 +1,20 @@ -$NetBSD: patch-src_tools_Makefile.in,v 1.1 2012/10/06 17:54:53 christos Exp $ +$NetBSD: patch-src_tools_Makefile.in,v 1.2 2014/01/14 10:58:17 markd Exp $ - use the .la files for linking - remove tests that don't link (using functions not in libraries) ---- src/tools/Makefile.in.orig 2012-09-13 04:51:19.000000000 -0400 -+++ src/tools/Makefile.in 2012-10-05 11:13:02.000000000 -0400 -@@ -37,7 +37,7 @@ +--- src/tools/Makefile.in.orig 2013-02-19 19:21:35.000000000 +0000 ++++ src/tools/Makefile.in +@@ -35,7 +35,7 @@ EXTRAOBJS = @OBJLIST@ DIRCONFOBJS = ../dird/dird_conf.o ../dird/ua_acl.o ../dird/run_conf.o ../dird/inc_conf.o NODIRTOOLS = bsmtp --DIRTOOLS = bsmtp dbcheck drivetype fstype testfind testls bregex bwild bbatch bregtest bvfs_test ing_test bpluginfo -+DIRTOOLS = bsmtp dbcheck drivetype fstype testfind bregex bwild bbatch bregtest ing_test bpluginfo +-DIRTOOLS = bsmtp dbcheck drivetype fstype testfind testls bregex bwild bbatch bregtest bvfs_test ing_test bpluginfo timelimit ++DIRTOOLS = bsmtp dbcheck drivetype fstype testfind bregex bwild bbatch bregtest ing_test bpluginfo timelimit TOOLS = $(@DIR_TOOLS@) INSNODIRTOOLS = bsmtp -@@ -58,22 +58,22 @@ +@@ -56,22 +56,22 @@ all: Makefile $(TOOLS) gigaslam grow @echo " " bsmtp: Makefile bsmtp.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @@ -42,7 +42,7 @@ $NetBSD: patch-src_tools_Makefile.in,v 1.1 2012/10/06 17:54:53 christos Exp $ $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) dird_conf.o: ../dird/dird_conf.c -@@ -91,34 +91,34 @@ +@@ -93,34 +93,34 @@ timelimit: timelimit.o testfind: Makefile ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) \ ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) $(FINDOBJS) $(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -o $@ $(FINDOBJS) -L. -L../lib -L../findlib \ @@ -84,7 +84,7 @@ $NetBSD: patch-src_tools_Makefile.in,v 1.1 2012/10/06 17:54:53 christos Exp $ cats_test.o: cats_test.c echo "Compiling $<" -@@ -126,7 +126,7 @@ +@@ -128,7 +128,7 @@ cats_test.o: cats_test.c cats_test: Makefile ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) cats_test.o $(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L../cats -L. -L../lib -L../findlib -o $@ cats_test.o \ @@ -93,7 +93,7 @@ $NetBSD: patch-src_tools_Makefile.in,v 1.1 2012/10/06 17:54:53 christos Exp $ gigaslam.o: gigaslam.c $(CXX) $(CFLAGS) -c $< -@@ -135,13 +135,13 @@ +@@ -137,13 +137,13 @@ gigaslam: gigaslam.o $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -o $@ gigaslam.o grow: Makefile grow.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) -- cgit v1.2.3