| 1 |
pebenito 09/08/02 02:58:25 |
| 2 |
|
| 3 |
Modified: selinux-policy-2.eclass selinux-policy.eclass |
| 4 |
Log: |
| 5 |
fix unqouted variables in selinux policy eclasses to fix bug #258227. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.4 eclass/selinux-policy-2.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/selinux-policy-2.eclass?rev=1.4&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/selinux-policy-2.eclass?rev=1.4&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/selinux-policy-2.eclass?r1=1.3&r2=1.4 |
| 13 |
|
| 14 |
Index: selinux-policy-2.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/selinux-policy-2.eclass,v |
| 17 |
retrieving revision 1.3 |
| 18 |
retrieving revision 1.4 |
| 19 |
diff -u -r1.3 -r1.4 |
| 20 |
--- selinux-policy-2.eclass 7 Jul 2007 16:21:07 -0000 1.3 |
| 21 |
+++ selinux-policy-2.eclass 2 Aug 2009 02:58:25 -0000 1.4 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2006 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/selinux-policy-2.eclass,v 1.3 2007/07/07 16:21:07 kaiowas Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/selinux-policy-2.eclass,v 1.4 2009/08/02 02:58:25 pebenito Exp $ |
| 27 |
|
| 28 |
# Eclass for installing SELinux policy, and optionally |
| 29 |
# reloading the reference-policy based modules |
| 30 |
@@ -36,13 +36,13 @@ |
| 31 |
done |
| 32 |
|
| 33 |
for i in ${POLICY_TYPES}; do |
| 34 |
- mkdir ${S}/${i} |
| 35 |
- cp ${S}/refpolicy/doc/Makefile.example ${S}/${i}/Makefile |
| 36 |
+ mkdir "${S}"/${i} |
| 37 |
+ cp "${S}"/refpolicy/doc/Makefile.example "${S}"/${i}/Makefile |
| 38 |
|
| 39 |
- cp ${modfiles} ${S}/${i} |
| 40 |
+ cp ${modfiles} "${S}"/${i} |
| 41 |
|
| 42 |
if [ -n "${POLICY_PATCH}" ]; then |
| 43 |
- cd ${S}/${i} |
| 44 |
+ cd "${S}"/${i} |
| 45 |
epatch "${POLICY_PATCH}" || die "failed patch ${i}" |
| 46 |
fi |
| 47 |
|
| 48 |
@@ -53,7 +53,7 @@ |
| 49 |
[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="strict targeted" |
| 50 |
|
| 51 |
for i in ${POLICY_TYPES}; do |
| 52 |
- make NAME=$i -C ${S}/${i} || die "${i} compile failed" |
| 53 |
+ make NAME=$i -C "${S}"/${i} || die "${i} compile failed" |
| 54 |
done |
| 55 |
} |
| 56 |
|
| 57 |
@@ -65,7 +65,7 @@ |
| 58 |
for j in ${MODS}; do |
| 59 |
echo "Installing ${i} ${j} policy package" |
| 60 |
insinto ${BASEDIR}/${i} |
| 61 |
- doins ${S}/${i}/${j}.pp |
| 62 |
+ doins "${S}"/${i}/${j}.pp |
| 63 |
done |
| 64 |
done |
| 65 |
} |
| 66 |
|
| 67 |
|
| 68 |
|
| 69 |
1.17 eclass/selinux-policy.eclass |
| 70 |
|
| 71 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/selinux-policy.eclass?rev=1.17&view=markup |
| 72 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/selinux-policy.eclass?rev=1.17&content-type=text/plain |
| 73 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/selinux-policy.eclass?r1=1.16&r2=1.17 |
| 74 |
|
| 75 |
Index: selinux-policy.eclass |
| 76 |
=================================================================== |
| 77 |
RCS file: /var/cvsroot/gentoo-x86/eclass/selinux-policy.eclass,v |
| 78 |
retrieving revision 1.16 |
| 79 |
retrieving revision 1.17 |
| 80 |
diff -u -r1.16 -r1.17 |
| 81 |
--- selinux-policy.eclass 16 May 2006 02:01:02 -0000 1.16 |
| 82 |
+++ selinux-policy.eclass 2 Aug 2009 02:58:25 -0000 1.17 |
| 83 |
@@ -1,6 +1,6 @@ |
| 84 |
# Copyright 1999-2004 Gentoo Foundation |
| 85 |
# Distributed under the terms of the GNU General Public License v2 |
| 86 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/selinux-policy.eclass,v 1.16 2006/05/16 02:01:02 pebenito Exp $ |
| 87 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/selinux-policy.eclass,v 1.17 2009/08/02 02:58:25 pebenito Exp $ |
| 88 |
|
| 89 |
# Eclass for installing SELinux policy, and optionally |
| 90 |
# reloading the policy |
| 91 |
@@ -19,7 +19,7 @@ |
| 92 |
RDEPEND=">=sec-policy/selinux-base-policy-20030729" |
| 93 |
|
| 94 |
selinux-policy_src_compile() { |
| 95 |
- cd ${S} |
| 96 |
+ cd "${S}" |
| 97 |
|
| 98 |
[ -z "${POLICYDIR}" ] && POLICYDIR="/etc/security/selinux/src/policy" |
| 99 |
SAVENAME="`date +%Y%m%d%H%M`-${PN}.tar.bz2" |
| 100 |
@@ -35,7 +35,7 @@ |
| 101 |
} |
| 102 |
|
| 103 |
selinux-policy_src_install() { |
| 104 |
- cd ${S} |
| 105 |
+ cd "${S}" |
| 106 |
|
| 107 |
insinto /etc/security/selinux/src/policy-backup |
| 108 |
doins *-${PN}.tar.bz2 |
Archives