Update to 1.36.3nb1, provided by Geert Hendrickx in PR 31570.

This contains the update to 1.36.3 and an additional security fix,
thus the nb1.

Changes since 1.36.0:

Changes to 1.36.3 released 23Apr05:
22Apr05
- Correct return type of ftello to avoid overflow --
  thanks to Peter Eriksson.
13Apr05
- Fix seg fault if Name directive missing in Job resource.
12Apr05
- Add new LaTeX doc to 1.36.2 branch.
- Fix SuSE autostart routines to use /etc/init.d instead
  of /etc/rc.d/init.d.
- Increase index size on File table Name and Path table Path
  to improve performance.
- Second fix for not zeroing SD pointers on restarted job.
- Turn off old style Include/Excludes.
01Apr05
- Use fseeko and ftello so that attributes can exceed 4GB
- Flush console output after every line.
- Turn off Multiple Connections in catalog resource, which
  causes corruped databases.  It is silently ignored.
- Drop support for old style Include/Exclude.  There is a
  perl script that will convert them.
- Inhibit trying to reset attributes on a Win32 drive.
18Mar05 1.36.2-store.patch
- This patch fails a job if no Storage resource is specified and
  the job attempts to call the SD.
18Mar05 1.36.2-reschedule.patch
- This patch should fix a Segfault bug when a job is rescheduled.
  The storage pointers were being released when they should not
  have been.
17Mar05 1.36.2-restore-speed.patch
- This patch will fix a subtle bug that was introduced in 1.36.2
  which causes Bacula to be very slow restoring a few files. This
  is because it reads completely to the end of the Volume rather
  than stopping when all the files on the Volume are loaded. The
  introduction of the bug was caused by a patch that fixed
  Bacula truncating tapes after a restore.
  Note that all source files will be rebuilt during the make.
16Mar05 1.36.2-console.patch
- This patch causes the output directed to a file to be
  flushed after every line. This is a bit overkill, IMO, but
  a user complained about it.
15Mar05 1.36.2-netbsd.patch
- This patch corrects a compile problem because of no statfs()
  on NetBSD. The patch was submitted by kardel with bug 258.
09Mar05 1.36.2-win32-drive.patch
- This patch will prevent the Win32 FD from printing an error message
  when it attempts to restore the permissions for a drive (which Win32
  doesn't permit). The error is harmless in any case.
04Mar05 1.36.2-level.patch
- This patch should fix a problem with th %l editing in the
  client (FD) where it edited nothing. With this fix, it should
  edit "since".
04Mar05 1.36.2-pool.patch
- This patch corrects a problem preventing multiple
  simultaneous jobs from different pools.

Changes to 1.36.2 released 28Feb05:
27Feb05
- Fix pointer to stack variable in Verify jobs.
- Change reference to DEV_BSIZE to B_DEV_BSIZE to
  avoid colision with some OSes.
- Release storage[i] in job.c if allocated when
  starting/restarting a job. Avoids orpahanned buffers.
24Feb05
- Add awk check to configure.in
- Bring over a few files from 1.37.
18Feb05
- Fix some lower case character problems in sql_cmds.c reported
  by Debian.
- Fix seg fault if debug level 900 set in SD.
- Truncate Win32 child return code to 8 bits.
15Feb05
- Fix deadlock in multiple simultaneous jobs.
- Fix tape "truncation"/"number of files" after restore bug.
- Merge a few minor things from the 1.37 stream.
14Feb05
- Add a number of new features from 1.37, and apply fixes
  for all known bugs. See ReleaseNotes for details.
- Apply Tim's patch for ACLs.

Version 1.36.1 released 26Nov04:
24Nov04
- Take Dan's fix to the fix_postgresql_tables (thanks Dan)
- Increase Maximum Concurrent Jobs to 20 in SD and FD!
- Fix improper handling of autochanger Volumes that are not
  marked InChanger.
22Nov04
- Update authentication failure message to indicate possible
  problem with Maximum Concurrent Jobs. Add to doc too.
- Commit PostgreSQL BIGINT fix -- apparently some people didn't
  get it.
- Do not use a slot unless it is InChanger in the autochanger
  code, otherwise autochanger gets upset not finding the Volume.
21Nov04
- Make authentication timeout compile time configurable.
  The value is set in src/baconfig.h
- Fix removing items from watchdog queue, which apparently
  screwed up if there was more than one item.
- Rework mediaformat part of manual to separate out old
  tape format for easier reading.
- Add a lot of debug code to the authentication code.
- Add seconds to the start/end times printed in the job report.
19Nov04
- Fix mutex deadlock in dequeue of messages.
- Add debug code to FD authorization.
18Nov04
- Increase authentication timeouts to 10 minutes.
15Nov04
- Fix cancel bug in FD on /lib/tls with zero pid in
  pthread_kill.
- Add date/time to all messages.
- Make Qmsg use time message was queued rather than time
  printed.
- Indent job output two spaces.
13Nov04
- Fix web page links for new manual.
- Grant postgresql permission to cdimages.
- Correct crash after "list nextvol" "list media" bug 160
12Nov04
- Fix scripts/Makefile.in missing ;\  -- thanks Martin
- A bit of work on btape to keep if from going into infinite
  loops when things do not work well, and to print a bit
  better info.
11Nov04
- JobDefs Storage resource completely overrode anything
  specified in Job resource -- bug 159 -- fixed.
- Fix syntax of renaming postgresql per Dan.
- Add working_directory to be /tmp for wx_console.
10Nov04
- Allow both a JobId and a filename or list of files to be
  specified on a restore command line.
- Save old mtx-changer before installing new one: bug 156
- Fix errors in CDROM file pointed out by Scott.
09Nov04
- Fix exepath when Bacula executed without path.
- Move test for socket libraries for Solaris in configure.in
  before tcp wrapper tests so that linking works.
- Add "make copy-static-fd" to makefile in CDROM file to
  copy existing static fd to CDROM rather than building it.
08Nov04
- More doc updates
- Fix ps command for OpenBSD
- Rework the creation of indexes for SQL -- fall back
  to the old code, but document what can be added.
06Nov04
- Add new Daemon message handler in default DIR conf.
05Nov04
- Fix Seg Fault with -D100 in bpipe.c.
- Fix Seg Fault in run specifying a JobId.
- Make mail from daemon with a Messages Resource use
  the MailCommand with editing rather than the default
  sendmail.
- Replace Jmsg in dispatch_message() with Qmsg.
- Make edit_job_codes handle NULL jcr.
04Nov04
- Add M_ALERT class and put tape alerts into it.
- Fix Verify count vs found by not double counting files
  that are split across files/Volumes.
30Oct04
- Fix count returned from write_bsr_file() to handle multiple
  volumes. This fixes most cases of the Verify VolumeToCatalog.
- Cleanup a bit the make clean for the rescue cdrom and remove
  unneeded files from the CVS.
28Oct04
- Fixed acquiring a tape so that it does not block all acquires
  when operator intervention is needed.
- Platform build script updates from Scott
- Doc updates
- Add patch to force Linux LD_ASSUME_KERNEL to avoid using the
  new /lib/tls. This is done in the startup scripts.
- Modify mtx-changer so that it checks for ONLINE while
  waiting.
- Modify make_postgresql_tables.in so that EndBlock is stored
  as a bigint. Prevents job failures when a disk volume is
  larger than 2GB.
24Oct04
- Add grep ONLINE to wait_for_drive() in mtx-changer.in
- More doc.
- Rebuild Scott's new configure

7 files changed, 223 insertions, 10 deletions

diff --git a/sysutils/bacula/Makefile b/sysutils/bacula/Makefile
index e019e72b939..d0581ae669c 100644
--- a/sysutils/bacula/Makefile
+++ b/sysutils/bacula/Makefile
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile,v 1.3 2005/01/16 19:34:45 kristerw Exp $
-
-PKGREVISION=	1
+# $NetBSD: Makefile,v 1.4 2005/10/14 15:44:51 wiz Exp $
 
 .include "Makefile.common"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/bacula/Makefile.common b/sysutils/bacula/Makefile.common
index 8e6ded27a1f..90a256b233c 100644
--- a/sysutils/bacula/Makefile.common
+++ b/sysutils/bacula/Makefile.common
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile.common,v 1.10 2005/10/10 17:04:15 hira Exp $
+# $NetBSD: Makefile.common,v 1.11 2005/10/14 15:44:51 wiz Exp $
 #
 
-DISTNAME=		bacula-1.36.0
+DISTNAME=		bacula-1.36.3
+PKGREVISION=		1
 CATEGORIES=		sysutils
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=bacula/}
 
@@ -80,4 +81,3 @@ pre-install:
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/tcp_wrappers/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/bacula/distinfo b/sysutils/bacula/distinfo
index 80d4df009f6..7338ae984cb 100644
--- a/sysutils/bacula/distinfo
+++ b/sysutils/bacula/distinfo
@@ -1,9 +1,13 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 13:40:50 agc Exp $
+$NetBSD: distinfo,v 1.3 2005/10/14 15:44:51 wiz Exp $
 
-SHA1 (bacula-1.36.0.tar.gz) = 022606a36bb5c094a8e212c57c0f41d83b458172
-RMD160 (bacula-1.36.0.tar.gz) = a005ad833f006bd5f074f973d6e2f6ef69964d62
-Size (bacula-1.36.0.tar.gz) = 6806740 bytes
+SHA1 (bacula-1.36.3.tar.gz) = 4b3366e43fd4a8b6cbdc23e86ea20da6933d0f75
+RMD160 (bacula-1.36.3.tar.gz) = e8fb6eee221e261ac5b927019f9e69256cfb1732
+Size (bacula-1.36.3.tar.gz) = 11153154 bytes
 SHA1 (patch-aa) = 3369d0c37108f05828ea7c33b7aabc287e0213fd
 SHA1 (patch-ac) = 295dbf7fc6d1f5104b13d37a8ff32ea8580d4019
 SHA1 (patch-ae) = ad4b7d5cb83f021235c11504a034def897fffcac
 SHA1 (patch-af) = 926e74b83a09f4620672ffb8419d9ea22983d231
+SHA1 (patch-ag) = 4168ce9f1ea804d0d39645a48ab4d4132a53579f
+SHA1 (patch-ah) = bc89aa134997552e82a28bf06ed3c2308fc30efd
+SHA1 (patch-ai) = edbbe7501bcaae7e6699e0a17b2d6fa4056fa810
+SHA1 (patch-aj) = 40ef8d3719e8ad2ba5c24de8d5661b3bfbbb5806
diff --git a/sysutils/bacula/patches/patch-ag b/sysutils/bacula/patches/patch-ag
new file mode 100644
index 00000000000..1cdae3f4330
--- /dev/null
+++ b/sysutils/bacula/patches/patch-ag
@@ -0,0 +1,158 @@
+$NetBSD: patch-ag,v 1.1 2005/10/14 15:44:51 wiz Exp $
+
+--- configure.orig	2005-04-14 19:46:30.000000000 +0200
++++ configure
+@@ -12858,6 +12858,153 @@ fi
+ echo "$as_me:$LINENO: result: $fstype" >&5
+ echo "${ECHO_T}$fstype" >&6
+ 
++if test "${ac_cv_header_sys_statvfs_h+set}" = set; then
++  echo "$as_me:$LINENO: checking for sys/statvfs.h" >&5
++echo $ECHO_N "checking for sys/statvfs.h... $ECHO_C" >&6
++if test "${ac_cv_header_sys_statvfs_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_sys_statvfs_h" >&5
++echo "${ECHO_T}$ac_cv_header_sys_statvfs_h" >&6
++else
++  # Is the header compilable?
++echo "$as_me:$LINENO: checking sys/statvfs.h usability" >&5
++echo $ECHO_N "checking sys/statvfs.h usability... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++#include <sys/statvfs.h>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_header_compiler=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_header_compiler=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6
++
++# Is the header present?
++echo "$as_me:$LINENO: checking sys/statvfs.h presence" >&5
++echo $ECHO_N "checking sys/statvfs.h presence... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/statvfs.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  ac_header_preproc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  ac_header_preproc=no
++fi
++rm -f conftest.err conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6
++
++# So?  What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++  yes:no: )
++    { echo "$as_me:$LINENO: WARNING: sys/statvfs.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: sys/statvfs.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sys/statvfs.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: sys/statvfs.h: proceeding with the compiler's result" >&2;}
++    ac_header_preproc=yes
++    ;;
++  no:yes:* )
++    { echo "$as_me:$LINENO: WARNING: sys/statvfs.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: sys/statvfs.h: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sys/statvfs.h:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: sys/statvfs.h:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sys/statvfs.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: sys/statvfs.h: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sys/statvfs.h:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: sys/statvfs.h:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sys/statvfs.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: sys/statvfs.h: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: sys/statvfs.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: sys/statvfs.h: in the future, the compiler will take precedence" >&2;}
++    (
++      cat <<\_ASBOX
++## ------------------------------------------ ##
++## Report this to the AC_PACKAGE_NAME lists.  ##
++## ------------------------------------------ ##
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++echo "$as_me:$LINENO: checking for sys/statvfs.h" >&5
++echo $ECHO_N "checking for sys/statvfs.h... $ECHO_C" >&6
++if test "${ac_cv_header_sys_statvfs_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_header_sys_statvfs_h=$ac_header_preproc
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_sys_statvfs_h" >&5
++echo "${ECHO_T}$ac_cv_header_sys_statvfs_h" >&6
++
++fi
++if test $ac_cv_header_sys_statvfs_h = yes; then
++
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_SYS_STATVFS_H 1
++_ACEOF
++
++fi
++
++
++
+ echo "$as_me:$LINENO: checking return type of signal handlers" >&5
+ echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
+ if test "${ac_cv_type_signal+set}" = set; then
diff --git a/sysutils/bacula/patches/patch-ah b/sysutils/bacula/patches/patch-ah
new file mode 100644
index 00000000000..d61e70af6d4
--- /dev/null
+++ b/sysutils/bacula/patches/patch-ah
@@ -0,0 +1,14 @@
+$NetBSD: patch-ah,v 1.1 2005/10/14 15:44:51 wiz Exp $
+
+--- autoconf/config.h.in.orig	2005-10-13 18:29:17.000000000 +0200
++++ autoconf/config.h.in
+@@ -97,6 +97,9 @@
+    very expensive.  */
+ #undef CACHE_IDS
+ 
++/* Define if you have the <sys/statvfs.h> header file */
++#undef HAVE_SYS_STATVFS_H
++
+ /* Define to use SVR4 statvfs to get filesystem type.  */
+ #undef FSTYPE_STATVFS
+ 
diff --git a/sysutils/bacula/patches/patch-ai b/sysutils/bacula/patches/patch-ai
new file mode 100644
index 00000000000..33f5605df30
--- /dev/null
+++ b/sysutils/bacula/patches/patch-ai
@@ -0,0 +1,17 @@
+$NetBSD: patch-ai,v 1.1 2005/10/14 15:44:51 wiz Exp $
+
+--- src/findlib/fstype.c.orig	2005-04-05 19:23:56.000000000 +0200
++++ src/findlib/fstype.c
+@@ -80,6 +80,12 @@ bool fstype(const char *fname, char *fs,
+ #include <sys/param.h>
+ #include <sys/mount.h>
+ 
++#ifdef HAVE_SYS_STATVFS_H
++#include <sys/statvfs.h>
++#else
++#define statvfs statfs
++#endif
++
+ bool fstype(const char *fname, char *fs, int fslen)
+ {
+    struct statvfs st;
diff --git a/sysutils/bacula/patches/patch-aj b/sysutils/bacula/patches/patch-aj
new file mode 100644
index 00000000000..9a637c1f1d6
--- /dev/null
+++ b/sysutils/bacula/patches/patch-aj
@@ -0,0 +1,20 @@
+$NetBSD: patch-aj,v 1.1 2005/10/14 15:44:51 wiz Exp $
+
+--- autoconf/randpass.orig	2002-11-09 16:55:22.000000000 +0100
++++ autoconf/randpass
+@@ -8,7 +8,14 @@ if test "x$1" = "x" ; then
+ else
+    PWL=$1
+ fi 
+-tmp=/tmp/p.tmp.$$    
++tmp=`mktemp randpass.XXXXXXXXXX`
++if test x$tmp = x; then
++   tmp=/tmp/p.tmp.$$    
++   if test -f $tmp; then
++      echo "Temp file security problem on: $tmp"
++      exit 1
++   fi
++fi
+ cp autoconf/randpass.bc $tmp
+ ps | sum | tr -d ':[:alpha:] ' | sed 's/^/k=/' >>$tmp
+ date | tr -d ':[:alpha:] ' | sed 's/^/k=k*/' >>$tmp