diff options
| author |   Anthony G. Basile <blueness@gentoo.org> | 2014-09-02 22:34:36 +0000 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2014-09-02 22:34:36 +0000 |
| commit | f61f76c7bbd78ad2e811ff99df32e0ddb4ab7a47 (patch) | |
| tree | 4b89225e67c2ae58635aea2f0eeaf5438eeaaf1f /sys-fs | |
| parent | Version bump. (diff) | |
| download | gentoo-2-f61f76c7bbd78ad2e811ff99df32e0ddb4ab7a47.tar.gz gentoo-2-f61f76c7bbd78ad2e811ff99df32e0ddb4ab7a47.tar.bz2 gentoo-2-f61f76c7bbd78ad2e811ff99df32e0ddb4ab7a47.zip | |
Fix bug #520684
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)
Diffstat (limited to 'sys-fs')
| -rw-r--r-- | sys-fs/eudev/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-fs/eudev/eudev-1.10.ebuild | 5 | ||||
| -rw-r--r-- | sys-fs/eudev/files/eudev-fix-selinux-headers.patch | 32 |
3 files changed, 41 insertions, 2 deletions
diff --git a/sys-fs/eudev/ChangeLog b/sys-fs/eudev/ChangeLog index 47819b6c3416..18bafa19ba34 100644 --- a/sys-fs/eudev/ChangeLog +++ b/sys-fs/eudev/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-fs/eudev # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.135 2014/08/22 14:26:14 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.136 2014/09/02 22:34:36 blueness Exp $ + + 02 Sep 2014; Anthony G. Basile <blueness@gentoo.org> + +files/eudev-fix-selinux-headers.patch, eudev-1.10.ebuild: + Fix bug #520684 *eudev-1.10 (22 Aug 2014) diff --git a/sys-fs/eudev/eudev-1.10.ebuild b/sys-fs/eudev/eudev-1.10.ebuild index d56c6e6a0317..63d9106363c1 100644 --- a/sys-fs/eudev/eudev-1.10.ebuild +++ b/sys-fs/eudev/eudev-1.10.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-fs/eudev/eudev-1.10.ebuild,v 1.1 2014/08/22 14:26:14 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-1.10.ebuild,v 1.2 2014/09/02 22:34:36 blueness Exp $ EAPI="5" @@ -104,6 +104,9 @@ src_prepare() { sed -e 's/GROUP="dialout"/GROUP="uucp"/' -i rules/*.rules \ || die "failed to change group dialout to uucp" + # Bug #520684 + epatch "${FILESDIR}"/${PN}-fix-selinux-headers.patch + epatch_user if [[ ! -e configure ]]; then diff --git a/sys-fs/eudev/files/eudev-fix-selinux-headers.patch b/sys-fs/eudev/files/eudev-fix-selinux-headers.patch new file mode 100644 index 000000000000..1d1d8dcc236f --- /dev/null +++ b/sys-fs/eudev/files/eudev-fix-selinux-headers.patch @@ -0,0 +1,32 @@ +From 361aa273d6fedda161c14b24302f009a58331693 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Amadeusz=20S=C5=82awi=C5=84ski?= <amade@asmblr.net> +Date: Tue, 2 Sep 2014 21:20:24 +0200 +Subject: [PATCH] fix SELINUX build +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Amadeusz Sławiński <amade@asmblr.net> +--- + src/shared/label.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/shared/label.c b/src/shared/label.c +index 3c6277a..e674241 100644 +--- a/src/shared/label.c ++++ b/src/shared/label.c +@@ -23,6 +23,11 @@ + #include <sys/socket.h> + #include <sys/un.h> + ++#ifdef HAVE_SELINUX ++#include <selinux/selinux.h> ++#include <selinux/label.h> ++#endif ++ + #include "label.h" + #include "util.h" + #include "path-util.h" +-- +2.1.0 + |