summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Vermeulen <sven.vermeulen@siphos.be>2011-09-13 21:03:14 +0200
committerSven Vermeulen <sven.vermeulen@siphos.be>2011-09-13 21:03:14 +0200
commit7477e812e78c243205224666ebbcf78ea3be401c (patch)
tree1b5389d8f6e02087b2b020ca8b1c3052b82b749e
parentFix digest (diff)
downloadhardened-dev-7477e812e78c243205224666ebbcf78ea3be401c.tar.gz
hardened-dev-7477e812e78c243205224666ebbcf78ea3be401c.tar.bz2
hardened-dev-7477e812e78c243205224666ebbcf78ea3be401c.zip
Update puppet
-rw-r--r--sec-policy/selinux-puppet/Manifest5
-rw-r--r--sec-policy/selinux-puppet/files/puppet_support_gentoo_calls-r2.patch14
-rw-r--r--sec-policy/selinux-puppet/selinux-puppet-2.20110726-r2.ebuild1
3 files changed, 2 insertions, 18 deletions
diff --git a/sec-policy/selinux-puppet/Manifest b/sec-policy/selinux-puppet/Manifest
index b5440160..ec88c120 100644
--- a/sec-policy/selinux-puppet/Manifest
+++ b/sec-policy/selinux-puppet/Manifest
@@ -1,6 +1,5 @@
-AUX puppet_support_gentoo_calls-r2.patch 437 RMD160 5d4188e6d6b15bdf902cff75c3760847d3395793 SHA1 9840f06c5220899b28fa217f42ee7149d172deec SHA256 ac83b6c479980308dd8c71cb07796957e4d1b047b366d6ffbcc092637c656090
-DIST patchbundle-selinux-base-policy-2.20110726-r4.tar.bz2 22332 RMD160 c18b980e7773e4e8c9ed8dac9f39f7af75a4ecfc SHA1 7bf4e803407e0809b14223e9d6a7c393519c060e SHA256 65a035ba4c25080495ea86736243326adf106ce68c0328a98f9f16702bcb4cf8
+DIST patchbundle-selinux-base-policy-2.20110726-r4.tar.bz2 22344 RMD160 b4ecb26fb48b21f21e4836dd560cc39b463f76b7 SHA1 7505a0eb3863f3949224512d7329c185c37883f9 SHA256 62d9a41b087a47a09d1e1e5cee4451b8427b53d63babd7e61c7620aea4cbb009
DIST refpolicy-2.20110726.tar.bz2 588033 RMD160 9803effffe1dbb28d52bee03432e052f4fdc8d3f SHA1 cc27b06c3f541d8f2c57c52804ab6893afcd9db2 SHA256 8159b7535aa0f805510e4e3504b1317d7083b227f0ef3df51c6f002ed70ecedb
-EBUILD selinux-puppet-2.20110726-r2.ebuild 452 RMD160 32d61357a6129533c93cbe9959e67c8365c4b0e1 SHA1 6853542dce94881ad799696a33387ca1785710fb SHA256 44884d5331826c159228ae04fa2d45c0639600acb36c2ee72b121e5af8aa4b40
+EBUILD selinux-puppet-2.20110726-r2.ebuild 388 RMD160 3e68073698f8e16384ce05257392789578274e8f SHA1 c7951be3b32cbcbd4717c27d97194e19dd2325fc SHA256 38a459f40468a0c3080637a5f72794bd6a15c36d33fcc1ba1c7c3c04d08efbeb
MISC ChangeLog 1415 RMD160 f98ec4298f1a0a0850dfcb44d85f4ac118d89b03 SHA1 c69ea4a2cedd1a717b9ee3ac66653af2e4b2746f SHA256 976049f5d0f612b17fc34d82db21f2f0095cf851016d996b36de8e1fd1ec832e
MISC metadata.xml 230 RMD160 5d5194ac8c13d1c054b3df43791bb3f5544aec02 SHA1 8653f0a6bb377d4a07ff59d75e1f2694b9867c4b SHA256 29b1c0521994399dc36bdc4fac4b4b7d1169b537602be0486896018c744d96cf
diff --git a/sec-policy/selinux-puppet/files/puppet_support_gentoo_calls-r2.patch b/sec-policy/selinux-puppet/files/puppet_support_gentoo_calls-r2.patch
deleted file mode 100644
index e38af568..00000000
--- a/sec-policy/selinux-puppet/files/puppet_support_gentoo_calls-r2.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- refpolicy/policy/modules/services/puppet.te 2011-09-13 20:32:33.901017683 +0200
-+++ refpolicy/policy/modules/services/puppet.te 2011-09-13 20:10:30.591017645 +0200
-@@ -183,8 +183,9 @@
-
- optional_policy(`
- init_exec_rc(puppet_t)
-- portage_run(puppet_t, system_r)
-- portage_fetch_run(puppet_t, system_r)
-+ portage_domtrans(puppet_t)
-+ portage_domtrans_fetch(puppet_t)
-+ portage_domtrans_gcc_config(puppet_t)
- ')
-
- optional_policy(`
diff --git a/sec-policy/selinux-puppet/selinux-puppet-2.20110726-r2.ebuild b/sec-policy/selinux-puppet/selinux-puppet-2.20110726-r2.ebuild
index 56a7c932..da84874a 100644
--- a/sec-policy/selinux-puppet/selinux-puppet-2.20110726-r2.ebuild
+++ b/sec-policy/selinux-puppet/selinux-puppet-2.20110726-r2.ebuild
@@ -6,7 +6,6 @@ EAPI="4"
IUSE=""
MODS="puppet"
BASEPOL="2.20110726-r4"
-POLICY_PATCH="${FILESDIR}/puppet_support_gentoo_calls-r2.patch"
inherit selinux-policy-2