summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2009-11-22 10:05:40 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2009-11-22 10:05:40 +0000
commit5921bf4ac496bbe5783928704f79cf6bfcb6056f (patch)
treef41de07ba07127d854a123e40d9d9e789af18d3e /app-backup/amanda/files
parentFix whitespace. (diff)
downloadgentoo-2-5921bf4ac496bbe5783928704f79cf6bfcb6056f.tar.gz
gentoo-2-5921bf4ac496bbe5783928704f79cf6bfcb6056f.tar.bz2
gentoo-2-5921bf4ac496bbe5783928704f79cf6bfcb6056f.zip
The 2.4 and 2.5 series no longer compile with modern autoconf. If you have a really old server that you need to talk to, you can get them from the CVS Attic.
(Portage version: 2.2_rc49/cvs/Linux x86_64)
Diffstat (limited to 'app-backup/amanda/files')
-rw-r--r--app-backup/amanda/files/amanda-2.4.5-4tb-holding-disk.patch12
-rw-r--r--app-backup/amanda/files/amanda-2.4.5-amverify-loop-detect.patch22
-rw-r--r--app-backup/amanda/files/amanda-2.4.5-samba-printf.patch11
-rw-r--r--app-backup/amanda/files/amanda-2.5.1_p2-tar-1.16.patch15
-rw-r--r--app-backup/amanda/files/amanda-2.5.1_p3-displayunit.patch17
-rw-r--r--app-backup/amanda/files/amanda-2.5.2_p1-chg-multi.patch12
-rw-r--r--app-backup/amanda/files/amanda-2.5.2_p1-fix-asneeded.patch22
-rw-r--r--app-backup/amanda/files/amanda-2.5.2p1-amcrypt-ossl-asym-race-fix.patch74
8 files changed, 0 insertions, 185 deletions
diff --git a/app-backup/amanda/files/amanda-2.4.5-4tb-holding-disk.patch b/app-backup/amanda/files/amanda-2.4.5-4tb-holding-disk.patch
deleted file mode 100644
index f056e98cf808..000000000000
--- a/app-backup/amanda/files/amanda-2.4.5-4tb-holding-disk.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -NuarwbB amanda-2.4.5.orig/common-src/statfs.c amanda-2.4.5/common-src/statfs.c
---- amanda-2.4.5.orig/common-src/statfs.c 1999-05-23 10:11:18.000000000 -0700
-+++ amanda-2.4.5/common-src/statfs.c 2005-06-08 13:12:58.000000000 -0700
-@@ -127,7 +127,7 @@
- # endif
- #endif
-
--#define scale(r,s) ( (r) == -1? -1 : (int)((r)*(double)(s)/1024.0) )
-+#define scale(r,s) ( (r) == -1? -1 : (long)((r)*(double)(s)/1024.0) )
-
- int get_fs_stats(dir, sp)
- char *dir;
diff --git a/app-backup/amanda/files/amanda-2.4.5-amverify-loop-detect.patch b/app-backup/amanda/files/amanda-2.4.5-amverify-loop-detect.patch
deleted file mode 100644
index bbf358af6d13..000000000000
--- a/app-backup/amanda/files/amanda-2.4.5-amverify-loop-detect.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From upstream. http://groups.yahoo.com/group/amanda-hackers/message/4510
---- amanda-2.4.5/server-src/amverify.sh.in.orig 2005-06-08 13:30:11.000000000 -0700
-+++ amanda-2.4.5/server-src/amverify.sh.in 2005-06-08 13:32:27.000000000 -0700
-@@ -425,14 +425,16 @@
- fi
- RESULT=`$AMRESTORE -h -p $DEVICE 2> $TEMP/amrestore.out \
- | doonefile 2> $TEMP/onefile.errors`
-+ # save previous filename to detect looping
-+ FILE_prev="$FILE"
- FILE=`grep restoring $TEMP/amrestore.out \
- | sed 's/^.*restoring //'`
- EOF=`grep "reached end of tape" $TEMP/amrestore.out`
- EOI=`grep "reached end of information" $TEMP/amrestore.out`
- # amrestore: 0: restoring sundae._mnt_sol1_usr.19961127.1
-- if [ X"$FILE" != X"" -a X"$RESULT" = X"0" ]; then
-+ if [ X"$FILE" != X"" -a X"$FILE" != X"$FILE_prev" -a X"$RESULT" = X"0" ]; then
- report "Checked $FILE"
-- elif [ X"$FILE" != X"" -a X"$RESULT" = X"999" ]; then
-+ elif [ X"$FILE" != X"" -a X"$FILE" != X"$FILE_prev" -a X"$RESULT" = X"999" ]; then
- report "Skipped $FILE (`cat $TEMP/errors`)"
- elif [ -n "$EOF" ]; then
- report "End-of-Tape detected."
diff --git a/app-backup/amanda/files/amanda-2.4.5-samba-printf.patch b/app-backup/amanda/files/amanda-2.4.5-samba-printf.patch
deleted file mode 100644
index 01dca14ca092..000000000000
--- a/app-backup/amanda/files/amanda-2.4.5-samba-printf.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-From upstream. See http://groups.yahoo.com/group/amanda-hackers/message/4511
---- amanda-2.4.5/client-src/sendsize.c.orig 2005-06-08 13:28:10.000000000 -0700
-+++ amanda-2.4.5/client-src/sendsize.c 2005-06-08 13:28:34.000000000 -0700
-@@ -557,6 +557,7 @@
- #ifdef SAMBA_CLIENT
- if (est->amdevice[0] == '/' && est->amdevice[1] == '/')
- dbprintf(("%s: Can't use CALCSIZE for samba estimate: %s %s\n",
-+ debug_prefix_time(NULL),
- est->amname, est->dirname));
- else
- #endif
diff --git a/app-backup/amanda/files/amanda-2.5.1_p2-tar-1.16.patch b/app-backup/amanda/files/amanda-2.5.1_p2-tar-1.16.patch
deleted file mode 100644
index 5d77aad9ffdf..000000000000
--- a/app-backup/amanda/files/amanda-2.5.1_p2-tar-1.16.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- client-src/sendbackup.c. 2006-07-25 20:27:56.000000000 +0200
-+++ client-src/sendbackup.c 2006-12-13 03:31:03.000000000 +0100
-@@ -597,6 +597,12 @@
- }
- #endif
-
-+ if(pid == tarpid) {
-+ if(ret == 1) {
-+ rc = 0;
-+ }
-+ }
-+
- #ifdef IGNORE_TAR_ERRORS
- if(pid == tarpid) {
- /*
diff --git a/app-backup/amanda/files/amanda-2.5.1_p3-displayunit.patch b/app-backup/amanda/files/amanda-2.5.1_p3-displayunit.patch
deleted file mode 100644
index 92c8fb5e6e2c..000000000000
--- a/app-backup/amanda/files/amanda-2.5.1_p3-displayunit.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -u -r --show-c-function --new-file --exclude-from=/home/martinea/src.orig/amanda.diff --ignore-matching-lines='$Id:' amanda-2.5.1p3.new/server-src/amstatus.pl.in amanda-2.5.1p3.new.amstatus/server-src/amstatus.pl.in
---- amanda-2.5.1p3.new/server-src/amstatus.pl.in 2007-02-01 14:17:01.000000000 -0500
-+++ amanda-2.5.1p3.new.amstatus/server-src/amstatus.pl.in 2007-02-12 18:35:11.000000000 -0500
-@@ -763,9 +763,9 @@ while(<AMDUMP>) {
- }
- elsif(/splitting chunk that started at \d*kb after (\d*)kb/) {
- $ntchunk{$nb_tape}++;
-- $ntsize{$nb_tape} += $1;
-- $ntesize{$nb_tape} += $1;
-- $ntchunk_size += $1;
-+ $ntsize{$nb_tape} += $1 / $unitdivisor;
-+ $ntesize{$nb_tape} += $1 / $unitdivisor;
-+ $ntchunk_size += $1 / $unitdivisor;
- }
- elsif(/driver: FINISHED/) {
- $driver_finished = 1;
-Binary files amanda-2.5.1p3.new/server-src/.amstatus.pl.in.swp and amanda-2.5.1p3.new.amstatus/server-src/.amstatus.pl.in.swp differ
diff --git a/app-backup/amanda/files/amanda-2.5.2_p1-chg-multi.patch b/app-backup/amanda/files/amanda-2.5.2_p1-chg-multi.patch
deleted file mode 100644
index 02ccc879c887..000000000000
--- a/app-backup/amanda/files/amanda-2.5.2_p1-chg-multi.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nuar amanda-2.5.2p1.orig/changer-src/chg-multi.sh.in amanda-2.5.2p1/changer-src/chg-multi.sh.in
---- amanda-2.5.2p1.orig/changer-src/chg-multi.sh.in 2007-05-17 10:38:34.000000000 -0700
-+++ amanda-2.5.2p1/changer-src/chg-multi.sh.in 2008-06-25 14:57:04.000000000 -0700
-@@ -325,7 +325,7 @@
- echo $answer
- exit 2
- fi
-- echo `_ ' -> offline'` "$device"` >> $logfile
-+ echo `_ ' -> offline'` "$device" >> $logfile
- $MT $MTF $device offline >> $logfile 2>&1
- if [ $? -ne 0 ]; then
- answer=`_ '%s %s: %s: unable to change to slot %s' "$newslot" "$pname" "$device" "$curslot"`
diff --git a/app-backup/amanda/files/amanda-2.5.2_p1-fix-asneeded.patch b/app-backup/amanda/files/amanda-2.5.2_p1-fix-asneeded.patch
deleted file mode 100644
index 012e0272556b..000000000000
--- a/app-backup/amanda/files/amanda-2.5.2_p1-fix-asneeded.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- amanda-2.5.2_p1.orig/tape-src/Makefile.am 2007-05-04 11:39:08.000000000 +0000
-+++ amanda-2.5.2_p1/tape-src/Makefile.am 2008-03-10 19:06:28.000000000 +0000
-@@ -20,6 +20,8 @@ libamtape_la_SOURCES = output-file.c \
-
- libamtape_la_LDFLAGS = -release $(VERSION)
-
-+libamtape_la_LIBADD = ../common-src/libamanda.la
-+
- ###
- # Because libamanda includes routines (e.g. regex) provided by some system
- # libraries, and because of the way libtool sets up the command line, we
---- amanda-2.5.2_p1.orig/server-src/Makefile.am 2007-05-04 11:39:04.000000000 +0000
-+++ amanda-2.5.2_p1/server-src/Makefile.am 2008-03-10 19:07:58.000000000 +0000
-@@ -36,6 +36,8 @@ libamserver_la_SOURCES= amindex.c change
-
- libamserver_la_LDFLAGS= -release $(VERSION)
-
-+libamserver_la_LIBADD = ../tape-src/libamtape.la
-+
- ###
- # Because libamanda includes routines (e.g. regex) provided by some system
- # libraries, and because of the way libtool sets up the command line, we
diff --git a/app-backup/amanda/files/amanda-2.5.2p1-amcrypt-ossl-asym-race-fix.patch b/app-backup/amanda/files/amanda-2.5.2p1-amcrypt-ossl-asym-race-fix.patch
deleted file mode 100644
index 512b962b3290..000000000000
--- a/app-backup/amanda/files/amanda-2.5.2p1-amcrypt-ossl-asym-race-fix.patch
+++ /dev/null
@@ -1,74 +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>
-
-diff -Nuar amanda-2.5.2p1.orig/server-src/amcrypt-ossl-asym.sh.in amanda-2.5.2p1/server-src/amcrypt-ossl-asym.sh.in
---- amanda-2.5.2p1.orig/server-src/amcrypt-ossl-asym.sh.in 2008-09-21 22:09:10.973248726 -0700
-+++ amanda-2.5.2p1/server-src/amcrypt-ossl-asym.sh.in 2008-09-21 22:09:46.575745504 -0700
-@@ -88,7 +88,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"
-
-@@ -98,11 +98,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
-@@ -173,7 +182,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 "${ME}: encryption failed" >&2
- exit 1