Update amanda to 2.4.4p4

Bug fix release and minor improvements:

new chg-iomega changer script.
amanda will not use a tape if it's label is not in the tapelist file.
amflush.c: Don't start a driver if nothing to flush.
amadmin.c: Call check_dumpuser() as soon as posible.
amadmin.c: Don't core dump if DUMPCYLE is too  big.
dumper.c: Parse warning message.

5 files changed, 34 insertions, 212 deletions

diff --git a/sysutils/amanda-plot/DESCR b/sysutils/amanda-plot/DESCR
index 97d0d402e6b..5ead5bbac60 100644
--- a/sysutils/amanda-plot/DESCR
+++ b/sysutils/amanda-plot/DESCR
@@ -1,181 +1,4 @@
-Amanda, The Advanced Maryland Automatic Network Disk Archiver
-Copyright (c) 1991-1998 University of Maryland at College Park
-All Rights Reserved.
-
-See the files COPYRIGHT, COPYRIGHT-REGEX and COPYRIGHT-APACHE for
-distribution conditions and official warranty disclaimer.
-
-PLEASE NOTE: THIS SOFTWARE IS BEING MADE AVAILABLE ``AS-IS''. UMD is making
-this work available so that other people can use it.  This software is in
-production use at our home site - the UMCP Department of Computer Science -
-but we make no warranties that it will work for you.  Amanda development is
-unfunded - the development team maintains the code in their spare time.  As a
-result, there is no support available other than users helping each other on
-the Amanda mailing lists.  See below for information on the mailing lists.
-
-
-WHAT IS AMANDA?
----------------
-
 This is a release of Amanda, the Advanced Maryland Automatic
-Network Disk Archiver.  Amanda is a backup system designed to archive many
-computers on a network to a single large-capacity tape drive. 
-
-Here are some features of Amanda:
-
-  * written in C, freely distributable.
-  * built on top of standard backup software: Unix dump/restore, GNU Tar
-    and others.
-  * will back up multiple machines in parallel to a holding disk, blasting
-    finished dumps one by one to tape as fast as we can write files to
-    tape.  For example, a ~2 Gb 8mm tape on a ~240K/s interface to a host
-    with a large holding disk can be filled by Amanda in under 4 hours.
-  * does simple tape management: will not overwrite the wrong tape.
-  * supports tape changers via a generic interface.  Easily customizable to
-    any type of tape carousel, robot, or stacker that can be controlled via
-    the unix command line.
-  * supports Kerberos 4 security, including encrypted dumps.  The Kerberos
-    support is available as a separate add-on package, see the file
-    KERBEROS.HOW-TO-GET on the ftp site, and the file docs/KERBEROS in this
-    package, for more details.
-  * for a restore, tells you what tapes you need, and finds the proper
-    backup image on the tape for you.
-  * recovers gracefully from errors, including down or hung machines.
-  * reports results, including all errors in detail, in email.
-  * will dynamically adjust backup schedule to keep within constraints: no
-    more juggling by hand when adding disks and computers to network.
-  * includes a pre-run checker program, that conducts sanity checks on both
-    the tape server host and all the client hosts (in parallel), and will
-    send an e-mail report of any problems that could cause the backups to
-    fail.
-  * can compress dumps before sending or after sending over the net, with
-    either compress or gzip.
-  * can optionally synchronize with external backups, for those large
-    timesharing computers where you want to do full dumps when the system
-    is down in single-user mode (since BSD dump is not reliable on active
-    filesystems): Amanda will still do your daily dumps.
-  * lots of other options; Amanda is very configurable.
-
-
-WHAT ARE THE SYSTEM REQUIREMENTS FOR AMANDA?
---------------------------------------------
-
-Amanda requires a host that is mostly idle during the time backups are
-done, with a large capacity tape drive (e.g. an EXABYTE, DAT or DLT tape).
-This becomes the "tape server host".  All the computers you are going to dump
-are the "backup client hosts".  The server host can also be a client host.
-
-Amanda works best with one or more large "holding disk" partitions on the
-server host available to it for buffering dumps before writing to tape.
-The holding disk allows Amanda to run backups in parallel to the disk, only
-writing them to tape when the backup is finished.  Note that the holding
-disk is not required: without it Amanda will run backups sequentially to
-the tape drive.  Running it this way kills the great performance, but still
-allows you to take advantage of Amanda's other features.
-
-As a rule of thumb, for best performance the holding disk should be larger
-than the dump output from your largest disk partitions.  For example, if
-you are backing up some full gigabyte disks that compress down to 500 MB,
-then you'll want 500 MB on your holding disk.  On the other hand, if those
-gigabyte drives are partitioned into 500 MB filesystems, they'll probably
-compress down to 250 MB and you'll only need that much on your holding
-disk.  Amanda will perform better with larger holding disks.
-
-Actually, Amanda will still work if you have full dumps that are larger
-than the holding disk: Amanda will send those dumps directly to tape one at
-a time.  If you have many such dumps you will be limited by the dump speed
-of those machines.
-
-Amanda does not yet support single backup images larger than a tape.
-
-
-WHAT SYSTEMS DOES AMANDA RUN ON?
---------------------------------
-
-Amanda should run on any modern Unix system that supports dump or GNU
-tar, has sockets and inetd, and either system V shared memory, or BSD
-mmap implemented.
-
-In particular, Amanda 2.4.1p1 has been compiled, and the client side tested
-on the following systems:
-	AIX 3.2 and 4.1
-	BSDI BSD/OS 2.1 and 3.1
-	DEC OSF/1 3.2 and 4.0
-	FreeBSD 2.2.5
-	IRIX 5.2 and 6.3
-	GNU/Linux on x86, alpha, sparc, arm and powerpc
-	NetBSD 1.0
-	Nextstep 3 (*)
-	OpenBSD 2.5 x86, sparc, etc (ports available)
-	SunOS 4.1.x (x >= 1) and 5.[567]
-	Ultrix 4.2
-	HP-UX 9.x and 10.x (x >= 01)
-
-The Amanda 2.4.1p1 server side is known to run on all of the other
-machines except on those marked with an asterisk.
-
-If you know of any system that is not listed here on which amanda
-builds successfully, either client&server or client-only, please
-report to amanda-hackers@amanda.org.
-
-
-WHERE DO I GET AMANDA?
-----------------------
-
-There are several versions of Amanda.  The latest version at the time
-of this writing is available at:
-
-	ftp://ftp.amanda.org/pub/amanda
-
-
-HOW DO I GET AMANDA UP AND RUNNING?
------------------------------------
-
-Read the file docs/INSTALL.  There are a variety of steps, from compiling
-Amanda to installing it on the tape server host and the client machines.
-    docs/INSTALL	contains general installation instructions.
-    docs/SYSTEM.NOTES	contains system-specific information.
-    docs/FAQ            contains answers to frequently asked questions.
-    docs/KERBEROS	explains installation under Kerberos 4.
-    docs/TAPE.CHANGERS	explains how to customize the changer interface.
-    docs/WHATS.NEW	details new features.
-
-
-WHO DO I TALK TO IF I HAVE A PROBLEM?
--------------------------------------
-
-Amanda is completely unsupported and made available as-is.  However,
-you may be able to get useful information in the Amanda mailing lists:
-
-==> To join a mailing list, DO NOT, EVER, send mail to that list.  Send
-    mail to <listname>-request@amanda.org, or amanda-lists@amanda.org,
-    with the following line in the body of the message:
-	subscribe <listname> <your-email-address>
-
-
-    amanda-announce
-        The amanda-announce mailing list is for important announcements
-        related to the Amanda Network Backup Manager package, including new
-        versions, contributions, and fixes.  NOTE: the amanda-users list is
-        itself on the amanda-announce distribution, so you only need to
-        subscribe to one of the two lists, not both.
-	To subscribe, send a message to amanda-announce-request@amanda.org.
-
-    amanda-users
-        The amanda-users mailing list is for questions and general discussion
-        about the Amanda Network Backup Manager.  This package and related
-        files are available via anonymous FTP from ftp.amanda.org in the
-        pub/amanda directory.  NOTE: the amanda-users list is itself on the
-        amanda-announce distribution, so you only need to subscribe to one of
-        the two lists, not both.
-	To subscribe, send a message to amanda-users-request@amanda.org.
-
-    amanda-hackers
-        The amanda-hackers mailing list is for discussion of the
-        technical details of the Amanda package, including extensions,
-        ports, bugs, fixes, and alpha testing of new versions.
-	To subscribe, send a message to amanda-hackers-request@amanda.org.
-
-
-Share and Enjoy,
-The Amanda Development Team
+Network Disk Archiver.  Amanda is a backup system designed to
+archive many computers on a network to a single large-capacity
+tape drive. 
diff --git a/sysutils/amanda-plot/Makefile b/sysutils/amanda-plot/Makefile
index 14df1abd9b7..7fe1bf179c1 100644
--- a/sysutils/amanda-plot/Makefile
+++ b/sysutils/amanda-plot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/10/05 17:51:05 seb Exp $
+# $NetBSD: Makefile,v 1.18 2004/11/12 12:13:45 mjl Exp $
 #
 
 PKGNAME=		amanda-plot-${VERS}
@@ -7,7 +7,7 @@ SVR4_PKGNAME=		amapl
 COMMENT=		Visualizes the behavior of Amanda, a network backup system
 
 DEPENDS+=		gnuplot>=3.7:../../graphics/gnuplot
-DEPENDS+=		amanda-server-2.4.4p2{,nb[0-9]*}:../../sysutils/amanda-server
+DEPENDS+=		amanda-server-2.4.4p4{,nb[0-9]*}:../../sysutils/amanda-server
 
 USE_BUILDLINK3=		yes
 
diff --git a/sysutils/amanda-plot/distinfo b/sysutils/amanda-plot/distinfo
index 0c2157f2e94..a554c65a4be 100644
--- a/sysutils/amanda-plot/distinfo
+++ b/sysutils/amanda-plot/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2004/05/15 12:15:22 bouyer Exp $
+$NetBSD: distinfo,v 1.7 2004/11/12 12:13:45 mjl Exp $
 
-SHA1 (amanda-2.4.4p2.tar.gz) = c14510260941a3915f4068e6b7e3f91698ab099e
-Size (amanda-2.4.4p2.tar.gz) = 1263075 bytes
+SHA1 (amanda-2.4.4p4.tar.gz) = e44b40ea0f8e51336716ab455b27c69f4616d7f6
+Size (amanda-2.4.4p4.tar.gz) = 1422735 bytes
 SHA1 (patch-aa) = 207efbc13033b10309d4194db7e180f50a53a76d
-SHA1 (patch-ab) = daa1d60888ec3e78eb4a88a4979f0a563e1a49f3
-SHA1 (patch-ac) = 44663863416fc81be5311c027482c494903a90b9
+SHA1 (patch-ab) = 9380ccd35cf3126e581ac72f34ad87d554395188
+SHA1 (patch-ac) = 04e2d7a595ee87b4c066f4fbef06f26799df71ce
diff --git a/sysutils/amanda-plot/patches/patch-ab b/sysutils/amanda-plot/patches/patch-ab
index 450fdc14e2e..5e2411bca16 100644
--- a/sysutils/amanda-plot/patches/patch-ab
+++ b/sysutils/amanda-plot/patches/patch-ab
@@ -1,8 +1,18 @@
-$NetBSD: patch-ab,v 1.6 2004/05/15 12:15:22 bouyer Exp $
+$NetBSD: patch-ab,v 1.7 2004/11/12 12:13:45 mjl Exp $
 
---- Makefile.in.orig	2004-01-08 19:21:29.000000000 +0100
-+++ Makefile.in	2004-05-15 14:05:39.000000000 +0200
-@@ -168,20 +168,14 @@
+--- Makefile.in.orig	2004-10-22 15:12:38.000000000 +0200
++++ Makefile.in	2004-11-08 01:36:50.000000000 +0100
+@@ -62,8 +62,7 @@
+ DATA = $(pkgdata_DATA)
+ ETAGS = etags
+ CTAGS = ctags
+-DIST_SUBDIRS = config common-src client-src tape-src server-src \
+-	changer-src restore-src recover-src amplot man docs example
++DIST_SUBDIRS = config amplot man
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ distdir = $(PACKAGE)-$(VERSION)
+ top_distdir = $(distdir)
+@@ -277,19 +276,13 @@
  # order is significant, don't change it arbitrarily
  SUBDIRS = \
  	config \
@@ -16,26 +26,15 @@ $NetBSD: patch-ab,v 1.6 2004/05/15 12:15:22 bouyer Exp $
 -	man docs example
 +	man
  
- 
 -pkgdata_DATA = \
 -	COPYRIGHT			\
 -	COPYRIGHT-APACHE		\
 -	COPYRIGHT-REGEX
 +pkgdata_DATA =
  
- 
  EXTRA_DIST = $(SNAPSHOT_STAMP) \
-@@ -243,8 +237,7 @@
- 	uninstall-recursive check-recursive installcheck-recursive
- DIST_COMMON = README AUTHORS ChangeLog INSTALL Makefile.am Makefile.in \
- 	NEWS acinclude.m4 aclocal.m4 configure configure.in
--DIST_SUBDIRS = config common-src client-src tape-src server-src \
--	changer-src restore-src recover-src amplot man docs example
-+DIST_SUBDIRS = config amplot man
- all: all-recursive
- 
- .SUFFIXES:
-@@ -506,7 +499,7 @@
+ 	$(pkgdata_DATA)			\
+@@ -676,7 +669,7 @@
  uninstall: uninstall-recursive
  
  install-am: all-am
diff --git a/sysutils/amanda-plot/patches/patch-ac b/sysutils/amanda-plot/patches/patch-ac
index 9a202fc1088..48301b00d68 100644
--- a/sysutils/amanda-plot/patches/patch-ac
+++ b/sysutils/amanda-plot/patches/patch-ac
@@ -1,17 +1,17 @@
-$NetBSD: patch-ac,v 1.6 2004/05/15 12:15:22 bouyer Exp $
+$NetBSD: patch-ac,v 1.7 2004/11/12 12:13:45 mjl Exp $
 
---- man/Makefile.in.orig	2004-05-15 14:07:19.000000000 +0200
-+++ man/Makefile.in	2004-05-15 14:07:34.000000000 +0200
-@@ -188,11 +188,7 @@
+--- man/Makefile.in.orig	2004-10-22 15:12:40.000000000 +0200
++++ man/Makefile.in	2004-11-08 01:38:11.000000000 +0100
+@@ -280,11 +280,7 @@
+ 
  # not autoconf-generated:
  EXTRA_DIST = amplot.8 amrestore.8 amtape.8 amdd.8 ammt.8
- 
 -man_MANS = $(AMPLOT_MAN_PAGES) \
 -	   $(COMMON_MAN_PAGES) \
 -	   $(SERVER_MAN_PAGES) \
 -	   $(RECOVER_MAN_PAGES) \
 -	   $(RESTORE_MAN_PAGES)
-+man_MANS = $(AMPLOT_MAN_PAGES) 
++man_MANS = $(AMPLOT_MAN_PAGES)
+ 
+ all: all-am
  
- subdir = man
- mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs