added selinux use and updated my patches

(Portage version: 2.1.9.20/git/Linux x86_64, unsigned Manifest commit)

5 files changed, 19 insertions, 44 deletions

diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index f8487d7..2440e6c 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,5 +1,4 @@
-AUX 0001-don-t-remount-svc-dir-for-gentoo.patch 907 RMD160 7ae3a0fad2fc9b821530aaf7f2123613a60bdafc SHA1 146e7c54fb73c14b71fb323bc26ae5d505c5c18a SHA256 76cb01b535969c09a29afc4a6ff1824d5fcc7d4a3393c460bd9ef2b515857d5c
-AUX 0002-update-xdm.service-for-gentoo.patch 786 RMD160 4d1dea76c79baab6e0fa209880a4746887355df0 SHA1 777733ea1d5990559ebac57c33d8d6db5e695172 SHA256 37835e7f6d7a3ea2c7083975c69486e6960846e2e3f80b3e9d801e8e5afacd12
-AUX 0003-never-umount-lib-rc-init.d.patch 803 RMD160 4d3c69aeae96f88cb2c4076be85187bbb7325a5b SHA1 71476c8c4c7fbad4bc7ae49a75730ccd5cbe0af2 SHA256 38e2dcd34c347679c8d88941ce4ea1d7383c32519d1c66a26ee22e014a5ef335
-EBUILD systemd-9999.ebuild 1513 RMD160 001477b88ea173d8e187e722e4de55d6eb08b850 SHA1 a3e5ad4846d71e4dba3d7f95ff0f73ebc25949d9 SHA256 09342020c2b3573c9fd01f9df806060a445be660f15cd689f4c9e3866fb5dadc
+AUX 0001-fixup-xdm.service-for-gentoo.patch 724 RMD160 0b2f3fced5fd03175f5fc27bb74c56488e9836d7 SHA1 509ad0cd0e85956718ad711a514f52220419ccdd SHA256 728344abe7b9f7ca44bd27187397ca57a060a0a554ffb5c57f3b3554e102f8ca
+AUX 0002-never-umount-lib-rc-init.d.patch 803 RMD160 8a72e1c1c63da8ec7900b3630e65970a6b5b38b1 SHA1 18aa1e23160c20c707abb8ced140ec3eae6ddbdd SHA256 3867d3f2ee00f98af90e3788a1985df280ee4935b93fb2bbb61a486a3536bf83
+EBUILD systemd-9999.ebuild 1655 RMD160 a1e5f68bf0cfb20aeb1cb77c60b72d960a53f4ff SHA1 1863b7e93b824f7cab48753ecb1f8f9ee3d7673b SHA256 ff896a04e6bbed4ac4ea4b2ca473163604a978a617812352ab6b986cc0628445
 MISC metadata.xml 285 RMD160 a394b62e33a5c004c74938e8105bd29b135dc6bc SHA1 672d2415dd51ce2c12c36c659c7926a9b2345fed SHA256 0d6905daec8d05c9a874142bfcc3084691ba54df9328d04bd7dd5a9f64ff4c54
diff --git a/sys-apps/systemd/files/0001-don-t-remount-svc-dir-for-gentoo.patch b/sys-apps/systemd/files/0001-don-t-remount-svc-dir-for-gentoo.patch
deleted file mode 100644
index 3442b1f..0000000
--- a/sys-apps/systemd/files/0001-don-t-remount-svc-dir-for-gentoo.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 688aa96f2716e85bb6198296313f66e2007ba9c4 Mon Sep 17 00:00:00 2001
-From: Luo Jinghua <sunmoon1997@gmail.com>
-Date: Sat, 16 Oct 2010 13:17:46 +0800
-Subject: [PATCH 1/3] don't remount svc dir for gentoo
-
----
- src/umount.c |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/src/umount.c b/src/umount.c
-index c7f6208..5b7d6d3 100644
---- a/src/umount.c
-+++ b/src/umount.c
-@@ -401,7 +401,9 @@ static int mount_points_list_umount(MountPoint **head, bool *changed) {
-         assert(head);
- 
-         LIST_FOREACH_SAFE(mount_point, m, n, *head) {
--                if (streq(m->path, "/"))
-+                if (streq(m->path, "/") ||
-+                    streq(m->path, "/lib/rc/init.d") ||
-+                    streq(m->path, "/lib64/rc/init.d"))
-                         continue;
- 
-                 /* Trying to umount. Forcing to umount if busy (only for NFS mounts) */
--- 
-1.7.3.1
-
diff --git a/sys-apps/systemd/files/0002-update-xdm.service-for-gentoo.patch b/sys-apps/systemd/files/0001-fixup-xdm.service-for-gentoo.patch
index 7a3ed9c..10347f6 100644
--- a/sys-apps/systemd/files/0002-update-xdm.service-for-gentoo.patch
+++ b/sys-apps/systemd/files/0001-fixup-xdm.service-for-gentoo.patch
@@ -1,23 +1,22 @@
-From f414e624881f4f6815089198a0a1d111b125619c Mon Sep 17 00:00:00 2001
+From e37cc814161ae420bdb20f84a5e64499be3d5d24 Mon Sep 17 00:00:00 2001
 From: Luo Jinghua <sunmoon1997@gmail.com>
 Date: Sat, 16 Oct 2010 13:18:29 +0800
-Subject: [PATCH 2/3] update xdm.service for gentoo
+Subject: [PATCH 1/2] fixup xdm.service for gentoo
 
 ---
- units/gentoo/xdm.service |    5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
+ units/gentoo/xdm.service |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
 
 diff --git a/units/gentoo/xdm.service b/units/gentoo/xdm.service
-index b94c6a8..64f6c70 100644
+index b94c6a8..fd387b1 100644
 --- a/units/gentoo/xdm.service
 +++ b/units/gentoo/xdm.service
-@@ -7,10 +7,13 @@
+@@ -7,10 +7,12 @@
  
  [Unit]
  Description=Display Manager
 -After=syslog.target dbus.target hald.service
-+#After=syslog.target dbus.target hald.service
-+After=syslog.target hald.service
++After=syslog.target
  
  [Service]
 +Type=forking
diff --git a/sys-apps/systemd/files/0003-never-umount-lib-rc-init.d.patch b/sys-apps/systemd/files/0002-never-umount-lib-rc-init.d.patch
index beac526..c0f9cc3 100644
--- a/sys-apps/systemd/files/0003-never-umount-lib-rc-init.d.patch
+++ b/sys-apps/systemd/files/0002-never-umount-lib-rc-init.d.patch
@@ -1,17 +1,17 @@
-From f60fa09498d2a619cf066ef8fe65acb99b5e758e Mon Sep 17 00:00:00 2001
+From 1e0bffb999e8a6097596a8917d71cf1daec135df Mon Sep 17 00:00:00 2001
 From: Luo Jinghua <sunmoon1997@gmail.com>
 Date: Sat, 16 Oct 2010 13:42:01 +0800
-Subject: [PATCH 3/3] never umount /lib/rc/init.d
+Subject: [PATCH 2/2] never umount /lib/rc/init.d
 
 ---
  src/mount.c |    6 ++++++
  1 files changed, 6 insertions(+), 0 deletions(-)
 
 diff --git a/src/mount.c b/src/mount.c
-index c7df923..492172f 100644
+index bbc29d8..389c0ca 100644
 --- a/src/mount.c
 +++ b/src/mount.c
-@@ -954,6 +954,12 @@ static int mount_stop(Unit *u) {
+@@ -956,6 +956,12 @@ static int mount_stop(Unit *u) {
                 m->state == MOUNT_REMOUNTING_SIGTERM ||
                 m->state == MOUNT_REMOUNTING_SIGKILL);
  
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 7c2c6db..5ee829f 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -16,7 +16,7 @@ SRC_URI=""
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="gtk pam +tcpwrap"
+IUSE="gtk pam +tcpwrap selinux"
 
 RDEPEND="
 	  >=sys-apps/dbus-1.3.2
@@ -54,6 +54,7 @@ src_configure() {
 		--prefix=/usr \
 		--with-rootdir=/ \
 		$(use_enable pam) \
+		$(use_enable selinux) \
 		$(use_enable tcpwrap)
 }
 
@@ -61,6 +62,9 @@ src_install() {
 	# make sure all directory are created
 	mkdir -p "${D}"/cgroup/{cpu,cpuacct,cpuset,debug,devices,freezer,memory,ns,systemd}
 	emake DESTDIR="${D}" install
+	if ! use selinux; then
+		rm "${D}"/lib/systemd/system/basic.target.wants/sys-kernel-security.automount
+	fi
 	dodoc "${D}/usr/share/doc/systemd"/* && \
 	rm -r "${D}/usr/share/doc/systemd/"
 	cd "${D}/usr/share/man/man8"