This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch release/2.21/master updated. glibc-2.21-12-g26f3646
- From: aurel32 at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 22 Nov 2015 18:33:09 -0000
- Subject: GNU C Library master sources branch release/2.21/master updated. glibc-2.21-12-g26f3646
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, release/2.21/master has been updated
via 26f36461f66ac62bf6d3f1ef7a1439ab3ed67cf6 (commit)
from e04da210f7cd564c46a8db0e15a0c6e726f3977e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=26f36461f66ac62bf6d3f1ef7a1439ab3ed67cf6
commit 26f36461f66ac62bf6d3f1ef7a1439ab3ed67cf6
Author: Mike Frysinger <vapier@gentoo.org>
Date: Sat May 30 14:55:16 2015 -0400
nscd: drop selinux/flask.h include
Building nscd w/selinux enabled yields a warning which yields an error:
In file included from selinux.c:32:0:
/usr/include/selinux/flask.h:5:2: error:
#warning "Please remove any #include's of this header in your source code."
I've done just that and it builds cleanly with libselinux-2.4.
(cherry picked from commit 808696696837b8b8fc858f2e6f8d4e40e26e1308)
diff --git a/ChangeLog b/ChangeLog
index 868d355..079b411 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-07-08 Mike Frysinger <vapier@gentoo.org>
+
+ * nscd/selinux.c: Delete selinux/flask.h include.
+
2015-03-02 Andreas Schwab <schwab@suse.de>
* elf/Makefile ($(elf-objpfx)runtime-linker.st): Fix typo in
diff --git a/nscd/selinux.c b/nscd/selinux.c
index e433b1b..806763f 100644
--- a/nscd/selinux.c
+++ b/nscd/selinux.c
@@ -29,7 +29,6 @@
#include <unistd.h>
#include <sys/prctl.h>
#include <selinux/avc.h>
-#include <selinux/flask.h>
#include <selinux/selinux.h>
#ifdef HAVE_LIBAUDIT
# include <libaudit.h>
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 4 ++++
nscd/selinux.c | 1 -
2 files changed, 4 insertions(+), 1 deletions(-)
hooks/post-receive
--
GNU C Library master sources