Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app-backup/amanda/Manifest15
-rw-r--r--app-backup/amanda/amanda-2.6.1_p1.ebuild378
-rw-r--r--app-backup/amanda/files/amanda-2.6.0_p2-syslocpath.patch19
-rw-r--r--app-backup/amanda/files/amanda-2.6.0p2-amcrypt-ossl-asym-race-fix.patch75
-rw-r--r--app-backup/amanda/files/amanda-2.6.1_p1-gentoo.patch81
-rw-r--r--app-backup/amanda/files/amanda-amandahosts-client-2.5.1_p3-r18
-rw-r--r--app-backup/amanda/files/amanda-amandahosts-server-2.5.1_p3-r18
-rw-r--r--app-backup/amanda/files/amanda-cron13
-rw-r--r--app-backup/amanda/files/amanda-inetd.amanda.sample-2.6.0_p2-r23
-rw-r--r--app-backup/amanda/files/amanda-profile1
-rw-r--r--app-backup/amanda/files/amanda-xinetd-2.6.1_p1-client20
-rw-r--r--app-backup/amanda/files/amanda-xinetd-2.6.1_p1-server20
-rw-r--r--app-backup/amanda/files/example_amanda.conf44
-rw-r--r--app-backup/amanda/files/example_disklist-2.5.1_p3-r14
-rw-r--r--app-backup/amanda/files/example_global.conf78
15 files changed, 0 insertions, 767 deletions
diff --git a/app-backup/amanda/Manifest b/app-backup/amanda/Manifest
deleted file mode 100644
index 18ff882..0000000
--- a/app-backup/amanda/Manifest
+++ /dev/null
@@ -1,15 +0,0 @@
-AUX amanda-2.6.0_p2-syslocpath.patch 965 RMD160 16b4ee50822a0c97d717dcf0c8c2644c984d1076 SHA1 442f40c16acaf0d48c3b3d615329c1389a9b0e2b SHA256 70f19629852cb02876bac21a119acc30b94822126f5828d4e453af1ae47bc398
-AUX amanda-2.6.0p2-amcrypt-ossl-asym-race-fix.patch 2713 RMD160 012e4a323de90f6fc266ba39df1e24184f891194 SHA1 7035280b3f89f652ab5d18b0062f07ee3990329d SHA256 4ef8b55a79f1dc7ccd604bf308afbe3949baf55f9eab9ef2556f9c0f4f48a6e8
-AUX amanda-2.6.1_p1-gentoo.patch 3472 RMD160 56e7a669b17f2a5095cc01301997af9bc18293b6 SHA1 3c4f212165de56aeb0e768a72a94d7d543b0c4d2 SHA256 28d03938b351e81e307b86cbc9945dd776913aadb3876db11220e76d94e70e66
-AUX amanda-amandahosts-client-2.5.1_p3-r1 343 RMD160 f5526644c7c9ec517f648b374d35dcbecd73de97 SHA1 c3e1e6a800b5b9ae26e218730d60817f8ddd8847 SHA256 26a446ae74aafcb90a05bb66430b70e35c5536ee9e42137abc7925bf1175e84e
-AUX amanda-amandahosts-server-2.5.1_p3-r1 340 RMD160 0680e414089f5bec2540404f8d74708602d703b1 SHA1 8920c2adb0a9a0e55eb15238630d93e9d54433a2 SHA256 9e07c28b344ff42c6a8f31af2d9dac780a00ff28e40850a0b115e26990ecc0e7
-AUX amanda-cron 419 RMD160 97b13e25afc88d64f0320a08189b4e7b4c7fa054 SHA1 ff4835e78c7a9abd10b8cd79c1d9d744a2782af1 SHA256 17e1a36c21264a9b254e64e9b7529d70402acd40772d158795490ac5fc08b01a
-AUX amanda-inetd.amanda.sample-2.6.0_p2-r2 326 RMD160 ea21b25849158eae590a6689132fe29f95d0fb40 SHA1 8a66d3f6428032a1fa92bcb4d385190bdd3f7266 SHA256 4056a53e1a6f3dd5527da9fd85e810e21ebab0fe9100043b2ac165743d5a9b79
-AUX amanda-profile 49 RMD160 2958487df40529f0d692f02f2343b633d34853a6 SHA1 80da3900ace9b4069b7cae11cfc5da5a6670f010 SHA256 5781459910f0f72b1bfe15d758f17e7d6c8e33b5856b62a8d5cedf64a2917e76
-AUX amanda-xinetd-2.6.1_p1-client 674 RMD160 349e602d0d3a22366abb46674eabf503e904e481 SHA1 66c9fee030558deaf29aa28dc4b2a7cc7eb8ea82 SHA256 0b265f46d3afb2568517560c7a7d62874f7880ebd90c81ab9fc47338c6c19854
-AUX amanda-xinetd-2.6.1_p1-server 694 RMD160 94e74b7f9b891dd04cfcce24ceb0fadb63a11ab0 SHA1 80d0bfd81bfaebb8a2301172033e62a13be97ebd SHA256 de4a365a2701353b6f0d66589c45389e6337ecdb58526d7d211742e394418ce8
-AUX example_amanda.conf 635 RMD160 1214396161457bb71cd6a31e23d6cb78482e20e7 SHA1 4368b8d7908e49963bc144c68119a32c047877ff SHA256 a1b0520fb0fca0f4146c59589987fffa637a0ce643a91d6d71dde6f538faf325
-AUX example_disklist-2.5.1_p3-r1 177 RMD160 e9f8f4dda3d7f022e1e60b556a713a9b891b5845 SHA1 8d35a5fe8ba9f3f30659684e17bae0e69d51196b SHA256 bc0388e7de0cc36888d3b27430b4a6b138dd39c77263fdc53dfee9f0b93142f8
-AUX example_global.conf 1377 RMD160 009e5039f94938c8521e58236da6027d7ec33766 SHA1 2e75914f18ed478c5cd1cd1bb9b0570fa2d20e82 SHA256 5223d061cd160b241e0d1fad1e328d241387fecb753e797d2e216f77d97a8808
-DIST amanda-2.6.1p1.tar.gz 2848295 RMD160 f76945bbddbab961fcc109f6dbe2ddf82ea3ee49 SHA1 796b8748d2bdee21268f6001aa967c95f68c8c51 SHA256 23e8523abe5623d4f1f5d7271460d1250309d10897e6da3af8c849bdd20ee921
-EBUILD amanda-2.6.1_p1.ebuild 13273 RMD160 6238f4ee3094292e3296e81513b0d50e6df16856 SHA1 c64dfaae7615d5f8367be11a2b68948f35fa34da SHA256 1c6f2a5129bf63aa466191ef74934d85a7e05dc9271a5bacfe8bac471bdf696e
diff --git a/app-backup/amanda/amanda-2.6.1_p1.ebuild b/app-backup/amanda/amanda-2.6.1_p1.ebuild
deleted file mode 100644
index d105d38..0000000
--- a/app-backup/amanda/amanda-2.6.1_p1.ebuild
+++ /dev/null
@@ -1,378 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-2.6.0_p2-r4.ebuild,v 1.11 2009/04/13 21:09:55 ranger Exp $
-
-inherit autotools eutils perl-module
-
-MY_P="${P/_}"
-DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver"
-HOMEPAGE="http://www.amanda.org/"
-SRC_URI="mirror://sourceforge/amanda/${MY_P}.tar.gz"
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-RDEPEND="sys-libs/readline
- virtual/inetd
- sys-apps/gawk
- app-arch/tar
- >=dev-lang/perl-5.6
- app-arch/dump
- net-misc/openssh
- >=dev-libs/glib-2.2
- nls? ( virtual/libintl )
- s3? ( >=net-misc/curl-7.10.0 )
- samba? ( net-fs/samba )
- kerberos? ( app-crypt/mit-krb5 )
- xfs? ( sys-fs/xfsdump )
- !minimal? (
- virtual/mailx
- app-arch/mt-st
- sys-block/mtx
- gnuplot? ( sci-visualization/gnuplot )
- app-crypt/aespipe
- app-crypt/gnupg
- )"
-
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- nls? ( sys-devel/gettext )"
-
-IUSE="gnuplot ipv6 kerberos minimal nls s3 samba xfs"
-
-S="${WORKDIR}/${MY_P}"
-
-MYFILESDIR="${T}/files"
-ENVDIR="/etc/env.d"
-ENVDFILE="97amanda"
-TMPENVFILE="${T}/${ENVDFILE}"
-
-# This is a complete list of Amanda settings that the ebuild takes from the
-# build environment. This allows users to alter the behavior of the package as
-# upstream intended, but keeping with Gentoo style. We store a copy of them in
-# /etc/env.d/97amanda during the install, so that they are preserved for future
-# installed. This variable name must not start with AMANDA_, as we do not want
-# it captured into the env file.
-ENV_SETTINGS_AMANDA="
-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_TAR
-AMANDA_PORTS_UDP AMANDA_PORTS_TCP AMANDA_PORTS_BOTH AMANDA_PORTS
-AMANDA_CONFIG_NAME AMANDA_TMPDIR"
-
-pkg_setup() {
- # Setting vars
- local currentamanda
-
- # Grab the current settings
- currentamanda="$(set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' | xargs)"
-
- # 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/bash
- [ -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=/var/tmp/amanda
- [ -z "${AMANDA_DBGDIR}" ] && AMANDA_DBGDIR="$AMANDA_TMPDIR"
- # 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=
-
- # What tar to use
- [ -z "${AMANDA_TAR}" ] && AMANDA_TAR=/bin/tar
-
- # Now pull in the old stuff
- if [ -f "${ROOT}${ENVDIR}/${ENVDFILE}" ]; then
- # We don't just source it as we don't want everything in there.
- eval $(egrep "^AMANDA_" "${ROOT}${ENVDIR}/${ENVDFILE}" | grep -v '^AMANDA_ENV_SETTINGS')
- fi
-
- # Re-apply the new settings if any
- [ -n "${currentamanda}" ] && eval $(echo "${currentamanda}")
-
- 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}
- cd "${S}"
-
- # Fix a fun race condition if you use encryption.
- # This is one of the reasons you should test your recovery procedures often.
- epatch "${FILESDIR}"/${PN}-2.6.0p2-amcrypt-ossl-asym-race-fix.patch
-
- # gentoo bug 248838, check /sbin stuff before /bin
- epatch "${FILESDIR}"/${PN}-2.6.0_p2-syslocpath.patch
-
- epatch "${FILESDIR}"/${P}-gentoo.patch
-
- eautoreconf
-
- # places for us to work in
- mkdir -p "${MYFILESDIR}"
- # Now we store the settings we just created
- set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' > "${TMPENVFILE}"
-
- # Prepare our custom files
- einfo "Building custom configuration files"
- local i # our iterator
- local sedexpr # var for sed expr
- sedexpr=''
- for i in ${ENV_SETTINGS_AMANDA} ; do
- local val
- eval "val=\"\${${i}}\""
- sedexpr="${sedexpr}s|__${i}__|${val}|g;"
- done
-
- # now apply the sed expr
- for i in "${FILESDIR}"/amanda-* ; do
- sed -re "${sedexpr}" <"${i}" >"${MYFILESDIR}/$(basename ${i})"
- done
-
- (
- cat "${MYFILESDIR}"/amanda-amandahosts-client-2.5.1_p3-r1
- use minimal || cat "${MYFILESDIR}"/amanda-amandahosts-server-2.5.1_p3-r1
- ) > "${T}"/amandahosts
-
- # Build the envdir file
- # Don't forget this..
- einfo "Building environment file"
- (
- echo "# These settings are what was present in the environment when this"
- echo "# Amanda was compiled. Changing anything below this comment will"
- echo "# have no effect on your application, but it merely exists to"
- echo "# preserve them for your next emerge of Amanda"
- cat "${TMPENVFILE}" | sed "s,=\$,='',g"
- ) >> "${MYFILESDIR}/${ENVDFILE}"
-
- if ! use ipv6 ; then
- sed -i -e "/flags.*IPv6/d" "${MYFILESDIR}"/amanda-xinetd-${PV}-* || die
- fi
-}
-
-src_compile() {
- # fix bug #36316
- addpredict /var/cache/samba/gencache.tdb
-
- [ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
- source "${TMPENVFILE}"
- local myconf
-
- 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_INDEX}"
- 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} as Tar implementation."
- myconf="${myconf} --with-gnutar=${AMANDA_TAR}"
- 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"
- # "debugging" in the configuration is NOT debug in the conventional sense.
- # It is actually just useful output in the application, and should remain
- # enabled. There are some cases of breakage with MTX tape changers as of
- # 2.5.1p2 that it exposes when turned off as well.
- myconf="${myconf} --with-debugging"
- # Where to put our files
- myconf="${myconf} --localstatedir=${AMANDA_USER_HOMEDIR}"
-
- # Samba support
- myconf="${myconf} $(use_with samba smbclient /usr/bin/smbclient)"
-
- # Support for BSD, SSH, BSDUDP, BSDTCP security methods all compiled in by
- # default
- myconf="${myconf} --with-bsd-security"
- myconf="${myconf} --with-ssh-security"
- myconf="${myconf} --with-bsdudp-security"
- myconf="${myconf} --with-bsdtcp-security"
-
- # kerberos-security mechanism version 4
- # always disable, per bug #173354
- myconf="${myconf} --without-krb4-security"
-
- # kerberos-security mechanism version 5
- myconf="${myconf} $(use_with kerberos krb5-security)"
-
- # Amazon S3 support
- myconf="${myconf} $(use_enable s3 s3-device)"
-
- # Client only, as requested in bug #127725
- if use minimal ; then
- myconf="${myconf} --without-server"
- else
- # amplot
- myconf="${myconf} $(use_with gnuplot)"
- fi
-
- # IPv6 fun.
- myconf="${myconf} $(use_with ipv6)"
-
- # I18N
- myconf="${myconf} $(use_enable nls)"
-
- perlinfo
- # siteperl -> vendorperl
- myconf="${myconf} --with-amperldir=${VENDOR_LIB}"
-
- econf ${myconf} || die "econf failed!"
- emake || die "emake failed!"
-}
-
-src_install() {
- [ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
- source ${TMPENVFILE}
-
- einfo "Doing stock install"
- # parallel make install b0rked
- emake -j1 DESTDIR="${D}" install || die
-
- # Env.d
- einfo "Installing environment config file"
- doenvd "${MYFILESDIR}/${ENVDFILE}"
-
- # Installing Amanda Xinetd Services Definition
- einfo "Installing xinetd service file"
- insinto /etc/xinetd.d
- if use minimal ; then
- newins "${MYFILESDIR}"/amanda-xinetd-${PV}-client amanda
- else
- newins "${MYFILESDIR}"/amanda-xinetd-${PV}-server amanda
- fi
-
- einfo "Installing Sample Daily Cron Job for Amanda"
- insinto /etc/cron.daily
- newins "${MYFILESDIR}/amanda-cron" amanda
-
- insinto /etc/amanda
- einfo "Installing .amandahosts File for ${AMANDA_USER_NAME} user"
- doins "${T}/amandahosts"
- fperms 600 /etc/amanda/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
-
- keepdir "/etc/amanda/${AMANDA_CONFIG_NAME}"
-
- keepdir "${AMANDA_TAR_LISTDIR}"
- keepdir "${AMANDA_USER_HOMEDIR}/amanda"
- keepdir "${AMANDA_TMPDIR}/dumps"
- # Just make sure it exists for XFS to work...
- use xfs && keepdir /var/xfsdump/inventory
-
- local i
- for i in "${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \
- "${AMANDA_TMPDIR}" /etc/amanda; do
- einfo "Securing directory (${i})"
- fowners -R ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} ${i}
- done
-
- # docs
- einfo "Installing documentation"
- dodoc AUTHORS ChangeLog DEVELOPING NEWS README ReleaseNotes UPGRADING
- # our inetd sample
- einfo "Installing standard inetd sample"
- newdoc "${MYFILESDIR}/amanda-inetd.amanda.sample-2.6.0_p2-r2" amanda-inetd.amanda.sample
- # Amanda example configs
- einfo "Installing example configurations"
- rm "${D}"/usr/share/amanda/{COPYRIGHT,ChangeLog,NEWS,ReleaseNotes}
- mv "${D}/usr/share/amanda/example" "${D}/usr/share/doc/${PF}/"
- docinto example1
- newdoc "${FILESDIR}/example_amanda.conf" amanda.conf
- newdoc "${FILESDIR}/example_disklist-2.5.1_p3-r1" disklist
- newdoc "${FILESDIR}/example_global.conf" global.conf
-}
-
-pkg_postinst() {
- [ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
- source "${TMPENVFILE}"
-
- # Migration of amandates from /etc to $localstatedir/amanda
- if [ -f "${ROOT}/etc/amandates" -a \
- ! -f "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates" ]; then
- einfo "Migrating amandates from /etc/ to ${AMANDA_USER_HOMEDIR}/amanda"
- einfo "A backup is also placed at /etc/amandates.orig"
- cp -dp "${ROOT}/etc/amandates" "${ROOT}/etc/amandates.orig"
- mkdir -p "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/"
- cp -dp "${ROOT}/etc/amandates" "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates"
- fi
- if [ -f "${ROOT}/etc/amandates" ]; then
- einfo "If you have migrated safely, please delete /etc/amandates"
- fi
-
- # If USE=minimal, give out a warning, if AMANDA_SERVER is not set to
- # another host than HOSTNAME.
- if use minimal && [ "${AMANDA_SERVER}" = "${HOSTNAME}" ] ; then
- elog "You are installing a client-only version of Amanda."
- elog "You should set the variable \$AMANDA_SERVER to point at your"
- elog "Amanda-tape-server, otherwise you will have to specify its name"
- elog "when using amrecover on the client."
- elog "For example: Use something like"
- elog "AMANDA_SERVER=\"myserver\" emerge amanda"
- elog
- fi
-
- elog "You should configure Amanda in /etc/amanda now."
- elog
- elog "If you use xinetd, Don't forget to check /etc/xinetd.d/amanda"
- elog "and restart xinetd afterwards!"
- elog
- elog "Otherwise, please look at /usr/share/doc/${PF}/inetd.amanda.sample"
- elog "as an example of how to configure your inetd."
- elog
- elog "NOTICE: You can use amserverconfig(8) and amaddclient(8)."
- elog
- elog "NOTICE: If you need raw access to partitions you need to add the"
- elog "amanda user to the 'disk' group."
- elog
- elog "NOTICE: If you have a tape changer, you need to add the amanda user"
- elog "to the 'tape' group."
- elog
- elog "If you use localhost in your disklist your restores may break."
- elog "You should replace it with the actual hostname!"
- elog "Please also see the syntax changes to amandahosts."
-}
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
-}
-
-