/*
* $Id: amandates.c,v 1.21 2006/07/25 18:35:21 martinea Exp $
*
- * manage amandates file, that mimics /etc/dumpdates, but stores
+ * manage amandates file, that mimics /var/lib/dumpdates, but stores
* GNUTAR dates
*/
devname = amname_to_devname(amdp->name);
- if((dumpdf = fopen("/etc/dumpdates", "r")) == NULL) {
+ if((dumpdf = fopen("/var/lib/dumpdates", "r")) == NULL) {
amfree(devname);
return;
}
check_file(COMPRESS_PATH, X_OK);
if (need_dump || need_xfsdump ) {
- if (check_file_exist("/etc/dumpdates")) {
- check_file("/etc/dumpdates",
+ if (check_file_exist("/var/lib/dumpdates")) {
+ check_file("/var/lib/dumpdates",
#ifdef USE_RUNDUMP
F_OK
#else
} else {
#ifndef USE_RUNDUMP
if (access("/etc", R_OK|W_OK) == -1) {
- g_printf(_("ERROR [dump will not be able to create the /etc/dumpdates file: %s]\n"), strerror(errno));
+ g_printf(_("ERROR [dump will not be able to create the /var/lib/dumpdates file: %s]\n"), strerror(errno));
}
#endif
}
}
if (need_vdump) {
- if (check_file_exist("/etc/vdumpdates")) {
- check_file("/etc/vdumpdates", F_OK);
+ if (check_file_exist("/var/lib/vdumpdates")) {
+ check_file("/var/lib/vdumpdates", F_OK);
}
}
check_space(AMANDA_DBGDIR, (off_t)64); /* for amandad i/o */
#endif
+ check_space("/var/lib", (off_t)64); /* for /var/lib/dumpdates writing */
check_space("/etc", (off_t)64); /* for /etc/dumpdates writing */
}
}
--- /dev/null
+amanda (1:3.3.0-1) unstable; urgency=low
+
+ As of version 3.3.0, Amanda now uses bsdtcp as the default auth method,
+ and the package postinst scripts install a suitable inetd entry.
+
+ You may need to update existing amanda.conf files to reflect this change,
+ as such configs are often hand-crafted to meet site expectations.
+
+ You may also need to adjust inetd or xinetd configs to include both bsd
+ and bsdtcp auth methods if circumstances mandate keeping auth method bsd
+ active in your environment.
+
+ -- Bdale Garbee <bdale@gag.com> Tue, 13 Sep 2011 12:36:08 -0600
--- /dev/null
+.TH ACTIVATE-DEVPAY 1
+.SH NAME
+activate-devpay \- create the token and certificate files for Amazon S3
+.SH SYNOPSIS
+.B activate-devpay
+.SH "DESCRIPTION"
+This program creates the token and certificate files for Amazon Devpay's
+Simple Token Service (STS). You can then use those files with the S3 device.
+
+This manual page was written for the Debian GNU/Linux distribution
+because the original program does not have a manual page.
+
+.SH AUTHOR
+This manual page was written by Bdale Garbee <bdale@gag.com>,
+for the Debian GNU/Linux system (but may be used by others).
--- /dev/null
+Notes on making amanda-client work on a Debian system
+
+To get indexing (or specifically amrecover) to work right two things need
+to be done:
+
+1. If you're using tcpd, make sure to edit the server's /etc/hosts.allow and
+ allow all client machines into the daemon amandad
+
+2. Edit the server(s) ~backup/.amandahosts and add an entry like:
+ "<client_hostname> root"
+
+As always: for more complex setups consult the manpages and available
+documentation in /usr/share/doc/amanda-common ;-)
+
--- /dev/null
+usr/share/doc/amanda-client/examples
+usr/share/lintian/overrides
+var/lib/amanda/gnutar-lists
--- /dev/null
+example/amanda-client.conf
+example/amanda-client-postgresql.conf
+example/inetd.conf.amandaclient
+example/xinetd.amandaclient
--- /dev/null
+usr/lib/amanda/amandad
+usr/lib/amanda/application/*
+usr/lib/amanda/calcsize
+usr/lib/amanda/killpgrp
+usr/lib/amanda/patch-system
+usr/lib/amanda/rundump
+usr/lib/amanda/runtar
+usr/lib/amanda/selfcheck
+usr/lib/amanda/sendbackup
+usr/lib/amanda/sendsize
+usr/sbin/amfetchdump
+usr/sbin/amoldrecover
+usr/sbin/amrecover
+usr/sbin/amrestore
+usr/share/man/man5/amanda-client.conf.5.gz
+usr/share/man/man7/amanda-applications.7.gz
+usr/share/man/man8/amfetchdump.8.gz
+usr/share/man/man8/amrecover.8.gz
+usr/share/man/man8/amrestore.8.gz
--- /dev/null
+amanda-client: setuid-binary usr/lib/amanda/application/amgtar 4754 root/backup
+amanda-client: setuid-binary usr/lib/amanda/application/amstar 4754 root/backup
+amanda-client: setuid-binary usr/lib/amanda/calcsize 4754 root/backup
+amanda-client: setuid-binary usr/lib/amanda/killpgrp 4754 root/backup
+amanda-client: setuid-binary usr/lib/amanda/rundump 4754 root/backup
+amanda-client: setuid-binary usr/lib/amanda/runtar 4754 root/backup
+amanda-client: non-standard-dir-perm var/lib/amanda/ 0770 != 0755
+amanda-client: non-standard-dir-perm var/lib/amanda/gnutar-lists/ 0770 != 0755
+amanda-client: possible-gpl-code-linked-with-openssl
--- /dev/null
+debian/amoldrecover.8
--- /dev/null
+etc/xinetd.d
+usr/lib
+usr/share/doc/amanda-common/examples
+usr/share/lintian/overrides
--- /dev/null
+example/DLT.ps
+example/EXB-8500.ps
+example/HP-DAT.ps
+example/8.5x11.ps
+example/3hole.ps
+example/DLT-A4.ps
+example/DIN-A4.ps
--- /dev/null
+amanda-common: possible-gpl-code-linked-with-openssl
--- /dev/null
+#!/bin/sh -e
+
+. /usr/share/debconf/confmodule
+
+if [ "$1" = configure ]; then
+ if ! getent passwd backup; then
+ adduser --quiet --system --no-create-home --home /var/backups \
+ --shell /bin/sh --uid 34 --gid 34 backup
+ fi
+
+ if [ ! -f /var/backups/.profile ]; then
+ echo 'PATH="$PATH:/usr/sbin"' > /var/backups/.profile
+ fi
+
+ groupadd -f -g 34 backup
+ groupadd -f -g 26 tape
+
+ adduser backup disk
+ adduser backup tape
+
+ # in case we get installed first
+ if [ ! -d /var/lib/amanda ]; then
+ mkdir -p /var/lib/amanda
+ fi
+
+ # try to handle a /var/lib/amandates file, since we created it
+ # incorrectly in previous versions of the amanda packages for Debian
+ if [ -f /var/lib/amandates ]; then
+ if [ ! -f /var/lib/amanda/amandates ]; then
+ mv /var/lib/amandates /var/lib/amanda/amandates
+ fi
+ fi
+
+ # make sure amandates exists and has the right perms
+ if [ ! -f /var/lib/amanda/amandates ]; then
+ touch /var/lib/amanda/amandates
+ fi
+ chown backup:backup /var/lib/amanda/amandates
+
+ # make sure user backup has a home directory
+ if [ ! -d ~backup ]; then
+ mkdir -p ~backup
+ fi
+
+ # make sure there is a .amandahosts symlink
+ if [ ! -L ~backup/.amandahosts ]; then
+ ln -sf /etc/amandahosts ~backup/.amandahosts
+ fi
+
+ # make sure /var/log/amanda exists
+ if [ ! -d /var/log/amanda ]; then
+ mkdir -p /var/log/amanda
+ fi
+
+ chown backup:backup ~backup/.amandahosts /etc/amandahosts \
+ /var/log/amanda
+ chmod 600 ~backup/.amandahosts /etc/amandahosts
+ chmod 770 /var/log/amanda
+fi
+
+update-inetd --add "amanda stream tcp nowait backup /usr/lib/amanda/amandad amandad -auth=bsdtcp amdump amindexd amidxtaped"
+
+#DEBHELPER#
--- /dev/null
+#!/bin/sh -e
+case "$1" in
+ purge)
+ if [ -d /var/log/amanda ]; then
+ rm -rf /var/log/amanda
+ fi
+ if [ -d /var/lib/amanda-gnutar-lists ]; then
+ rm -rf /var/lib/amanda-gnutar-lists
+ fi
+ if [ -d /var/lib/amanda-index ]; then
+ rm -rf /var/lib/amanda-index
+ fi
+ if [ -d /var/lib/amanda ]; then
+ rm -rf /var/lib/amanda
+ fi
+ # keep this around to clean up after old, broken amanda packages
+ # new packages have amandates in /var/lib/amanda...
+ if [ -f /var/lib/amandates ]; then
+ rm -f /var/lib/amandates
+ fi
+
+ rm -f ~backup/.amandahosts
+
+ ;;
+ remove|upgrade|deconfigure)
+ ;;
+
+ failed-upgrade)
+ ;;
+
+ *)
+ echo "unknown argument --> $1" >&2
+ exit 0
+ ;;
+esac
+
+#DEBHELPER#
--- /dev/null
+#!/bin/sh -e
+
+# if a .amandahosts exists and is not a symlink, move it to /etc
+if [ ! -L ~backup/.amandahosts ]
+then
+ if [ -f ~backup/.amandahosts ]
+ then
+ mv -f ~backup/.amandahosts /etc/amandahosts
+ fi
+fi
+
+#DEBHELPER#
--- /dev/null
+#!/bin/sh -e
+
+update-inetd --remove "amanda"
+
+#DEBHELPER#
--- /dev/null
+amanda for DEBIAN
+-----------------
+
+Since every Amanda installation is different, there is some work you need to
+do to configure your server. For a simple setup, as root you need to:
+
+1. Create a directory under /etc/amanda for your backup config, we'll assume
+ a name 'DailySet1' as our example.
+
+ mkdir /etc/amanda/DailySet1
+
+ Make sure that /etc/amanda and all the files under it are owner and group
+ backup with directory permissions of 770 and file permissions of 660.
+
+2. populate this directory with config files. At a minimum, you need
+ amanda.conf and disklist.
+
+ cp /usr/share/doc/amanda-server/examples/amanda.conf \
+ /etc/amanda/DailySet1/amanda.conf*
+ cp /usr/share/doc/amanda-server/examples/disklist \
+ /etc/amanda/DailySet1/disklist
+
+ Edit these files as needed, following the instructions in each file.
+
+3. Make sure that /etc/amanda and all the files under it are owner and group
+ backup with directory permissions of 770 and file permissions of 660.
+
+ chown -R backup:backup /etc/amanda
+
+3. Prepare the "holding disk" if you plan to use one (highly recommended!) by
+ ensuring user backup can access it. See the note below indicating that it
+ may be better to use a subdirectory and not a mount point to avoid having
+ system artifacts like the lost+found directory confuse things.
+
+ chown -R backup:backup <holding disk location>
+
+4. Install a suitable crontab for user backup. If you used DailySet1 as your
+ configuration name, you can just install the provided example. If you
+ picked some other name, you will obviously need to edit a copy of the
+ example before installing it.
+
+ crontab -u backup /usr/share/doc/amanda-server/examples/crontab.amanda
+
+To use all of Amanda's features, you probably also want to put each client
+machine's root user in the .rhosts or .amandahosts for ~backup on the server
+machine. On Debian systems, this is usually linked to /etc/amandahosts, but
+if you have clients running other operating systems you'll have to find the
+right place yourself.
+
+NOTE: If you want to backup your server too, you need to treat it as both a
+client *and* a server, see /usr/share/doc/amanda-client/README.Debian for
+more information.
+
+For more complex setups, consult the manpages and the extra documents and
+example files in /usr/share/doc/amanda-common, or look at www.amanda.org on
+the web.
+
+Another Note: if you use floppy tapes you have to use the sftape interface
+for use with ftape(>=3.03).
+
+Jean Pierre LeJacq <jplejacq@mail.quoininc.com> reports the following about
+his experience using ftape:
+
+ I'm using ftape successfully with amanda but only after
+ struggling. The crucial trick was to set the block size with with ftmt to
+ be the same as used by amanda. I've implemented this with this entry in
+ /etc/modules.conf:
+
+ alias char-major-27 zftape
+ pre-install zftape /sbin/swapout 5
+ post-install zftape /bin/ftmt -f /dev/nzqft0 setblk 32768
+
+To ease use with firewalls, Amanda has been built with options restricting the
+use of TCP to the port range 50000-50100, and UDP to the port range 840-860.
+
+Sam Johnston <samj@samj.net> reported problems with an Amanda server on which
+bastille was used with the "restrict system resources" option. See bug
+118616 in the Debian bug tracking system for more information.
+
+If you choose to use the SSH authentication method and associated transport,
+please be aware that there may be problems if /usr/lib/amanda/dumper is suid.
+You can fix this on your server with chmod u-s /usr/lib/amanda/dumper, or
+investigate dpkg-statoverride.
+
+Concerns have been expressed about the reliability of 'dump' as a backup tool
+on live Linux systems. Nothing can guarantee a consistent and meaningful
+backup of a live filesystem under all circumstances, and the maintainer of
+these packages uses dump with good results.
+
+The tar utility is 'essential' in Debian and so will always be around, is not
+tied to any specific filesystem type, and there are entries in the default
+amanda.conf file defining dump types using tar. This may therefore be a good
+option to consider.
+
+Note that if you are using tar with amanda, and getting errors about missing
+exclude files (particularly on upgrades from older versions), then you may
+need to update your dumptypes definition to explicitly indicate that the
+exclude file is optional, as shown in this example:
+
+ define dumptype userdata-lowvalue {
+ program "GNUTAR"
+ comment "Low value user data dumped with tar"
+ options compress-fast, index
+ exclude list optional ".amandaexclude"
+ priority low
+ }
+
+- - - - -
+
+If you see backups failing with an error like:
+
+ driver: FATAL flush line 1: syntax error (skipping != FLUSH)
+
+The problem may be that some versions of Amanda around 2.5.2 are not
+happy if there are unexpected contents in the holdingdisk you have
+defined on the server. This can occur, for example, if you are using
+the mount point of a separate filesystem that contains a lost+found
+directory. The quick fix is to create a subdirectory in that partition
+for Amanda to use that will have no such unexpected contents. For more
+info on this issue see:
+
+ http://forums.zmanda.com/archive/index.php/t-591.html
+
+- - - - -
+
+If you see things like this in dmesg:
+
+ INFO: task ammt:9839 blocked for more than 120 seconds.
+ "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message.
+
+This information from Marc Schaefer may relevant:
+
+> AFAIK it's because mtio operations are done in D state (uninterruptible
+> sleep).
+>
+> And except for mtio operations which may last more than two minutes,
+> nothing in the usual kernel operation will last that long.
+>
+> Solutions:
+> - either fix mtio to be interruptible (which may well cause problems
+> because e.g. SCSI reselection might happen later)
+> - use the proposed work-around
+> - ignore those messages in your logcheck.
+
--- /dev/null
+etc/amanda
+etc/xinetd.d
+usr/sbin
+usr/share/doc/amanda-server/examples
+usr/share/lintian/overrides
+var/lib/amanda
--- /dev/null
+debian/crontab.amanda
+example/chg-multi.conf
+example/chg-scsi.conf
+example/disklist
+example/amanda.conf
+example/inetd.conf.amandaserver
+example/xinetd.amandaserver
+example/template.d/dumptypes
+example/template.d/tapetypes
+example/template.d/README
+example/template.d/chg-manual.conf
+example/template.d/advanced.conf
+example/template.d/amanda-harddisk.conf
+example/template.d/amanda-single-tape.conf
+example/template.d/amanda-tape-changer.conf
+example/template.d/amanda-S3.conf
--- /dev/null
+usr/lib/amanda/amcat.awk
+usr/lib/amanda/amidxtaped
+usr/lib/amanda/amindexd
+usr/lib/amanda/amlogroll
+usr/lib/amanda/amplot.*
+usr/lib/amanda/amtrmidx
+usr/lib/amanda/amtrmlog
+usr/lib/amanda/chg-*
+usr/lib/amanda/driver
+usr/lib/amanda/dumper
+usr/lib/amanda/planner
+usr/lib/amanda/taper
+usr/sbin/activate-devpay
+usr/sbin/amadmin
+usr/sbin/amcheck
+usr/sbin/amcheckdb
+usr/sbin/amcheckdump
+usr/sbin/amcleanup
+usr/sbin/amcleanupdisk
+usr/sbin/amdump
+usr/sbin/amflush
+usr/sbin/amgetconf
+usr/sbin/amlabel
+usr/sbin/amoverview
+usr/sbin/amplot
+usr/sbin/amreport
+usr/sbin/amrmtape
+usr/sbin/amstatus
+usr/sbin/amtape
+usr/sbin/amtapetype
+usr/sbin/amtoc
+usr/share/man/man8/amadmin.8.gz
+usr/share/man/man8/amanda.8.gz
+usr/share/man/man8/amcheck.8.gz
+usr/share/man/man8/amcheckdb.8.gz
+usr/share/man/man8/amcheckdump.8.gz
+usr/share/man/man8/amcleanup.8.gz
+usr/share/man/man8/amdump.8.gz
+usr/share/man/man8/amflush.8.gz
+usr/share/man/man8/amgetconf.8.gz
+usr/share/man/man8/amlabel.8.gz
+usr/share/man/man8/amoverview.8.gz
+usr/share/man/man8/amplot.8.gz
+usr/share/man/man8/amreport.8.gz
+usr/share/man/man8/amrmtape.8.gz
+usr/share/man/man8/amstatus.8.gz
+usr/share/man/man8/amtape.8.gz
+usr/share/man/man8/amtapetype.8.gz
+usr/share/man/man8/amtoc.8.gz
--- /dev/null
+amanda-server: non-standard-dir-perm etc/amanda/ 0770 != 0755
+amanda-server: setuid-binary usr/lib/amanda/dumper 4754 root/backup
+amanda-server: setuid-binary usr/lib/amanda/planner 4754 root/backup
+amanda-server: setuid-binary usr/sbin/amcheck 4754 root/backup
+amanda-server: non-standard-dir-perm var/lib/amanda/ 0770 != 0755
+amanda-server: possible-gpl-code-linked-with-openssl
--- /dev/null
+debian/activate-devpay.1
--- /dev/null
+localhost backup
--- /dev/null
+.TH AMOLDRECOVER 8
+.SH NAME
+amoldrecover \- amrecover variant compantible with old Amanda protocols
+.SH "DESCRIPTION"
+This program has the same syntax and functionality as amrecover, but uses
+the older amidxtaped/amindexd protocol. It is provided only for compatibility
+with old Amanda releases.
+
+This manual page was written for the Debian GNU/Linux distribution
+because the original program does not have a manual page.
+
+.SH "SEE ALSO"
+.PP
+\fBamrecover\fR(8),
+
+.SH AUTHOR
+This manual page was written by Bdale Garbee <bdale@gag.com>,
+for the Debian GNU/Linux system (but may be used by others).
--- /dev/null
+amanda (1:3.3.2-1) UNRELEASED; urgency=low
+
+ * new upstream version, closes: #697783
+ * fix hard-coded amandabackup user in many scripts and docs, closes: #693333
+ * fix amserverconfig trying to create /var/lib/lib/amanda, closes: #693331
+
+ -- Bdale Garbee <bdale@gag.com> Mon, 08 Oct 2012 17:50:43 -0600
+
+amanda (1:3.3.1-4) unstable; urgency=low
+
+ * eliminate spurious empty /var/log/amanda directory in amanda-server package
+ that generates piuparts errors, closes: #681568
+
+ -- Bdale Garbee <bdale@gag.com> Sat, 14 Jul 2012 15:14:22 -0600
+
+amanda (1:3.3.1-3) unstable; urgency=low
+
+ * patch from Robert Milan to fix kfreebsd FTBFS, closes: #667836
+ * patch from amanda-users mailing list via Jose Manuel dos Santos Calhariz
+ that fixes amrecover issue with VTAPE access, closes: #666088
+
+ -- Bdale Garbee <bdale@gag.com> Thu, 12 Apr 2012 23:29:14 -0600
+
+amanda (1:3.3.1-2) unstable; urgency=low
+
+ * patch from Michael Biebl to elide g_queue_free_full definition that
+ conflicts with glib 2.32 but isn't actually used, closes: #665675
+
+ -- Bdale Garbee <bdale@gag.com> Tue, 03 Apr 2012 07:18:07 -0700
+
+amanda (1:3.3.1-1) unstable; urgency=low
+
+ * new upstream version, closes: #655025, #658933
+ * enable hardening build flags, closes: #644437
+ * include Indonesian translation, closes: #658482
+ * relax build-deps by having dump and xfsdump only required on linux-any,
+ to allow amanda to build on kFreeBSD, closes: #661702
+ * clean up and expand the delivery of examples, closes: #496286, #647550
+
+ -- Bdale Garbee <bdale@gag.com> Tue, 20 Mar 2012 14:59:38 +0100
+
+amanda (1:3.3.0-1) unstable; urgency=low
+
+ * new upstream version, closes: #641453
+ * lots of packaging cleanup
+ * consolidate inetd and xinetd config handling in amanda-common package
+ * add a NEWS entry explaining the switch to bsdtcp auth as default
+
+ -- Bdale Garbee <bdale@gag.com> Tue, 13 Sep 2011 12:42:40 -0600
+
+amanda (1:3.2.1-1.1) unstable; urgency=low
+
+ * non-maintainer upload
+ * clear dependency_libs in *.la files, closes: #621214
+
+ -- Luk Claes <luk@debian.org> Sat, 28 May 2011 17:04:18 +0200
+
+amanda (1:3.2.1-1) unstable; urgency=low
+
+ * new upstream version, closes: #613178
+ * enable support for Amazon S3 storage on request from Christopher McCrory
+ * fix for dh_perl usage to include private library, closes: #582220
+ * merge updated Vietnamese debconf translation, closes: #601919
+ * merge updated Danish debconf translation, closes: #608435
+ * merge updated Arabic debconf translation, closes: #596178
+
+ -- Bdale Garbee <bdale@gag.com> Sun, 27 Feb 2011 11:54:58 -0700
+
+amanda (1:3.2.0-1) unstable; urgency=low
+
+ * new upstream version
+
+ -- Bdale Garbee <bdale@gag.com> Wed, 01 Dec 2010 20:39:49 -0700
+
+amanda (1:3.1.0-1) unstable; urgency=low
+
+ * new upstream version
+
+ -- Bdale Garbee <bdale@gag.com> Mon, 14 Jun 2010 13:46:03 -0600
+
+amanda (1:2.6.1p2-2) unstable; urgency=low
+
+ * add build depend on procps, closes: #552390
+ * add dh_perl call to rules and ${perl:Depends} to amanda-common deps so
+ that we comply with Perl policy, closes: #582220
+
+ -- Bdale Garbee <bdale@gag.com> Mon, 14 Jun 2010 10:21:11 -0600
+
+amanda (1:2.6.1p2-1) unstable; urgency=low
+
+ * new upstream version
+ * move more files out of amanda-common that really belong elsewhere
+ * deliver /usr/lib/amanda/application/am[gs]tar setuid, closes: #558094
+ * leave user backup groups alone on purge, closes: #572933
+
+ -- Bdale Garbee <bdale@gag.com> Mon, 15 Mar 2010 15:23:20 -0600
+
+amanda (1:2.6.1p1-2) unstable; urgency=low
+
+ * calcsize needs to be setuid, closes: #551156
+ * patch from upstream to fix init of xml_app.result in diskfile.c,
+ closes: #550098
+ * add note to server package README.Debian regarding mtio operations that
+ take too long putting noise in dmesg, closes: #506397
+ * merge Finnish translation of the debconf templates, closes: #535214
+
+ -- Bdale Garbee <bdale@gag.com> Fri, 16 Oct 2009 02:10:52 -0600
+
+amanda (1:2.6.1p1-1) unstable; urgency=low
+
+ * new upstream version, closes: #527090, #527489, #486405, #488713
+ * tweak configure to ensure ssh support is enabled, closes: #524618, #492352
+ * update debian/control to include my git packaging repo location
+ * resolve possible bashisms, closes: #530041
+
+ -- Bdale Garbee <bdale@gag.com> Tue, 08 Sep 2009 11:40:42 -0600
+
+amanda (1:2.5.2p1-5) unstable; urgency=low
+
+ * add --without-ipv6 as a short-term fix for amdump connectivity problems,
+ closes: #482754, #501281, #470202
+
+ -- Bdale Garbee <bdale@gag.com> Thu, 26 Mar 2009 22:52:51 -0600
+
+amanda (1:2.5.2p1-4) unstable; urgency=high
+
+ * high priority bug fixes intended for lenny release
+ * update version thresholds in Replaces to ease upgrades, closes: #476583
+ * don't set maxdumpsize in the default amanda.conf, closes: #475524
+ * freshen to latest standards version
+ * revert chg-multi.sh.in and patch since the new version previously pulled
+ in caused more problems than it solved, closes: #486384
+ * undo traps on amverify exit to prevent double reports, closes: #487405
+ * correct paths in amcrypt-ossl-asym(8) xml source, closes: #486739
+
+ -- Bdale Garbee <bdale@gag.com> Sat, 16 Aug 2008 16:03:27 -0300
+
+amanda (1:2.5.2p1-3) unstable; urgency=low
+
+ * fix "bashisms" in the amcleanup and amverify scripts. closes: #464489
+ * merge updated Russian translation, closes: #471030
+ * move example configuration 'DailySet1' from /etc/amanda to
+ /usr/share/doc/amanda-server/examples to reduce confusion, update
+ the amanda-server README.Debian with fresh install notes. closes: #420023
+ * move some binaries out of amanda-common into -server and -client
+ * harden forcing of /usr/bin/mail instead of /usr/bin/Mail, closes: #475771
+
+ -- Bdale Garbee <bdale@gag.com> Wed, 16 Apr 2008 00:02:13 -0600
+
+amanda (1:2.5.2p1-2) unstable; urgency=low
+
+ * document holding disk constraint in amanda-server README.Debian file,
+ closes: #465746
+ * patch from Wolfgang Weisselberg for a problem in amstatus, closes: #471240
+ * enable both with-bsdtcp-security and with-bsdudp-security in configure,
+ perhaps that will help resolve some of the problems users are having
+ with 2.5.2?
+
+ -- Bdale Garbee <bdale@gag.com> Thu, 20 Mar 2008 18:06:58 -0600
+
+amanda (1:2.5.2p1-1) unstable; urgency=low
+
+ * new upstream version, closes: #434607, #434606
+ * pull fresher chg-multi.sh.in from upstream to fix syntax error
+ * drop reference to non-existent 'taper' package in control, closes: #444330
+ * a number of tweaks to address issues found by lintian
+ * incorporate Galician translation, closes: #414113
+
+ -- Bdale Garbee <bdale@gag.com> Sun, 07 Oct 2007 18:39:45 -0600
+
+amanda (1:2.5.1p3-3) unstable; urgency=low
+
+ * fix amcrypt-ossl and amcryopt-ossl-asym to use the right username for
+ Debian systems, closes: #417818
+ * patch from upstream for problem in get_fs_stats(), closes: #420100
+ * patch from upstream for problem in sendsize.c, closes: #420076
+ * replace netbase dependency with update-inetd
+
+ -- Bdale Garbee <bdale@gag.com> Tue, 15 May 2007 11:44:34 -0600
+
+amanda (1:2.5.1p3-2) unstable; urgency=low
+
+ * fold in diff from NMU of 1:2.5.1p1-2.1 by Peter Palfrader, closes: #399790
+ Do not fail postrm when removing the backup user from either
+ group disk or tape does not succeed. Also, try this only
+ when the backup user is in those groups to begin with. Also
+ handles the case of deluser not existing anymore.
+ Based in parts on the patch provided by Andreas Henriksson and
+ the cupsys postinst script.
+ * remove useless redundant clause in postrm, closes: #411739
+
+ -- Bdale Garbee <bdale@gag.com> Wed, 21 Feb 2007 04:22:49 +0900
+
+amanda (1:2.5.1p3-1) unstable; urgency=low
+
+ * new upstream version, closes: #402221
+ * merge updated es.po, closes: #409316
+ * merge updated pt.po, closes: #409697
+ * fix for segfault in amfetchdump, closes: #411470
+ * update inetd and xinetd configs for new security model, closes: #402215
+
+ -- Bdale Garbee <bdale@gag.com> Tue, 20 Feb 2007 13:05:28 +0900
+
+amanda (1:2.5.1p1-2) unstable; urgency=medium
+
+ * fix broken way of setting default CLN_AMANDATES in client-src/clientconf.c
+ so that the file ends up where we expect it, closes: #394796
+ * make this medium priority because of the amandates location problem
+ * updated German translation, closes: #396029
+
+ -- Bdale Garbee <bdale@gag.com> Sun, 29 Oct 2006 11:24:39 -0700
+
+amanda (1:2.5.1p1-1) unstable; urgency=low
+
+ * new upstream version, closes: #395319
+
+ -- Bdale Garbee <bdale@gag.com> Thu, 26 Oct 2006 15:29:08 -0600
+
+amanda (1:2.5.1-1) unstable; urgency=low
+
+ * new upstream version, closes: #361716
+ * incorporate patch from NMU by Martin Krafft based on a suggestion by
+ Bill Alombert (thanks!), accounting for the fact that we now deliver
+ content in amanda-common that used to be in amanda-client, closes: #391026
+ * updated ja.po from Hideki Yamane, closes: #392153
+ * change debconf notification about old/rare conflict with amandadates file
+ to be of type 'error' instead of 'note', closes: #388707
+ * add --with-ssh-security to configure and note issue with suid of dumper
+ to README.Debian, closes: #365306
+
+ -- Bdale Garbee <bdale@gag.com> Wed, 18 Oct 2006 01:02:23 -0600
+
+amanda (1:2.5.0p2-2) unstable; urgency=low
+
+ * merge updated French translation, closes: #369243
+ * merge updated Italian translation, closes: #369588
+ * merge updated Czech translaterion, closes: #370299
+ * merge updated Dutch translaterion, closes: #374850
+ * merge updated Swedish translaterion, closes: #375747
+ * rework postinst to use adduser instead of usermod to add user backup to
+ groups disk and tape, and add postrm support for removing user backup from
+ those groups on purge, closes: #380336
+ * patch from upstream 2.5.1b1 via Geert Uytterhoeven to support tar 1.15.91,
+ closes: #378558
+ * accept patch from Raphael Pinson adding xinetd support
+ * Clean debian/po/templates.pot after build
+
+ -- Bdale Garbee <bdale@gag.com> Mon, 28 Aug 2006 09:15:23 -0400
+
+amanda (1:2.5.0p2-1) unstable; urgency=low
+
+ * new upstream version
+ * freshen delivered default amanda.conf, closes: #359036
+
+ -- Bdale Garbee <bdale@gag.com> Thu, 25 May 2006 22:59:16 -0600
+
+amanda (1:2.5.0-2) unstable; urgency=low
+
+ * tighten amandahosts permissions to user-only in the amanda-common postinst
+
+ -- Bdale Garbee <bdale@gag.com> Mon, 3 Apr 2006 05:03:29 -0700
+
+amanda (1:2.5.0-1) unstable; urgency=low
+
+ * new upstream version, closes: #360085
+ * add --with-maxtapeblocksize=256 to configure, to better support LTO-3
+ tapes like the HP Ultrium 960
+ * tweak packaging to handle changes in upstream makefiles, etc
+ * fix overlong line in amrestore man page synopsys
+ * move private shlibs to the amanda-common package to simplify deps
+
+ -- Bdale Garbee <bdale@gag.com> Mon, 3 Apr 2006 00:28:17 -0700
+
+amanda (1:2.4.5p1-2) unstable; urgency=low
+
+ * now that we're using it for debugging info, make sure /var/log/amanda
+ exists in the amanda-common postinst
+
+ -- Bdale Garbee <bdale@gag.com> Thu, 29 Dec 2005 11:57:11 -0700
+
+amanda (1:2.4.5p1-1) unstable; urgency=low
+
+ * new upstream version
+ * add --with-debugging=/var/log/amanda to avoid potentially insecure use
+ of /tmp, closes: #226139
+ * fix typo in chg-null.sh.in causing it to not use AMANDA_DBGDIR definition
+ * patch chg-null.sh.in to use defined value of tapedev, closes: #219656
+ * patch from Jan Nordholz to fix off-by-one error, closes: #339588
+ * fix misleading usage example in amtoc man page, closes: #297690
+ * add a note to amanda-server's README.Debian about how to keep missing
+ exclude files from making tar not work, closes: #168229, #185312, #186285
+ * fix bogus reported sizes when using dump caused by assuming dump is
+ reporting 512 byte instead of 1k blocks, closes: #234173
+ Debian reports results in 1k, not 512-byte blocks,
+ * remove globbing example from amanda man page that is hopelessly broken
+ and generating man errors
+
+ -- Bdale Garbee <bdale@gag.com> Thu, 29 Dec 2005 01:36:23 -0700
+
+amanda (1:2.4.5-2) unstable; urgency=low
+
+ * merge Arabic translation, closes: #320759
+ * merge Vietnamese translation, closes: #307735
+ * allow debconf-2.0 as a dependency alternative
+ * update dependencies in light of libreadline5-dev, closes: #326390
+ * don't blindly remove non-conffiles in /etc/amanda, closes: #282772
+ * fix strange dump results with smbclient 3.0, closes: #226798, #313553
+ * pass --numeric-owner to tar from sendsize to improve estimation speed
+ on systems using mixed libnss modules, closes: #247661
+ * have amanda-common postinst add /usr/sbin to backup user's path,
+ closes: #74045
+
+ -- Bdale Garbee <bdale@gag.com> Wed, 28 Sep 2005 00:16:44 -0600
+
+amanda (1:2.4.5-1) unstable; urgency=low
+
+ * new upstream version, closes: #299586, #308559
+
+ -- Bdale Garbee <bdale@gag.com> Fri, 3 Jun 2005 09:02:42 -0600
+
+amanda (1:2.4.4p3-3) unstable; urgency=low
+
+ * use /usr/bin/mail instead of /usr/bin/Mail, closes: #296022
+ * incorporate Czech translation from Miroslav Kure, closes: #297596
+
+ -- Bdale Garbee <bdale@gag.com> Sun, 29 May 2005 17:02:16 +0200
+
+amanda (1:2.4.4p3-2) unstable; urgency=low
+
+ * add killpgrp to the set of setuid root:backup executables in the
+ amanda-client package, closes: #266520
+
+ -- Bdale Garbee <bdale@gag.com> Wed, 18 Aug 2004 12:55:21 -0600
+
+amanda (1:2.4.4p3-1) unstable; urgency=low
+
+ * new upstream version
+ * incorporate nl.po from Luk Claes, closes: #240071
+ * incorporate it.po from Luca Monducci, closes: #249171
+
+ -- Bdale Garbee <bdale@gag.com> Sat, 24 Jul 2004 00:17:50 -0600
+
+amanda (1:2.4.4p2-2) unstable; urgency=high
+
+ * don't assume /var/backups is owned by user backup in the postinst,
+ closes: #238069, #218135
+ * fix README.Debian pathnames in descriptions, closes: #225849, #225856
+ * include Japanese debconf translation, closes: #235321
+ * include upstream changelog in amanda-common, closes: #227033
+
+ -- Bdale Garbee <bdale@gag.com> Sun, 14 Mar 2004 23:35:13 -0700
+
+amanda (1:2.4.4p2-1) unstable; urgency=low
+
+ * new upstream version, closes: #228697
+
+ -- Bdale Garbee <bdale@gag.com> Sun, 15 Feb 2004 19:38:11 -0700
+
+amanda (1:2.4.4p1-2) unstable; urgency=low
+
+ * patch to fix problem using samba3, closes: #214845
+ * add AUTHORS, NEWS, and README to the set of docs delivered, closes: #81068
+ * add a note to the amanda-server README.Debian regarding the interaction
+ with bastille's 'restrict system resources' option, closes: #118616
+ * add a note to the amanda-server README.Debian regarding the concerns
+ about the reliability of 'dump', closes: #198060
+ * though amverify now exits instead of hanging if mt is not present, make
+ amanda-server suggest cpio|mt-st to get an mt anyway, closes: #155181
+ * apply patch for chg-scsi.c from Chirik to make emubarcode option work,
+ closes: #214519
+ * include pt.po from Bruno Rodrigues, closes: #216390
+
+ -- Bdale Garbee <bdale@gag.com> Fri, 24 Oct 2003 01:49:29 -0600
+
+amanda (1:2.4.4p1-1) unstable; urgency=low
+
+ * new upstream version, closes: #210324
+ * make rundump setuid like runtar, closes: #193982
+ * switch to gettext-based debconf templates, closes: #198101
+ * stop forcing ownership of ~backup to avoid security issues posed by other
+ packages writing there as root, closes: #198944
+ * limit port ranges to ease use with firewalls, semi-arbitrarily picking
+ ranges TCP 50000-50100 and UDP 840-860, closes: #65109, #89432, #111882
+ * remove ~backup/.amandahosts symlink in postrm on purge, closes: #198949
+
+ -- Bdale Garbee <bdale@gag.com> Sun, 14 Sep 2003 23:21:00 -0600
+
+amanda (1:2.4.4-2) unstable; urgency=low
+
+ * mark amanda-server as replacing files in older amanda-common to ease
+ upgrading, closes: #190185, #191626
+
+ -- Bdale Garbee <bdale@gag.com> Fri, 2 May 2003 10:50:44 -0600
+
+amanda (1:2.4.4-1) unstable; urgency=low
+
+ * new upstream version, closes: #169634, #182397, #182882
+ * updates the README.Debian files, closes: #189228, #189229
+ * change mailx from suggests to depends, closes: #187283
+ * correct instructions in amanda-client's README.Debian, closes: #180179
+ * patch from Brad Roberts, also submitted upstream, that fixes problems
+ with amflush sometimes ending up in an infinite loop inside the libc
+ memory allocation code, closes: #169537
+ * merge Danish templates translation, closes: #174740
+ * update chg-zd-mtx to include definition of cleancycle, the code using it
+ is already fixed in 2.4.3, closes: #169634
+ * remove explicit suggests on awk, since some flavor of awk is essential
+ * add lintian overrides files to squelch noise about conscious decisions
+
+ -- Bdale Garbee <bdale@gag.com> Sun, 20 Apr 2003 01:14:33 -0600
+
+amanda (1:2.4.3-1) unstable; urgency=low
+
+ * new upstream version, closes: #127801, #163844, #167021, #165522, #127801
+ * this version does not hard-code the sed path, closes: #161850, #151962
+ * have clean target in rules file update config.sub/guess
+ * clean up postinst files to only call ldconfig when configuring
+ * move to newer debhelper compatibility mode
+ * fix typo in postinst creation of group tape, closes: #165640
+ * enable support for XFS filesystems by adding xfsdump to the list of
+ required build dependencies, closes: #143913, #110731
+
+ -- Bdale Garbee <bdale@gag.com> Wed, 6 Nov 2002 02:39:58 -0700
+
+amanda (1:2.4.2p2-4) unstable; urgency=low
+
+ * add mtx to the list of build dependencies so support for it gets included
+ * merge chg-zd-mtx.sh.in from 2.5.0 CVS, since it actually works with our
+ current mtx, closes: #136571
+ * merge french templates translation, closes: #138521
+ * merge russian templates translation, closes: #137616
+ * switch to unmerged templates files in the source package
+
+ -- Bdale Garbee <bdale@gag.com> Tue, 2 Apr 2002 00:43:13 -0700
+
+amanda (1:2.4.2p2-3) unstable; urgency=medium
+
+ * solve problem reported as bug 112691 a different way, to back out the
+ change made for -2 that had disasterous side-effects... instead of messing
+ with configure options, just eliminate chg-mtx since it's not useful and
+ the mtx package provides mtx-changer which works.
+ Closes: #119495, #119546, #119352, #119361, #119549, #119665
+ * add lpr to build dependencies, closes: #119399, #108607
+ * change the fix for duplicate dependencies on amanda-common so that it's
+ the versioned flavor we preserve, so all the pieces stay in sync
+
+ -- Bdale Garbee <bdale@gag.com> Wed, 14 Nov 2001 21:41:11 -0700
+
+amanda (1:2.4.2p2-2) unstable; urgency=medium
+
+ * add configure option to keep chg-mtx, et al, from writing to files in
+ in /tmp insecurely, closes: #112691
+ * merge in -pt_BR template translation, closes: #106129
+ * fix duplicate dependencies on amanda-common, closes: #118639, #118642
+
+ -- Bdale Garbee <bdale@gag.com> Fri, 9 Nov 2001 10:30:27 -0700
+
+amanda (1:2.4.2p2-1) unstable; urgency=low
+
+ * new upstream version, closes: #93449
+ * freshen config.sub/guess again
+ * fix problem with tapetype install using wrong libtool, closes: #104772
+ * various minor cleanups in the rules file to reduce warnings
+
+ -- Bdale Garbee <bdale@gag.com> Thu, 19 Jul 2001 23:26:33 -0600
+
+amanda (1:2.4.2-6) unstable; urgency=low
+
+ * freshen config.sub/guess for ia64 and hppa, closes: #90182
+ * amanda tests for -E or -S for estimates from dump during configure, and
+ is selecting -S now with the dump in sid. The latest amanda and latest
+ dump therefore should work fine together, closes: #91859
+ * update build-depends from perl5 to perl
+
+ -- Bdale Garbee <bdale@gag.com> Wed, 4 Apr 2001 15:43:52 -0600
+
+amanda (1:2.4.2-5) unstable; urgency=low
+
+ * add an explicit dependency in the rules file on /usr/bin/smbclient, since
+ the Build-Depends: line in the control file isn't checked automatically,
+ and the configure will happily build amanda without smbclient support if
+ it isn't installed... which is *not* what we want! closes: #85965
+
+ -- Bdale Garbee <bdale@gag.com> Wed, 14 Feb 2001 11:33:06 -0700
+
+amanda (1:2.4.2-4) unstable; urgency=low
+
+ * lose the ftape-util build dependency, nobody wanted it and it's causing
+ various problems. closes: #85516, #85708
+
+ -- Bdale Garbee <bdale@gag.com> Mon, 12 Feb 2001 21:54:31 -0700
+
+amanda (1:2.4.2-3) unstable; urgency=low
+
+ * lose the dh_suidregister calls, since it's obsolete, closes: #85334
+ * add build-depend on ftape-util so that configure will find and know how to
+ use that technology, even though nobody has ever actually asked me about
+ it who wanted to use it... closes: #83287
+ * fold in contributed template translations, closes: #83479, #84839, #84867
+ * if ~backup/.amandahosts isn't a link, use 'su -c backup' when creating it
+ to be compatible with NFS-mounted home directories. It would be cleaner,
+ of course, to train Amanda to use the real file which I now place in /etc
+ directly, but that can wait for another day. closes: #83554
+
+ -- Bdale Garbee <bdale@gag.com> Fri, 9 Feb 2001 11:42:31 -0700
+
+amanda (1:2.4.2-2) unstable; urgency=low
+
+ * make sure /etc/amandahosts has correct owner/group/perms in postinst,
+ closes: #80941
+ * update dependency information since some files moved from amanda-common
+ to amanda-client, so that upgrades go smoothly. also, make the client
+ and server packages have a versioned depend on the common package to avoid
+ potential problems.
+ * problem with visible control chars in amverify confirmed to have been
+ fixed upstream in the 2.4.2 version, closes: #65537
+
+ -- Bdale Garbee <bdale@gag.com> Sun, 31 Dec 2000 21:49:16 -0700
+
+amanda (1:2.4.2-1) unstable; urgency=low
+
+ * new upstream version, closes: #76632, #78040, #79500
+ * fold in debconf support patch from shaleh
+ * make sure all build dependencies are present, closes: #67008
+ * move canonical location of amandahosts file to /etc, moving existing file
+ there if necessary, and using a symlink in ~backup. This allows treatment
+ as a conffile. Closes: #52357
+ * upstream implemented a general Y2K amoverview fix, closes: #64780
+ * chg-scsi is delivered in amanda-server 2.4.2, closes: #41420
+
+ -- Bdale Garbee <bdale@gag.com> Tue, 26 Dec 2000 23:25:22 -0700
+
+amanda (1:2.4.1p1-12) frozen unstable; urgency=low
+
+ * revert amplot/Makefile.in to upstream version to dodge issues created
+ by newer automake version. Note that items in the build depends
+ list in the control file *must* be available or the package build will
+ fail, as some executables won't be generated if configure doesn't find
+ everything it wants! Closes: #64864, marked as grave for potato.
+
+ -- Bdale Garbee <bdale@gag.com> Sun, 11 Jun 2000 09:53:35 -0600
+
+amanda (1:2.4.1p1-11) frozen unstable; urgency=low
+
+ * target frozen because I think the spurious failure messages and duplicated
+ dependencies are worth fixing for potato even though both were filed as
+ "normal" bugs
+ * add extra cases to amanda-client's filtering of tar output to eliminate
+ user concern and confusion from spurious "FAILED DUMP" messages,
+ closes: #60126
+ * be more careful about which -dev packages are on build machine so that
+ we only depend on one version of libreadline, closes: #57940
+
+ -- Bdale Garbee <bdale@gag.com> Sun, 12 Mar 2000 22:31:39 -0700
+
+amanda (1:2.4.1p1-10) unstable; urgency=low
+
+ * fix postinst bug in amanda-server that breaks inetd.conf that was
+ introduced during cut'n'paste for -8, closes: #52332
+ * the amanda-server package depends on mailx because the upstream source
+ looks for mailx at configure time, embeds the path, and uses it to send
+ mail. The dependency on mailx is not arbitrary. Closes: #44034
+ * add mailx to the Build-Depends so configure can find it
+ * update path reference to GPL in copyright file for FHS
+
+ -- Bdale Garbee <bdale@gag.com> Fri, 7 Jan 2000 01:39:14 -0700
+
+amanda (1:2.4.1p1-9) unstable; urgency=low
+
+ * missed a few things in Build-Depends, fill them in
+
+ -- Bdale Garbee <bdale@gag.com> Sun, 5 Dec 1999 15:15:33 -0700
+
+amanda (1:2.4.1p1-8) unstable; urgency=low
+
+ * supply the real tapetype, not just libtool wrapper. closes: #50585, #50280
+ * update control to include Build-Depends:, remove README.source-depends
+ * move the inetd entry handling from amanda-common postinst/prerm to the
+ amanda-server package, since they're only relevant there, closes: #49578
+
+ -- Bdale Garbee <bdale@gag.com> Sat, 27 Nov 1999 17:39:13 -0700
+
+amanda (1:2.4.1p1-7) unstable; urgency=low
+
+ * recompile to include smbclient support
+
+ -- Bdale Garbee <bdale@gag.com> Sun, 7 Nov 1999 14:13:24 -0700
+
+amanda (1:2.4.1p1-6) unstable; urgency=low
+
+ * apply patches from Amanda patch page for glibc21, glibc22, and samba2.
+ Closes: #42771, #44672
+ * real fix for self-referential dependencies, closes: #46362
+ * the amrecover behavior reported was a 2.4.0 issue, closes: #27709
+ * "fix" bash-ism in the rules file, closes: #45236
+ * provide tapetype in amanda-server, closes: #42825
+ * FHS compliance, lintian clean
+ * thanks to Ben Kochie <ben@nerp.net> for reviewing open bugs for this update
+
+ -- Bdale Garbee <bdale@gag.com> Fri, 5 Nov 1999 20:22:00 -0700
+
+amanda (1:2.4.1p1-5) unstable; urgency=low
+
+ * update perl dependency to perl5 as per new perl policy
+
+ -- Bdale Garbee <bdale@gag.com> Sun, 11 Jul 1999 11:37:32 -0600
+
+amanda (1:2.4.1p1-4) unstable; urgency=low
+
+ * fix dependencies for amanda-common in control, closes 38464
+
+ -- Bdale Garbee <bdale@gag.com> Sun, 30 May 1999 23:37:55 -0600
+
+amanda (1:2.4.1p1-3) unstable; urgency=low
+
+ * depend on mailx, closes 34894
+ * lose the -DENABLE_GNUTAR_ATIME_PRESERVE, since it eliminates the ability
+ to use tar for incremental backups, closes 36639
+
+ -- Bdale Garbee <bdale@gag.com> Mon, 24 May 1999 23:57:25 -0600
+
+amanda (1:2.4.1p1-2) unstable; urgency=low
+
+ * replace /var/state usage with /var/lib/amanda, since user backup can't
+ write to /var/state
+ * stop calling automake/autoconf explicitly in the rules file, since it
+ appears that automake 1.4 breaks amanda, while 1.3 was ok. It should be
+ ok to just use the provided configure, closes 32143
+
+ -- Bdale Garbee <bdale@gag.com> Tue, 19 Jan 1999 21:21:18 -0700
+
+amanda (1:2.4.1p1-1) unstable; urgency=low
+
+ * new upstream version, closes 24855, 22270
+ * enable IGNORE_TAR_ERRORS and ENABLE_GNUTAR_ATIME_PRESERVE, closes 28486
+ * have the amanda-common postinst create /var/lib/amanda before it tries to
+ put a file there, closes 22345, 30326, 25106
+ * fix a few last references to /usr/adm, closes 25574
+ * update the docs for amanda-server to include a note about using ftape
+ from Jean Pierre LeJacq, closes 22271
+ * make the 'build-stamp' chunk of the rules file depend on /sbin/dump, since
+ amanda won't know about dump unless it can find it during the configure.
+ Another reason we need build-time dependencies, I guess. Closes 24369.
+ * fix chg-mtx.sh.in to reflect Debian mtx syntax, closes 26208
+ * add tapetype QIC-3080, closes 26569
+ * eliminate dh_du from the rules file
+ * various tweaks to resolve lintian complaints
+
+ -- Bdale Garbee <bdale@gag.com> Mon, 18 Jan 1999 22:58:34 -0700
+
+amanda (1:2.4.0-4) unstable; urgency=low
+
+ * add suggests dump to amanda-client, closes 24962
+
+ -- Bdale Garbee <bdale@gag.com> Mon, 3 Aug 1998 22:32:29 -0600
+
+amanda (1:2.4.0-3) frozen unstable; urgency=low
+
+ * be consistent about pointing to /var/lib/amanda/amandates, closes 21811.
+ * be consistent about supporting suidregister.
+ * make sure user backup's home directory exists before using it in the
+ amanda-common postinst, closes 21897.
+
+ -- Bdale Garbee <bdale@gag.com> Sun, 3 May 1998 20:48:38 -0600
+
+amanda (1:2.4.0-2) frozen unstable; urgency=low
+
+ * update amanda-common postinst to do a better job of making sure the
+ user 'backup' exists, and has the right group privs. Closes 18242,
+ 20675, and 20945
+ * update amanda-client README file to reflect automatic handling of user
+ backup, and to add information for users setting up to do indexing,
+ closes 21313
+ * improve documentation of server config issues in amanda-server README,
+ closes 21366
+ * update default amanda.conf to fix compression flags on comp-user-tar and
+ comp-root-tar, closes 21198
+ * fix typos in amanda-server's README file, closes 21118
+
+ -- Bdale Garbee <bdale@gag.com> Mon, 20 Apr 1998 02:14:50 -0600
+
+amanda (1:2.4.0-1) frozen unstable; urgency=high
+
+ * new upstream release, 2.4.0 is no longer beta...
+ * use an explicit epoch in the version since 2.4.0 < 2.4.0b6 ... sigh
+ * add --with-smbclient to configure run, and include more docs in
+ amanda-common, closes 18366
+ * clean up dependencies, closes 18746
+ * patch dh_movefiles from debhelper to move real files before symlinks when
+ processing wildcards, closes 19267... debhelper bug 18220 addresses this
+ issue.
+ * make better use of wildcards in debhelper control files, closes 18350
+ * fix spelling errors in control file, closes 18959
+ * have amanda-server suggest mailx, since amcheck optionally uses
+ /usr/bin/Mail to notify the operator of needed tapes, closes 18334
+ * improve the postinst slightly... the home directory for user backup needs
+ to be fixed in /etc/passwd before I can do the right things to close
+ 18242 completely. Bug filed against base-passwd, severity important.
+ * various small cleanups suggested to me via email without bugs filed
+
+ -- Bdale Garbee <bdale@gag.com> Mon, 30 Mar 1998 18:29:55 -0700
+
+amanda (2.4.0b6-12) unstable; urgency=low
+
+ * apply upstream patches to bring us to 2.4.0-980319
+ * fold in some of Heiko's improvements from his bo-unstable version
+
+ -- Bdale Garbee <bdale@gag.com> Tue, 24 Mar 1998 23:52:55 -0700
+
+amanda (2.4.0b6-11) unstable; urgency=low
+
+ * apply upstream patches to bring us to 2.4.0b6p4
+ * use appropriate wildcards in amanda-*.files control files. Closes 18196.
+ * include 'adduser' alternative in amanda-client's README, closes 18174.
+
+ -- Bdale Garbee <bdale@gag.com> Sun, 15 Feb 1998 12:54:46 -0700
+
+amanda (2.4.0b6-10) unstable; urgency=low
+
+ * apply upstream patches to bring us to 2.4.0b6p3
+
+ -- Bdale Garbee <bdale@gag.com> Sun, 8 Feb 1998 17:53:47 -0700
+
+amanda (2.4.0b6-9) unstable; urgency=low
+
+ * clean up dependencies, closes 17838
+ * apply upstream patches to bring us to 2.4.0b6p2
+ * switch to automake 1.2d from experimental on build machine, reduces
+ the amount of hackery required, and therefore the size of the diffs.
+
+ -- Bdale Garbee <bdale@gag.com> Thu, 5 Feb 1998 22:40:58 -0700
+
+amanda (2.4.0b6-8) unstable; urgency=low
+
+ * apply upstream patch to handle occasional divide by zero in amplot
+ * refine split of files between binary packages
+
+ -- Bdale Garbee <bdale@gag.com> Wed, 28 Jan 1998 14:33:30 -0700
+
+amanda (2.4.0b6-7) unstable; urgency=low
+
+ * patch for amrmtape from Heiko, will be in a future upstream release
+ * add suidmanager support to control files
+
+ -- Bdale Garbee <bdale@gag.com> Wed, 28 Jan 1998 14:33:30 -0700
+
+amanda (2.4.0b6-6) unstable; urgency=low
+
+ * clean up permissions... with --with-bsd-security enabled, some pieces must
+ be setuid in the server package
+ * fix client prerm so that it only removes the inetd.conf entry it owns.
+
+ -- Bdale Garbee <bdale@gag.com> Tue, 27 Jan 1998 14:44:30 -0700
+
+amanda (2.4.0b6-5) unstable; urgency=low
+
+ * enable use of .amandahosts instead of .rhosts for access control.
+ * change /etc/amandates location to /var/lib/amandates for FSSTND compliance.
+ * ensure /var/lib/amandates exists with correct perms in postinst.
+ * make the /var/lib/amanda-gnutar-lists directory have appropriate perms.
+ * update README files to reflect contemporary reality
+
+ -- Bdale Garbee <bdale@gag.com> Tue, 27 Jan 1998 10:04:58 -0700
+
+amanda (2.4.0b6-4) unstable; urgency=low
+
+ * oops... --with-bsd-security got dropped from the configure at some point,
+ add it back in. Thanks to Heiko again for pointing this out.
+
+ -- Bdale Garbee <bdale@gag.com> Mon, 26 Jan 1998 10:40:39 -0700
+
+amanda (2.4.0b6-3) unstable; urgency=low
+
+ * make amanda-common depend on tar >= 1.12. Thanks to Heiko Schlittermann
+ for pointing this out.
+
+ -- Bdale Garbee <bdale@gag.com> Mon, 26 Jan 1998 10:40:39 -0700
+
+amanda (2.4.0b6-2) unstable; urgency=low
+
+ * amanda-common was suggesting amanda or amanda-client, updated to reflect
+ replacement of 'amanda' with 'amanda-server'.
+
+ -- Bdale Garbee <bdale@gag.com> Mon, 26 Jan 1998 10:40:39 -0700
+
+amanda (2.4.0b6-1) unstable; urgency=low
+
+ * new maintainer
+ * new upstream release, reworked package for libc6, using debhelper
+ * incorporate amanda-common split suggested by Tom Lear's 2.4.0b4 package.
+ this replaces 'amanda' with 'amanda-server', and breaks out an
+ 'amanda-common' package to hold the libs and man pages that were formerly
+ conflicting between amanda and amanda-client. Closes bugs 11046, 11943.
+
+ -- Bdale Garbee <bdale@gag.com> Mon, 26 Jan 1998 09:15:05 -0700
+
+amanda (2.3.0.4-2.1) unstable; urgency=low
+
+ * non-maintainer release (never actually uploaded)
+ * libc6
+ * make amanda and amanda-client depend on netbase (>=3.03) for /etc/services
+ entries. Remove /etc/services mashing from postinst. Closes bugs 12847,
+ 12848, 13795.
+ * make amanda depend on amanda-client. This is the easiest way to resolve
+ the overlapping files problem. It makes the assumption that if you're
+ running an amanda server, you'll want the client stuff anyway so you can
+ back up the server. Since the client package is small, this seems like a
+ better resolution than splitting out a third "common" package. Closes
+ bugs 11046, 11943.
+ * update all references to /etc/amandates and /etc/dumpdates to use
+ /var/lib/*dates, ala current Debian dump package. Closes bug 15586.
+ * pre-apply all the patches from the upstream archive, to simplify the
+ build process. Patches applied include: arithexc.diff,exclude2.diff,
+ flushidx.diff,srvcomp.diff,tardates.diff,exclude.diff,exclude3.diff,
+ longopt.diff, and srvcomp2.diff. Closes bug 13151, 13796.
+ * convert rules file to use debhelper.
+
+ -- Bdale Garbee <bdale@gag.com> Sat, 10 Jan 1998 02:08:02 -0700
+
+amanda (2.3.0.4-2) unstable; urgency=low
+
+ * fixed dependencies for amanda-client
+
+ -- Christian Meder <meder@control.toronto.edu> Wed, 18 Jun 1997 14:49:49 -0400
+
+amanda (2.3.0.4-1) unstable; urgency=low
+
+ * Initial Release.
+ * Split in client and server package
+ * wrote small READMEs to ease a quick start
+ * applied several patches from
+ http://www.cs.umd.edu/projects/amanda/patches.html to fix various
+ new features
+
+ -- Christian Meder <meder@control.toronto.edu> Wed, 14 May 1997 13:08:34 -0500
+
+Local variables:
+mode: debian-changelog
+End:
--- /dev/null
+#!/bin/sh -e
+
+. /usr/share/debconf/confmodule
+
+# if both files exist, suggest they merge them
+# if only one exists, the postinst moves it
+if [ -f /var/lib/amandates ]; then
+ if [ -f /var/lib/amanda/amandates ]; then
+ db_input medium amanda-common/merge_amandates || true
+ db_go
+ fi
+fi
--- /dev/null
+Source: amanda
+Section: utils
+Priority: optional
+Maintainer: Bdale Garbee <bdale@gag.com>
+Vcs-Git: git://git.gag.com/debian/amanda
+Vcs-Browser: http://git.gag.com/?p=debian/amanda
+Build-Depends: debhelper (>= 5), dump [linux-any], gnuplot, libncurses5-dev, libreadline-dev, libtool, flex, perl, smbclient, bsd-mailx | mailx, lpr, mtx, xfsdump [linux-any], po-debconf, autotools-dev, libglib2.0-dev, procps, curl, libcurl4-openssl-dev
+Standards-Version: 3.9.3
+
+Package: amanda-common
+Architecture: any
+Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}, update-inetd, tar (>=1.12), perl5, bsd-mailx | mailx, debconf | debconf-2.0, adduser, openbsd-inetd | inet-superserver
+Suggests: amanda-server (= ${binary:Version}) | amanda-client (= ${binary:Version})
+Conflicts: amanda
+Replaces: amanda, amanda-client
+Description: Advanced Maryland Automatic Network Disk Archiver (Libs)
+ This package contains libraries required by the amanda client and
+ server packages.
+
+Package: amanda-server
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}, amanda-common (= ${binary:Version}), bsd-mailx | mailx
+Suggests: perl5, gnuplot, amanda-client (= ${binary:Version}), cpio | mt-st
+Conflicts: amanda, amanda-common (<< 1:2.5.2p1-3)
+Replaces: amanda-common (<< 1:2.5.2p1-3)
+Description: Advanced Maryland Automatic Network Disk Archiver (Server)
+ Amanda is a backup system designed to archive many computers on a
+ network to a single large-capacity tape drive. This package is
+ suitable for large amounts of data to backup. For smaller solutions
+ take a look at afbackup, tob, ...
+ .
+ Features:
+ * 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.
+ * built on top of standard backup software: Unix dump/restore, and
+ later GNU Tar and others.
+ * 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.
+ * 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 to operators.
+ * 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.
+ .
+ For important notes, see /usr/share/doc/amanda-server/README.Debian.
+ .
+ Explanation of suggested programs:
+ - perl is needed for some non essential server utilities
+ - gnuplot is needed for plotting statistics of backups
+ - to backup the tape server, you need to install the client too
+
+Package: amanda-client
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}, amanda-common (= ${binary:Version})
+Suggests: gnuplot, dump, smbclient
+Conflicts: amanda, amanda-common (<< 1:2.5.2p1-3)
+Replaces: amanda-common (<< 1:2.5.2p1-3)
+Description: Advanced Maryland Automatic Network Disk Archiver (Client)
+ Amanda is a backup system designed to archive many computers on a
+ network to a single large-capacity tape drive. This package is
+ suitable for large amounts of data to backup. For smaller solutions
+ take a look at afbackup, tob, ...
+ .
+ Features:
+ * 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.
+ * built on top of standard backup software: Unix dump/restore, and
+ later GNU Tar and others.
+ * 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.
+ * 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 to operators.
+ * will dynamically adjust backup schedule to keep within constraints:
+ no more juggling by hand when adding disks and computers to network.
+ * includes a pre-run checker program, that conducts sanity checks on both
+ the tape server host and all the client hosts (in parallel), and will
+ send an e-mail report of any problems that could cause the backups to
+ fail.
+ * can compress dumps before sending or after sending over the net, with
+ either compress or gzip.
+ * can optionally synchronize with external backups, for those large
+ timesharing computers where you want to do full dumps when the system
+ is down in single-user mode (since BSD dump is not reliable on active
+ filesystems): Amanda will still do your daily dumps.
+ * lots of other options; Amanda is very configurable.
+ .
+ THIS PACKAGE RELIES ON A RUNNING AMANDA SERVER IN YOUR NETWORK.
+ .
+ For important notes, see /usr/share/doc/amanda-client/README.Debian.
+ .
+ Explanation of suggested programs:
+ - gnuplot is needed for plotting statistics of backups
+
--- /dev/null
+This package was built by Bdale Garbee <bdale@gag.com> using sources downloaded
+from
+
+ ftp://ftp.amanda.org/pub/amanda/
+
+The Amanda copyright:
+
+/*
+ * Amanda, The Advanced Maryland Automatic Network Disk Archiver
+ * Copyright (c) 1991-1998 University of Maryland at College Park
+ * All Rights Reserved.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of U.M. not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission. U.M. makes no representations about the
+ * suitability of this software for any purpose. It is provided "as is"
+ * without express or implied warranty.
+ *
+ * U.M. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL U.M.
+ * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Authors: the Amanda Development Team. Its members are listed in a
+ * file named AUTHORS, in the root directory of this distribution.
+ */
+
+/*
+** This Version of Amanda contains parts of GNU programs
+** (alloca.c, exclude_file.c)
+*/
+
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
--- /dev/null
+# This is an example for a crontab entry for automated backup with amanda
+# With these cron lines, Amanda will check that the correct tape is in
+# the drive every weekday afternoon at 4pm (if it isn't, all the
+# operators will get mail). At 12:45am that night the dumps will be run.
+0 16 * * 1-5 /usr/sbin/amcheck -m DailySet1
+45 0 * * 2-6 /usr/sbin/amdump DailySet1
+
--- /dev/null
+AUTHORS
+NEWS
+README
--- /dev/null
+diff --git a/example/amanda-client-postgresql.conf.in b/example/amanda-client-postgresql.conf.in
+index f917a5b..bd32b3d 100644
+--- a/example/amanda-client-postgresql.conf.in
++++ b/example/amanda-client-postgresql.conf.in
+@@ -25,7 +25,7 @@ ssh_keys "/var/lib/amanda/.ssh/id_rsa_amrecover"
+ # Use /etc/amanda/pgpassfile for authentication credentials
+ # (Note: for PostgreSQL 8.0.x, you must use PG-PASSWORD instead)
+ # Should contain an appropriate line for foo (below).Example:
+-# localhost:*:*:amandabackup:my_backup_password
++# localhost:*:*:backup:my_backup_password
+ # The file must be owned by the Amanda user with permissions 0600
+ property "PG-PASSFILE" "/etc/amanda/pgpassfile"
+
+@@ -34,8 +34,8 @@ property "PG-PASSFILE" "/etc/amanda/pgpassfile"
+ property "foo-PG-HOST" "localhost"
+ # Connect to port 5432 (PostgreSQL's default)
+ property "foo-PG-PORT" "5432"
+-# Connect as user amandabackup (Note: must be a superuser)
+-property "foo-PG-USER" "amandabackup"
++# Connect as user backup (Note: must be a superuser)
++property "foo-PG-USER" "backup"
+ # Connect to database template1 (exists by default)
+ property "foo-PG-DB" "template1"
+ # Database's data directory
+diff --git a/example/inetd.conf.amandaclient.in b/example/inetd.conf.amandaclient.in
+index 9d60e06..9b8f8a0 100644
+--- a/example/inetd.conf.amandaclient.in
++++ b/example/inetd.conf.amandaclient.in
+@@ -1,2 +1,2 @@
+-#amanda stream tcp nowait amandabackup @amlibexecdir@/amandad -auth=bsdtcp amdump
+-amanda stream tcp nowait amandabackup @amlibexecdir@/amandad amandad -auth=bsdtcp amdump
++#amanda stream tcp nowait backup @amlibexecdir@/amandad -auth=bsdtcp amdump
++amanda stream tcp nowait backup @amlibexecdir@/amandad amandad -auth=bsdtcp amdump
+diff --git a/example/inetd.conf.amandaserver.in b/example/inetd.conf.amandaserver.in
+index 3228c79..f964b43 100644
+--- a/example/inetd.conf.amandaserver.in
++++ b/example/inetd.conf.amandaserver.in
+@@ -1 +1 @@
+-amanda stream tcp nowait amandabackup @amlibexecdir@/amandad amandad -auth=bsdtcp amdump amindexd amidxtaped
++amanda stream tcp nowait backup @amlibexecdir@/amandad amandad -auth=bsdtcp amdump amindexd amidxtaped
+diff --git a/example/xinetd.amandaclient.in b/example/xinetd.amandaclient.in
+index a97c8e1..5cfc8e0 100644
+--- a/example/xinetd.amandaclient.in
++++ b/example/xinetd.amandaclient.in
+@@ -10,7 +10,7 @@ service amanda
+ socket_type = stream
+ protocol = tcp
+ wait = no
+- user = amandabackup
++ user = backup
+ group = disk
+ groups = yes
+ server = @amlibexecdir@/amandad
+diff --git a/example/xinetd.amandaserver.in b/example/xinetd.amandaserver.in
+index a665efe..cc33c18 100644
+--- a/example/xinetd.amandaserver.in
++++ b/example/xinetd.amandaserver.in
+@@ -10,7 +10,7 @@ service amanda
+ socket_type = stream
+ protocol = tcp
+ wait = no
+- user = amandabackup
++ user = backup
+ group = disk
+ groups = yes
+ server = @amlibexecdir@/amandad
+diff --git a/installcheck/Amanda_Config.pl b/installcheck/Amanda_Config.pl
+index 362dcb5..27c1ace 100644
+--- a/installcheck/Amanda_Config.pl
++++ b/installcheck/Amanda_Config.pl
+@@ -212,7 +212,7 @@ $testconf->add_script('my_script', [
+ 'plugin' => '"script-email"',
+ 'execute-on' => 'pre-host-backup, post-host-backup',
+ 'execute-where' => 'client',
+- 'property' => '"mailto" "amandabackup" "amanda"',
++ 'property' => '"mailto" "backup" "amanda"',
+ ]);
+ $testconf->add_device('my_device', [
+ 'comment' => '"my device is mine, not yours"',
+diff --git a/installcheck/catalogs/chunker-partial.cat b/installcheck/catalogs/chunker-partial.cat
+index 621b73f..25b0be2 100644
+--- a/installcheck/catalogs/chunker-partial.cat
++++ b/installcheck/catalogs/chunker-partial.cat
+@@ -28,7 +28,7 @@ planner: DEFAULT_TAPE_SERVER="localhost" DEFAULT_TAPE_DEVICE=""
+ planner: HAVE_MMAP NEED_STRSTR HAVE_SYSVSHM AMFLOCK_POSIX AMFLOCK_LOCKF
+ planner: AMFLOCK_LNLOCK SETPGRP_VOID ASSERTIONS AMANDA_DEBUG_DAYS=4
+ planner: BSD_SECURITY RSH_SECURITY USE_AMANDAHOSTS
+-planner: CLIENT_LOGIN="amandabackup" CHECK_USERID HAVE_GZIP
++planner: CLIENT_LOGIN="backup" CHECK_USERID HAVE_GZIP
+ planner: COMPRESS_SUFFIX=".gz" COMPRESS_FAST_OPT="--fast"
+ planner: COMPRESS_BEST_OPT="--best" UNCOMPRESS_OPT="-dc"
+ READING CONF INFO...
+diff --git a/man/amaddclient.8 b/man/amaddclient.8
+index 775c21c..8a892bd 100644
+--- a/man/amaddclient.8
++++ b/man/amaddclient.8
+@@ -56,7 +56,7 @@ for detail\&.)
+ .PP
+
+ \fBamaddclient\fR
+-must be run by user amandabackup\&.
++must be run by user backup\&.
+ .PP
+ \-\-config, \-\-client and \-\-diskdev must be specified\&.
+ .SH "OPTIONS"
+@@ -172,7 +172,7 @@ Amanda configuration template files install location
+ .PP
+ \fB/var/lib/amanda\fR
+ .RS 4
+-amandabackup home directory
++backup home directory
+ .RE
+ .PP
+ \fB/var/lib/amanda/\&.amandahosts\fR
+diff --git a/man/amanda-auth.7 b/man/amanda-auth.7
+index c4d9db1..d44f5b0 100644
+--- a/man/amanda-auth.7
++++ b/man/amanda-auth.7
+@@ -124,7 +124,7 @@ parameter selects a communication/authentication method to use between the clien
+ .PP
+ When Amanda is built, a username is specified with the
+ \fB\-\-with\-user\fR
+-option\&. Most Amanda processes run under this user\*(Aqs identity, to minimize security risks\&. In binary distributions, this username is usually one of \*(Aqamanda\*(Aq, \*(Aqamandabackup\*(Aq, or \*(Aqbackup\*(Aq\&. The examples below use \*(Aqamandabackup\*(Aq since it is unambiguous\&. You may need to adjust accordingly for your system\&.
++option\&. Most Amanda processes run under this user\*(Aqs identity, to minimize security risks\&. In binary distributions, this username is usually one of \*(Aqamanda\*(Aq, \*(Aqbackup\*(Aq, or \*(Aqbackup\*(Aq\&. The examples below use \*(Aqbackup\*(Aq since it is unambiguous\&. You may need to adjust accordingly for your system\&.
+ .SS "Authenticated Peer Hostnames"
+ .PP
+ Amanda\*(Aqs authentication mechanisms provide an authenticated hostname of the system on the other end of the connection, which is used to restrict access to only particular hosts\&. The degree of "authentication" performed on this hostname varies with the authentication mechanism, and is discussed below\&.
+@@ -192,10 +192,10 @@ If service is omitted, it defaults to
+ (which is equivalent to
+ \fBamdump\fR)\&.
+ .PP
+-Example of the \&.amandahosts file on an Amanda client, where \*(Aqamandabackup\*(Aq is the Amanda dumpuser\&.
++Example of the \&.amandahosts file on an Amanda client, where \*(Aqbackup\*(Aq is the Amanda dumpuser\&.
+ .sp
+ .nf
+- \fBamandaserver\&.example\&.com amandabackup amdump\fR
++ \fBamandaserver\&.example\&.com backup amdump\fR
+ .fi
+ .PP
+ Example of the \&.amandahosts file on an Amanda server
+@@ -211,7 +211,7 @@ The authentication is done using \&.amandahosts file in the Amanda user\*(Aqs ho
+ The authentication is done using \&.amandahosts files in the Amanda user\*(Aqs home directory\&. It uses UDP protocol between Amanda server and client for data and hence the number of DLEs is limited by the UDP packet size\&. It uses one TCP port to establish the connection and multiplexes all data streams using one port on the server (see PORT USAGE below)\&.
+ .SS "bsdtcp communication and authentication"
+ .PP
+-The authentication is done using \&.amandahosts files in the backup user\*(Aqs (for example: amandabackup) home directory\&. It uses TCP protocol between Amanda server and client\&. On the client, two reserved ports are used\&. On the server, all data streams are multiplexed to one port (see PORT USAGE below)\&.
++The authentication is done using \&.amandahosts files in the backup user\*(Aqs (for example: backup) home directory\&. It uses TCP protocol between Amanda server and client\&. On the client, two reserved ports are used\&. On the server, all data streams are multiplexed to one port (see PORT USAGE below)\&.
+ .SS "USING INETD SERVER"
+ .PP
+ Template for Amanda client inetd service entry
+@@ -222,10 +222,10 @@ Template for Amanda client inetd service entry
+ .PP
+ Client example of using
+ \fBbsd\fR
+-authorization for inetd server given Amanda user is "amandabackup":
++authorization for inetd server given Amanda user is "backup":
+ .sp
+ .nf
+-\fB amanda dgram udp wait amandabackup /path/to/amandad amandad \-auth=bsd amdump\fR
++\fB amanda dgram udp wait backup /path/to/amandad amandad \-auth=bsd amdump\fR
+ .fi
+ .PP
+ The same could be used for
+@@ -234,10 +234,10 @@ if specifying \-auth=bsdudp instead of \-auth=bsd\&.
+ .PP
+ Client example of using
+ \fBbsdtcp\fR
+-authorization for inetd server given Amanda user is "amandabackup":
++authorization for inetd server given Amanda user is "backup":
+ .sp
+ .nf
+-\fB amanda stream tcp nowait amandabackup /path/to/amandad amandad \-auth=bsdtcp amdump\fR
++\fB amanda stream tcp nowait backup /path/to/amandad amandad \-auth=bsdtcp amdump\fR
+ .fi
+ .PP
+ \fBamindexd\fR
+@@ -249,10 +249,10 @@ server arguments for an Amanda server\&.
+ .PP
+ Server example of using
+ \fBbsdtcp\fR
+-authorization for inetd server given Amanda user is "amandabackup":
++authorization for inetd server given Amanda user is "backup":
+ .sp
+ .nf
+-\fB amanda stream tcp nowait amandabackup /path/to/amandad amandad \-auth=bsdtcp amdump amindexd amidxtaped\fR
++\fB amanda stream tcp nowait backup /path/to/amandad amandad \-auth=bsdtcp amdump amindexd amidxtaped\fR
+ .fi
+ .PP
+ For Amanda version 2\&.5\&.0 and earlier, remember that neither
+@@ -286,8 +286,8 @@ instead and, again, the server must be running the amandaidx and amidxtape netwo
+ Example of amindexd and amidxtaped Amanda daemon services configured as their own network services for a 2\&.5\&.0 or earlier server or a newer server having 2\&.5\&.0 or earlier clients
+ .sp
+ .nf
+-\fB amandaidx stream tcp nowait amandabackup /usr/local/libexec/amanda/current/amindexd amindexd\fR
+-\fB amidxtape stream tcp nowait amandabackup /usr/local/libexec/amanda/current/amidxtaped amidxtaped\fR
++\fB amandaidx stream tcp nowait backup /usr/local/libexec/amanda/current/amindexd amindexd\fR
++\fB amidxtape stream tcp nowait backup /usr/local/libexec/amanda/current/amidxtaped amidxtaped\fR
+ .fi
+ .SS "USING XINETD SERVER"
+ .PP
+@@ -315,7 +315,7 @@ parameter can be used with xinetd but is usually in addition to the primary form
+ .PP
+ Client example of using
+ \fBbsd\fR
+-authorization for xinetd server and for Amanda user "amandabackup":
++authorization for xinetd server and for Amanda user "backup":
+ .sp
+ .nf
+ service amanda
+@@ -324,7 +324,7 @@ service amanda
+ socket_type = dgram
+ protocol = udp
+ wait = yes
+- user = amandabackup
++ user = backup
+ group = disk
+ groups = yes
+ server = /path/to/amandad
+@@ -339,7 +339,7 @@ if specifying \-auth=bsdudp instead of \-auth=bsd\&.
+ .PP
+ Client example of using
+ \fBbsdtcp\fR
+-authorization for xinetd server and for Amanda user "amandabackup":
++authorization for xinetd server and for Amanda user "backup":
+ .sp
+ .nf
+ service amanda
+@@ -348,7 +348,7 @@ service amanda
+ socket_type = stream
+ protocol = tcp
+ wait = no
+- user = amandabackup
++ user = backup
+ group = disk
+ groups = yes
+ server = /path/to/amandad
+@@ -589,7 +589,7 @@ For example:
+ define dumptype rsh_example {
+ \&.\&.\&.
+ auth "rsh"
+- client\-username "amandabackup"
++ client\-username "backup"
+ amandad\-path "/usr/lib/exec/amandad"
+ \&.\&.\&.
+ }
+@@ -616,7 +616,7 @@ When you use a public key on the client to do data encryption (see http://wiki\&
+ Enable SSH authentication and set the \fBssh\-keys\fR option in all DLEs for that host by adding the following to the DLE itself or to the corresponding dumptype in amanda\&.conf:
+
+ auth "ssh"
+- ssh\-keys "/home/amandabackup/\&.ssh/id_rsa_amdump"
++ ssh\-keys "/home/backup/\&.ssh/id_rsa_amdump"
+
+ \fBssh\-keys\fR is the path to the private key on the client\&. If the username to which Amanda should connect is different from the default, then you should also add
+
+diff --git a/man/amgpgcrypt.8 b/man/amgpgcrypt.8
+index 6489a6d..3ea03b2 100644
+--- a/man/amgpgcrypt.8
++++ b/man/amgpgcrypt.8
+@@ -98,11 +98,11 @@ You need a User\-ID to identify your key; the software constructs the user id
+ from Real Name, Comment and Email Address in this form:
+ "Heinrich Heine (Der Dichter) (heinrichh@duesseldorf\&.de)"
+
+-Real name: amandabackup
++Real name: backup
+ Email address:
+-Comment: gpg keys for amandabackup
++Comment: gpg keys for backup
+ You selected this USER\-ID:
+- "amandabackup (gpg keys for amandabackup)"
++ "backup (gpg keys for backup)"
+
+ Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? o
+ You need a Passphrase to protect your secret key\&.
+@@ -120,7 +120,7 @@ generator a better chance to gain enough entropy\&.
+ public and secret key created and signed\&.
+ key marked as ultimately trusted\&.
+
+-pub 1024D/4417A8CB 2006\-02\-07 amandabackup (gpg keys for amandabackup)
++pub 1024D/4417A8CB 2006\-02\-07 backup (gpg keys for backup)
+ Key fingerprint = 139C 6369 44FC 7F1A 655C E5E9 7EAA 515A 4417 A8CB
+ sub 1024g/8C3A6A78 2006\-02\-07 [expires: 2006\-08\-06]
+ .fi
+diff --git a/man/amserverconfig.8 b/man/amserverconfig.8
+index fb5607d..b6d433e 100644
+--- a/man/amserverconfig.8
++++ b/man/amserverconfig.8
+@@ -40,7 +40,7 @@ will setup initial Amanda configuration files\&. It will create /var/lib/amanda/
+ \fBamserverconfig\fR
+ does not change existing Amanda configurations\&.
+ \fBamserverconfig\fR
+-must be run by user amandabackup\&.
++must be run by user backup\&.
+ .SH "OPTIONS"
+ .PP
+ Options may be abbreviated, as long as the abbreviation is not ambiguous\&. Option argument can either separated by \*(Aq=\*(Aq or a space\&. Example: \-\-templ=harddisk \-\-tapedev /dev/nst0
+@@ -61,7 +61,7 @@ are the valid inputs for this option\&. Pre\-configured template files can be fo
+ .sp
+ If tape\-changer is chosen for this option, program mtx is required\&.
+ \fBamserverconfig\fR
+-will search for mtx in the following directory: "/usr/sbin", "/usr/local/sbin", "/usr/local/bin", "/usr/bin", "/bin" and amandabackup\*(Aqs PATH\&.
++will search for mtx in the following directory: "/usr/sbin", "/usr/local/sbin", "/usr/local/bin", "/usr/bin", "/bin" and backup\*(Aqs PATH\&.
+ .sp
+ If harddisk is chosen and \-\-no\-vtape is not specified,
+ \fBamserverconfig\fR
+@@ -107,7 +107,7 @@ The type of tape drive associated with tapedev or tpchanger\&. default [HARDDISK
+ .PP
+ \fB\-\-mailto mailto\fR
+ .RS 4
+-A space separated list of recipients for mail reports\&. default [amandabackup]
++A space separated list of recipients for mail reports\&. default [backup]
+ .RE
+ .PP
+ \fB\-\-dumpcycle dumpcycle\fR
+@@ -143,7 +143,7 @@ Amanda configuration template files install location
+ .PP
+ \fB/var/lib/amanda\fR
+ .RS 4
+-amandabackup home directory
++backup home directory
+ .RE
+ .PP
+ \fB/var/lib/amanda/gnutar\-lists\fR
+diff --git a/man/amsuntar.8 b/man/amsuntar.8
+index 6e10904..54da0f0 100644
+--- a/man/amsuntar.8
++++ b/man/amsuntar.8
+@@ -37,7 +37,7 @@ The
+ \fBdiskdevice\fR
+ in the disklist (DLE) must be the directory to backup\&.
+ .PP
+-Solaris 10 supports Role Based Access Control(RBAC) which is enabled by default\&. To run backup operations using sun tar utility by under privileged user like amandabackup, amandabackup user need to have proper roles and profiles, specially "Media Backup" profile/role\&. This can be done using \*(Aqusermod \-P "Media Backup" amandabackup\*(Aq command\&.
++Solaris 10 supports Role Based Access Control(RBAC) which is enabled by default\&. To run backup operations using sun tar utility by under privileged user like backup, backup user need to have proper roles and profiles, specially "Media Backup" profile/role\&. This can be done using \*(Aqusermod \-P "Media Backup" backup\*(Aq command\&.
+ .SH "PROPERTIES"
+ .PP
+ This section lists the properties that control amsuntar\*(Aqs functionality\&. See
+diff --git a/man/xml-source/amaddclient.8.xml b/man/xml-source/amaddclient.8.xml
+index f0bbbbf..6966d53 100644
+--- a/man/xml-source/amaddclient.8.xml
++++ b/man/xml-source/amaddclient.8.xml
+@@ -61,7 +61,7 @@ the client.
+ (See <refentrytitle>ssh-keygen</refentrytitle><manvolnum>1</manvolnum> and
+ <refentrytitle>ssh-add</refentrytitle><manvolnum>1</manvolnum> for detail.)</para>
+ <para>
+-&amaddclient; must be run by user amandabackup.</para>
++&amaddclient; must be run by user backup.</para>
+ <para> --config, --client and --diskdev must be specified.
+ </para>
+ </refsect1>
+@@ -218,7 +218,7 @@ Specify either --excludefile or --excludelist. </para>
+ <varlistentry>
+ <term><option>/var/lib/amanda</option></term>
+ <listitem>
+-<para>amandabackup home directory</para>
++<para>backup home directory</para>
+ </listitem>
+ </varlistentry>
+
+diff --git a/man/xml-source/amaespipe.8.xml b/man/xml-source/amaespipe.8.xml
+old mode 100755
+new mode 100644
+diff --git a/man/xml-source/amanda-auth.7.xml b/man/xml-source/amanda-auth.7.xml
+index 3d27fbb..04e3eb0 100644
+--- a/man/xml-source/amanda-auth.7.xml
++++ b/man/xml-source/amanda-auth.7.xml
+@@ -85,7 +85,7 @@ Authentication Configure option(s)
+ <option>--with-user</option> option. Most Amanda processes run under
+ this user's identity, to minimize security risks. In binary
+ distributions, this username is usually one of 'amanda',
+-'amandabackup', or 'backup'. The examples below use 'amandabackup'
++'backup', or 'backup'. The examples below use 'backup'
+ since it is unambiguous. You may need to adjust accordingly for your
+ system.</para>
+
+@@ -147,10 +147,10 @@ configuration file.</para>
+
+ <para>If service is omitted, it defaults to <emphasis remap='B'>noop selfcheck sendsize sendbackup</emphasis> (which is equivalent to <emphasis remap='B'>amdump</emphasis>).</para>
+
+- <para>Example of the .amandahosts file on an Amanda client, where 'amandabackup' is the Amanda dumpuser.
++ <para>Example of the .amandahosts file on an Amanda client, where 'backup' is the Amanda dumpuser.
+
+ <programlisting>
+- <emphasis remap='B'>amandaserver.example.com amandabackup amdump</emphasis>
++ <emphasis remap='B'>amandaserver.example.com backup amdump</emphasis>
+ </programlisting>
+ </para>
+
+@@ -171,7 +171,7 @@ configuration file.</para>
+ </refsect2>
+
+ <refsect2><title>bsdtcp communication and authentication</title>
+- <para>The authentication is done using .amandahosts files in the backup user's (for example: amandabackup) home directory. It uses TCP protocol between Amanda server and client. On the client, two reserved ports are used. On the server, all data streams are multiplexed to one port (see PORT USAGE below).</para>
++ <para>The authentication is done using .amandahosts files in the backup user's (for example: backup) home directory. It uses TCP protocol between Amanda server and client. On the client, two reserved ports are used. On the server, all data streams are multiplexed to one port (see PORT USAGE below).</para>
+ </refsect2>
+
+ <refsect2><title>USING INETD SERVER</title>
+@@ -181,24 +181,24 @@ configuration file.</para>
+ <emphasis remap='I'> service_name</emphasis> <emphasis remap='I'>socket_type</emphasis> <emphasis remap='I'>protocol</emphasis> <emphasis remap='I'>wait/nowait</emphasis> <emphasis remap='I'>amanda_backup_user</emphasis> <emphasis remap='I'>absolute_path_to_amandad</emphasis> amandad <emphasis remap='I'>server_args</emphasis>
+ </programlisting>
+ </para>
+- <para>Client example of using <emphasis remap='B'>bsd</emphasis> authorization for inetd server given Amanda user is "amandabackup":
++ <para>Client example of using <emphasis remap='B'>bsd</emphasis> authorization for inetd server given Amanda user is "backup":
+
+ <programlisting>
+-<emphasis remap='B'> amanda dgram udp wait amandabackup /path/to/amandad amandad -auth=bsd amdump</emphasis>
++<emphasis remap='B'> amanda dgram udp wait backup /path/to/amandad amandad -auth=bsd amdump</emphasis>
+ </programlisting>
+ </para>
+ <para>The same could be used for <emphasis remap='B'>bsdudp</emphasis> if specifying -auth=bsdudp instead of -auth=bsd.</para>
+- <para>Client example of using <emphasis remap='B'>bsdtcp</emphasis> authorization for inetd server given Amanda user is "amandabackup":
++ <para>Client example of using <emphasis remap='B'>bsdtcp</emphasis> authorization for inetd server given Amanda user is "backup":
+
+ <programlisting>
+-<emphasis remap='B'> amanda stream tcp nowait amandabackup /path/to/amandad amandad -auth=bsdtcp amdump</emphasis>
++<emphasis remap='B'> amanda stream tcp nowait backup /path/to/amandad amandad -auth=bsdtcp amdump</emphasis>
+ </programlisting>
+ </para>
+ <para><emphasis remap='B'>amindexd</emphasis> and <emphasis remap='B'>amidxtaped</emphasis> would typically be added at the end of the line as &amandad; server arguments for an Amanda server.</para>
+- <para>Server example of using <emphasis remap='B'>bsdtcp</emphasis> authorization for inetd server given Amanda user is "amandabackup":
++ <para>Server example of using <emphasis remap='B'>bsdtcp</emphasis> authorization for inetd server given Amanda user is "backup":
+
+ <programlisting>
+-<emphasis remap='B'> amanda stream tcp nowait amandabackup /path/to/amandad amandad -auth=bsdtcp amdump amindexd amidxtaped</emphasis>
++<emphasis remap='B'> amanda stream tcp nowait backup /path/to/amandad amandad -auth=bsdtcp amdump amindexd amidxtaped</emphasis>
+ </programlisting>
+ </para>
+ <para>For Amanda version 2.5.0 and earlier, remember that neither <emphasis remap='B'>bsdudp</emphasis> nor <emphasis remap='B'>bsdtcp</emphasis> are supported and the Amanda daemon &amandad; accepts no arguments. Because of the latter, &amrecover; as of Amanda version 2.5.1 is not compatible with 2.5.0 and earlier servers. Thus, servers that are 2.5.0 or earlier must, in addition to the <emphasis remap='I'>amanda</emphasis> service, run <emphasis remap='I'>amindexd</emphasis> and <emphasis remap='I'>amidxtaped</emphasis> Amanda services as their own network services, amandaidx and amidxtape, respectively (see below).</para>
+@@ -208,8 +208,8 @@ configuration file.</para>
+ <para>Example of amindexd and amidxtaped Amanda daemon services configured as their own network services for a 2.5.0 or earlier server or a newer server having 2.5.0 or earlier clients
+
+ <programlisting>
+-<emphasis remap='B'> amandaidx stream tcp nowait amandabackup /usr/local/libexec/amanda/current/amindexd amindexd</emphasis>
+-<emphasis remap='B'> amidxtape stream tcp nowait amandabackup /usr/local/libexec/amanda/current/amidxtaped amidxtaped</emphasis>
++<emphasis remap='B'> amandaidx stream tcp nowait backup /usr/local/libexec/amanda/current/amindexd amindexd</emphasis>
++<emphasis remap='B'> amidxtape stream tcp nowait backup /usr/local/libexec/amanda/current/amidxtaped amidxtaped</emphasis>
+ </programlisting>
+ </para>
+ </refsect2>
+@@ -234,7 +234,7 @@ service amanda
+ </programlisting>
+ </para>
+ <para>The <emphasis remap='I'>only_from</emphasis> parameter can be used with xinetd but is usually in addition to the primary form of access control via the .amandahosts file.</para>
+- <para>Client example of using <emphasis remap='B'>bsd</emphasis> authorization for xinetd server and for Amanda user "amandabackup":
++ <para>Client example of using <emphasis remap='B'>bsd</emphasis> authorization for xinetd server and for Amanda user "backup":
+
+ <programlisting>
+ service amanda
+@@ -243,7 +243,7 @@ service amanda
+ socket_type = dgram
+ protocol = udp
+ wait = yes
+- user = amandabackup
++ user = backup
+ group = disk
+ groups = yes
+ server = /path/to/amandad
+@@ -253,7 +253,7 @@ service amanda
+ </programlisting>
+ </para>
+ <para>The same could be used for <emphasis remap='B'>bsdudp</emphasis> if specifying -auth=bsdudp instead of -auth=bsd.</para>
+- <para>Client example of using <emphasis remap='B'>bsdtcp</emphasis> authorization for xinetd server and for Amanda user "amandabackup":
++ <para>Client example of using <emphasis remap='B'>bsdtcp</emphasis> authorization for xinetd server and for Amanda user "backup":
+
+ <programlisting>
+ service amanda
+@@ -262,7 +262,7 @@ service amanda
+ socket_type = stream
+ protocol = tcp
+ wait = no
+- user = amandabackup
++ user = backup
+ group = disk
+ groups = yes
+ server = /path/to/amandad
+@@ -473,7 +473,7 @@ For example:
+ define dumptype rsh_example {
+ ...
+ auth "rsh"
+- client-username "amandabackup"
++ client-username "backup"
+ amandad-path "/usr/lib/exec/amandad"
+ ...
+ }
+@@ -506,7 +506,7 @@ When you use a public key on the client to do data encryption (see http://wiki.z
+ Enable SSH authentication and set the <amkeyword>ssh-keys</amkeyword> option in all DLEs for that host by adding the following to the DLE itself or to the corresponding dumptype in amanda.conf:
+
+ auth "ssh"
+- ssh-keys "/home/amandabackup/.ssh/id_rsa_amdump"
++ ssh-keys "/home/backup/.ssh/id_rsa_amdump"
+
+ <amkeyword>ssh-keys</amkeyword> is the path to the private key on the client. If the username to which Amanda should connect is different from the default, then you should also add
+
+diff --git a/man/xml-source/amcrypt.8.xml b/man/xml-source/amcrypt.8.xml
+old mode 100755
+new mode 100644
+diff --git a/man/xml-source/amgpgcrypt.8.xml b/man/xml-source/amgpgcrypt.8.xml
+index 3dd7140..d6b9db1 100644
+--- a/man/xml-source/amgpgcrypt.8.xml
++++ b/man/xml-source/amgpgcrypt.8.xml
+@@ -92,11 +92,11 @@ You need a User-ID to identify your key; the software constructs the user id
+ from Real Name, Comment and Email Address in this form:
+ "Heinrich Heine (Der Dichter) (heinrichh@duesseldorf.de)"
+
+-Real name: amandabackup
++Real name: backup
+ Email address:
+-Comment: gpg keys for amandabackup
++Comment: gpg keys for backup
+ You selected this USER-ID:
+- "amandabackup (gpg keys for amandabackup)"
++ "backup (gpg keys for backup)"
+
+ Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? o
+ You need a Passphrase to protect your secret key.
+@@ -114,7 +114,7 @@ generator a better chance to gain enough entropy.
+ public and secret key created and signed.
+ key marked as ultimately trusted.
+
+-pub 1024D/4417A8CB 2006-02-07 amandabackup (gpg keys for amandabackup)
++pub 1024D/4417A8CB 2006-02-07 backup (gpg keys for backup)
+ Key fingerprint = 139C 6369 44FC 7F1A 655C E5E9 7EAA 515A 4417 A8CB
+ sub 1024g/8C3A6A78 2006-02-07 [expires: 2006-08-06]
+
+diff --git a/man/xml-source/amserverconfig.8.xml b/man/xml-source/amserverconfig.8.xml
+index 2871fcf..99875a3 100644
+--- a/man/xml-source/amserverconfig.8.xml
++++ b/man/xml-source/amserverconfig.8.xml
+@@ -50,7 +50,7 @@
+ It will create /var/lib/amanda/guntar-lists directory if one does
+ not exist.
+ &amserverconfig; does not change existing Amanda configurations.
+-&amserverconfig; must be run by user amandabackup.
++&amserverconfig; must be run by user backup.
+ </para>
+ </refsect1>
+
+@@ -73,7 +73,7 @@ Example: --templ=harddisk --tapedev /dev/nst0</para>
+ </para>
+ <para>If tape-changer is chosen for this option, program mtx is required. &amserverconfig; will
+ search for mtx in the following directory: "/usr/sbin", "/usr/local/sbin",
+-"/usr/local/bin", "/usr/bin", "/bin" and amandabackup's PATH.
++"/usr/local/bin", "/usr/bin", "/bin" and backup's PATH.
+ </para>
+ <para>
+ If harddisk is chosen and --no-vtape is not specified, &amserverconfig; will create and label virtual tape
+@@ -138,7 +138,7 @@ is supported.</para>
+ <varlistentry>
+ <term><option>--mailto mailto</option></term>
+ <listitem>
+-<para> A space separated list of recipients for mail reports. default [amandabackup] </para>
++<para> A space separated list of recipients for mail reports. default [backup] </para>
+ </listitem>
+ </varlistentry>
+
+@@ -193,7 +193,7 @@ is supported.</para>
+ <varlistentry>
+ <term><option>/var/lib/amanda</option></term>
+ <listitem>
+-<para>amandabackup home directory</para>
++<para>backup home directory</para>
+ </listitem>
+ </varlistentry>
+
+diff --git a/man/xml-source/amsuntar.8.xml b/man/xml-source/amsuntar.8.xml
+index 47ff3d5..f11afc5 100644
+--- a/man/xml-source/amsuntar.8.xml
++++ b/man/xml-source/amsuntar.8.xml
+@@ -39,9 +39,9 @@ must be the directory to backup.</para>
+
+ <para>Solaris 10 supports Role Based Access Control(RBAC) which is enabled
+ by default. To run backup operations using sun tar utility by under
+-privileged user like amandabackup, amandabackup user need to have proper
++privileged user like backup, backup user need to have proper
+ roles and profiles, specially "Media Backup" profile/role. This can be done
+-using 'usermod -P "Media Backup" amandabackup' command.</para>
++using 'usermod -P "Media Backup" backup' command.</para>
+
+
+ </refsect1>
--- /dev/null
+Description: make dumpdates path in docs match Debian configuration
+Author: Bdale Garbee <bdale@gag.com>
+
+--- amanda-3.3.0.orig/man/disklist.5
++++ amanda-3.3.0/man/disklist.5
+@@ -89,7 +89,7 @@ defined in the
+ \fBamanda\&.conf\fR
+ file\&.
+ \fIDumptype\fRs specify backup related parameters, such as whether to compress the backups, whether to record backup results in
+-/etc/dumpdates, the disk\*(Aqs relative priority, etc\&.
++/var/lib/dumpdates, the disk\*(Aqs relative priority, etc\&.
+ .RE
+ .PP
+ \fIspindle\fR
+--- amanda-3.3.0.orig/man/amanda.conf.5
++++ amanda-3.3.0/man/amanda.conf.5
+@@ -1672,8 +1672,8 @@ keyword append the values to the list of
+ \fBrecord\fR \fIboolean\fR
+ .RS 4
+ Default:
+-\fByes\fR\&. Whether to ask the backup program to update its database (e\&.g\&.
+-/etc/dumpdates
++\fIyes\fR\&. Whether to ask the backup program to update its database (e\&.g\&.
++/var/lib/dumpdates
+ for DUMP or
+ /usr/local/var/amanda/gnutar\-lists
+ for GNUTAR) of time stamps\&. This is normally enabled for daily backups and turned off for periodic archival runs\&.
+--- amanda-3.3.0.orig/man/entities/global.entities.in
++++ amanda-3.3.0/man/entities/global.entities.in
+@@ -98,7 +98,7 @@
+ <!ENTITY tapelist '<manref name="tapelist" vol="5"/>'>
+
+ <!-- IDs for files used by AMANDA-->
+-<!ENTITY dumpdates '<filename>/etc/dumpdates</filename>'>
++<!ENTITY dumpdates '<filename>/var/lib/dumpdates</filename>'>
+
+ <!-- IDs for AMANDA commands-->
+ <!ENTITY amadmin ' <command>amadmin</command>'>
+--- amanda-3.3.0.orig/man/xml-source/disklist.5.xml
++++ amanda-3.3.0/man/xml-source/disklist.5.xml
+@@ -112,7 +112,7 @@ file.
+ specify backup related parameters,
+ such as whether to compress the backups,
+ whether to record backup results in
+-<filename>/etc/dumpdates</filename>, the disk's relative priority, etc.</para>
++<filename>/var/lib/dumpdates</filename>, the disk's relative priority, etc.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+--- amanda-3.3.0.orig/man/xml-source/amanda.conf.5.xml
++++ amanda-3.3.0/man/xml-source/amanda.conf.5.xml
+@@ -2155,8 +2155,8 @@ the property to set, and the others cont
+ <term><amkeyword>record</amkeyword> <amtype>boolean</amtype></term>
+ <listitem>
+ <para>Default:
+-<amkeyword>yes</amkeyword>.
+-Whether to ask the backup program to update its database (e.g. <filename>/etc/dumpdates</filename>
++<emphasis remap='I'>yes</emphasis>.
++Whether to ask the backup program to update its database (e.g. <filename>/var/lib/dumpdates</filename>
+ for DUMP or <filename>/usr/local/var/amanda/gnutar-lists</filename> for GNUTAR) of time stamps.
+ This is normally enabled for daily backups and turned off for periodic archival runs.</para>
+ </listitem>
+--- amanda-3.3.0.orig/client-src/amandates.c
++++ amanda-3.3.0/client-src/amandates.c
+@@ -26,7 +26,7 @@
+ /*
+ * $Id: amandates.c,v 1.21 2006/07/25 18:35:21 martinea Exp $
+ *
+- * manage amandates file, that mimics /etc/dumpdates, but stores
++ * manage amandates file, that mimics /var/lib/dumpdates, but stores
+ * GNUTAR dates
+ */
+
+@@ -314,7 +314,7 @@ import_dumpdates(
+
+ devname = amname_to_devname(amdp->name);
+
+- if((dumpdf = fopen("/etc/dumpdates", "r")) == NULL) {
++ if((dumpdf = fopen("/var/lib/dumpdates", "r")) == NULL) {
+ amfree(devname);
+ return;
+ }
+--- amanda-3.3.0.orig/client-src/selfcheck.c
++++ amanda-3.3.0/client-src/selfcheck.c
+@@ -1128,8 +1128,8 @@ check_overall(void)
+ check_file(COMPRESS_PATH, X_OK);
+
+ if (need_dump || need_xfsdump ) {
+- if (check_file_exist("/etc/dumpdates")) {
+- check_file("/etc/dumpdates",
++ if (check_file_exist("/var/lib/dumpdates")) {
++ check_file("/var/lib/dumpdates",
+ #ifdef USE_RUNDUMP
+ F_OK
+ #else
+@@ -1139,15 +1139,15 @@ check_overall(void)
+ } else {
+ #ifndef USE_RUNDUMP
+ if (access("/etc", R_OK|W_OK) == -1) {
+- g_printf(_("ERROR [dump will not be able to create the /etc/dumpdates file: %s]\n"), strerror(errno));
++ g_printf(_("ERROR [dump will not be able to create the /var/lib/dumpdates file: %s]\n"), strerror(errno));
+ }
+ #endif
+ }
+ }
+
+ if (need_vdump) {
+- if (check_file_exist("/etc/vdumpdates")) {
+- check_file("/etc/vdumpdates", F_OK);
++ if (check_file_exist("/var/lib/vdumpdates")) {
++ check_file("/var/lib/vdumpdates", F_OK);
+ }
+ }
+
+@@ -1159,6 +1159,7 @@ check_overall(void)
+ check_space(AMANDA_DBGDIR, (off_t)64); /* for amandad i/o */
+ #endif
+
++ check_space("/var/lib", (off_t)64); /* for /var/lib/dumpdates writing */
+ check_space("/etc", (off_t)64); /* for /etc/dumpdates writing */
+ }
+ }
+--- amanda-3.3.0.orig/server-src/diskfile.h
++++ amanda-3.3.0/server-src/diskfile.h
+@@ -110,7 +110,7 @@ typedef struct disk_s {
+ char *clnt_decrypt_opt; /* client-side decryption option parameter to use */
+ double comprate[2]; /* default compression rates */
+ /* flag options */
+- int record; /* record dump in /etc/dumpdates ? */
++ int record; /* record dump in /var/lib/dumpdates ? */
+ int skip_incr; /* incs done externally ? */
+ int skip_full; /* fulls done externally ? */
+ int to_holdingdisk; /* use holding disk ? */
+--- amanda-3.3.0.orig/example/amanda.conf.in
++++ amanda-3.3.0/example/amanda.conf.in
+@@ -460,7 +460,7 @@ define tapetype SEAGATE-ULTRIUM-LTO {
+ # program - specify the dump system to use. Valid values are "DUMP",
+ # or "GNUTAR". Default: [program "DUMP"].
+ # record - record the backup in the time-stamp-database of the backup
+-# program (e.g. /etc/dumpdates for DUMP or
++# program (e.g. /var/lib/dumpdates for DUMP or
+ # @GNUTAR_LISTED_INCREMENTAL_DIRX@ for GNUTAR.).
+ # Default: [record yes]
+ # skip-full - skip the disk when a level 0 is due, to allow full backups
+@@ -621,7 +621,7 @@ define dumptype nocomp-high {
+
+ define dumptype nocomp-test {
+ global
+- comment "test dump without compression, no /etc/dumpdates recording"
++ comment "test dump without compression, no /var/lib/dumpdates recording"
+ compress none
+ record no
+ priority medium
+@@ -629,7 +629,7 @@ define dumptype nocomp-test {
+
+ define dumptype comp-test {
+ nocomp-test
+- comment "test dump with compression, no /etc/dumpdates recording"
++ comment "test dump with compression, no /var/lib/dumpdates recording"
+ compress client fast
+ }
+
+--- amanda-3.3.0.orig/example/template.d/dumptypes
++++ amanda-3.3.0/example/template.d/dumptypes
+@@ -106,7 +106,7 @@
+ # program - specify the dump system to use. Valid values are "DUMP"
+ # "STAR" and "GNUTAR". Default: [program "DUMP"].
+ # record - record the backup in the time-stamp-database of the backup
+-# program (e.g. /etc/dumpdates for DUMP or
++# program (e.g. /var/lib/dumpdates for DUMP or
+ # /var/lib/amanda/gnutar-lists for GNUTAR.).
+ # Default: [record yes]
+ # skip-full - skip the disk when a level 0 is due, to allow full backups
+@@ -302,7 +302,7 @@ define dumptype nocomp-high {
+
+ define dumptype nocomp-test {
+ global
+- comment "test dump without compression, no /etc/dumpdates recording"
++ comment "test dump without compression, no /var/lib/dumpdates recording"
+ compress none
+ record no
+ priority medium
+@@ -310,7 +310,7 @@ define dumptype nocomp-test {
+
+ define dumptype comp-test {
+ nocomp-test
+- comment "test dump with compression, no /etc/dumpdates recording"
++ comment "test dump with compression, no /var/lib/dumpdates recording"
+ compress client fast
+ }
+
--- /dev/null
+diff --git a/server-src/amserverconfig.pl b/server-src/amserverconfig.pl
+index a05dd18..9357116 100755
+--- a/server-src/amserverconfig.pl
++++ b/server-src/amserverconfig.pl
+@@ -31,7 +31,7 @@ use Amanda::Constants;
+
+ my $confdir="$CONFIG_DIR";
+ my $tmpdir="$AMANDA_DBGDIR";
+-my $amandahomedir="$localstatedir/lib/amanda";
++my $amandahomedir="$localstatedir/amanda";
+ my $templatedir="$amdatadir/template.d"; #rpm install template files here
+ my $def_tapedev="file:$amandahomedir/vtapes";
+
--- /dev/null
+dumpdates-path
+fix-amserverconfig-path
+amandabackup-hard-coded
--- /dev/null
+[type: gettext/rfc822deb] templates
--- /dev/null
+# translation of ar.po to
+#
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans#
+# Developers do not need to manually edit POT or PO files.
+#
+# Ossama M. Khayat, 2005.
+# Ossama M. Khayat <okhayat@yahoo.com>, 2010.
+msgid ""
+msgstr ""
+"Project-Id-Version: amanda_1:2.4.5-1\n"
+"Report-Msgid-Bugs-To: amanda@packages.debian.org\n"
+"POT-Creation-Date: 2008-04-16 01:13-0600\n"
+"PO-Revision-Date: 2010-09-09 04:51+0300\n"
+"Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
+"Language-Team: Arabic <support@arabeyes.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
+"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+
+#. Type: error
+#. Description
+#: ../templates:1001
+msgid "Please merge /var/lib/amandates and /var/lib/amanda/amandates"
+msgstr "الرجاء دمج /var/lib/amandates و /var/lib/amanda/amandates"
+
+#. Type: error
+#. Description
+#: ../templates:1001
+msgid ""
+"You have both /var/lib/amandates and /var/lib/amanda/amandates. Please "
+"review the files, and merge the contents you care about to the /var/lib/"
+"amanda/amandates location, and remove the old file /var/lib/amandates."
+msgstr ""
+"لديك كلاً من /var/lib/amandates و /var/lib/amanda/amandates. الرجاء معاينة "
+"الملفات، ودمج المحتويات التي تهمك حول موقع /var/lib/amanda/amandates، وإزالة "
+"الملف /var/lib/amandates القديم."
+
--- /dev/null
+#
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+#
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+# Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: amanda\n"
+"Report-Msgid-Bugs-To: amanda@packages.debian.org\n"
+"POT-Creation-Date: 2008-04-16 01:13-0600\n"
+"PO-Revision-Date: 2006-06-04 17:06+0200\n"
+"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
+"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: error
+#. Description
+#: ../templates:1001
+msgid "Please merge /var/lib/amandates and /var/lib/amanda/amandates"
+msgstr "Spojte prosím /var/lib/amandates a /var/lib/amanda/amandates"
+
+#. Type: error
+#. Description
+#: ../templates:1001
+msgid ""
+"You have both /var/lib/amandates and /var/lib/amanda/amandates. Please "
+"review the files, and merge the contents you care about to the /var/lib/"
+"amanda/amandates location, and remove the old file /var/lib/amandates."
+msgstr ""
+"V systému máte soubor /var/lib/amandates i /var/lib/amanda/amandates. Oba "
+"soubory prohlédněte, zajímavý obsah slučte do /var/lib/amanda/amandates a "
+"starý soubor /var/lib/amandates smažte."
--- /dev/null
+# Danish translation for amanda.
+# Copyright (C) 2010 amanda og nedenstående oversættere.
+# This file is distributed under the same license as the amanda package.
+# Joe Hansen (joedalton2@yahoo.dk), 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: amanda\n"
+"Report-Msgid-Bugs-To: amanda@packages.debian.org\n"
+"POT-Creation-Date: 2008-04-16 01:13-0600\n"
+"PO-Revision-Date: 2010-12-30 19:25+0200\n"
+"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
+"Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: error
+#. Description
+#: ../templates:1001
+msgid "Please merge /var/lib/amandates and /var/lib/amanda/amandates"
+msgstr "Venligst flet /var/lib/amandates og /var/lib/amanda/amandates"
+
+#. Type: error
+#. Description
+#: ../templates:1001
+msgid ""
+"You have both /var/lib/amandates and /var/lib/amanda/amandates. Please "
+"review the files, and merge the contents you care about to the /var/lib/"
+"amanda/amandates location, and remove the old file /var/lib/amandates."
+msgstr ""
+"Du har både /var/lib/amandates og /var/lib/amanda/amandates. Du rådes til at "
+"gennemse filerne, og flette indholdet der interesserer dig til den nye "
+"lokation /var/lib/amanda/amandates og fjern den gamle fil /var/lib/amandates."
--- /dev/null
+#
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+#
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+# Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: amanda@packages.debian.org\n"
+"POT-Creation-Date: 2008-04-16 01:13-0600\n"
+"PO-Revision-Date: 2006-10-29 15:05+0100\n"
+"Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
+"Language-Team: de <debian-l10n-german@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: error
+#. Description
+#: ../templates:1001
+msgid "Please merge /var/lib/amandates and /var/lib/amanda/amandates"
+msgstr "Bitte vereinigen Sie /var/lib/amandates und /var/lib/amanda/amandates."
+
+#. Type: error
+#. Description
+#: ../templates:1001
+msgid ""
+"You have both /var/lib/amandates and /var/lib/amanda/amandates. Please "
+"review the files, and merge the contents you care about to the /var/lib/"
+"amanda/amandates location, and remove the old file /var/lib/amandates."
+msgstr ""
+"Es existieren die beiden Verzeichnisse /var/lib/amandates und /var/lib/"
+"amanda/amandates. Bitte überprüfen Sie die Dateien und verschieben Sie den "
+"Inhalt, der Ihnen wichtig ist, nach /var/lib/amanda/amandates und löschen "
+"Sie die alte Datei /var/lib/amandates."
--- /dev/null
+# amanda translation to spanish
+# Copyright (C) 2007 Free Software Foundation, Inc.
+# This file is distributed under the same license as the package.
+#
+# Changes:
+# - Initial translation
+# Manuel Porras Peralta , 2007
+#
+#
+# Traductores, si no conoce el formato PO, merece la pena leer la
+# documentación de gettext, especialmente las secciones dedicadas a este
+# formato, por ejemplo ejecutando:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+#
+# Equipo de traducción al español, por favor lean antes de traducir
+# los siguientes documentos:
+#
+# - El proyecto de traducción de Debian al español
+# http://www.debian.org/intl/spanish/
+# especialmente las notas y normas de traducción en
+# http://www.debian.org/intl/spanish/notas
+#
+# - La guía de traducción de po's de debconf:
+# /usr/share/doc/po-debconf/README-trans
+# o http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+# Si tiene dudas o consultas sobre esta traducción consulte con el último
+# traductor (campo Last-Translator) y ponga en copia a la lista de
+# traducción de Debian al español (<debian-l10n-spanish@lists.debian.org>)
+msgid ""
+msgstr ""
+"Project-Id-Version: amanda\n"
+"Report-Msgid-Bugs-To: amanda@packages.debian.org\n"
+"POT-Creation-Date: 2008-04-16 01:13-0600\n"
+"PO-Revision-Date: 2007-01-29 14:29+0100\n"
+"Last-Translator: Manuel Porras Peralta «Venturi» <venturi.debian@gmail.com>\n"
+"Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: error
+#. Description
+#: ../templates:1001
+msgid "Please merge /var/lib/amandates and /var/lib/amanda/amandates"
+msgstr "Por favor, combine «/var/lib/amandates» y «/var/lib/amanda/amandates»"
+
+#. Type: error
+#. Description
+#: ../templates:1001
+msgid ""
+"You have both /var/lib/amandates and /var/lib/amanda/amandates. Please "
+"review the files, and merge the contents you care about to the /var/lib/"
+"amanda/amandates location, and remove the old file /var/lib/amandates."
+msgstr ""
+"Se han detectado los archivos «/var/lib/amandates» y «/var/lib/amanda/"
+"amandates». Por favor, revíselos, combine los contenidos que necesite en el "
+"archivo «/var/lib/amanda/amandates», y borre el archivo antiguo «/var/lib/"
+"amandates»."
--- /dev/null
+# Copyright (C) 2009
+# This file is distributed under the same license as the amanda package.
+#
+# Esko Arajärvi <edu@iki.fi>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: amanda\n"
+"Report-Msgid-Bugs-To: amanda@packages.debian.org\n"
+"POT-Creation-Date: 2008-04-16 01:13-0600\n"
+"PO-Revision-Date: 2009-06-30 22:11+0300\n"
+"Last-Translator: Esko Arajärvi <edu@iki.fi>\n"
+"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 0.3\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. Type: error
+#. Description
+#: ../templates:1001
+msgid "Please merge /var/lib/amandates and /var/lib/amanda/amandates"
+msgstr "Yhdistä /var/lib/amandates ja /var/lib/amanda/amandates"
+
+#. Type: error
+#. Description
+#: ../templates:1001
+msgid ""
+"You have both /var/lib/amandates and /var/lib/amanda/amandates. Please "
+"review the files, and merge the contents you care about to the /var/lib/"
+"amanda/amandates location, and remove the old file /var/lib/amandates."
+msgstr ""
+"Järjestelmässä on sekä tiedosto /var/lib/amandates että tiedosto "
+"/var/lib/amanda/amandates. Tarkasta molemmat tiedostot ja yhdistä "
+"tarvittava sisältö tiedostoon /var/lib/amanda/amandates. Poista tämän "
+"jälkeen vanha tiedosto /var/lib/amandates."
+
--- /dev/null
+# translation of fr.po to French
+#
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+#
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+# Developers do not need to manually edit POT or PO files.
+#
+# Original french translation by an unknown contributor
+#
+# Christian Perrier <bubulle@debian.org>, 2006.
+msgid ""
+msgstr ""
+"Project-Id-Version: fr\n"
+"Report-Msgid-Bugs-To: amanda@packages.debian.org\n"
+"POT-Creation-Date: 2008-04-16 01:13-0600\n"
+"PO-Revision-Date: 2006-05-28 17:13+0200\n"
+"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.2\n"
+
+#. Type: error
+#. Description
+#: ../templates:1001
+msgid "Please merge /var/lib/amandates and /var/lib/amanda/amandates"
+msgstr ""
+"Fusion indispensable de /var/lib/amandates et /var/lib/amanda/amandates"
+
+#. Type: error
+#. Description
+#: ../templates:1001
+msgid ""
+"You have both /var/lib/amandates and /var/lib/amanda/amandates. Please "
+"review the files, and merge the contents you care about to the /var/lib/"
+"amanda/amandates location, and remove the old file /var/lib/amandates."
+msgstr ""
+"Les deux fichiers /var/lib/amandates et /var/lib/amanda/amandates existent. "
+"Veuillez les examiner et fusionner les données importantes dans le fichier /"
+"var/lib/amanda/amandates ; supprimez ensuite l'ancien fichier /var/lib/"
+"amandates. "
--- /dev/null
+#. This catalog was generated by poedit
+#. Number of items: 2
+#. Language: French
+#. Country:
+#. Basepath:
+#. Paths: 0
+#. Keywords: 0
--- /dev/null
+# Galician translation of amanda's debconf templates
+# This file is distributed under the same license as the amanda package.
+# Jacobo Tarrio <jtarrio@debian.org>, 2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: amanda\n"
+"Report-Msgid-Bugs-To: amanda@packages.debian.org\n"
+"POT-Creation-Date: 2008-04-16 01:13-0600\n"
+"PO-Revision-Date: 2007-03-09 09:24+0100\n"
+"Last-Translator: Jacobo Tarrio <jtarrio@debian.org>\n"
+"Language-Team: Galician <proxecto@trasno.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: error
+#. Description
+#: ../templates:1001
+msgid "Please merge /var/lib/amandates and /var/lib/amanda/amandates"
+msgstr "Combine /var/lib/amandates e /var/lib/amanda/amandates"
+
+#. Type: error
+#. Description
+#: ../templates:1001
+msgid ""
+"You have both /var/lib/amandates and /var/lib/amanda/amandates. Please "
+"review the files, and merge the contents you care about to the /var/lib/"
+"amanda/amandates location, and remove the old file /var/lib/amandates."
+msgstr ""
+"No seu sistema existen os dous ficheiros, /var/lib/amandates e /var/lib/"
+"amanda/amandates. Revise os ficheiros e combine o contido interesante no "
+"ficheiro /var/lib/amanda/amandates e elimine o ficheiro antigo, /var/lib/"
+"amandates."
--- /dev/null
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: amanda 1-3.3.0-1\n"
+"Report-Msgid-Bugs-To: amanda@packages.debian.org\n"
+"POT-Creation-Date: 2008-04-16 01:13-0600\n"
+"PO-Revision-Date: 2012-02-03 19:55+0700\n"
+"Last-Translator: Kurniawan Haikal <conecones@gmail.com>\n"
+"Language-Team: Debian Indonesia Translators <debian-l10n-indonesian@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Indonesian\n"
+"X-Poedit-Country: INDONESIA\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#. Type: error
+#. Description
+#: ../templates:1001
+msgid "Please merge /var/lib/amandates and /var/lib/amanda/amandates"
+msgstr "Silakan gabungkan /var/lib/amandates dan /var/lib/amanda/amandates"
+
+#. Type: error
+#. Description
+#: ../templates:1001
+msgid "You have both /var/lib/amandates and /var/lib/amanda/amandates. Please review the files, and merge the contents you care about to the /var/lib/amanda/amandates location, and remove the old file /var/lib/amandates."
+msgstr "Anda memiliki /var/lib/amandates dan /var/lib/amanda/amandates. Silakan periksa ulang berkas-berkas tersebut, dan gabungkan isi yang Anda anggap penting ke lokasi /var/lib/amanda/amandates, dan hapus berkas lama /var/lib/amandates."
+
--- /dev/null
+# Italian (it) translation of debconf templates for amanda
+# Copyright (C) 2004 Software in the Public Interest
+# This file is distributed under the same license as the amanda package.
+# Luca Monducci <luca.mo@tiscali.it>, 2004-2006.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: amanda 1:2.5.0p2 italian debconf templates\n"
+"Report-Msgid-Bugs-To: amanda@packages.debian.org\n"
+"POT-Creation-Date: 2008-04-16 01:13-0600\n"
+"PO-Revision-Date: 2006-05-30 10:30+0200\n"
+"Last-Translator: Luca Monducci <luca.mo@tiscali.it>\n"
+"Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: error
+#. Description
+#: ../templates:1001
+msgid "Please merge /var/lib/amandates and /var/lib/amanda/amandates"
+msgstr "Unire /var/lib/amandates e /var/lib/amanda/amndates."
+
+#. Type: error
+#. Description
+#: ../templates:1001
+msgid ""
+"You have both /var/lib/amandates and /var/lib/amanda/amandates. Please "
+"review the files, and merge the contents you care about to the /var/lib/"
+"amanda/amandates location, and remove the old file /var/lib/amandates."
+msgstr ""
+"Esistono sia /var/lib/amandates che /var/lib/amanda/amandates. Controllare i "
+"file e unire tutte le parti utili in /var/lib/amanda/amandates e poi "
+"rimuovere il file /var/lib/amanadates."
--- /dev/null
+#
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+#
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+# Developers do not need to manually edit POT or PO files.
+#
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: amanda 2.5.0p2-2.1\n"
+"Report-Msgid-Bugs-To: amanda@packages.debian.org\n"
+"POT-Creation-Date: 2008-04-16 01:13-0600\n"
+"PO-Revision-Date: 2006-10-11 00:08+0900\n"
+"Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
+"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: error
+#. Description
+#: ../templates:1001
+msgid "Please merge /var/lib/amandates and /var/lib/amanda/amandates"
+msgstr "/var/lib/amandates と /var/lib/amanda/amandates をマージしてください。"
+
+#. Type: error
+#. Description
+#: ../templates:1001
+msgid ""
+"You have both /var/lib/amandates and /var/lib/amanda/amandates. Please "
+"review the files, and merge the contents you care about to the /var/lib/"
+"amanda/amandates location, and remove the old file /var/lib/amandates."
+msgstr ""
+"/var/lib/amandates と /var/lib/amanda/amandates の両方があります。ファイルを"
+"確認し、/var/lib/amanda/amandates に注意が必要な内容をマージしてから、古い"
+"ファイル /var/lib/amandates を削除してください。"
--- /dev/null
+# translation of amanda 1:2.5.0p2-1_templates.po to Dutch
+# This file is distributed under the same license as the amanda package.
+# Please see debian/copyright.
+#
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+#
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+# Developers do not need to manually edit POT or PO files.
+#
+# Luk Claes <luk.claes(AT)ugent(DOT)be>, 2004
+# This is an unofficial translation
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: amanda 1:2.5.0p2-1\n"
+"Report-Msgid-Bugs-To: amanda@packages.debian.org\n"
+"POT-Creation-Date: 2008-04-16 01:13-0600\n"
+"PO-Revision-Date: 2006-06-18 20:45+0100\n"
+"Last-Translator: Kurt De Bree <kdebree(AT)telenet(DOT)be>\n"
+"Language-Team: Debian l10n Dutch <debian-l10n-dutch@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: error
+#. Description
+#: ../templates:1001
+msgid "Please merge /var/lib/amandates and /var/lib/amanda/amandates"
+msgstr "Voeg /var/lib/amandates en /var/lib/amanda/amandates samen."
+
+#. Type: error
+#. Description
+#: ../templates:1001
+msgid ""
+"You have both /var/lib/amandates and /var/lib/amanda/amandates. Please "
+"review the files, and merge the contents you care about to the /var/lib/"
+"amanda/amandates location, and remove the old file /var/lib/amandates."
+msgstr ""
+"Zowel /var/lib/amandates als /var/lib/amanda/amandates zijn op uw "
+"systeemaanwezig. Kijk deze bestanden na en combineer de inhoud u belangrijk "
+"vindt, in /var/lib/amanda/amandates, en verwijder het oude bestand /var/lib/"
+"amandates."
--- /dev/null
+# Portuguese translation of amanda debconf messages.
+# Copyright (C) 2007 Carlos Lisboa
+# This file is distributed under the same license as the amanda package.
+# Carlos Lisboa <carloslisboa@gmail.com>, 2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: amanda\n"
+"Report-Msgid-Bugs-To: amanda@packages.debian.org\n"
+"POT-Creation-Date: 2008-04-16 01:13-0600\n"
+"PO-Revision-Date: 2007-02-04 12:24+0000\n"
+"Last-Translator: Carlos Lisboa <carloslisboa@gmail.com>\n"
+"Language-Team: Portuguese <traduz@debianpt.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: error
+#. Description
+#: ../templates:1001
+msgid "Please merge /var/lib/amandates and /var/lib/amanda/amandates"
+msgstr ""
+"Por favor faça a fusão de /var/lib/amandates e /var/lib/amanda/amandates"
+
+#. Type: error
+#. Description
+#: ../templates:1001
+msgid ""
+"You have both /var/lib/amandates and /var/lib/amanda/amandates. Please "
+"review the files, and merge the contents you care about to the /var/lib/"
+"amanda/amandates location, and remove the old file /var/lib/amandates."
+msgstr ""
+"Possui tanto o /var/lib/amandates como o /var/lib/amanda/amandates. Por "
+"favor reveja esses ficheiros, e faça a fusão do conteúdo que pretende para o "
+"local /var/lib/amanda/amandates, e remova o ficheiro antigo /var/lib/"
+"amandates."
--- /dev/null
+#
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+#
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+# Developers do not need to manually edit POT or PO files.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: amanda@packages.debian.org\n"
+"POT-Creation-Date: 2008-04-16 01:13-0600\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: error
+#. Description
+#: ../templates:1001
+#, fuzzy
+msgid "Please merge /var/lib/amandates and /var/lib/amanda/amandates"
+msgstr "Por favor junte /var/lib/amandates e /var/lib/amanda/amandates."
+
+#. Type: error
+#. Description
+#: ../templates:1001
+msgid ""
+"You have both /var/lib/amandates and /var/lib/amanda/amandates. Please "
+"review the files, and merge the contents you care about to the /var/lib/"
+"amanda/amandates location, and remove the old file /var/lib/amandates."
+msgstr ""
+"Você possui ambos /var/lib/amandates e /var/lib/amanda/amandates. Por favor "
+"revise os arquivos, junte os conteúdos que lhe importam para a localização /"
+"var/lib/amanda/amandates e remova o antigo arquivo /var/lib/amandates."
--- /dev/null
+# translation of amanda_1:2.5.2p1-1_ru.po to Russian
+#
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans#
+# Developers do not need to manually edit POT or PO files.
+#
+# Yuri Kozlov <kozlov.y@gmail.com>, 2008.
+msgid ""
+msgstr ""
+"Project-Id-Version: amanda 1:2.5.2p1-1\n"
+"Report-Msgid-Bugs-To: amanda@packages.debian.org\n"
+"POT-Creation-Date: 2008-04-16 01:13-0600\n"
+"PO-Revision-Date: 2008-03-15 13:30+0300\n"
+"Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
+"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#. Type: error
+#. Description
+#: ../templates:1001
+msgid "Please merge /var/lib/amandates and /var/lib/amanda/amandates"
+msgstr ""
+"Объедините настройки из /var/lib/amandates и /var/lib/amanda/amandates."
+
+#. Type: error
+#. Description
+#: ../templates:1001
+msgid ""
+"You have both /var/lib/amandates and /var/lib/amanda/amandates. Please "
+"review the files, and merge the contents you care about to the /var/lib/"
+"amanda/amandates location, and remove the old file /var/lib/amandates."
+msgstr ""
+"В системе найдены файлы: /var/lib/amandates и /var/lib/amanda/amandates. "
+"Просмотрите эти файлы, объедините их настройки в файле /var/lib/amanda/"
+"amandates и удалите старый файл /var/lib/amandates."
--- /dev/null
+#
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+#
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+# Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: amanda 1:2.5.0p2-1\n"
+"Report-Msgid-Bugs-To: amanda@packages.debian.org\n"
+"POT-Creation-Date: 2008-04-16 01:13-0600\n"
+"PO-Revision-Date: 2006-06-27 23:05+0100\n"
+"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
+"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: error
+#. Description
+#: ../templates:1001
+msgid "Please merge /var/lib/amandates and /var/lib/amanda/amandates"
+msgstr "Sammanfoga /var/lib/amandates och /var/lib/amanda/amandates"
+
+#. Type: error
+#. Description
+#: ../templates:1001
+msgid ""
+"You have both /var/lib/amandates and /var/lib/amanda/amandates. Please "
+"review the files, and merge the contents you care about to the /var/lib/"
+"amanda/amandates location, and remove the old file /var/lib/amandates."
+msgstr ""
+"Du har både /var/lib/amandates och /var/lib/amanda/amandates. Granska dessa "
+"filer och sammanfoga innehållet som du bryr dig om till den nya platsen /var/"
+"lib/amanda/amandates. Ta sedan bort den gamla filen /var/lib/amandates."
--- /dev/null
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: amanda@packages.debian.org\n"
+"POT-Creation-Date: 2008-04-16 01:13-0600\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: error
+#. Description
+#: ../templates:1001
+msgid "Please merge /var/lib/amandates and /var/lib/amanda/amandates"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../templates:1001
+msgid ""
+"You have both /var/lib/amandates and /var/lib/amanda/amandates. Please "
+"review the files, and merge the contents you care about to the /var/lib/"
+"amanda/amandates location, and remove the old file /var/lib/amandates."
+msgstr ""
--- /dev/null
+# Vietnamese Translation for Amanda.
+# Copyright © 2010 Free Software Foundation, Inc.
+# Clytie Siddall <clytie@riverland.net.au>, 2005-2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: amanda 1/3.1.0-1\n"
+"Report-Msgid-Bugs-To: amanda@packages.debian.org\n"
+"POT-Creation-Date: 2008-04-16 01:13-0600\n"
+"PO-Revision-Date: 2010-10-31 13:45+1030\n"
+"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: LocFactoryEditor 1.8\n"
+
+#: ../templates:1001
+#. Type: error
+#. Description
+msgid "Please merge /var/lib/amandates and /var/lib/amanda/amandates"
+msgstr "Hòa trộn « /var/lib/amandates » và « /var/lib/amanda/amandates »"
+
+#: ../templates:1001
+#. Type: error
+#. Description
+msgid ""
+"You have both /var/lib/amandates and /var/lib/amanda/amandates. Please "
+"review the files, and merge the contents you care about to the /var/lib/"
+"amanda/amandates location, and remove the old file /var/lib/amandates."
+msgstr ""
+"Đồng thời có cả hai tập tin « /var/lib/amandates » và « /var/lib/amanda/amandates ». Hãy xem lại hai tập tin đó, sau đó hoà trộn nội dung muốn giữ lại vào vị trí « /var/lib/amanda/amandates », và gỡ bỏ tập tin cũ « /var/lib/amandates »."
--- /dev/null
+#!/usr/bin/make -f
+# Copyright 1998-2011 by Bdale Garbee. License GPL v2
+
+export DH_VERBOSE=1
+
+DPKG_EXPORT_BUILDFLAGS = 1
+-include /usr/share/dpkg/buildflags.mk
+
+r=$(shell pwd)/debian/amanda-common
+s=$(shell pwd)/debian/amanda-server
+c=$(shell pwd)/debian/amanda-client
+
+configure: configure-stamp
+configure-stamp:
+ dh_testdir
+ # pick up latest config files provided by autotools-dev
+ cp -f /usr/share/misc/config.sub config/config.sub
+ cp -f /usr/share/misc/config.guess config/config.guess
+ # do we need --{htmldir,dvidir,pdfdir,psdir} to force subdirectories?
+ # should we re-craft this to use --without-server and --without-client,
+ # and lose the amanda-common package?
+ MAILER=/usr/bin/mail \
+ SSH=/usr/bin/ssh \
+ ./configure \
+ --prefix=/usr \
+ --bindir=/usr/sbin \
+ --libexecdir=/usr/lib/amanda \
+ --without-amlibexecdir \
+ --without-amperldir \
+ --sysconfdir=/etc \
+ --sharedstatedir=/var/lib \
+ --localstatedir=/var/lib \
+ --with-user=backup \
+ --with-group=backup \
+ --with-tcpportrange=50000,50100 \
+ --with-udpportrange=840,860 \
+ --with-debugging=/var/log/amanda \
+ --with-gnutar-listdir=/var/lib/amanda/gnutar-lists \
+ --with-index-server=localhost \
+ --with-bsd-security \
+ --with-smbclient=/usr/bin/smbclient \
+ --with-amandahosts \
+ --with-ssh-security \
+ --with-bsdtcp-security \
+ --with-bsdudp-security \
+ --without-ipv6 \
+ --enable-s3-device
+
+ touch missing
+ touch configure-stamp
+
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
+build-stamp: configure-stamp
+ dh_testdir
+ MAILER=/usr/bin/mail $(MAKE) CFLAGS="$(CFLAGS) -O2 -g -Wall \
+ -DAMANDATES_FILE='\"/var/lib/amanda/amandates\"' \
+ -DIGNORE_TAR_ERRORS "
+ touch build-stamp
+
+clean:
+ dh_testdir
+ dh_testroot
+ [ ! -f Makefile ] || make clean
+ [ ! -f Makefile ] || make distclean
+ -rm -f build-stamp configure-stamp missing config/config.h common-src/genversion
+ -find . -type d -name .deps -exec rm -rf {} \;
+ dh_clean
+
+# call this before packaging for upload when updating template English text
+updatepo:
+ -rm -f debian/po/templates.pot
+ debconf-updatepo
+
+binary-indep: build
+
+binary-arch: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs -a
+ make install DESTDIR=$(r)
+ sed -i "/dependency_libs/ s/'.*'/''/" `find $(r)/usr/lib/amanda/ -name '*.la'`
+ install -m 644 debian/amandahosts $(r)/etc/amandahosts
+ dh_installdocs -a
+ dh_installexamples -a
+ cp ChangeLog $(r)/usr/share/doc/amanda-common/changelog
+ cp example/xinetd.amandaserver $(r)/etc/xinetd.d/amanda
+ dh_installmenu -a
+ dh_installcron -a
+ dh_installchangelogs -a
+ dh_installdebconf -a
+ dh_installman -a
+ dh_strip -a
+ dh_compress -a
+ dh_movefiles -a --sourcedir=debian/amanda-common
+ rm -r $(r)/usr/share/amanda
+ dh_fixperms -av
+ # fix perms manually
+ chown -R backup:backup debian/*/var/lib/*
+ chmod -R u=rwX,g=rwX,o-rwx debian/*/var/lib/*
+ chown -R backup:backup $(s)/etc/amanda
+ chmod -R u=rwX,g=rwX,o-rwx $(s)/etc/amanda
+ chown -R backup:backup $(c)/var/lib/amanda/gnutar-lists
+ chmod -R u=rwX,g=rwX,o-rwx $(c)/var/lib/amanda/gnutar-lists
+ # .. setuid
+ chown root:backup \
+ $(c)/usr/lib/amanda/application/amgtar \
+ $(c)/usr/lib/amanda/application/amstar \
+ $(c)/usr/lib/amanda/calcsize \
+ $(c)/usr/lib/amanda/killpgrp \
+ $(c)/usr/lib/amanda/rundump \
+ $(c)/usr/lib/amanda/runtar \
+ $(s)/usr/lib/amanda/dumper \
+ $(s)/usr/lib/amanda/planner \
+ $(s)/usr/sbin/amcheck
+ chmod u=srwx,g=rx,o=r \
+ $(c)/usr/lib/amanda/application/amgtar \
+ $(c)/usr/lib/amanda/application/amstar \
+ $(c)/usr/lib/amanda/calcsize \
+ $(c)/usr/lib/amanda/killpgrp \
+ $(c)/usr/lib/amanda/rundump \
+ $(c)/usr/lib/amanda/runtar \
+ $(s)/usr/lib/amanda/dumper \
+ $(s)/usr/lib/amanda/planner \
+ $(s)/usr/sbin/amcheck
+ install -o root -g root -m 0644 debian/amanda-client.lintian \
+ $(c)/usr/share/lintian/overrides/amanda-client
+ install -o root -g root -m 0644 debian/amanda-common.lintian \
+ $(r)/usr/share/lintian/overrides/amanda-common
+ install -o root -g root -m 0644 debian/amanda-server.lintian \
+ $(s)/usr/share/lintian/overrides/amanda-server
+ dh_makeshlibs -pamanda-common --noscripts
+ dh_installdeb -a
+ dh_perl -a usr/lib/amanda/perl
+ dh_shlibdeps -a -l"debian/amanda-common/usr/lib:debian/amanda-client/usr/lib:debian/amanda-server/usr/lib"
+ # strip out the non-versioned amanda-common references, we need
+ # the versioned ones in the control file and dupes are ugly...
+ sed -e 's/amanda-common, //' < debian/amanda-server.substvars > debian/blah
+ mv debian/blah debian/amanda-server.substvars
+ sed -e 's/amanda-common, //' < debian/amanda-client.substvars > debian/blah
+ mv debian/blah debian/amanda-client.substvars
+ dh_gencontrol -a
+ dh_md5sums -a
+ dh_builddeb -a
+
+source diff:
+ @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
+
+binary: binary-indep binary-arch
+.PHONY: configure build-indep build-arch build clean binary-indep binary-arch binary
--- /dev/null
+3.0 (quilt)
--- /dev/null
+Template: amanda-common/merge_amandates
+Type: error
+_Description: Please merge /var/lib/amandates and /var/lib/amanda/amandates
+ You have both /var/lib/amandates and /var/lib/amanda/amandates. Please
+ review the files, and merge the contents you care about to the
+ /var/lib/amanda/amandates location, and remove the old file
+ /var/lib/amandates.
--- /dev/null
+# debian/watch for amanda
+# format version number, currently 3; this line is compulsory!
+version=3
+# If your package is located on sourceforge, use the following format
+# to automatically use the qa.debian.org redirector, avoiding SF's
+# difficult mirror system.
+http://sf.net/amanda/amanda-([0-9]+\.[0-9]+\.[0-9]+[^b]*)\.tar\.gz debian uupdate
# Use /etc/amanda/pgpassfile for authentication credentials
# (Note: for PostgreSQL 8.0.x, you must use PG-PASSWORD instead)
# Should contain an appropriate line for foo (below).Example:
-# localhost:*:*:amandabackup:my_backup_password
+# localhost:*:*:backup:my_backup_password
# The file must be owned by the Amanda user with permissions 0600
property "PG-PASSFILE" "/etc/amanda/pgpassfile"
property "foo-PG-HOST" "localhost"
# Connect to port 5432 (PostgreSQL's default)
property "foo-PG-PORT" "5432"
-# Connect as user amandabackup (Note: must be a superuser)
-property "foo-PG-USER" "amandabackup"
+# Connect as user backup (Note: must be a superuser)
+property "foo-PG-USER" "backup"
# Connect to database template1 (exists by default)
property "foo-PG-DB" "template1"
# Database's data directory
# program - specify the dump system to use. Valid values are "DUMP",
# or "GNUTAR". Default: [program "DUMP"].
# record - record the backup in the time-stamp-database of the backup
-# program (e.g. /etc/dumpdates for DUMP or
+# program (e.g. /var/lib/dumpdates for DUMP or
# @GNUTAR_LISTED_INCREMENTAL_DIRX@ for GNUTAR.).
# Default: [record yes]
# skip-full - skip the disk when a level 0 is due, to allow full backups
define dumptype nocomp-test {
global
- comment "test dump without compression, no /etc/dumpdates recording"
+ comment "test dump without compression, no /var/lib/dumpdates recording"
compress none
record no
priority medium
define dumptype comp-test {
nocomp-test
- comment "test dump with compression, no /etc/dumpdates recording"
+ comment "test dump with compression, no /var/lib/dumpdates recording"
compress client fast
}
-#amanda stream tcp nowait amandabackup @amlibexecdir@/amandad -auth=bsdtcp amdump
-amanda stream tcp nowait amandabackup @amlibexecdir@/amandad amandad -auth=bsdtcp amdump
+#amanda stream tcp nowait backup @amlibexecdir@/amandad -auth=bsdtcp amdump
+amanda stream tcp nowait backup @amlibexecdir@/amandad amandad -auth=bsdtcp amdump
-amanda stream tcp nowait amandabackup @amlibexecdir@/amandad amandad -auth=bsdtcp amdump amindexd amidxtaped
+amanda stream tcp nowait backup @amlibexecdir@/amandad amandad -auth=bsdtcp amdump amindexd amidxtaped
# program - specify the dump system to use. Valid values are "DUMP"
# "STAR" and "GNUTAR". Default: [program "DUMP"].
# record - record the backup in the time-stamp-database of the backup
-# program (e.g. /etc/dumpdates for DUMP or
+# program (e.g. /var/lib/dumpdates for DUMP or
# /var/lib/amanda/gnutar-lists for GNUTAR.).
# Default: [record yes]
# skip-full - skip the disk when a level 0 is due, to allow full backups
define dumptype nocomp-test {
global
- comment "test dump without compression, no /etc/dumpdates recording"
+ comment "test dump without compression, no /var/lib/dumpdates recording"
compress none
record no
priority medium
define dumptype comp-test {
nocomp-test
- comment "test dump with compression, no /etc/dumpdates recording"
+ comment "test dump with compression, no /var/lib/dumpdates recording"
compress client fast
}
socket_type = stream
protocol = tcp
wait = no
- user = amandabackup
+ user = backup
group = disk
groups = yes
server = @amlibexecdir@/amandad
socket_type = stream
protocol = tcp
wait = no
- user = amandabackup
+ user = backup
group = disk
groups = yes
server = @amlibexecdir@/amandad
'plugin' => '"script-email"',
'execute-on' => 'pre-host-backup, post-host-backup',
'execute-where' => 'client',
- 'property' => '"mailto" "amandabackup" "amanda"',
+ 'property' => '"mailto" "backup" "amanda"',
]);
$testconf->add_device('my_device', [
'comment' => '"my device is mine, not yours"',
planner: HAVE_MMAP NEED_STRSTR HAVE_SYSVSHM AMFLOCK_POSIX AMFLOCK_LOCKF
planner: AMFLOCK_LNLOCK SETPGRP_VOID ASSERTIONS AMANDA_DEBUG_DAYS=4
planner: BSD_SECURITY RSH_SECURITY USE_AMANDAHOSTS
-planner: CLIENT_LOGIN="amandabackup" CHECK_USERID HAVE_GZIP
+planner: CLIENT_LOGIN="backup" CHECK_USERID HAVE_GZIP
planner: COMPRESS_SUFFIX=".gz" COMPRESS_FAST_OPT="--fast"
planner: COMPRESS_BEST_OPT="--best" UNCOMPRESS_OPT="-dc"
READING CONF INFO...
.PP
\fBamaddclient\fR
-must be run by user amandabackup\&.
+must be run by user backup\&.
.PP
\-\-config, \-\-client and \-\-diskdev must be specified\&.
.SH "OPTIONS"
.PP
\fB/var/lib/amanda\fR
.RS 4
-amandabackup home directory
+backup home directory
.RE
.PP
\fB/var/lib/amanda/\&.amandahosts\fR
.PP
When Amanda is built, a username is specified with the
\fB\-\-with\-user\fR
-option\&. Most Amanda processes run under this user\*(Aqs identity, to minimize security risks\&. In binary distributions, this username is usually one of \*(Aqamanda\*(Aq, \*(Aqamandabackup\*(Aq, or \*(Aqbackup\*(Aq\&. The examples below use \*(Aqamandabackup\*(Aq since it is unambiguous\&. You may need to adjust accordingly for your system\&.
+option\&. Most Amanda processes run under this user\*(Aqs identity, to minimize security risks\&. In binary distributions, this username is usually one of \*(Aqamanda\*(Aq, \*(Aqbackup\*(Aq, or \*(Aqbackup\*(Aq\&. The examples below use \*(Aqbackup\*(Aq since it is unambiguous\&. You may need to adjust accordingly for your system\&.
.SS "Authenticated Peer Hostnames"
.PP
Amanda\*(Aqs authentication mechanisms provide an authenticated hostname of the system on the other end of the connection, which is used to restrict access to only particular hosts\&. The degree of "authentication" performed on this hostname varies with the authentication mechanism, and is discussed below\&.
(which is equivalent to
\fBamdump\fR)\&.
.PP
-Example of the \&.amandahosts file on an Amanda client, where \*(Aqamandabackup\*(Aq is the Amanda dumpuser\&.
+Example of the \&.amandahosts file on an Amanda client, where \*(Aqbackup\*(Aq is the Amanda dumpuser\&.
.sp
.nf
- \fBamandaserver\&.example\&.com amandabackup amdump\fR
+ \fBamandaserver\&.example\&.com backup amdump\fR
.fi
.PP
Example of the \&.amandahosts file on an Amanda server
The authentication is done using \&.amandahosts files in the Amanda user\*(Aqs home directory\&. It uses UDP protocol between Amanda server and client for data and hence the number of DLEs is limited by the UDP packet size\&. It uses one TCP port to establish the connection and multiplexes all data streams using one port on the server (see PORT USAGE below)\&.
.SS "bsdtcp communication and authentication"
.PP
-The authentication is done using \&.amandahosts files in the backup user\*(Aqs (for example: amandabackup) home directory\&. It uses TCP protocol between Amanda server and client\&. On the client, two reserved ports are used\&. On the server, all data streams are multiplexed to one port (see PORT USAGE below)\&.
+The authentication is done using \&.amandahosts files in the backup user\*(Aqs (for example: backup) home directory\&. It uses TCP protocol between Amanda server and client\&. On the client, two reserved ports are used\&. On the server, all data streams are multiplexed to one port (see PORT USAGE below)\&.
.SS "USING INETD SERVER"
.PP
Template for Amanda client inetd service entry
.PP
Client example of using
\fBbsd\fR
-authorization for inetd server given Amanda user is "amandabackup":
+authorization for inetd server given Amanda user is "backup":
.sp
.nf
-\fB amanda dgram udp wait amandabackup /path/to/amandad amandad \-auth=bsd amdump\fR
+\fB amanda dgram udp wait backup /path/to/amandad amandad \-auth=bsd amdump\fR
.fi
.PP
The same could be used for
.PP
Client example of using
\fBbsdtcp\fR
-authorization for inetd server given Amanda user is "amandabackup":
+authorization for inetd server given Amanda user is "backup":
.sp
.nf
-\fB amanda stream tcp nowait amandabackup /path/to/amandad amandad \-auth=bsdtcp amdump\fR
+\fB amanda stream tcp nowait backup /path/to/amandad amandad \-auth=bsdtcp amdump\fR
.fi
.PP
\fBamindexd\fR
.PP
Server example of using
\fBbsdtcp\fR
-authorization for inetd server given Amanda user is "amandabackup":
+authorization for inetd server given Amanda user is "backup":
.sp
.nf
-\fB amanda stream tcp nowait amandabackup /path/to/amandad amandad \-auth=bsdtcp amdump amindexd amidxtaped\fR
+\fB amanda stream tcp nowait backup /path/to/amandad amandad \-auth=bsdtcp amdump amindexd amidxtaped\fR
.fi
.PP
For Amanda version 2\&.5\&.0 and earlier, remember that neither
Example of amindexd and amidxtaped Amanda daemon services configured as their own network services for a 2\&.5\&.0 or earlier server or a newer server having 2\&.5\&.0 or earlier clients
.sp
.nf
-\fB amandaidx stream tcp nowait amandabackup /usr/local/libexec/amanda/current/amindexd amindexd\fR
-\fB amidxtape stream tcp nowait amandabackup /usr/local/libexec/amanda/current/amidxtaped amidxtaped\fR
+\fB amandaidx stream tcp nowait backup /usr/local/libexec/amanda/current/amindexd amindexd\fR
+\fB amidxtape stream tcp nowait backup /usr/local/libexec/amanda/current/amidxtaped amidxtaped\fR
.fi
.SS "USING XINETD SERVER"
.PP
.PP
Client example of using
\fBbsd\fR
-authorization for xinetd server and for Amanda user "amandabackup":
+authorization for xinetd server and for Amanda user "backup":
.sp
.nf
service amanda
socket_type = dgram
protocol = udp
wait = yes
- user = amandabackup
+ user = backup
group = disk
groups = yes
server = /path/to/amandad
.PP
Client example of using
\fBbsdtcp\fR
-authorization for xinetd server and for Amanda user "amandabackup":
+authorization for xinetd server and for Amanda user "backup":
.sp
.nf
service amanda
socket_type = stream
protocol = tcp
wait = no
- user = amandabackup
+ user = backup
group = disk
groups = yes
server = /path/to/amandad
define dumptype rsh_example {
\&.\&.\&.
auth "rsh"
- client\-username "amandabackup"
+ client\-username "backup"
amandad\-path "/usr/lib/exec/amandad"
\&.\&.\&.
}
Enable SSH authentication and set the \fBssh\-keys\fR option in all DLEs for that host by adding the following to the DLE itself or to the corresponding dumptype in amanda\&.conf:
auth "ssh"
- ssh\-keys "/home/amandabackup/\&.ssh/id_rsa_amdump"
+ ssh\-keys "/home/backup/\&.ssh/id_rsa_amdump"
\fBssh\-keys\fR is the path to the private key on the client\&. If the username to which Amanda should connect is different from the default, then you should also add
\fBrecord\fR \fIboolean\fR
.RS 4
Default:
-\fByes\fR\&. Whether to ask the backup program to update its database (e\&.g\&.
-/etc/dumpdates
+\fIyes\fR\&. Whether to ask the backup program to update its database (e\&.g\&.
+/var/lib/dumpdates
for DUMP or
/usr/local/var/amanda/gnutar\-lists
for GNUTAR) of time stamps\&. This is normally enabled for daily backups and turned off for periodic archival runs\&.
from Real Name, Comment and Email Address in this form:
"Heinrich Heine (Der Dichter) (heinrichh@duesseldorf\&.de)"
-Real name: amandabackup
+Real name: backup
Email address:
-Comment: gpg keys for amandabackup
+Comment: gpg keys for backup
You selected this USER\-ID:
- "amandabackup (gpg keys for amandabackup)"
+ "backup (gpg keys for backup)"
Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? o
You need a Passphrase to protect your secret key\&.
public and secret key created and signed\&.
key marked as ultimately trusted\&.
-pub 1024D/4417A8CB 2006\-02\-07 amandabackup (gpg keys for amandabackup)
+pub 1024D/4417A8CB 2006\-02\-07 backup (gpg keys for backup)
Key fingerprint = 139C 6369 44FC 7F1A 655C E5E9 7EAA 515A 4417 A8CB
sub 1024g/8C3A6A78 2006\-02\-07 [expires: 2006\-08\-06]
.fi
\fBamserverconfig\fR
does not change existing Amanda configurations\&.
\fBamserverconfig\fR
-must be run by user amandabackup\&.
+must be run by user backup\&.
.SH "OPTIONS"
.PP
Options may be abbreviated, as long as the abbreviation is not ambiguous\&. Option argument can either separated by \*(Aq=\*(Aq or a space\&. Example: \-\-templ=harddisk \-\-tapedev /dev/nst0
.sp
If tape\-changer is chosen for this option, program mtx is required\&.
\fBamserverconfig\fR
-will search for mtx in the following directory: "/usr/sbin", "/usr/local/sbin", "/usr/local/bin", "/usr/bin", "/bin" and amandabackup\*(Aqs PATH\&.
+will search for mtx in the following directory: "/usr/sbin", "/usr/local/sbin", "/usr/local/bin", "/usr/bin", "/bin" and backup\*(Aqs PATH\&.
.sp
If harddisk is chosen and \-\-no\-vtape is not specified,
\fBamserverconfig\fR
.PP
\fB\-\-mailto mailto\fR
.RS 4
-A space separated list of recipients for mail reports\&. default [amandabackup]
+A space separated list of recipients for mail reports\&. default [backup]
.RE
.PP
\fB\-\-dumpcycle dumpcycle\fR
.PP
\fB/var/lib/amanda\fR
.RS 4
-amandabackup home directory
+backup home directory
.RE
.PP
\fB/var/lib/amanda/gnutar\-lists\fR
\fBdiskdevice\fR
in the disklist (DLE) must be the directory to backup\&.
.PP
-Solaris 10 supports Role Based Access Control(RBAC) which is enabled by default\&. To run backup operations using sun tar utility by under privileged user like amandabackup, amandabackup user need to have proper roles and profiles, specially "Media Backup" profile/role\&. This can be done using \*(Aqusermod \-P "Media Backup" amandabackup\*(Aq command\&.
+Solaris 10 supports Role Based Access Control(RBAC) which is enabled by default\&. To run backup operations using sun tar utility by under privileged user like backup, backup user need to have proper roles and profiles, specially "Media Backup" profile/role\&. This can be done using \*(Aqusermod \-P "Media Backup" backup\*(Aq command\&.
.SH "PROPERTIES"
.PP
This section lists the properties that control amsuntar\*(Aqs functionality\&. See
\fBamanda\&.conf\fR
file\&.
\fIDumptype\fRs specify backup related parameters, such as whether to compress the backups, whether to record backup results in
-/etc/dumpdates, the disk\*(Aqs relative priority, etc\&.
+/var/lib/dumpdates, the disk\*(Aqs relative priority, etc\&.
.RE
.PP
\fIspindle\fR
<!ENTITY tapelist '<manref name="tapelist" vol="5"/>'>
<!-- IDs for files used by AMANDA-->
-<!ENTITY dumpdates '<filename>/etc/dumpdates</filename>'>
+<!ENTITY dumpdates '<filename>/var/lib/dumpdates</filename>'>
<!-- IDs for AMANDA commands-->
<!ENTITY amadmin ' <command>amadmin</command>'>
(See <refentrytitle>ssh-keygen</refentrytitle><manvolnum>1</manvolnum> and
<refentrytitle>ssh-add</refentrytitle><manvolnum>1</manvolnum> for detail.)</para>
<para>
-&amaddclient; must be run by user amandabackup.</para>
+&amaddclient; must be run by user backup.</para>
<para> --config, --client and --diskdev must be specified.
</para>
</refsect1>
<varlistentry>
<term><option>/var/lib/amanda</option></term>
<listitem>
-<para>amandabackup home directory</para>
+<para>backup home directory</para>
</listitem>
</varlistentry>
<option>--with-user</option> option. Most Amanda processes run under
this user's identity, to minimize security risks. In binary
distributions, this username is usually one of 'amanda',
-'amandabackup', or 'backup'. The examples below use 'amandabackup'
+'backup', or 'backup'. The examples below use 'backup'
since it is unambiguous. You may need to adjust accordingly for your
system.</para>
<para>If service is omitted, it defaults to <emphasis remap='B'>noop selfcheck sendsize sendbackup</emphasis> (which is equivalent to <emphasis remap='B'>amdump</emphasis>).</para>
- <para>Example of the .amandahosts file on an Amanda client, where 'amandabackup' is the Amanda dumpuser.
+ <para>Example of the .amandahosts file on an Amanda client, where 'backup' is the Amanda dumpuser.
<programlisting>
- <emphasis remap='B'>amandaserver.example.com amandabackup amdump</emphasis>
+ <emphasis remap='B'>amandaserver.example.com backup amdump</emphasis>
</programlisting>
</para>
</refsect2>
<refsect2><title>bsdtcp communication and authentication</title>
- <para>The authentication is done using .amandahosts files in the backup user's (for example: amandabackup) home directory. It uses TCP protocol between Amanda server and client. On the client, two reserved ports are used. On the server, all data streams are multiplexed to one port (see PORT USAGE below).</para>
+ <para>The authentication is done using .amandahosts files in the backup user's (for example: backup) home directory. It uses TCP protocol between Amanda server and client. On the client, two reserved ports are used. On the server, all data streams are multiplexed to one port (see PORT USAGE below).</para>
</refsect2>
<refsect2><title>USING INETD SERVER</title>
<emphasis remap='I'> service_name</emphasis> <emphasis remap='I'>socket_type</emphasis> <emphasis remap='I'>protocol</emphasis> <emphasis remap='I'>wait/nowait</emphasis> <emphasis remap='I'>amanda_backup_user</emphasis> <emphasis remap='I'>absolute_path_to_amandad</emphasis> amandad <emphasis remap='I'>server_args</emphasis>
</programlisting>
</para>
- <para>Client example of using <emphasis remap='B'>bsd</emphasis> authorization for inetd server given Amanda user is "amandabackup":
+ <para>Client example of using <emphasis remap='B'>bsd</emphasis> authorization for inetd server given Amanda user is "backup":
<programlisting>
-<emphasis remap='B'> amanda dgram udp wait amandabackup /path/to/amandad amandad -auth=bsd amdump</emphasis>
+<emphasis remap='B'> amanda dgram udp wait backup /path/to/amandad amandad -auth=bsd amdump</emphasis>
</programlisting>
</para>
<para>The same could be used for <emphasis remap='B'>bsdudp</emphasis> if specifying -auth=bsdudp instead of -auth=bsd.</para>
- <para>Client example of using <emphasis remap='B'>bsdtcp</emphasis> authorization for inetd server given Amanda user is "amandabackup":
+ <para>Client example of using <emphasis remap='B'>bsdtcp</emphasis> authorization for inetd server given Amanda user is "backup":
<programlisting>
-<emphasis remap='B'> amanda stream tcp nowait amandabackup /path/to/amandad amandad -auth=bsdtcp amdump</emphasis>
+<emphasis remap='B'> amanda stream tcp nowait backup /path/to/amandad amandad -auth=bsdtcp amdump</emphasis>
</programlisting>
</para>
<para><emphasis remap='B'>amindexd</emphasis> and <emphasis remap='B'>amidxtaped</emphasis> would typically be added at the end of the line as &amandad; server arguments for an Amanda server.</para>
- <para>Server example of using <emphasis remap='B'>bsdtcp</emphasis> authorization for inetd server given Amanda user is "amandabackup":
+ <para>Server example of using <emphasis remap='B'>bsdtcp</emphasis> authorization for inetd server given Amanda user is "backup":
<programlisting>
-<emphasis remap='B'> amanda stream tcp nowait amandabackup /path/to/amandad amandad -auth=bsdtcp amdump amindexd amidxtaped</emphasis>
+<emphasis remap='B'> amanda stream tcp nowait backup /path/to/amandad amandad -auth=bsdtcp amdump amindexd amidxtaped</emphasis>
</programlisting>
</para>
<para>For Amanda version 2.5.0 and earlier, remember that neither <emphasis remap='B'>bsdudp</emphasis> nor <emphasis remap='B'>bsdtcp</emphasis> are supported and the Amanda daemon &amandad; accepts no arguments. Because of the latter, &amrecover; as of Amanda version 2.5.1 is not compatible with 2.5.0 and earlier servers. Thus, servers that are 2.5.0 or earlier must, in addition to the <emphasis remap='I'>amanda</emphasis> service, run <emphasis remap='I'>amindexd</emphasis> and <emphasis remap='I'>amidxtaped</emphasis> Amanda services as their own network services, amandaidx and amidxtape, respectively (see below).</para>
<para>Example of amindexd and amidxtaped Amanda daemon services configured as their own network services for a 2.5.0 or earlier server or a newer server having 2.5.0 or earlier clients
<programlisting>
-<emphasis remap='B'> amandaidx stream tcp nowait amandabackup /usr/local/libexec/amanda/current/amindexd amindexd</emphasis>
-<emphasis remap='B'> amidxtape stream tcp nowait amandabackup /usr/local/libexec/amanda/current/amidxtaped amidxtaped</emphasis>
+<emphasis remap='B'> amandaidx stream tcp nowait backup /usr/local/libexec/amanda/current/amindexd amindexd</emphasis>
+<emphasis remap='B'> amidxtape stream tcp nowait backup /usr/local/libexec/amanda/current/amidxtaped amidxtaped</emphasis>
</programlisting>
</para>
</refsect2>
</programlisting>
</para>
<para>The <emphasis remap='I'>only_from</emphasis> parameter can be used with xinetd but is usually in addition to the primary form of access control via the .amandahosts file.</para>
- <para>Client example of using <emphasis remap='B'>bsd</emphasis> authorization for xinetd server and for Amanda user "amandabackup":
+ <para>Client example of using <emphasis remap='B'>bsd</emphasis> authorization for xinetd server and for Amanda user "backup":
<programlisting>
service amanda
socket_type = dgram
protocol = udp
wait = yes
- user = amandabackup
+ user = backup
group = disk
groups = yes
server = /path/to/amandad
</programlisting>
</para>
<para>The same could be used for <emphasis remap='B'>bsdudp</emphasis> if specifying -auth=bsdudp instead of -auth=bsd.</para>
- <para>Client example of using <emphasis remap='B'>bsdtcp</emphasis> authorization for xinetd server and for Amanda user "amandabackup":
+ <para>Client example of using <emphasis remap='B'>bsdtcp</emphasis> authorization for xinetd server and for Amanda user "backup":
<programlisting>
service amanda
socket_type = stream
protocol = tcp
wait = no
- user = amandabackup
+ user = backup
group = disk
groups = yes
server = /path/to/amandad
define dumptype rsh_example {
...
auth "rsh"
- client-username "amandabackup"
+ client-username "backup"
amandad-path "/usr/lib/exec/amandad"
...
}
Enable SSH authentication and set the <amkeyword>ssh-keys</amkeyword> option in all DLEs for that host by adding the following to the DLE itself or to the corresponding dumptype in amanda.conf:
auth "ssh"
- ssh-keys "/home/amandabackup/.ssh/id_rsa_amdump"
+ ssh-keys "/home/backup/.ssh/id_rsa_amdump"
<amkeyword>ssh-keys</amkeyword> is the path to the private key on the client. If the username to which Amanda should connect is different from the default, then you should also add
<term><amkeyword>record</amkeyword> <amtype>boolean</amtype></term>
<listitem>
<para>Default:
-<amkeyword>yes</amkeyword>.
-Whether to ask the backup program to update its database (e.g. <filename>/etc/dumpdates</filename>
+<emphasis remap='I'>yes</emphasis>.
+Whether to ask the backup program to update its database (e.g. <filename>/var/lib/dumpdates</filename>
for DUMP or <filename>/usr/local/var/amanda/gnutar-lists</filename> for GNUTAR) of time stamps.
This is normally enabled for daily backups and turned off for periodic archival runs.</para>
</listitem>
from Real Name, Comment and Email Address in this form:
"Heinrich Heine (Der Dichter) (heinrichh@duesseldorf.de)"
-Real name: amandabackup
+Real name: backup
Email address:
-Comment: gpg keys for amandabackup
+Comment: gpg keys for backup
You selected this USER-ID:
- "amandabackup (gpg keys for amandabackup)"
+ "backup (gpg keys for backup)"
Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? o
You need a Passphrase to protect your secret key.
public and secret key created and signed.
key marked as ultimately trusted.
-pub 1024D/4417A8CB 2006-02-07 amandabackup (gpg keys for amandabackup)
+pub 1024D/4417A8CB 2006-02-07 backup (gpg keys for backup)
Key fingerprint = 139C 6369 44FC 7F1A 655C E5E9 7EAA 515A 4417 A8CB
sub 1024g/8C3A6A78 2006-02-07 [expires: 2006-08-06]
It will create /var/lib/amanda/guntar-lists directory if one does
not exist.
&amserverconfig; does not change existing Amanda configurations.
-&amserverconfig; must be run by user amandabackup.
+&amserverconfig; must be run by user backup.
</para>
</refsect1>
</para>
<para>If tape-changer is chosen for this option, program mtx is required. &amserverconfig; will
search for mtx in the following directory: "/usr/sbin", "/usr/local/sbin",
-"/usr/local/bin", "/usr/bin", "/bin" and amandabackup's PATH.
+"/usr/local/bin", "/usr/bin", "/bin" and backup's PATH.
</para>
<para>
If harddisk is chosen and --no-vtape is not specified, &amserverconfig; will create and label virtual tape
<varlistentry>
<term><option>--mailto mailto</option></term>
<listitem>
-<para> A space separated list of recipients for mail reports. default [amandabackup] </para>
+<para> A space separated list of recipients for mail reports. default [backup] </para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>/var/lib/amanda</option></term>
<listitem>
-<para>amandabackup home directory</para>
+<para>backup home directory</para>
</listitem>
</varlistentry>
<para>Solaris 10 supports Role Based Access Control(RBAC) which is enabled
by default. To run backup operations using sun tar utility by under
-privileged user like amandabackup, amandabackup user need to have proper
+privileged user like backup, backup user need to have proper
roles and profiles, specially "Media Backup" profile/role. This can be done
-using 'usermod -P "Media Backup" amandabackup' command.</para>
+using 'usermod -P "Media Backup" backup' command.</para>
</refsect1>
specify backup related parameters,
such as whether to compress the backups,
whether to record backup results in
-<filename>/etc/dumpdates</filename>, the disk's relative priority, etc.</para>
+<filename>/var/lib/dumpdates</filename>, the disk's relative priority, etc.</para>
</listitem>
</varlistentry>
<varlistentry>
my $confdir="$CONFIG_DIR";
my $tmpdir="$AMANDA_DBGDIR";
-my $amandahomedir="$localstatedir/lib/amanda";
+my $amandahomedir="$localstatedir/amanda";
my $templatedir="$amdatadir/template.d"; #rpm install template files here
my $def_tapedev="file:$amandahomedir/vtapes";
char *clnt_decrypt_opt; /* client-side decryption option parameter to use */
double comprate[2]; /* default compression rates */
/* flag options */
- int record; /* record dump in /etc/dumpdates ? */
+ int record; /* record dump in /var/lib/dumpdates ? */
int skip_incr; /* incs done externally ? */
int skip_full; /* fulls done externally ? */
int to_holdingdisk; /* use holding disk ? */
projects / debian / amanda / commitdiff