diff options
Diffstat (limited to 'app-backup/amanda')
| -rw-r--r-- | app-backup/amanda/ChangeLog | 12 | ||||
| -rw-r--r-- | app-backup/amanda/amanda-2.5.2_p1-r5.ebuild | 460 | ||||
| -rw-r--r-- | app-backup/amanda/amanda-2.6.0_p2-r3.ebuild | 493 | ||||
| -rw-r--r-- | app-backup/amanda/files/amanda-2.5.2p1-amcrypt-ossl-asym-race-fix.patch | 74 | ||||
| -rw-r--r-- | app-backup/amanda/files/amanda-2.6.0p2-amcrypt-ossl-asym-race-fix.patch | 75 |
5 files changed, 1113 insertions, 1 deletions
diff --git a/app-backup/amanda/ChangeLog b/app-backup/amanda/ChangeLog index f4bc01b5bfd3..2d5e4ae2c23e 100644 --- a/app-backup/amanda/ChangeLog +++ b/app-backup/amanda/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for app-backup/amanda # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/ChangeLog,v 1.43 2008/09/19 19:34:30 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/ChangeLog,v 1.44 2008/09/23 02:32:25 robbat2 Exp $ + +*amanda-2.6.0_p2-r3 (22 Sep 2008) +*amanda-2.5.2_p1-r5 (22 Sep 2008) + + 22 Sep 2008; Robin H. Johnson <robbat2@gentoo.org> + +files/amanda-2.5.2p1-amcrypt-ossl-asym-race-fix.patch, + +files/amanda-2.6.0p2-amcrypt-ossl-asym-race-fix.patch, + +amanda-2.5.2_p1-r5.ebuild, +amanda-2.6.0_p2-r3.ebuild: + Fixup a nasty race condition in encryption of backups. amaespipe suffers + from the same problem and is not yet fixed. *amanda-2.6.0_p2-r2 (19 Sep 2008) diff --git a/app-backup/amanda/amanda-2.5.2_p1-r5.ebuild b/app-backup/amanda/amanda-2.5.2_p1-r5.ebuild new file mode 100644 index 000000000000..fc3dc972becb --- /dev/null +++ b/app-backup/amanda/amanda-2.5.2_p1-r5.ebuild @@ -0,0 +1,460 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-2.5.2_p1-r5.ebuild,v 1.1 2008/09/23 02:32:25 robbat2 Exp $ + +inherit autotools 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="~amd64 ~ppc ~ppc64 ~sparc ~x86" +RDEPEND="sys-libs/readline + virtual/inetd + sys-apps/gawk + app-arch/tar + dev-lang/perl + app-arch/dump + net-misc/openssh + dev-libs/glib + samba? ( net-fs/samba ) + kerberos? ( app-crypt/mit-krb5 ) + !sparc? ( xfs? ( sys-fs/xfsdump ) ) + !minimal? ( virtual/mailx + app-arch/mt-st + sys-block/mtx + sci-visualization/gnuplot + app-crypt/aespipe + app-crypt/gnupg )" + +DEPEND="${RDEPEND} + sys-devel/autoconf + sys-devel/automake" + +IUSE="berkdb debug gdbm minimal samba xfs kerberos" + +S="${WORKDIR}/${P/_/}" +MYFILESDIR="${WORKDIR}/files" +MYTMPDIR="${WORKDIR}/tmp" +MYINSTTMPDIR="/usr/share/amanda" +ENVDIR="/etc/env.d" +ENVDFILE="97amanda" +TMPENVFILE="${MYTMPDIR}/${ENVDFILE}" +TMPINSTENVFILE="${MYINSTTMPDIR}/tmpenv-${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 AMANDA_MAX_TAPE_BLOCK_KB" + +amanda_variable_setup() { + + # Setting vars + local currentamanda + + # Grab the current settings + currentamanda="$(set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' | 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=-1 + [ -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 + + # Text mode is the only one left. + AMANDA_DBMODE='text' + + # Raise maximum configurable blocksize + [ -z "${AMANDA_MAX_TAPE_BLOCK_KB}" ] && AMANDA_MAX_TAPE_BLOCK_KB=512 + + # 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} | grep -v '^AMANDA_ENV_SETTINGS') + fi + + # Re-apply the new settings if any + [ -n "${currentamanda}" ] && eval `echo "${currentamanda}"` + +} + +pkg_setup() { + # Now add users if needed + [ -n "${AMANDA_DBMODE}" -a "${AMANDA_DBMODE}" != "text" ] && \ + ewarn "Using db or gdbm modes for the database is no longer supported." + 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} + + # Gentoo bug #192296, chg-multi fails + EPATCH_OPTS="-d ${S}" epatch \ + "${FILESDIR}"/${PN}-2.5.2_p1-chg-multi.patch \ + || die "Failed to apply patch to correct typo in chg-multi!" + + # Gentoo bug #212970, --as-needed linking + EPATCH_OPTS="-d ${S}" epatch \ + "${FILESDIR}"/${PN}-2.5.2_p1-fix-asneeded.patch \ + || die "Failed to apply patch to correct bug #212970!" + + # Fix a fun race condition if you use encryption. + # This is one of the reasons you should test your recovery procedures often. + EPATCH_OPTS="-d ${S}" epatch \ + "${FILESDIR}"/${PN}-2.5.2p1-amcrypt-ossl-asym-race-fix.patch \ + || die "Failed to apply race fix for encryption" + + eautomake + + # 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_" | grep -v '^AMANDA_ENV_SETTINGS' > "${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_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`" + + # Client only, as requested in bug #127725 + use minimal && myconf="${myconf} --without-server" + + # Raise maximum configurable blocksize + myconf="${myconf} --with-maxtapeblocksize=${AMANDA_MAX_TAPE_BLOCK_KB}" + + econf ${myconf} || die "econf failed!" + emake -j1 || 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" + emake -j1 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 ${ENV_SETTINGS_AMANDA} ; 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" + local t + t="${MYFILESDIR}"/${ENVDFILE} + echo "# These settings are what was present in the environment when this" >>"${t}" + echo "# Amanda was compiled. Changing anything below this comment will" >>"${t}" + echo "# have no effect on your application, but it merely exists to" >>"${t}" + echo "# preserve them for your next emerge of Amanda" >>"${t}" + cat "${TMPENVFILE}" | sed "s,=\$,='',g" >>"${t}" + + into /usr + + # Deprecated, 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 /usr/share/amanda/* + rm -rf "${D}"/usr/share/amanda + mkdir -p "${D}"/${MYINSTTMPDIR} || die + cp "${TMPENVFILE}" "${D}"/${TMPINSTENVFILE} || die + # our inetd sample + einfo "Installing standard inetd sample" + newdoc "${MYFILESDIR}"/amanda-inetd.amanda.sample-2.5.1_p3-r1 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-2.5.1_p3-r1 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 /var/xfsdump/inventory + + insinto /etc/amanda + einfo "Installing .amandahosts File for ${AMANDA_USER_NAME} user" + + cat "${MYFILESDIR}"/amanda-amandahosts-client-2.5.1_p3-r1 \ + >>"${D}"/etc/amanda/amandahosts + use minimal \ + || cat "${MYFILESDIR}"/amanda-amandahosts-server-2.5.1_p3-r1 \ + >>"${D}"/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 + + einfo "Installing Sample Daily Cron Job for Amanda" + CRONDIR=/etc/cron.daily/ + exeinto ${CRONDIR} + newexe "${MYFILESDIR}"/amanda-cron amanda + # Not executable 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 + + einfo "Setting setuid permissions" + amanda_permissions_fix "${D}" + + # DevFS + einfo "Installing DevFS config file" + insinto /etc/devfs.d + newins "${MYFILESDIR}"/amanda-devfs amanda + + # Env.d + einfo "Installing environment config file" + doenvd "${MYFILESDIR}"/${ENVDFILE} + + # Installing Amanda Xinetd Services Definition + einfo "Installing xinetd service file" + insinto /etc/xinetd.d + newins "${MYFILESDIR}"/amanda-xinetd-2.5.1_p3-r1 amanda + +} + +pkg_postinst() { + local aux="${ROOT}"/${TMPINSTENVFILE} + [ ! -f "${aux}" ] && die "Variable setting file (${aux}) should exist!" + source "${aux}" + rm "${aux}" + rmdir "${ROOT}"/${MYINSTTMPDIR} 2>/dev/null # ignore error + + 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 + + # If USE=minimal, give out a warning, if AMANDA_SERVER is not set to + # another host than HOSTNAME. + if use minimal; then + if [[ "${AMANDA_SERVER}" = "${HOSTNAME}" ]]; then + echo + ewarn "You are installing a client-only version of Amanda." + ewarn "You should set the variable $AMANDA_SERVER to point at your" + ewarn "Amanda-tape-server, otherwise you will have to specify its name" + ewarn "when using amrecover on the client." + ewarn "For example: Use something like" + ewarn "AMANDA_SERVER=\"myserver\" emerge amanda" + echo + fi + fi + + einfo "Checking setuid permissions" + amanda_permissions_fix "${ROOT}" + + 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/${P}/inetd.amanda.sample" + elog "as an example of how to configure your inetd." + elog + elog "NOTICE: If you need raw access to partitions you need to add the" + elog "amanda user to the 'disk' group and uncomment following lines in" + elog "your /etc/devfs.d/amanda:" + elog "SCSI:" + elog "REGISTER ^scsi/host.*/bus.*/target.*/lun.*/part[0-9] PERMISSIONS root.disk 660" + elog "IDE:" + elog "REGISTER ^ide/host.*/bus.*/target.*/lun.*/part[0-9] PERMISSIONS root.disk 660" + elog + elog "NOTICE: If you have a tape changer, also uncomment the following" + elog "REGISTER ^scsi/host.*/bus.*/target.*/lun.*/generic PERMISSIONS root.disk 660" + 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." +} + +# We have had reports of amanda file permissions getting screwed up. +# Losing setuid, becoming too lax etc. +# ONLY root and users in the amanda group should be able to run these binaries! +amanda_permissions_fix() { + local root="$1" + [ -z "${root}" ] && die "Failed to pass root argument to amanda_permissions_fix!" + for i in /usr/sbin/amcheck /usr/libexec/calcsize /usr/libexec/killpgrp \ + /usr/libexec/rundump /usr/libexec/runtar /usr/libexec/dumper \ + /usr/libexec/planner ; do + chown root:${AMANDA_GROUP_NAME} "${root}"/${i} + chmod u=srwx,g=rx,o= "${root}"/${i} + done +} diff --git a/app-backup/amanda/amanda-2.6.0_p2-r3.ebuild b/app-backup/amanda/amanda-2.6.0_p2-r3.ebuild new file mode 100644 index 000000000000..84eea04b1894 --- /dev/null +++ b/app-backup/amanda/amanda-2.6.0_p2-r3.ebuild @@ -0,0 +1,493 @@ +# Copyright 1999-2008 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-r3.ebuild,v 1.1 2008/09/23 02:32:25 robbat2 Exp $ + +inherit autotools 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="~amd64 ~ppc ~ppc64 ~sparc ~x86" +RDEPEND="sys-libs/readline + virtual/inetd + sys-apps/gawk + app-arch/tar + dev-lang/perl + app-arch/dump + net-misc/openssh + dev-libs/glib + s3? ( net-misc/curl ) + samba? ( net-fs/samba ) + kerberos? ( app-crypt/mit-krb5 ) + !sparc? ( xfs? ( sys-fs/xfsdump ) ) + !minimal? ( virtual/mailx + app-arch/mt-st + sys-block/mtx + sci-visualization/gnuplot + app-crypt/aespipe + app-crypt/gnupg )" + +DEPEND="${RDEPEND} + sys-devel/autoconf + sys-devel/automake" + +IUSE="berkdb debug gdbm minimal s3 samba xfs kerberos" + +S="${WORKDIR}/${P/_/}" +MYFILESDIR="${WORKDIR}/files" +MYTMPDIR="${WORKDIR}/tmp" +MYINSTTMPDIR="/usr/share/amanda" +ENVDIR="/etc/env.d" +ENVDFILE="97amanda" +TMPENVFILE="${MYTMPDIR}/${ENVDFILE}" +TMPINSTENVFILE="${MYINSTTMPDIR}/tmpenv-${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 AMANDA_MAX_TAPE_BLOCK_KB" + +amanda_variable_setup() { + + # Setting vars + local currentamanda + + # Grab the current settings + currentamanda="$(set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' | 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=-1 + [ -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 + + # Text mode is the only one left. + AMANDA_DBMODE='text' + + # Raise maximum configurable blocksize + [ -z "${AMANDA_MAX_TAPE_BLOCK_KB}" ] && AMANDA_MAX_TAPE_BLOCK_KB=512 + + # 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} | grep -v '^AMANDA_ENV_SETTINGS') + fi + + # Re-apply the new settings if any + [ -n "${currentamanda}" ] && eval `echo "${currentamanda}"` + +} + +pkg_setup() { + # Now add users if needed + [ -n "${AMANDA_DBMODE}" -a "${AMANDA_DBMODE}" != "text" ] && \ + ewarn "Using db or gdbm modes for the database is no longer supported." + 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} + + # Gentoo bug #192296, chg-multi fails + #EPATCH_OPTS="-d ${S}" epatch \ + # "${FILESDIR}"/${PN}-2.5.2_p1-chg-multi.patch \ + # || die "Failed to apply patch to correct typo in chg-multi!" + + # Gentoo bug #212970, --as-needed linking + #EPATCH_OPTS="-d ${S}" epatch \ + # "${FILESDIR}"/${PN}-2.5.2_p1-fix-asneeded.patch \ + # || die "Failed to apply patch to correct bug #212970!" + + # Fix a fun race condition if you use encryption. + # This is one of the reasons you should test your recovery procedures often. + EPATCH_OPTS="-d ${S} -p1" epatch \ + "${FILESDIR}"/${PN}-2.6.0p2-amcrypt-ossl-asym-race-fix.patch \ + || die "Failed to apply race fix for encryption" + + cd "${S}" + epatch "${FILESDIR}"/s3-list-keys.diff + cd "${S}"/device-src + epatch "${FILESDIR}"/s3.c.part2.diff + + cd "${S}" + #sed -i 's,amanda_working_ipv6,amanda_cv_working_ipv6,g' \ + # "${S}"/configure.in || die "failed to sed" + # rm -f "${S}"/acinclude.m4 + eautomake + + # 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_" | grep -v '^AMANDA_ENV_SETTINGS' > "${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_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`" + myconf="${myconf} `use_enable s3 devpay`" + + # Client only, as requested in bug #127725 + use minimal && myconf="${myconf} --without-server" + + # Raise maximum configurable blocksize + myconf="${myconf} --with-maxtapeblocksize=${AMANDA_MAX_TAPE_BLOCK_KB}" + + econf ${myconf} || die "econf failed!" + emake -j1 || 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" + emake -j1 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 ${ENV_SETTINGS_AMANDA} ; 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" + local t + t="${MYFILESDIR}"/${ENVDFILE} + echo "# These settings are what was present in the environment when this" >>"${t}" + echo "# Amanda was compiled. Changing anything below this comment will" >>"${t}" + echo "# have no effect on your application, but it merely exists to" >>"${t}" + echo "# preserve them for your next emerge of Amanda" >>"${t}" + cat "${TMPENVFILE}" | sed "s,=\$,='',g" >>"${t}" + + into /usr + + # Deprecated, 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 /usr/share/amanda/* + rm -rf "${D}"/usr/share/amanda + mkdir -p "${D}"/${MYINSTTMPDIR} || die + cp "${TMPENVFILE}" "${D}"/${TMPINSTENVFILE} || die + # our inetd sample + einfo "Installing standard inetd sample" + newdoc "${MYFILESDIR}"/amanda-inetd.amanda.sample-2.6.0_p2-r2 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-2.5.1_p3-r1 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 /var/xfsdump/inventory + + insinto /etc/amanda + einfo "Installing .amandahosts File for ${AMANDA_USER_NAME} user" + + cat "${MYFILESDIR}"/amanda-amandahosts-client-2.5.1_p3-r1 \ + >>"${D}"/etc/amanda/amandahosts + use minimal \ + || cat "${MYFILESDIR}"/amanda-amandahosts-server-2.5.1_p3-r1 \ + >>"${D}"/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 + + einfo "Installing Sample Daily Cron Job for Amanda" + CRONDIR=/etc/cron.daily/ + exeinto ${CRONDIR} + newexe "${MYFILESDIR}"/amanda-cron amanda + # Not executable 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 + + einfo "Setting setuid permissions" + amanda_permissions_fix "${D}" + + # DevFS + einfo "Installing DevFS config file" + insinto /etc/devfs.d + newins "${MYFILESDIR}"/amanda-devfs amanda + + # Env.d + einfo "Installing environment config file" + doenvd "${MYFILESDIR}"/${ENVDFILE} + + # Installing Amanda Xinetd Services Definition + einfo "Installing xinetd service file" + insinto /etc/xinetd.d + newins "${MYFILESDIR}"/amanda-xinetd-2.6.0_p2-r2 amanda + +} + +do_initial() { + path="$1" + shift + for i in $* ; do + einfo "Creating inital Amanda file (${i}) in $path" + touch "${ROOT}"/${path}/${i} + chown ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} "${ROOT}"/${path}/${i} + chmod 600 "${ROOT}"/${path}/${i} + done +} + +pkg_postinst() { + local aux="${ROOT}"/${TMPINSTENVFILE} + [ ! -f "${aux}" ] && die "Variable setting file (${aux}) should exist!" + source "${aux}" + rm "${aux}" + rmdir "${ROOT}"/${MYINSTTMPDIR} 2>/dev/null # ignore error + + # Migration of amandates from /etc to $localstatedir/amanda + if [ -f "${ROOT}/etc/amandates" -a \ + ! -f "${ROOT}/${AMANDA_USER_HOMEDIR}/amandates" ]; then + einfo "Migrating amandates from /etc/ to ${AMANDA_USER_HOMEDIR}" + einfo "A backup is also placed at /etc/amandates.orig" + cp -f "${ROOT}/etc/amandates" "${ROOT}/etc/amandates.orig" + cp -f "${ROOT}/etc/amandates" "${ROOT}/${AMANDA_USER_HOMEDIR}/amandates" + fi + if [ -f "${ROOT}/etc/amandates" ]; then + einfo "If you have migrated safely, please delete /etc/amandates" + fi + # Do setups + do_initial /etc dumpdates + do_initial "${AMANDA_USER_HOMEDIR}" amandates + + # If USE=minimal, give out a warning, if AMANDA_SERVER is not set to + # another host than HOSTNAME. + if use minimal; then + if [[ "${AMANDA_SERVER}" = "${HOSTNAME}" ]]; then + echo + ewarn "You are installing a client-only version of Amanda." + ewarn "You should set the variable $AMANDA_SERVER to point at your" + ewarn "Amanda-tape-server, otherwise you will have to specify its name" + ewarn "when using amrecover on the client." + ewarn "For example: Use something like" + ewarn "AMANDA_SERVER=\"myserver\" emerge amanda" + echo + fi + fi + + einfo "Checking setuid permissions" + amanda_permissions_fix "${ROOT}" + + 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/${P}/inetd.amanda.sample" + elog "as an example of how to configure your inetd." + elog + elog "NOTICE: If you need raw access to partitions you need to add the" + elog "amanda user to the 'disk' group and uncomment following lines in" + elog "your /etc/devfs.d/amanda:" + elog "SCSI:" + elog "REGISTER ^scsi/host.*/bus.*/target.*/lun.*/part[0-9] PERMISSIONS root.disk 660" + elog "IDE:" + elog "REGISTER ^ide/host.*/bus.*/target.*/lun.*/part[0-9] PERMISSIONS root.disk 660" + elog + elog "NOTICE: If you have a tape changer, also uncomment the following" + elog "REGISTER ^scsi/host.*/bus.*/target.*/lun.*/generic PERMISSIONS root.disk 660" + 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." +} + +# We have had reports of amanda file permissions getting screwed up. +# Losing setuid, becoming too lax etc. +# ONLY root and users in the amanda group should be able to run these binaries! +amanda_permissions_fix() { + local root="$1" + [ -z "${root}" ] && die "Failed to pass root argument to amanda_permissions_fix!" + local le="/usr/libexec/amanda" + for i in /usr/sbin/amcheck "${le}"/calcsize "${le}"/killpgrp \ + "${le}"/rundump "${le}"/runtar "${le}"/dumper \ + "${le}"/planner ; do + chown root:${AMANDA_GROUP_NAME} "${root}"/${i} + chmod u=srwx,g=rx,o= "${root}"/${i} + done +} 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 new file mode 100644 index 000000000000..316aa94c13e1 --- /dev/null +++ b/app-backup/amanda/files/amanda-2.5.2p1-amcrypt-ossl-asym-race-fix.patch @@ -0,0 +1,74 @@ +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 status=noxfer ++ 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 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 new file mode 100644 index 000000000000..54db5e0d81ec --- /dev/null +++ b/app-backup/amanda/files/amanda-2.6.0p2-amcrypt-ossl-asym-race-fix.patch @@ -0,0 +1,75 @@ +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 status=noxfer ++ 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 |