summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2014-10-19 20:13:21 +0000
committerMike Gilbert <floppym@gentoo.org>2014-10-19 20:13:21 +0000
commit73d82ebaddd9a5fe4dbf605d5f8754827dc952a2 (patch)
tree79342fab417436a918415ab19cd84864f9a60a90 /sys-apps
parentRemove old (diff)
downloadhistorical-73d82ebaddd9a5fe4dbf605d5f8754827dc952a2.tar.gz
historical-73d82ebaddd9a5fe4dbf605d5f8754827dc952a2.tar.bz2
historical-73d82ebaddd9a5fe4dbf605d5f8754827dc952a2.zip
Add use flag to control apparmor support, bug 525894 by Dainius Masiliūnas.
Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64 Manifest-Sign-Key: 0x0BBEEA1FEA4843A4
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/systemd/ChangeLog6
-rw-r--r--sys-apps/systemd/Manifest18
-rw-r--r--sys-apps/systemd/metadata.xml1
-rw-r--r--sys-apps/systemd/systemd-216-r1.ebuild7
-rw-r--r--sys-apps/systemd/systemd-9999.ebuild7
5 files changed, 22 insertions, 17 deletions
diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index 5f6a34b490c0..6c434602fd71 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.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 <floppym@gentoo.org> 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 <klausman@gentoo.org> systemd-215-r3.ebuild:
Stable on alpha, bug 517120
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 3b97854156e8..69f83d5cfb40 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -11,16 +11,14 @@ DIST systemd-215.tar.xz 2888652 SHA256 ce76a3c05e7d4adc806a3446a5510c0c9b76a33f1
DIST systemd-216.tar.xz 3612960 SHA256 945d3db7d840d6ffe98aa68394428e13317161ae79905397faab6671619728f3 SHA512 f4eee6664368168eafd61939f1355ac21c7eeecce6247de98ef36f40bb6a942d12c006ced4ee15f3d8f11699c194990222d5a5115b45f2aa81f2a1abafebbdd2 WHIRLPOOL 505e09b55209a4f9d8cec077970571b2e1298e8db02946a6c79df139dece9d1a08e46c86ef6c8053274abfd46c9a5ea09157f5bc9dc1f7461322c596e84ef494
EBUILD systemd-212-r5.ebuild 14286 SHA256 911b093c8c7b8fa5e63537a2cccf62c89e64229724feec69f0454290a284ffb2 SHA512 ac79890c72d21c108e3348b836979a38c861514504fb52d48d54fdf69400cce3786159817a0ca784dc7051d44624adffea4c3252e19a423709fd21b32baa7baf WHIRLPOOL 307098ec61aba2b58ebb65eb86b5b24e98536b32a989b527fd2d3b82251ebca626075a97e93f80a97d55653974722a2b063f8220aa15428ab3b1fea8e74e82b4
EBUILD systemd-215-r3.ebuild 16065 SHA256 2c504d90406c54ecb4b6336ac7b6298ef43b4899a561fe23b7041d694c9280ca SHA512 6507693d67408083fa8817753d833a228953a3adc4b65e7007c2cdcdaf5b750f990184e3588273a16b9b073a98457d21ef5698cb3a55ab46a05f843bfb619d63 WHIRLPOOL 1ede766043eb0780d4134c95dba23fa6c3a35579df5151abe53ad45f39d8d9aad5958a32afe2e1ed520ec245559e651c7237bca1ee194828f010c8b9fdbdaa9e
-EBUILD systemd-216-r1.ebuild 15539 SHA256 b54b5af2307292bb55a5cf041c06517c37c00fa148af758d3ec6dd0a1d250a7f SHA512 bbf980f65b2d70a229d2e8af1030792a90406aeef8d67f309445e6f16942015098d4e27b8885aa10031dd410559de00fb905a7610efb4513c965e791ffd75ac6 WHIRLPOOL 17990819533f7f1cd60884d0e5bf937629aafefae338d6a62dd2c5bba3bea6cf6b4e337e1e7c88cc8febd7ffc7bc2f981bd034de3bc1ea70642d2891baa9310b
-EBUILD systemd-9999.ebuild 15657 SHA256 e2a93e1ae90fa02ab5b36e18b909808e6039ef8054e2fa1ecda253b7106c2a5e SHA512 fa8fdce034db0f711094168fb00ee640d76ac46986f3c336f831256a63d5df31fe5cc080da4e48e40c41df425a5e12e5e272ed2ef3b388b236e40f9a8454a78a WHIRLPOOL 3f05a22d80710a23a2301de2433590661268e86e8bbba16127db1e40eea29202c882debd25baf437eefa7ad37f35ede99c6460aea47a48ba83dda1d7772e9b59
-MISC ChangeLog 56222 SHA256 cca87654052556d71d7bb7df43030f5e69c1f19c7afb9c1dac925c1031b84737 SHA512 fe01ddc797bbdf3a89d5e561053af8e285c5fc152c920bf295b978c4d6bd21de0d48752b481913c5a167c9f69a96b5ea8c0883f06bb3f6d1770c670e6a89858f WHIRLPOOL 54937103dd3a9d27ae9f358790667fea65d1efbadfff0de9e6a7b91e1426a58b19acdef285ccf5129ff824e55108eb3e179d857e86966f1d5a24106e60a65b9b
-MISC metadata.xml 1274 SHA256 ada019b0ad28087994a013b50abf20e59351799205882cae167c9ceb5005092e SHA512 a912ef156eb1c925690be27ae2d9c3411c6ae5ea2eff035e3e1e15b84d12956911004760036b5b54fc34416310ef23b34f5e92115645e8ed6312f5471eaa800e WHIRLPOOL 51756b380a09a3a0f8bdec94f5dcdbb5c3960fd71878a9e7b0b920e06ff37a2713cac928588d75e6bb94f7b9e32f564a353d36e690619e0b2b245c77682ac0e4
+EBUILD systemd-216-r1.ebuild 15609 SHA256 5577896fb2ee4f61d4df6987226031bd04195ae6dc0cb1afb822257f081dbe46 SHA512 9d870bc8c56b0e68a4427b63cf6154e629109f646cb430f163e3a23e6919dbe243a1c68003ceaa19274df9f05f2ca642d35171b9a2405e143bcf928c48c2484c WHIRLPOOL f753b25d41ead3eb21d901a2520ecff9152573f331219dae82b1ed5a05a5daf865f214183f41d00512e6ad66f02de6cc62d5dfe33726ce72bf078bde71e9f2f2
+EBUILD systemd-9999.ebuild 15725 SHA256 203c35c547fedad7a318ef2ff4f4614890abe8f581891439faecf403c7b80d53 SHA512 70081cb8dbecc17fb6928f7cb58c0d6b0df288f1c6cacca5cbddaacc9353a3c7b28b69f682733bc5d72bc1541cff0cb6007c42c416ce465306feac5a0f5cbadc WHIRLPOOL b8af69718679257d3c1ddd40fe6303ff50a27b2b292b42d6884820bd4e5d6714ca566e13b5c7d14c2b9e6427a692d9c34ae7be0f67c188c8f869435dcf450644
+MISC ChangeLog 56410 SHA256 4aa62b9999dae83c40ffdef4d55a38222bb255ca92b7b663ebb23dc42cc95348 SHA512 64d371d69c1275554f1795bd33183d966ad4a99f29b9948dda961cda859c9fe305c677e1128e301449ae86aaf913b370e22e70a4ee9a0f2e3b9b012511bd7971 WHIRLPOOL 2a7e6c15c474a362e36ca84ea5887bba4336d4d1d1b7085adaf562eecd40a44861f914fc9261d24b48b99b9b1b254a09f1206cb41a6c33b39a529e939e63041a
+MISC metadata.xml 1329 SHA256 3d5e7371843da6f15b4c8d4317b60251bb5c23b7d66e8d7a4d3db428e36c0c67 SHA512 f6f52f9d6f6de6014a2230a2d33e3eec3a8fdc84426b183ae310f07c3ba5d7eea2841401a69a9c75663e7cc0d065e5732e4b261bf52b31b4752f000a8b70116b WHIRLPOOL 3091bd5203418c47dd41ea8439adedf196e5a0cb74672322afa5100e0710e6858ed4f98a687054f81fbf802bafd286c7197be1b127779c38b2603971e22e9a5d
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
-iKYEAREIAGYFAlQ+jd9fFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
-bnBncC5maWZ0aGhvcnNlbWFuLm5ldDFGNDg1MzU4NjMzRTAyNzA3RkY0ODA1QzAz
-RUUwM0ExQ0U1RDU0RTgACgkQA+4Doc5dVOjmMQCfUsprjafbTxAWO60wUbbagL7Q
-DygAni5fSsMMx1HlpAmH+V/TplVXmc1T
-=/bCI
+iF4EAREIAAYFAlREG2EACgkQC77qH+pIQ6RiXwD/Z7+b1CKrbtuyv/gl4Ex+2Ym0
+DzyoI4vwa7HrKQ4pjggA/jezWUm4MxH25NKjWS0qWgiWys6pYy3+jqZgc/5UZEOj
+=fnlE
-----END PGP SIGNATURE-----
diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml
index 3ecf886b92d8..78b4a3359b77 100644
--- a/sys-apps/systemd/metadata.xml
+++ b/sys-apps/systemd/metadata.xml
@@ -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>
diff --git a/sys-apps/systemd/systemd-216-r1.ebuild b/sys-apps/systemd/systemd-216-r1.ebuild
index 7c8d033f3e44..3f0f45045c43 100644
--- a/sys-apps/systemd/systemd-216-r1.ebuild
+++ b/sys-apps/systemd/systemd-216-r1.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-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 @@ SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz"
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 @@ MINKV="3.8"
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 @@ multilib_src_configure() {
# 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_src_configure() {
$(multilib_native_enable vconsole)
# not supported (avoid automagic deps in the future)
- --disable-apparmor
--disable-chkconfig
# hardcode a few paths to spare some deps
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 24bc9552074a..34b14b263915 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.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 @@ SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz"
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 @@ MINKV="3.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 @@ multilib_src_configure() {
# 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_src_configure() {
$(multilib_native_enable vconsole)
# not supported (avoid automagic deps in the future)
- --disable-apparmor
--disable-chkconfig
# hardcode a few paths to spare some deps