summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris PeBenito <pebenito@gentoo.org>2009-08-02 02:58:25 +0000
committerChris PeBenito <pebenito@gentoo.org>2009-08-02 02:58:25 +0000
commitce0e47f541b883d52e672464ac6a54f39b3b7b5f (patch)
treed443ac75ed570e0d273e18958be9e8ab7885bacc
parentadd myself as maintainer as discussed with robbat2 of the base-system herd (diff)
downloadgentoo-2-ce0e47f541b883d52e672464ac6a54f39b3b7b5f.tar.gz
gentoo-2-ce0e47f541b883d52e672464ac6a54f39b3b7b5f.tar.bz2
gentoo-2-ce0e47f541b883d52e672464ac6a54f39b3b7b5f.zip
fix unqouted variables in selinux policy eclasses to fix bug #258227.
-rw-r--r--eclass/selinux-policy-2.eclass14
-rw-r--r--eclass/selinux-policy.eclass6
2 files changed, 10 insertions, 10 deletions
diff --git a/eclass/selinux-policy-2.eclass b/eclass/selinux-policy-2.eclass
index ae4d411a8658..f49ca9e83975 100644
--- a/eclass/selinux-policy-2.eclass
+++ b/eclass/selinux-policy-2.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/selinux-policy-2.eclass,v 1.3 2007/07/07 16:21:07 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/selinux-policy-2.eclass,v 1.4 2009/08/02 02:58:25 pebenito Exp $
# Eclass for installing SELinux policy, and optionally
# reloading the reference-policy based modules
@@ -36,13 +36,13 @@ selinux-policy-2_src_unpack() {
done
for i in ${POLICY_TYPES}; do
- mkdir ${S}/${i}
- cp ${S}/refpolicy/doc/Makefile.example ${S}/${i}/Makefile
+ mkdir "${S}"/${i}
+ cp "${S}"/refpolicy/doc/Makefile.example "${S}"/${i}/Makefile
- cp ${modfiles} ${S}/${i}
+ cp ${modfiles} "${S}"/${i}
if [ -n "${POLICY_PATCH}" ]; then
- cd ${S}/${i}
+ cd "${S}"/${i}
epatch "${POLICY_PATCH}" || die "failed patch ${i}"
fi
@@ -53,7 +53,7 @@ selinux-policy-2_src_compile() {
[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="strict targeted"
for i in ${POLICY_TYPES}; do
- make NAME=$i -C ${S}/${i} || die "${i} compile failed"
+ make NAME=$i -C "${S}"/${i} || die "${i} compile failed"
done
}
@@ -65,7 +65,7 @@ selinux-policy-2_src_install() {
for j in ${MODS}; do
echo "Installing ${i} ${j} policy package"
insinto ${BASEDIR}/${i}
- doins ${S}/${i}/${j}.pp
+ doins "${S}"/${i}/${j}.pp
done
done
}
diff --git a/eclass/selinux-policy.eclass b/eclass/selinux-policy.eclass
index 86f90dfad36f..39ad67ac622b 100644
--- a/eclass/selinux-policy.eclass
+++ b/eclass/selinux-policy.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/selinux-policy.eclass,v 1.16 2006/05/16 02:01:02 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/selinux-policy.eclass,v 1.17 2009/08/02 02:58:25 pebenito Exp $
# Eclass for installing SELinux policy, and optionally
# reloading the policy
@@ -19,7 +19,7 @@ IUSE=""
RDEPEND=">=sec-policy/selinux-base-policy-20030729"
selinux-policy_src_compile() {
- cd ${S}
+ cd "${S}"
[ -z "${POLICYDIR}" ] && POLICYDIR="/etc/security/selinux/src/policy"
SAVENAME="`date +%Y%m%d%H%M`-${PN}.tar.bz2"
@@ -35,7 +35,7 @@ selinux-policy_src_compile() {
}
selinux-policy_src_install() {
- cd ${S}
+ cd "${S}"
insinto /etc/security/selinux/src/policy-backup
doins *-${PN}.tar.bz2