diff options
author | bouyer <bouyer@pkgsrc.org> | 2002-05-02 13:28:15 +0000 |
---|---|---|
committer | bouyer <bouyer@pkgsrc.org> | 2002-05-02 13:28:15 +0000 |
commit | 88b61a744d3fb73084e7f9c07d1353c0a7c0d2bd (patch) | |
tree | 071a073b8f5b02d8f0d0c2efb07bc7a48f710161 /sysutils | |
parent | 17b1f25969f0ec2147405b0f0ddefc4228950e7a (diff) | |
download | pkgsrc-88b61a744d3fb73084e7f9c07d1353c0a7c0d2bd.tar.gz |
Packages for amanda 2.4.3b3, a developement snapshot of the 2.4.3 branch.
Some interesting features in the server part over 2.4.2p2 (handling of
barcode readers, dumper priorities, ...)
Diffstat (limited to 'sysutils')
53 files changed, 2370 insertions, 0 deletions
diff --git a/sysutils/amanda-dev-client/DESCR b/sysutils/amanda-dev-client/DESCR new file mode 100644 index 00000000000..d0168e863ad --- /dev/null +++ b/sysutils/amanda-dev-client/DESCR @@ -0,0 +1,183 @@ +Please note that this is a package of a developement snapshot of the 2.4.3 +branch. + +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 diff --git a/sysutils/amanda-dev-client/Makefile b/sysutils/amanda-dev-client/Makefile new file mode 100644 index 00000000000..807a2fdd473 --- /dev/null +++ b/sysutils/amanda-dev-client/Makefile @@ -0,0 +1,36 @@ +# $NetBSD: Makefile,v 1.1.1.1 2002/05/02 13:28:15 bouyer Exp $ +# FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp +# + +PKGNAME= amanda-client-${VERS} +SVR4_PKGNAME= amacl + +COMMENT= Client part of Amanda, a network backup system + +DEPENDS+= gtar-1.12:../../archivers/gtar +DEPENDS+= amanda-common-${VERS}:../../sysutils/amanda-dev-common + +GNU_CONFIGURE= yes + +.include "../../mk/bsd.prefs.mk" +.include "../../sysutils/amanda-dev-common/Makefile.common" +.include "../../devel/readline/buildlink.mk" + +CONFIGURE_ARGS+= --without-server --without-restore + +# Prevent configure script from finding unnecessary libraries. We'll patch +# the amrecover Makefile to add the readline libraries as it's the only +# program that uses readline. +# +CONFIGURE_ENV+= ac_cv_lib_intl_main=no +CONFIGURE_ENV+= ac_cv_lib_termcap_tgetent=no +CONFIGURE_ENV+= ac_cv_lib_curses_tgetent=no +CONFIGURE_ENV+= ac_cv_lib_ncurses_tgetent=no +CONFIGURE_ENV+= ac_cv_lib_readline_readline=no + +.if defined(AMANDA_SMB) +CONFIGURE_ARGS+= --with-smbclient +DEPENDS+= samba>=2.0.0:../../net/samba +.endif + +.include "../../mk/bsd.pkg.mk" diff --git a/sysutils/amanda-dev-client/PLIST b/sysutils/amanda-dev-client/PLIST new file mode 100644 index 00000000000..c73b237ca3a --- /dev/null +++ b/sysutils/amanda-dev-client/PLIST @@ -0,0 +1,17 @@ +@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/02 13:28:15 bouyer Exp $ +lib/libamclient.a +lib/libamclient.la +lib/libamclient-2.4.3b3.so +libexec/amandad +libexec/calcsize +libexec/killpgrp +libexec/patch-system +libexec/rundump +libexec/runtar +libexec/selfcheck +libexec/sendbackup +libexec/sendsize +libexec/versionsuffix +libexec/patch-system +man/man8/amrecover.8 +sbin/amrecover diff --git a/sysutils/amanda-dev-client/distinfo b/sysutils/amanda-dev-client/distinfo new file mode 100644 index 00000000000..0e98e8404e8 --- /dev/null +++ b/sysutils/amanda-dev-client/distinfo @@ -0,0 +1,9 @@ +$NetBSD: distinfo,v 1.1.1.1 2002/05/02 13:28:15 bouyer Exp $ + +SHA1 (amanda-2.4.3b3.tar.gz) = 7028e5f060ee159d05c35635e79c5fd4701f08ee +Size (amanda-2.4.3b3.tar.gz) = 1167303 bytes +SHA1 (patch-aa) = 46fca5506e3f7f38f1f8c33db30cf53a5d1fcbb0 +SHA1 (patch-ab) = 9140b0c980927a1e4f8cc23985391ed3c6c76785 +SHA1 (patch-ac) = 7c94b9c5adbdf7266b76e2599e297dbb4be271aa +SHA1 (patch-ad) = 75d2adc88cb2af6477762673baf0f62048dda4c8 +SHA1 (patch-ae) = d50d43cc2b557af326a29ed9ba918c10458b3545 diff --git a/sysutils/amanda-dev-client/patches/patch-aa b/sysutils/amanda-dev-client/patches/patch-aa new file mode 100644 index 00000000000..8871e3a8788 --- /dev/null +++ b/sysutils/amanda-dev-client/patches/patch-aa @@ -0,0 +1,15 @@ +$NetBSD: patch-aa,v 1.1.1.1 2002/05/02 13:28:15 bouyer Exp $ + +--- configure.orig Fri Mar 8 20:28:05 2002 ++++ configure Tue Apr 30 11:39:11 2002 +@@ -9893,8 +9893,10 @@ + # This can be used to rebuild libtool when needed + LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" + ++if false ; then + # Always use our own libtool. + LIBTOOL='$(SHELL) $(top_builddir)/libtool' ++fi + + # Prevent multiple expansion + diff --git a/sysutils/amanda-dev-client/patches/patch-ab b/sysutils/amanda-dev-client/patches/patch-ab new file mode 100644 index 00000000000..a74572c5410 --- /dev/null +++ b/sysutils/amanda-dev-client/patches/patch-ab @@ -0,0 +1,99 @@ +$NetBSD: patch-ab,v 1.1.1.1 2002/05/02 13:28:15 bouyer Exp $ + +--- client-src/Makefile.in.orig Fri Mar 8 20:29:40 2002 ++++ client-src/Makefile.in Tue Apr 30 11:44:22 2002 +@@ -180,9 +180,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 +@@ -241,73 +239,53 @@ + amandad_SOURCES = amandad.c + amandad_OBJECTS = amandad.$(OBJEXT) + amandad_LDADD = $(LDADD) +-amandad_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamclient.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++amandad_DEPENDENCIES = libamclient.$(LIB_EXTENSION) + amandad_LDFLAGS = + calcsize_SOURCES = calcsize.c + calcsize_OBJECTS = calcsize.$(OBJEXT) + calcsize_LDADD = $(LDADD) +-calcsize_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- 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) +-getfsent_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- 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) +-killpgrp_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- 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 = + runtar_SOURCES = runtar.c + runtar_OBJECTS = runtar.$(OBJEXT) + runtar_LDADD = $(LDADD) +-runtar_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- 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) +-selfcheck_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- 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) + sendbackup_LDADD = $(LDADD) +-sendbackup_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- 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) +-sendsize_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- 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) +-versionsuffix_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamclient.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++versionsuffix_DEPENDENCIES = libamclient.$(LIB_EXTENSION) + versionsuffix_LDFLAGS = + SCRIPTS = $(libexec_SCRIPTS) $(sbin_SCRIPTS) + diff --git a/sysutils/amanda-dev-client/patches/patch-ac b/sysutils/amanda-dev-client/patches/patch-ac new file mode 100644 index 00000000000..ca20fb0e796 --- /dev/null +++ b/sysutils/amanda-dev-client/patches/patch-ac @@ -0,0 +1,28 @@ +$NetBSD: patch-ac,v 1.1.1.1 2002/05/02 13:28:15 bouyer Exp $ + +--- Makefile.in.orig Fri Mar 8 20:29:29 2002 ++++ Makefile.in Tue Apr 30 11:46:35 2002 +@@ -163,21 +163,15 @@ + # order is significant, don't change it arbitrarily + SUBDIRS = \ + config \ +- common-src \ + $(CLIENT_SUBDIRS) \ + $(TAPE_SUBDIRS) \ + $(SERVER_SUBDIRS) \ + $(RESTORE_SUBDIRS) \ + $(RECOVER_SUBDIRS) \ +- $(PLOT_SUBDIRS) \ +- man docs example ++ man + + +-pkgdata_DATA = \ +- COPYRIGHT \ +- COPYRIGHT-APACHE \ +- COPYRIGHT-REGEX +- ++pkgdata_DATA = + + EXTRA_DIST = $(SNAPSHOT_STAMP) \ + $(pkgdata_DATA) \ diff --git a/sysutils/amanda-dev-client/patches/patch-ad b/sysutils/amanda-dev-client/patches/patch-ad new file mode 100644 index 00000000000..82d621d6b7b --- /dev/null +++ b/sysutils/amanda-dev-client/patches/patch-ad @@ -0,0 +1,15 @@ +$NetBSD: patch-ad,v 1.1.1.1 2002/05/02 13:28:15 bouyer Exp $ + +--- man/Makefile.in.orig Fri Mar 8 20:29:52 2002 ++++ man/Makefile.in Tue Apr 30 11:48:42 2002 +@@ -180,9 +180,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) \ ++man_MANS = $(SERVER_MAN_PAGES) \ + $(RECOVER_MAN_PAGES) \ + $(RESTORE_MAN_PAGES) + diff --git a/sysutils/amanda-dev-client/patches/patch-ae b/sysutils/amanda-dev-client/patches/patch-ae new file mode 100644 index 00000000000..8e4ebba83f4 --- /dev/null +++ b/sysutils/amanda-dev-client/patches/patch-ae @@ -0,0 +1,28 @@ +$NetBSD: patch-ae,v 1.1.1.1 2002/05/02 13:28:15 bouyer Exp $ + +--- recover-src/Makefile.in.orig Fri Mar 8 20:29:49 2002 ++++ recover-src/Makefile.in Tue Apr 30 11:51:14 2002 +@@ -165,10 +165,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. + ### +-LDADD = ../common-src/libamanda.$(LIB_EXTENSION) \ +- @LEXLIB@ \ ++LDADD = @LEXLIB@ \ + ../client-src/libamclient.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++ -lamanda + + + amrecover_SOURCES = amrecover.c \ +@@ -192,9 +191,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@ diff --git a/sysutils/amanda-dev-common/DESCR b/sysutils/amanda-dev-common/DESCR new file mode 100644 index 00000000000..5434b9d711b --- /dev/null +++ b/sysutils/amanda-dev-common/DESCR @@ -0,0 +1,184 @@ +Please note that this is a package of a developement snapshot of the 2.4.3 +branch. + +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 diff --git a/sysutils/amanda-dev-common/Makefile b/sysutils/amanda-dev-common/Makefile new file mode 100644 index 00000000000..bb15460fa18 --- /dev/null +++ b/sysutils/amanda-dev-common/Makefile @@ -0,0 +1,38 @@ +# $NetBSD: Makefile,v 1.1.1.1 2002/05/02 13:28:15 bouyer Exp $ +# FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp +# + +PKGNAME= amanda-common-${VERS} +SVR4_PKGNAME= amaco + +COMMENT= Libraries and binaries used by both the client and server parts of amanda + +USE_BUILDLINK_ONLY= YES + +.include "../../mk/bsd.prefs.mk" +.include "../../sysutils/amanda-dev-common/Makefile.common" + +.if ${OPSYS} == "NetBSD" +CPPFLAGS= # empty +.elif ${OPSYS} == "SunOS" +CPPFLAGS+= -D_LARGEFILE64_SOURCE +.endif + +CONFIGURE_ARGS+= --without-server --without-restore --without-client + +# Prevent configure script from finding unnecessary libraries. +# +CONFIGURE_ENV+= ac_cv_lib_intl_main=no +CONFIGURE_ENV+= ac_cv_lib_termcap_tgetent=no +CONFIGURE_ENV+= ac_cv_lib_curses_tgetent=no +CONFIGURE_ENV+= ac_cv_lib_ncurses_tgetent=no +CONFIGURE_ENV+= ac_cv_lib_readline_readline=no + +PKG_GROUPS= ${AMANDA_GROUP} +PKG_USERS= ${AMANDA_USER}:${AMANDA_GROUP}::Amanda\\ user::${SH} + +OWN_DIRS_PERMS= ${AMANDA_VAR} ${AMANDA_USER} ${AMANDA_GROUP} 0700 +OWN_DIRS_PERMS+= ${AMANDA_VAR}/gnutar-lists ${AMANDA_USER} ${AMANDA_GROUP} 0700 + +.include "../../mk/bsd.pkg.install.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/sysutils/amanda-dev-common/Makefile.common b/sysutils/amanda-dev-common/Makefile.common new file mode 100644 index 00000000000..b6147f2470e --- /dev/null +++ b/sysutils/amanda-dev-common/Makefile.common @@ -0,0 +1,36 @@ +# $NetBSD: Makefile.common,v 1.1.1.1 2002/05/02 13:28:15 bouyer Exp $ +# +# common make file fragment shared by all amanda-* pkgs. +# + +VERS= 2.4.3b3 +DISTNAME?= amanda-${VERS} +CATEGORIES= sysutils +MASTER_SITES?= http://download.sourceforge.net/amanda/ + +MAINTAINER= packages@netbsd.org +HOMEPAGE= http://www.amanda.org/ + +.if ${OPSYS} == "NetBSD" +AMANDA_GROUP?= operator +.elif ${OPSYS} == "SunOS" +AMANDA_GROUP?= sysadmin +.endif + +AMANDA_USER?= backup +AMANDA_VAR?= /var/amanda + +BUILD_DEFS+= AMANDA_USER AMANDA_GROUP AMANDA_SMB AMANDA_VAR + +USE_LIBTOOL= yes +LTCONFIG_OVERRIDE= ${WRKSRC}/config/ltconfig + +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --with-user=${AMANDA_USER} +CONFIGURE_ARGS+= --with-group=${AMANDA_GROUP} +CONFIGURE_ARGS+= --with-owner=root +CONFIGURE_ARGS+= --with-mmap +CONFIGURE_ARGS+= --with-amandahosts +CONFIGURE_ARGS+= --localstatedir=${AMANDA_VAR} +CONFIGURE_ARGS+= --with-gnutar-listdir=${AMANDA_VAR}/gnutar-lists +CONFIGURE_ARGS+= --with-dump-honor-nodump diff --git a/sysutils/amanda-dev-common/PLIST b/sysutils/amanda-dev-common/PLIST new file mode 100644 index 00000000000..1f166e3f102 --- /dev/null +++ b/sysutils/amanda-dev-common/PLIST @@ -0,0 +1,16 @@ +@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/02 13:28:15 bouyer Exp $ +lib/libamanda.a +lib/libamanda.la +lib/libamtape.a +lib/libamtape.la +man/man8/amanda.8 +man/man8/amdd.8 +man/man8/ammt.8 +share/doc/amanda/COPYRIGHT +share/doc/amanda/COPYRIGHT-APACHE +share/doc/amanda/COPYRIGHT-REGEX +sbin/amdd +sbin/ammt + +@dirrm share/doc/amanda + diff --git a/sysutils/amanda-dev-common/distinfo b/sysutils/amanda-dev-common/distinfo new file mode 100644 index 00000000000..3a72d86a68a --- /dev/null +++ b/sysutils/amanda-dev-common/distinfo @@ -0,0 +1,10 @@ +$NetBSD: distinfo,v 1.1.1.1 2002/05/02 13:28:15 bouyer Exp $ + +SHA1 (amanda-2.4.3b3.tar.gz) = 7028e5f060ee159d05c35635e79c5fd4701f08ee +Size (amanda-2.4.3b3.tar.gz) = 1167303 bytes +SHA1 (patch-aa) = a173c2ff9ae91d4a347472deaeab440f5d1498d7 +SHA1 (patch-ab) = 8ad679e9df686bac180526daa4ed4b7a37410d58 +SHA1 (patch-ac) = a400a6308cd2e96bc30c8a6493cf7b90b442a35d +SHA1 (patch-ad) = 510e650c9e9976323b1d27a7895cee6281b89dcd +SHA1 (patch-ba) = 27a72a5585e3e6c2f191f337261ab25a2bcaa3a4 +SHA1 (patch-bb) = c8c91b848e669f2ccd3a753cfa7aba64e47d2166 diff --git a/sysutils/amanda-dev-common/patches/patch-aa b/sysutils/amanda-dev-common/patches/patch-aa new file mode 100644 index 00000000000..56184be25a0 --- /dev/null +++ b/sysutils/amanda-dev-common/patches/patch-aa @@ -0,0 +1,20 @@ +$NetBSD: patch-aa,v 1.1.1.1 2002/05/02 13:28:15 bouyer Exp $ + +--- client-src/Makefile.in.orig Fri Mar 8 20:29:40 2002 ++++ client-src/Makefile.in Tue Apr 30 11:14:37 2002 +@@ -304,12 +304,10 @@ + sendsize_LDFLAGS = + versionsuffix_SOURCES = versionsuffix.c + versionsuffix_OBJECTS = versionsuffix.$(OBJEXT) +-versionsuffix_LDADD = $(LDADD) +-versionsuffix_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamclient.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++versionsuffix_LDADD = ../common-src/libamanda.$(LIB_EXTENSION) ++versionsuffix_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) + versionsuffix_LDFLAGS = +-SCRIPTS = $(libexec_SCRIPTS) $(sbin_SCRIPTS) ++SCRIPTS = $(libexec_S:RIPTS) $(sbin_SCRIPTS) + + + DEFS = @DEFS@ diff --git a/sysutils/amanda-dev-common/patches/patch-ab b/sysutils/amanda-dev-common/patches/patch-ab new file mode 100644 index 00000000000..df3a6428adb --- /dev/null +++ b/sysutils/amanda-dev-common/patches/patch-ab @@ -0,0 +1,36 @@ +$NetBSD: patch-ab,v 1.1.1.1 2002/05/02 13:28:15 bouyer Exp $ + +--- Makefile.in.orig Fri Mar 8 20:29:29 2002 ++++ Makefile.in Tue Apr 30 13:23:44 2002 +@@ -33,7 +33,7 @@ + mandir = @mandir@ + includedir = @includedir@ + oldincludedir = /usr/include +-pkgdatadir = $(datadir)/@PACKAGE@ ++pkgdatadir = $(datadir)/doc/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ + top_builddir = . +@@ -155,11 +155,11 @@ + 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 + @WANT_SERVER_TRUE@SERVER_SUBDIRS = server-src changer-src + @WANT_RESTORE_TRUE@RESTORE_SUBDIRS = restore-src + @WANT_RECOVER_TRUE@RECOVER_SUBDIRS = recover-src +-@WANT_AMPLOT_TRUE@PLOT_SUBDIRS = amplot ++#PLOT_SUBDIRS = amplot + # order is significant, don't change it arbitrarily + SUBDIRS = \ + config \ +@@ -170,7 +170,7 @@ + $(RESTORE_SUBDIRS) \ + $(RECOVER_SUBDIRS) \ + $(PLOT_SUBDIRS) \ +- man docs example ++ man + + + pkgdata_DATA = \ diff --git a/sysutils/amanda-dev-common/patches/patch-ac b/sysutils/amanda-dev-common/patches/patch-ac new file mode 100644 index 00000000000..37dca0baa97 --- /dev/null +++ b/sysutils/amanda-dev-common/patches/patch-ac @@ -0,0 +1,27 @@ +$NetBSD: patch-ac,v 1.1.1.1 2002/05/02 13:28:15 bouyer Exp $ + +--- man/Makefile.in.orig Fri Mar 8 20:29:52 2002 ++++ man/Makefile.in Tue Apr 30 15:19:08 2002 +@@ -150,20 +150,18 @@ + + transform = s,x,x,; + +-@WANT_AMPLOT_TRUE@AMPLOT_MAN_PAGES = amplot.8 ++#AMPLOT_MAN_PAGES = amplot.8 + +-COMMON_MAN_PAGES = amanda.8 ++COMMON_MAN_PAGES = amanda.8 amdd.8 ammt.8 + + @WANT_SERVER_TRUE@SERVER_MAN_PAGES = amadmin.8 \ + @WANT_SERVER_TRUE@ amcheck.8 \ + @WANT_SERVER_TRUE@ amcheckdb.8 \ + @WANT_SERVER_TRUE@ amcleanup.8 \ +-@WANT_SERVER_TRUE@ amdd.8 \ + @WANT_SERVER_TRUE@ amdump.8 \ + @WANT_SERVER_TRUE@ amflush.8 \ + @WANT_SERVER_TRUE@ amgetconf.8 \ + @WANT_SERVER_TRUE@ amlabel.8 \ +-@WANT_SERVER_TRUE@ ammt.8 \ + @WANT_SERVER_TRUE@ amoverview.8 \ + @WANT_SERVER_TRUE@ amreport.8 \ + @WANT_SERVER_TRUE@ amrmtape.8 \ diff --git a/sysutils/amanda-dev-common/patches/patch-ad b/sysutils/amanda-dev-common/patches/patch-ad new file mode 100644 index 00000000000..c670d6a4196 --- /dev/null +++ b/sysutils/amanda-dev-common/patches/patch-ad @@ -0,0 +1,22 @@ +$NetBSD: patch-ad,v 1.1.1.1 2002/05/02 13:28:15 bouyer Exp $ + +Use the correct name for the statvfs struct. + +--- common-src/statfs.c.orig Sun May 23 11:11:18 1999 ++++ common-src/statfs.c Thu Jan 11 12:53:12 2001 +@@ -55,7 +55,15 @@ + */ + # include <sys/statvfs.h> + # define STATFS_TYP "SVR4 (Irix-5+, Solaris-2, Linux glibc 2.1)" ++#if defined(__sun__) && defined(__svr4__) ++#if defined(_LARGEFILE64_SOURCE) ++# define STATFS_STRUCT statvfs64_t ++#else ++# define STATFS_STRUCT statvfs_t ++#endif /* largefile source */ ++#else + # define STATFS_STRUCT struct statvfs ++#endif /* !Solaris */ + # define STATFS_TOTAL(buf) (buf).f_blocks + # define STATFS_AVAIL(buf) (buf).f_bavail + # define STATFS_FREE(buf) (buf).f_bfree diff --git a/sysutils/amanda-dev-common/patches/patch-ba b/sysutils/amanda-dev-common/patches/patch-ba new file mode 100644 index 00000000000..b3f517608e9 --- /dev/null +++ b/sysutils/amanda-dev-common/patches/patch-ba @@ -0,0 +1,13 @@ +$NetBSD: patch-ba,v 1.1.1.1 2002/05/02 13:28:15 bouyer Exp $ + +--- common-src/token.h.orig Sun Feb 10 13:49:54 2002 ++++ common-src/token.h Tue Apr 30 11:18:43 2002 +@@ -43,7 +43,7 @@ + __attribute__ ((format (printf, 2, 3))); + extern char *quote P((char *sep, char *str)); + extern char *rxquote P((char *str)); +-extern char *shquote P((char *str)); ++extern char *am_shquote P((char *str)); + extern int table_lookup P((table_t *table, char *str)); + extern char *table_lookup_r P((table_t *table, int val)); + diff --git a/sysutils/amanda-dev-common/patches/patch-bb b/sysutils/amanda-dev-common/patches/patch-bb new file mode 100644 index 00000000000..cf9414b19ee --- /dev/null +++ b/sysutils/amanda-dev-common/patches/patch-bb @@ -0,0 +1,13 @@ +$NetBSD: patch-bb,v 1.1.1.1 2002/05/02 13:28:15 bouyer Exp $ + +--- common-src/token.c.orig Thu Mar 15 20:30:23 2001 ++++ common-src/token.c Thu Mar 15 20:30:56 2001 +@@ -295,7 +295,7 @@ + } + + /* Quote a string so that it can be safely passed to a shell */ +-char *shquote(str) ++char *am_shquote(str) + char *str; /* the string to quote */ + { + char *pi, *po; diff --git a/sysutils/amanda-dev-plot/DESCR b/sysutils/amanda-dev-plot/DESCR new file mode 100644 index 00000000000..5434b9d711b --- /dev/null +++ b/sysutils/amanda-dev-plot/DESCR @@ -0,0 +1,184 @@ +Please note that this is a package of a developement snapshot of the 2.4.3 +branch. + +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 diff --git a/sysutils/amanda-dev-plot/Makefile b/sysutils/amanda-dev-plot/Makefile new file mode 100644 index 00000000000..5c512320910 --- /dev/null +++ b/sysutils/amanda-dev-plot/Makefile @@ -0,0 +1,22 @@ +# $NetBSD: Makefile,v 1.1.1.1 2002/05/02 13:28:15 bouyer Exp $ +# FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp +# + +PKGNAME= amanda-plot-${VERS} +SVR4_PKGNAME= amapl + +COMMENT= Visualizes the behavior of Amanda, a network backup system + +DEPENDS+= gnuplot>=3.7:../../graphics/gnuplot +DEPENDS+= amanda-server-${VERS}:../../sysutils/amanda-dev-server + +USE_X11= yes + +.include "../../mk/bsd.prefs.mk" +.include "../../sysutils/amanda-dev-common/Makefile.common" + +CONFIGURE_ARGS+= --without-client --without-restore \ + --without-restore --without-amrecover +CONFIGURE_ENV+= GNUPLOT="${LOCALBASE}/bin/gnuplot" + +.include "../../mk/bsd.pkg.mk" diff --git a/sysutils/amanda-dev-plot/PLIST b/sysutils/amanda-dev-plot/PLIST new file mode 100644 index 00000000000..683ac110f16 --- /dev/null +++ b/sysutils/amanda-dev-plot/PLIST @@ -0,0 +1,7 @@ +@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/02 13:28:15 bouyer Exp $ +libexec/amcat.awk +libexec/amplot.awk +libexec/amplot.g +libexec/amplot.gp +man/man8/amplot.8 +sbin/amplot diff --git a/sysutils/amanda-dev-plot/distinfo b/sysutils/amanda-dev-plot/distinfo new file mode 100644 index 00000000000..72c3f24dc4e --- /dev/null +++ b/sysutils/amanda-dev-plot/distinfo @@ -0,0 +1,7 @@ +$NetBSD: distinfo,v 1.1.1.1 2002/05/02 13:28:15 bouyer Exp $ + +SHA1 (amanda-2.4.3b3.tar.gz) = 7028e5f060ee159d05c35635e79c5fd4701f08ee +Size (amanda-2.4.3b3.tar.gz) = 1167303 bytes +SHA1 (patch-aa) = c98871c70e5b5a290abf0138695a0dd636178695 +SHA1 (patch-ab) = 00833fb7f08cf753c4d9e38f312ee08d38afee76 +SHA1 (patch-ac) = e3f2b28d1cccc6d1edcef3127491cd7e7143d56d diff --git a/sysutils/amanda-dev-plot/patches/patch-aa b/sysutils/amanda-dev-plot/patches/patch-aa new file mode 100644 index 00000000000..67d575e39f2 --- /dev/null +++ b/sysutils/amanda-dev-plot/patches/patch-aa @@ -0,0 +1,15 @@ +$NetBSD: patch-aa,v 1.1.1.1 2002/05/02 13:28:15 bouyer Exp $ + +--- configure.orig Fri Mar 8 20:28:05 2002 ++++ configure Tue Apr 30 15:28:37 2002 +@@ -9893,8 +9893,10 @@ + # This can be used to rebuild libtool when needed + LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" + ++if false ; then + # Always use our own libtool. + LIBTOOL='$(SHELL) $(top_builddir)/libtool' ++fi + + # Prevent multiple expansion + diff --git a/sysutils/amanda-dev-plot/patches/patch-ab b/sysutils/amanda-dev-plot/patches/patch-ab new file mode 100644 index 00000000000..2b18484e491 --- /dev/null +++ b/sysutils/amanda-dev-plot/patches/patch-ab @@ -0,0 +1,44 @@ +$NetBSD: patch-ab,v 1.1.1.1 2002/05/02 13:28:15 bouyer Exp $ + +--- Makefile.in.orig Fri Mar 8 20:29:29 2002 ++++ Makefile.in Tue Apr 30 15:40:45 2002 +@@ -163,20 +163,14 @@ + # order is significant, don't change it arbitrarily + SUBDIRS = \ + config \ +- common-src \ + $(CLIENT_SUBDIRS) \ +- $(TAPE_SUBDIRS) \ +- $(SERVER_SUBDIRS) \ + $(RESTORE_SUBDIRS) \ + $(RECOVER_SUBDIRS) \ + $(PLOT_SUBDIRS) \ +- man docs example ++ man + + +-pkgdata_DATA = \ +- COPYRIGHT \ +- COPYRIGHT-APACHE \ +- COPYRIGHT-REGEX ++pkgdata_DATA = + + + EXTRA_DIST = $(SNAPSHOT_STAMP) \ +@@ -466,7 +460,6 @@ + all-am: Makefile $(DATA) + installdirs: installdirs-recursive + installdirs-am: +- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) + + install: install-recursive + install-exec: install-exec-recursive +@@ -511,7 +504,7 @@ + + info-am: + +-install-data-am: install-pkgdataDATA ++install-data-am: + + install-exec-am: + diff --git a/sysutils/amanda-dev-plot/patches/patch-ac b/sysutils/amanda-dev-plot/patches/patch-ac new file mode 100644 index 00000000000..acc3ff8835b --- /dev/null +++ b/sysutils/amanda-dev-plot/patches/patch-ac @@ -0,0 +1,17 @@ +$NetBSD: patch-ac,v 1.1.1.1 2002/05/02 13:28:15 bouyer Exp $ + +--- man/Makefile.in.orig Fri Mar 8 20:29:52 2002 ++++ man/Makefile.in Tue Apr 30 15:31:39 2002 +@@ -180,11 +180,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) + + subdir = man + mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs diff --git a/sysutils/amanda-dev-server/DESCR b/sysutils/amanda-dev-server/DESCR new file mode 100644 index 00000000000..5434b9d711b --- /dev/null +++ b/sysutils/amanda-dev-server/DESCR @@ -0,0 +1,184 @@ +Please note that this is a package of a developement snapshot of the 2.4.3 +branch. + +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 diff --git a/sysutils/amanda-dev-server/Makefile b/sysutils/amanda-dev-server/Makefile new file mode 100644 index 00000000000..979c218fe27 --- /dev/null +++ b/sysutils/amanda-dev-server/Makefile @@ -0,0 +1,53 @@ +# $NetBSD: Makefile,v 1.1.1.1 2002/05/02 13:28:16 bouyer Exp $ +# FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp +# + +PKGNAME= amanda-server-${VERS} + +COMMENT= Server part of Amanda, a network backup system + +DEPENDS+= amanda-common-${VERS}:../../sysutils/amanda-dev-common + +USE_PERL5= yes +USE_GMAKE= yes + +.include "../../mk/bsd.prefs.mk" +.include "../../sysutils/amanda-dev-common/Makefile.common" + +CONFIGURE_ARGS+= --without-client + +# Prevent configure script from finding unnecessary libraries. +# +CONFIGURE_ENV+= ac_cv_lib_intl_main=no +CONFIGURE_ENV+= ac_cv_lib_termcap_tgetent=no +CONFIGURE_ENV+= ac_cv_lib_curses_tgetent=no +CONFIGURE_ENV+= ac_cv_lib_ncurses_tgetent=no +CONFIGURE_ENV+= ac_cv_lib_readline_readline=no + +# post-install: +# ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/amanda +# ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/amanda +# for i in ${WRKDIR}/${DISTNAME}/docs/* ; do \ +# ${INSTALL_DATA} $$i ${PREFIX}/share/doc/amanda; \ +# done +# for i in ${WRKDIR}/${DISTNAME}/example/8.5x11.ps \ +# ${WRKDIR}/${DISTNAME}/example/DIN-A4.ps \ +# ${WRKDIR}/${DISTNAME}/example/DLT.ps \ +# ${WRKDIR}/${DISTNAME}/example/EXB-8500.ps \ +# ${WRKDIR}/${DISTNAME}/example/HP-DAT.ps \ +# ${WRKDIR}/${DISTNAME}/example/amanda.conf \ +# ${WRKDIR}/${DISTNAME}/example/chg-multi.conf \ +# ${WRKDIR}/${DISTNAME}/example/chg-scsi.conf \ +# ${WRKDIR}/${DISTNAME}/example/config.site \ +# ${WRKDIR}/${DISTNAME}/example/disklist; do \ +# ${INSTALL_DATA} $$i ${PREFIX}/share/examples/amanda; \ +# done + +.if ${OPSYS} == "SunOS" +PLIST_SRC= ${WRKDIR}/PLIST-src + +pre-install: + ${SED} -e 's|^libexec/chg-scsi$$|@comment libexec/chg-scsi needs headers...|' ${PKGDIR}/PLIST > ${PLIST_SRC} +.endif + +.include "../../mk/bsd.pkg.mk" diff --git a/sysutils/amanda-dev-server/PLIST b/sysutils/amanda-dev-server/PLIST new file mode 100644 index 00000000000..3b347234b6d --- /dev/null +++ b/sysutils/amanda-dev-server/PLIST @@ -0,0 +1,91 @@ +@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/02 13:28:15 bouyer Exp $ +lib/libamserver-2.4.3b3.so +lib/libamserver.a +lib/libamserver.la +lib/libamserver.so +libexec/amcleanupdisk +libexec/amidxtaped +libexec/amindexd +libexec/amlogroll +libexec/amtrmidx +libexec/amtrmlog +libexec/chg-chio +libexec/chg-chs +libexec/chg-manual +libexec/chg-mtx +libexec/chg-multi +libexec/chg-rth +libexec/chg-scsi +libexec/chg-zd-mtx +libexec/driver +libexec/dumper +libexec/planner +libexec/taper +man/man8/amadmin.8 +man/man8/amcheck.8 +man/man8/amcheckdb.8 +man/man8/amcleanup.8 +man/man8/amdump.8 +man/man8/amflush.8 +man/man8/amgetconf.8 +man/man8/amlabel.8 +man/man8/amoverview.8 +man/man8/amreport.8 +man/man8/amrestore.8 +man/man8/amrmtape.8 +man/man8/amstatus.8 +man/man8/amtape.8 +man/man8/amtoc.8 +man/man8/amverify.8 +sbin/amadmin +sbin/amcheck +sbin/amcheckdb +sbin/amcleanup +sbin/amdump +sbin/amflush +sbin/amgetconf +sbin/amlabel +sbin/amoverview +sbin/amreport +sbin/amrestore +sbin/amrmtape +sbin/amstatus +sbin/amtape +sbin/amtoc +sbin/amverify +share/doc/amanda/DUMPER-API +share/doc/amanda/EXCLUDE +share/doc/amanda/FAQ +share/doc/amanda/INDEXING +share/doc/amanda/INSTALL +share/doc/amanda/INTERNALS +share/doc/amanda/KERBEROS +share/doc/amanda/LABEL.PRINTING +share/doc/amanda/MULTITAPE +share/doc/amanda/PORT.USAGE +share/doc/amanda/RAIT +share/doc/amanda/RESTORE +share/doc/amanda/SAMBA +share/doc/amanda/SECURITY +share/doc/amanda/SYSTEM.NOTES +share/doc/amanda/TAPE.CHANGERS +share/doc/amanda/TAPETYPES +share/doc/amanda/UPGRADE +share/doc/amanda/VTAPE-API +share/doc/amanda/WHATS.NEW +share/doc/amanda/WISHLIST +share/doc/amanda/YEAR2000 +share/doc/amanda/ZFTAPE +share/examples/amanda/3hole.ps +share/examples/amanda/8.5x11.ps +share/examples/amanda/DIN-A4.ps +share/examples/amanda/DLT.ps +share/examples/amanda/EXB-8500.ps +share/examples/amanda/HP-DAT.ps +share/examples/amanda/amanda.conf +share/examples/amanda/amanda.conf.chg-scsi +share/examples/amanda/chg-multi.conf +share/examples/amanda/chg-scsi.conf +share/examples/amanda/config.site +share/examples/amanda/disklist +@dirrm share/examples/amanda diff --git a/sysutils/amanda-dev-server/distinfo b/sysutils/amanda-dev-server/distinfo new file mode 100644 index 00000000000..7b07d9d6a93 --- /dev/null +++ b/sysutils/amanda-dev-server/distinfo @@ -0,0 +1,23 @@ +$NetBSD: distinfo,v 1.1.1.1 2002/05/02 13:28:15 bouyer Exp $ + +SHA1 (amanda-2.4.3b3.tar.gz) = 7028e5f060ee159d05c35635e79c5fd4701f08ee +Size (amanda-2.4.3b3.tar.gz) = 1167303 bytes +SHA1 (patch-aa) = f18ea70e071e33ffda7abd82ceea463a680ce462 +SHA1 (patch-ab) = 20a87e2101f643c3935367d9f836eaaea8b3dfbd +SHA1 (patch-ac) = 3ba9c95792e8ea99216c70958489b6a6f264db3c +SHA1 (patch-ad) = 4a481994c8f1c7a2e804d247d07f20f52abc45e9 +SHA1 (patch-ae) = 0e607d5c9d67a144c83a265240f28f095f730b62 +SHA1 (patch-af) = a0a6a8e8fdbe5d24daf84669702dc755ff61b239 +SHA1 (patch-ag) = 4397a7c6bde844d80781e1ffd8fb81c289e92fe0 +SHA1 (patch-ah) = c3b30d72ec79b59c1b86b333a0e45f5fac1939eb +SHA1 (patch-ai) = 71bc624cb27a2f3c7615450db2e36cf181e0cbb5 +SHA1 (patch-aj) = cab0a647cf0df0920f7aa658d473cf935adff2e1 +SHA1 (patch-ak) = 1fcc2579a2b20f500964536e2ce135f6a2b0769d +SHA1 (patch-al) = aa7d3a2551190fe9cea8028880374e797e7d5f7d +SHA1 (patch-am) = aac4ccd7cb42746ac8d43a8cb0f1470096886d83 +SHA1 (patch-ba) = b90d895f4c0b9c4dc725c340e936952d857c4f3e +SHA1 (patch-bb) = c8c91b848e669f2ccd3a753cfa7aba64e47d2166 +SHA1 (patch-bc) = 640144ef583cb5871e893485f67bd0943ea020c7 +SHA1 (patch-bd) = 8b9277a48329993408e69ccd8e0ee9ed6b4bfc64 +SHA1 (patch-be) = f9c292d3b219f8125e82439fea3feefaa9682572 +SHA1 (patch-bf) = 51587f339049d8195f0b67c0c350e8795490d7a0 diff --git a/sysutils/amanda-dev-server/patches/patch-aa b/sysutils/amanda-dev-server/patches/patch-aa new file mode 100644 index 00000000000..956ee630777 --- /dev/null +++ b/sysutils/amanda-dev-server/patches/patch-aa @@ -0,0 +1,32 @@ +$NetBSD: patch-aa,v 1.1.1.1 2002/05/02 13:28:16 bouyer Exp $ + +--- configure.orig Fri Mar 8 20:28:05 2002 ++++ configure Tue Apr 30 12:56:23 2002 +@@ -4317,6 +4317,7 @@ + test -n "$GETCONF" && break + done + ++if false ;then + for ac_prog in gnuplot + do + # Extract the first word of "$ac_prog", so it can be a program name with args. +@@ -4358,6 +4359,8 @@ + + test -n "$GNUPLOT" && break + done ++fi ++GNUPLOT="" + + if test -z "$GNUPLOT"; then + NO_AMPLOT_MODE=true +@@ -9893,8 +9896,10 @@ + # This can be used to rebuild libtool when needed + LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" + ++if false; then + # Always use our own libtool. + LIBTOOL='$(SHELL) $(top_builddir)/libtool' ++fi + + # Prevent multiple expansion + diff --git a/sysutils/amanda-dev-server/patches/patch-ab b/sysutils/amanda-dev-server/patches/patch-ab new file mode 100644 index 00000000000..e1e5c5007a4 --- /dev/null +++ b/sysutils/amanda-dev-server/patches/patch-ab @@ -0,0 +1,31 @@ +$NetBSD: patch-ab,v 1.1.1.1 2002/05/02 13:28:16 bouyer Exp $ + +--- Makefile.in.orig Fri Mar 8 20:29:29 2002 ++++ Makefile.in Tue Apr 30 13:37:17 2002 +@@ -33,7 +33,7 @@ + mandir = @mandir@ + includedir = @includedir@ + oldincludedir = /usr/include +-pkgdatadir = $(datadir)/@PACKAGE@ ++pkgdatadir = $(datadir)/doc/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ + top_builddir = . +@@ -155,7 +155,7 @@ + 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 + @WANT_SERVER_TRUE@SERVER_SUBDIRS = server-src changer-src + @WANT_RESTORE_TRUE@RESTORE_SUBDIRS = restore-src + @WANT_RECOVER_TRUE@RECOVER_SUBDIRS = recover-src +@@ -474,7 +474,7 @@ + uninstall: uninstall-recursive + + install-am: all-am +- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am + + installcheck: installcheck-recursive + install-strip: diff --git a/sysutils/amanda-dev-server/patches/patch-ac b/sysutils/amanda-dev-server/patches/patch-ac new file mode 100644 index 00000000000..5d2bec0713c --- /dev/null +++ b/sysutils/amanda-dev-server/patches/patch-ac @@ -0,0 +1,19 @@ +$NetBSD: patch-ac,v 1.1.1.1 2002/05/02 13:28:16 bouyer Exp $ + +--- example/amanda.conf.chg-scsi.in.orig Fri Apr 13 19:35:18 2001 ++++ example/amanda.conf.chg-scsi.in Tue Apr 30 13:01:08 2002 +@@ -165,10 +165,10 @@ + # Note that, although the keyword below is infofile, it is only so for + # historic reasons, since now it is supposed to be a directory (unless + # you have selected some database format other than the `text' default) +-infofile "/usr/adm/amanda/@DEFAULT_CONFIG@/curinfo" # database DIRECTORY +-logdir "/usr/adm/amanda/@DEFAULT_CONFIG@" # log directory +-indexdir "/usr/adm/amanda/@DEFAULT_CONFIG@/index" # index directory +-#tapelist "/usr/adm/amanda/@DEFAULT_CONFIG@/tapelist" # list of used tapes ++infofile "@localstatedir@/@DEFAULT_CONFIG@/curinfo" # database DIRECTORY ++logdir "@localstatedir@/@DEFAULT_CONFIG@" # log directory ++indexdir "@localstatedir@/@DEFAULT_CONFIG@/index" # index directory ++#tapelist "@localstatedir@/@DEFAULT_CONFIG@/tapelist" # list of used tapes + # tapelist is stored, by default, in the directory that contains amanda.conf + + diff --git a/sysutils/amanda-dev-server/patches/patch-ad b/sysutils/amanda-dev-server/patches/patch-ad new file mode 100644 index 00000000000..692a24784d4 --- /dev/null +++ b/sysutils/amanda-dev-server/patches/patch-ad @@ -0,0 +1,200 @@ +$NetBSD: patch-ad,v 1.1.1.1 2002/05/02 13:28:16 bouyer Exp $ + +--- server-src/Makefile.in.orig Fri Mar 8 20:29:44 2002 ++++ server-src/Makefile.in Tue Apr 30 13:08:50 2002 +@@ -196,10 +196,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) \ +- libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++LDADD = libamserver.$(LIB_EXTENSION) + + + SUFFIXES = .sh .pl +@@ -264,155 +261,98 @@ + amadmin_SOURCES = amadmin.c + amadmin_OBJECTS = amadmin.$(OBJEXT) + amadmin_LDADD = $(LDADD) +-amadmin_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++amadmin_DEPENDENCIES = libamserver.$(LIB_EXTENSION) + amadmin_LDFLAGS = + amcheck_SOURCES = amcheck.c + amcheck_OBJECTS = amcheck.$(OBJEXT) + amcheck_LDADD = $(LDADD) +-amcheck_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++amcheck_DEPENDENCIES = libamserver.$(LIB_EXTENSION) + amcheck_LDFLAGS = + amcleanupdisk_SOURCES = amcleanupdisk.c + amcleanupdisk_OBJECTS = amcleanupdisk.$(OBJEXT) + amcleanupdisk_LDADD = $(LDADD) +-amcleanupdisk_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++amcleanupdisk_DEPENDENCIES = libamserver.$(LIB_EXTENSION) + amcleanupdisk_LDFLAGS = + amflush_SOURCES = amflush.c + amflush_OBJECTS = amflush.$(OBJEXT) + amflush_LDADD = $(LDADD) +-amflush_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++amflush_DEPENDENCIES = libamserver.$(LIB_EXTENSION) + amflush_LDFLAGS = + am_amgetconf_OBJECTS = getconf.$(OBJEXT) + amgetconf_OBJECTS = $(am_amgetconf_OBJECTS) + amgetconf_LDADD = $(LDADD) +-amgetconf_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++amgetconf_DEPENDENCIES = libamserver.$(LIB_EXTENSION) + amgetconf_LDFLAGS = + am_amindexd_OBJECTS = amindexd.$(OBJEXT) disk_history.$(OBJEXT) \ + list_dir.$(OBJEXT) + amindexd_OBJECTS = $(am_amindexd_OBJECTS) + amindexd_LDADD = $(LDADD) +-amindexd_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++amindexd_DEPENDENCIES = libamserver.$(LIB_EXTENSION) + amindexd_LDFLAGS = + amlabel_SOURCES = amlabel.c + amlabel_OBJECTS = amlabel.$(OBJEXT) + amlabel_LDADD = $(LDADD) +-amlabel_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++amlabel_DEPENDENCIES = libamserver.$(LIB_EXTENSION) + amlabel_LDFLAGS = + amlogroll_SOURCES = amlogroll.c + amlogroll_OBJECTS = amlogroll.$(OBJEXT) + amlogroll_LDADD = $(LDADD) +-amlogroll_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++amlogroll_DEPENDENCIES = libamserver.$(LIB_EXTENSION) + amlogroll_LDFLAGS = + am_amreport_OBJECTS = reporter.$(OBJEXT) + amreport_OBJECTS = $(am_amreport_OBJECTS) + amreport_LDADD = $(LDADD) +-amreport_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++amreport_DEPENDENCIES = libamserver.$(LIB_EXTENSION) + amreport_LDFLAGS = + amtape_SOURCES = amtape.c + amtape_OBJECTS = amtape.$(OBJEXT) + amtape_LDADD = $(LDADD) +-amtape_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++amtape_DEPENDENCIES = libamserver.$(LIB_EXTENSION) + amtape_LDFLAGS = + amtrmidx_SOURCES = amtrmidx.c + amtrmidx_OBJECTS = amtrmidx.$(OBJEXT) + amtrmidx_LDADD = $(LDADD) +-amtrmidx_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++amtrmidx_DEPENDENCIES = libamserver.$(LIB_EXTENSION) + amtrmidx_LDFLAGS = + amtrmlog_SOURCES = amtrmlog.c + amtrmlog_OBJECTS = amtrmlog.$(OBJEXT) + amtrmlog_LDADD = $(LDADD) +-amtrmlog_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++amtrmlog_DEPENDENCIES = libamserver.$(LIB_EXTENSION) + amtrmlog_LDFLAGS = + am_conffile_OBJECTS = conffile.test.$(OBJEXT) + conffile_OBJECTS = $(am_conffile_OBJECTS) + conffile_LDADD = $(LDADD) +-conffile_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++conffile_DEPENDENCIES = libamserver.$(LIB_EXTENSION) + conffile_LDFLAGS = + am_diskfile_OBJECTS = diskfile.test.$(OBJEXT) + diskfile_OBJECTS = $(am_diskfile_OBJECTS) + diskfile_LDADD = $(LDADD) +-diskfile_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++diskfile_DEPENDENCIES = libamserver.$(LIB_EXTENSION) + diskfile_LDFLAGS = + driver_SOURCES = driver.c + driver_OBJECTS = driver.$(OBJEXT) + driver_LDADD = $(LDADD) +-driver_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++driver_DEPENDENCIES = libamserver.$(LIB_EXTENSION) + driver_LDFLAGS = + dumper_SOURCES = dumper.c + dumper_OBJECTS = dumper.$(OBJEXT) + dumper_LDADD = $(LDADD) +-dumper_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++dumper_DEPENDENCIES = libamserver.$(LIB_EXTENSION) + dumper_LDFLAGS = + am_infofile_OBJECTS = infofile.test.$(OBJEXT) + infofile_OBJECTS = $(am_infofile_OBJECTS) + infofile_LDADD = $(LDADD) +-infofile_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++infofile_DEPENDENCIES = libamserver.$(LIB_EXTENSION) + infofile_LDFLAGS = + planner_SOURCES = planner.c + planner_OBJECTS = planner.$(OBJEXT) + planner_LDADD = $(LDADD) +-planner_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++planner_DEPENDENCIES = libamserver.$(LIB_EXTENSION) + planner_LDFLAGS = + taper_SOURCES = taper.c + taper_OBJECTS = taper.$(OBJEXT) + taper_LDADD = $(LDADD) +-taper_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++taper_DEPENDENCIES = libamserver.$(LIB_EXTENSION) + taper_LDFLAGS = + SCRIPTS = $(sbin_SCRIPTS) + +@@ -421,7 +361,7 @@ + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/config + CPPFLAGS = @CPPFLAGS@ + LDFLAGS = @LDFLAGS@ +-LIBS = @LIBS@ ++LIBS = @LIBS@ -lamtape -lamanda + depcomp = $(SHELL) $(top_srcdir)/config/depcomp + @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/amadmin.Po $(DEPDIR)/amcheck.Po \ + @AMDEP_TRUE@ $(DEPDIR)/amcleanupdisk.Po $(DEPDIR)/amflush.Po \ diff --git a/sysutils/amanda-dev-server/patches/patch-ae b/sysutils/amanda-dev-server/patches/patch-ae new file mode 100644 index 00000000000..2cd0d267fea --- /dev/null +++ b/sysutils/amanda-dev-server/patches/patch-ae @@ -0,0 +1,62 @@ +$NetBSD: patch-ae,v 1.1.1.1 2002/05/02 13:28:16 bouyer Exp $ + +--- changer-src/Makefile.in.orig Fri Mar 8 20:29:46 2002 ++++ changer-src/Makefile.in Tue Apr 30 14:51:57 2002 +@@ -154,7 +154,7 @@ + @WANT_LIBTOOL_TRUE@LIB_EXTENSION = la + @WANT_LIBTOOL_FALSE@LIB_EXTENSION = a + +-@WANT_CHIO_SCSI_TRUE@CHIO_SCSI = chg-scsi-chio ++#CHIO_SCSI = chg-scsi-chio + + @WANT_CHG_SCSI_TRUE@CHG_SCSI = chg-scsi + +@@ -172,10 +172,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) \ +- ../server-src/libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++LDADD = ../server-src/libamserver.$(LIB_EXTENSION) + + + SUFFIXES = .pl .sh +@@ -194,11 +191,11 @@ + CONFIG_CLEAN_FILES = chg-manual.sh chg-multi.sh chg-mtx.sh chg-chs.sh \ + chg-rth.pl chg-chio.pl chg-zd-mtx.sh + @WANT_CHG_SCSI_FALSE@@WANT_CHIO_SCSI_TRUE@libexec_PROGRAMS = \ +-@WANT_CHG_SCSI_FALSE@@WANT_CHIO_SCSI_TRUE@ chg-scsi-chio$(EXEEXT) ++# chg-scsi-chio$(EXEEXT) + @WANT_CHG_SCSI_FALSE@@WANT_CHIO_SCSI_FALSE@libexec_PROGRAMS = + @WANT_CHG_SCSI_TRUE@@WANT_CHIO_SCSI_TRUE@libexec_PROGRAMS = \ + @WANT_CHG_SCSI_TRUE@@WANT_CHIO_SCSI_TRUE@ chg-scsi$(EXEEXT) \ +-@WANT_CHG_SCSI_TRUE@@WANT_CHIO_SCSI_TRUE@ chg-scsi-chio$(EXEEXT) ++# chg-scsi-chio$(EXEEXT) + @WANT_CHG_SCSI_TRUE@@WANT_CHIO_SCSI_FALSE@libexec_PROGRAMS = \ + @WANT_CHG_SCSI_TRUE@@WANT_CHIO_SCSI_FALSE@ chg-scsi$(EXEEXT) + PROGRAMS = $(libexec_PROGRAMS) +@@ -209,19 +206,13 @@ + scsi-bsd.$(OBJEXT) scsi-cam.$(OBJEXT) sense.$(OBJEXT) + chg_scsi_OBJECTS = $(am_chg_scsi_OBJECTS) + chg_scsi_LDADD = $(LDADD) +-chg_scsi_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- ../server-src/libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) +-chg_scsi_LDFLAGS = ++chg_scsi_DEPENDENCIES = ../server-src/libamserver.$(LIB_EXTENSION) ++chg_scsi_LDFLAGS = -lamanda -lamtape + am_chg_scsi_chio_OBJECTS = chg-scsi-chio.$(OBJEXT) scsi-hpux.$(OBJEXT) \ + scsi-chio.$(OBJEXT) + chg_scsi_chio_OBJECTS = $(am_chg_scsi_chio_OBJECTS) + chg_scsi_chio_LDADD = $(LDADD) +-chg_scsi_chio_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- ../server-src/libamserver.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++chg_scsi_chio_DEPENDENCIES = ../server-src/libamserver.$(LIB_EXTENSION) + chg_scsi_chio_LDFLAGS = + SCRIPTS = $(libexec_SCRIPTS) + diff --git a/sysutils/amanda-dev-server/patches/patch-af b/sysutils/amanda-dev-server/patches/patch-af new file mode 100644 index 00000000000..c37bfd5c37c --- /dev/null +++ b/sysutils/amanda-dev-server/patches/patch-af @@ -0,0 +1,205 @@ +$NetBSD: patch-af,v 1.1.1.1 2002/05/02 13:28:16 bouyer Exp $ + +--- changer-src/scsi-chio.c.orig Thu Jun 17 20:33:19 1999 ++++ changer-src/scsi-chio.c Tue Apr 30 14:33:22 2002 +@@ -59,16 +59,26 @@ + */ + int GetCurrentSlot(int fd, int drive) + { +- struct changer_element_status ces; ++#if defined(OCHIOGSTATUS) ++struct ochanger_element_status_request cesr; ++#else ++struct changer_element_status ces; ++#endif + int slot; + int i, rc; + + get_changer_info(fd); ++#if defined(OCHIOGSTATUS) ++ cesr.cesr_type = CHET_ST; ++ cesr.cesr_data = malloc(changer_info.cp_nslots); + ++ rc = ioctl(fd, CHIOGSTATUS, &cesr); ++#else + ces.ces_type = CHET_ST; + ces.ces_data = malloc(changer_info.cp_nslots); + + rc = ioctl(fd, CHIOGSTATUS, &ces); ++#endif + if (rc) { + dbprintf(("%s: changer status query failed: 0x%x %s\n", + get_pname(), rc,strerror(errno))); +@@ -76,7 +86,11 @@ + } + for (slot = 0; slot < changer_info.cp_nslots; slot++) + { ++#if defined(OCHIOGSTATUS) ++ i = cesr.cesr_data[slot] & CESTATUS_FULL; ++#else + i = ces.ces_data[slot] & CESTATUS_FULL; ++#endif + dbprintf(("\tGetCurrentSlot slot %d = %d\n", slot, i)); + if (!i) + return(slot); +@@ -121,25 +135,41 @@ + */ + int isempty(int fd, int slot) + { ++#if defined(OCHIOGSTATUS) ++struct ochanger_element_status_request cesr; ++#else + struct changer_element_status ces; ++#endif ++ + int i,rc; + int type=CHET_ST; + + get_changer_info(fd); + ++#if defined(OCHIOGSTATUS) ++ cesr.cesr_type = type; ++ cesr.cesr_data = malloc(changer_info.cp_nslots); ++ rc = ioctl(fd, OCHIOGSTATUS, &cesr); ++#else + ces.ces_type = type; + ces.ces_data = malloc(changer_info.cp_nslots); +- + rc = ioctl(fd, CHIOGSTATUS, &ces); ++#endif ++ + if (rc) { + dbprintf(("%s: changer status query failed: 0x%x %s\n", + get_pname(), rc,strerror(errno))); + return -1; + } + ++#if defined(OCHIOGSTATUS) ++ i = cesr.cesr_data[slot] & CESTATUS_FULL; ++ free(cesr.cesr_data); ++#else + i = ces.ces_data[slot] & CESTATUS_FULL; +- + free(ces.ces_data); ++#endif ++ + return !i; + } + +@@ -148,16 +178,27 @@ + */ + int find_empty(int fd, int start, int count) + { ++#if defined(OCHIOGSTATUS) ++struct ochanger_element_status_request cesr; ++#else + struct changer_element_status ces; ++#endif ++ + int i,rc; + int type=CHET_ST; + + get_changer_info(fd); + ++#if defined(OCHIOGSTATUS) ++ cesr.cesr_type = type; ++ cesr.cesr_data = malloc(changer_info.cp_nslots); ++ rc = ioctl(fd, OCHIOGSTATUS, &cesr); ++#else + ces.ces_type = type; + ces.ces_data = malloc(changer_info.cp_nslots); ++ rc = ioctl(fd, CHIOGSTATUS, &ces); ++#endif + +- rc = ioctl(fd,CHIOGSTATUS,&ces); + if (rc) { + dbprintf(("%s: changer status query failed: 0x%x %s\n", + get_pname(), rc, strerror(errno))); +@@ -165,9 +206,17 @@ + } + + i = 0; ++ ++#if defined(OCHIOGSTATUS) ++ while ((i < changer_info.cp_nslots)&&(cesr.cesr_data[i] & CESTATUS_FULL)) ++ i++; ++ free(cesr.cesr_data); ++#else + while ((i < changer_info.cp_nslots)&&(ces.ces_data[i] & CESTATUS_FULL)) + i++; + free(ces.ces_data); ++#endif ++ + return i; + } + +@@ -176,25 +225,41 @@ + */ + int drive_loaded(int fd, int drivenum) + { ++#if defined(OCHIOGSTATUS) ++struct ochanger_element_status_request cesr; ++#else + struct changer_element_status ces; ++#endif ++ + int i,rc; + int type=CHET_DT; + + get_changer_info(fd); + ++#if defined(OCHIOGSTATUS) ++ cesr.cesr_type = type; ++ cesr.cesr_data = malloc(changer_info.cp_ndrives); ++ rc = ioctl(fd, OCHIOGSTATUS, &cesr); ++#else + ces.ces_type = type; + ces.ces_data = malloc(changer_info.cp_ndrives); +- + rc = ioctl(fd, CHIOGSTATUS, &ces); ++#endif ++ + if (rc) { + dbprintf(("%s: drive status query failed: 0x%x %s\n", + get_pname(), rc, strerror(errno))); + return -1; + } + ++#if defined(OCHIOGSTATUS) ++ i = (cesr.cesr_data[drivenum] & CESTATUS_FULL); ++ free(cesr.cesr_data); ++#else + i = (ces.ces_data[drivenum] & CESTATUS_FULL); +- + free(ces.ces_data); ++#endif ++ + return i; + } + +@@ -204,7 +269,12 @@ + */ + int unload(int fd, int drive, int slot) + { ++#if defined(OCHIOGSTATUS) ++struct changer_move_request move; ++#else + struct changer_move move; ++#endif ++ + int rc; + + dbprintf(("unload : fd = %d, drive = %d, slot =%d\n",fd, drive, slot)); +@@ -230,7 +300,12 @@ + */ + int load(int fd, int drive, int slot) + { ++#if defined(OCHIOGSTATUS) ++struct changer_move_request move; ++#else + struct changer_move move; ++#endif ++ + int rc; + + dbprintf(("load : fd = %d, drive = %d, slot =%d\n",fd, drive, slot)); diff --git a/sysutils/amanda-dev-server/patches/patch-ag b/sysutils/amanda-dev-server/patches/patch-ag new file mode 100644 index 00000000000..b5606d24148 --- /dev/null +++ b/sysutils/amanda-dev-server/patches/patch-ag @@ -0,0 +1,23 @@ +$NetBSD: patch-ag,v 1.1.1.1 2002/05/02 13:28:16 bouyer Exp $ + +--- example/chg-scsi.conf.old Tue Feb 23 16:44:39 1999 ++++ example/chg-scsi.conf Tue Feb 23 16:46:38 1999 +@@ -2,6 +2,8 @@ + number_configs 2 + eject 1 # Tapedrives need an eject command + sleep 5 # Seconds to wait until the tape gets ready ++ # The driver first sleeps for <sleep>/2 seconds, ++ # then pool the drive every seconds. + cleanmax 10 # How many times could a cleaning tape get used + changerdev /dev/sch0 + # +@@ -13,7 +15,8 @@ + startuse 0 # The slots associated with the drive 0 + enduse 9 # + statfile /usr/local/etc/amanda/tape5-slot # The file where the actual slot is stored +-cleancart 20 # the slot where the cleaningcartridge for drive 0 is located ++cleancart -1 # the slot where the cleaningcartridge for drive 0 is ++ # located. -1 means none. + cleanfile /usr/local/etc/amanda/tape0-clean # The file where the cleanings are recorded + usagecount /usr/local/etc/amanda/backup/totaltime + diff --git a/sysutils/amanda-dev-server/patches/patch-ah b/sysutils/amanda-dev-server/patches/patch-ah new file mode 100644 index 00000000000..88fe683240c --- /dev/null +++ b/sysutils/amanda-dev-server/patches/patch-ah @@ -0,0 +1,30 @@ +$NetBSD: patch-ah,v 1.1.1.1 2002/05/02 13:28:16 bouyer Exp $ + +--- example/amanda.conf.in.orig Fri Dec 7 20:24:58 2001 ++++ example/amanda.conf.in Tue Apr 30 13:10:50 2002 +@@ -90,8 +90,8 @@ + tpchanger "chg-manual" # the tape-changer glue script + tapedev "@DEFAULT_TAPE_DEVICE@" # the no-rewind tape device to be used + rawtapedev "@DEFAULT_RAW_TAPE_DEVICE@" # the raw device to be used (ftape only) +-changerfile "/usr/adm/amanda/@DEFAULT_CONFIG@/changer" +-changerfile "/usr/adm/amanda/@DEFAULT_CONFIG@/changer-status" ++changerfile "@CONFIG_DIR@/@DEFAULT_CONFIG@/changer" ++changerfile "@CONFIG_DIR@/@DEFAULT_CONFIG@/changer-status" + changerfile "@CONFIG_DIR@/@DEFAULT_CONFIG@/changer.conf" + changerdev "@DEFAULT_CHANGER_DEVICE@" + +@@ -182,10 +182,10 @@ + # Note that, although the keyword below is infofile, it is only so for + # historic reasons, since now it is supposed to be a directory (unless + # you have selected some database format other than the `text' default) +-infofile "/usr/adm/amanda/@DEFAULT_CONFIG@/curinfo" # database DIRECTORY +-logdir "/usr/adm/amanda/@DEFAULT_CONFIG@" # log directory +-indexdir "/usr/adm/amanda/@DEFAULT_CONFIG@/index" # index directory +-#tapelist "/usr/adm/amanda/@DEFAULT_CONFIG@/tapelist" # list of used tapes ++infofile "@localstatedir@/@DEFAULT_CONFIG@/curinfo" # database DIRECTORY ++logdir "@localstatedir@/@DEFAULT_CONFIG@" # log directory ++indexdir "@localstatedir@/@DEFAULT_CONFIG@/index" # index directory ++#tapelist "@localstatedir@/@DEFAULT_CONFIG@/tapelist" # list of used tapes + # tapelist is stored, by default, in the directory that contains amanda.conf + + diff --git a/sysutils/amanda-dev-server/patches/patch-ai b/sysutils/amanda-dev-server/patches/patch-ai new file mode 100644 index 00000000000..03b7ed6b890 --- /dev/null +++ b/sysutils/amanda-dev-server/patches/patch-ai @@ -0,0 +1,34 @@ +$NetBSD: patch-ai,v 1.1.1.1 2002/05/02 13:28:16 bouyer Exp $ + +--- restore-src/Makefile.in.orig Fri Mar 8 20:29:48 2002 ++++ restore-src/Makefile.in Tue Apr 30 13:12:24 2002 +@@ -165,9 +165,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) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++LDADD = -lamtape -lamanda + + + amidxtaped_SOURCES = amidxtaped.c +@@ -182,16 +180,12 @@ + am_amidxtaped_OBJECTS = amidxtaped.$(OBJEXT) + amidxtaped_OBJECTS = $(am_amidxtaped_OBJECTS) + amidxtaped_LDADD = $(LDADD) +-amidxtaped_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++amidxtaped_DEPENDENCIES = + amidxtaped_LDFLAGS = + amrestore_SOURCES = amrestore.c + amrestore_OBJECTS = amrestore.$(OBJEXT) + amrestore_LDADD = $(LDADD) +-amrestore_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \ +- ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++amrestore_DEPENDENCIES = + amrestore_LDFLAGS = + + DEFS = @DEFS@ diff --git a/sysutils/amanda-dev-server/patches/patch-aj b/sysutils/amanda-dev-server/patches/patch-aj new file mode 100644 index 00000000000..2be1e2781db --- /dev/null +++ b/sysutils/amanda-dev-server/patches/patch-aj @@ -0,0 +1,30 @@ +$NetBSD: patch-aj,v 1.1.1.1 2002/05/02 13:28:16 bouyer Exp $ + +--- example/Makefile.in.orig Fri Mar 8 20:29:55 2002 ++++ example/Makefile.in Tue Apr 30 13:14:30 2002 +@@ -35,7 +35,7 @@ + mandir = @mandir@ + includedir = @includedir@ + oldincludedir = /usr/include +-pkgdatadir = $(datadir)/@PACKAGE@ ++pkgdatadir = $(datadir)/examples/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ + top_builddir = .. +@@ -265,7 +265,15 @@ + + info-am: + +-install-data-am: ++install-data-am: $(noinst_DATA) $(EXTRA_DIST) ++ @$(NORMAL_INSTALL) ++ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) ++ @list='$(noinst_DATA) $(EXTRA_DIST)'; for p in $$list; do \ ++ if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \ ++ $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \ ++ done + + install-exec-am: + diff --git a/sysutils/amanda-dev-server/patches/patch-ak b/sysutils/amanda-dev-server/patches/patch-ak new file mode 100644 index 00000000000..a415d66d622 --- /dev/null +++ b/sysutils/amanda-dev-server/patches/patch-ak @@ -0,0 +1,13 @@ +$NetBSD: patch-ak,v 1.1.1.1 2002/05/02 13:28:16 bouyer Exp $ + +--- docs/Makefile.in.orig Fri Mar 8 20:29:54 2002 ++++ docs/Makefile.in Tue Apr 30 13:15:40 2002 +@@ -33,7 +33,7 @@ + mandir = @mandir@ + includedir = @includedir@ + oldincludedir = /usr/include +-pkgdatadir = $(datadir)/@PACKAGE@ ++pkgdatadir = $(datadir)/doc/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ + top_builddir = .. diff --git a/sysutils/amanda-dev-server/patches/patch-al b/sysutils/amanda-dev-server/patches/patch-al new file mode 100644 index 00000000000..92d3368bedf --- /dev/null +++ b/sysutils/amanda-dev-server/patches/patch-al @@ -0,0 +1,35 @@ +$NetBSD: patch-al,v 1.1.1.1 2002/05/02 13:28:16 bouyer Exp $ + +--- man/Makefile.in.orig Fri Mar 8 20:29:52 2002 ++++ man/Makefile.in Tue Apr 30 15:19:08 2002 +@@ -150,20 +150,18 @@ + + transform = s,x,x,; + +-@WANT_AMPLOT_TRUE@AMPLOT_MAN_PAGES = amplot.8 ++#AMPLOT_MAN_PAGES = amplot.8 + +-COMMON_MAN_PAGES = amanda.8 ++COMMON_MAN_PAGES = amanda.8 amdd.8 ammt.8 + + @WANT_SERVER_TRUE@SERVER_MAN_PAGES = amadmin.8 \ + @WANT_SERVER_TRUE@ amcheck.8 \ + @WANT_SERVER_TRUE@ amcheckdb.8 \ + @WANT_SERVER_TRUE@ amcleanup.8 \ +-@WANT_SERVER_TRUE@ amdd.8 \ + @WANT_SERVER_TRUE@ amdump.8 \ + @WANT_SERVER_TRUE@ amflush.8 \ + @WANT_SERVER_TRUE@ amgetconf.8 \ + @WANT_SERVER_TRUE@ amlabel.8 \ +-@WANT_SERVER_TRUE@ ammt.8 \ + @WANT_SERVER_TRUE@ amoverview.8 \ + @WANT_SERVER_TRUE@ amreport.8 \ + @WANT_SERVER_TRUE@ amrmtape.8 \ +@@ -181,7 +179,6 @@ + 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) diff --git a/sysutils/amanda-dev-server/patches/patch-am b/sysutils/amanda-dev-server/patches/patch-am new file mode 100644 index 00000000000..ea8b64ebe01 --- /dev/null +++ b/sysutils/amanda-dev-server/patches/patch-am @@ -0,0 +1,40 @@ +$NetBSD: patch-am,v 1.1.1.1 2002/05/02 13:28:16 bouyer Exp $ + +--- common-src/Makefile.in.orig Tue Apr 30 14:04:39 2002 ++++ common-src/Makefile.in Tue Apr 30 13:55:56 2002 +@@ -563,24 +563,19 @@ + done + check-am: all-am + check: check-am +-all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(HEADERS) ++all-am: Makefile genversion.h + + installdirs: +- $(mkinstalldirs) $(DESTDIR)$(libdir) + + install: install-am + install-exec: install-exec-am + install-data: install-data-am + uninstall: uninstall-am + +-install-am: all-am +- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++install-am: + + installcheck: installcheck-am + install-strip: +- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- `test -z '$(STRIP)' || \ +- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + mostlyclean-generic: + + clean-generic: +@@ -613,7 +608,7 @@ + + install-data-am: + +-install-exec-am: install-libLTLIBRARIES ++install-exec-am: + + install-info: install-info-am + diff --git a/sysutils/amanda-dev-server/patches/patch-ba b/sysutils/amanda-dev-server/patches/patch-ba new file mode 100644 index 00000000000..9021fb279a4 --- /dev/null +++ b/sysutils/amanda-dev-server/patches/patch-ba @@ -0,0 +1,13 @@ +$NetBSD: patch-ba,v 1.1.1.1 2002/05/02 13:28:16 bouyer Exp $ + +--- common-src/token.h.orig Sun Feb 10 13:49:54 2002 ++++ common-src/token.h Tue Apr 30 13:35:22 2002 +@@ -43,7 +43,7 @@ + __attribute__ ((format (printf, 2, 3))); + extern char *quote P((char *sep, char *str)); + extern char *rxquote P((char *str)); +-extern char *shquote P((char *str)); ++extern char *am_shquote P((char *str)); + extern int table_lookup P((table_t *table, char *str)); + extern char *table_lookup_r P((table_t *table, int val)); + diff --git a/sysutils/amanda-dev-server/patches/patch-bb b/sysutils/amanda-dev-server/patches/patch-bb new file mode 100644 index 00000000000..24365f1e9b4 --- /dev/null +++ b/sysutils/amanda-dev-server/patches/patch-bb @@ -0,0 +1,13 @@ +$NetBSD: patch-bb,v 1.1.1.1 2002/05/02 13:28:16 bouyer Exp $ + +--- common-src/token.c.orig Thu Mar 15 20:30:23 2001 ++++ common-src/token.c Thu Mar 15 20:30:56 2001 +@@ -295,7 +295,7 @@ + } + + /* Quote a string so that it can be safely passed to a shell */ +-char *shquote(str) ++char *am_shquote(str) + char *str; /* the string to quote */ + { + char *pi, *po; diff --git a/sysutils/amanda-dev-server/patches/patch-bc b/sysutils/amanda-dev-server/patches/patch-bc new file mode 100644 index 00000000000..765c259e563 --- /dev/null +++ b/sysutils/amanda-dev-server/patches/patch-bc @@ -0,0 +1,13 @@ +$NetBSD: patch-bc,v 1.1.1.1 2002/05/02 13:28:16 bouyer Exp $ + +--- server-src/taper.c.orig Tue Apr 30 13:44:04 2002 ++++ server-src/taper.c Tue Apr 30 13:44:49 2002 +@@ -1484,7 +1484,7 @@ + void detach_buffers(bufp) + char *bufp; + { +- if(munmap((void *)bufp, saved_size)*conf_tapebufs) == -1) { ++ if(munmap((void *)bufp, saved_size) == -1) { + error("detach_buffers: munmap: %s", strerror(errno)); + } + diff --git a/sysutils/amanda-dev-server/patches/patch-bd b/sysutils/amanda-dev-server/patches/patch-bd new file mode 100644 index 00000000000..f111c51d80e --- /dev/null +++ b/sysutils/amanda-dev-server/patches/patch-bd @@ -0,0 +1,13 @@ +$NetBSD: patch-bd,v 1.1.1.1 2002/05/02 13:28:16 bouyer Exp $ + +--- changer-src/chg-scsi-chio.c.orig Tue Apr 30 14:14:29 2002 ++++ changer-src/chg-scsi-chio.c Tue Apr 30 14:14:35 2002 +@@ -639,7 +639,7 @@ + + if(read_conffile(CONFFILE_NAME)) { + fprintf(stderr, "%s: could not find config file \"%s\"", +- changer_dev, conffile); ++ changer_dev, CONFFILE_NAME); + exit(1); + } + diff --git a/sysutils/amanda-dev-server/patches/patch-be b/sysutils/amanda-dev-server/patches/patch-be new file mode 100644 index 00000000000..dc97745a857 --- /dev/null +++ b/sysutils/amanda-dev-server/patches/patch-be @@ -0,0 +1,13 @@ +$NetBSD: patch-be,v 1.1.1.1 2002/05/02 13:28:16 bouyer Exp $ + +--- changer-src/scsi-bsd.c.orig Tue Apr 30 19:16:44 2002 ++++ changer-src/scsi-bsd.c Sun Sep 16 20:10:26 2001 +@@ -198,7 +198,7 @@ + { + SCSI_OpenDevice(DeviceFD); + } +- Result = ioctl(DeviceFD, SCIOCCOMMAND, &ds); ++ Result = ioctl(pDev[DeviceFD].fd, SCIOCCOMMAND, &ds); + SCSI_CloseDevice(DeviceFD); + + memcpy(pRequestSense, ds.sense, RequestSenseLength); diff --git a/sysutils/amanda-dev-server/patches/patch-bf b/sysutils/amanda-dev-server/patches/patch-bf new file mode 100644 index 00000000000..2c0ebe063f6 --- /dev/null +++ b/sysutils/amanda-dev-server/patches/patch-bf @@ -0,0 +1,23 @@ +$NetBSD: patch-bf,v 1.1.1.1 2002/05/02 13:28:16 bouyer Exp $ + +--- changer-src/scsi-changer-driver.c.orig Sun Feb 10 13:49:51 2002 ++++ changer-src/scsi-changer-driver.c Tue Apr 30 20:02:06 2002 +@@ -331,6 +331,18 @@ + GenericBarCode, + GenericSearch, + GenericSenseHandler}, ++ {"LXB", ++ "Overland LXB", ++ GenericMove, ++ GenericElementStatus, ++ GenericResetStatus, ++ GenericFree, ++ GenericEject, ++ GenericClean, ++ GenericRewind, ++ GenericBarCode, ++ GenericSearch, ++ GenericSenseHandler}, + /* + * And now the tape devices + */ diff --git a/sysutils/amanda-dev/DESCR b/sysutils/amanda-dev/DESCR new file mode 100644 index 00000000000..7942c84f1af --- /dev/null +++ b/sysutils/amanda-dev/DESCR @@ -0,0 +1,9 @@ +Amanda is a backup system designed to archive many computers on a network to a +single large-capacity tape drive. This is a package of a developement +snapshot of the 2.4.3 branch. + +This package does not contain anything by itself -- it is a +"meta-package" that depends on the amanda-client, amanda-server, +and amanda-plot packages. Its purpose is to require dependencies +so users can install this package only and have the complete +Amanda software pulled in by the port/package dependency mechanism. diff --git a/sysutils/amanda-dev/Makefile b/sysutils/amanda-dev/Makefile new file mode 100644 index 00000000000..bc369091af9 --- /dev/null +++ b/sysutils/amanda-dev/Makefile @@ -0,0 +1,25 @@ +# $NetBSD: Makefile,v 1.1.1.1 2002/05/02 13:28:15 bouyer Exp $ +# + +MASTER_SITES= # empty +DISTFILES= # empty + +COMMENT= The "meta-package" for Amanda, a network backup system + +DEPENDS+= amanda-client-${VERS}:../../sysutils/amanda-dev-client +DEPENDS+= amanda-server-${VERS}:../../sysutils/amanda-dev-server +DEPENDS+= amanda-plot-${VERS}:../../sysutils/amanda-dev-plot + +.include "../../mk/bsd.prefs.mk" +.include "../../sysutils/amanda-dev-common/Makefile.common" + +USE_X11= yes +EXTRACT_ONLY= # empty +NO_CHECKSUM= yes +NO_PATCH= yes +NO_CONFIGURE= yes +NO_BUILD= yes + +do-install: # empty + +.include "../../mk/bsd.pkg.mk" diff --git a/sysutils/amanda-dev/PLIST b/sysutils/amanda-dev/PLIST new file mode 100644 index 00000000000..7985ae05cea --- /dev/null +++ b/sysutils/amanda-dev/PLIST @@ -0,0 +1,2 @@ +@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/02 13:28:15 bouyer Exp $ +@comment this plist intentionally left empty |