diff options
author | mjl <mjl> | 2004-11-12 12:13:44 +0000 |
---|---|---|
committer | mjl <mjl> | 2004-11-12 12:13:44 +0000 |
commit | a9f98883438d8ae0d6d22262a91824979bf490e9 (patch) | |
tree | d1f225724e77f6dc963c4d3de1ea6f57cc98e737 /sysutils/amanda-client | |
parent | 19cbd89df1716b9fce556bd33dfe0f2c1693a250 (diff) | |
download | pkgsrc-a9f98883438d8ae0d6d22262a91824979bf490e9.tar.gz |
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.
Diffstat (limited to 'sysutils/amanda-client')
-rw-r--r-- | sysutils/amanda-client/DESCR | 182 | ||||
-rw-r--r-- | sysutils/amanda-client/Makefile | 4 | ||||
-rw-r--r-- | sysutils/amanda-client/distinfo | 14 | ||||
-rw-r--r-- | sysutils/amanda-client/patches/patch-aa | 13 | ||||
-rw-r--r-- | sysutils/amanda-client/patches/patch-ab | 10 | ||||
-rw-r--r-- | sysutils/amanda-client/patches/patch-ac | 44 | ||||
-rw-r--r-- | sysutils/amanda-client/patches/patch-ad | 32 |
7 files changed, 56 insertions, 243 deletions
diff --git a/sysutils/amanda-client/DESCR b/sysutils/amanda-client/DESCR index ae3624e07a0..5ead5bbac60 100644 --- a/sysutils/amanda-client/DESCR +++ b/sysutils/amanda-client/DESCR @@ -1,180 +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.0 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 - Linux/GNU on x86, alpha and sparc - NetBSD 1.0 - Nextstep 3 (*) - SunOS 4.1.x (x >= 1) and 5.[56] - Ultrix 4.2 - HP-UX 9.x and 10.x (x >= 01) - -The Amanda 2.4.0 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-client/Makefile b/sysutils/amanda-client/Makefile index ad644acb336..f3bb5d6f431 100644 --- a/sysutils/amanda-client/Makefile +++ b/sysutils/amanda-client/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.36 2004/10/05 15:51:00 seb Exp $ +# $NetBSD: Makefile,v 1.37 2004/11/12 12:13:44 mjl Exp $ # PKGNAME= amanda-client-${VERS} -PKGREVISION= 1 +# PKGREVISION= 1 SVR4_PKGNAME= amacl COMMENT= Client part of Amanda, a network backup system diff --git a/sysutils/amanda-client/distinfo b/sysutils/amanda-client/distinfo index 539e585294e..19a35ee5860 100644 --- a/sysutils/amanda-client/distinfo +++ b/sysutils/amanda-client/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.5 2004/05/12 18:45:25 bouyer Exp $ +$NetBSD: distinfo,v 1.6 2004/11/12 12:13:44 mjl Exp $ -SHA1 (amanda-2.4.4p2.tar.gz) = c14510260941a3915f4068e6b7e3f91698ab099e -Size (amanda-2.4.4p2.tar.gz) = 1263075 bytes -SHA1 (patch-aa) = afe34fae1d76f6adc7a48104a9a30fe12a4de925 -SHA1 (patch-ab) = 87c985ce2195c5305baa8b62f6fee26a07b99bd9 -SHA1 (patch-ac) = 90f21b449315f77f3933e0bf9b6fdd0f21320676 -SHA1 (patch-ad) = fa41e5ec65414bc0c68f51c0b892a374a16351e5 +SHA1 (amanda-2.4.4p4.tar.gz) = e44b40ea0f8e51336716ab455b27c69f4616d7f6 +Size (amanda-2.4.4p4.tar.gz) = 1422735 bytes +SHA1 (patch-aa) = 2a7dde94ea59ed017d3b05fc33fd98b840126cfb +SHA1 (patch-ab) = c37b50640d53619ef5ec07d6e63817b3070b7e66 +SHA1 (patch-ac) = e04871589a719e1b1502f8609cf6e04cc6f76428 +SHA1 (patch-ad) = b0ce806ccb513674b68ef1bf2e683d2191636717 diff --git a/sysutils/amanda-client/patches/patch-aa b/sysutils/amanda-client/patches/patch-aa index ccdc82ce35e..0eafb0c9125 100644 --- a/sysutils/amanda-client/patches/patch-aa +++ b/sysutils/amanda-client/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.5 2004/05/12 18:45:25 bouyer Exp $ +$NetBSD: patch-aa,v 1.6 2004/11/12 12:13:44 mjl Exp $ ---- Makefile.in.orig 2004-01-08 19:21:29.000000000 +0100 -+++ Makefile.in 2004-05-12 15:21:00.000000000 +0200 -@@ -168,20 +168,16 @@ +--- Makefile.in.orig 2004-10-22 15:12:38.000000000 +0200 ++++ Makefile.in 2004-11-08 00:35:11.000000000 +0100 +@@ -277,19 +277,15 @@ # order is significant, don't change it arbitrarily SUBDIRS = \ config \ @@ -16,16 +16,15 @@ $NetBSD: patch-aa,v 1.5 2004/05/12 18:45:25 bouyer Exp $ - man docs example + man - -pkgdata_DATA = \ - COPYRIGHT \ - COPYRIGHT-APACHE \ - COPYRIGHT-REGEX +pkgdata_DATA = - EXTRA_DIST = $(SNAPSHOT_STAMP) \ -@@ -506,7 +502,7 @@ + $(pkgdata_DATA) \ +@@ -676,7 +672,7 @@ uninstall: uninstall-recursive install-am: all-am diff --git a/sysutils/amanda-client/patches/patch-ab b/sysutils/amanda-client/patches/patch-ab index 0b4b7d5ba4b..27cec6a2659 100644 --- a/sysutils/amanda-client/patches/patch-ab +++ b/sysutils/amanda-client/patches/patch-ab @@ -1,11 +1,11 @@ -$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:44 mjl Exp $ ---- man/Makefile.in.orig 2004-01-08 10:23:42.000000000 -0800 -+++ man/Makefile.in 2004-02-23 10:00:21.000000000 -0800 -@@ -188,9 +188,7 @@ +--- man/Makefile.in.orig 2004-10-22 15:12:40.000000000 +0200 ++++ man/Makefile.in 2004-11-08 00:36:33.000000000 +0100 +@@ -280,9 +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) \ diff --git a/sysutils/amanda-client/patches/patch-ac b/sysutils/amanda-client/patches/patch-ac index cdf70b81f88..5ee3c27a123 100644 --- a/sysutils/amanda-client/patches/patch-ac +++ b/sysutils/amanda-client/patches/patch-ac @@ -1,19 +1,8 @@ -$NetBSD: patch-ac,v 1.6 2004/05/12 18:45:25 bouyer Exp $ +$NetBSD: patch-ac,v 1.7 2004/11/12 12:13:44 mjl Exp $ ---- client-src/Makefile.in.orig 2004-01-08 10:22:34.000000000 -0800 -+++ client-src/Makefile.in 2004-02-23 12:42:44.000000000 -0800 -@@ -184,9 +184,7 @@ - # need to list libamanda twice here, first to override the system library - # routines, and second to pick up any references in the other libraries. - ### --LDADD = ../common-src/libamanda.$(LIB_EXTENSION) \ -- libamclient.$(LIB_EXTENSION) \ -- ../common-src/libamanda.$(LIB_EXTENSION) -+LDADD = libamclient.$(LIB_EXTENSION) -lamanda - - - SUFFIXES = .sh .pl -@@ -237,80 +235,58 @@ +--- client-src/Makefile.in.orig 2004-10-22 15:12:39.000000000 +0200 ++++ client-src/Makefile.in 2004-11-08 00:42:06.000000000 +0100 +@@ -74,70 +74,48 @@ amandad_SOURCES = amandad.c amandad_OBJECTS = amandad.$(OBJEXT) amandad_LDADD = $(LDADD) @@ -21,7 +10,6 @@ $NetBSD: patch-ac,v 1.6 2004/05/12 18:45:25 bouyer Exp $ - libamclient.$(LIB_EXTENSION) \ - ../common-src/libamanda.$(LIB_EXTENSION) +amandad_DEPENDENCIES = libamclient.$(LIB_EXTENSION) - amandad_LDFLAGS = amqde_SOURCES = amqde.c amqde_OBJECTS = amqde.$(OBJEXT) amqde_LDADD = $(LDADD) @@ -29,7 +17,6 @@ $NetBSD: patch-ac,v 1.6 2004/05/12 18:45:25 bouyer Exp $ - libamclient.$(LIB_EXTENSION) \ - ../common-src/libamanda.$(LIB_EXTENSION) +amqde_DEPENDENCIES = libamclient.$(LIB_EXTENSION) - amqde_LDFLAGS = calcsize_SOURCES = calcsize.c calcsize_OBJECTS = calcsize.$(OBJEXT) calcsize_LDADD = $(LDADD) @@ -37,7 +24,6 @@ $NetBSD: patch-ac,v 1.6 2004/05/12 18:45:25 bouyer Exp $ - libamclient.$(LIB_EXTENSION) \ - ../common-src/libamanda.$(LIB_EXTENSION) +calcsize_DEPENDENCIES = libamclient.$(LIB_EXTENSION) - calcsize_LDFLAGS = am_getfsent_OBJECTS = getfsent.test.$(OBJEXT) getfsent_OBJECTS = $(am_getfsent_OBJECTS) getfsent_LDADD = $(LDADD) @@ -45,7 +31,6 @@ $NetBSD: patch-ac,v 1.6 2004/05/12 18:45:25 bouyer Exp $ - libamclient.$(LIB_EXTENSION) \ - ../common-src/libamanda.$(LIB_EXTENSION) +getfsent_DEPENDENCIES = libamclient.$(LIB_EXTENSION) - getfsent_LDFLAGS = killpgrp_SOURCES = killpgrp.c killpgrp_OBJECTS = killpgrp.$(OBJEXT) killpgrp_LDADD = $(LDADD) @@ -53,15 +38,13 @@ $NetBSD: patch-ac,v 1.6 2004/05/12 18:45:25 bouyer Exp $ - libamclient.$(LIB_EXTENSION) \ - ../common-src/libamanda.$(LIB_EXTENSION) +killpgrp_DEPENDENCIES = libamclient.$(LIB_EXTENSION) - killpgrp_LDFLAGS = rundump_SOURCES = rundump.c rundump_OBJECTS = rundump.$(OBJEXT) rundump_LDADD = $(LDADD) -rundump_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ - libamclient.$(LIB_EXTENSION) \ - ../common-src/libamanda.$(LIB_EXTENSION) -+rundump_DEPENDENCIES = libamclient.$(LIB_EXTENSION) - rundump_LDFLAGS = ++rundump_DEPENDENCIES = libamclient.$(LIB_EXTENSION) runtar_SOURCES = runtar.c runtar_OBJECTS = runtar.$(OBJEXT) runtar_LDADD = $(LDADD) @@ -69,7 +52,6 @@ $NetBSD: patch-ac,v 1.6 2004/05/12 18:45:25 bouyer Exp $ - libamclient.$(LIB_EXTENSION) \ - ../common-src/libamanda.$(LIB_EXTENSION) +runtar_DEPENDENCIES = libamclient.$(LIB_EXTENSION) - runtar_LDFLAGS = selfcheck_SOURCES = selfcheck.c selfcheck_OBJECTS = selfcheck.$(OBJEXT) selfcheck_LDADD = $(LDADD) @@ -77,7 +59,6 @@ $NetBSD: patch-ac,v 1.6 2004/05/12 18:45:25 bouyer Exp $ - libamclient.$(LIB_EXTENSION) \ - ../common-src/libamanda.$(LIB_EXTENSION) +selfcheck_DEPENDENCIES = libamclient.$(LIB_EXTENSION) - selfcheck_LDFLAGS = am_sendbackup_OBJECTS = sendbackup.$(OBJEXT) sendbackup-dump.$(OBJEXT) \ sendbackup-gnutar.$(OBJEXT) sendbackup_OBJECTS = $(am_sendbackup_OBJECTS) @@ -86,7 +67,6 @@ $NetBSD: patch-ac,v 1.6 2004/05/12 18:45:25 bouyer Exp $ - libamclient.$(LIB_EXTENSION) \ - ../common-src/libamanda.$(LIB_EXTENSION) +sendbackup_DEPENDENCIES = libamclient.$(LIB_EXTENSION) - sendbackup_LDFLAGS = sendsize_SOURCES = sendsize.c sendsize_OBJECTS = sendsize.$(OBJEXT) sendsize_LDADD = $(LDADD) @@ -94,7 +74,6 @@ $NetBSD: patch-ac,v 1.6 2004/05/12 18:45:25 bouyer Exp $ - libamclient.$(LIB_EXTENSION) \ - ../common-src/libamanda.$(LIB_EXTENSION) +sendsize_DEPENDENCIES = libamclient.$(LIB_EXTENSION) - sendsize_LDFLAGS = versionsuffix_SOURCES = versionsuffix.c versionsuffix_OBJECTS = versionsuffix.$(OBJEXT) versionsuffix_LDADD = $(LDADD) @@ -102,6 +81,17 @@ $NetBSD: patch-ac,v 1.6 2004/05/12 18:45:25 bouyer Exp $ - libamclient.$(LIB_EXTENSION) \ - ../common-src/libamanda.$(LIB_EXTENSION) +versionsuffix_DEPENDENCIES = libamclient.$(LIB_EXTENSION) - versionsuffix_LDFLAGS = + libexecSCRIPT_INSTALL = $(INSTALL_SCRIPT) + sbinSCRIPT_INSTALL = $(INSTALL_SCRIPT) SCRIPTS = $(libexec_SCRIPTS) $(sbin_SCRIPTS) +@@ -382,9 +360,7 @@ + # need to list libamanda twice here, first to override the system library + # routines, and second to pick up any references in the other libraries. + ### +-LDADD = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamclient.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++LDADD = libamclient.$(LIB_EXTENSION) -lamanda + + SUFFIXES = .sh .pl diff --git a/sysutils/amanda-client/patches/patch-ad b/sysutils/amanda-client/patches/patch-ad index 8cb19cd4512..64ac61a6f94 100644 --- a/sysutils/amanda-client/patches/patch-ad +++ b/sysutils/amanda-client/patches/patch-ad @@ -1,8 +1,19 @@ -$NetBSD: patch-ad,v 1.6 2004/05/12 18:45:25 bouyer Exp $ +$NetBSD: patch-ad,v 1.7 2004/11/12 12:13:44 mjl Exp $ ---- recover-src/Makefile.in.orig 2004-01-08 10:23:34.000000000 -0800 -+++ recover-src/Makefile.in 2004-02-23 12:49:20.000000000 -0800 -@@ -172,10 +172,9 @@ +--- recover-src/Makefile.in.orig 2004-10-22 15:12:41.000000000 +0200 ++++ recover-src/Makefile.in 2004-11-08 00:44:56.000000000 +0100 +@@ -61,9 +61,7 @@ + amrecover_OBJECTS = $(am_amrecover_OBJECTS) + amrecover_LDADD = $(LDADD) + am__DEPENDENCIES_1 = +-amrecover_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- ../client-src/libamclient.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) $(am__DEPENDENCIES_1) ++amrecover_DEPENDENCIES = ../client-src/libamclient.$(LIB_EXTENSION) + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/config + depcomp = $(SHELL) $(top_srcdir)/config/depcomp + am__depfiles_maybe = depfiles +@@ -291,10 +289,9 @@ # need to list libamanda twice here, first to override the system library # routines, and second to pick up any references in the other libraries. ### @@ -14,15 +25,4 @@ $NetBSD: patch-ad,v 1.6 2004/05/12 18:45:25 bouyer Exp $ + -lamanda \ $(READLINE_LIBS) - -@@ -200,9 +199,7 @@ - uparse.$(OBJEXT) uscan.$(OBJEXT) - amrecover_OBJECTS = $(am_amrecover_OBJECTS) - amrecover_LDADD = $(LDADD) --amrecover_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ -- ../client-src/libamclient.$(LIB_EXTENSION) \ -- ../common-src/libamanda.$(LIB_EXTENSION) -+amrecover_DEPENDENCIES = ../client-src/libamclient.$(LIB_EXTENSION) - amrecover_LDFLAGS = - - DEFS = @DEFS@ + amrecover_SOURCES = amrecover.c \ |