fix bug #37400 with a better default

7 files changed, 356 insertions, 13 deletions

diff --git a/app-admin/amanda/ChangeLog b/app-admin/amanda/ChangeLog
index 89ce72d8b033..c146b78de24e 100644
--- a/app-admin/amanda/ChangeLog
+++ b/app-admin/amanda/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/amanda
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/amanda/ChangeLog,v 1.10 2003/12/25 02:43:56 robbat2 Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/amanda/ChangeLog,v 1.11 2004/01/07 08:59:07 robbat2 Exp $
+
+*amanda-2.4.4-r3 (07 Jan 2004)
+
+  07 Jan 2004; Robin H. Johnson <robbat2@gentoo.org> amanda-2.4.4-r1.ebuild,
+  amanda-2.4.4-r2.ebuild, amanda-2.4.4-r3.ebuild, amanda-2.4.4.ebuild:
+  fix bug #37400 with a better default
 
   24 Dec 2003; Robin H. Johnson <robbat2@gentoo.org> amanda-2.4.4-r1.ebuild,
   amanda-2.4.4-r2.ebuild, amanda-2.4.4.ebuild:
diff --git a/app-admin/amanda/Manifest b/app-admin/amanda/Manifest
index 571ef0f95bb9..65e029c7b87a 100644
--- a/app-admin/amanda/Manifest
+++ b/app-admin/amanda/Manifest
@@ -1,8 +1,8 @@
-# $Header: /var/cvsroot/gentoo-x86/app-admin/amanda/Manifest,v 1.23 2003/12/25 02:44:59 robbat2 Exp $
-MD5 42ee070efeecc99acc78c0cb909f60ba amanda-2.4.4-r2.ebuild 11248
-MD5 b2fd848797d7bad624451d1e3266aa5e amanda-2.4.4.ebuild 8434
-MD5 07adfe3736ddce8b2aac7482107c13f2 amanda-2.4.4-r1.ebuild 11270
-MD5 e08f5636c78e3ad5f131d3e736a3eb3b ChangeLog 2611
+MD5 28fb726c3065de7a12f04c7bb2ef1532 amanda-2.4.4-r2.ebuild 11248
+MD5 3a543dbee741db52ca625994441a91e6 amanda-2.4.4.ebuild 8434
+MD5 81b9429f13380db53fc03e57092c03b0 amanda-2.4.4-r1.ebuild 11270
+MD5 3d9986ad500bfb68120fd73846f6f45b amanda-2.4.4-r3.ebuild 11254
+MD5 5f33e4455d83f0b478899d0ab8b7bc9f ChangeLog 2831
 MD5 b21569120561b1c58ad59e93ce6df732 files/amanda-devfs 216
 MD5 fe28f64731a2dbf85f76b6f38942e032 files/example_disklist 55
 MD5 a98390eb2ab16398b7332c42560c190f files/amanda-cron 419
@@ -13,5 +13,6 @@ MD5 451df413de672ae539379c00fb9e62fc files/amanda-amandahosts 339
 MD5 7e5571de2054c56f477b5522246a834e files/digest-amanda-2.4.4 65
 MD5 7e5571de2054c56f477b5522246a834e files/digest-amanda-2.4.4-r1 65
 MD5 7e5571de2054c56f477b5522246a834e files/digest-amanda-2.4.4-r2 65
+MD5 7e5571de2054c56f477b5522246a834e files/digest-amanda-2.4.4-r3 65
 MD5 95a109a0edbf12da91dbabf7977a97f7 files/example_global.conf 1377
 MD5 ef2e4c8797076d9733b31a860fda8582 files/amanda-inetd.amanda.sample 194
diff --git a/app-admin/amanda/amanda-2.4.4-r1.ebuild b/app-admin/amanda/amanda-2.4.4-r1.ebuild
index b84790dc2a83..be5acfd0bfb4 100644
--- a/app-admin/amanda/amanda-2.4.4-r1.ebuild
+++ b/app-admin/amanda/amanda-2.4.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/amanda/amanda-2.4.4-r1.ebuild,v 1.12 2003/12/25 02:44:52 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/amanda/amanda-2.4.4-r1.ebuild,v 1.13 2004/01/07 08:59:07 robbat2 Exp $
 
 inherit eutils
 
diff --git a/app-admin/amanda/amanda-2.4.4-r2.ebuild b/app-admin/amanda/amanda-2.4.4-r2.ebuild
index 7bbc1bc8c4ad..34dc9b1f1bb3 100644
--- a/app-admin/amanda/amanda-2.4.4-r2.ebuild
+++ b/app-admin/amanda/amanda-2.4.4-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/amanda/amanda-2.4.4-r2.ebuild,v 1.7 2003/12/25 02:44:52 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/amanda/amanda-2.4.4-r2.ebuild,v 1.8 2004/01/07 08:59:07 robbat2 Exp $
 
 inherit eutils
 
diff --git a/app-admin/amanda/amanda-2.4.4-r3.ebuild b/app-admin/amanda/amanda-2.4.4-r3.ebuild
new file mode 100644
index 000000000000..6325b4d7f9af
--- /dev/null
+++ b/app-admin/amanda/amanda-2.4.4-r3.ebuild
@@ -0,0 +1,335 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/amanda/amanda-2.4.4-r3.ebuild,v 1.1 2004/01/07 08:59:07 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"
+DEPEND="sys-libs/readline
+		virtual/inetd
+		app-arch/mt-st
+		media-gfx/gnuplot
+		sys-apps/gawk
+		app-arch/tar
+		sys-devel/autoconf
+		sys-devel/automake
+		dev-lang/perl
+		sys-apps/mtx
+		app-arch/dump
+		net-mail/mailx
+		samba? ( net-fs/samba )
+		berkdb? ( sys-libs/db )
+		gdbm? ( sys-libs/gdbm )
+		xfs? ( sys-fs/xfsdump )"
+
+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}
+	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`"
+	# PIC
+	myconf="${myconf} `use_with pic`"
+	# 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"
+
+	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 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
+
+	for i in amandates dumpdates; do
+		einfo "Creating inital Amanda file (${i})"
+		touch ${D}/etc/${i}
+		fowners ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} /etc/${i}
+		fperms 600 /etc/${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() {
+	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"
+}
diff --git a/app-admin/amanda/amanda-2.4.4.ebuild b/app-admin/amanda/amanda-2.4.4.ebuild
index f4695fa91696..b8107dc89c5d 100644
--- a/app-admin/amanda/amanda-2.4.4.ebuild
+++ b/app-admin/amanda/amanda-2.4.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/amanda/amanda-2.4.4.ebuild,v 1.11 2003/12/25 02:43:56 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/amanda/amanda-2.4.4.ebuild,v 1.12 2004/01/07 08:59:07 robbat2 Exp $
 
 inherit eutils
 DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver"
diff --git a/app-admin/amanda/files/digest-amanda-2.4.4-r3 b/app-admin/amanda/files/digest-amanda-2.4.4-r3
new file mode 100644
index 000000000000..0744e0686521
--- /dev/null
+++ b/app-admin/amanda/files/digest-amanda-2.4.4-r3
@@ -0,0 +1 @@
+MD5 1f5f0c636707994eb7b5e74b19528323 amanda-2.4.4.tar.gz 1220934