sys-apps/systemd: adjust SECCOMP kernel checks

Only check for SECCOMP and SECCOMP_FILTER when USE="seccomp".

Package-Manager: portage-2.3.0_p23

diff --git a/sys-apps/systemd/systemd-226-r2.ebuild b/sys-apps/systemd/systemd-226-r2.ebuild
index 02ffcf5da3e324edd3026fcd57a56f10982c92c9..80b0c0e14388ee9b97791b10e38d41917684610b 100644 (file)
--- a/sys-apps/systemd/systemd-226-r2.ebuild
+++ b/sys-apps/systemd/systemd-226-r2.ebuild
@@ -97,12 +97,13 @@ DEPEND="${COMMON_DEPEND}
 pkg_pretend() {
        local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
                ~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY ~FHANDLE
-               ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SECCOMP ~SIGNALFD ~SYSFS
+               ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
                ~TIMERFD ~TMPFS_XATTR ~UNIX
                ~!FW_LOADER_USER_HELPER ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
                ~!SYSFS_DEPRECATED_V2"
 
        use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
+       use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
        kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
        kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
 

diff --git a/sys-apps/systemd/systemd-228-r1.ebuild b/sys-apps/systemd/systemd-228-r1.ebuild
index d64cd1995078b83b1b13ac7c19ed49a725e33e76..61af7c49b3d6a1b9be0da7c6138e74ba74fd0543 100644 (file)
--- a/sys-apps/systemd/systemd-228-r1.ebuild
+++ b/sys-apps/systemd/systemd-228-r1.ebuild
@@ -97,12 +97,13 @@ DEPEND="${COMMON_DEPEND}
 pkg_pretend() {
        local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
                ~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY ~FHANDLE
-               ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SECCOMP ~SIGNALFD ~SYSFS
+               ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
                ~TIMERFD ~TMPFS_XATTR ~UNIX
                ~!FW_LOADER_USER_HELPER ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
                ~!SYSFS_DEPRECATED_V2"
 
        use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
+       use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
        kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
        kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
 

diff --git a/sys-apps/systemd/systemd-229.ebuild b/sys-apps/systemd/systemd-229.ebuild
index de87dcccfcf578a3c50e0f70cc3e9a8c89022698..543f5729e68646886f43f6e21ae8ca5108b188f1 100644 (file)
--- a/sys-apps/systemd/systemd-229.ebuild
+++ b/sys-apps/systemd/systemd-229.ebuild
@@ -101,12 +101,13 @@ DEPEND="${COMMON_DEPEND}
 pkg_pretend() {
        local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
                ~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY ~FHANDLE
-               ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SECCOMP ~SIGNALFD ~SYSFS
+               ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
                ~TIMERFD ~TMPFS_XATTR ~UNIX
                ~!FW_LOADER_USER_HELPER ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
                ~!SYSFS_DEPRECATED_V2"
 
        use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
+       use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
        kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
        kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
 

diff --git a/sys-apps/systemd/systemd-230-r2.ebuild b/sys-apps/systemd/systemd-230-r2.ebuild
index 97cfdce6c224ad4c1ce5dedbd067fb9a1c097910..00aa5e98745fa069fd63fa51bacf778bd2124c05 100644 (file)
--- a/sys-apps/systemd/systemd-230-r2.ebuild
+++ b/sys-apps/systemd/systemd-230-r2.ebuild
@@ -107,12 +107,13 @@ python_check_deps() {
 pkg_pretend() {
        local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
                ~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY ~FHANDLE
-               ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SECCOMP ~SIGNALFD ~SYSFS
+               ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
                ~TIMERFD ~TMPFS_XATTR ~UNIX
                ~!FW_LOADER_USER_HELPER ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
                ~!SYSFS_DEPRECATED_V2"
 
        use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
+       use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
        kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
        kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
 

diff --git a/sys-apps/systemd/systemd-231.ebuild b/sys-apps/systemd/systemd-231.ebuild
index 42684a920f73132882a2a1e2fbf6282c51ce8f0f..9d130236deec797efa5e666f830d89771f9a9f8b 100644 (file)
--- a/sys-apps/systemd/systemd-231.ebuild
+++ b/sys-apps/systemd/systemd-231.ebuild
@@ -106,12 +106,13 @@ python_check_deps() {
 pkg_pretend() {
        local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
                ~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY ~FHANDLE
-               ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SECCOMP ~SIGNALFD ~SYSFS
+               ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
                ~TIMERFD ~TMPFS_XATTR ~UNIX
                ~!FW_LOADER_USER_HELPER ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
                ~!SYSFS_DEPRECATED_V2"
 
        use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
+       use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
        kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
        kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
 

diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 26e4effa92280c954a2fd375ffd210a8cbe9eb3d..04ae140f41382539bbb94e4788c1d33cd7d2b1eb 100644 (file)
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -106,12 +106,13 @@ python_check_deps() {
 pkg_pretend() {
        local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
                ~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY ~FHANDLE
-               ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SECCOMP ~SIGNALFD ~SYSFS
+               ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
                ~TIMERFD ~TMPFS_XATTR ~UNIX
                ~!FW_LOADER_USER_HELPER ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
                ~!SYSFS_DEPRECATED_V2"
 
        use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
+       use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
        kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
        kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"