[gentoo-commits] repo/gentoo:master commit in: app-backup/amanda/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: app-backup/amanda/
@ 2021-01-20  9:30 Sam James
  0 siblings, 0 replies; 26+ messages in thread
From: Sam James @ 2021-01-20  9:30 UTC (permalink / raw
  To: gentoo-commits

commit:     cbb9c4a460543540d369a37176dc797f378583e1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 20 09:30:37 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jan 20 09:30:37 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbb9c4a4

app-backup/amanda: Stabilize 3.5.1-r3 ppc, #756883

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-backup/amanda/amanda-3.5.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-backup/amanda/amanda-3.5.1-r3.ebuild b/app-backup/amanda/amanda-3.5.1-r3.ebuild
index 0e3b1c80f98..071fccdd890 100644
--- a/app-backup/amanda/amanda-3.5.1-r3.ebuild
+++ b/app-backup/amanda/amanda-3.5.1-r3.ebuild
@@ -13,7 +13,7 @@ LICENSE="HPND BSD BSD-2 GPL-2+ GPL-3+"
 SLOT="0"
 IUSE="curl gnuplot ipv6 kerberos minimal ndmp nls readline s3 samba systemd xfs"
 
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~amd64 ppc ~ppc64 ~sparc x86"
 DEPEND="
 	acct-group/amanda
 	acct-user/amanda


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/amanda/
@ 2022-05-15  1:00 Sam James
  0 siblings, 0 replies; 26+ messages in thread
From: Sam James @ 2022-05-15  1:00 UTC (permalink / raw
  To: gentoo-commits

commit:     d4bc6cc2413b2a28a5984e1f151278ec4f3d1ff1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May  7 06:50:28 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun May 15 01:00:05 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4bc6cc2

app-backup/amanda: egrep -> grep -E

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-backup/amanda/amanda-3.5.1-r3.ebuild | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app-backup/amanda/amanda-3.5.1-r3.ebuild b/app-backup/amanda/amanda-3.5.1-r3.ebuild
index 9498a6165145..f838aa934335 100644
--- a/app-backup/amanda/amanda-3.5.1-r3.ebuild
+++ b/app-backup/amanda/amanda-3.5.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -77,7 +77,7 @@ amanda_variable_setup() {
 	local currentamanda
 
 	# Grab the current settings
-	currentamanda="$(set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' | xargs)"
+	currentamanda="$(set | grep -E "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' | xargs)"
 
 	# First we set the defaults
 	AMANDA_GROUP_NAME=amanda
@@ -106,7 +106,7 @@ amanda_variable_setup() {
 	# Now pull in the old stuff
 	if [[ -f ${EROOT}${ENVDIR}/${ENVDFILE} ]]; then
 		# We don't just source it as we don't want everything in there.
-		eval $(egrep "^AMANDA_" "${EROOT}${ENVDIR}/${ENVDFILE}" | grep -v '^AMANDA_ENV_SETTINGS')
+		eval $(grep -E "^AMANDA_" "${EROOT}${ENVDIR}/${ENVDFILE}" | grep -v '^AMANDA_ENV_SETTINGS')
 	fi
 
 	# Re-apply the new settings if any
@@ -152,7 +152,7 @@ src_prepare() {
 	# places for us to work in
 	mkdir -p "${MYFILESDIR}" || die
 	# Now we store the settings we just created
-	set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' > "${TMPENVFILE}" || die
+	set | grep -E "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' > "${TMPENVFILE}" || die
 
 	# Prepare our custom files
 	einfo "Building custom configuration files"


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/amanda/
@ 2021-01-24 13:33 Sam James
  0 siblings, 0 replies; 26+ messages in thread
From: Sam James @ 2021-01-24 13:33 UTC (permalink / raw
  To: gentoo-commits

commit:     e95651f8575de281ebcb158dec2bb567d70d3a15
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 24 13:33:04 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 24 13:33:04 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e95651f8

app-backup/amanda: Stabilize 3.5.1-r3 ppc64, #756883

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-backup/amanda/amanda-3.5.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-backup/amanda/amanda-3.5.1-r3.ebuild b/app-backup/amanda/amanda-3.5.1-r3.ebuild
index 0b672997bcd..9498a616514 100644
--- a/app-backup/amanda/amanda-3.5.1-r3.ebuild
+++ b/app-backup/amanda/amanda-3.5.1-r3.ebuild
@@ -13,7 +13,7 @@ LICENSE="HPND BSD BSD-2 GPL-2+ GPL-3+"
 SLOT="0"
 IUSE="curl gnuplot ipv6 kerberos minimal ndmp nls readline s3 samba systemd xfs"
 
-KEYWORDS="amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
 DEPEND="
 	acct-group/amanda
 	acct-user/amanda


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/amanda/
@ 2021-01-21  7:40 Agostino Sarubbo
  0 siblings, 0 replies; 26+ messages in thread
From: Agostino Sarubbo @ 2021-01-21  7:40 UTC (permalink / raw
  To: gentoo-commits

commit:     d071247a6e734407ba6df5f8b0ae4535d3a7aaf8
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 21 07:39:40 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Jan 21 07:39:40 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d071247a

app-backup/amanda: amd64 stable wrt bug #756883

Package-Manager: Portage-3.0.9, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 app-backup/amanda/amanda-3.5.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-backup/amanda/amanda-3.5.1-r3.ebuild b/app-backup/amanda/amanda-3.5.1-r3.ebuild
index 071fccdd890..fe0544d2393 100644
--- a/app-backup/amanda/amanda-3.5.1-r3.ebuild
+++ b/app-backup/amanda/amanda-3.5.1-r3.ebuild
@@ -13,7 +13,7 @@ LICENSE="HPND BSD BSD-2 GPL-2+ GPL-3+"
 SLOT="0"
 IUSE="curl gnuplot ipv6 kerberos minimal ndmp nls readline s3 samba systemd xfs"
 
-KEYWORDS="~amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ppc ~ppc64 ~sparc x86"
 DEPEND="
 	acct-group/amanda
 	acct-user/amanda


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/amanda/
@ 2021-01-20  9:29 Sam James
  0 siblings, 0 replies; 26+ messages in thread
From: Sam James @ 2021-01-20  9:29 UTC (permalink / raw
  To: gentoo-commits

commit:     e272c0fc407adb042d0da77548637890ab5a2990
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 20 09:28:54 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jan 20 09:28:54 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e272c0fc

app-backup/amanda: Stabilize 3.5.1-r3 x86, #756883

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-backup/amanda/amanda-3.5.1-r3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-backup/amanda/amanda-3.5.1-r3.ebuild b/app-backup/amanda/amanda-3.5.1-r3.ebuild
index 81acd43577d..0e3b1c80f98 100644
--- a/app-backup/amanda/amanda-3.5.1-r3.ebuild
+++ b/app-backup/amanda/amanda-3.5.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ LICENSE="HPND BSD BSD-2 GPL-2+ GPL-3+"
 SLOT="0"
 IUSE="curl gnuplot ipv6 kerberos minimal ndmp nls readline s3 samba systemd xfs"
 
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc x86"
 DEPEND="
 	acct-group/amanda
 	acct-user/amanda


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/amanda/
@ 2020-12-30 10:26 David Seifert
  0 siblings, 0 replies; 26+ messages in thread
From: David Seifert @ 2020-12-30 10:26 UTC (permalink / raw
  To: gentoo-commits

commit:     32620cc5b62c287abc06cc551f564f37a7f9942e
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 30 10:26:01 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Dec 30 10:26:01 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32620cc5

app-backup/amanda: Clean up ebuild

Closes: https://github.com/gentoo/gentoo/pull/18872
Closes: https://bugs.gentoo.org/762448
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 ...anda-3.5.1-r2.ebuild => amanda-3.5.1-r3.ebuild} | 240 ++++++++++-----------
 1 file changed, 116 insertions(+), 124 deletions(-)

diff --git a/app-backup/amanda/amanda-3.5.1-r2.ebuild b/app-backup/amanda/amanda-3.5.1-r3.ebuild
similarity index 70%
rename from app-backup/amanda/amanda-3.5.1-r2.ebuild
rename to app-backup/amanda/amanda-3.5.1-r3.ebuild
index 98bcf0c20ae..81acd43577d 100644
--- a/app-backup/amanda/amanda-3.5.1-r2.ebuild
+++ b/app-backup/amanda/amanda-3.5.1-r3.ebuild
@@ -72,7 +72,6 @@ AMANDA_PORTS_UDP AMANDA_PORTS_TCP AMANDA_PORTS_BOTH AMANDA_PORTS
 AMANDA_CONFIG_NAME AMANDA_TMPDIR"
 
 amanda_variable_setup() {
-
 	# Setting vars
 	local currentamanda
 
@@ -86,32 +85,31 @@ amanda_variable_setup() {
 
 	# 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_TAPE_DEVICE}" ]] && AMANDA_SERVER_TAPE_DEVICE="/dev/nst0"
-	[[ -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"
+	: ${AMANDA_SERVER:=${HOSTNAME}}
+	: ${AMANDA_SERVER_TAPE:=${AMANDA_SERVER}}
+	: ${AMANDA_SERVER_TAPE_DEVICE:="${EPREFIX}"/dev/nst0}
+	: ${AMANDA_SERVER_INDEX:=${AMANDA_SERVER}}
+	: ${AMANDA_TAR_LISTDIR:=${AMANDA_USER_HOMEDIR}/tar-lists}
+	: ${AMANDA_CONFIG_NAME:=DailySet1}
+	: ${AMANDA_TMPDIR:="${EPREFIX}"/var/tmp/amanda}
+	: ${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=
+	: ${AMANDA_PORTS_UDP:=""}
+	: ${AMANDA_PORTS_TCP:=""}
+	: ${AMANDA_PORTS_BOTH:=""}
+	: ${AMANDA_PORTS:=""}
 
 	# What tar to use
-	[[ -z "${AMANDA_TAR}" ]] && AMANDA_TAR=/bin/tar
+	: ${AMANDA_TAR:=/bin/tar}
 
 	# Now pull in the old stuff
-	if [[ -f "${EROOT}${ENVDIR}/${ENVDFILE}" ]]; then
+	if [[ -f ${EROOT}${ENVDIR}/${ENVDFILE} ]]; then
 		# We don't just source it as we don't want everything in there.
 		eval $(egrep "^AMANDA_" "${EROOT}${ENVDIR}/${ENVDFILE}" | grep -v '^AMANDA_ENV_SETTINGS')
 	fi
 
 	# Re-apply the new settings if any
-	[ -n "${currentamanda}" ] && eval $(echo "${currentamanda}")
-
+	[[ -n ${currentamanda} ]] && eval $(echo "${currentamanda}")
 }
 
 pkg_setup() {
@@ -119,7 +117,7 @@ pkg_setup() {
 
 	# 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
+	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"
@@ -132,7 +130,7 @@ pkg_setup() {
 
 src_unpack() {
 	# we do not want the perl src_unpack
-	default_src_unpack
+	default
 }
 
 src_prepare() {
@@ -159,14 +157,14 @@ src_prepare() {
 	local i # our iterator
 	local sedexpr # var for sed expr
 	sedexpr=''
-	for i in ${ENV_SETTINGS_AMANDA} ; do
+	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
+	for i in "${FILESDIR}"/amanda-*; do
 		sed -re "${sedexpr}" <"${i}" >"${MYFILESDIR}/`basename ${i}`" || die
 	done
 
@@ -188,126 +186,155 @@ src_configure() {
 	addpredict /run/blkid
 	addpredict /etc/blkid.tab
 
-	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
+	[[ ! -f ${TMPENVFILE} ]] && die "Variable setting file (${TMPENVFILE}) should exist!"
 	source "${TMPENVFILE}"
-	local myconf
+	local myconf=()
 
 	einfo "Using ${AMANDA_SERVER_TAPE} for tape server."
-	myconf="${myconf} --with-tape-server=${AMANDA_SERVER_TAPE}"
+	myconf+=( --with-tape-server="${AMANDA_SERVER_TAPE}" )
 	einfo "Using ${AMANDA_SERVER_TAPE_DEVICE} for tape server."
-	myconf="${myconf} --with-tape-device=${AMANDA_SERVER_TAPE_DEVICE}"
+	myconf+=( --with-tape-device="${AMANDA_SERVER_TAPE_DEVICE}" )
 	einfo "Using ${AMANDA_SERVER_INDEX} for index server."
-	myconf="${myconf} --with-index-server=${AMANDA_SERVER_INDEX}"
+	myconf+=( --with-index-server="${AMANDA_SERVER_INDEX}" )
 	einfo "Using ${AMANDA_USER_NAME} for amanda user."
-	myconf="${myconf} --with-user=${AMANDA_USER_NAME}"
+	myconf+=( --with-user="${AMANDA_USER_NAME}" )
 	einfo "Using ${AMANDA_GROUP_NAME} for amanda group."
-	myconf="${myconf} --with-group=${AMANDA_GROUP_NAME}"
+	myconf+=( --with-group="${AMANDA_GROUP_NAME}" )
 	einfo "Using ${AMANDA_TAR} as Tar implementation."
-	myconf="${myconf} --with-gnutar=${AMANDA_TAR}"
+	myconf+=( --with-gnutar="${AMANDA_TAR}" )
 	einfo "Using ${AMANDA_TAR_LISTDIR} as tar listdir."
-	myconf="${myconf} --with-gnutar-listdir=${AMANDA_TAR_LISTDIR}"
+	myconf+=( --with-gnutar-listdir="${AMANDA_TAR_LISTDIR}" )
 	einfo "Using ${AMANDA_CONFIG_NAME} as default config name."
-	myconf="${myconf} --with-config=${AMANDA_CONFIG_NAME}"
+	myconf+=( --with-config="${AMANDA_CONFIG_NAME}" )
 	einfo "Using ${AMANDA_TMPDIR} as Amanda temporary directory."
-	myconf="${myconf} --with-tmpdir=${AMANDA_TMPDIR}"
+	myconf+=( --with-tmpdir="${AMANDA_TMPDIR}" )
 
-	if [ -n "${AMANDA_PORTS_UDP}" ] && [ -n "${AMANDA_PORTS_TCP}" ] && [ -z "${AMANDA_PORTS_BOTH}" ] ; then
+	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
+	if [[ -n ${AMANDA_PORTS_UDP} ]]; then
 		einfo "Using UDP ports ${AMANDA_PORTS_UDP/,/-}"
-		myconf="${myconf} --with-udpportrange=${AMANDA_PORTS_UDP}"
+		myconf+=( --with-udpportrange="${AMANDA_PORTS_UDP}" )
 	fi
-	if [ -n "${AMANDA_PORTS_TCP}" ]; then
+	if [[ -n ${AMANDA_PORTS_TCP} ]]; then
 		einfo "Using TCP ports ${AMANDA_PORTS_TCP/,/-}"
-		myconf="${myconf} --with-tcpportrange=${AMANDA_PORTS_TCP}"
+		myconf+=( --with-tcpportrange="${AMANDA_PORTS_TCP}" )
 	fi
-	if [ -n "${AMANDA_PORTS}" ]; then
+	if [[ -n ${AMANDA_PORTS} ]]; then
 		einfo "Using ports ${AMANDA_PORTS/,/-}"
-		myconf="${myconf} --with-portrange=${AMANDA_PORTS}"
+		myconf+=( --with-portrange="${AMANDA_PORTS}" )
 	fi
 
 	# Extras
 	# Speed option
-	myconf="${myconf} --with-buffered-dump"
+	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"
+	myconf+=( --with-debugging )
 	# Where to put our files
-	myconf="${myconf} --localstatedir=${AMANDA_USER_HOMEDIR}"
+	myconf+=( --localstatedir="${AMANDA_USER_HOMEDIR}" )
 
 	# Samba support
-	myconf="${myconf} $(use_with samba smbclient /usr/bin/smbclient)"
+	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"
+	myconf+=( --with-bsd-security )
+	myconf+=( --with-ssh-security )
+	myconf+=( --with-bsdudp-security )
+	myconf+=( --with-bsdtcp-security )
 
 	# kerberos-security mechanism version 5
-	myconf="${myconf} $(use_with kerberos krb5-security)"
+	myconf+=( $(use_with kerberos krb5-security) )
 
 	# Amazon S3 support
-	myconf="${myconf} `use_enable s3 s3-device`"
+	myconf+=( $(use_enable s3 s3-device) )
 
 	# libcurl is required for S3 but otherwise optional
 	if ! use s3; then
-		myconf="${myconf} $(use_with curl libcurl)"
+		myconf+=( $(use_with curl libcurl) )
 	fi
 
 	# Client only, as requested in bug #127725
-	if use minimal ; then
-		myconf="${myconf} --without-server"
+	if use minimal; then
+		myconf+=( --without-server )
 	else
 		# amplot
-		myconf="${myconf} $(use_with gnuplot)"
+		myconf+=( $(use_with gnuplot) )
 	fi
 
 	# IPv6 fun.
-	myconf="${myconf} `use_with ipv6`"
+	myconf+=( $(use_with ipv6) )
 	# This is to prevent the IPv6-is-working test
 	# As the test fails on binpkg build hosts with no IPv6.
 	use ipv6 && export amanda_cv_working_ipv6=yes
 
 	# I18N
-	myconf="${myconf} `use_enable nls`"
+	myconf+=( $(use_enable nls) )
 
 	# Bug #296634: Perl location
 	perl_set_version
-	myconf="${myconf} --with-amperldir=${VENDOR_LIB}"
+	myconf+=( --with-amperldir="${VENDOR_LIB}" )
 
 	# Bug 296633: --disable-syntax-checks
 	# Some tests are not safe for production systems
-	myconf="${myconf} --disable-syntax-checks"
+	myconf+=( --disable-syntax-checks )
 
 	# build manpages
-	myconf="${myconf} --enable-manpage-build"
+	myconf+=( --enable-manpage-build )
 
 	# Bug #636262
-	myconf="${myconf} $(use_with ndmp ndmp)"
+	myconf+=( $(use_with ndmp ndmp) )
 
 	# bug #483120
 	tc-export AR
 
 	econf \
+		--disable-static \
 		$(use_with readline) \
-		${myconf}
+		"${myconf[@]}"
 }
 
 src_compile() {
 	# Again, do not want the perl-module src_compile
-	default_src_compile
+	default
+}
+
+# We do not want the perl-module tests.
+src_test() {
+	default
+}
+
+# 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 i le=/usr/libexec/amanda
+	for i in "${le}"/calcsize "${le}"/killpgrp "${le}"/rundump "${le}"/runtar; do
+		[[ -e ${root}/${i} ]] || continue
+		chown root:${AMANDA_GROUP_NAME} "${root}"/${i} || die
+		chmod u=srwx,g=rx,o= "${root}"/${i} || die
+	done
+
+	# amanda-security.conf is a config file with similar requirements:
+	# writable only by root
+	# world-readable
+	# 3.3.9: introduced in /etc/amanda-security.conf
+	# 3.4.2: moved to /etc/amanda/amanda-security.conf
+	f=/etc/amanda/amanda-security.conf
+	chown root:root "${root}""${f}" || die
+	chmod u=rw,go=r "${root}""${f}" || die
 }
 
 src_install() {
-	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
+	[[ ! -f ${TMPENVFILE} ]] && die "Variable setting file (${TMPENVFILE}) should exist!"
 	source ${TMPENVFILE}
 
 	einfo "Doing stock install"
@@ -315,18 +342,14 @@ src_install() {
 
 	# 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}"
-
-	# Env.d
 	einfo "Installing environment config file"
-	doenvd "${MYFILESDIR}/${ENVDFILE}"
+	newenvd - "${ENVDFILE}" <<- _EOF_
+		# These settings are what was present in the environment when this
+		# Amanda was compiled.  Changing anything below this comment will
+		# have no effect on your application, but it merely exists to
+		# preserve them for your next emerge of Amanda
+		$(cat "${TMPENVFILE}" | sed "s,=\$,='',g")
+	_EOF_
 
 	einfo "Installing systemd service and socket files for Amanda"
 	systemd_dounit "${FILESDIR}"/amanda.socket
@@ -337,7 +360,7 @@ src_install() {
 	# Installing Amanda Xinetd Services Definition
 	einfo "Installing xinetd service file"
 	insinto /etc/xinetd.d
-	if use minimal ; then
+	if use minimal; then
 		newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-client amanda
 	else
 		newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-server amanda
@@ -360,11 +383,11 @@ src_install() {
 	newins "${MYFILESDIR}"/amanda-profile .profile
 
 	insinto /etc/amanda
-	doins "${S}/example/amanda-client.conf"
-	if ! use minimal ; then
+	doins example/amanda-client.conf
+	if ! use minimal; then
 		insinto "/etc/amanda/${AMANDA_CONFIG_NAME}"
-		doins "${S}/example/amanda.conf"
-		doins "${S}/example/disklist"
+		doins example/amanda.conf
+		doins example/disklist
 		keepdir "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}/index"
 	fi
 
@@ -386,14 +409,14 @@ src_install() {
 		"${AMANDA_USER_HOMEDIR}/amanda" \
 		/etc/amanda
 
-	if ! use minimal ; then
+	if ! use minimal; then
 		fperms 0700 \
 			 "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}" \
 			 /etc/amanda/${AMANDA_CONFIG_NAME}
 	fi
 
 	einfo "Setting setuid permissions"
-	amanda_permissions_fix "${D}"
+	amanda_permissions_fix "${ED}"
 
 	# Relax permissions again
 	insopts -m0644
@@ -403,11 +426,11 @@ src_install() {
 	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
+	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} || die
-	mv "${D}/usr/share/amanda/example" "${D}/usr/share/doc/${PF}/" || die
+	rm "${ED}"/usr/share/amanda/{COPYRIGHT,ChangeLog,NEWS,ReleaseNotes} || die
+	mv "${ED}"/usr/share/amanda/example "${ED}"/usr/share/doc/${PF}/ || die
 	docinto example1
 	newdoc "${FILESDIR}"/example_amanda.conf amanda.conf
 	newdoc "${FILESDIR}"/example_disklist-2.5.1_p3-r1 disklist
@@ -415,30 +438,29 @@ src_install() {
 
 	einfo "Cleaning up dud .la files"
 	perl_set_version
-	find "${D}"/"${VENDOR_LIB}" -name '*.la' -delete || die
+
+	find "${ED}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
-	[ ! -f "${TMPENVFILE}" -a "$MERGE_TYPE" == "binary" ] && \
-		TMPENVFILE="${ROOT}${ENVDIR}/${ENVDFILE}"
-	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
+	[[ ! -f ${TMPENVFILE} && ${MERGE_TYPE} == "binary" ]] && TMPENVFILE="${EROOT}${ENVDIR}/${ENVDFILE}"
+	[[ ! -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
+	if [[ -f ${EROOT}/etc/amandates && ! -f ${EROOT}/${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" || die
-		mkdir -p "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/" || die
-		cp -dp "${ROOT}/etc/amandates" "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates" || die
+		cp -dp "${EROOT}"/etc/amandates "${EROOT}"/etc/amandates.orig || die
+		mkdir -p "${EROOT}/${AMANDA_USER_HOMEDIR}/amanda/" || die
+		cp -dp "${EROOT}"/etc/amandates "${EROOT}"/${AMANDA_USER_HOMEDIR}/amanda/amandates || die
 	fi
-	if [ -f "${ROOT}/etc/amandates" ]; then
+	if [[ -f ${EROOT}/etc/amandates ]]; then
 		einfo "If you have migrated safely, please delete /etc/amandates"
 	fi
 
 	einfo "Checking setuid permissions"
-	amanda_permissions_fix "${ROOT}"
+	amanda_permissions_fix "${EROOT}"/
 
 	elog "You should configure Amanda in /etc/amanda now."
 	elog
@@ -466,33 +488,3 @@ pkg_postinst() {
 	elog "virtual/inetd, as it supports modes where an inetd is not needed"
 	elog "(see bug #506028 for details)."
 }
-
-# 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"
-	local i
-	for i in "${le}"/calcsize "${le}"/killpgrp \
-		"${le}"/rundump "${le}"/runtar ; do
-		[ -e "${root}"/${i} ] || continue
-		chown root:${AMANDA_GROUP_NAME} "${root}"/${i} || die
-		chmod u=srwx,g=rx,o= "${root}"/${i} || die
-	done
-
-	# amanda-security.conf is a config file with similar requirements:
-	# writable only by root
-	# world-readable
-	# 3.3.9: introduced in /etc/amanda-security.conf
-	# 3.4.2: moved to /etc/amanda/amanda-security.conf
-	f=/etc/amanda/amanda-security.conf
-	chown root:root "${root}""${f}" || die
-	chmod u=rw,go=r "${root}""${f}" || die
-}
-
-# We do not want the perl-module tests.
-src_test() {
-	default_src_test
-}


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/amanda/
@ 2020-01-01  0:06 Erik Mackdanz
  0 siblings, 0 replies; 26+ messages in thread
From: Erik Mackdanz @ 2020-01-01  0:06 UTC (permalink / raw
  To: gentoo-commits

commit:     5631afa49b6eb89ab275f7bea84fc45a69d9749a
Author:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  1 00:06:22 2020 +0000
Commit:     Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Wed Jan  1 00:06:22 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5631afa4

app-backup/amanda: Disable sandbox-violating configure test

Closes: https://bugs.gentoo.org/701416
Signed-off-by: Erik Mackdanz <stasibear <AT> gentoo.org>
Package-Manager: Portage-2.3.84, Repoman-2.3.20

 app-backup/amanda/amanda-3.5.1-r1.ebuild | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app-backup/amanda/amanda-3.5.1-r1.ebuild b/app-backup/amanda/amanda-3.5.1-r1.ebuild
index 997834b00aa..dd20dd7237b 100644
--- a/app-backup/amanda/amanda-3.5.1-r1.ebuild
+++ b/app-backup/amanda/amanda-3.5.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -145,6 +145,9 @@ src_prepare() {
 	# bug with glibc-2.16.0
 	sed -i -e '/gets is a security/d' "${S}"/gnulib/stdio.in.h || die
 
+	# https://bugs.gentoo.org/701416 sandbox violation
+	sed -i -e 's/case `"$SAMBA_CLIENT.*/case "Connection to nosuchhost.amanda.org failed" in/' "${S}"/config/amanda/dumpers.m4 || die
+
 	eautoreconf
 
 	# places for us to work in
@@ -388,7 +391,7 @@ src_install() {
 	if ! use minimal ; then
 		fperms 0700 \
 			 "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}" \
-	         /etc/amanda/${AMANDA_CONFIG_NAME}
+			 /etc/amanda/${AMANDA_CONFIG_NAME}
 	fi
 
 	einfo "Setting setuid permissions"
@@ -476,7 +479,7 @@ amanda_permissions_fix() {
 	local i
 	for i in "${le}"/calcsize "${le}"/killpgrp \
 		"${le}"/rundump "${le}"/runtar ; do
-	    [ -e "${root}"/${i} ] || continue
+		[ -e "${root}"/${i} ] || continue
 		chown root:${AMANDA_GROUP_NAME} "${root}"/${i} || die
 		chmod u=srwx,g=rx,o= "${root}"/${i} || die
 	done


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/amanda/
@ 2017-12-14 22:05 Robin H. Johnson
  0 siblings, 0 replies; 26+ messages in thread
From: Robin H. Johnson @ 2017-12-14 22:05 UTC (permalink / raw
  To: gentoo-commits

commit:     77aa0b2693eec1254835f4331948f266ea39059e
Author:     Stefan G. Weichinger <office <AT> oops <DOT> co <DOT> at>
AuthorDate: Wed Dec  6 14:35:13 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Dec 14 22:05:29 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77aa0b26

app-backup/amanda: fixed permissions

(revbump included by Robin H. Johnson [robbat2])

Closes: https://github.com/gentoo/gentoo/pull/6470
Closes: https://bugs.gentoo.org/639930
(cherry picked from commit 63d030d108893a4045402e1cf7581fc3b02fab36)
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 app-backup/amanda/{amanda-3.5.1.ebuild => amanda-3.5.1-r1.ebuild} | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app-backup/amanda/amanda-3.5.1.ebuild b/app-backup/amanda/amanda-3.5.1-r1.ebuild
similarity index 99%
rename from app-backup/amanda/amanda-3.5.1.ebuild
rename to app-backup/amanda/amanda-3.5.1-r1.ebuild
index 058d9b9ccb9..997834b00aa 100644
--- a/app-backup/amanda/amanda-3.5.1.ebuild
+++ b/app-backup/amanda/amanda-3.5.1-r1.ebuild
@@ -474,9 +474,8 @@ amanda_permissions_fix() {
 	[ -z "${root}" ] && die "Failed to pass root argument to amanda_permissions_fix!"
 	local le="/usr/libexec/amanda"
 	local i
-	for i in /usr/sbin/amcheck "${le}"/calcsize "${le}"/killpgrp \
-		"${le}"/rundump "${le}"/runtar "${le}"/dumper \
-		"${le}"/planner ; do
+	for i in "${le}"/calcsize "${le}"/killpgrp \
+		"${le}"/rundump "${le}"/runtar ; do
 	    [ -e "${root}"/${i} ] || continue
 		chown root:${AMANDA_GROUP_NAME} "${root}"/${i} || die
 		chmod u=srwx,g=rx,o= "${root}"/${i} || die


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/amanda/
@ 2017-12-06  3:40 Robin H. Johnson
  0 siblings, 0 replies; 26+ messages in thread
From: Robin H. Johnson @ 2017-12-06  3:40 UTC (permalink / raw
  To: gentoo-commits

commit:     17ad4efd714800f4a068789d679435304c62178b
Author:     Stefan G. Weichinger <office <AT> oops <DOT> co <DOT> at>
AuthorDate: Mon Dec  4 08:21:23 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Dec  6 03:40:13 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17ad4efd

app-backup/amanda: version bump to 3.5.1

Closes: https://github.com/gentoo/gentoo/pull/6433
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 app-backup/amanda/Manifest            |   1 +
 app-backup/amanda/amanda-3.5.1.ebuild | 498 ++++++++++++++++++++++++++++++++++
 2 files changed, 499 insertions(+)

diff --git a/app-backup/amanda/Manifest b/app-backup/amanda/Manifest
index 1531d6ae2f2..9deacf3ccff 100644
--- a/app-backup/amanda/Manifest
+++ b/app-backup/amanda/Manifest
@@ -4,4 +4,5 @@ DIST amanda-3.4.2.tar.gz 5353734 SHA256 175c6a2ef57fe480ddeeefc920a93c8d1cde4111
 DIST amanda-3.4.3.tar.gz 5355137 SHA256 8ebca59d7b5fc64179fee3d9de4289cd9e8dbb49558e0a21228b06e16105d688 SHA512 5fa7a8c59961f87568d3459e6b5368e50c6cf74e1a6c7599faf5f85d537e72668775acc11009d1d5699ab92d1c21553b5b86e06b804c6a1ae04500889726694a WHIRLPOOL e1c4cd778d5c71994d2c74fef07948476f367fff42e666fb1b516035746c1e9562b9bf4579875e922c44f8dd65924bf9fec5ca7d30bbee0998540c4c319d18b0
 DIST amanda-3.4.4.tar.gz 5363929 SHA256 467e44eccd47170cf8ec40e914a2fbc1e6d50966e6a71c46d96091183c54a3d3 SHA512 e73ee29a6074396a885b08d9b1160b1e379423596dde872a14a8c8cf5845c9fcf3ea08038007a99063169a863d8b9f3ca9c23b8f5609d463a5b1f2ddcd44be96 WHIRLPOOL 221848cd608fd3e45b4f172f56ab691dc2a1dd659f3a5f15df6a2e973daae0964d88fd359c9975147b358289feb77779342f26956b0e693f8683da8d621f04ea
 DIST amanda-3.4.5.tar.gz 5365381 SHA256 bf05ea512676c7520ccff8d711e17176ea2aec47f7c517669cee02e8ab201343 SHA512 441efef6a34a1cb645c8c5d1e909f25230322ceb38d1efa0a104de2d9051640f7032255c8d8c7391a918102aceeb5073048070471fb642e185a2a113c817e00c WHIRLPOOL c21b1cbf276d60fae48c9178b7ae56416c81af4729341e9251b95c50775a3fdaf147c8d1d0e7c33b9477cd215ea4c0c51ac22e16348d2dfd9af20587d53f4b32
+DIST amanda-3.5.1.tar.gz 5402093 BLAKE2B 4c342fb55b2b5fc0d338a1616bf26b1d844b0ecd6627432b849996c0072756090e1f695050605af0a5c3eda2daeb63131fbe16b5ac728af9137699f4d916b8e8 SHA512 8d5451b6b3f18f9a705592ba6baf8ffb7fb4fe62261eac8a4f4fae4eded3f7f447f547ac6f016bcb57ea43f116cf87fdc48f8e77b117bbdecf00d3e37dd0f39f
 DIST amanda-3.5.tar.gz 5386719 SHA256 099eb36321b1360ebde6156fb1e75f3e0245520b6f886a0e8e0f31a7a6169be4 SHA512 31340eb250972b2d7b2ad5e51c4f3fafb9de15b9f51f688447214174c77ea89d344f50709ca51d6ba965f8ed6977608f22d7bc6811cc97b63207f7a7cec8219c WHIRLPOOL b6d12e046203f3f553e197215c1da8ed610f07a34ac6b8ca7e5b11846308d1ee490aaaaeee8daeae94b8b6b18fcb18bc26e434dc95042d08b443118ccb504801

diff --git a/app-backup/amanda/amanda-3.5.1.ebuild b/app-backup/amanda/amanda-3.5.1.ebuild
new file mode 100644
index 00000000000..058d9b9ccb9
--- /dev/null
+++ b/app-backup/amanda/amanda-3.5.1.ebuild
@@ -0,0 +1,498 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools perl-module user systemd
+
+DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver"
+HOMEPAGE="http://www.amanda.org/"
+SRC_URI="mirror://sourceforge/amanda/${P}.tar.gz"
+
+LICENSE="HPND BSD BSD-2 GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="curl gnuplot ipv6 kerberos minimal ndmp nls readline s3 samba systemd xfs"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+RDEPEND="sys-libs/readline:=
+	virtual/awk
+	app-arch/tar
+	dev-lang/perl:=
+	app-arch/dump
+	net-misc/openssh
+	>=dev-libs/glib-2.26.0
+	dev-perl/JSON
+	dev-perl/Encode-Locale
+	nls? ( virtual/libintl )
+	s3? ( >=net-misc/curl-7.10.0 )
+	!s3? ( curl? ( >=net-misc/curl-7.10.0 ) )
+	samba? ( net-fs/samba:= )
+	kerberos? ( app-crypt/mit-krb5 )
+	xfs? ( sys-fs/xfsdump )
+	!minimal? (
+		dev-perl/XML-Simple
+		virtual/mailx
+		app-arch/mt-st:=
+		sys-block/mtx
+		gnuplot? ( sci-visualization/gnuplot )
+		app-crypt/aespipe
+		app-crypt/gnupg
+	)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	>=app-text/docbook-xsl-stylesheets-1.72.0
+	app-text/docbook-xml-dtd
+	dev-libs/libxslt
+	dev-lang/swig
+	"
+
+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_TAPE_DEVICE 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_variable_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_TAPE_DEVICE}" ]] && AMANDA_SERVER_TAPE_DEVICE="/dev/nst0"
+	[[ -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 "${EROOT}${ENVDIR}/${ENVDFILE}" ]]; then
+		# We don't just source it as we don't want everything in there.
+		eval $(egrep "^AMANDA_" "${EROOT}${ENVDIR}/${ENVDFILE}" | grep -v '^AMANDA_ENV_SETTINGS')
+	fi
+
+	# Re-apply the new settings if any
+	[ -n "${currentamanda}" ] && eval $(echo "${currentamanda}")
+
+}
+
+pkg_setup() {
+	amanda_variable_setup
+
+	# 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
+
+	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() {
+	# we do not want the perl src_unpack
+	default_src_unpack
+}
+
+src_prepare() {
+	# gentoo bug #331111
+	sed -i '/^check-local: check-perl$/d' "${S}"/config/automake/scripts.am || die
+	sed -i '/^check-local:/s,syntax-check,,g' "${S}"/perl/Makefile.am || die
+
+	# bug with glibc-2.16.0
+	sed -i -e '/gets is a security/d' "${S}"/gnulib/stdio.in.h || die
+
+	eautoreconf
+
+	# places for us to work in
+	mkdir -p "${MYFILESDIR}" || die
+	# Now we store the settings we just created
+	set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' > "${TMPENVFILE}" || die
+
+	# 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}`" || die
+	done
+
+	if use minimal; then
+		cat "${MYFILESDIR}"/amanda-amandahosts-server-2.5.1_p3-r1 > "${T}"/amandahosts || die
+	else
+		sed -i -e 's:^\(my $amandahomedir\)=.*:\1 = $localstatedir;:' \
+			server-src/am{addclient,serverconfig}.pl || die
+		cat "${MYFILESDIR}"/amanda-amandahosts-client-2.5.1_p3-r1 > "${T}"/amandahosts || die
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	# fix bug #36316
+	addpredict /var/cache/samba/gencache.tdb
+	# fix bug #376169
+	addpredict /run/blkid
+	addpredict /etc/blkid.tab
+
+	[ ! -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_TAPE_DEVICE} for tape server."
+	myconf="${myconf} --with-tape-device=${AMANDA_SERVER_TAPE_DEVICE}"
+	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 5
+	myconf="${myconf} $(use_with kerberos krb5-security)"
+
+	# Amazon S3 support
+	myconf="${myconf} `use_enable s3 s3-device`"
+
+	# libcurl is required for S3 but otherwise optional
+	if ! use s3; then
+		myconf="${myconf} $(use_with curl libcurl)"
+	fi
+
+	# 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`"
+	# This is to prevent the IPv6-is-working test
+	# As the test fails on binpkg build hosts with no IPv6.
+	use ipv6 && export amanda_cv_working_ipv6=yes
+
+	# I18N
+	myconf="${myconf} `use_enable nls`"
+
+	# Bug #296634: Perl location
+	perl_set_version
+	myconf="${myconf} --with-amperldir=${VENDOR_LIB}"
+
+	# Bug 296633: --disable-syntax-checks
+	# Some tests are not safe for production systems
+	myconf="${myconf} --disable-syntax-checks"
+
+	# build manpages
+	myconf="${myconf} --enable-manpage-build"
+
+	# Bug #636262
+	myconf="${myconf} $(use_with ndmp ndmp)"
+
+	# bug #483120
+	tc-export AR
+
+	econf \
+		$(use_with readline) \
+		${myconf}
+}
+
+src_compile() {
+	# Again, do not want the perl-module src_compile
+	default_src_compile
+}
+
+src_install() {
+	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
+	source ${TMPENVFILE}
+
+	einfo "Doing stock install"
+	emake DESTDIR="${D}" install
+
+	# 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}"
+
+	# Env.d
+	einfo "Installing environment config file"
+	doenvd "${MYFILESDIR}/${ENVDFILE}"
+
+	einfo "Installing systemd service and socket files for Amanda"
+	systemd_dounit "${FILESDIR}"/amanda.socket
+	systemd_newunit "${FILESDIR}"/amanda.service 'amanda@.service'
+
+	# Lock down next section (up until docs).
+	insopts -m0640
+	# Installing Amanda Xinetd Services Definition
+	einfo "Installing xinetd service file"
+	insinto /etc/xinetd.d
+	if use minimal ; then
+		newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-client amanda
+	else
+		newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-server amanda
+	fi
+
+	if ! use minimal; then
+		einfo "Installing Sample Daily Cron Job for Amanda"
+		insinto /etc/cron.daily
+		newins "${MYFILESDIR}/amanda-cron" amanda
+	fi
+
+	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
+
+	insinto /etc/amanda
+	doins "${S}/example/amanda-client.conf"
+	if ! use minimal ; then
+		insinto "/etc/amanda/${AMANDA_CONFIG_NAME}"
+		doins "${S}/example/amanda.conf"
+		doins "${S}/example/disklist"
+		keepdir "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}/index"
+	fi
+
+	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
+	# Do NOT use -R
+	fperms 0700 \
+		"${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \
+		"${AMANDA_TMPDIR}" "${AMANDA_TMPDIR}/dumps" \
+		 "${AMANDA_USER_HOMEDIR}/amanda" \
+		 /etc/amanda
+
+	if ! use minimal ; then
+		fperms 0700 \
+			 "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}" \
+	         /etc/amanda/${AMANDA_CONFIG_NAME}
+	fi
+
+	einfo "Setting setuid permissions"
+	amanda_permissions_fix "${D}"
+
+	# Relax permissions again
+	insopts -m0644
+
+	# 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} || die
+	mv "${D}/usr/share/amanda/example" "${D}/usr/share/doc/${PF}/" || die
+	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
+
+	einfo "Cleaning up dud .la files"
+	perl_set_version
+	find "${D}"/"${VENDOR_LIB}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	[ ! -f "${TMPENVFILE}" -a "$MERGE_TYPE" == "binary" ] && \
+		TMPENVFILE="${ROOT}${ENVDIR}/${ENVDFILE}"
+	[ ! -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" || die
+		mkdir -p "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/" || die
+		cp -dp "${ROOT}/etc/amandates" "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates" || die
+	fi
+	if [ -f "${ROOT}/etc/amandates" ]; then
+		einfo "If you have migrated safely, please delete /etc/amandates"
+	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/${PF}/inetd.amanda.sample"
+	elog "as an example of how to configure your inetd."
+	elog
+	elog "systemd-users: enable and start amanda.socket or the relevant services"
+	elog "regarding what auth method you use."
+	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."
+	elog "The only exception is when you use the authentication method 'local'."
+	elog
+	elog "Please note that this package no longer explicitly depends on"
+	elog "virtual/inetd, as it supports modes where an inetd is not needed"
+	elog "(see bug #506028 for details)."
+}
+
+# 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"
+	local i
+	for i in /usr/sbin/amcheck "${le}"/calcsize "${le}"/killpgrp \
+		"${le}"/rundump "${le}"/runtar "${le}"/dumper \
+		"${le}"/planner ; do
+	    [ -e "${root}"/${i} ] || continue
+		chown root:${AMANDA_GROUP_NAME} "${root}"/${i} || die
+		chmod u=srwx,g=rx,o= "${root}"/${i} || die
+	done
+
+	# amanda-security.conf is a config file with similar requirements:
+	# writable only by root
+	# world-readable
+	# 3.3.9: introduced in /etc/amanda-security.conf
+	# 3.4.2: moved to /etc/amanda/amanda-security.conf
+	f=/etc/amanda/amanda-security.conf
+	chown root:root "${root}""${f}" || die
+	chmod u=rw,go=r "${root}""${f}" || die
+}
+
+# We do not want the perl-module tests.
+src_test() {
+	default_src_test
+}


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/amanda/
@ 2017-11-13 20:59 Robin H. Johnson
  0 siblings, 0 replies; 26+ messages in thread
From: Robin H. Johnson @ 2017-11-13 20:59 UTC (permalink / raw
  To: gentoo-commits

commit:     8c2ba2ea5d4137883dfbf00b23a0c2dbaf8444d6
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 13 20:58:49 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Nov 13 20:59:30 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c2ba2ea

app-backup/amanda: run correct src_test.

Fixes: https://bugs.gentoo.org/621416
Package-Manager: Portage-2.3.8, Repoman-2.3.3
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 app-backup/amanda/amanda-3.3.9.ebuild  | 5 +++++
 app-backup/amanda/amanda-3.4.1.ebuild  | 5 +++++
 app-backup/amanda/amanda-3.4.2.ebuild  | 5 +++++
 app-backup/amanda/amanda-3.4.3.ebuild  | 5 +++++
 app-backup/amanda/amanda-3.4.4.ebuild  | 5 +++++
 app-backup/amanda/amanda-3.4.5.ebuild  | 5 +++++
 app-backup/amanda/amanda-3.5-r1.ebuild | 5 +++++
 7 files changed, 35 insertions(+)

diff --git a/app-backup/amanda/amanda-3.3.9.ebuild b/app-backup/amanda/amanda-3.3.9.ebuild
index 70ea0b2ba30..968e236abaa 100644
--- a/app-backup/amanda/amanda-3.3.9.ebuild
+++ b/app-backup/amanda/amanda-3.3.9.ebuild
@@ -473,3 +473,8 @@ amanda_permissions_fix() {
 		chmod u=srwx,g=rx,o= "${root}"/${i}
 	done
 }
+
+# We do not want the perl-module tests.
+src_test() {
+	default_src_test
+}

diff --git a/app-backup/amanda/amanda-3.4.1.ebuild b/app-backup/amanda/amanda-3.4.1.ebuild
index 3171fd4f7c8..aa6f6387998 100644
--- a/app-backup/amanda/amanda-3.4.1.ebuild
+++ b/app-backup/amanda/amanda-3.4.1.ebuild
@@ -480,3 +480,8 @@ amanda_permissions_fix() {
 		chmod u=srwx,g=rx,o= "${root}"/${i}
 	done
 }
+
+# We do not want the perl-module tests.
+src_test() {
+	default_src_test
+}

diff --git a/app-backup/amanda/amanda-3.4.2.ebuild b/app-backup/amanda/amanda-3.4.2.ebuild
index 9e26503c1a4..aec64fedec3 100644
--- a/app-backup/amanda/amanda-3.4.2.ebuild
+++ b/app-backup/amanda/amanda-3.4.2.ebuild
@@ -477,3 +477,8 @@ amanda_permissions_fix() {
 		chmod u=srwx,g=rx,o= "${root}"/${i}
 	done
 }
+
+# We do not want the perl-module tests.
+src_test() {
+	default_src_test
+}

diff --git a/app-backup/amanda/amanda-3.4.3.ebuild b/app-backup/amanda/amanda-3.4.3.ebuild
index 9e26503c1a4..aec64fedec3 100644
--- a/app-backup/amanda/amanda-3.4.3.ebuild
+++ b/app-backup/amanda/amanda-3.4.3.ebuild
@@ -477,3 +477,8 @@ amanda_permissions_fix() {
 		chmod u=srwx,g=rx,o= "${root}"/${i}
 	done
 }
+
+# We do not want the perl-module tests.
+src_test() {
+	default_src_test
+}

diff --git a/app-backup/amanda/amanda-3.4.4.ebuild b/app-backup/amanda/amanda-3.4.4.ebuild
index 9e26503c1a4..aec64fedec3 100644
--- a/app-backup/amanda/amanda-3.4.4.ebuild
+++ b/app-backup/amanda/amanda-3.4.4.ebuild
@@ -477,3 +477,8 @@ amanda_permissions_fix() {
 		chmod u=srwx,g=rx,o= "${root}"/${i}
 	done
 }
+
+# We do not want the perl-module tests.
+src_test() {
+	default_src_test
+}

diff --git a/app-backup/amanda/amanda-3.4.5.ebuild b/app-backup/amanda/amanda-3.4.5.ebuild
index 9e26503c1a4..aec64fedec3 100644
--- a/app-backup/amanda/amanda-3.4.5.ebuild
+++ b/app-backup/amanda/amanda-3.4.5.ebuild
@@ -477,3 +477,8 @@ amanda_permissions_fix() {
 		chmod u=srwx,g=rx,o= "${root}"/${i}
 	done
 }
+
+# We do not want the perl-module tests.
+src_test() {
+	default_src_test
+}

diff --git a/app-backup/amanda/amanda-3.5-r1.ebuild b/app-backup/amanda/amanda-3.5-r1.ebuild
index bbc32ece405..058d9b9ccb9 100644
--- a/app-backup/amanda/amanda-3.5-r1.ebuild
+++ b/app-backup/amanda/amanda-3.5-r1.ebuild
@@ -491,3 +491,8 @@ amanda_permissions_fix() {
 	chown root:root "${root}""${f}" || die
 	chmod u=rw,go=r "${root}""${f}" || die
 }
+
+# We do not want the perl-module tests.
+src_test() {
+	default_src_test
+}


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/amanda/
@ 2017-11-13 20:45 Robin H. Johnson
  0 siblings, 0 replies; 26+ messages in thread
From: Robin H. Johnson @ 2017-11-13 20:45 UTC (permalink / raw
  To: gentoo-commits

commit:     95ee4b091e3c6e5e1db342a57b6fdee53b095e8c
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 13 20:32:41 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Nov 13 20:45:00 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95ee4b09

app-backup/amanda: fix ownership of /etc/amanda/amanda-security.conf

Fixes: https://bugs.gentoo.org/637332
Package-Manager: Portage-2.3.8, Repoman-2.3.3
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 app-backup/amanda/amanda-3.5-r1.ebuild | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/app-backup/amanda/amanda-3.5-r1.ebuild b/app-backup/amanda/amanda-3.5-r1.ebuild
index 673a7b70dae..bbc32ece405 100644
--- a/app-backup/amanda/amanda-3.5-r1.ebuild
+++ b/app-backup/amanda/amanda-3.5-r1.ebuild
@@ -481,4 +481,13 @@ amanda_permissions_fix() {
 		chown root:${AMANDA_GROUP_NAME} "${root}"/${i} || die
 		chmod u=srwx,g=rx,o= "${root}"/${i} || die
 	done
+
+	# amanda-security.conf is a config file with similar requirements:
+	# writable only by root
+	# world-readable
+	# 3.3.9: introduced in /etc/amanda-security.conf
+	# 3.4.2: moved to /etc/amanda/amanda-security.conf
+	f=/etc/amanda/amanda-security.conf
+	chown root:root "${root}""${f}" || die
+	chmod u=rw,go=r "${root}""${f}" || die
 }


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/amanda/
@ 2017-11-13 20:45 Robin H. Johnson
  0 siblings, 0 replies; 26+ messages in thread
From: Robin H. Johnson @ 2017-11-13 20:45 UTC (permalink / raw
  To: gentoo-commits

commit:     cddd3e2baa07e18ed26e7a40863db949b772b702
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 13 20:32:41 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Nov 13 20:44:59 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cddd3e2b

app-backup/amanda: fix chown during USE=minimal

Fixes: https://bugs.gentoo.org/633828
Package-Manager: Portage-2.3.8, Repoman-2.3.3
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 app-backup/amanda/amanda-3.5-r1.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-backup/amanda/amanda-3.5-r1.ebuild b/app-backup/amanda/amanda-3.5-r1.ebuild
index 7b97c5c5d9f..673a7b70dae 100644
--- a/app-backup/amanda/amanda-3.5-r1.ebuild
+++ b/app-backup/amanda/amanda-3.5-r1.ebuild
@@ -477,6 +477,7 @@ amanda_permissions_fix() {
 	for i in /usr/sbin/amcheck "${le}"/calcsize "${le}"/killpgrp \
 		"${le}"/rundump "${le}"/runtar "${le}"/dumper \
 		"${le}"/planner ; do
+	    [ -e "${root}"/${i} ] || continue
 		chown root:${AMANDA_GROUP_NAME} "${root}"/${i} || die
 		chmod u=srwx,g=rx,o= "${root}"/${i} || die
 	done


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/amanda/
@ 2017-11-13 20:45 Robin H. Johnson
  0 siblings, 0 replies; 26+ messages in thread
From: Robin H. Johnson @ 2017-11-13 20:45 UTC (permalink / raw
  To: gentoo-commits

commit:     b740f33032923e18de20051c88669c583af7d6fb
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 13 20:35:06 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Nov 13 20:44:57 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b740f330

app-backup/amanda: fix systemd perms.

Fixes: https://bugs.gentoo.org/530150
Package-Manager: Portage-2.3.8, Repoman-2.3.3
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 app-backup/amanda/{amanda-3.5.ebuild => amanda-3.5-r1.ebuild} | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app-backup/amanda/amanda-3.5.ebuild b/app-backup/amanda/amanda-3.5-r1.ebuild
similarity index 100%
rename from app-backup/amanda/amanda-3.5.ebuild
rename to app-backup/amanda/amanda-3.5-r1.ebuild
index f59aebd6c04..7b97c5c5d9f 100644
--- a/app-backup/amanda/amanda-3.5.ebuild
+++ b/app-backup/amanda/amanda-3.5-r1.ebuild
@@ -326,6 +326,10 @@ src_install() {
 	einfo "Installing environment config file"
 	doenvd "${MYFILESDIR}/${ENVDFILE}"
 
+	einfo "Installing systemd service and socket files for Amanda"
+	systemd_dounit "${FILESDIR}"/amanda.socket
+	systemd_newunit "${FILESDIR}"/amanda.service 'amanda@.service'
+
 	# Lock down next section (up until docs).
 	insopts -m0640
 	# Installing Amanda Xinetd Services Definition
@@ -343,10 +347,6 @@ src_install() {
 		newins "${MYFILESDIR}/amanda-cron" amanda
 	fi
 
-	einfo "Installing systemd service and socket files for Amanda"
-	systemd_dounit "${FILESDIR}"/amanda.socket
-	systemd_newunit "${FILESDIR}"/amanda.service 'amanda@.service'
-
 	insinto /etc/amanda
 	einfo "Installing .amandahosts File for ${AMANDA_USER_NAME} user"
 	doins "${T}/amandahosts"


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/amanda/
@ 2017-11-07  6:16 Robin H. Johnson
  0 siblings, 0 replies; 26+ messages in thread
From: Robin H. Johnson @ 2017-11-07  6:16 UTC (permalink / raw
  To: gentoo-commits

commit:     0016f461cb30308ba627329b0e760a2f8dfc6d8a
Author:     Stefan G. Weichinger <office <AT> oops <DOT> co <DOT> at>
AuthorDate: Mon Nov  6 10:04:34 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Nov  7 06:15:51 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0016f461

app-backup/amanda: make NDMP optional

NDMP is an uncommon feature, and fails to build with newer glibc at this time; make it optional for now.

Closes: https://bugs.gentoo.org/376127
Closes: https://bugs.gentoo.org/636262
Closes: https://github.com/gentoo/gentoo/pull/6137
Closes: https://github.com/gentoo/gentoo/pull/6138
Closes: https://github.com/gentoo/gentoo/pull/6142
(cherry picked from commit 337a72935369e963b74b8293e3a9ecbce1383bd0)
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 app-backup/amanda/amanda-3.5.ebuild | 5 ++++-
 app-backup/amanda/metadata.xml      | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app-backup/amanda/amanda-3.5.ebuild b/app-backup/amanda/amanda-3.5.ebuild
index 797dbc7a026..f59aebd6c04 100644
--- a/app-backup/amanda/amanda-3.5.ebuild
+++ b/app-backup/amanda/amanda-3.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/amanda/${P}.tar.gz"
 
 LICENSE="HPND BSD BSD-2 GPL-2+ GPL-3+"
 SLOT="0"
-IUSE="curl gnuplot ipv6 kerberos minimal nls readline s3 samba systemd xfs"
+IUSE="curl gnuplot ipv6 kerberos minimal ndmp nls readline s3 samba systemd xfs"
 
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 RDEPEND="sys-libs/readline:=
@@ -288,6 +288,9 @@ src_configure() {
 	# build manpages
 	myconf="${myconf} --enable-manpage-build"
 
+	# Bug #636262
+	myconf="${myconf} $(use_with ndmp ndmp)"
+
 	# bug #483120
 	tc-export AR
 

diff --git a/app-backup/amanda/metadata.xml b/app-backup/amanda/metadata.xml
index e191fc902dc..a044ded2763 100644
--- a/app-backup/amanda/metadata.xml
+++ b/app-backup/amanda/metadata.xml
@@ -23,6 +23,7 @@
 	<use>
 		<flag name="xfs">Support for backing up raw XFS filesystems using xfsdump</flag>
 		<flag name="s3">Support for backing up to the Amazon S3 system</flag>
+		<flag name="ndmp">Support for the NDMP protocol</flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">amanda</remote-id>


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/amanda/
@ 2017-10-04  9:42 Patrice Clement
  0 siblings, 0 replies; 26+ messages in thread
From: Patrice Clement @ 2017-10-04  9:42 UTC (permalink / raw
  To: gentoo-commits

commit:     eb07adf8ad92b2ec30d3951b088d034b8406fd05
Author:     Stefan G. Weichinger <office <AT> oops <DOT> co <DOT> at>
AuthorDate: Tue Oct  3 10:35:58 2017 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Oct  4 09:42:08 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb07adf8

app-backup/amanda: version bump to 3.5.

Closes: https://github.com/gentoo/gentoo/pull/5848

 app-backup/amanda/Manifest          |   1 +
 app-backup/amanda/amanda-3.5.ebuild | 480 ++++++++++++++++++++++++++++++++++++
 2 files changed, 481 insertions(+)

diff --git a/app-backup/amanda/Manifest b/app-backup/amanda/Manifest
index 3813e4aaff5..1531d6ae2f2 100644
--- a/app-backup/amanda/Manifest
+++ b/app-backup/amanda/Manifest
@@ -4,3 +4,4 @@ DIST amanda-3.4.2.tar.gz 5353734 SHA256 175c6a2ef57fe480ddeeefc920a93c8d1cde4111
 DIST amanda-3.4.3.tar.gz 5355137 SHA256 8ebca59d7b5fc64179fee3d9de4289cd9e8dbb49558e0a21228b06e16105d688 SHA512 5fa7a8c59961f87568d3459e6b5368e50c6cf74e1a6c7599faf5f85d537e72668775acc11009d1d5699ab92d1c21553b5b86e06b804c6a1ae04500889726694a WHIRLPOOL e1c4cd778d5c71994d2c74fef07948476f367fff42e666fb1b516035746c1e9562b9bf4579875e922c44f8dd65924bf9fec5ca7d30bbee0998540c4c319d18b0
 DIST amanda-3.4.4.tar.gz 5363929 SHA256 467e44eccd47170cf8ec40e914a2fbc1e6d50966e6a71c46d96091183c54a3d3 SHA512 e73ee29a6074396a885b08d9b1160b1e379423596dde872a14a8c8cf5845c9fcf3ea08038007a99063169a863d8b9f3ca9c23b8f5609d463a5b1f2ddcd44be96 WHIRLPOOL 221848cd608fd3e45b4f172f56ab691dc2a1dd659f3a5f15df6a2e973daae0964d88fd359c9975147b358289feb77779342f26956b0e693f8683da8d621f04ea
 DIST amanda-3.4.5.tar.gz 5365381 SHA256 bf05ea512676c7520ccff8d711e17176ea2aec47f7c517669cee02e8ab201343 SHA512 441efef6a34a1cb645c8c5d1e909f25230322ceb38d1efa0a104de2d9051640f7032255c8d8c7391a918102aceeb5073048070471fb642e185a2a113c817e00c WHIRLPOOL c21b1cbf276d60fae48c9178b7ae56416c81af4729341e9251b95c50775a3fdaf147c8d1d0e7c33b9477cd215ea4c0c51ac22e16348d2dfd9af20587d53f4b32
+DIST amanda-3.5.tar.gz 5386719 SHA256 099eb36321b1360ebde6156fb1e75f3e0245520b6f886a0e8e0f31a7a6169be4 SHA512 31340eb250972b2d7b2ad5e51c4f3fafb9de15b9f51f688447214174c77ea89d344f50709ca51d6ba965f8ed6977608f22d7bc6811cc97b63207f7a7cec8219c WHIRLPOOL b6d12e046203f3f553e197215c1da8ed610f07a34ac6b8ca7e5b11846308d1ee490aaaaeee8daeae94b8b6b18fcb18bc26e434dc95042d08b443118ccb504801

diff --git a/app-backup/amanda/amanda-3.5.ebuild b/app-backup/amanda/amanda-3.5.ebuild
new file mode 100644
index 00000000000..797dbc7a026
--- /dev/null
+++ b/app-backup/amanda/amanda-3.5.ebuild
@@ -0,0 +1,480 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools perl-module user systemd
+
+DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver"
+HOMEPAGE="http://www.amanda.org/"
+SRC_URI="mirror://sourceforge/amanda/${P}.tar.gz"
+
+LICENSE="HPND BSD BSD-2 GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="curl gnuplot ipv6 kerberos minimal nls readline s3 samba systemd xfs"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+RDEPEND="sys-libs/readline:=
+	virtual/awk
+	app-arch/tar
+	dev-lang/perl:=
+	app-arch/dump
+	net-misc/openssh
+	>=dev-libs/glib-2.26.0
+	dev-perl/JSON
+	dev-perl/Encode-Locale
+	nls? ( virtual/libintl )
+	s3? ( >=net-misc/curl-7.10.0 )
+	!s3? ( curl? ( >=net-misc/curl-7.10.0 ) )
+	samba? ( net-fs/samba:= )
+	kerberos? ( app-crypt/mit-krb5 )
+	xfs? ( sys-fs/xfsdump )
+	!minimal? (
+		dev-perl/XML-Simple
+		virtual/mailx
+		app-arch/mt-st:=
+		sys-block/mtx
+		gnuplot? ( sci-visualization/gnuplot )
+		app-crypt/aespipe
+		app-crypt/gnupg
+	)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	>=app-text/docbook-xsl-stylesheets-1.72.0
+	app-text/docbook-xml-dtd
+	dev-libs/libxslt
+	dev-lang/swig
+	"
+
+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_TAPE_DEVICE 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_variable_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_TAPE_DEVICE}" ]] && AMANDA_SERVER_TAPE_DEVICE="/dev/nst0"
+	[[ -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 "${EROOT}${ENVDIR}/${ENVDFILE}" ]]; then
+		# We don't just source it as we don't want everything in there.
+		eval $(egrep "^AMANDA_" "${EROOT}${ENVDIR}/${ENVDFILE}" | grep -v '^AMANDA_ENV_SETTINGS')
+	fi
+
+	# Re-apply the new settings if any
+	[ -n "${currentamanda}" ] && eval $(echo "${currentamanda}")
+
+}
+
+pkg_setup() {
+	amanda_variable_setup
+
+	# 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
+
+	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() {
+	# we do not want the perl src_unpack
+	default_src_unpack
+}
+
+src_prepare() {
+	# gentoo bug #331111
+	sed -i '/^check-local: check-perl$/d' "${S}"/config/automake/scripts.am || die
+	sed -i '/^check-local:/s,syntax-check,,g' "${S}"/perl/Makefile.am || die
+
+	# bug with glibc-2.16.0
+	sed -i -e '/gets is a security/d' "${S}"/gnulib/stdio.in.h || die
+
+	eautoreconf
+
+	# places for us to work in
+	mkdir -p "${MYFILESDIR}" || die
+	# Now we store the settings we just created
+	set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' > "${TMPENVFILE}" || die
+
+	# 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}`" || die
+	done
+
+	if use minimal; then
+		cat "${MYFILESDIR}"/amanda-amandahosts-server-2.5.1_p3-r1 > "${T}"/amandahosts || die
+	else
+		sed -i -e 's:^\(my $amandahomedir\)=.*:\1 = $localstatedir;:' \
+			server-src/am{addclient,serverconfig}.pl || die
+		cat "${MYFILESDIR}"/amanda-amandahosts-client-2.5.1_p3-r1 > "${T}"/amandahosts || die
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	# fix bug #36316
+	addpredict /var/cache/samba/gencache.tdb
+	# fix bug #376169
+	addpredict /run/blkid
+	addpredict /etc/blkid.tab
+
+	[ ! -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_TAPE_DEVICE} for tape server."
+	myconf="${myconf} --with-tape-device=${AMANDA_SERVER_TAPE_DEVICE}"
+	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 5
+	myconf="${myconf} $(use_with kerberos krb5-security)"
+
+	# Amazon S3 support
+	myconf="${myconf} `use_enable s3 s3-device`"
+
+	# libcurl is required for S3 but otherwise optional
+	if ! use s3; then
+		myconf="${myconf} $(use_with curl libcurl)"
+	fi
+
+	# 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`"
+	# This is to prevent the IPv6-is-working test
+	# As the test fails on binpkg build hosts with no IPv6.
+	use ipv6 && export amanda_cv_working_ipv6=yes
+
+	# I18N
+	myconf="${myconf} `use_enable nls`"
+
+	# Bug #296634: Perl location
+	perl_set_version
+	myconf="${myconf} --with-amperldir=${VENDOR_LIB}"
+
+	# Bug 296633: --disable-syntax-checks
+	# Some tests are not safe for production systems
+	myconf="${myconf} --disable-syntax-checks"
+
+	# build manpages
+	myconf="${myconf} --enable-manpage-build"
+
+	# bug #483120
+	tc-export AR
+
+	econf \
+		$(use_with readline) \
+		${myconf}
+}
+
+src_compile() {
+	# Again, do not want the perl-module src_compile
+	default_src_compile
+}
+
+src_install() {
+	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
+	source ${TMPENVFILE}
+
+	einfo "Doing stock install"
+	emake DESTDIR="${D}" install
+
+	# 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}"
+
+	# Env.d
+	einfo "Installing environment config file"
+	doenvd "${MYFILESDIR}/${ENVDFILE}"
+
+	# Lock down next section (up until docs).
+	insopts -m0640
+	# Installing Amanda Xinetd Services Definition
+	einfo "Installing xinetd service file"
+	insinto /etc/xinetd.d
+	if use minimal ; then
+		newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-client amanda
+	else
+		newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-server amanda
+	fi
+
+	if ! use minimal; then
+		einfo "Installing Sample Daily Cron Job for Amanda"
+		insinto /etc/cron.daily
+		newins "${MYFILESDIR}/amanda-cron" amanda
+	fi
+
+	einfo "Installing systemd service and socket files for Amanda"
+	systemd_dounit "${FILESDIR}"/amanda.socket
+	systemd_newunit "${FILESDIR}"/amanda.service 'amanda@.service'
+
+	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
+
+	insinto /etc/amanda
+	doins "${S}/example/amanda-client.conf"
+	if ! use minimal ; then
+		insinto "/etc/amanda/${AMANDA_CONFIG_NAME}"
+		doins "${S}/example/amanda.conf"
+		doins "${S}/example/disklist"
+		keepdir "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}/index"
+	fi
+
+	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
+	# Do NOT use -R
+	fperms 0700 \
+		"${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \
+		"${AMANDA_TMPDIR}" "${AMANDA_TMPDIR}/dumps" \
+		 "${AMANDA_USER_HOMEDIR}/amanda" \
+		 /etc/amanda
+
+	if ! use minimal ; then
+		fperms 0700 \
+			 "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}" \
+	         /etc/amanda/${AMANDA_CONFIG_NAME}
+	fi
+
+	einfo "Setting setuid permissions"
+	amanda_permissions_fix "${D}"
+
+	# Relax permissions again
+	insopts -m0644
+
+	# 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} || die
+	mv "${D}/usr/share/amanda/example" "${D}/usr/share/doc/${PF}/" || die
+	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
+
+	einfo "Cleaning up dud .la files"
+	perl_set_version
+	find "${D}"/"${VENDOR_LIB}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	[ ! -f "${TMPENVFILE}" -a "$MERGE_TYPE" == "binary" ] && \
+		TMPENVFILE="${ROOT}${ENVDIR}/${ENVDFILE}"
+	[ ! -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" || die
+		mkdir -p "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/" || die
+		cp -dp "${ROOT}/etc/amandates" "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates" || die
+	fi
+	if [ -f "${ROOT}/etc/amandates" ]; then
+		einfo "If you have migrated safely, please delete /etc/amandates"
+	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/${PF}/inetd.amanda.sample"
+	elog "as an example of how to configure your inetd."
+	elog
+	elog "systemd-users: enable and start amanda.socket or the relevant services"
+	elog "regarding what auth method you use."
+	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."
+	elog "The only exception is when you use the authentication method 'local'."
+	elog
+	elog "Please note that this package no longer explicitly depends on"
+	elog "virtual/inetd, as it supports modes where an inetd is not needed"
+	elog "(see bug #506028 for details)."
+}
+
+# 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"
+	local i
+	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} || die
+		chmod u=srwx,g=rx,o= "${root}"/${i} || die
+	done
+}


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/amanda/
@ 2017-07-01 18:59 Robin H. Johnson
  0 siblings, 0 replies; 26+ messages in thread
From: Robin H. Johnson @ 2017-07-01 18:59 UTC (permalink / raw
  To: gentoo-commits

commit:     2de09cceadfb09723764102c55a920429fe02c98
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  1 18:58:37 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Jul  1 18:58:55 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2de09cce

app-backup/amanda: cleanup, per bug #537248.

Package-Manager: portage-2.3.6

 app-backup/amanda/Manifest               |   3 -
 app-backup/amanda/amanda-3.3.3-r1.ebuild | 477 -------------------------------
 app-backup/amanda/amanda-3.3.3.ebuild    | 468 ------------------------------
 app-backup/amanda/amanda-3.3.5.ebuild    | 477 -------------------------------
 app-backup/amanda/amanda-3.3.7.ebuild    | 474 ------------------------------
 5 files changed, 1899 deletions(-)

diff --git a/app-backup/amanda/Manifest b/app-backup/amanda/Manifest
index 8f28f5f72ec..3813e4aaff5 100644
--- a/app-backup/amanda/Manifest
+++ b/app-backup/amanda/Manifest
@@ -1,6 +1,3 @@
-DIST amanda-3.3.3.tar.gz 4394935 SHA256 c36c9cd61dc62a7824abb7ba74cc4b09527bd82a930d691cf207b60b4bb15b72 SHA512 42af74a9e3b3fd92600e78d98eb4cdcf9d260bd9bbd016dde4133db346374deb41e4893159205336b35521c36f737c2877fd5030028531e1c09a0a6ac2931ba9 WHIRLPOOL 730deda1d85e645e658500a01ea72895f836a3dd99209314a65161674da24fed5aad98313a8ef66ef76176c6c7b1a60e62d30d692cfe2121eb429d9cb37f5636
-DIST amanda-3.3.5.tar.gz 4530463 SHA256 17d14cdc64e5b98270a2ad6c1b58a5e317ab2fe0d518a4212f82f7e3d13d231b SHA512 bef1f5271939e804387424924e6423537efa3ac1a722fe68f3afd77677e5974d8325f1a32a2a22d510344ee3d7b8f480a969611388fcb632c0f3cd640315f812 WHIRLPOOL 5ba8c2734cbd3a7e771b9fc7f9561596e5cda3dce1ea60b7192893fcca401e1c5da6154dcac18084ce6ef5ccacdf4899a65e255424f1bbbdafc219e8405669e4
-DIST amanda-3.3.7.tar.gz 4618547 SHA256 cd1534c7d9c5b97afcb52b189f05fb158972fadb2cf46249847ae8bc5ad8a78a SHA512 33066a34f5da5a37f4e8b18a365c2e5ae9cd9105a1ed05f74df95d03937bddee25167960e3daf519d3cf04b1580d9e617e48ba1a695fe683823a27ec298582f4 WHIRLPOOL 21c1c70d04bf8f503158d3facdf4dd479ae26d69bcbc89a9ee2812cc97667cc0c9109a7357971c0d43620cd949ea195c1affb23b754afa81438a56aad247e15d
 DIST amanda-3.3.9.tar.gz 4673301 SHA256 2520b95ca96f1d521d582b7c94bd631486e7029eda1de8e1887d74b323549a41 SHA512 345670a20cff335453e8dcbf457d1fcdb9f266e4a03d729c2b1ba762f4fac323de4a87713d0fd54c11ca244a08dc97fb8c641625f7fa81cb241b3c17748b1b7e WHIRLPOOL e149ab7dbc30cf3585e41d9fb338dd96ab4dd440e31723be51b8ccc9e5841f8dda31d3b89418474e31c7c2498f40177c646f03713c256a4d9341152e2ce2c8e4
 DIST amanda-3.4.1.tar.gz 5338575 SHA256 1f69e9bdae774ac2394297dd9d7f98ccbce44ca9199317ada764ca173909d2ac SHA512 245bf334e36fe8b4361d9fc27ea7e7ef5bd2ecec74719caa16cc94d1ebb3abbef058e28d9afd85851654aaae0984531593a35c079d1ba4aed0fc5177e907ec16 WHIRLPOOL b9608456f28fb35137276f16ec24d79ae397a44450b42ec4fa28256763798dee623ab560ba0db147ff41d2abc57810e2318ae64741ea0a054a8ff853f4ad9c59
 DIST amanda-3.4.2.tar.gz 5353734 SHA256 175c6a2ef57fe480ddeeefc920a93c8d1cde4111eec76d76e088101a53eeafac SHA512 dea44ffa5eb30318336395ccbd582df2f83da9a4cf91def2834a2e65b2e0f36cafc1911f6b73c3afb63be256484a78b006bdeb1db5b3ecf87dc59d34754987fd WHIRLPOOL af08e2b7b42cead569b69edfa264c1439d21d455e36ba5d346a74631e037773f20cd0563c6cdf95eeea0ee0e1e45328e553a5490ef4c66545acc1a3bd85570d0

diff --git a/app-backup/amanda/amanda-3.3.3-r1.ebuild b/app-backup/amanda/amanda-3.3.3-r1.ebuild
deleted file mode 100644
index 375e15d4bcb..00000000000
--- a/app-backup/amanda/amanda-3.3.3-r1.ebuild
+++ /dev/null
@@ -1,477 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils perl-module user systemd
-
-DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver"
-HOMEPAGE="http://www.amanda.org/"
-SRC_URI="mirror://sourceforge/amanda/${P}.tar.gz"
-
-LICENSE="HPND BSD BSD-2 GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="curl gnuplot ipv6 kerberos minimal nls readline s3 samba systemd xfs"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-RDEPEND="sys-libs/readline
-	virtual/awk
-	app-arch/tar
-	>=dev-lang/perl-5.6
-	app-arch/dump
-	net-misc/openssh
-	>=dev-libs/glib-2.26.0
-	nls? ( virtual/libintl )
-	s3? ( >=net-misc/curl-7.10.0 )
-	!s3? ( curl? ( >=net-misc/curl-7.10.0 ) )
-	samba? ( net-fs/samba )
-	kerberos? ( app-crypt/mit-krb5 )
-	xfs? ( sys-fs/xfsdump )
-	readline? ( sys-libs/readline )
-	!minimal? (
-		dev-perl/XML-Simple
-		virtual/mailx
-		app-arch/mt-st
-		sys-block/mtx
-		gnuplot? ( sci-visualization/gnuplot )
-		app-crypt/aespipe
-		app-crypt/gnupg
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	>=app-text/docbook-xsl-stylesheets-1.72.0
-	app-text/docbook-xml-dtd
-	dev-libs/libxslt
-	"
-
-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"
-
-amanda_variable_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}"`
-
-}
-
-pkg_setup() {
-	amanda_variable_setup
-
-	# 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
-
-	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() {
-	# we do not want the perl src_unpack
-	default_src_unpack
-}
-
-src_prepare() {
-	# gentoo bug #537248
-	epatch "${FILESDIR}/local-amanda-perl5.20.patch"
-
-	# gentoo bug #331111
-	sed -i '/^check-local: check-perl$/d' "${S}"/config/automake/scripts.am
-	sed -i '/^check-local:/s,syntax-check,,g' "${S}"/perl/Makefile.am
-
-	# bug with glibc-2.16.0
-	sed -i -e '/gets is a security/d' "${S}"/gnulib/stdio.in.h
-
-	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
-
-	if ! use minimal; then
-		sed -i -e 's:^\(my $amandahomedir\)=.*:\1 = $localstatedir;:' \
-			server-src/am{addclient,serverconfig}.pl || die
-	fi
-}
-
-src_configure() {
-	# fix bug #36316
-	addpredict /var/cache/samba/gencache.tdb
-	# fix bug #376169
-	addpredict /run/blkid
-	addpredict /etc/blkid.tab
-
-	[ ! -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 5
-	myconf="${myconf} `use_with kerberos krb5-security`"
-
-	# Amazon S3 support
-	myconf="${myconf} `use_enable s3 s3-device`"
-
-	# libcurl is required for S3 but otherwise optional
-	if ! use s3; then
-		myconf="${myconf} $(use_with curl libcurl)"
-	fi
-
-	# 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`"
-	# This is to prevent the IPv6-is-working test
-	# As the test fails on binpkg build hosts with no IPv6.
-	use ipv6 && export amanda_cv_working_ipv6=yes
-
-	# I18N
-	myconf="${myconf} `use_enable nls`"
-
-	# Bug #296634: Perl location
-	perl_set_version
-	myconf="${myconf} --with-amperldir=${VENDOR_LIB}"
-
-	# Bug 296633: --disable-syntax-checks
-	# Some tests are not safe for production systems
-	myconf="${myconf} --disable-syntax-checks"
-
-	# build manpages
-	myconf="${myconf} --enable-manpage-build"
-
-	# bug #483120
-	tc-export AR
-
-	econf \
-		$(use_with readline) \
-		${myconf}
-}
-
-src_compile() {
-	# Again, do not want the perl-module src_compile
-	default_src_compile
-}
-
-src_install() {
-	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
-	source ${TMPENVFILE}
-
-	einfo "Doing stock install"
-	emake DESTDIR="${D}" install || die
-
-	# 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}"
-
-	# Env.d
-	einfo "Installing environment config file"
-	doenvd "${MYFILESDIR}/${ENVDFILE}"
-
-	# Lock down next section (up until docs).
-	insopts -m0640
-	# Installing Amanda Xinetd Services Definition
-	einfo "Installing xinetd service file"
-	insinto /etc/xinetd.d
-	if use minimal ; then
-		newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-client amanda
-	else
-		newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-server amanda
-	fi
-
-	if ! use minimal; then
-		einfo "Installing Sample Daily Cron Job for Amanda"
-		insinto /etc/cron.daily
-		newins "${MYFILESDIR}/amanda-cron" amanda
-	fi
-
-	einfo "Installing systemd service and socket files for Amanda"
-	systemd_dounit "${FILESDIR}"/amanda.socket || die
-	systemd_newunit "${FILESDIR}"/amanda.service-r1 'amanda@.service' || die
-
-	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
-
-	insinto /etc/amanda
-	doins "${S}/example/amanda-client.conf"
-	if ! use minimal ; then
-		insinto "/etc/amanda/${AMANDA_CONFIG_NAME}"
-		doins "${S}/example/amanda.conf"
-		doins "${S}/example/disklist"
-		keepdir "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}/index"
-	fi
-
-	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
-	# Do NOT use -R
-	fperms 0700 \
-		"${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \
-		"${AMANDA_TMPDIR}" "${AMANDA_TMPDIR}/dumps" \
-		 "${AMANDA_USER_HOMEDIR}/amanda" \
-		 /etc/amanda
-
-	if ! use minimal ; then
-		fperms 0700 \
-			 "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}" \
-	         /etc/amanda/${AMANDA_CONFIG_NAME}
-	fi
-
-	einfo "Setting setuid permissions"
-	amanda_permissions_fix "${D}"
-
-	# Relax permissions again
-	insopts -m0644
-
-	# 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
-
-	einfo "Cleaning up dud .la files"
-	perl_set_version
-	find "${D}"/"${VENDOR_LIB}" -name '*.la' -print0 |xargs -0 rm -f
-}
-
-pkg_postinst() {
-	[ ! -f "${TMPENVFILE}" -a "$MERGE_TYPE" == "binary" ] && \
-		TMPENVFILE="${ROOT}${ENVDIR}/${ENVDFILE}"
-	[ ! -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
-
-	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/${PF}/inetd.amanda.sample"
-	elog "as an example of how to configure your inetd."
-	elog
-	elog "systemd-users: enable and start amanda.socket or the relevant services"
-	elog "regarding what auth method you use."
-	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."
-	elog
-	elog "Please note that this package no longer explicitly depends on"
-	elog "virtual/inetd, as it supports modes where an inetd is not needed"
-	elog "(see bug #506028 for details)."
-	elog "The only exception is when you use the authentication method 'local'."
-}
-
-# 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/amanda-3.3.3.ebuild b/app-backup/amanda/amanda-3.3.3.ebuild
deleted file mode 100644
index a0615c70412..00000000000
--- a/app-backup/amanda/amanda-3.3.3.ebuild
+++ /dev/null
@@ -1,468 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils perl-module user systemd
-
-DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver"
-HOMEPAGE="http://www.amanda.org/"
-SRC_URI="mirror://sourceforge/amanda/${P}.tar.gz"
-LICENSE="HPND BSD BSD-2 GPL-2+ GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86"
-RDEPEND="sys-libs/readline
-	virtual/awk
-	app-arch/tar
-	>=dev-lang/perl-5.6
-	app-arch/dump
-	net-misc/openssh
-	>=dev-libs/glib-2.26.0
-	nls? ( virtual/libintl )
-	s3? ( >=net-misc/curl-7.10.0 )
-	!s3? ( curl? ( >=net-misc/curl-7.10.0 ) )
-	samba? ( net-fs/samba )
-	kerberos? ( app-crypt/mit-krb5 )
-	xfs? ( sys-fs/xfsdump )
-	readline? ( sys-libs/readline )
-	!minimal? (
-		dev-perl/XML-Simple
-		virtual/mailx
-		app-arch/mt-st
-		sys-block/mtx
-		gnuplot? ( sci-visualization/gnuplot )
-		app-crypt/aespipe
-		app-crypt/gnupg
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	>=app-text/docbook-xsl-stylesheets-1.72.0
-	app-text/docbook-xml-dtd
-	dev-libs/libxslt
-	"
-
-IUSE="curl gnuplot ipv6 kerberos minimal nls readline s3 samba systemd xfs"
-
-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"
-
-amanda_variable_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}"`
-
-}
-
-pkg_setup() {
-	amanda_variable_setup
-
-	# 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
-
-	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() {
-	# we do not want the perl src_unpack
-	default_src_unpack
-}
-
-src_prepare() {
-
-	# gentoo bug #331111
-	sed -i '/^check-local: check-perl$/d' "${S}"/config/automake/scripts.am
-	sed -i '/^check-local:/s,syntax-check,,g' "${S}"/perl/Makefile.am
-
-	# bug with glibc-2.16.0
-	sed -i -e '/gets is a security/d' "${S}"/gnulib/stdio.in.h
-
-	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
-
-	if ! use minimal; then
-		sed -i -e 's:^\(my $amandahomedir\)=.*:\1 = $localstatedir;:' \
-			server-src/am{addclient,serverconfig}.pl || die
-	fi
-}
-
-src_configure() {
-	# fix bug #36316
-	addpredict /var/cache/samba/gencache.tdb
-	# fix bug #376169
-	addpredict /run/blkid
-	addpredict /etc/blkid.tab
-
-	[ ! -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 5
-	myconf="${myconf} `use_with kerberos krb5-security`"
-
-	# Amazon S3 support
-	myconf="${myconf} `use_enable s3 s3-device`"
-
-	# libcurl is required for S3 but otherwise optional
-	if ! use s3; then
-		myconf="${myconf} $(use_with curl libcurl)"
-	fi
-
-	# 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`"
-	# This is to prevent the IPv6-is-working test
-	# As the test fails on binpkg build hosts with no IPv6.
-	use ipv6 && export amanda_cv_working_ipv6=yes
-
-	# I18N
-	myconf="${myconf} `use_enable nls`"
-
-	# Bug #296634: Perl location
-	perl_set_version
-	myconf="${myconf} --with-amperldir=${VENDOR_LIB}"
-
-	# Bug 296633: --disable-syntax-checks
-	# Some tests are not safe for production systems
-	myconf="${myconf} --disable-syntax-checks"
-
-	# build manpages
-	myconf="${myconf} --enable-manpage-build"
-
-	econf \
-		$(use_with readline) \
-		${myconf}
-}
-
-src_compile() {
-	# Again, do not want the perl-module src_compile
-	default_src_compile
-}
-
-src_install() {
-	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
-	source ${TMPENVFILE}
-
-	einfo "Doing stock install"
-	emake DESTDIR="${D}" install || die
-
-	# 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}"
-
-	# Env.d
-	einfo "Installing environment config file"
-	doenvd "${MYFILESDIR}/${ENVDFILE}"
-
-	# Lock down next section (up until docs).
-	insopts -m0640
-	# Installing Amanda Xinetd Services Definition
-	einfo "Installing xinetd service file"
-	insinto /etc/xinetd.d
-	if use minimal ; then
-		newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-client amanda
-	else
-		newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-server amanda
-	fi
-
-	if ! use minimal; then
-		einfo "Installing Sample Daily Cron Job for Amanda"
-		insinto /etc/cron.daily
-		newins "${MYFILESDIR}/amanda-cron" amanda
-	fi
-
-	einfo "Installing systemd service and socket files for Amanda"
-	systemd_dounit "${FILESDIR}"/amanda.socket || die
-	systemd_newunit "${FILESDIR}"/amanda.service 'amanda@.service' || die
-
-	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
-
-	insinto /etc/amanda
-	doins "${S}/example/amanda-client.conf"
-	if ! use minimal ; then
-		insinto "/etc/amanda/${AMANDA_CONFIG_NAME}"
-		doins "${S}/example/amanda.conf"
-		doins "${S}/example/disklist"
-		keepdir "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}/index"
-	fi
-
-	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
-	# Do NOT use -R
-	fperms 0700 \
-		"${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \
-		"${AMANDA_TMPDIR}" "${AMANDA_TMPDIR}/dumps" \
-		 "${AMANDA_USER_HOMEDIR}/amanda" \
-		 /etc/amanda
-
-	if ! use minimal ; then
-		fperms 0700 \
-			 "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}" \
-	         /etc/amanda/${AMANDA_CONFIG_NAME}
-	fi
-
-	einfo "Setting setuid permissions"
-	amanda_permissions_fix "${D}"
-
-	# Relax permissions again
-	insopts -m0644
-
-	# 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
-
-	einfo "Cleaning up dud .la files"
-	perl_set_version
-	find "${D}"/"${VENDOR_LIB}" -name '*.la' -print0 |xargs -0 rm -f
-}
-
-pkg_postinst() {
-	[ ! -f "${TMPENVFILE}" -a "$MERGE_TYPE" == "binary" ] && \
-		TMPENVFILE="${ROOT}${ENVDIR}/${ENVDFILE}"
-	[ ! -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
-
-	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/${PF}/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."
-	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."
-	elog
-	elog "Please note that this package no longer explicitly depends on"
-	elog "virtual/inetd, as it supports modes where an inetd is not needed"
-	elog "(see bug #506028 for details)."
-
-}
-
-# 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/amanda-3.3.5.ebuild b/app-backup/amanda/amanda-3.3.5.ebuild
deleted file mode 100644
index 02ad41d9591..00000000000
--- a/app-backup/amanda/amanda-3.3.5.ebuild
+++ /dev/null
@@ -1,477 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils perl-module user systemd
-
-DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver"
-HOMEPAGE="http://www.amanda.org/"
-SRC_URI="mirror://sourceforge/amanda/${P}.tar.gz"
-
-LICENSE="HPND BSD BSD-2 GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="curl gnuplot ipv6 kerberos minimal nls readline s3 samba systemd xfs"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-RDEPEND="sys-libs/readline
-	virtual/awk
-	app-arch/tar
-	dev-lang/perl:=
-	app-arch/dump
-	net-misc/openssh
-	>=dev-libs/glib-2.26.0
-	nls? ( virtual/libintl )
-	s3? ( >=net-misc/curl-7.10.0 )
-	!s3? ( curl? ( >=net-misc/curl-7.10.0 ) )
-	samba? ( net-fs/samba )
-	kerberos? ( app-crypt/mit-krb5 )
-	xfs? ( sys-fs/xfsdump )
-	readline? ( sys-libs/readline )
-	!minimal? (
-		dev-perl/XML-Simple
-		virtual/mailx
-		app-arch/mt-st
-		sys-block/mtx
-		gnuplot? ( sci-visualization/gnuplot )
-		app-crypt/aespipe
-		app-crypt/gnupg
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	>=app-text/docbook-xsl-stylesheets-1.72.0
-	app-text/docbook-xml-dtd
-	dev-libs/libxslt
-	"
-
-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"
-
-amanda_variable_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}"`
-
-}
-
-pkg_setup() {
-	amanda_variable_setup
-
-	# 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
-
-	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() {
-	# we do not want the perl src_unpack
-	default_src_unpack
-}
-
-src_prepare() {
-	# gentoo bug #537248
-	epatch "${FILESDIR}/local-amanda-perl5.20.patch"
-
-	# gentoo bug #331111
-	sed -i '/^check-local: check-perl$/d' "${S}"/config/automake/scripts.am
-	sed -i '/^check-local:/s,syntax-check,,g' "${S}"/perl/Makefile.am
-
-	# bug with glibc-2.16.0
-	sed -i -e '/gets is a security/d' "${S}"/gnulib/stdio.in.h
-
-	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
-
-	if ! use minimal; then
-		sed -i -e 's:^\(my $amandahomedir\)=.*:\1 = $localstatedir;:' \
-			server-src/am{addclient,serverconfig}.pl || die
-	fi
-}
-
-src_configure() {
-	# fix bug #36316
-	addpredict /var/cache/samba/gencache.tdb
-	# fix bug #376169
-	addpredict /run/blkid
-	addpredict /etc/blkid.tab
-
-	[ ! -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 5
-	myconf="${myconf} `use_with kerberos krb5-security`"
-
-	# Amazon S3 support
-	myconf="${myconf} `use_enable s3 s3-device`"
-
-	# libcurl is required for S3 but otherwise optional
-	if ! use s3; then
-		myconf="${myconf} $(use_with curl libcurl)"
-	fi
-
-	# 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`"
-	# This is to prevent the IPv6-is-working test
-	# As the test fails on binpkg build hosts with no IPv6.
-	use ipv6 && export amanda_cv_working_ipv6=yes
-
-	# I18N
-	myconf="${myconf} `use_enable nls`"
-
-	# Bug #296634: Perl location
-	perl_set_version
-	myconf="${myconf} --with-amperldir=${VENDOR_LIB}"
-
-	# Bug 296633: --disable-syntax-checks
-	# Some tests are not safe for production systems
-	myconf="${myconf} --disable-syntax-checks"
-
-	# build manpages
-	myconf="${myconf} --enable-manpage-build"
-
-	# bug #483120
-	tc-export AR
-
-	econf \
-		$(use_with readline) \
-		${myconf}
-}
-
-src_compile() {
-	# Again, do not want the perl-module src_compile
-	default_src_compile
-}
-
-src_install() {
-	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
-	source ${TMPENVFILE}
-
-	einfo "Doing stock install"
-	emake DESTDIR="${D}" install || die
-
-	# 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}"
-
-	# Env.d
-	einfo "Installing environment config file"
-	doenvd "${MYFILESDIR}/${ENVDFILE}"
-
-	# Lock down next section (up until docs).
-	insopts -m0640
-	# Installing Amanda Xinetd Services Definition
-	einfo "Installing xinetd service file"
-	insinto /etc/xinetd.d
-	if use minimal ; then
-		newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-client amanda
-	else
-		newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-server amanda
-	fi
-
-	if ! use minimal; then
-		einfo "Installing Sample Daily Cron Job for Amanda"
-		insinto /etc/cron.daily
-		newins "${MYFILESDIR}/amanda-cron" amanda
-	fi
-
-	einfo "Installing systemd service and socket files for Amanda"
-	systemd_dounit "${FILESDIR}"/amanda.socket || die
-	systemd_newunit "${FILESDIR}"/amanda.service-r1 'amanda@.service' || die
-
-	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
-
-	insinto /etc/amanda
-	doins "${S}/example/amanda-client.conf"
-	if ! use minimal ; then
-		insinto "/etc/amanda/${AMANDA_CONFIG_NAME}"
-		doins "${S}/example/amanda.conf"
-		doins "${S}/example/disklist"
-		keepdir "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}/index"
-	fi
-
-	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
-	# Do NOT use -R
-	fperms 0700 \
-		"${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \
-		"${AMANDA_TMPDIR}" "${AMANDA_TMPDIR}/dumps" \
-		 "${AMANDA_USER_HOMEDIR}/amanda" \
-		 /etc/amanda
-
-	if ! use minimal ; then
-		fperms 0700 \
-			 "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}" \
-	         /etc/amanda/${AMANDA_CONFIG_NAME}
-	fi
-
-	einfo "Setting setuid permissions"
-	amanda_permissions_fix "${D}"
-
-	# Relax permissions again
-	insopts -m0644
-
-	# 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
-
-	einfo "Cleaning up dud .la files"
-	perl_set_version
-	find "${D}"/"${VENDOR_LIB}" -name '*.la' -print0 |xargs -0 rm -f
-}
-
-pkg_postinst() {
-	[ ! -f "${TMPENVFILE}" -a "$MERGE_TYPE" == "binary" ] && \
-		TMPENVFILE="${ROOT}${ENVDIR}/${ENVDFILE}"
-	[ ! -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
-
-	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/${PF}/inetd.amanda.sample"
-	elog "as an example of how to configure your inetd."
-	elog
-	elog "systemd-users: enable and start amanda.socket or the relevant services"
-	elog "regarding what auth method you use."
-	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."
-	elog
-	elog "Please note that this package no longer explicitly depends on"
-	elog "virtual/inetd, as it supports modes where an inetd is not needed"
-	elog "(see bug #506028 for details)."
-	elog "The only exception is when you use the authentication method 'local'."
-}
-
-# 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/amanda-3.3.7.ebuild b/app-backup/amanda/amanda-3.3.7.ebuild
deleted file mode 100644
index 0a2e3ed3f5e..00000000000
--- a/app-backup/amanda/amanda-3.3.7.ebuild
+++ /dev/null
@@ -1,474 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils perl-module user systemd
-
-DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver"
-HOMEPAGE="http://www.amanda.org/"
-SRC_URI="mirror://sourceforge/amanda/${P}.tar.gz"
-
-LICENSE="HPND BSD BSD-2 GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="curl gnuplot ipv6 kerberos minimal nls readline s3 samba systemd xfs"
-
-KEYWORDS="amd64 ~ppc ppc64 ~sparc ~x86"
-RDEPEND="sys-libs/readline
-	virtual/awk
-	app-arch/tar
-	dev-lang/perl:=
-	app-arch/dump
-	net-misc/openssh
-	>=dev-libs/glib-2.26.0
-	nls? ( virtual/libintl )
-	s3? ( >=net-misc/curl-7.10.0 )
-	!s3? ( curl? ( >=net-misc/curl-7.10.0 ) )
-	samba? ( net-fs/samba )
-	kerberos? ( app-crypt/mit-krb5 )
-	xfs? ( sys-fs/xfsdump )
-	readline? ( sys-libs/readline )
-	!minimal? (
-		dev-perl/XML-Simple
-		virtual/mailx
-		app-arch/mt-st
-		sys-block/mtx
-		gnuplot? ( sci-visualization/gnuplot )
-		app-crypt/aespipe
-		app-crypt/gnupg
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	>=app-text/docbook-xsl-stylesheets-1.72.0
-	app-text/docbook-xml-dtd
-	dev-libs/libxslt
-	"
-
-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"
-
-amanda_variable_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}"`
-
-}
-
-pkg_setup() {
-	amanda_variable_setup
-
-	# 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
-
-	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() {
-	# we do not want the perl src_unpack
-	default_src_unpack
-}
-
-src_prepare() {
-	# gentoo bug #331111
-	sed -i '/^check-local: check-perl$/d' "${S}"/config/automake/scripts.am
-	sed -i '/^check-local:/s,syntax-check,,g' "${S}"/perl/Makefile.am
-
-	# bug with glibc-2.16.0
-	sed -i -e '/gets is a security/d' "${S}"/gnulib/stdio.in.h
-
-	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
-
-	if ! use minimal; then
-		sed -i -e 's:^\(my $amandahomedir\)=.*:\1 = $localstatedir;:' \
-			server-src/am{addclient,serverconfig}.pl || die
-	fi
-}
-
-src_configure() {
-	# fix bug #36316
-	addpredict /var/cache/samba/gencache.tdb
-	# fix bug #376169
-	addpredict /run/blkid
-	addpredict /etc/blkid.tab
-
-	[ ! -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 5
-	myconf="${myconf} `use_with kerberos krb5-security`"
-
-	# Amazon S3 support
-	myconf="${myconf} `use_enable s3 s3-device`"
-
-	# libcurl is required for S3 but otherwise optional
-	if ! use s3; then
-		myconf="${myconf} $(use_with curl libcurl)"
-	fi
-
-	# 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`"
-	# This is to prevent the IPv6-is-working test
-	# As the test fails on binpkg build hosts with no IPv6.
-	use ipv6 && export amanda_cv_working_ipv6=yes
-
-	# I18N
-	myconf="${myconf} `use_enable nls`"
-
-	# Bug #296634: Perl location
-	perl_set_version
-	myconf="${myconf} --with-amperldir=${VENDOR_LIB}"
-
-	# Bug 296633: --disable-syntax-checks
-	# Some tests are not safe for production systems
-	myconf="${myconf} --disable-syntax-checks"
-
-	# build manpages
-	myconf="${myconf} --enable-manpage-build"
-
-	# bug #483120
-	tc-export AR
-
-	econf \
-		$(use_with readline) \
-		${myconf}
-}
-
-src_compile() {
-	# Again, do not want the perl-module src_compile
-	default_src_compile
-}
-
-src_install() {
-	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
-	source ${TMPENVFILE}
-
-	einfo "Doing stock install"
-	emake DESTDIR="${D}" install || die
-
-	# 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}"
-
-	# Env.d
-	einfo "Installing environment config file"
-	doenvd "${MYFILESDIR}/${ENVDFILE}"
-
-	# Lock down next section (up until docs).
-	insopts -m0640
-	# Installing Amanda Xinetd Services Definition
-	einfo "Installing xinetd service file"
-	insinto /etc/xinetd.d
-	if use minimal ; then
-		newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-client amanda
-	else
-		newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-server amanda
-	fi
-
-	if ! use minimal; then
-		einfo "Installing Sample Daily Cron Job for Amanda"
-		insinto /etc/cron.daily
-		newins "${MYFILESDIR}/amanda-cron" amanda
-	fi
-
-	einfo "Installing systemd service and socket files for Amanda"
-	systemd_dounit "${FILESDIR}"/amanda.socket || die
-	systemd_newunit "${FILESDIR}"/amanda.service-r1 'amanda@.service' || die
-
-	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
-
-	insinto /etc/amanda
-	doins "${S}/example/amanda-client.conf"
-	if ! use minimal ; then
-		insinto "/etc/amanda/${AMANDA_CONFIG_NAME}"
-		doins "${S}/example/amanda.conf"
-		doins "${S}/example/disklist"
-		keepdir "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}/index"
-	fi
-
-	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
-	# Do NOT use -R
-	fperms 0700 \
-		"${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \
-		"${AMANDA_TMPDIR}" "${AMANDA_TMPDIR}/dumps" \
-		 "${AMANDA_USER_HOMEDIR}/amanda" \
-		 /etc/amanda
-
-	if ! use minimal ; then
-		fperms 0700 \
-			 "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}" \
-	         /etc/amanda/${AMANDA_CONFIG_NAME}
-	fi
-
-	einfo "Setting setuid permissions"
-	amanda_permissions_fix "${D}"
-
-	# Relax permissions again
-	insopts -m0644
-
-	# 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
-
-	einfo "Cleaning up dud .la files"
-	perl_set_version
-	find "${D}"/"${VENDOR_LIB}" -name '*.la' -print0 |xargs -0 rm -f
-}
-
-pkg_postinst() {
-	[ ! -f "${TMPENVFILE}" -a "$MERGE_TYPE" == "binary" ] && \
-		TMPENVFILE="${ROOT}${ENVDIR}/${ENVDFILE}"
-	[ ! -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
-
-	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/${PF}/inetd.amanda.sample"
-	elog "as an example of how to configure your inetd."
-	elog
-	elog "systemd-users: enable and start amanda.socket or the relevant services"
-	elog "regarding what auth method you use."
-	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."
-	elog
-	elog "Please note that this package no longer explicitly depends on"
-	elog "virtual/inetd, as it supports modes where an inetd is not needed"
-	elog "(see bug #506028 for details)."
-	elog "The only exception is when you use the authentication method 'local'."
-}
-
-# 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
-}


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/amanda/
@ 2017-06-10  7:15 Robin H. Johnson
  0 siblings, 0 replies; 26+ messages in thread
From: Robin H. Johnson @ 2017-06-10  7:15 UTC (permalink / raw
  To: gentoo-commits

commit:     458924ced5e21b2e918dab6cb158f133529a5074
Author:     Stefan G. Weichinger <office <AT> oops <DOT> co <DOT> at>
AuthorDate: Fri Jun  9 12:20:30 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Jun 10 07:15:11 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=458924ce

app-backup/amanda: version bump to 3.4.5

(cherry picked from commit 44ac2533196e2acedb67a273bb3f6f19c5a0b1fe)
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
Fixes: https://github.com/gentoo/gentoo/pull/4891

 app-backup/amanda/Manifest            |   1 +
 app-backup/amanda/amanda-3.4.5.ebuild | 479 ++++++++++++++++++++++++++++++++++
 2 files changed, 480 insertions(+)

diff --git a/app-backup/amanda/Manifest b/app-backup/amanda/Manifest
index c1ccc6bb356..8f28f5f72ec 100644
--- a/app-backup/amanda/Manifest
+++ b/app-backup/amanda/Manifest
@@ -6,3 +6,4 @@ DIST amanda-3.4.1.tar.gz 5338575 SHA256 1f69e9bdae774ac2394297dd9d7f98ccbce44ca9
 DIST amanda-3.4.2.tar.gz 5353734 SHA256 175c6a2ef57fe480ddeeefc920a93c8d1cde4111eec76d76e088101a53eeafac SHA512 dea44ffa5eb30318336395ccbd582df2f83da9a4cf91def2834a2e65b2e0f36cafc1911f6b73c3afb63be256484a78b006bdeb1db5b3ecf87dc59d34754987fd WHIRLPOOL af08e2b7b42cead569b69edfa264c1439d21d455e36ba5d346a74631e037773f20cd0563c6cdf95eeea0ee0e1e45328e553a5490ef4c66545acc1a3bd85570d0
 DIST amanda-3.4.3.tar.gz 5355137 SHA256 8ebca59d7b5fc64179fee3d9de4289cd9e8dbb49558e0a21228b06e16105d688 SHA512 5fa7a8c59961f87568d3459e6b5368e50c6cf74e1a6c7599faf5f85d537e72668775acc11009d1d5699ab92d1c21553b5b86e06b804c6a1ae04500889726694a WHIRLPOOL e1c4cd778d5c71994d2c74fef07948476f367fff42e666fb1b516035746c1e9562b9bf4579875e922c44f8dd65924bf9fec5ca7d30bbee0998540c4c319d18b0
 DIST amanda-3.4.4.tar.gz 5363929 SHA256 467e44eccd47170cf8ec40e914a2fbc1e6d50966e6a71c46d96091183c54a3d3 SHA512 e73ee29a6074396a885b08d9b1160b1e379423596dde872a14a8c8cf5845c9fcf3ea08038007a99063169a863d8b9f3ca9c23b8f5609d463a5b1f2ddcd44be96 WHIRLPOOL 221848cd608fd3e45b4f172f56ab691dc2a1dd659f3a5f15df6a2e973daae0964d88fd359c9975147b358289feb77779342f26956b0e693f8683da8d621f04ea
+DIST amanda-3.4.5.tar.gz 5365381 SHA256 bf05ea512676c7520ccff8d711e17176ea2aec47f7c517669cee02e8ab201343 SHA512 441efef6a34a1cb645c8c5d1e909f25230322ceb38d1efa0a104de2d9051640f7032255c8d8c7391a918102aceeb5073048070471fb642e185a2a113c817e00c WHIRLPOOL c21b1cbf276d60fae48c9178b7ae56416c81af4729341e9251b95c50775a3fdaf147c8d1d0e7c33b9477cd215ea4c0c51ac22e16348d2dfd9af20587d53f4b32

diff --git a/app-backup/amanda/amanda-3.4.5.ebuild b/app-backup/amanda/amanda-3.4.5.ebuild
new file mode 100644
index 00000000000..9e26503c1a4
--- /dev/null
+++ b/app-backup/amanda/amanda-3.4.5.ebuild
@@ -0,0 +1,479 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools perl-module user systemd
+
+DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver"
+HOMEPAGE="http://www.amanda.org/"
+SRC_URI="mirror://sourceforge/amanda/${P}.tar.gz"
+
+LICENSE="HPND BSD BSD-2 GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="curl gnuplot ipv6 kerberos minimal nls readline s3 samba systemd xfs"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+RDEPEND="sys-libs/readline:=
+	virtual/awk
+	app-arch/tar
+	dev-lang/perl:=
+	app-arch/dump
+	net-misc/openssh
+	>=dev-libs/glib-2.26.0
+	dev-perl/JSON
+	dev-perl/Encode-Locale
+	nls? ( virtual/libintl )
+	s3? ( >=net-misc/curl-7.10.0 )
+	!s3? ( curl? ( >=net-misc/curl-7.10.0 ) )
+	samba? ( net-fs/samba:= )
+	kerberos? ( app-crypt/mit-krb5 )
+	xfs? ( sys-fs/xfsdump )
+	!minimal? (
+		dev-perl/XML-Simple
+		virtual/mailx
+		app-arch/mt-st:=
+		sys-block/mtx
+		gnuplot? ( sci-visualization/gnuplot )
+		app-crypt/aespipe
+		app-crypt/gnupg
+	)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	>=app-text/docbook-xsl-stylesheets-1.72.0
+	app-text/docbook-xml-dtd
+	dev-libs/libxslt
+	dev-lang/swig
+	"
+
+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_TAPE_DEVICE 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_variable_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_TAPE_DEVICE}" ]] && AMANDA_SERVER_TAPE_DEVICE="/dev/nst0"
+	[[ -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 "${EROOT}${ENVDIR}/${ENVDFILE}" ]]; then
+		# We don't just source it as we don't want everything in there.
+		eval $(egrep "^AMANDA_" "${EROOT}${ENVDIR}/${ENVDFILE}" | grep -v '^AMANDA_ENV_SETTINGS')
+	fi
+
+	# Re-apply the new settings if any
+	[ -n "${currentamanda}" ] && eval $(echo "${currentamanda}")
+
+}
+
+pkg_setup() {
+	amanda_variable_setup
+
+	# 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
+
+	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() {
+	# we do not want the perl src_unpack
+	default_src_unpack
+}
+
+src_prepare() {
+	# gentoo bug #331111
+	sed -i '/^check-local: check-perl$/d' "${S}"/config/automake/scripts.am || die
+	sed -i '/^check-local:/s,syntax-check,,g' "${S}"/perl/Makefile.am || die
+
+	# bug with glibc-2.16.0
+	sed -i -e '/gets is a security/d' "${S}"/gnulib/stdio.in.h || die
+
+	eautoreconf
+
+	# places for us to work in
+	mkdir -p "${MYFILESDIR}" || die
+	# Now we store the settings we just created
+	set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' > "${TMPENVFILE}" || die
+
+	# 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}`" || die
+	done
+
+	if use minimal; then
+		cat "${MYFILESDIR}"/amanda-amandahosts-server-2.5.1_p3-r1 > "${T}"/amandahosts || die
+	else
+		sed -i -e 's:^\(my $amandahomedir\)=.*:\1 = $localstatedir;:' \
+			server-src/am{addclient,serverconfig}.pl || die
+		cat "${MYFILESDIR}"/amanda-amandahosts-client-2.5.1_p3-r1 > "${T}"/amandahosts || die
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	# fix bug #36316
+	addpredict /var/cache/samba/gencache.tdb
+	# fix bug #376169
+	addpredict /run/blkid
+	addpredict /etc/blkid.tab
+
+	[ ! -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_TAPE_DEVICE} for tape server."
+	myconf="${myconf} --with-tape-device=${AMANDA_SERVER_TAPE_DEVICE}"
+	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 5
+	myconf="${myconf} $(use_with kerberos krb5-security)"
+
+	# Amazon S3 support
+	myconf="${myconf} `use_enable s3 s3-device`"
+
+	# libcurl is required for S3 but otherwise optional
+	if ! use s3; then
+		myconf="${myconf} $(use_with curl libcurl)"
+	fi
+
+	# 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`"
+	# This is to prevent the IPv6-is-working test
+	# As the test fails on binpkg build hosts with no IPv6.
+	use ipv6 && export amanda_cv_working_ipv6=yes
+
+	# I18N
+	myconf="${myconf} `use_enable nls`"
+
+	# Bug #296634: Perl location
+	perl_set_version
+	myconf="${myconf} --with-amperldir=${VENDOR_LIB}"
+
+	# Bug 296633: --disable-syntax-checks
+	# Some tests are not safe for production systems
+	myconf="${myconf} --disable-syntax-checks"
+
+	# build manpages
+	myconf="${myconf} --enable-manpage-build"
+
+	# bug #483120
+	tc-export AR
+
+	econf \
+		$(use_with readline) \
+		${myconf}
+}
+
+src_compile() {
+	# Again, do not want the perl-module src_compile
+	default_src_compile
+}
+
+src_install() {
+	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
+	source ${TMPENVFILE}
+
+	einfo "Doing stock install"
+	emake DESTDIR="${D}" install || die
+
+	# 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}"
+
+	# Env.d
+	einfo "Installing environment config file"
+	doenvd "${MYFILESDIR}/${ENVDFILE}"
+
+	# Lock down next section (up until docs).
+	insopts -m0640
+	# Installing Amanda Xinetd Services Definition
+	einfo "Installing xinetd service file"
+	insinto /etc/xinetd.d
+	if use minimal ; then
+		newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-client amanda
+	else
+		newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-server amanda
+	fi
+
+	if ! use minimal; then
+		einfo "Installing Sample Daily Cron Job for Amanda"
+		insinto /etc/cron.daily
+		newins "${MYFILESDIR}/amanda-cron" amanda
+	fi
+
+	einfo "Installing systemd service and socket files for Amanda"
+	systemd_dounit "${FILESDIR}"/amanda.socket || die
+	systemd_newunit "${FILESDIR}"/amanda.service 'amanda@.service' || die
+
+	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
+
+	insinto /etc/amanda
+	doins "${S}/example/amanda-client.conf"
+	if ! use minimal ; then
+		insinto "/etc/amanda/${AMANDA_CONFIG_NAME}"
+		doins "${S}/example/amanda.conf"
+		doins "${S}/example/disklist"
+		keepdir "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}/index"
+	fi
+
+	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
+	# Do NOT use -R
+	fperms 0700 \
+		"${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \
+		"${AMANDA_TMPDIR}" "${AMANDA_TMPDIR}/dumps" \
+		 "${AMANDA_USER_HOMEDIR}/amanda" \
+		 /etc/amanda
+
+	if ! use minimal ; then
+		fperms 0700 \
+			 "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}" \
+	         /etc/amanda/${AMANDA_CONFIG_NAME}
+	fi
+
+	einfo "Setting setuid permissions"
+	amanda_permissions_fix "${D}"
+
+	# Relax permissions again
+	insopts -m0644
+
+	# 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
+
+	einfo "Cleaning up dud .la files"
+	perl_set_version
+	find "${D}"/"${VENDOR_LIB}" -name '*.la' -print0 |xargs -0 rm -f
+}
+
+pkg_postinst() {
+	[ ! -f "${TMPENVFILE}" -a "$MERGE_TYPE" == "binary" ] && \
+		TMPENVFILE="${ROOT}${ENVDIR}/${ENVDFILE}"
+	[ ! -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
+
+	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/${PF}/inetd.amanda.sample"
+	elog "as an example of how to configure your inetd."
+	elog
+	elog "systemd-users: enable and start amanda.socket or the relevant services"
+	elog "regarding what auth method you use."
+	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."
+	elog "The only exception is when you use the authentication method 'local'."
+	elog
+	elog "Please note that this package no longer explicitly depends on"
+	elog "virtual/inetd, as it supports modes where an inetd is not needed"
+	elog "(see bug #506028 for details)."
+}
+
+# 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
+}


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/amanda/
@ 2017-05-04 17:21 Robin H. Johnson
  0 siblings, 0 replies; 26+ messages in thread
From: Robin H. Johnson @ 2017-05-04 17:21 UTC (permalink / raw
  To: gentoo-commits

commit:     5ac479a46b8bfaaa421b8c5d0620d34413fd42b4
Author:     Stefan G. Weichinger <office <AT> oops <DOT> co <DOT> at>
AuthorDate: Thu May  4 08:32:31 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu May  4 17:21:03 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ac479a4

app-backup/amanda: version bump to 3.4.4

(cherry picked from commit d4aba38537bd4de517d106a440a3be3fed836092)
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
Fixes: https://github.com/gentoo/gentoo/pull/4540

 app-backup/amanda/Manifest            |   1 +
 app-backup/amanda/amanda-3.4.4.ebuild | 479 ++++++++++++++++++++++++++++++++++
 2 files changed, 480 insertions(+)

diff --git a/app-backup/amanda/Manifest b/app-backup/amanda/Manifest
index 8fcc112a08d..c1ccc6bb356 100644
--- a/app-backup/amanda/Manifest
+++ b/app-backup/amanda/Manifest
@@ -5,3 +5,4 @@ DIST amanda-3.3.9.tar.gz 4673301 SHA256 2520b95ca96f1d521d582b7c94bd631486e7029e
 DIST amanda-3.4.1.tar.gz 5338575 SHA256 1f69e9bdae774ac2394297dd9d7f98ccbce44ca9199317ada764ca173909d2ac SHA512 245bf334e36fe8b4361d9fc27ea7e7ef5bd2ecec74719caa16cc94d1ebb3abbef058e28d9afd85851654aaae0984531593a35c079d1ba4aed0fc5177e907ec16 WHIRLPOOL b9608456f28fb35137276f16ec24d79ae397a44450b42ec4fa28256763798dee623ab560ba0db147ff41d2abc57810e2318ae64741ea0a054a8ff853f4ad9c59
 DIST amanda-3.4.2.tar.gz 5353734 SHA256 175c6a2ef57fe480ddeeefc920a93c8d1cde4111eec76d76e088101a53eeafac SHA512 dea44ffa5eb30318336395ccbd582df2f83da9a4cf91def2834a2e65b2e0f36cafc1911f6b73c3afb63be256484a78b006bdeb1db5b3ecf87dc59d34754987fd WHIRLPOOL af08e2b7b42cead569b69edfa264c1439d21d455e36ba5d346a74631e037773f20cd0563c6cdf95eeea0ee0e1e45328e553a5490ef4c66545acc1a3bd85570d0
 DIST amanda-3.4.3.tar.gz 5355137 SHA256 8ebca59d7b5fc64179fee3d9de4289cd9e8dbb49558e0a21228b06e16105d688 SHA512 5fa7a8c59961f87568d3459e6b5368e50c6cf74e1a6c7599faf5f85d537e72668775acc11009d1d5699ab92d1c21553b5b86e06b804c6a1ae04500889726694a WHIRLPOOL e1c4cd778d5c71994d2c74fef07948476f367fff42e666fb1b516035746c1e9562b9bf4579875e922c44f8dd65924bf9fec5ca7d30bbee0998540c4c319d18b0
+DIST amanda-3.4.4.tar.gz 5363929 SHA256 467e44eccd47170cf8ec40e914a2fbc1e6d50966e6a71c46d96091183c54a3d3 SHA512 e73ee29a6074396a885b08d9b1160b1e379423596dde872a14a8c8cf5845c9fcf3ea08038007a99063169a863d8b9f3ca9c23b8f5609d463a5b1f2ddcd44be96 WHIRLPOOL 221848cd608fd3e45b4f172f56ab691dc2a1dd659f3a5f15df6a2e973daae0964d88fd359c9975147b358289feb77779342f26956b0e693f8683da8d621f04ea

diff --git a/app-backup/amanda/amanda-3.4.4.ebuild b/app-backup/amanda/amanda-3.4.4.ebuild
new file mode 100644
index 00000000000..9e26503c1a4
--- /dev/null
+++ b/app-backup/amanda/amanda-3.4.4.ebuild
@@ -0,0 +1,479 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools perl-module user systemd
+
+DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver"
+HOMEPAGE="http://www.amanda.org/"
+SRC_URI="mirror://sourceforge/amanda/${P}.tar.gz"
+
+LICENSE="HPND BSD BSD-2 GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="curl gnuplot ipv6 kerberos minimal nls readline s3 samba systemd xfs"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+RDEPEND="sys-libs/readline:=
+	virtual/awk
+	app-arch/tar
+	dev-lang/perl:=
+	app-arch/dump
+	net-misc/openssh
+	>=dev-libs/glib-2.26.0
+	dev-perl/JSON
+	dev-perl/Encode-Locale
+	nls? ( virtual/libintl )
+	s3? ( >=net-misc/curl-7.10.0 )
+	!s3? ( curl? ( >=net-misc/curl-7.10.0 ) )
+	samba? ( net-fs/samba:= )
+	kerberos? ( app-crypt/mit-krb5 )
+	xfs? ( sys-fs/xfsdump )
+	!minimal? (
+		dev-perl/XML-Simple
+		virtual/mailx
+		app-arch/mt-st:=
+		sys-block/mtx
+		gnuplot? ( sci-visualization/gnuplot )
+		app-crypt/aespipe
+		app-crypt/gnupg
+	)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	>=app-text/docbook-xsl-stylesheets-1.72.0
+	app-text/docbook-xml-dtd
+	dev-libs/libxslt
+	dev-lang/swig
+	"
+
+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_TAPE_DEVICE 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_variable_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_TAPE_DEVICE}" ]] && AMANDA_SERVER_TAPE_DEVICE="/dev/nst0"
+	[[ -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 "${EROOT}${ENVDIR}/${ENVDFILE}" ]]; then
+		# We don't just source it as we don't want everything in there.
+		eval $(egrep "^AMANDA_" "${EROOT}${ENVDIR}/${ENVDFILE}" | grep -v '^AMANDA_ENV_SETTINGS')
+	fi
+
+	# Re-apply the new settings if any
+	[ -n "${currentamanda}" ] && eval $(echo "${currentamanda}")
+
+}
+
+pkg_setup() {
+	amanda_variable_setup
+
+	# 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
+
+	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() {
+	# we do not want the perl src_unpack
+	default_src_unpack
+}
+
+src_prepare() {
+	# gentoo bug #331111
+	sed -i '/^check-local: check-perl$/d' "${S}"/config/automake/scripts.am || die
+	sed -i '/^check-local:/s,syntax-check,,g' "${S}"/perl/Makefile.am || die
+
+	# bug with glibc-2.16.0
+	sed -i -e '/gets is a security/d' "${S}"/gnulib/stdio.in.h || die
+
+	eautoreconf
+
+	# places for us to work in
+	mkdir -p "${MYFILESDIR}" || die
+	# Now we store the settings we just created
+	set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' > "${TMPENVFILE}" || die
+
+	# 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}`" || die
+	done
+
+	if use minimal; then
+		cat "${MYFILESDIR}"/amanda-amandahosts-server-2.5.1_p3-r1 > "${T}"/amandahosts || die
+	else
+		sed -i -e 's:^\(my $amandahomedir\)=.*:\1 = $localstatedir;:' \
+			server-src/am{addclient,serverconfig}.pl || die
+		cat "${MYFILESDIR}"/amanda-amandahosts-client-2.5.1_p3-r1 > "${T}"/amandahosts || die
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	# fix bug #36316
+	addpredict /var/cache/samba/gencache.tdb
+	# fix bug #376169
+	addpredict /run/blkid
+	addpredict /etc/blkid.tab
+
+	[ ! -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_TAPE_DEVICE} for tape server."
+	myconf="${myconf} --with-tape-device=${AMANDA_SERVER_TAPE_DEVICE}"
+	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 5
+	myconf="${myconf} $(use_with kerberos krb5-security)"
+
+	# Amazon S3 support
+	myconf="${myconf} `use_enable s3 s3-device`"
+
+	# libcurl is required for S3 but otherwise optional
+	if ! use s3; then
+		myconf="${myconf} $(use_with curl libcurl)"
+	fi
+
+	# 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`"
+	# This is to prevent the IPv6-is-working test
+	# As the test fails on binpkg build hosts with no IPv6.
+	use ipv6 && export amanda_cv_working_ipv6=yes
+
+	# I18N
+	myconf="${myconf} `use_enable nls`"
+
+	# Bug #296634: Perl location
+	perl_set_version
+	myconf="${myconf} --with-amperldir=${VENDOR_LIB}"
+
+	# Bug 296633: --disable-syntax-checks
+	# Some tests are not safe for production systems
+	myconf="${myconf} --disable-syntax-checks"
+
+	# build manpages
+	myconf="${myconf} --enable-manpage-build"
+
+	# bug #483120
+	tc-export AR
+
+	econf \
+		$(use_with readline) \
+		${myconf}
+}
+
+src_compile() {
+	# Again, do not want the perl-module src_compile
+	default_src_compile
+}
+
+src_install() {
+	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
+	source ${TMPENVFILE}
+
+	einfo "Doing stock install"
+	emake DESTDIR="${D}" install || die
+
+	# 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}"
+
+	# Env.d
+	einfo "Installing environment config file"
+	doenvd "${MYFILESDIR}/${ENVDFILE}"
+
+	# Lock down next section (up until docs).
+	insopts -m0640
+	# Installing Amanda Xinetd Services Definition
+	einfo "Installing xinetd service file"
+	insinto /etc/xinetd.d
+	if use minimal ; then
+		newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-client amanda
+	else
+		newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-server amanda
+	fi
+
+	if ! use minimal; then
+		einfo "Installing Sample Daily Cron Job for Amanda"
+		insinto /etc/cron.daily
+		newins "${MYFILESDIR}/amanda-cron" amanda
+	fi
+
+	einfo "Installing systemd service and socket files for Amanda"
+	systemd_dounit "${FILESDIR}"/amanda.socket || die
+	systemd_newunit "${FILESDIR}"/amanda.service 'amanda@.service' || die
+
+	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
+
+	insinto /etc/amanda
+	doins "${S}/example/amanda-client.conf"
+	if ! use minimal ; then
+		insinto "/etc/amanda/${AMANDA_CONFIG_NAME}"
+		doins "${S}/example/amanda.conf"
+		doins "${S}/example/disklist"
+		keepdir "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}/index"
+	fi
+
+	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
+	# Do NOT use -R
+	fperms 0700 \
+		"${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \
+		"${AMANDA_TMPDIR}" "${AMANDA_TMPDIR}/dumps" \
+		 "${AMANDA_USER_HOMEDIR}/amanda" \
+		 /etc/amanda
+
+	if ! use minimal ; then
+		fperms 0700 \
+			 "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}" \
+	         /etc/amanda/${AMANDA_CONFIG_NAME}
+	fi
+
+	einfo "Setting setuid permissions"
+	amanda_permissions_fix "${D}"
+
+	# Relax permissions again
+	insopts -m0644
+
+	# 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
+
+	einfo "Cleaning up dud .la files"
+	perl_set_version
+	find "${D}"/"${VENDOR_LIB}" -name '*.la' -print0 |xargs -0 rm -f
+}
+
+pkg_postinst() {
+	[ ! -f "${TMPENVFILE}" -a "$MERGE_TYPE" == "binary" ] && \
+		TMPENVFILE="${ROOT}${ENVDIR}/${ENVDFILE}"
+	[ ! -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
+
+	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/${PF}/inetd.amanda.sample"
+	elog "as an example of how to configure your inetd."
+	elog
+	elog "systemd-users: enable and start amanda.socket or the relevant services"
+	elog "regarding what auth method you use."
+	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."
+	elog "The only exception is when you use the authentication method 'local'."
+	elog
+	elog "Please note that this package no longer explicitly depends on"
+	elog "virtual/inetd, as it supports modes where an inetd is not needed"
+	elog "(see bug #506028 for details)."
+}
+
+# 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
+}


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/amanda/
@ 2017-03-02 20:36 Robin H. Johnson
  0 siblings, 0 replies; 26+ messages in thread
From: Robin H. Johnson @ 2017-03-02 20:36 UTC (permalink / raw
  To: gentoo-commits

commit:     5d1a0310418e71c0467712c9216b2b47f62d0f39
Author:     Stefan G. Weichinger <office <AT> oops <DOT> co <DOT> at>
AuthorDate: Wed Mar  1 17:48:50 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Mar  2 20:36:02 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d1a0310

app-backup/amanda: version bump to 3.4.3

(cherry picked from commit b2ef81c443097de5527d877b77816d79ffaa0887)
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 app-backup/amanda/Manifest            |   1 +
 app-backup/amanda/amanda-3.4.3.ebuild | 479 ++++++++++++++++++++++++++++++++++
 2 files changed, 480 insertions(+)

diff --git a/app-backup/amanda/Manifest b/app-backup/amanda/Manifest
index 8427d0cfa64..8fcc112a08d 100644
--- a/app-backup/amanda/Manifest
+++ b/app-backup/amanda/Manifest
@@ -4,3 +4,4 @@ DIST amanda-3.3.7.tar.gz 4618547 SHA256 cd1534c7d9c5b97afcb52b189f05fb158972fadb
 DIST amanda-3.3.9.tar.gz 4673301 SHA256 2520b95ca96f1d521d582b7c94bd631486e7029eda1de8e1887d74b323549a41 SHA512 345670a20cff335453e8dcbf457d1fcdb9f266e4a03d729c2b1ba762f4fac323de4a87713d0fd54c11ca244a08dc97fb8c641625f7fa81cb241b3c17748b1b7e WHIRLPOOL e149ab7dbc30cf3585e41d9fb338dd96ab4dd440e31723be51b8ccc9e5841f8dda31d3b89418474e31c7c2498f40177c646f03713c256a4d9341152e2ce2c8e4
 DIST amanda-3.4.1.tar.gz 5338575 SHA256 1f69e9bdae774ac2394297dd9d7f98ccbce44ca9199317ada764ca173909d2ac SHA512 245bf334e36fe8b4361d9fc27ea7e7ef5bd2ecec74719caa16cc94d1ebb3abbef058e28d9afd85851654aaae0984531593a35c079d1ba4aed0fc5177e907ec16 WHIRLPOOL b9608456f28fb35137276f16ec24d79ae397a44450b42ec4fa28256763798dee623ab560ba0db147ff41d2abc57810e2318ae64741ea0a054a8ff853f4ad9c59
 DIST amanda-3.4.2.tar.gz 5353734 SHA256 175c6a2ef57fe480ddeeefc920a93c8d1cde4111eec76d76e088101a53eeafac SHA512 dea44ffa5eb30318336395ccbd582df2f83da9a4cf91def2834a2e65b2e0f36cafc1911f6b73c3afb63be256484a78b006bdeb1db5b3ecf87dc59d34754987fd WHIRLPOOL af08e2b7b42cead569b69edfa264c1439d21d455e36ba5d346a74631e037773f20cd0563c6cdf95eeea0ee0e1e45328e553a5490ef4c66545acc1a3bd85570d0
+DIST amanda-3.4.3.tar.gz 5355137 SHA256 8ebca59d7b5fc64179fee3d9de4289cd9e8dbb49558e0a21228b06e16105d688 SHA512 5fa7a8c59961f87568d3459e6b5368e50c6cf74e1a6c7599faf5f85d537e72668775acc11009d1d5699ab92d1c21553b5b86e06b804c6a1ae04500889726694a WHIRLPOOL e1c4cd778d5c71994d2c74fef07948476f367fff42e666fb1b516035746c1e9562b9bf4579875e922c44f8dd65924bf9fec5ca7d30bbee0998540c4c319d18b0

diff --git a/app-backup/amanda/amanda-3.4.3.ebuild b/app-backup/amanda/amanda-3.4.3.ebuild
new file mode 100644
index 00000000000..9e26503c1a4
--- /dev/null
+++ b/app-backup/amanda/amanda-3.4.3.ebuild
@@ -0,0 +1,479 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools perl-module user systemd
+
+DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver"
+HOMEPAGE="http://www.amanda.org/"
+SRC_URI="mirror://sourceforge/amanda/${P}.tar.gz"
+
+LICENSE="HPND BSD BSD-2 GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="curl gnuplot ipv6 kerberos minimal nls readline s3 samba systemd xfs"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+RDEPEND="sys-libs/readline:=
+	virtual/awk
+	app-arch/tar
+	dev-lang/perl:=
+	app-arch/dump
+	net-misc/openssh
+	>=dev-libs/glib-2.26.0
+	dev-perl/JSON
+	dev-perl/Encode-Locale
+	nls? ( virtual/libintl )
+	s3? ( >=net-misc/curl-7.10.0 )
+	!s3? ( curl? ( >=net-misc/curl-7.10.0 ) )
+	samba? ( net-fs/samba:= )
+	kerberos? ( app-crypt/mit-krb5 )
+	xfs? ( sys-fs/xfsdump )
+	!minimal? (
+		dev-perl/XML-Simple
+		virtual/mailx
+		app-arch/mt-st:=
+		sys-block/mtx
+		gnuplot? ( sci-visualization/gnuplot )
+		app-crypt/aespipe
+		app-crypt/gnupg
+	)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	>=app-text/docbook-xsl-stylesheets-1.72.0
+	app-text/docbook-xml-dtd
+	dev-libs/libxslt
+	dev-lang/swig
+	"
+
+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_TAPE_DEVICE 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_variable_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_TAPE_DEVICE}" ]] && AMANDA_SERVER_TAPE_DEVICE="/dev/nst0"
+	[[ -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 "${EROOT}${ENVDIR}/${ENVDFILE}" ]]; then
+		# We don't just source it as we don't want everything in there.
+		eval $(egrep "^AMANDA_" "${EROOT}${ENVDIR}/${ENVDFILE}" | grep -v '^AMANDA_ENV_SETTINGS')
+	fi
+
+	# Re-apply the new settings if any
+	[ -n "${currentamanda}" ] && eval $(echo "${currentamanda}")
+
+}
+
+pkg_setup() {
+	amanda_variable_setup
+
+	# 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
+
+	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() {
+	# we do not want the perl src_unpack
+	default_src_unpack
+}
+
+src_prepare() {
+	# gentoo bug #331111
+	sed -i '/^check-local: check-perl$/d' "${S}"/config/automake/scripts.am || die
+	sed -i '/^check-local:/s,syntax-check,,g' "${S}"/perl/Makefile.am || die
+
+	# bug with glibc-2.16.0
+	sed -i -e '/gets is a security/d' "${S}"/gnulib/stdio.in.h || die
+
+	eautoreconf
+
+	# places for us to work in
+	mkdir -p "${MYFILESDIR}" || die
+	# Now we store the settings we just created
+	set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' > "${TMPENVFILE}" || die
+
+	# 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}`" || die
+	done
+
+	if use minimal; then
+		cat "${MYFILESDIR}"/amanda-amandahosts-server-2.5.1_p3-r1 > "${T}"/amandahosts || die
+	else
+		sed -i -e 's:^\(my $amandahomedir\)=.*:\1 = $localstatedir;:' \
+			server-src/am{addclient,serverconfig}.pl || die
+		cat "${MYFILESDIR}"/amanda-amandahosts-client-2.5.1_p3-r1 > "${T}"/amandahosts || die
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	# fix bug #36316
+	addpredict /var/cache/samba/gencache.tdb
+	# fix bug #376169
+	addpredict /run/blkid
+	addpredict /etc/blkid.tab
+
+	[ ! -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_TAPE_DEVICE} for tape server."
+	myconf="${myconf} --with-tape-device=${AMANDA_SERVER_TAPE_DEVICE}"
+	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 5
+	myconf="${myconf} $(use_with kerberos krb5-security)"
+
+	# Amazon S3 support
+	myconf="${myconf} `use_enable s3 s3-device`"
+
+	# libcurl is required for S3 but otherwise optional
+	if ! use s3; then
+		myconf="${myconf} $(use_with curl libcurl)"
+	fi
+
+	# 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`"
+	# This is to prevent the IPv6-is-working test
+	# As the test fails on binpkg build hosts with no IPv6.
+	use ipv6 && export amanda_cv_working_ipv6=yes
+
+	# I18N
+	myconf="${myconf} `use_enable nls`"
+
+	# Bug #296634: Perl location
+	perl_set_version
+	myconf="${myconf} --with-amperldir=${VENDOR_LIB}"
+
+	# Bug 296633: --disable-syntax-checks
+	# Some tests are not safe for production systems
+	myconf="${myconf} --disable-syntax-checks"
+
+	# build manpages
+	myconf="${myconf} --enable-manpage-build"
+
+	# bug #483120
+	tc-export AR
+
+	econf \
+		$(use_with readline) \
+		${myconf}
+}
+
+src_compile() {
+	# Again, do not want the perl-module src_compile
+	default_src_compile
+}
+
+src_install() {
+	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
+	source ${TMPENVFILE}
+
+	einfo "Doing stock install"
+	emake DESTDIR="${D}" install || die
+
+	# 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}"
+
+	# Env.d
+	einfo "Installing environment config file"
+	doenvd "${MYFILESDIR}/${ENVDFILE}"
+
+	# Lock down next section (up until docs).
+	insopts -m0640
+	# Installing Amanda Xinetd Services Definition
+	einfo "Installing xinetd service file"
+	insinto /etc/xinetd.d
+	if use minimal ; then
+		newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-client amanda
+	else
+		newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-server amanda
+	fi
+
+	if ! use minimal; then
+		einfo "Installing Sample Daily Cron Job for Amanda"
+		insinto /etc/cron.daily
+		newins "${MYFILESDIR}/amanda-cron" amanda
+	fi
+
+	einfo "Installing systemd service and socket files for Amanda"
+	systemd_dounit "${FILESDIR}"/amanda.socket || die
+	systemd_newunit "${FILESDIR}"/amanda.service 'amanda@.service' || die
+
+	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
+
+	insinto /etc/amanda
+	doins "${S}/example/amanda-client.conf"
+	if ! use minimal ; then
+		insinto "/etc/amanda/${AMANDA_CONFIG_NAME}"
+		doins "${S}/example/amanda.conf"
+		doins "${S}/example/disklist"
+		keepdir "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}/index"
+	fi
+
+	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
+	# Do NOT use -R
+	fperms 0700 \
+		"${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \
+		"${AMANDA_TMPDIR}" "${AMANDA_TMPDIR}/dumps" \
+		 "${AMANDA_USER_HOMEDIR}/amanda" \
+		 /etc/amanda
+
+	if ! use minimal ; then
+		fperms 0700 \
+			 "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}" \
+	         /etc/amanda/${AMANDA_CONFIG_NAME}
+	fi
+
+	einfo "Setting setuid permissions"
+	amanda_permissions_fix "${D}"
+
+	# Relax permissions again
+	insopts -m0644
+
+	# 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
+
+	einfo "Cleaning up dud .la files"
+	perl_set_version
+	find "${D}"/"${VENDOR_LIB}" -name '*.la' -print0 |xargs -0 rm -f
+}
+
+pkg_postinst() {
+	[ ! -f "${TMPENVFILE}" -a "$MERGE_TYPE" == "binary" ] && \
+		TMPENVFILE="${ROOT}${ENVDIR}/${ENVDFILE}"
+	[ ! -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
+
+	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/${PF}/inetd.amanda.sample"
+	elog "as an example of how to configure your inetd."
+	elog
+	elog "systemd-users: enable and start amanda.socket or the relevant services"
+	elog "regarding what auth method you use."
+	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."
+	elog "The only exception is when you use the authentication method 'local'."
+	elog
+	elog "Please note that this package no longer explicitly depends on"
+	elog "virtual/inetd, as it supports modes where an inetd is not needed"
+	elog "(see bug #506028 for details)."
+}
+
+# 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
+}


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/amanda/
@ 2017-02-02 20:01 Robin H. Johnson
  0 siblings, 0 replies; 26+ messages in thread
From: Robin H. Johnson @ 2017-02-02 20:01 UTC (permalink / raw
  To: gentoo-commits

commit:     a120cba32531abbc6aa01e190dbaa3736696ef08
Author:     Stefan G. Weichinger <office <AT> oops <DOT> co <DOT> at>
AuthorDate: Thu Feb  2 14:36:29 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Feb  2 20:01:28 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a120cba3

fixes bug #607980

(cherry picked from commit 8b620fe3f8143a1a394937fda520ce9e2306fe16)
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
Fixes: https://github.com/gentoo/gentoo/pull/3773

 app-backup/amanda/amanda-3.4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-backup/amanda/amanda-3.4.2.ebuild b/app-backup/amanda/amanda-3.4.2.ebuild
index 472b5ab..2964176 100644
--- a/app-backup/amanda/amanda-3.4.2.ebuild
+++ b/app-backup/amanda/amanda-3.4.2.ebuild
@@ -170,7 +170,7 @@ src_prepare() {
 	done
 
 	if use minimal; then
-		cat "${MYFILESDIR}"/amanda-amandahosts-server.5.1_p3-r1 > "${T}"/amandahosts || die
+		cat "${MYFILESDIR}"/amanda-amandahosts-server-2.5.1_p3-r1 > "${T}"/amandahosts || die
 	else
 		sed -i -e 's:^\(my $amandahomedir\)=.*:\1 = $localstatedir;:' \
 			server-src/am{addclient,serverconfig}.pl || die


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/amanda/
@ 2017-01-03 10:38 Agostino Sarubbo
  0 siblings, 0 replies; 26+ messages in thread
From: Agostino Sarubbo @ 2017-01-03 10:38 UTC (permalink / raw
  To: gentoo-commits

commit:     e9e541ad605b35fbe3cb5013fbd3bb70a899a39a
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  3 10:36:28 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Jan  3 10:38:30 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9e541ad

app-backup/amanda: ppc64 stable wrt bug #549626

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 app-backup/amanda/amanda-3.3.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-backup/amanda/amanda-3.3.9.ebuild b/app-backup/amanda/amanda-3.3.9.ebuild
index 063a8ba..14dfae8 100644
--- a/app-backup/amanda/amanda-3.3.9.ebuild
+++ b/app-backup/amanda/amanda-3.3.9.ebuild
@@ -13,7 +13,7 @@ LICENSE="HPND BSD BSD-2 GPL-2+ GPL-3+"
 SLOT="0"
 IUSE="curl gnuplot ipv6 kerberos minimal nls readline s3 samba systemd xfs"
 
-KEYWORDS="amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
 RDEPEND="sys-libs/readline:=
 	virtual/awk
 	app-arch/tar


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/amanda/
@ 2016-09-27  7:09 Agostino Sarubbo
  0 siblings, 0 replies; 26+ messages in thread
From: Agostino Sarubbo @ 2016-09-27  7:09 UTC (permalink / raw
  To: gentoo-commits

commit:     fa4ba3627ce737f561e211d7290629398d9c03b4
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 27 07:09:33 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Sep 27 07:09:33 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa4ba362

app-backup/amanda: amd64 stable wrt bug #549626

Package-Manager: portage-2.2.28
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 app-backup/amanda/amanda-3.3.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-backup/amanda/amanda-3.3.9.ebuild b/app-backup/amanda/amanda-3.3.9.ebuild
index b0dc41f..c1b541f 100644
--- a/app-backup/amanda/amanda-3.3.9.ebuild
+++ b/app-backup/amanda/amanda-3.3.9.ebuild
@@ -13,7 +13,7 @@ LICENSE="HPND BSD BSD-2 GPL-2+ GPL-3+"
 SLOT="0"
 IUSE="curl gnuplot ipv6 kerberos minimal nls readline s3 samba systemd xfs"
 
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc ~x86"
 RDEPEND="sys-libs/readline:=
 	virtual/awk
 	app-arch/tar


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/amanda/
@ 2016-04-06  4:39 Ian Delaney
  0 siblings, 0 replies; 26+ messages in thread
From: Ian Delaney @ 2016-04-06  4:39 UTC (permalink / raw
  To: gentoo-commits

commit:     bfb6bf22a8a6d911ba4676aa34f13aa75c976c9f
Author:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  4 12:36:59 2016 +0000
Commit:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Wed Apr  6 04:39:39 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfb6bf22

app-backup/amanda: metadata.xml, update

Reset description attribute for user maintainer in metadata.xml

Package-Manager: portage-2.2.28

 app-backup/amanda/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-backup/amanda/metadata.xml b/app-backup/amanda/metadata.xml
index 8a0beb7..110b169 100644
--- a/app-backup/amanda/metadata.xml
+++ b/app-backup/amanda/metadata.xml
@@ -9,7 +9,7 @@
 	<maintainer type="person">
 		<email>lists@xunil.at</email>
 		<name>Stefan G. Weichinger</name>
-		<description>Proxied developer. Please CC on bugs.</description>
+		<description>Proxied developer; set to assignee in all bugs</description>
 	</maintainer>
 	<maintainer type="person">
 		<email>dustin@v.igoro.us</email>


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/amanda/
@ 2016-04-01  8:52 Ian Delaney
  0 siblings, 0 replies; 26+ messages in thread
From: Ian Delaney @ 2016-04-01  8:52 UTC (permalink / raw
  To: gentoo-commits

commit:     7609504718b0dbd9f406e80923a574fb574fa23b
Author:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  1 08:38:28 2016 +0000
Commit:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Fri Apr  1 08:51:45 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76095047

app-backup/amanda: remove duplicate entry of name

Package-Manager: portage-2.2.28

 app-backup/amanda/metadata.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app-backup/amanda/metadata.xml b/app-backup/amanda/metadata.xml
index 9b85151..8a0beb7 100644
--- a/app-backup/amanda/metadata.xml
+++ b/app-backup/amanda/metadata.xml
@@ -8,9 +8,8 @@
 	</maintainer>
 	<maintainer type="person">
 		<email>lists@xunil.at</email>
-		<name>Stefan Weichinger</name>
-		<description>Proxied developer. Please CC on bugs.</description>
 		<name>Stefan G. Weichinger</name>
+		<description>Proxied developer. Please CC on bugs.</description>
 	</maintainer>
 	<maintainer type="person">
 		<email>dustin@v.igoro.us</email>


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/amanda/
@ 2016-04-01  6:25 Ian Delaney
  0 siblings, 0 replies; 26+ messages in thread
From: Ian Delaney @ 2016-04-01  6:25 UTC (permalink / raw
  To: gentoo-commits

commit:     a239d70f03a2e1405256223924e07ad7a148d9dc
Author:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  1 05:55:34 2016 +0000
Commit:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Fri Apr  1 06:25:18 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a239d70f

app-backup/amanda: minor tidy to metadata.xml

Package-Manager: portage-2.2.28

 app-backup/amanda/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-backup/amanda/metadata.xml b/app-backup/amanda/metadata.xml
index e3baa37..9b85151 100644
--- a/app-backup/amanda/metadata.xml
+++ b/app-backup/amanda/metadata.xml
@@ -8,6 +8,7 @@
 	</maintainer>
 	<maintainer type="person">
 		<email>lists@xunil.at</email>
+		<name>Stefan Weichinger</name>
 		<description>Proxied developer. Please CC on bugs.</description>
 		<name>Stefan G. Weichinger</name>
 	</maintainer>


^ permalink raw reply related	[flat|nested] 26+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-backup/amanda/
@ 2015-09-20  7:30 Ian Delaney
  0 siblings, 0 replies; 26+ messages in thread
From: Ian Delaney @ 2015-09-20  7:30 UTC (permalink / raw
  To: gentoo-commits

commit:     4c82f4e29993449f34e902e4ed0463543f82795e
Author:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 20 07:28:59 2015 +0000
Commit:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Sun Sep 20 07:30:07 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c82f4e2

app-backup/amanda: postinstall log message ammended to all ebuilds

patch by Proxied developer, sourced from bug #518982

Package-Manager: portage-2.2.20.1

 app-backup/amanda/amanda-3.3.3-r1.ebuild | 5 ++++-
 app-backup/amanda/amanda-3.3.5.ebuild    | 5 ++++-
 app-backup/amanda/amanda-3.3.7.ebuild    | 5 ++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/app-backup/amanda/amanda-3.3.3-r1.ebuild b/app-backup/amanda/amanda-3.3.3-r1.ebuild
index 6c1ad5e..12774cc 100644
--- a/app-backup/amanda/amanda-3.3.3-r1.ebuild
+++ b/app-backup/amanda/amanda-3.3.3-r1.ebuild
@@ -443,6 +443,9 @@ pkg_postinst() {
 	elog "Otherwise, please look at /usr/share/doc/${PF}/inetd.amanda.sample"
 	elog "as an example of how to configure your inetd."
 	elog
+	elog "systemd-users: enable and start amanda.socket or the relevant services"
+	elog "regarding what auth method you use."
+	elog
 	elog "NOTICE: If you need raw access to partitions you need to add the"
 	elog "amanda user to the 'disk' group."
 	elog
@@ -456,7 +459,7 @@ pkg_postinst() {
 	elog "Please note that this package no longer explicitly depends on"
 	elog "virtual/inetd, as it supports modes where an inetd is not needed"
 	elog "(see bug #506028 for details)."
-
+	elog "The only exception is when you use the authentication method 'local'."
 }
 
 # We have had reports of amanda file permissions getting screwed up.

diff --git a/app-backup/amanda/amanda-3.3.5.ebuild b/app-backup/amanda/amanda-3.3.5.ebuild
index de12f3f..a214a4f 100644
--- a/app-backup/amanda/amanda-3.3.5.ebuild
+++ b/app-backup/amanda/amanda-3.3.5.ebuild
@@ -443,6 +443,9 @@ pkg_postinst() {
 	elog "Otherwise, please look at /usr/share/doc/${PF}/inetd.amanda.sample"
 	elog "as an example of how to configure your inetd."
 	elog
+	elog "systemd-users: enable and start amanda.socket or the relevant services"
+	elog "regarding what auth method you use."
+	elog
 	elog "NOTICE: If you need raw access to partitions you need to add the"
 	elog "amanda user to the 'disk' group."
 	elog
@@ -456,7 +459,7 @@ pkg_postinst() {
 	elog "Please note that this package no longer explicitly depends on"
 	elog "virtual/inetd, as it supports modes where an inetd is not needed"
 	elog "(see bug #506028 for details)."
-
+	elog "The only exception is when you use the authentication method 'local'."
 }
 
 # We have had reports of amanda file permissions getting screwed up.

diff --git a/app-backup/amanda/amanda-3.3.7.ebuild b/app-backup/amanda/amanda-3.3.7.ebuild
index 3b784f8..4ed9f33 100644
--- a/app-backup/amanda/amanda-3.3.7.ebuild
+++ b/app-backup/amanda/amanda-3.3.7.ebuild
@@ -440,6 +440,9 @@ pkg_postinst() {
 	elog "Otherwise, please look at /usr/share/doc/${PF}/inetd.amanda.sample"
 	elog "as an example of how to configure your inetd."
 	elog
+	elog "systemd-users: enable and start amanda.socket or the relevant services"
+	elog "regarding what auth method you use."
+	elog
 	elog "NOTICE: If you need raw access to partitions you need to add the"
 	elog "amanda user to the 'disk' group."
 	elog
@@ -453,7 +456,7 @@ pkg_postinst() {
 	elog "Please note that this package no longer explicitly depends on"
 	elog "virtual/inetd, as it supports modes where an inetd is not needed"
 	elog "(see bug #506028 for details)."
-
+	elog "The only exception is when you use the authentication method 'local'."
 }
 
 # We have had reports of amanda file permissions getting screwed up.


^ permalink raw reply related	[flat|nested] 26+ messages in thread

end of thread, other threads:[~2022-05-15  1:00 UTC | newest]

Thread overview: 26+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-20  9:30 [gentoo-commits] repo/gentoo:master commit in: app-backup/amanda/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2022-05-15  1:00 Sam James
2021-01-24 13:33 Sam James
2021-01-21  7:40 Agostino Sarubbo
2021-01-20  9:29 Sam James
2020-12-30 10:26 David Seifert
2020-01-01  0:06 Erik Mackdanz
2017-12-14 22:05 Robin H. Johnson
2017-12-06  3:40 Robin H. Johnson
2017-11-13 20:59 Robin H. Johnson
2017-11-13 20:45 Robin H. Johnson
2017-11-13 20:45 Robin H. Johnson
2017-11-13 20:45 Robin H. Johnson
2017-11-07  6:16 Robin H. Johnson
2017-10-04  9:42 Patrice Clement
2017-07-01 18:59 Robin H. Johnson
2017-06-10  7:15 Robin H. Johnson
2017-05-04 17:21 Robin H. Johnson
2017-03-02 20:36 Robin H. Johnson
2017-02-02 20:01 Robin H. Johnson
2017-01-03 10:38 Agostino Sarubbo
2016-09-27  7:09 Agostino Sarubbo
2016-04-06  4:39 Ian Delaney
2016-04-01  8:52 Ian Delaney
2016-04-01  6:25 Ian Delaney
2015-09-20  7:30 Ian Delaney

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox