| 1 |
swift 14/08/28 18:20:49 |
| 2 |
|
| 3 |
Modified: ChangeLog selinux-policy-2.eclass |
| 4 |
Log: |
| 5 |
Update selinux eclass with improved rlpkg call and relabeling package set optimization |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.1358 eclass/ChangeLog |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1358&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1358&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1357&r2=1.1358 |
| 13 |
|
| 14 |
Index: ChangeLog |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 17 |
retrieving revision 1.1357 |
| 18 |
retrieving revision 1.1358 |
| 19 |
diff -u -r1.1357 -r1.1358 |
| 20 |
--- ChangeLog 27 Aug 2014 08:15:27 -0000 1.1357 |
| 21 |
+++ ChangeLog 28 Aug 2014 18:20:49 -0000 1.1358 |
| 22 |
@@ -1,6 +1,9 @@ |
| 23 |
# ChangeLog for eclass directory |
| 24 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1357 2014/08/27 08:15:27 mgorny Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1358 2014/08/28 18:20:49 swift Exp $ |
| 27 |
+ |
| 28 |
+ 28 Aug 2014; Sven Vermeulen <swift@g.o> selinux-policy-2.eclass: |
| 29 |
+ Simplify rlpkg call and optimize package relabeling thanks to Jason Perfinion |
| 30 |
|
| 31 |
27 Aug 2014; Michał Górny <mgorny@g.o> bash-completion-r1.eclass: |
| 32 |
Make completionsdir default to the new location (for new installs). Eselect |
| 33 |
|
| 34 |
|
| 35 |
|
| 36 |
1.27 eclass/selinux-policy-2.eclass |
| 37 |
|
| 38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/selinux-policy-2.eclass?rev=1.27&view=markup |
| 39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/selinux-policy-2.eclass?rev=1.27&content-type=text/plain |
| 40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/selinux-policy-2.eclass?r1=1.26&r2=1.27 |
| 41 |
|
| 42 |
Index: selinux-policy-2.eclass |
| 43 |
=================================================================== |
| 44 |
RCS file: /var/cvsroot/gentoo-x86/eclass/selinux-policy-2.eclass,v |
| 45 |
retrieving revision 1.26 |
| 46 |
retrieving revision 1.27 |
| 47 |
diff -u -r1.26 -r1.27 |
| 48 |
--- selinux-policy-2.eclass 24 Aug 2014 07:54:37 -0000 1.26 |
| 49 |
+++ selinux-policy-2.eclass 28 Aug 2014 18:20:49 -0000 1.27 |
| 50 |
@@ -1,6 +1,6 @@ |
| 51 |
# Copyright 1999-2014 Gentoo Foundation |
| 52 |
# Distributed under the terms of the GNU General Public License v2 |
| 53 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/selinux-policy-2.eclass,v 1.26 2014/08/24 07:54:37 swift Exp $ |
| 54 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/selinux-policy-2.eclass,v 1.27 2014/08/28 18:20:49 swift Exp $ |
| 55 |
|
| 56 |
# Eclass for installing SELinux policy, and optionally |
| 57 |
# reloading the reference-policy based modules. |
| 58 |
@@ -318,14 +318,13 @@ |
| 59 |
# Relabel depending packages |
| 60 |
PKGSET=""; |
| 61 |
if [ -x /usr/bin/qdepends ] ; then |
| 62 |
- PKGSET=$(/usr/bin/qdepends -Cq -Q ${CATEGORY}/${PN}); |
| 63 |
+ PKGSET=$(/usr/bin/qdepends -Cq -Q ${CATEGORY}/${PN} | grep -v "sec-policy/selinux-"); |
| 64 |
elif [ -x /usr/bin/equery ] ; then |
| 65 |
- PKGSET=$(/usr/bin/equery -Cq depends ${CATEGORY}/${PN}); |
| 66 |
+ PKGSET=$(/usr/bin/equery -Cq depends ${CATEGORY}/${PN} | grep -v "sec-policy/selinux-"); |
| 67 |
+ fi |
| 68 |
+ if [ -n "${PKGSET}" ] ; then |
| 69 |
+ rlpkg ${PKGSET}; |
| 70 |
fi |
| 71 |
- for PKG in ${PKGSET}; |
| 72 |
- do |
| 73 |
- rlpkg ${PKG}; |
| 74 |
- done |
| 75 |
} |
| 76 |
|
| 77 |
# @FUNCTION: selinux-policy-2_pkg_postrm |
Archives