diff options
Diffstat (limited to 'app-backup/amanda/files')
13 files changed, 0 insertions, 374 deletions
diff --git a/app-backup/amanda/files/amanda-2.6.0_p2-syslocpath.patch b/app-backup/amanda/files/amanda-2.6.0_p2-syslocpath.patch deleted file mode 100644 index ecd3fd1..0000000 --- a/app-backup/amanda/files/amanda-2.6.0_p2-syslocpath.patch +++ /dev/null @@ -1,19 +0,0 @@ -We should check /sbin and /usr/sbin earlier in the configure process. -If there is a binary named 'dump' that is not a filesystem dump command (which -is normally found in /usr/sbin) that occurs in the /usr/bin, then configure can -hang. - -Gentoo-bug: 248838 -Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> -diff -Nuar --exclude '*~' amanda-2.6.0p2.orig/config/amanda/progs.m4 amanda-2.6.0p2/config/amanda/progs.m4 ---- amanda-2.6.0p2.orig/config/amanda/progs.m4 2008-02-15 13:35:57.000000000 -0800 -+++ amanda-2.6.0p2/config/amanda/progs.m4 2008-11-25 17:46:56.879917150 -0800 -@@ -24,7 +24,7 @@ - # - AC_DEFUN([AMANDA_INIT_PROGS], - [ -- SYSPATH="/bin:/usr/bin:/sbin:/usr/sbin:/opt/SUNWspro/bin:/usr/ucb:/usr/sfw/bin:/usr/bsd:/etc:/usr/etc" -+ SYSPATH="/sbin:/bin:/usr/sbin:/usr/bin:/opt/SUNWspro/bin:/usr/ucb:/usr/sfw/bin:/usr/bsd:/etc:/usr/etc" - # expand prefix or exec_prefix in LOCPATH - LOCPATH=`( - test "x$prefix" = xNONE && prefix=$ac_default_prefix diff --git a/app-backup/amanda/files/amanda-2.6.0p2-amcrypt-ossl-asym-race-fix.patch b/app-backup/amanda/files/amanda-2.6.0p2-amcrypt-ossl-asym-race-fix.patch deleted file mode 100644 index 2aa6625..0000000 --- a/app-backup/amanda/files/amanda-2.6.0p2-amcrypt-ossl-asym-race-fix.patch +++ /dev/null @@ -1,75 +0,0 @@ -There is a race condition inside the client-side sendbackup. The short version -is that any output from the compression or encryption pipes that gets send -before the "sendbackup:" headers gets discarded by the server on receipt. - -For any pipe command that outputs headers, a sufficiently fast machine will -allow this to happen. - -As a solution, we buffer the header from amcrypt-ossl-asym, and only output it -after we have started receiving real data. At the time of writing this patch, -amaespipe looks to suffer from the same problem. - -Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> -(Forward ported from the 2.5.2p1 patch) - -diff -Nuar --exclude '*~' --exclude '*.orig' --exclude '*.rej' amanda-2.6.0p2.orig/common-src/amcrypt-ossl-asym.sh amanda-2.6.0p2/common-src/amcrypt-ossl-asym.sh ---- amanda-2.6.0p2.orig/common-src/amcrypt-ossl-asym.sh 2008-01-17 16:31:41.000000000 -0800 -+++ amanda-2.6.0p2/common-src/amcrypt-ossl-asym.sh 2008-09-21 22:32:21.265609630 -0700 -@@ -95,7 +95,7 @@ - perl -pe 'BEGIN { $bs = 96; $/ = \8192 } $nbytes = ($nbytes + length) % $bs; END { print "\0" x ($bs - $nbytes) }' - } - --encrypt() { -+encrypt_setup() { - # generate a random printable cipher key (on one line) - echo `"${OPENSSL}" rand -base64 80` >"${WORKDIR}/pass" - -@@ -105,11 +105,20 @@ - - # print magic - printf "%s" "${MAGIC}" -+ [ $? -eq 0 ] || return 1 - - # print the encrypted cipher key, preceded by size - ls -l "${WORKDIR}/pass.ciphertext" | awk '{ printf("%-10d", $5) }' -+ [ $? -eq 0 ] || return 1 - cat "${WORKDIR}/pass.ciphertext" -+ [ $? -eq 0 ] || return 1 - -+ # Do a test encryption to see that it will work and we will not lose data -+ echo "foo" | encrypt >/dev/null -+ [ $? -eq 0 ] || return 1 -+} -+ -+encrypt() { - # encrypt data using the cipher key and print - pad | "${OPENSSL}" enc "-${CIPHER}" -nopad -e -pass "file:${WORKDIR}/pass" -nosalt - [ $? -eq 0 ] || return 1 -@@ -180,7 +189,26 @@ - exit 1 - fi - -- encrypt -+ # we must perform the encryption setup, but not produce any output until we start getting input -+ encrypt_setup >"${WORKDIR}/encryption-header" -+ if [ $? -ne 0 ]; then -+ echo "${ME}: encryption setup failed" >&2 -+ exit 1 -+ fi -+ # block until the first of the input -+ dd of="${WORKDIR}/data.buffer" bs=4 count=1 2>/dev/null -+ if [ $? -ne 0 ]; then -+ echo "${ME}: encryption failed to get input data" >&2 -+ exit 1 -+ fi -+ # now spit out the encryption header -+ cat "${WORKDIR}/encryption-header" -+ if [ $? -ne 0 ]; then -+ echo "${ME}: encryption failed to output encryption header" >&2 -+ exit 1 -+ fi -+ # followed by our first bit of input, then the rest -+ cat "${WORKDIR}/data.buffer" - | encrypt - if [ $? -ne 0 ]; then - echo `_ '%s: encryption failed' "${ME}"` >&2 - exit 1 diff --git a/app-backup/amanda/files/amanda-2.6.1_p1-gentoo.patch b/app-backup/amanda/files/amanda-2.6.1_p1-gentoo.patch deleted file mode 100644 index 40329b4..0000000 --- a/app-backup/amanda/files/amanda-2.6.1_p1-gentoo.patch +++ /dev/null @@ -1,81 +0,0 @@ -diff -Naur amanda-2.6.1p1.orig/example/template.d/amanda-harddisk.conf.in amanda-2.6.1p1/example/template.d/amanda-harddisk.conf.in ---- amanda-2.6.1p1.orig/example/template.d/amanda-harddisk.conf.in 2008-12-02 06:17:16.000000000 +0900 -+++ amanda-2.6.1p1/example/template.d/amanda-harddisk.conf.in 2009-04-22 19:53:25.000000000 +0900 -@@ -11,7 +11,7 @@ - # cycle - runtapes 1 # number of tapes to be used in a single run of amdump - tpchanger "chg-disk" # the tape-changer glue script --tapedev "file://var/lib/amanda/vtapes/@DEFAULT_CONFIG@" # the no-rewind tape device to be used -+tapedev "file:/@localstatedir@/vtapes/@DEFAULT_CONFIG@" # the no-rewind tape device to be used - changerfile "@CONFIG_DIR@/@DEFAULT_CONFIG@/changer.conf" - changerdev "/dev/null" - tapetype HARDDISK # what kind of tape it is -diff -Naur amanda-2.6.1p1.orig/server-src/amaddclient.pl amanda-2.6.1p1/server-src/amaddclient.pl ---- amanda-2.6.1p1.orig/server-src/amaddclient.pl 2008-12-02 06:17:18.000000000 +0900 -+++ amanda-2.6.1p1/server-src/amaddclient.pl 2009-04-22 18:56:21.000000000 +0900 -@@ -30,7 +30,7 @@ - - my $prefix="@prefix@"; - my $localstatedir="@localstatedir@"; --my $amandahomedir="$localstatedir/lib/amanda"; -+my $amandahomedir="$localstatedir"; - - my $amanda_user="@CLIENT_LOGIN@"; - my $amanda_group="disk"; -@@ -487,9 +487,6 @@ - } - } - --&mprint ("File /var/lib/amanda/example/xinetd.amandaclient contains the latest Amanda client daemon configuration.\n"); --&mprint ("Please merge it to /etc/xinetd.d/amandaclient.\n"); -- - $ENV{'PATH'} = $oldPATH; - close (LOG); - -diff -Naur amanda-2.6.1p1.orig/server-src/amserverconfig.pl amanda-2.6.1p1/server-src/amserverconfig.pl ---- amanda-2.6.1p1.orig/server-src/amserverconfig.pl 2009-02-06 20:52:08.000000000 +0900 -+++ amanda-2.6.1p1/server-src/amserverconfig.pl 2009-04-22 19:48:15.000000000 +0900 -@@ -28,7 +28,7 @@ - - my $confdir="$CONFIG_DIR"; - my $tmpdir="$AMANDA_DBGDIR"; --my $amandahomedir="$localstatedir/lib/amanda"; -+my $amandahomedir="$localstatedir"; - my $templatedir="$amdatadir/template.d"; #rpm install template files here - my $def_tapedev="file:$amandahomedir/vtapes"; - -@@ -120,12 +120,12 @@ - - # rpm installation should have taken care of these. Create one if it's not there - sub check_gnutarlist_dir { -- if ( -e "$amandahomedir/gnutar-lists" ) { -- &mprint ("$amandahomedir/gnutar-lists directory exists\n"); -+ if ( -e $GNUTAR_LISTED_INCREMENTAL_DIR ) { -+ &mprint ("$GNUTAR_LISTED_INCREMENTAL_DIR directory exists\n"); - } - else { -- mkdir ("$amandahomedir/gnutar-lists", $def_perm) || -- &log_and_die ("ERROR: mkdir:$amandahomedir/gnutar-lists failed: $!\n", 0); -+ mkdir ($GNUTAR_LISTED_INCREMENTAL_DIR, $def_perm) || -+ &log_and_die ("ERROR: mkdir:$GNUTAR_LISTED_INCREMENTAL_DIR failed: $!\n", 0); - } - } - -@@ -399,8 +399,6 @@ - - - sub check_xinetd{ -- &mprint ("/var/lib/amanda/example/xinetd.amandaserver contains the latest Amanda server daemon configuration.\n"); -- &mprint ("Please merge it to /etc/xinetd.d/amandaserver.\n"); - } - - -@@ -420,7 +418,7 @@ - } - close NEWAUTH; - close PUB; -- &mprint("$amandahomedir/.ssh/client_authorized_keys created. Please append to /var/lib/amanda/.ssh/authorized_keys file on Amanda clients\n"); -+ &mprint("$amandahomedir/.ssh/client_authorized_keys created. Please append to $amandahomedir/.ssh/authorized_keys file on Amanda clients\n"); - } - } - } diff --git a/app-backup/amanda/files/amanda-amandahosts-client-2.5.1_p3-r1 b/app-backup/amanda/files/amanda-amandahosts-client-2.5.1_p3-r1 deleted file mode 100644 index 570a710..0000000 --- a/app-backup/amanda/files/amanda-amandahosts-client-2.5.1_p3-r1 +++ /dev/null @@ -1,8 +0,0 @@ -# vim: ts=4 sts=4 sw=4 noexpandtab: -# Machine-name for those hosts which are permitted to back up (fully-qualified -# is best). An entry in /etc/hosts adds fail-safe against DNS death :-) -# | -# | permitted user-name -# | | - -__AMANDA_SERVER__ __AMANDA_USER_NAME__ amdump diff --git a/app-backup/amanda/files/amanda-amandahosts-server-2.5.1_p3-r1 b/app-backup/amanda/files/amanda-amandahosts-server-2.5.1_p3-r1 deleted file mode 100644 index 4951d4a..0000000 --- a/app-backup/amanda/files/amanda-amandahosts-server-2.5.1_p3-r1 +++ /dev/null @@ -1,8 +0,0 @@ -# vim: ts=4 sts=4 sw=4 noexpandtab: -# Machine-name for those hosts which are permitted to back up (fully-qualified -# is best). An entry in /etc/hosts adds fail-safe against DNS death :-) -# | -# | permitted user-name -# | | - -__AMANDA_SERVER__ root amindexd amidxtaped diff --git a/app-backup/amanda/files/amanda-cron b/app-backup/amanda/files/amanda-cron deleted file mode 100644 index a5524dc..0000000 --- a/app-backup/amanda/files/amanda-cron +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -# This is a sample cron job to kick off backups with amanda. - -# Run the tape tests on DailySet first, and if ok, then kick off backups -# Mail error reports to root - -# Ensure TAPE is set to your tape drive for mt to work, ie. TAPE="/dev/st0" - -ADMIN_EMAIL="root@localhost" - -/usr/sbin/amcheck -t -m -M"${ADMIN_EMAIL}" __AMANDA_CONFIG_NAME__ && \ -( /usr/sbin/amdump __AMANDA_CONFIG_NAME__ ; /usr/sbin/mt eject ) diff --git a/app-backup/amanda/files/amanda-inetd.amanda.sample-2.6.0_p2-r2 b/app-backup/amanda/files/amanda-inetd.amanda.sample-2.6.0_p2-r2 deleted file mode 100644 index e2aa342..0000000 --- a/app-backup/amanda/files/amanda-inetd.amanda.sample-2.6.0_p2-r2 +++ /dev/null @@ -1,3 +0,0 @@ -amanda dgram udp wait amanda /usr/libexec/amanda/amandad amandad -auth=bsd amdump amindexd amidxtaped -amandaidx stream tcp nowait amanda /usr/libexec/amanda/amindexd amindexd -auth=bsd amdump amindexd amidxtaped -amidxtape stream tcp nowait amanda /usr/libexec/amanda/amidxtaped amidxtaped -auth=bsd amdump amindexd amidxtaped diff --git a/app-backup/amanda/files/amanda-profile b/app-backup/amanda/files/amanda-profile deleted file mode 100644 index d8e132b..0000000 --- a/app-backup/amanda/files/amanda-profile +++ /dev/null @@ -1 +0,0 @@ -export PATH=/sbin:/usr/sbin:/usr/libexec:${PATH} diff --git a/app-backup/amanda/files/amanda-xinetd-2.6.1_p1-client b/app-backup/amanda/files/amanda-xinetd-2.6.1_p1-client deleted file mode 100644 index 092d6da..0000000 --- a/app-backup/amanda/files/amanda-xinetd-2.6.1_p1-client +++ /dev/null @@ -1,20 +0,0 @@ -# These are the services needed for amanda. -# Default is to talk to localhost only unless -# AMANDA_SERVER was specified at build time. - -service amanda -{ - socket_type = stream - flags = IPv6 - protocol = tcp - wait = no - user = __AMANDA_USER_NAME__ - group = __AMANDA_GROUP_NAME__ - groups = yes - server = /usr/libexec/amanda/amandad - server_args = -auth=bsdtcp amdump - # You need to ensure this points to your Amanda server! - # Don't just remove it! - only_from = __AMANDA_SERVER__ - disable = yes -} diff --git a/app-backup/amanda/files/amanda-xinetd-2.6.1_p1-server b/app-backup/amanda/files/amanda-xinetd-2.6.1_p1-server deleted file mode 100644 index abed525..0000000 --- a/app-backup/amanda/files/amanda-xinetd-2.6.1_p1-server +++ /dev/null @@ -1,20 +0,0 @@ -# These are the services needed for amanda. -# Default is to talk to localhost only unless -# AMANDA_SERVER was specified at build time. - -service amanda -{ - socket_type = stream - flags = IPv6 - protocol = tcp - wait = no - user = __AMANDA_USER_NAME__ - group = __AMANDA_GROUP_NAME__ - groups = yes - server = /usr/libexec/amanda/amandad - server_args = -auth=bsdtcp amdump amindexd amidxtaped - # You need to ensure this points to your Amanda server! - # Don't just remove it! - only_from = __AMANDA_SERVER__ - disable = yes -} diff --git a/app-backup/amanda/files/example_amanda.conf b/app-backup/amanda/files/example_amanda.conf deleted file mode 100644 index 947625e..0000000 --- a/app-backup/amanda/files/example_amanda.conf +++ /dev/null @@ -1,44 +0,0 @@ -# type "man amanda" - -org "example" -mailto "root@localhost" - -dumpcycle 7 -runspercycle -1 -tapecycle 7 - -dumpuser "amanda" -printer "lp" - -#tpchanger "chg-manual" -tapedev "/dev/nst0" - -runtapes 1 -labelstr "^EXAMPLE-[0-9][0-9]*$" -tapetype DDS4-PRINT - -ctimeout 60 -dtimeout 3600 -etimeout 600 - -netusage 2000 -inparallel 10 - -dumporder "tttTTTTTTT" -maxdumps 10 -bumpsize 10 -bumpmult 1.5 -bumpdays 1 - -diskfile "/etc/amanda/example/disklist" -infofile "/etc/amanda/example/curinfo" -logdir "/etc/amanda/example" -indexdir "/etc/amanda/example/index" -tapelist "tapelist" - -tapebufs 20 -reserve 100 -autoflush off - -includefile "/etc/amanda/global.conf" - diff --git a/app-backup/amanda/files/example_disklist-2.5.1_p3-r1 b/app-backup/amanda/files/example_disklist-2.5.1_p3-r1 deleted file mode 100644 index 73bf017..0000000 --- a/app-backup/amanda/files/example_disklist-2.5.1_p3-r1 +++ /dev/null @@ -1,4 +0,0 @@ -# Substitute <HOSTNAME> with the FQDN of your Amanda-client here. -# The usage of localhost will *break* your restores. -<HOSTNAME> hda1 normal local -<HOSTNAME> hda3 normal local diff --git a/app-backup/amanda/files/example_global.conf b/app-backup/amanda/files/example_global.conf deleted file mode 100644 index 7287398..0000000 --- a/app-backup/amanda/files/example_global.conf +++ /dev/null @@ -1,78 +0,0 @@ -holdingdisk hd1 { - comment "main holding disk" - directory "/tmp/amanda/dumps" - use -1 Gb - chunksize 500 Mb -} - -define dumptype normal { - auth BSD - comment "Normal backup, compression" - comprate 0.50, 0.50 - compress client best - index yes - priority high - program "GNUTAR" - record yes - strategy STANDARD - holdingdisk yes -} - -define dumptype compress-server { - auth BSD - comment "Normal backup, compression" - comprate 0.50, 0.50 - compress server best - index yes - priority high - program "GNUTAR" - record yes - strategy STANDARD - holdingdisk yes -} - -define dumptype normal-no_hold { - normal - holdingdisk no -} - -define tapetype DDS4 { - comment "Seagate Scorpion 40" - length 16432 mbytes - filemark 0 kbytes - speed 2267 kps -} - -define tapetype DDS4-PRINT { - comment "Seagate Scorpion 40 with printer" - length 16432 mbytes - filemark 0 kbytes - speed 2267 kps - lbl-templ "/etc/amanda/lbl/DIN-A4.ps" -} - -define tapetype DDS2 { - comment "HP DAT C1533A" - length 1845 mbytes - filemark 0 kbytes - speed 480 kps -} - -define tapetype DDS1 { - comment "HP DAT HP35480A" - length 1845 mbytes - filemark 32 kbytes - speed 174 kps -} - -define interface local { - comment "local disk" - use 4000 kbps -} - -define interface eth1 { - comment "100 Mbps ethernet" - use 1000 kbps -} - - |