o) Update to the new version 1.32b

o) Take over maintainership in agreement with old maintainer,
   who don't use bacula anymore.

7 files changed, 325 insertions, 113 deletions

diff --git a/sysutils/bacula-server/files/bacula-barcodes b/sysutils/bacula-server/files/bacula-barcodes
new file mode 100644
index 000000000000..0a0b2dc28f24
--- /dev/null
+++ b/sysutils/bacula-server/files/bacula-barcodes
@@ -0,0 +1,51 @@
+#
+# Bacula barcode simulation file
+# used by ${PREFIX}/sbin/chio-bacula (FreeBSD)
+#
+# The volumenames are returned by the "changer list" command
+# labeling in the console is done by "label barcodes"
+# (then all volumes belog to the default pool).
+# All Lines with an "#" at the bedinning are ignored
+#
+# !!!! If you export an tape and reinsert another one,
+# !!!! don't forget to change the volume name in this file!
+#
+1:Volume1-100
+2:Volume1-101
+3:Volume1-102
+4:Volume1-103
+5:Volume1-104
+6:Volume1-105
+7:Volume1-106
+8:Volume1-107
+9:Volume1-108
+10:Volume1-109
+11:Volume1-110
+12:Volume1-111
+#
+# Further volumes exported from the changer
+#
+# 36GB AIT2 tapes
+#Volume1-100
+#Volume1-101
+#Volume1-102
+#Volume1-103
+#Volume1-104
+#Volume1-105
+#Volume1-106
+#Volume1-107
+#Volume1-108
+#Volume1-109
+#Volume1-110
+#Volume1-111
+#Volume1-112
+#Volume1-113
+#Volume1-114
+#Volume1-115
+#
+# 50GB AIT2 tapes
+#Volume2-200
+#Volume2-201
+#Volume2-202
+#Volume2-203
+#Volume2-204
diff --git a/sysutils/bacula-server/files/chio-bacula b/sysutils/bacula-server/files/chio-bacula
new file mode 100644
index 000000000000..dd6b9e8b88d8
--- /dev/null
+++ b/sysutils/bacula-server/files/chio-bacula
@@ -0,0 +1,138 @@
+#!/bin/sh
+#
+# Bacula interface to mtx autoloader
+# (By Lars Köller, lars+bacula@koellers.net)
+#
+#  If you set in your Device resource
+#
+#  Changer Command = "path-to-this-script/chio-bacula" %c %o %S %a
+#    you will have the following input to this script:
+#
+#  chio-bacula "changer-device" "command" "slot" "archive-device"
+#
+#  for example:
+#
+#  chio-bacula /dev/sg0 load 1 /dev/nst0 (on a FreeBSD system)
+#
+#  If you need to to an offline, refer to the drive as $4
+#    e.g.   mt -f $f offline
+#
+#  Many changers need an offline after the unload. Also many
+#   changers need a sleep 60 after the mtx load.
+#
+#  N.B. If you change the script, take care to return either
+#   the mtx exit code or a 0. If the script exits with a non-zero
+#   exit code, Bacula will assume the request failed.
+#
+
+# This simulates a barcode reader in the changer.
+# The labes of the virtual barcode reader are located in the BARCODE_FILE
+SIMULATE_BARCODE=true
+BARCODE_FILE=/usr/local/etc/bacula-barcodes
+
+me=$(basename $0)
+
+# Debug
+echo "$me $@" > /dev/console
+
+if [ -z "$1" ] ; then
+    usage;
+fi
+
+if [ -z "$2" ] ; then
+    usage;
+fi
+
+MTX=/bin/chio
+CHANGER=$1
+COMMAND=$2
+if [ ! -z "$3" ]; then
+    SLOT=$3
+fi
+if [ ! -z "$4" ]; then
+    TAPE=$4
+else
+    TAPE=/dev/nrsa2
+fi
+
+# Time to wait for loading
+SLEEP=20
+# What drive of the autochanger should be used primary
+# At the moment bacula (1.31a) could not deal with more drives
+DRIVE=1
+
+usage()
+{
+  echo ""
+  echo "The $me script for bacula"
+  echo "--------------------------------------"
+  echo ""
+  echo "usage: $me <changer-device> <command> [slot] [devicename of tapedrive]"
+  echo ""
+  echo "Valid commands:"
+  echo ""
+  echo "unload          Unloads a tape into the slot"
+  echo "                from where it was loaded."
+  echo "load <slot>     Loads a tape from the slot <slot>"
+  echo "                (slot-base is calculated to 1 as first slot)"
+  echo "list            Lists full storage slots"
+  echo "loaded          Gives slot from where the tape was loaded."
+  echo "                0 means the tape drive is empty."
+  echo "slots           Gives Number of aviable slots."
+  echo ""
+  echo "Example:"
+  echo "  mtx-changer /dev/changer load 1   loads a tape from slot 1"
+  echo ""
+  exit 2
+}
+
+
+case ${COMMAND} in
+    unload)
+	# enable the following line if you need to eject the cartridge
+	#mt -f ${TAPE} off
+	#sleep 2
+	${MTX} -f ${CHANGER} return drive ${DRIVE}
+	;;
+
+    load)
+	${MTX} -f ${CHANGER} move slot $((${SLOT}-1)) drive ${DRIVE}
+	rtn=$?
+	# Increase the sleep time if you have a slow device
+	sleep $SLEEP
+	exit $rtn
+	;;
+
+    list)
+	if [ "${SIMULATE_BARCODE}" = "true" ]; then
+	    if [ -f "$BARCODE_FILE" ]; then
+		cat $BARCODE_FILE | grep -v "^#"
+		exit 0
+	    else
+		echo "Barcode file $BARCODE_FILE missing ... exiting!"
+		exit 1
+	    fi
+	else
+	    ${MTX} -f ${CHANGER} status | grep "^slot .*: .*FULL>" | awk '{print $2}' | awk -F: '{print $1+1" "}' | tr -d "[\r\n]"
+	fi
+      ;;
+
+    loaded)
+	# echo "Request loaded"
+	${MTX} -f ${CHANGER} status -S > /tmp/mtx.$$
+	rtn=$?
+	cat /tmp/mtx.$$ | grep "^drive ${DRIVE}: <FULL>" | awk '{print $6+1}' | tr -d ">"
+	cat /tmp/mtx.$$ | grep "^drive ${DRIVE}:  source: <>" | awk "{print 0}"
+	rm -f /tmp/mtx.$$
+	exit $rtn
+	;;
+
+    slots)
+	# echo "Request slots"
+	${MTX} -f ${CHANGER} status | grep "^slot " | tail -1 | awk '{print $2+1}' | tr -d ":"
+      ;;
+
+    *)
+	usage
+      ;;
+esac
diff --git a/sysutils/bacula-server/files/patch-autoconf-Make.common.in b/sysutils/bacula-server/files/patch-autoconf-Make.common.in
index ed9ed2a4cf8b..110aaa06d79c 100644
--- a/sysutils/bacula-server/files/patch-autoconf-Make.common.in
+++ b/sysutils/bacula-server/files/patch-autoconf-Make.common.in
@@ -1,19 +1,29 @@
---- autoconf/Make.common.in	Sat Mar 29 13:25:04 2003
-+++ autoconf/Make.common.in	Thu May  8 07:18:26 2003
-@@ -31,6 +31,7 @@
- sysconfdir = @sysconfdir@
- scriptdir = @scriptdir@
- mandir = @mandir@/man1
-+datadir = @datadir@
- manext = 1
- 
- # Tools & program stuff
-@@ -50,7 +51,7 @@
- RANLIB = @RANLIB@
- INSTALL = @INSTALL@
- # add the -s to the following in PRODUCTION mode
--INSTALL_PROGRAM = @INSTALL@ -m 754
-+INSTALL_PROGRAM = @INSTALL@ -s -m 754
- INSTALL_DATA = @INSTALL@ -m 644
- INSTALL_SCRIPT = @INSTALL@ -m 754
- INSTALL_CONFIG = @INSTALL@ -m 640
+*** autoconf/Make.common.in.orig	Thu May  8 14:40:44 2003
+--- autoconf/Make.common.in	Sat Oct 11 10:50:22 2003
+***************
+*** 24,29 ****
+--- 24,30 ----
+  sysconfdir = @sysconfdir@
+  scriptdir = @scriptdir@
+  mandir = @mandir@/man1
++ datadir = @datadir@
+  manext = 1
+  
+  # Tools & program stuff
+***************
+*** 43,49 ****
+  RANLIB = @RANLIB@
+  INSTALL = @INSTALL@
+  # add the -s to the following in PRODUCTION mode
+! INSTALL_PROGRAM = @INSTALL@ -m 754
+  INSTALL_DATA = @INSTALL@ -m 644
+  INSTALL_SCRIPT = @INSTALL@ -m 754
+  INSTALL_CONFIG = @INSTALL@ -m 640
+--- 44,50 ----
+  RANLIB = @RANLIB@
+  INSTALL = @INSTALL@
+  # add the -s to the following in PRODUCTION mode
+! INSTALL_PROGRAM = @INSTALL@ -s -m 754
+  INSTALL_DATA = @INSTALL@ -m 644
+  INSTALL_SCRIPT = @INSTALL@ -m 754
+  INSTALL_CONFIG = @INSTALL@ -m 640
diff --git a/sysutils/bacula-server/files/patch-configure b/sysutils/bacula-server/files/patch-configure
deleted file mode 100644
index 75a3d2074f70..000000000000
--- a/sysutils/bacula-server/files/patch-configure
+++ /dev/null
@@ -1,15 +0,0 @@
---- configure~	Thu May  8 07:23:27 2003
-+++ configure	Thu May  8 07:26:21 2003
-@@ -4038,9 +4038,9 @@
- 		   { echo "configure: error: Unable to find sqlite.h in standard locations" 1>&2; exit 1; }
- 		fi
- 	else
--		if test -f $withval/sqlite.h; then
--			SQLITE_INCDIR=$withval
--			SQLITE_LIBDIR=$withval
-+		if test -f $withval/include/sqlite.h; then
-+			SQLITE_INCDIR=$withval/include
-+			SQLITE_LIBDIR=$withval/lib
- 			SQLITE_BINDIR=$withval
- 		else
- 		   echo "$ac_t""no" 1>&6
diff --git a/sysutils/bacula-server/files/patch-scripts-fd.in b/sysutils/bacula-server/files/patch-scripts-fd.in
index 783b842b4a88..62525545d487 100644
--- a/sysutils/bacula-server/files/patch-scripts-fd.in
+++ b/sysutils/bacula-server/files/patch-scripts-fd.in
@@ -1,13 +1,21 @@
---- scripts/fd.in.orig	Mon Feb 24 13:49:20 2003
-+++ scripts/fd.in	Mon Feb 24 13:49:59 2003
-@@ -135,8 +135,8 @@
- 		    return 1
- 	    fi
-     fi
--    # See if /var/lock/subsys/$1 exists
--    if [ -f /var/lock/subsys/$1 ]; then
-+    # See if @subsysdir@/$1 exists
-+    if [ -f @subsysdir@/$1 ]; then
- 	    echo "$1 dead but subsys locked"
- 	    return 2
-     fi
+*** scripts/fd.in.orig	Sun May 11 22:39:16 2003
+--- scripts/fd.in	Wed Oct  1 20:47:13 2003
+***************
+*** 139,146 ****
+  		    return 1
+  	    fi
+      fi
+!     # See if /var/lock/subsys/$1 exists
+!     if [ -f /var/lock/subsys/$1 ]; then
+  	    echo "$1 dead but subsys locked"
+  	    return 2
+      fi
+--- 139,146 ----
+  		    return 1
+  	    fi
+      fi
+!     # See if @subsysdir@/$1 exists
+!     if [ -f @subsysdir@/$1 ]; then
+  	    echo "$1 dead but subsys locked"
+  	    return 2
+      fi
diff --git a/sysutils/bacula-server/files/patch-src-cats-Makefile.in b/sysutils/bacula-server/files/patch-src-cats-Makefile.in
index fb83790227bc..0c7ce27142fe 100644
--- a/sysutils/bacula-server/files/patch-src-cats-Makefile.in
+++ b/sysutils/bacula-server/files/patch-src-cats-Makefile.in
@@ -1,33 +1,43 @@
---- src/cats/Makefile.in~	Mon Apr  7 13:06:05 2003
-+++ src/cats/Makefile.in	Thu May  8 07:39:15 2003
-@@ -12,6 +12,7 @@
- thisdir = src/cats
- 
- DEBUG=@DEBUG@
-+MKDIR=$(topdir)/autoconf/mkinstalldirs
- 
- SQL_INC=@SQL_INCLUDE@
- 
-@@ -70,14 +71,14 @@
- 	(cd $(srcdir); $(RMF) Makefile; $(RMF) -r CVS)
- 
- install:
--	$(INSTALL_SCRIPT) create_@DB_NAME@_database $(DESTDIR)$(scriptdir)/create_@DB_NAME@_database
--	$(INSTALL_SCRIPT) drop_@DB_NAME@_tables $(DESTDIR)$(scriptdir)/drop_@DB_NAME@_tables
--	$(INSTALL_SCRIPT) make_@DB_NAME@_tables $(DESTDIR)$(scriptdir)/make_@DB_NAME@_tables
--	$(INSTALL_SCRIPT) drop_bacula_tables $(DESTDIR)$(scriptdir)/drop_bacula_tables
--	$(INSTALL_SCRIPT) make_bacula_tables $(DESTDIR)$(scriptdir)/make_bacula_tables
--	$(INSTALL_SCRIPT) make_catalog_backup $(DESTDIR)$(scriptdir)/make_catalog_backup  
--	$(INSTALL_SCRIPT) delete_catalog_backup $(DESTDIR)$(scriptdir)/delete_catalog_backup  
--	$(INSTALL_SCRIPT) grant_mysql_privileges $(DESTDIR)$(scriptdir)/grant_mysql_privileges	
-+	$(MKDIR) $(DESTDIR)$(datadir)/bacula
-+	$(INSTALL_SCRIPT) create_@DB_NAME@_database $(DESTDIR)$(datadir)/bacula/create_@DB_NAME@_database
-+	$(INSTALL_SCRIPT) drop_@DB_NAME@_tables $(DESTDIR)$(datadir)/bacula/drop_@DB_NAME@_tables
-+	$(INSTALL_SCRIPT) make_@DB_NAME@_tables $(DESTDIR)$(datadir)/bacula/make_@DB_NAME@_tables
-+	$(INSTALL_SCRIPT) drop_bacula_tables $(DESTDIR)$(datadir)/bacula/drop_bacula_tables
-+	$(INSTALL_SCRIPT) make_bacula_tables $(DESTDIR)$(datadir)/bacula/make_bacula_tables
-+	$(INSTALL_SCRIPT) make_catalog_backup $(DESTDIR)$(datadir)/bacula/make_catalog_backup  
-+	$(INSTALL_SCRIPT) delete_catalog_backup $(DESTDIR)$(datadir)/bacula/delete_catalog_backup  
- 
- uninstall:
- 	(cd $(DESTDIR)$(scriptdir); $(RMF) create_@DB_NAME@_database)
+*** src/cats/Makefile.in.orig	Sun May 11 22:39:16 2003
+--- src/cats/Makefile.in	Wed Oct  1 20:59:45 2003
+***************
+*** 12,17 ****
+--- 12,18 ----
+  thisdir = src/cats
+  
+  DEBUG=@DEBUG@
++ MKDIR=$(topdir)/autoconf/mkinstalldirs
+  
+  SQL_INC=@SQL_INCLUDE@
+  
+***************
+*** 73,86 ****
+  	(cd $(srcdir); $(RMF) Makefile; $(RMF) -r CVS)
+  
+  install:
+! 	$(INSTALL_SCRIPT) create_@DB_NAME@_database $(DESTDIR)$(scriptdir)/create_@DB_NAME@_database
+! 	$(INSTALL_SCRIPT) drop_@DB_NAME@_tables $(DESTDIR)$(scriptdir)/drop_@DB_NAME@_tables
+! 	$(INSTALL_SCRIPT) make_@DB_NAME@_tables $(DESTDIR)$(scriptdir)/make_@DB_NAME@_tables
+! 	$(INSTALL_SCRIPT) drop_bacula_tables $(DESTDIR)$(scriptdir)/drop_bacula_tables
+! 	$(INSTALL_SCRIPT) make_bacula_tables $(DESTDIR)$(scriptdir)/make_bacula_tables
+! 	$(INSTALL_SCRIPT) make_catalog_backup $(DESTDIR)$(scriptdir)/make_catalog_backup  
+! 	$(INSTALL_SCRIPT) delete_catalog_backup $(DESTDIR)$(scriptdir)/delete_catalog_backup  
+! 	$(INSTALL_SCRIPT) grant_mysql_privileges $(DESTDIR)$(scriptdir)/grant_mysql_privileges	
+  
+  uninstall:
+  	(cd $(DESTDIR)$(scriptdir); $(RMF) create_@DB_NAME@_database)
+--- 74,87 ----
+  	(cd $(srcdir); $(RMF) Makefile; $(RMF) -r CVS)
+  
+  install:
+! 	$(MKDIR) $(DESTDIR)$(datadir)/bacula
+! 	$(INSTALL_SCRIPT) create_@DB_NAME@_database $(DESTDIR)$(datadir)/bacula/create_@DB_NAME@_database
+! 	$(INSTALL_SCRIPT) drop_@DB_NAME@_tables $(DESTDIR)$(datadir)/bacula/drop_@DB_NAME@_tables
+! 	$(INSTALL_SCRIPT) make_@DB_NAME@_tables $(DESTDIR)$(datadir)/bacula/make_@DB_NAME@_tables
+! 	$(INSTALL_SCRIPT) drop_bacula_tables $(DESTDIR)$(datadir)/bacula/drop_bacula_tables
+! 	$(INSTALL_SCRIPT) make_bacula_tables $(DESTDIR)$(datadir)/bacula/make_bacula_tables
+! 	$(INSTALL_SCRIPT) make_catalog_backup $(DESTDIR)$(datadir)/bacula/make_catalog_backup  
+! 	$(INSTALL_SCRIPT) delete_catalog_backup $(DESTDIR)$(datadir)/bacula/delete_catalog_backup  
+  
+  uninstall:
+  	(cd $(DESTDIR)$(scriptdir); $(RMF) create_@DB_NAME@_database)
diff --git a/sysutils/bacula-server/files/patch-src__cats__Makefile.in b/sysutils/bacula-server/files/patch-src__cats__Makefile.in
index fb83790227bc..0c7ce27142fe 100644
--- a/sysutils/bacula-server/files/patch-src__cats__Makefile.in
+++ b/sysutils/bacula-server/files/patch-src__cats__Makefile.in
@@ -1,33 +1,43 @@
---- src/cats/Makefile.in~	Mon Apr  7 13:06:05 2003
-+++ src/cats/Makefile.in	Thu May  8 07:39:15 2003
-@@ -12,6 +12,7 @@
- thisdir = src/cats
- 
- DEBUG=@DEBUG@
-+MKDIR=$(topdir)/autoconf/mkinstalldirs
- 
- SQL_INC=@SQL_INCLUDE@
- 
-@@ -70,14 +71,14 @@
- 	(cd $(srcdir); $(RMF) Makefile; $(RMF) -r CVS)
- 
- install:
--	$(INSTALL_SCRIPT) create_@DB_NAME@_database $(DESTDIR)$(scriptdir)/create_@DB_NAME@_database
--	$(INSTALL_SCRIPT) drop_@DB_NAME@_tables $(DESTDIR)$(scriptdir)/drop_@DB_NAME@_tables
--	$(INSTALL_SCRIPT) make_@DB_NAME@_tables $(DESTDIR)$(scriptdir)/make_@DB_NAME@_tables
--	$(INSTALL_SCRIPT) drop_bacula_tables $(DESTDIR)$(scriptdir)/drop_bacula_tables
--	$(INSTALL_SCRIPT) make_bacula_tables $(DESTDIR)$(scriptdir)/make_bacula_tables
--	$(INSTALL_SCRIPT) make_catalog_backup $(DESTDIR)$(scriptdir)/make_catalog_backup  
--	$(INSTALL_SCRIPT) delete_catalog_backup $(DESTDIR)$(scriptdir)/delete_catalog_backup  
--	$(INSTALL_SCRIPT) grant_mysql_privileges $(DESTDIR)$(scriptdir)/grant_mysql_privileges	
-+	$(MKDIR) $(DESTDIR)$(datadir)/bacula
-+	$(INSTALL_SCRIPT) create_@DB_NAME@_database $(DESTDIR)$(datadir)/bacula/create_@DB_NAME@_database
-+	$(INSTALL_SCRIPT) drop_@DB_NAME@_tables $(DESTDIR)$(datadir)/bacula/drop_@DB_NAME@_tables
-+	$(INSTALL_SCRIPT) make_@DB_NAME@_tables $(DESTDIR)$(datadir)/bacula/make_@DB_NAME@_tables
-+	$(INSTALL_SCRIPT) drop_bacula_tables $(DESTDIR)$(datadir)/bacula/drop_bacula_tables
-+	$(INSTALL_SCRIPT) make_bacula_tables $(DESTDIR)$(datadir)/bacula/make_bacula_tables
-+	$(INSTALL_SCRIPT) make_catalog_backup $(DESTDIR)$(datadir)/bacula/make_catalog_backup  
-+	$(INSTALL_SCRIPT) delete_catalog_backup $(DESTDIR)$(datadir)/bacula/delete_catalog_backup  
- 
- uninstall:
- 	(cd $(DESTDIR)$(scriptdir); $(RMF) create_@DB_NAME@_database)
+*** src/cats/Makefile.in.orig	Sun May 11 22:39:16 2003
+--- src/cats/Makefile.in	Wed Oct  1 20:59:45 2003
+***************
+*** 12,17 ****
+--- 12,18 ----
+  thisdir = src/cats
+  
+  DEBUG=@DEBUG@
++ MKDIR=$(topdir)/autoconf/mkinstalldirs
+  
+  SQL_INC=@SQL_INCLUDE@
+  
+***************
+*** 73,86 ****
+  	(cd $(srcdir); $(RMF) Makefile; $(RMF) -r CVS)
+  
+  install:
+! 	$(INSTALL_SCRIPT) create_@DB_NAME@_database $(DESTDIR)$(scriptdir)/create_@DB_NAME@_database
+! 	$(INSTALL_SCRIPT) drop_@DB_NAME@_tables $(DESTDIR)$(scriptdir)/drop_@DB_NAME@_tables
+! 	$(INSTALL_SCRIPT) make_@DB_NAME@_tables $(DESTDIR)$(scriptdir)/make_@DB_NAME@_tables
+! 	$(INSTALL_SCRIPT) drop_bacula_tables $(DESTDIR)$(scriptdir)/drop_bacula_tables
+! 	$(INSTALL_SCRIPT) make_bacula_tables $(DESTDIR)$(scriptdir)/make_bacula_tables
+! 	$(INSTALL_SCRIPT) make_catalog_backup $(DESTDIR)$(scriptdir)/make_catalog_backup  
+! 	$(INSTALL_SCRIPT) delete_catalog_backup $(DESTDIR)$(scriptdir)/delete_catalog_backup  
+! 	$(INSTALL_SCRIPT) grant_mysql_privileges $(DESTDIR)$(scriptdir)/grant_mysql_privileges	
+  
+  uninstall:
+  	(cd $(DESTDIR)$(scriptdir); $(RMF) create_@DB_NAME@_database)
+--- 74,87 ----
+  	(cd $(srcdir); $(RMF) Makefile; $(RMF) -r CVS)
+  
+  install:
+! 	$(MKDIR) $(DESTDIR)$(datadir)/bacula
+! 	$(INSTALL_SCRIPT) create_@DB_NAME@_database $(DESTDIR)$(datadir)/bacula/create_@DB_NAME@_database
+! 	$(INSTALL_SCRIPT) drop_@DB_NAME@_tables $(DESTDIR)$(datadir)/bacula/drop_@DB_NAME@_tables
+! 	$(INSTALL_SCRIPT) make_@DB_NAME@_tables $(DESTDIR)$(datadir)/bacula/make_@DB_NAME@_tables
+! 	$(INSTALL_SCRIPT) drop_bacula_tables $(DESTDIR)$(datadir)/bacula/drop_bacula_tables
+! 	$(INSTALL_SCRIPT) make_bacula_tables $(DESTDIR)$(datadir)/bacula/make_bacula_tables
+! 	$(INSTALL_SCRIPT) make_catalog_backup $(DESTDIR)$(datadir)/bacula/make_catalog_backup  
+! 	$(INSTALL_SCRIPT) delete_catalog_backup $(DESTDIR)$(datadir)/bacula/delete_catalog_backup  
+  
+  uninstall:
+  	(cd $(DESTDIR)$(scriptdir); $(RMF) create_@DB_NAME@_database)