summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2013-04-16 05:21:34 +0000
committerMichał Górny <mgorny@gentoo.org>2013-04-16 05:21:34 +0000
commitd91aad5fa4ddb97cc5ef7a2f9a9e8c1886d7393d (patch)
tree7f2a042ea0a26aedcc9e95c5295a367c74f49a2c /sys-apps
parentUpdate dependencies for the alsa-firmware move from media-sound category to s... (diff)
downloadgentoo-2-d91aad5fa4ddb97cc5ef7a2f9a9e8c1886d7393d.tar.gz
gentoo-2-d91aad5fa4ddb97cc5ef7a2f9a9e8c1886d7393d.tar.bz2
gentoo-2-d91aad5fa4ddb97cc5ef7a2f9a9e8c1886d7393d.zip
Re-enable IMA, my mistake.
(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 9627F456F9DA7643!)
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/systemd/ChangeLog6
-rw-r--r--sys-apps/systemd/systemd-201.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 02205a578b38..4e101a9bf202 100644
--- a/sys-apps/systemd/ChangeLog
+++ b/sys-apps/systemd/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/systemd
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.117 2013/04/15 20:15:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.118 2013/04/16 05:21:34 mgorny Exp $
+
+ 16 Apr 2013; Michał Górny <mgorny@gentoo.org> systemd-201.ebuild,
+ systemd-9999.ebuild:
+ Re-enable IMA, my mistake.
15 Apr 2013; Michał Górny <mgorny@gentoo.org> systemd-201.ebuild:
Backport quota dep removal and configure cleanup from -9999. No need to
diff --git a/sys-apps/systemd/systemd-201.ebuild b/sys-apps/systemd/systemd-201.ebuild
index 96147a92e255..67ccf59a0130 100644
--- a/sys-apps/systemd/systemd-201.ebuild
+++ b/sys-apps/systemd/systemd-201.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-201.ebuild,v 1.2 2013/04/15 20:15:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-201.ebuild,v 1.3 2013/04/16 05:21:34 mgorny Exp $
EAPI=5
@@ -79,6 +79,7 @@ src_configure() {
# no deps
--enable-keymap
--enable-efi
+ --enable-ima
# optional components/dependencies
$(use_enable acl)
$(use_enable audit)
@@ -100,7 +101,6 @@ src_configure() {
# not supported (avoid automagic deps in the future)
--disable-chkconfig
- --disable-ima
# hardcode a few paths to spare some deps
QUOTAON=/usr/sbin/quotaon
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 6be8ef726a62..e2a194889eb2 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 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.43 2013/04/15 20:13:01 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.44 2013/04/16 05:21:34 mgorny Exp $
EAPI=5
@@ -109,6 +109,7 @@ src_configure() {
# no deps
--enable-keymap
--enable-efi
+ --enable-ima
# optional components/dependencies
$(use_enable acl)
$(use_enable audit)
@@ -130,7 +131,6 @@ src_configure() {
# not supported (avoid automagic deps in the future)
--disable-chkconfig
- --disable-ima
# hardcode a few paths to spare some deps
QUOTAON=/usr/sbin/quotaon