summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2014-01-11 18:57:15 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2014-01-11 18:57:15 +0000
commit3733237f6b9c100bdde3b37d1f2a68adeb432cc7 (patch)
tree33e43528c5d3756481c2d407b10f8e203e0e11b2 /app-backup
parentBump. (diff)
downloadgentoo-2-3733237f6b9c100bdde3b37d1f2a68adeb432cc7.tar.gz
gentoo-2-3733237f6b9c100bdde3b37d1f2a68adeb432cc7.tar.bz2
gentoo-2-3733237f6b9c100bdde3b37d1f2a68adeb432cc7.zip
Bug #484980: Build fix for USE=minimal.
(Portage version: 2.2.7/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'app-backup')
-rw-r--r--app-backup/amanda/ChangeLog6
-rw-r--r--app-backup/amanda/amanda-3.3.3-r1.ebuild11
-rw-r--r--app-backup/amanda/amanda-3.3.3.ebuild13
3 files changed, 22 insertions, 8 deletions
diff --git a/app-backup/amanda/ChangeLog b/app-backup/amanda/ChangeLog
index a417bb22698a..3f1410c82d18 100644
--- a/app-backup/amanda/ChangeLog
+++ b/app-backup/amanda/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-backup/amanda
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/ChangeLog,v 1.108 2014/01/11 09:36:08 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/ChangeLog,v 1.109 2014/01/11 18:57:15 robbat2 Exp $
+
+ 11 Jan 2014; Robin H. Johnson <robbat2@gentoo.org> amanda-3.3.3-r1.ebuild,
+ amanda-3.3.3.ebuild:
+ Bug #484980: Build fix for USE=minimal.
11 Jan 2014; Pacho Ramos <pacho@gentoo.org> amanda-3.3.3-r1.ebuild:
ppc/ppc64 stable, bug #494576
diff --git a/app-backup/amanda/amanda-3.3.3-r1.ebuild b/app-backup/amanda/amanda-3.3.3-r1.ebuild
index 9166665f2798..1888c7785462 100644
--- a/app-backup/amanda/amanda-3.3.3-r1.ebuild
+++ b/app-backup/amanda/amanda-3.3.3-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-3.3.3-r1.ebuild,v 1.4 2014/01/11 09:36:08 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-3.3.3-r1.ebuild,v 1.5 2014/01/11 18:57:15 robbat2 Exp $
EAPI=5
inherit autotools eutils perl-module user systemd
@@ -373,8 +373,13 @@ src_install() {
"${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \
"${AMANDA_TMPDIR}" "${AMANDA_TMPDIR}/dumps" \
"${AMANDA_USER_HOMEDIR}/amanda" \
- "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}" \
- /etc/amanda /etc/amanda/${AMANDA_CONFIG_NAME}
+ /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}"
diff --git a/app-backup/amanda/amanda-3.3.3.ebuild b/app-backup/amanda/amanda-3.3.3.ebuild
index 347c240f4de8..8c2b2e7b4e60 100644
--- a/app-backup/amanda/amanda-3.3.3.ebuild
+++ b/app-backup/amanda/amanda-3.3.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-3.3.3.ebuild,v 1.8 2013/09/10 06:14:32 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-3.3.3.ebuild,v 1.9 2014/01/11 18:57:15 robbat2 Exp $
EAPI=5
inherit autotools eutils perl-module user systemd
@@ -373,8 +373,13 @@ src_install() {
"${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \
"${AMANDA_TMPDIR}" "${AMANDA_TMPDIR}/dumps" \
"${AMANDA_USER_HOMEDIR}/amanda" \
- "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}" \
- /etc/amanda /etc/amanda/${AMANDA_CONFIG_NAME}
+ /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}"