Changes 5.0.3:

This 5.0.3 version is significant bug fix update to version 5.0.2.
It includes new code and some new features.
There is no database change since prior versions of 5.0.

Compatibility:
--------------
As always, both the Director and Storage daemon must be upgraded at
the same time.

Older 5.0.x and 3.0.x File Daemons are compatible with the 5.0.3
Director and Storage daemons. There should be no need to upgrade older File
Daemons.

Changes and New Features:
- If a VSS (Windows) snapshot fails, the whole Job is failed, previously
  it printed a warning message and continued.
- New editing codes %b = Job Bytes and %f = Job Files for runscripts
- Any non-Bacula project plugins (i.e. third party plugins)
  must be upgraded to specify AGPLv3 in place of the GPLv2 used previously
  for the PLUGIN_LICENSE.
- The bat Media page text columns can be sorted by clicking on the column.
- If possible, the SD will automatically update the catalog Volume size if
  it does not match the Volume size. The mismatch between the Volume sizes
  typically occurs when the FD has a comm line drop or the FD crashes.

13 files changed, 80 insertions, 36 deletions

diff --git a/sysutils/bacula-doc/Makefile b/sysutils/bacula-doc/Makefile
index e85f4c97f44..6898f62608a 100644
--- a/sysutils/bacula-doc/Makefile
+++ b/sysutils/bacula-doc/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2010/05/08 09:05:47 adam Exp $
+# $NetBSD: Makefile,v 1.25 2010/12/26 18:39:46 adam Exp $
 
-DISTNAME=	bacula-docs-5.0.2
+DISTNAME=	bacula-docs-5.0.3
 PKGNAME=	${DISTNAME:S/docs/doc/}
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=bacula/}
diff --git a/sysutils/bacula-doc/distinfo b/sysutils/bacula-doc/distinfo
index d266b6de270..634216601d1 100644
--- a/sysutils/bacula-doc/distinfo
+++ b/sysutils/bacula-doc/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.21 2010/05/08 09:05:47 adam Exp $
+$NetBSD: distinfo,v 1.22 2010/12/26 18:39:46 adam Exp $
 
-SHA1 (bacula-docs-5.0.2.tar.bz2) = e5d5494883492ef60c70b72dee62ae08a9a133c3
-RMD160 (bacula-docs-5.0.2.tar.bz2) = fbcbc3c46bd4b5c326ec454b0055029513412b4c
-Size (bacula-docs-5.0.2.tar.bz2) = 34587039 bytes
+SHA1 (bacula-docs-5.0.3.tar.bz2) = dfe867bc4ac7f82ea01a34fd5ada3c0310aac25f
+RMD160 (bacula-docs-5.0.3.tar.bz2) = 9e0af6364d3f36d5580d0af5f4a831fd6033f670
+Size (bacula-docs-5.0.3.tar.bz2) = 34519440 bytes
diff --git a/sysutils/bacula-qt-console/Makefile b/sysutils/bacula-qt-console/Makefile
index 28d6a84b523..252587bafd2 100644
--- a/sysutils/bacula-qt-console/Makefile
+++ b/sysutils/bacula-qt-console/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2010/11/15 22:58:29 abs Exp $
+# $NetBSD: Makefile,v 1.15 2010/12/26 18:39:46 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/-qt-console-/}
-PKGREVISION=	3
 COMMENT=	Qt-based console for Bacula - The Network Backup Solution
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/sysutils/bacula-tray-monitor/Makefile b/sysutils/bacula-tray-monitor/Makefile
index d1d54ba99f7..38a13f4b1e3 100644
--- a/sysutils/bacula-tray-monitor/Makefile
+++ b/sysutils/bacula-tray-monitor/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2010/11/15 22:58:29 abs Exp $
+# $NetBSD: Makefile,v 1.17 2010/12/26 18:39:46 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/-tray-monitor-/}
-PKGREVISION=	3
 COMMENT=	System tray monitor for Bacula - The Network Backup Solution
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/sysutils/bacula-wx-console/Makefile b/sysutils/bacula-wx-console/Makefile
index e28e01f1428..7e03f8ba207 100644
--- a/sysutils/bacula-wx-console/Makefile
+++ b/sysutils/bacula-wx-console/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.20 2010/11/15 22:58:30 abs Exp $
+# $NetBSD: Makefile,v 1.21 2010/12/26 18:39:47 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/-wx-console-/}
-PKGREVISION=	3
 COMMENT=	wxWindows-based console for Bacula - The Network Backup Solution
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/sysutils/bacula/Makefile.common b/sysutils/bacula/Makefile.common
index 1284e458e16..59a7497ab2c 100644
--- a/sysutils/bacula/Makefile.common
+++ b/sysutils/bacula/Makefile.common
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.55 2010/05/16 13:08:10 wiz Exp $
+# $NetBSD: Makefile.common,v 1.56 2010/12/26 18:39:45 adam Exp $
 #
 # used by sysutils/bacula-clientonly/Makefile
 # used by sysutils/bacula-tray-monitor/Makefile
 # used by sysutils/bacula-wx-console/Makefile
 
-DISTNAME=	bacula-5.0.2
+DISTNAME=	bacula-5.0.3
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=bacula/}
 
@@ -29,7 +29,7 @@ BACULA_DIR_USER?=	bacula-dir
 BACULA_SD_USER?=	bacula-sd
 
 PKG_GROUPS_VARS+=	BACULA_GROUP
-PKG_USERS_VARS+=	BACULA_DIR_USER BACULA_SD_USER
+PKG_USERS_VARS=		BACULA_DIR_USER BACULA_SD_USER
 
 PKG_SYSCONFSUBDIR?=	bacula
 BACULA_PIDDIR?=		${VARBASE}/run
diff --git a/sysutils/bacula/PLIST.common b/sysutils/bacula/PLIST.common
index a3842f2f315..b3dd1fe3ad4 100644
--- a/sysutils/bacula/PLIST.common
+++ b/sysutils/bacula/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.12 2010/03/09 07:06:00 adam Exp $
+@comment $NetBSD: PLIST.common,v 1.13 2010/12/26 18:39:45 adam Exp $
 lib/bpipe-fd.la
 lib/libbac.la
 lib/libbaccfg.la
@@ -12,6 +12,7 @@ libexec/bacula/bacula_config
 libexec/bacula/bconsole
 libexec/bacula/btraceback.dbx
 libexec/bacula/btraceback.gdb
+libexec/bacula/btraceback.mdb
 libexec/bacula/disk-changer
 libexec/bacula/mtx-changer
 libexec/bacula/mtx-changer.conf
diff --git a/sysutils/bacula/distinfo b/sysutils/bacula/distinfo
index fd5f43d38a4..dcb430fc6d9 100644
--- a/sysutils/bacula/distinfo
+++ b/sysutils/bacula/distinfo
@@ -1,18 +1,20 @@
-$NetBSD: distinfo,v 1.42 2010/05/25 06:47:31 adam Exp $
+$NetBSD: distinfo,v 1.43 2010/12/26 18:39:45 adam Exp $
 
-SHA1 (bacula-5.0.2.tar.gz) = fe5b8d682fe73d2458f0b2965ea88386ba40f0d5
-RMD160 (bacula-5.0.2.tar.gz) = cb2e767476baf0d0bc3573a39882870e41dda6db
-Size (bacula-5.0.2.tar.gz) = 4189272 bytes
+SHA1 (bacula-5.0.3.tar.gz) = 4ced1c4f8984a063a1134b59968d163243017611
+RMD160 (bacula-5.0.3.tar.gz) = 0ae8f303b379daffdf09e4eab9b35182759add41
+Size (bacula-5.0.3.tar.gz) = 3800556 bytes
 SHA1 (patch-aa) = 088623d447102579d2723f0ff0a1e802d83cfdd0
+SHA1 (patch-ab) = f5b5c8ee67d35ec5e92bd2732e63a956596ae6d8
 SHA1 (patch-ac) = 4ba89bcf49ce82b527edc789e2b17a781cb8622e
 SHA1 (patch-ad) = e80f433b251709db6504e6f8ecc158c43590ae93
-SHA1 (patch-ae) = cfd66ce6ae33b993a9398b1d40aa6b6c7fc84552
+SHA1 (patch-ae) = 09a5a722c7acf384881198a23ed97d723f4c9698
 SHA1 (patch-af) = eb573f4b823c6c693634989883d2f94d2fa81f98
+SHA1 (patch-ag) = 53454345615422267e9e50b28a7aac10fd257df0
 SHA1 (patch-ah) = 8cfe18b486fdd49eb162e20509ddf59e4b0c7375
 SHA1 (patch-ai) = 388e075e7ec54fb377ee9dbe8338c667efb256ee
 SHA1 (patch-aj) = 125d1503406474fec32e737068328cdfa718f5c2
-SHA1 (patch-am) = a2bfd8f345ce2c68b9387b02b08437cb9fc5772b
+SHA1 (patch-am) = 28536d3f0de81940773749c3704ad7aca86d374d
 SHA1 (patch-an) = dbad88c5a6f60c501176103e794e85ab9400dd1a
-SHA1 (patch-ao) = bf35f9569909fe3d96c4bc7aca1ff989c75b4d2b
+SHA1 (patch-ao) = d1d7f529950d144c63af0e9d033497a7cc77d4fe
 SHA1 (patch-ap) = 383a4449e6503e518bc40d2053127e5968ad3cd4
 SHA1 (patch-aq) = a8cabf3b43e1a2a878105875d68d5b000fe6632a
diff --git a/sysutils/bacula/patches/patch-ab b/sysutils/bacula/patches/patch-ab
new file mode 100644
index 00000000000..d0dbe42f0b5
--- /dev/null
+++ b/sysutils/bacula/patches/patch-ab
@@ -0,0 +1,31 @@
+$NetBSD: patch-ab,v 1.7 2010/12/26 18:39:46 adam Exp $
+
+--- src/findlib/attribs.c.orig	2010-08-05 14:29:51.000000000 +0000
++++ src/findlib/attribs.c
+@@ -240,7 +240,7 @@ void encode_stat(char *buf, struct stat 
+ int decode_stat(char *buf, struct stat *statp, int32_t *LinkFI)
+ {
+    char *p = buf;
+-   int64_t val;
++   intmax_t val;
+ 
+    p += from_base64(&val, p);
+    plug(statp->st_dev, val);
+@@ -325,7 +325,7 @@ int decode_stat(char *buf, struct stat *
+ int32_t decode_LinkFI(char *buf, struct stat *statp)
+ {
+    char *p = buf;
+-   int64_t val;
++   intmax_t val;
+ 
+    skip_nonspaces(&p);                /* st_dev */
+    p++;                               /* skip space */
+@@ -632,7 +632,7 @@ int encode_attribsEx(JCR *jcr, char *att
+ static bool set_win32_attributes(JCR *jcr, ATTR *attr, BFILE *ofd)
+ {
+    char *p = attr->attrEx;
+-   int64_t val;
++   intmax_t val;
+    WIN32_FILE_ATTRIBUTE_DATA atts;
+    ULARGE_INTEGER li;
+    POOLMEM *win32_ofile;
diff --git a/sysutils/bacula/patches/patch-ae b/sysutils/bacula/patches/patch-ae
index 24d12b0e2b1..9f54621409d 100644
--- a/sysutils/bacula/patches/patch-ae
+++ b/sysutils/bacula/patches/patch-ae
@@ -1,17 +1,17 @@
-$NetBSD: patch-ae,v 1.6 2010/03/09 07:06:00 adam Exp $
+$NetBSD: patch-ae,v 1.7 2010/12/26 18:39:46 adam Exp $
 
---- src/filed/Makefile.in.orig	2010-02-24 15:33:48.000000000 +0000
+--- src/filed/Makefile.in.orig	2010-08-05 14:29:51.000000000 +0000
 +++ src/filed/Makefile.in
-@@ -87,7 +87,7 @@ win32:	$(WIN32OBJS)
+@@ -94,7 +94,7 @@ win32:	$(WIN32OBJS)
  bacula-fd:  Makefile $(SVROBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@
  	@echo "Linking $@ ..."
  	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \
--	  $(WIN32LIBS) $(FDLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(LIBS) \
-+	  $(WIN32LIBS) $(FDLIBS) ../findlib/libbacfind.la ../lib/libbacpy.la ../lib/libbaccfg.la ../lib/libbac.la -lm $(PYTHON_LIBS) $(LIBS) \
- 	  $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS)
+-	  $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(LIBS) \
++	  $(WIN32LIBS) $(FDLIBS) $(ZLIBS) ../findlib/libbacfind.la ../lib/libbacpy.la ../lib/libbaccfg.la ../lib/libbac.la -lm $(PYTHON_LIBS) $(LIBS) \
+ 	  $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS)
  
  static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind.a ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@
-@@ -130,14 +130,14 @@ devclean: realclean
+@@ -137,14 +137,14 @@ devclean: realclean
  install: all
  	$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bacula-fd $(DESTDIR)$(sbindir)/bacula-fd 
  	@srcconf=bacula-fd.conf; \
diff --git a/sysutils/bacula/patches/patch-ag b/sysutils/bacula/patches/patch-ag
new file mode 100644
index 00000000000..6635347f82b
--- /dev/null
+++ b/sysutils/bacula/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.9 2010/12/26 18:39:46 adam Exp $
+
+--- src/lib/attr.c.orig	2010-12-26 18:20:15.000000000 +0000
++++ src/lib/attr.c
+@@ -106,7 +106,7 @@ int unpack_attributes_record(JCR *jcr, i
+    pm_strcpy(attr->attrEx, p);        /* copy extended attributes, if any */
+ 
+    if (attr->data_stream) {
+-      int64_t val;
++      intmax_t val;
+       while (*p++ != 0)               /* skip extended attributes */
+          { }
+       from_base64(&val, p);
diff --git a/sysutils/bacula/patches/patch-am b/sysutils/bacula/patches/patch-am
index dc63398cd87..ad7464cb7a0 100644
--- a/sysutils/bacula/patches/patch-am
+++ b/sysutils/bacula/patches/patch-am
@@ -1,6 +1,6 @@
-$NetBSD: patch-am,v 1.2 2009/05/15 10:29:05 adam Exp $
+$NetBSD: patch-am,v 1.3 2010/12/26 18:39:46 adam Exp $
 
---- scripts/Makefile.in.orig	2009-03-12 19:05:33.000000000 +0100
+--- scripts/Makefile.in.orig	2010-08-05 14:29:51.000000000 +0000
 +++ scripts/Makefile.in
 @@ -58,11 +58,6 @@ install: installdirs
  	   $(MV) -f ${DESTDIR}${scriptdir}/disk-changer ${DESTDIR}${scriptdir}/disk-changer.old; \
@@ -13,4 +13,4 @@ $NetBSD: patch-am,v 1.2 2009/05/15 10:29:05 adam Exp $
 -	$(INSTALL_SCRIPT) dvd-handler $(DESTDIR)$(scriptdir)/dvd-handler
  	$(INSTALL_DATA)   btraceback.gdb $(DESTDIR)$(scriptdir)/btraceback.gdb
  	$(INSTALL_DATA)   btraceback.dbx $(DESTDIR)$(scriptdir)/btraceback.dbx
- 	chmod 0644 $(DESTDIR)$(scriptdir)/btraceback.gdb \
+ 	$(INSTALL_DATA)   btraceback.mdb $(DESTDIR)$(scriptdir)/btraceback.mdb
diff --git a/sysutils/bacula/patches/patch-ao b/sysutils/bacula/patches/patch-ao
index 6b388b793cc..b8cc6c296f8 100644
--- a/sysutils/bacula/patches/patch-ao
+++ b/sysutils/bacula/patches/patch-ao
@@ -1,8 +1,8 @@
-$NetBSD: patch-ao,v 1.4 2010/05/08 09:05:47 adam Exp $
+$NetBSD: patch-ao,v 1.5 2010/12/26 18:39:46 adam Exp $
 
---- configure.orig	2010-04-27 19:58:29.000000000 +0000
+--- configure.orig	2010-08-05 14:29:51.000000000 +0000
 +++ configure
-@@ -47193,7 +47193,7 @@ echo "$as_me: error: Could not find qmak
+@@ -47521,7 +47521,7 @@ echo "$as_me: error: Could not find qmak
     { (exit 1); exit 1; }; }
     fi