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.

9 files changed, 59 insertions, 102 deletions

diff --git a/sysutils/amanda-common/DESCR b/sysutils/amanda-common/DESCR
index 3b05399fba2..5ead5bbac60 100644
--- a/sysutils/amanda-common/DESCR
+++ b/sysutils/amanda-common/DESCR
@@ -1,38 +1,4 @@
-This is 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.
+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. 
diff --git a/sysutils/amanda-common/Makefile b/sysutils/amanda-common/Makefile
index e4c85c6db7a..25f3fc15304 100644
--- a/sysutils/amanda-common/Makefile
+++ b/sysutils/amanda-common/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.30 2004/10/03 00:18:14 tv Exp $
+# $NetBSD: Makefile,v 1.31 2004/11/12 12:13:44 mjl Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp
 #
 
 PKGNAME=		amanda-common-${VERS}
-PKGREVISION=		1
+# PKGREVISION=		1
 SVR4_PKGNAME=		amaco
 
 COMMENT=		Common libraries and binaries for Amanda
diff --git a/sysutils/amanda-common/Makefile.common b/sysutils/amanda-common/Makefile.common
index 52111c31b51..93b045ad5db 100644
--- a/sysutils/amanda-common/Makefile.common
+++ b/sysutils/amanda-common/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.12 2004/05/12 18:45:25 bouyer Exp $
+# $NetBSD: Makefile.common,v 1.13 2004/11/12 12:13:44 mjl Exp $
 #
 # common make file fragment shared by all amanda-* pkgs.
 #
 
-VERS=                   2.4.4p2
+VERS=                   2.4.4p4
 DISTNAME?=              amanda-${VERS}
 CATEGORIES=             sysutils
 MASTER_SITES?=          http://download.sourceforge.net/amanda/
diff --git a/sysutils/amanda-common/buildlink3.mk b/sysutils/amanda-common/buildlink3.mk
index 67d64a46518..9f61dab898e 100644
--- a/sysutils/amanda-common/buildlink3.mk
+++ b/sysutils/amanda-common/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:18:14 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/11/12 12:13:45 mjl Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 AMANDA_COMMON_BUILDLINK3_MK:=	${AMANDA_COMMON_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Namanda-common}
 BUILDLINK_PACKAGES+=	amanda-common
 
 .if !empty(AMANDA_COMMON_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.amanda-common+=	amanda-common>=2.4.4p2
-BUILDLINK_RECOMMENDED.amanda-common+=	amanda-common>=2.4.4p2nb1
+BUILDLINK_DEPENDS.amanda-common+=	amanda-common>=2.4.4p4
+BUILDLINK_RECOMMENDED.amanda-common+=	amanda-common>=2.4.4p4
 BUILDLINK_PKGSRCDIR.amanda-common?=	../../sysutils/amanda-common
 .endif	# AMANDA_COMMON_BUILDLINK3_MK
 
diff --git a/sysutils/amanda-common/distinfo b/sysutils/amanda-common/distinfo
index e69858a51c3..6dd521ff913 100644
--- a/sysutils/amanda-common/distinfo
+++ b/sysutils/amanda-common/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.5 2004/07/09 12:21:26 salo Exp $
+$NetBSD: distinfo,v 1.6 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 (patch-aa) = 6338b1e138ea34e2f9de27da3edf850c4923df5d
-SHA1 (patch-ab) = dae2eedc8672d7137cf528ca5e52462288a7241b
-SHA1 (patch-ac) = 2bd89830f652d74dc82d095affc7079060f7ce55
+SHA1 (amanda-2.4.4p4.tar.gz) = e44b40ea0f8e51336716ab455b27c69f4616d7f6
+Size (amanda-2.4.4p4.tar.gz) = 1422735 bytes
+SHA1 (patch-aa) = c03117e065da4fa3b7dce91c091d6cf044f884ea
+SHA1 (patch-ab) = 8a6233a38207d514e2671eac50e38996ee578530
+SHA1 (patch-ac) = 1c42e18ac4055fe7370acd5a00c126ab9d93f890
 SHA1 (patch-ad) = 510e650c9e9976323b1d27a7895cee6281b89dcd
-SHA1 (patch-ae) = 0aaaf8752727ace218668ab0cb14abad6f2e17ca
+SHA1 (patch-ae) = bcf887d6e1722cf27538cf9d1d190b5c749f587f
diff --git a/sysutils/amanda-common/patches/patch-aa b/sysutils/amanda-common/patches/patch-aa
index c9090ae94ef..7161a5c9ac0 100644
--- a/sysutils/amanda-common/patches/patch-aa
+++ b/sysutils/amanda-common/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.7 2004/05/12 18:45:25 bouyer Exp $
+$NetBSD: patch-aa,v 1.8 2004/11/12 12:13:45 mjl Exp $
 
---- client-src/Makefile.in.orig	2004-01-08 10:22:34.000000000 -0800
-+++ client-src/Makefile.in	2004-02-23 16:26:20.000000000 -0800
-@@ -307,10 +307,8 @@
- sendsize_LDFLAGS =
+--- client-src/Makefile.in.orig	2004-10-22 15:12:39.000000000 +0200
++++ client-src/Makefile.in	2004-11-07 13:17:17.000000000 +0100
+@@ -134,10 +134,8 @@
+ 	../common-src/libamanda.$(LIB_EXTENSION)
  versionsuffix_SOURCES = versionsuffix.c
  versionsuffix_OBJECTS = versionsuffix.$(OBJEXT)
 -versionsuffix_LDADD = $(LDADD)
@@ -12,6 +12,6 @@ $NetBSD: patch-aa,v 1.7 2004/05/12 18:45:25 bouyer Exp $
 -	../common-src/libamanda.$(LIB_EXTENSION)
 +versionsuffix_LDADD = ../common-src/libamanda.$(LIB_EXTENSION)
 +versionsuffix_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION)
- versionsuffix_LDFLAGS =
+ libexecSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+ sbinSCRIPT_INSTALL = $(INSTALL_SCRIPT)
  SCRIPTS = $(libexec_SCRIPTS) $(sbin_SCRIPTS)
- 
diff --git a/sysutils/amanda-common/patches/patch-ab b/sysutils/amanda-common/patches/patch-ab
index c91b5def0b3..c59e9e85dda 100644
--- a/sysutils/amanda-common/patches/patch-ab
+++ b/sysutils/amanda-common/patches/patch-ab
@@ -1,19 +1,19 @@
-$NetBSD: patch-ab,v 1.6 2004/05/12 18:45:25 bouyer Exp $
+$NetBSD: patch-ab,v 1.7 2004/11/12 12:13:45 mjl Exp $
 
---- Makefile.in.orig	2004-01-08 10:21:29.000000000 -0800
-+++ Makefile.in	2004-02-23 16:30:27.000000000 -0800
-@@ -33,7 +33,7 @@
- mandir = @mandir@
- includedir = @includedir@
- oldincludedir = /usr/include
+--- Makefile.in.orig	2004-10-22 15:12:38.000000000 +0200
++++ Makefile.in	2004-11-07 13:23:31.000000000 +0100
+@@ -17,7 +17,7 @@
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
 -pkgdatadir = $(datadir)/@PACKAGE@
 +pkgdatadir = $(datadir)/doc/@PACKAGE@
  pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
  top_builddir = .
-@@ -160,11 +160,11 @@
+@@ -269,11 +269,11 @@
+ LIBTOOL_M4I = $(srcdir)/config/libtool.m4i
  ACINCLUDE_M4_DEPS = $(ACINCLUDE_M4I) $(LIBTOOL_M4I)
- 
  @WANT_CLIENT_TRUE@CLIENT_SUBDIRS = client-src
 -@WANT_TAPE_TRUE@TAPE_SUBDIRS = tape-src
 +TAPE_SUBDIRS = tape-src
@@ -21,16 +21,16 @@ $NetBSD: patch-ab,v 1.6 2004/05/12 18:45:25 bouyer Exp $
  @WANT_RESTORE_TRUE@RESTORE_SUBDIRS = restore-src
  @WANT_RECOVER_TRUE@RECOVER_SUBDIRS = recover-src
 -@WANT_AMPLOT_TRUE@PLOT_SUBDIRS = amplot
-+#PLOT_SUBDIRS = amplot
++# PLOT_SUBDIRS = amplot
  # order is significant, don't change it arbitrarily
  SUBDIRS = \
  	config \
-@@ -175,7 +175,7 @@
+@@ -284,7 +284,7 @@
  	$(RESTORE_SUBDIRS) \
  	$(RECOVER_SUBDIRS) \
  	$(PLOT_SUBDIRS) \
 -	man docs example
 +	man
  
- 
  pkgdata_DATA = \
+ 	COPYRIGHT			\
diff --git a/sysutils/amanda-common/patches/patch-ac b/sysutils/amanda-common/patches/patch-ac
index a11dad566f7..4375e1485b0 100644
--- a/sysutils/amanda-common/patches/patch-ac
+++ b/sysutils/amanda-common/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.7 2004/07/09 12:21:26 salo Exp $
+$NetBSD: patch-ac,v 1.8 2004/11/12 12:13:45 mjl Exp $
 
---- man/Makefile.in.orig	Thu Jan  8 19:23:42 2004
-+++ man/Makefile.in	Fri Jul  9 14:17:32 2004
-@@ -156,7 +156,7 @@
- am__quote = @am__quote@
- install_sh = @install_sh@
- 
+--- man/Makefile.in.orig	2004-10-22 15:12:40.000000000 +0200
++++ man/Makefile.in	2004-11-07 13:25:11.000000000 +0100
+@@ -253,7 +253,7 @@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
 -@WANT_AMPLOT_TRUE@AMPLOT_MAN_PAGES = amplot.8
-+#AMPLOT_MAN_PAGES = amplot.8
- 
++# AMPLOT_MAN_PAGES = amplot.8
  COMMON_MAN_PAGES = amanda.8
- 
+ @WANT_SERVER_TRUE@SERVER_MAN_PAGES = amadmin.8 \
+ @WANT_SERVER_TRUE@		   amcheck.8 \
diff --git a/sysutils/amanda-common/patches/patch-ae b/sysutils/amanda-common/patches/patch-ae
index 2eca1b57ca2..36953c18515 100644
--- a/sysutils/amanda-common/patches/patch-ae
+++ b/sysutils/amanda-common/patches/patch-ae
@@ -1,26 +1,17 @@
-$NetBSD: patch-ae,v 1.4 2004/05/28 09:20:37 bouyer Exp $
+$NetBSD: patch-ae,v 1.5 2004/11/12 12:13:45 mjl Exp $
 
---- tape-src/Makefile.in.orig	2004-01-08 19:22:46.000000000 +0100
-+++ tape-src/Makefile.in	2004-05-12 14:35:59.000000000 +0200
-@@ -160,7 +160,7 @@
- lib_LTLIBRARIES = libamtape.la
- LIB_EXTENSION = la
- 
--sbin_PROGRAMS = ammt amdd amtapetype
-+sbin_PROGRAMS = 
- 
- libamtape_la_SOURCES = output-file.c \
- 			output-null.c \
-@@ -217,7 +217,7 @@
- 	output-tape.lo tapeio.lo
- libamtape_la_OBJECTS = $(am_libamtape_la_OBJECTS)
- EXTRA_PROGRAMS = amtapeio$(EXEEXT)
+--- tape-src/Makefile.in.orig	2004-10-22 15:12:42.000000000 +0200
++++ tape-src/Makefile.in	2004-11-07 13:26:54.000000000 +0100
+@@ -41,7 +41,7 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
 -sbin_PROGRAMS = ammt$(EXEEXT) amdd$(EXEEXT) amtapetype$(EXEEXT)
-+sbin_PROGRAMS = 
- PROGRAMS = $(sbin_PROGRAMS)
- 
- amdd_SOURCES = amdd.c
-@@ -519,7 +519,7 @@
++sbin_PROGRAMS =
+ EXTRA_PROGRAMS = $(am__EXEEXT_1)
+ subdir = tape-src
+ DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+@@ -622,7 +622,7 @@
  
  install-data-am: