Amanda version bump to 2.4.5. Fixed bugs 91084, 83829, 51370.

Package-Manager: portage-2.0.51.22-r1

7 files changed, 421 insertions, 13 deletions

diff --git a/app-admin/amanda/ChangeLog b/app-admin/amanda/ChangeLog
index 7586a3077aa4..0b946d3f9d7d 100644
--- a/app-admin/amanda/ChangeLog
+++ b/app-admin/amanda/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/amanda
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/amanda/ChangeLog,v 1.32 2005/04/21 14:09:56 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/amanda/ChangeLog,v 1.33 2005/06/08 20:45:13 robbat2 Exp $
+
+*amanda-2.4.5 (08 Jun 2005)
+
+  08 Jun 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +files/amanda-2.4.5-4tb-holding-disk.patch,
+  +files/amanda-2.4.5-amverify-loop-detect.patch,
+  +files/amanda-2.4.5-samba-printf.patch, +amanda-2.4.5.ebuild:
+  Amanda version bump to 2.4.5. Fixed bugs 91084, 83829, 51370.
 
   21 Apr 2005; Simon Stelling <blubb@gentoo.org> amanda-2.4.4_p3.ebuild:
   stable on amd64
diff --git a/app-admin/amanda/Manifest b/app-admin/amanda/Manifest
index 7477c3717665..65d77db2457f 100644
--- a/app-admin/amanda/Manifest
+++ b/app-admin/amanda/Manifest
@@ -1,22 +1,27 @@
-MD5 c9d83d5121737c4f208c79c3b419fe66 ChangeLog 5867
-MD5 e9e3bac518c50528fbf94874c987c036 amanda-2.4.4-r3.ebuild 11287
-MD5 3dea0358c1c265a44aef11ae020c5a19 amanda-2.4.4_p2-r1.ebuild 11505
+MD5 162750b843d52da255e36c09855dc07a amanda-2.4.4_p3.ebuild 11800
 MD5 9d6a9bcaff257ec06163a218a9bb38a3 amanda-2.4.4_p2-r2.ebuild 11639
 MD5 a148574a8ecd216969f0edf1de34cfee amanda-2.4.4_p2.ebuild 11337
-MD5 162750b843d52da255e36c09855dc07a amanda-2.4.4_p3.ebuild 11800
+MD5 e9e3bac518c50528fbf94874c987c036 amanda-2.4.4-r3.ebuild 11287
+MD5 3dea0358c1c265a44aef11ae020c5a19 amanda-2.4.4_p2-r1.ebuild 11505
+MD5 827179ce8d35f8e756a385ee5c4e4de5 ChangeLog 6176
 MD5 b0d485ea1a51fb83c70daedef2599272 metadata.xml 279
-MD5 451df413de672ae539379c00fb9e62fc files/amanda-amandahosts 339
-MD5 a98390eb2ab16398b7332c42560c190f files/amanda-cron 419
+MD5 b848f27157d39e5e5009bb6d09ad6abd amanda-2.4.5.ebuild 12188
 MD5 89f98efbd6fee9891cd6c39d52e5d7a8 files/amanda-devfs 349
-MD5 ef2e4c8797076d9733b31a860fda8582 files/amanda-inetd.amanda.sample 194
-MD5 c1754144159a9b9e71119c7ca30e6054 files/amanda-profile 49
+MD5 fe28f64731a2dbf85f76b6f38942e032 files/example_disklist 55
+MD5 a98390eb2ab16398b7332c42560c190f files/amanda-cron 419
+MD5 1526ee8fda3df565caa85063636c2268 files/amanda-2.4.5-4tb-holding-disk.patch 457
+MD5 715b6aaa38cdf51b60a25581a530e64c files/amanda-2.4.5-amverify-loop-detect.patch 1108
 MD5 3f55a95767207ed6c8fa0a14ec2a27b3 files/amanda-xinetd 1502
+MD5 c1754144159a9b9e71119c7ca30e6054 files/amanda-profile 49
+MD5 7e3ebbf89155432d9ee2e0ede8d4d8d6 files/example_amanda.conf 635
+MD5 451df413de672ae539379c00fb9e62fc files/amanda-amandahosts 339
+MD5 1939136431aad74bca6d83105b0b8ba2 files/digest-amanda-2.4.5 65
+MD5 1c3320d56e74e925e4b3e4a8936488cd files/patch-tar-1.14.90 984
 MD5 7e5571de2054c56f477b5522246a834e files/digest-amanda-2.4.4-r3 65
 MD5 0c1121f81cee9a50018b96c615b4554b files/digest-amanda-2.4.4_p2 67
+MD5 8c132263bed2ee3703b26936b15aa916 files/digest-amanda-2.4.4_p3 67
 MD5 0c1121f81cee9a50018b96c615b4554b files/digest-amanda-2.4.4_p2-r1 67
 MD5 0c1121f81cee9a50018b96c615b4554b files/digest-amanda-2.4.4_p2-r2 67
-MD5 8c132263bed2ee3703b26936b15aa916 files/digest-amanda-2.4.4_p3 67
-MD5 7e3ebbf89155432d9ee2e0ede8d4d8d6 files/example_amanda.conf 635
-MD5 fe28f64731a2dbf85f76b6f38942e032 files/example_disklist 55
 MD5 95a109a0edbf12da91dbabf7977a97f7 files/example_global.conf 1377
-MD5 1c3320d56e74e925e4b3e4a8936488cd files/patch-tar-1.14.90 984
+MD5 ef2e4c8797076d9733b31a860fda8582 files/amanda-inetd.amanda.sample 194
+MD5 6020426a696d9bbec9244067debbba4d files/amanda-2.4.5-samba-printf.patch 498
diff --git a/app-admin/amanda/amanda-2.4.5.ebuild b/app-admin/amanda/amanda-2.4.5.ebuild
new file mode 100644
index 000000000000..92c07e160de5
--- /dev/null
+++ b/app-admin/amanda/amanda-2.4.5.ebuild
@@ -0,0 +1,349 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/amanda/amanda-2.4.5.ebuild,v 1.1 2005/06/08 20:45:13 robbat2 Exp $
+
+inherit eutils
+
+DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver"
+HOMEPAGE="http://www.amanda.org/"
+SRC_URI="mirror://sourceforge/amanda/${P/_/}.tar.gz"
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc amd64"
+RDEPEND="sys-libs/readline
+		virtual/inetd
+		app-arch/mt-st
+		media-gfx/gnuplot
+		sys-apps/gawk
+		app-arch/tar
+		dev-lang/perl
+		sys-block/mtx
+		app-arch/dump
+		virtual/mailx
+		samba? ( net-fs/samba )
+		berkdb? ( sys-libs/db )
+		gdbm? ( sys-libs/gdbm )
+		!sparc? ( xfs? ( sys-fs/xfsdump ) )
+		>=sys-apps/portage-2.0.51-r3"
+
+DEPEND="${RDEPEND}
+	sys-devel/autoconf
+	sys-devel/automake"
+
+IUSE="pic debug gdbm berkdb samba xfs"
+
+S="${WORKDIR}/${P/_/}"
+MYFILESDIR="${WORKDIR}/files"
+MYTMPDIR="${WORKDIR}/tmp"
+ENVDIR="/etc/env.d"
+ENVDFILE="97amanda"
+TMPENVFILE="${MYTMPDIR}/${ENVDFILE}"
+
+amanda_variable_setup() {
+
+	# Setting vars
+	local currentamanda
+
+	# Grab the current settings
+	currentamanda="$(set | egrep "^AMANDA_" | xargs)"
+	use debug && einfo "Current settings: ${currentamanda}"
+	#for i in ${currentamanda}; do
+	#	eval `eval echo ${i}`
+	#	echo "Setting: ${i}"
+	#done;
+
+	# First we set the defaults
+	[ -z "${AMANDA_GROUP_GID}" ] && AMANDA_GROUP_GID=87
+	[ -z "${AMANDA_GROUP_NAME}" ] && AMANDA_GROUP_NAME=amanda
+	[ -z "${AMANDA_USER_NAME}" ] && AMANDA_USER_NAME=amanda
+	[ -z "${AMANDA_USER_UID}" ] && AMANDA_USER_UID=87
+	[ -z "${AMANDA_USER_SH}" ] && AMANDA_USER_SH=/bin/false
+	[ -z "${AMANDA_USER_HOMEDIR}" ] && AMANDA_USER_HOMEDIR=/var/spool/amanda
+	[ -z "${AMANDA_USER_GROUPS}" ] && AMANDA_USER_GROUPS="${AMANDA_GROUP_NAME}"
+	# This installs Amanda, with the server. However, it could be a client,
+	# just specify an alternate server name in AMANDA_SERVER.
+	[ -z "${AMANDA_SERVER}" ] && AMANDA_SERVER="${HOSTNAME}"
+	[ -z "${AMANDA_SERVER_TAPE}" ] && AMANDA_SERVER_TAPE="${AMANDA_SERVER}"
+	[ -z "${AMANDA_SERVER_INDEX}" ] && AMANDA_SERVER_INDEX="${AMANDA_SERVER}"
+	[ -z "${AMANDA_TAR_LISTDIR}" ] && AMANDA_TAR_LISTDIR=${AMANDA_USER_HOMEDIR}/tar-lists
+	[ -z "${AMANDA_CONFIG_NAME}" ] && AMANDA_CONFIG_NAME=DailySet1
+	[ -z "${AMANDA_TMPDIR}" ] && AMANDA_TMPDIR=${AMANDA_USER_HOMEDIR}/tmp
+	# These are left empty by default
+	[ -z "${AMANDA_PORTS_UDP}" ] && AMANDA_PORTS_UDP=
+	[ -z "${AMANDA_PORTS_TCP}" ] && AMANDA_PORTS_TCP=
+	[ -z "${AMANDA_PORTS_BOTH}" ] && AMANDA_PORTS_BOTH=
+	[ -z "${AMANDA_PORTS}" ] && AMANDA_PORTS=
+
+	# This one is a little more complicated
+	# The priority list is this:
+	# 1. 'Berkely DB style' (only if USE="berkdb")
+	# 2. 'GDBM style' (only if USE="gdbm")
+	# 3. 'Text style'
+	[ -z "${AMANDA_DBMODE}" ] && use berkdb && AMANDA_DBMODE=db
+	[ -z "${AMANDA_DBMODE}" ] && use gdbm && AMANDA_DBMODE=gdbm
+	[ -z "${AMANDA_DBMODE}" ] && AMANDA_DBMODE=text
+
+	# Now pull in the old stuff
+	if [ -f "${ENVDIR}/${ENVDFILE}" ]; then
+		# We don't just source it as we don't want everything in there.
+		eval $(egrep "^AMANDA_" ${ENVDIR}/${ENVDFILE})
+	fi
+
+	# Re-apply the new settings if any
+	[ -n "${currentamanda}" ] && eval `echo "${currentamanda}"`
+
+}
+
+pkg_setup() {
+	# Now add users if needed
+	amanda_variable_setup
+	enewgroup "${AMANDA_GROUP_NAME}" "${AMANDA_GROUP_GID}"
+	enewuser "${AMANDA_USER_NAME}" "${AMANDA_USER_UID}" "${AMANDA_USER_SH}" "${AMANDA_USER_HOMEDIR}" "${AMANDA_USER_GROUPS}"
+}
+
+src_unpack() {
+	unpack "${A}"
+	# Fix glitch with recognizing tar-1.14.90
+	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/patch-tar-1.14.90 || die "Failed to add tar support patch"
+	epatch ${FILESDIR}/${P}-4tb-holding-disk.patch || die "Failed to patch for 4TB holding disks"
+	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${P}-samba-printf.patch || die "Failed to patch samba printf bug"
+	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${P}-amverify-loop-detect.patch || die "Failed to patch amverify loop bug"
+	# now the real fun
+	amanda_variable_setup
+	# places for us to work in
+	mkdir -p "${MYFILESDIR}" "${MYTMPDIR}"
+	# Now we store the settings we just created
+	set | egrep "^AMANDA_" > "${TMPENVFILE}"
+}
+
+src_compile() {
+	# fix bug #36316
+	addpredict /var/cache/samba/gencache.tdb
+
+	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
+	source "${TMPENVFILE}"
+	local myconf
+	cd ${S}
+
+	einfo "Using '${AMANDA_DBMODE}' style database"
+	myconf="${myconf} --with-db=${AMANDA_DBMODE}"
+	einfo "Using ${AMANDA_SERVER_TAPE} for tape server."
+	myconf="${myconf} --with-tape-server=${AMANDA_SERVER_TAPE}"
+	einfo "Using ${AMANDA_SERVER_INDEX} for index server."
+	myconf="${myconf} --with-index-server=${AMANDA_SERVER_TAPE}"
+	einfo "Using ${AMANDA_USER_NAME} for amanda user."
+	myconf="${myconf} --with-user=${AMANDA_USER_NAME}"
+	einfo "Using ${AMANDA_GROUP_NAME} for amanda group."
+	myconf="${myconf} --with-group=${AMANDA_GROUP_NAME}"
+	einfo "Using ${AMANDA_TAR_LISTDIR} as tar listdir."
+	myconf="${myconf} --with-gnutar-listdir=${AMANDA_TAR_LISTDIR}"
+	einfo "Using ${AMANDA_CONFIG_NAME} as default config name."
+	myconf="${myconf} --with-config=${AMANDA_CONFIG_NAME}"
+	einfo "Using ${AMANDA_TMPDIR} as Amanda temporary directory."
+	myconf="${myconf} --with-tmpdir=${AMANDA_TMPDIR}"
+
+	if [ -n "${AMANDA_PORTS_UDP}" ] && [ -n "${AMANDA_PORTS_TCP}" ] && [ -z "${AMANDA_PORTS_BOTH}" ] ; then
+		eerror "If you want _both_ UDP and TCP ports, please use only the"
+		eerror "AMANDA_PORTS environment variable for identical ports, or set"
+		eerror "AMANDA_PORTS_BOTH."
+		die "Bad port setup!"
+	fi
+	if [ -n "${AMANDA_PORTS_UDP}" ]; then
+		einfo "Using UDP ports ${AMANDA_PORTS_UDP/,/-}"
+		myconf="${myconf} --with-udpportrange=${AMANDA_PORTS_UDP}"
+	fi
+	if [ -n "${AMANDA_PORTS_TCP}" ]; then
+		einfo "Using TCP ports ${AMANDA_PORTS_TCP/,/-}"
+		myconf="${myconf} --with-tcpportrange=${AMANDA_PORTS_TCP}"
+	fi
+	if [ -n "${AMANDA_PORTS}" ]; then
+		einfo "Using ports ${AMANDA_PORTS/,/-}"
+		myconf="${myconf} --with-portrange=${AMANDA_PORTS}"
+	fi
+
+	# Extras
+	# Speed option
+	myconf="${myconf} --with-buffered-dump"
+	# Debug
+	myconf="${myconf} `use_with debug debugging`"
+	# Where to put our files
+	myconf="${myconf} --localstatedir=${AMANDA_USER_HOMEDIR}"
+
+	# Samba support
+	use samba && myconf="${myconf} --with-smbclient=/usr/bin/smbclient" || myconf="${myconf} --without-smbclient"
+
+	# Force the correct TAR
+	myconf="${myconf} --with-gnutar=/bin/tar"
+
+	econf ${myconf} || die "econf failed!"
+	emake || die "emake failed!"
+
+	# Compile the tapetype program too
+	# This is deprecated, use amtapetype instead!
+	# cd tape-src
+	# emake tapetype || die "emake tapetype failed!"
+
+	# Only needed if you we do versioning
+	#dosed "s,/usr/local/bin/perl,/usr/bin/perl," ${S}/contrib/set_prod_link.pl
+	#perl ${S}/contrib/set_prod_link.pl
+
+}
+
+src_install() {
+	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
+	source ${TMPENVFILE}
+
+	einfo "Doing stock install"
+	make DESTDIR=${D} install || die
+
+	# Prepare our custom files
+	einfo "Building custom configuration files"
+	cp ${FILESDIR}/amanda-* ${MYFILESDIR}
+	local i # our iterator
+	local sedexpr # var for sed expr
+	sedexpr=''
+	for i in AMANDA_GROUP_GID AMANDA_GROUP_NAME AMANDA_USER_NAME AMANDA_USER_UID AMANDA_USER_SH AMANDA_USER_HOMEDIR AMANDA_USER_GROUPS AMANDA_SERVER AMANDA_SERVER_TAPE AMANDA_SERVER_INDEX AMANDA_TAR_LISTDIR AMANDA_CONFIG_NAME AMANDA_TMPDIR AMANDA_PORTS_UDP AMANDA_PORTS_TCP AMANDA_PORTS_BOTH AMANDA_PORTS; do
+		local val
+		eval "val=\"\${${i}}\""
+		sedexpr="${sedexpr}s|__${i}__|${val}|g;"
+	done
+	#einfo "Compiled SED expression: '${sedexpr}'"
+
+	# now apply the sed expr
+	for i in "${FILESDIR}"/amanda-* ; do
+		local filename
+		filename=`basename ${i}`
+		#einfo "Applying compiled SED expression to ${filename}"
+		sed -re "${sedexpr}" <${i} >"${MYFILESDIR}/${filename}"
+	done
+
+
+
+	# Build the envdir file
+	# Don't forget this..
+	einfo "Building environment file"
+	echo "# These settings are what was present in the environment when this" >>${MYFILESDIR}/${ENVDFILE}
+	echo "# Amanda was compiled.  Changing anything below this comment will" >>${MYFILESDIR}/${ENVDFILE}
+	echo "# have no effect on your application, but it merely exists to" >>${MYFILESDIR}/${ENVDFILE}
+	echo "# preserve them for your next emerge of Amanda" >>${MYFILESDIR}/${ENVDFILE}
+	cat ${TMPENVFILE} | sed "s,=\$,='',g" >>${MYFILESDIR}/${ENVDFILE}
+
+	into /usr
+
+	# Depreacted, use amtapetype instead
+	#einfo "Installing tapetype utility"
+	#newsbin tape-src/tapetype tapetype
+
+	# docs
+	einfo "Installing documentation"
+	dodoc AUTHORS C* INSTALL NEWS README
+	# Clean up some bits
+	dodoc ${D}/usr/share/amanda/*
+	rm -rf ${D}/usr/share/amanda
+	# our inetd sample
+	einfo "Installing standard inetd sample"
+	dodoc ${MYFILESDIR}/amanda-inetd.amanda.sample
+	# Stock extra docs
+	docinto docs
+	dodoc ${S}/docs/*
+	# Labels
+	einfo "Installing labels"
+	docinto labels
+	dodoc ${S}/example/3hole.ps
+	dodoc ${S}/example/8.5x11.ps
+	dodoc ${S}/example/DIN-A4.ps
+	dodoc ${S}/example/DLT.ps
+	dodoc ${S}/example/EXB-8500.ps
+	dodoc ${S}/example/HP-DAT.ps
+	# Amanda example configs
+	einfo "Installing example configurations"
+	docinto example
+	dodoc ${S}/example/*
+	docinto example1
+	newdoc ${FILESDIR}/example_amanda.conf amanda.conf
+	newdoc ${FILESDIR}/example_disklist disklist
+	newdoc ${FILESDIR}/example_global.conf global.conf
+	docinto example2
+	newdoc ${S}/example/amanda.conf amanda.conf
+	newdoc ${S}/example/disklist disklist
+	# Compress it all
+	prepalldocs
+
+	# Just make sure it exists for XFS to work...
+	use !sparc && use xfs && keepdir ${D}/var/xfsdump/inventory
+
+	insinto /etc/amanda
+	einfo "Installing .amandahosts File for ${AMANDA_USER_NAME} user"
+	newins ${MYFILESDIR}/amanda-amandahosts amandahosts
+	dosym /etc/amanda/amandahosts ${AMANDA_USER_HOMEDIR}/.amandahosts
+	insinto ${AMANDA_USER_HOMEDIR}
+	einfo "Installing .profile for ${AMANDA_USER_NAME} user"
+	newins ${MYFILESDIR}/amanda-profile .profile
+
+	einfo "Installing Sample Daily Cron Job for Amanda"
+	CRONDIR=/etc/cron.daily/
+	exeinto ${CRONDIR}
+	newexe ${MYFILESDIR}/amanda-cron amanda
+	# Not excetuable by default
+	fperms 644 ${CRONDIR}/amanda
+
+	insinto /etc/amanda/${AMANDA_CONFIG_NAME}
+	keepdir /etc/amanda
+	keepdir /etc/amanda/${AMANDA_CONFIG_NAME}
+
+	local i
+	for i in ${AMANDA_USER_HOMEDIR} ${AMANDA_TAR_LISTDIR} ${AMANDA_TMPDIR} ${AMANDA_TMPDIR}/dumps ${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME} /etc/amanda /etc/amanda/${AMANDA_CONFIG_NAME}; do
+		einfo "Securing directory (${i})"
+		dodir ${i}
+		keepdir ${i}
+		fowners ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} ${i}
+		fperms 700 ${i}
+	done
+
+	# DevFS
+	einfo "Installing DevFS config file"
+	insinto /etc/devfs.d
+	newins ${MYFILESDIR}/amanda-devfs amanda
+
+	# Env.d
+	einfo "Installing environment config file"
+	insinto /etc/env.d
+	doins ${MYFILESDIR}/${ENVDFILE}
+
+	# Installing Amanda Xinetd Services Definition
+	einfo "Installing xinetd service file"
+	insinto /etc/xinetd.d
+	newins ${MYFILESDIR}/amanda-xinetd amanda
+
+}
+
+pkg_postinst() {
+	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
+	source ${TMPENVFILE}
+	local i
+	for i in amandates dumpdates; do
+		einfo "Creating inital Amanda file (${i})"
+		touch ${ROOT}/etc/${i}
+		chown ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} ${ROOT}/etc/${i}
+		chmod 600 ${ROOT}/etc/${i}
+	done
+
+	einfo "You should configure Amanda in /etc/amanda now."
+	echo
+	einfo "If you use xinetd, Don't forget to check /etc/xinetd.d/amanda"
+	einfo "and restart xinetd afterwards!"
+	echo
+	einfo "Otherwise, please look at /usr/share/doc/${P}/inetd.amanda.sample"
+	einfo "as an example of how to configure your inetd."
+	echo
+	einfo "NOTICE: If you need raw acces to partitions you need to add the"
+	einfo "amanda user to the 'disk' group and uncomment following lines in"
+	einfo "your /etc/devfs.d/amanda:"
+	einfo "SCSI:"
+	einfo "REGISTER   ^scsi/host.*/bus.*/target.*/lun.*/part[0-9]  PERMISSIONS root.disk 660"
+	einfo "IDE:"
+	einfo "REGISTER   ^ide/host.*/bus.*/target.*/lun.*/part[0-9]   PERMISSIONS root.disk 660"
+	echo
+	einfo "NOTICE: If you have a tape changer, also uncomment the following"
+	einfo "REGISTER   ^scsi/host.*/bus.*/target.*/lun.*/generic    PERMISSIONS root.disk 660"
+}
diff --git a/app-admin/amanda/files/amanda-2.4.5-4tb-holding-disk.patch b/app-admin/amanda/files/amanda-2.4.5-4tb-holding-disk.patch
new file mode 100644
index 000000000000..f056e98cf808
--- /dev/null
+++ b/app-admin/amanda/files/amanda-2.4.5-4tb-holding-disk.patch
@@ -0,0 +1,12 @@
+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-admin/amanda/files/amanda-2.4.5-amverify-loop-detect.patch b/app-admin/amanda/files/amanda-2.4.5-amverify-loop-detect.patch
new file mode 100644
index 000000000000..bbf358af6d13
--- /dev/null
+++ b/app-admin/amanda/files/amanda-2.4.5-amverify-loop-detect.patch
@@ -0,0 +1,22 @@
+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-admin/amanda/files/amanda-2.4.5-samba-printf.patch b/app-admin/amanda/files/amanda-2.4.5-samba-printf.patch
new file mode 100644
index 000000000000..01dca14ca092
--- /dev/null
+++ b/app-admin/amanda/files/amanda-2.4.5-samba-printf.patch
@@ -0,0 +1,11 @@
+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-admin/amanda/files/digest-amanda-2.4.5 b/app-admin/amanda/files/digest-amanda-2.4.5
new file mode 100644
index 000000000000..ad4726a140ef
--- /dev/null
+++ b/app-admin/amanda/files/digest-amanda-2.4.5
@@ -0,0 +1 @@
+MD5 1960b7875424e412d042bc92a1548d7f amanda-2.4.5.tar.gz 1541761