floppym 14/10/19 20:13:19
Modified: systemd-9999.ebuild metadata.xml
systemd-216-r1.ebuild ChangeLog
Log:
Add use flag to control apparmor support, bug 525894 by Dainius Masiliƫnas.
(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with
key 0BBEEA1FEA4843A4)
Revision Changes Path
1.142 sys-apps/systemd/systemd-9999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?rev=1.142&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?rev=1.142&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?r1=1.141&r2=1.142
Index: systemd-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- systemd-9999.ebuild 18 Sep 2014 12:26:22 -0000 1.141
+++ systemd-9999.ebuild 19 Oct 2014 20:13:19 -0000 1.142
@@ -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.141 2014/09/18 12:26:22 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v
1.142 2014/10/19 20:13:19 floppym Exp $
EAPI=5
@@ -25,7 +25,7 @@
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0/2"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="acl audit cryptsetup curl doc elfutils gcrypt gudev http
+IUSE="acl apparmor audit cryptsetup curl doc elfutils gcrypt gudev http
idn introspection kdbus +kmod lz4 lzma pam policykit python qrcode
+seccomp
selinux ssl test vanilla"
@@ -34,6 +34,7 @@
COMMON_DEPEND=">=sys-apps/util-linux-2.20:0=
sys-libs/libcap:0=
acl? ( sys-apps/acl:0= )
+ apparmor? ( sys-libs/libapparmor:0= )
audit? ( >=sys-process/audit-2:0= )
cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= )
curl? ( net-misc/curl:0= )
@@ -204,6 +205,7 @@
# Optional components/dependencies
$(multilib_native_use_enable acl)
+ $(multilib_native_use_enable apparmor)
$(multilib_native_use_enable audit)
$(multilib_native_use_enable cryptsetup libcryptsetup)
$(multilib_native_use_enable curl libcurl)
@@ -252,7 +254,6 @@
$(multilib_native_enable vconsole)
# not supported (avoid automagic deps in the future)
- --disable-apparmor
--disable-chkconfig
# hardcode a few paths to spare some deps
1.28 sys-apps/systemd/metadata.xml
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/metadata.xml?rev=1.28&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/metadata.xml?rev=1.28&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/metadata.xml?r1=1.27&r2=1.28
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/metadata.xml,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- metadata.xml 28 Jul 2014 03:36:10 -0000 1.27
+++ metadata.xml 19 Oct 2014 20:13:19 -0000 1.28
@@ -7,6 +7,7 @@
</maintainer>
<use>
<!-- XXX: describe those two better -->
+ <flag name='apparmor'>Enable AppArmor support</flag>
<flag name='audit'>Enable support for
<pkg>sys-process/audit</pkg></flag>
<flag name='cryptsetup'>Use libcryptsetup</flag>
<flag name='firmware-loader'>Enable user-space firmware loader
(for kernels prior to 3.8)</flag>
1.3 sys-apps/systemd/systemd-216-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-216-r1.ebuild?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-216-r1.ebuild?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-216-r1.ebuild?r1=1.2&r2=1.3
Index: systemd-216-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-216-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- systemd-216-r1.ebuild 12 Oct 2014 09:58:35 -0000 1.2
+++ systemd-216-r1.ebuild 19 Oct 2014 20:13:19 -0000 1.3
@@ -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-216-r1.ebuild,v
1.2 2014/10/12 09:58:35 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-216-r1.ebuild,v
1.3 2014/10/19 20:13:19 floppym Exp $
EAPI=5
@@ -17,7 +17,7 @@
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0/2"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="acl audit cryptsetup curl doc elfutils +firmware-loader gcrypt gudev http
+IUSE="acl apparmor audit cryptsetup curl doc elfutils +firmware-loader gcrypt
gudev http
idn introspection kdbus +kmod lz4 lzma pam policykit python qrcode
+seccomp
selinux ssl test vanilla"
@@ -26,6 +26,7 @@
COMMON_DEPEND=">=sys-apps/util-linux-2.20:0=
sys-libs/libcap:0=
acl? ( sys-apps/acl:0= )
+ apparmor? ( sys-libs/libapparmor:0= )
audit? ( >=sys-process/audit-2:0= )
cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= )
curl? ( net-misc/curl:0= )
@@ -182,6 +183,7 @@
# Optional components/dependencies
$(multilib_native_use_enable acl)
+ $(multilib_native_use_enable apparmor)
$(multilib_native_use_enable audit)
$(multilib_native_use_enable cryptsetup libcryptsetup)
$(multilib_native_use_enable curl libcurl)
@@ -230,7 +232,6 @@
$(multilib_native_enable vconsole)
# not supported (avoid automagic deps in the future)
- --disable-apparmor
--disable-chkconfig
# hardcode a few paths to spare some deps
1.313 sys-apps/systemd/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.313&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.313&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?r1=1.312&r2=1.313
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v
retrieving revision 1.312
retrieving revision 1.313
diff -u -r1.312 -r1.313
--- ChangeLog 15 Oct 2014 15:08:14 -0000 1.312
+++ ChangeLog 19 Oct 2014 20:13:19 -0000 1.313
@@ -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.312
2014/10/15 15:08:14 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.313
2014/10/19 20:13:19 floppym Exp $
+
+ 19 Oct 2014; Mike Gilbert <[email protected]> metadata.xml,
+ systemd-216-r1.ebuild, systemd-9999.ebuild:
+ Add use flag to control apparmor support, bug 525894 by Dainius Masiliƫnas.
15 Oct 2014; Tobias Klausmann <[email protected]> systemd-215-r3.ebuild:
Stable on alpha, bug 517120