summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2014-03-31 19:01:26 +0000
committerMike Gilbert <floppym@gentoo.org>2014-03-31 19:01:26 +0000
commite4a1173e07f63563c3979202a838a5a61713d05a (patch)
tree9ec2ce92a7baf33a517da9193fa99d9c06df7a7f /sys-apps
parentVersion bumps. Remove old (diff)
downloadgentoo-2-e4a1173e07f63563c3979202a838a5a61713d05a.tar.gz
gentoo-2-e4a1173e07f63563c3979202a838a5a61713d05a.tar.bz2
gentoo-2-e4a1173e07f63563c3979202a838a5a61713d05a.zip
Check for CONFIG_NET_NS, bug 506244 by Alexander Bartha.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/systemd/ChangeLog6
-rw-r--r--sys-apps/systemd/systemd-212.ebuild4
-rw-r--r--sys-apps/systemd/systemd-9999.ebuild4
3 files changed, 9 insertions, 5 deletions
diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index 19f2f3801cb2..1ff2a48cce8b 100644
--- a/sys-apps/systemd/ChangeLog
+++ b/sys-apps/systemd/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/systemd
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.243 2014/03/29 08:02:04 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.244 2014/03/31 19:01:26 floppym Exp $
+
+ 31 Mar 2014; Mike Gilbert <floppym@gentoo.org> systemd-212.ebuild,
+ systemd-9999.ebuild:
+ Check for CONFIG_NET_NS, bug 506244 by Alexander Bartha.
29 Mar 2014; Michał Górny <mgorny@gentoo.org> systemd-212.ebuild:
Require kernel 3.7 temporarily due to unconditional use of newer defines.
diff --git a/sys-apps/systemd/systemd-212.ebuild b/sys-apps/systemd/systemd-212.ebuild
index effa9d233398..6d434e285be8 100644
--- a/sys-apps/systemd/systemd-212.ebuild
+++ b/sys-apps/systemd/systemd-212.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-212.ebuild,v 1.3 2014/03/29 08:02:04 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-212.ebuild,v 1.4 2014/03/31 19:01:25 floppym Exp $
EAPI=5
@@ -87,7 +87,7 @@ src_prepare() {
pkg_pretend() {
local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS ~DEVTMPFS ~DMIID
- ~EPOLL ~FANOTIFY ~FHANDLE ~INOTIFY_USER ~IPV6 ~NET ~PROC_FS
+ ~EPOLL ~FANOTIFY ~FHANDLE ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS
~SECCOMP ~SIGNALFD ~SYSFS ~TIMERFD
~!IDE ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2
~!GRKERNSEC_PROC"
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 56175fd0c214..d65f5326afe9 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.102 2014/03/28 18:16:31 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.103 2014/03/31 19:01:25 floppym Exp $
EAPI=5
@@ -114,7 +114,7 @@ src_prepare() {
pkg_pretend() {
local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS ~DEVTMPFS ~DMIID
- ~EPOLL ~FANOTIFY ~FHANDLE ~INOTIFY_USER ~IPV6 ~NET ~PROC_FS
+ ~EPOLL ~FANOTIFY ~FHANDLE ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS
~SECCOMP ~SIGNALFD ~SYSFS ~TIMERFD
~!IDE ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2
~!GRKERNSEC_PROC"