Update to 2.5.2p1, provided by Nick Goffee of BBN.

[bugfixes and minor improvements omitted; see NEWS]

Changes in release 2.5.2

   * krb5 auth is working
   * Works with IPv6 address
   * Amanda configuration file changes
         o amanda.conf changes
               + debugging is enabled in the config file
                 see all debug_* config option
               + tapetype 'readblocksize', if maxtapeblocksize is set too
                 larger for your hardware
   * Amanda command changes
         o amadmin: new 'holding list' and 'holding delete' subcommand.

Changes in release 2.5.1p3

   * Works with tar-1.16 and exit status of 1.

Changes in release 2.5.1p2

   * amoverview is working
   * dumptype starttime is working

   * Amanda command changes
         o amtape accept the -o arguments
         o amgetconf --list to list all tapetype, dumptype, holdingdisk
           or interface
         o amgetconf can return a value of a specific tapetype, dumptype,
           holdingdisk or interface

Changes in release 2.5.1p1

   * Remove contrib/sst.

Changes in release 2.5.1

   * Defects found by Coverity scan and Klocwork K7 analysis tools fixed.
   * Works with GNU tar 1.15.91 - work with new gtar state file format.
   * Open SSL encryption support
   * Two new authentication methods: bsdtcp, bsdudp.
   * Unlimited number of DLEs on a client with bsdtcp, rsh and ssh
     authentication methods.
   * Recovery process amrecover uses Secure API. amoldrecover command
     (same syntax and functionality as amrecover command) is provided for
     compatibility with old Amanda releases. amoldrecover command uses old
     amidxtaped/amindexd protocol.
   * Amanda debug files are separated into client/server/amandad and
     are also classified based on Amanda configuration name.

   * Amanda command changes
         o amfetchdump -o is replaced by -O.
         o amcheck -w option does all tests including the tape writable test.
           Use amcheck -t -w to do only the tape writable test.
         o -o command option to override Amanda configuration. See amanda man
           page for details.
         o amgetconf command doesn't write the BUGGY message when a entry
           is not found in the configuration file.

   * Amanda configuration file changes
         o amanda.conf changes
               + amrecover_do_fsf in amanda.conf defaults to yes
               + amrecover_check_label in amanda.conf defaults to yes
               + usetimestamps in amanda.conf to support multiple
                 backup runs in a calendar day.
               + holdingdisk in amanda.conf supports new values:
                 NEVER, AUTO, REQUIRED.
               + amandad_path, client_username and ssh_keys in
                 amanda.conf for ssh/rsh authentication.
         o New amanda client configuration file - amanda-client.conf.
           Different client configuration file can be used for each Amanda
           configuration.
               + gnutar_list-dir and amandates can be specified in
                 Amanda client configuration file - amanda-client.conf
         o .amandahosts format changes to allow use of secure API for recovery.
         o Amanda service entries in xinetd configuration has changed.

Changes in release 2.5.0p1

* Add the 'amtape update' command.

Changes in release 2.5.0

* Communication security/authentication: Kerberos 4/5, OpenSSH
* Data security: Symmetric/Assymetric encrytion algorithms (aesutil
  and gpg encryption),  Encryption can be done on server or client,
  Custom encryption utilities can be used.
* Compression: Ability to add custom compression tools. This is a
  really useful feature especially since it can specified for a DLE.  You
  can use different compression algorithm for images, binaries, ascii files
  and so on.
* Dump images spanning multiple media volumes - Dump images are no
  longer restricted to a single media volume (tape or vtape).  Data restoration
  can be done using amrecover and amfetchdump commands.
* Auto tape labelling - This optional feature is good for disk backups.

Change in release 2.4.5

* new displayunit global option to select the unit use to display number
  k=kilo, m=mega, g=giga, t=tera.
* new amoverview -skipmissed option.

Change in release 2.4.5b1

* holding disk disk use timestamped directory.
* autoflush flush today's dump.
* new bumppercent global option, this should improve bumping criteria,
  the bumpsize is set to a fixed value which can be adequate for small
  and large disk.
* bumpsize, bumppercent, bumpdays and bumpmult can be in a dumptype.
* calcsize support include and exclude like gnutar.
* new 'estimate' dumptype option to select estimate type:
    CLIENT: estimate by the dumping program.
    CALCSIZE: estimate by the calcsize program, a lot faster but less acurate.
    SERVER: estimate based on statistic from previous run, take second but
            can be wrong on the estimate size.

5 files changed, 70 insertions, 47 deletions

diff --git a/sysutils/amanda-plot/Makefile b/sysutils/amanda-plot/Makefile
index 46ac6fb4d92..80d84615a4b 100644
--- a/sysutils/amanda-plot/Makefile
+++ b/sysutils/amanda-plot/Makefile
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.23 2007/11/08 19:39:42 joerg Exp $
+# $NetBSD: Makefile,v 1.24 2008/02/15 16:23:09 gdt Exp $
 #
 
 PKGNAME=		amanda-plot-${VERS}
-PKGREVISION=		4
 SVR4_PKGNAME=		amapl
 
 COMMENT=		Visualizes the behavior of Amanda, a network backup system
 
 DEPENDS+=		gnuplot>=3.7:../../graphics/gnuplot
-DEPENDS+=		amanda-server-2.4.4p4{,nb[0-9]*}:../../sysutils/amanda-server
+DEPENDS+=		amanda-server-2.5.2p1{,nb[0-9]*}:../../sysutils/amanda-server
 
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/sysutils/amanda-plot/distinfo b/sysutils/amanda-plot/distinfo
index 462e2d93bf5..0225bcb09b6 100644
--- a/sysutils/amanda-plot/distinfo
+++ b/sysutils/amanda-plot/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.8 2005/02/24 13:40:50 agc Exp $
+$NetBSD: distinfo,v 1.9 2008/02/15 16:23:09 gdt Exp $
 
-SHA1 (amanda-2.4.4p4.tar.gz) = e44b40ea0f8e51336716ab455b27c69f4616d7f6
-RMD160 (amanda-2.4.4p4.tar.gz) = d145a5ebb0df340af6aee0e8a15da6b54dfb3051
-Size (amanda-2.4.4p4.tar.gz) = 1422735 bytes
-SHA1 (patch-aa) = 207efbc13033b10309d4194db7e180f50a53a76d
-SHA1 (patch-ab) = 9380ccd35cf3126e581ac72f34ad87d554395188
-SHA1 (patch-ac) = 04e2d7a595ee87b4c066f4fbef06f26799df71ce
+SHA1 (amanda-2.5.2p1.tar.gz) = 0969376590a93b2c060dbe9d2573bf335614a4c2
+RMD160 (amanda-2.5.2p1.tar.gz) = 31a81a7c5c0d953a6dffa575a7c3edc14d41f236
+Size (amanda-2.5.2p1.tar.gz) = 1967240 bytes
+SHA1 (patch-aa) = 7b041da3d60634c0741cb19a2ea296dfcdb88601
+SHA1 (patch-ab) = 33c7b2c3dbc21bd1fcfa490b0e9bb9fccaedb70c
+SHA1 (patch-ac) = 066c93eeaba931cb04040f3f6859ffc7b9c81f29
diff --git a/sysutils/amanda-plot/patches/patch-aa b/sysutils/amanda-plot/patches/patch-aa
index 6567f557c44..b0fb4e99cec 100644
--- a/sysutils/amanda-plot/patches/patch-aa
+++ b/sysutils/amanda-plot/patches/patch-aa
@@ -1,8 +1,20 @@
-$NetBSD: patch-aa,v 1.3 2004/05/15 12:15:22 bouyer Exp $
+$NetBSD: patch-aa,v 1.4 2008/02/15 16:23:09 gdt Exp $
 
---- configure.orig	2004-01-08 19:21:36.000000000 +0100
-+++ configure	2004-05-15 13:46:46.000000000 +0200
-@@ -11399,8 +11399,10 @@
+--- configure.orig	2008-02-08 16:34:38.000000000 -0500
++++ configure
+@@ -13538,7 +13538,10 @@ echo $ECHO_N "checking SSH options... $E
+     # now convert that to a comma-separated list of C strings
+     eval "set dummy ${SSH_OPTIONS}"; shift
+     SSH_OPTIONS=''
+-    for i in "${@}"; do SSH_OPTIONS="${SSH_OPTIONS}${SSH_OPTIONS:+, }\"${i/\"/\\\"}\""; done
++    for i in "${@}"; do
++	quoted="\"`echo "$i" | sed -e 's/\"/\\\"/'`\""
++	SSH_OPTIONS="${SSH_OPTIONS}${SSH_OPTIONS:+, }$quoted";
++     done
+     echo "$as_me:$LINENO: result: $SSH_OPTIONS" >&5
+ echo "${ECHO_T}$SSH_OPTIONS" >&6
+ 
+@@ -38647,8 +38650,10 @@ fi
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
  
@@ -13,3 +25,12 @@ $NetBSD: patch-aa,v 1.3 2004/05/15 12:15:22 bouyer Exp $
  
  # Prevent multiple expansion
  
+@@ -62491,7 +62496,7 @@ fi;
+ # Check whether --with-xsltproc-flags or --without-xsltproc-flags was given.
+ if test "${with_xsltproc_flags+set}" = set; then
+   withval="$with_xsltproc_flags"
+-   if test "x$withval" == "xno"; then
++   if test "x$withval" = "xno"; then
+ 	XSLTPROC_FLAGS=''
+     else
+ 	if test "x$withval" != "xyes"; then
diff --git a/sysutils/amanda-plot/patches/patch-ab b/sysutils/amanda-plot/patches/patch-ab
index 5e2411bca16..0761fd40dc4 100644
--- a/sysutils/amanda-plot/patches/patch-ab
+++ b/sysutils/amanda-plot/patches/patch-ab
@@ -1,24 +1,17 @@
-$NetBSD: patch-ab,v 1.7 2004/11/12 12:13:45 mjl Exp $
+$NetBSD: patch-ab,v 1.8 2008/02/15 16:23:09 gdt Exp $
 
---- 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 @@
+--- Makefile.in.orig	2007-06-06 19:22:51.000000000 -0400
++++ Makefile.in
+@@ -380,21 +380,14 @@ ACINCLUDE_M4_DEPS = $(GNULIB_M4I) $(ACIN
+ @WANT_AMPLOT_TRUE@PLOT_SUBDIRS = amplot
  # order is significant, don't change it arbitrarily
  SUBDIRS = \
+-	gnulib \
  	config \
 -	common-src \
- 	$(CLIENT_SUBDIRS) \
+-	amandad-src \
 -	$(TAPE_SUBDIRS) \
+ 	$(CLIENT_SUBDIRS) \
 -	$(SERVER_SUBDIRS) \
  	$(RESTORE_SUBDIRS) \
  	$(RECOVER_SUBDIRS) \
@@ -27,14 +20,13 @@ $NetBSD: patch-ab,v 1.7 2004/11/12 12:13:45 mjl Exp $
 +	man
  
 -pkgdata_DATA = \
--	COPYRIGHT			\
--	COPYRIGHT-APACHE		\
--	COPYRIGHT-REGEX
+-	ReleaseNotes			\
+-	COPYRIGHT
 +pkgdata_DATA =
  
  EXTRA_DIST = $(SNAPSHOT_STAMP) \
  	$(pkgdata_DATA)			\
-@@ -676,7 +669,7 @@
+@@ -775,7 +768,7 @@ install-data: install-data-recursive
  uninstall: uninstall-recursive
  
  install-am: all-am
diff --git a/sysutils/amanda-plot/patches/patch-ac b/sysutils/amanda-plot/patches/patch-ac
index 48301b00d68..d96a6e6d482 100644
--- a/sysutils/amanda-plot/patches/patch-ac
+++ b/sysutils/amanda-plot/patches/patch-ac
@@ -1,17 +1,28 @@
-$NetBSD: patch-ac,v 1.7 2004/11/12 12:13:45 mjl Exp $
+$NetBSD: patch-ac,v 1.8 2008/02/15 16:23:09 gdt Exp $
 
---- 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 @@
+--- man/Makefile.in.orig	2007-06-06 19:22:52.000000000 -0400
++++ man/Makefile.in
+@@ -373,19 +373,10 @@ SERVER_MAN8_PAGES = amadmin.8 \
+ #endif
+ @WANT_RECOVER_TRUE@RECOVER_MAN8_PAGES = amrecover.8
+ @WANT_RESTORE_TRUE@RESTORE_MAN8_PAGES = amrestore.8
+-man8_pages = $(COMMON_MAN8_PAGES) \
+-	    $(AMPLOT_MAN8_PAGES) \
+-	    $(SERVER_MAN8_PAGES) \
+-	    $(RECOVER_MAN8_PAGES) \
+-	    $(RESTORE_MAN8_PAGES)
+-
+-man5_pages = $(COMMON_MAN5_PAGES)
+-ALL_MAN_PAGES = $(AMPLOT_MAN8_PAGES) \
+-	   $(COMMON_MAN5_PAGES) \
+-	   $(COMMON_MAN8_PAGES) \
+-	   $(SERVER_MAN8_PAGES) \
+-	   $(RECOVER_MAN8_PAGES) \
+-	   $(RESTORE_MAN8_PAGES)
++man8_pages = $(AMPLOT_MAN8_PAGES)
++
++man5_pages =
++ALL_MAN_PAGES = $(AMPLOT_MAN8_PAGES)
  
- # 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)
- 
- all: all-am
  
+ # These lines are needed to force automake to set the $man<n>dir variables.