| 1 |
commit: 0162eaf09d639ea29b088b569ca1cdf147c2b370 |
| 2 |
Author: Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be> |
| 3 |
AuthorDate: Wed Aug 3 11:05:56 2011 +0000 |
| 4 |
Commit: Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be> |
| 5 |
CommitDate: Wed Aug 3 11:05:56 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=0162eaf0 |
| 7 |
|
| 8 |
Make BASEPOL checks consistent with POLICY_PATCH checks, thanks to Peter Volkov (pva <AT> g.o) |
| 9 |
|
| 10 |
--- |
| 11 |
eclass/selinux-policy-2.eclass | 8 ++++---- |
| 12 |
1 files changed, 4 insertions(+), 4 deletions(-) |
| 13 |
|
| 14 |
diff --git a/eclass/selinux-policy-2.eclass b/eclass/selinux-policy-2.eclass |
| 15 |
index 3c42633..6ae1046 100644 |
| 16 |
--- a/eclass/selinux-policy-2.eclass |
| 17 |
+++ b/eclass/selinux-policy-2.eclass |
| 18 |
@@ -29,7 +29,7 @@ |
| 19 |
# This variable contains the version string of the selinux-base-policy package |
| 20 |
# that this module build depends on. It is used to patch with the appropriate |
| 21 |
# patch bundle(s) that are part of selinux-base-policy. |
| 22 |
-: ${BASEPOL:="0"} |
| 23 |
+: ${BASEPOL:=""} |
| 24 |
|
| 25 |
# @ECLASS-VARIABLE: POLICY_PATCH |
| 26 |
# @DESCRIPTION: |
| 27 |
@@ -51,7 +51,7 @@ inherit eutils |
| 28 |
IUSE="" |
| 29 |
|
| 30 |
HOMEPAGE="http://www.gentoo.org/proj/en/hardened/selinux/" |
| 31 |
-if [[ "${BASEPOL}" == "0" ]]; |
| 32 |
+if [[ -n "${BASEPOL}" ]]; |
| 33 |
then |
| 34 |
SRC_URI="http://oss.tresys.com/files/refpolicy/refpolicy-${PV}.tar.bz2" |
| 35 |
else |
| 36 |
@@ -66,7 +66,7 @@ PATCHBUNDLE="${DISTDIR}/patchbundle-selinux-base-policy-${BASEPOL}.tar.bz2" |
| 37 |
|
| 38 |
# Modules should always depend on at least the first release of the |
| 39 |
# selinux-base-policy for which they are generated. |
| 40 |
-if [[ "${BASEPOL}" == "0" ]]; |
| 41 |
+if [[ -n "${BASEPOL}" ]]; |
| 42 |
then |
| 43 |
RDEPEND=">=sys-apps/policycoreutils-2.0.82 |
| 44 |
>=sec-policy/selinux-base-policy-${PV}" |
| 45 |
@@ -116,7 +116,7 @@ selinux-policy-2_src_prepare() { |
| 46 |
local modfiles |
| 47 |
|
| 48 |
# Patch the sources with the base patchbundle |
| 49 |
- if [[ "${BASEPOL}" != "0" ]]; |
| 50 |
+ if [[ -n "${BASEPOL}" ]]; |
| 51 |
then |
| 52 |
cd "${S}" |
| 53 |
epatch "${PATCHBUNDLE}" |
Archives