Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 246291 Details for
Bug 330139
sys-apps/findutils-4.5.8 automagic dependency on selinux
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Upstream's patch for --with-selinux/--without-selinux options to configure.
findutils-4.5.8-selinux.patch (text/plain), 4.21 KB, created by
Johan Hattne
on 2010-09-06 18:32:46 UTC
(
hide
)
Description:
Upstream's patch for --with-selinux/--without-selinux options to configure.
Filename:
MIME Type:
Creator:
Johan Hattne
Created:
2010-09-06 18:32:46 UTC
Size:
4.21 KB
patch
obsolete
>--- gnulib/m4/selinux-context-h.m4.orig Sun Aug 29 21:36:35 2010 >+++ gnulib/m4/selinux-context-h.m4 Sun Aug 29 21:36:35 2010 >@@ -1,4 +1,4 @@ >-# serial 1 -*- Autoconf -*- >+# serial 2 -*- Autoconf -*- > # Copyright (C) 2006-2007, 2009-2010 Free Software Foundation, Inc. > # This file is free software; the Free Software Foundation > # gives unlimited permission to copy and/or distribute it, >@@ -9,8 +9,13 @@ > > AC_DEFUN([gl_HEADERS_SELINUX_CONTEXT_H], > [ >- AC_CHECK_HEADERS([selinux/context.h], >- [SELINUX_CONTEXT_H=], >- [SELINUX_CONTEXT_H=selinux/context.h]) >+ AC_REQUIRE([gl_LIBSELINUX]) >+ if test "$with_selinux" != no; then >+ AC_CHECK_HEADERS([selinux/context.h], >+ [SELINUX_CONTEXT_H=], >+ [SELINUX_CONTEXT_H=selinux/context.h]) >+ else >+ SELINUX_CONTEXT_H=selinux/context.h >+ fi > AC_SUBST([SELINUX_CONTEXT_H]) > ]) >--- gnulib/m4/selinux-selinux-h.m4.orig Sun Aug 29 21:36:35 2010 >+++ gnulib/m4/selinux-selinux-h.m4 Sun Aug 29 21:36:35 2010 >@@ -1,4 +1,4 @@ >-# serial 3 -*- Autoconf -*- >+# serial 4 -*- Autoconf -*- > # Copyright (C) 2006-2007, 2009-2010 Free Software Foundation, Inc. > # This file is free software; the Free Software Foundation > # gives unlimited permission to copy and/or distribute it, >@@ -12,41 +12,54 @@ > AC_DEFUN([gl_HEADERS_SELINUX_SELINUX_H], > [ > AC_REQUIRE([gl_LIBSELINUX]) >- AC_CHECK_HEADERS([selinux/selinux.h]) >+ if test "$with_selinux" != no; then >+ AC_CHECK_HEADERS([selinux/selinux.h]) > >- if test "$ac_cv_header_selinux_selinux_h" = yes; then >- # We do have <selinux/selinux.h>, so do compile getfilecon.c >- # and arrange to use its wrappers. >- AC_LIBOBJ([getfilecon]) >- gl_CHECK_NEXT_HEADERS([selinux/selinux.h]) >- AC_DEFINE([getfilecon], [rpl_getfilecon], >- [Always use our getfilecon wrapper.]) >- AC_DEFINE([lgetfilecon], [rpl_lgetfilecon], >- [Always use our lgetfilecon wrapper.]) >- AC_DEFINE([fgetfilecon], [rpl_fgetfilecon], >- [Always use our fgetfilecon wrapper.]) >+ if test "$ac_cv_header_selinux_selinux_h" = yes; then >+ # We do have <selinux/selinux.h>, so do compile getfilecon.c >+ # and arrange to use its wrappers. >+ AC_LIBOBJ([getfilecon]) >+ gl_CHECK_NEXT_HEADERS([selinux/selinux.h]) >+ AC_DEFINE([getfilecon], [rpl_getfilecon], >+ [Always use our getfilecon wrapper.]) >+ AC_DEFINE([lgetfilecon], [rpl_lgetfilecon], >+ [Always use our lgetfilecon wrapper.]) >+ AC_DEFINE([fgetfilecon], [rpl_fgetfilecon], >+ [Always use our fgetfilecon wrapper.]) >+ fi >+ >+ case "$ac_cv_search_setfilecon:$ac_cv_header_selinux_selinux_h" in >+ no:*) # already warned >+ ;; >+ *:no) >+ AC_MSG_WARN([libselinux was found but selinux/selinux.h is missing.]) >+ AC_MSG_WARN([AC_PACKAGE_NAME will be compiled without SELinux support.]) >+ esac >+ else >+ # Do as if <selinux/selinux.h> does not exist, even if >+ # AC_CHECK_HEADERS_ONCE has already determined that it exists. >+ AC_DEFINE([HAVE_SELINUX_SELINUX_H], [0]) > fi >- >- case "$ac_cv_search_setfilecon:$ac_cv_header_selinux_selinux_h" in >- no:*) # already warned >- ;; >- *:no) >- AC_MSG_WARN([libselinux was found but selinux/selinux.h is missing.]) >- AC_MSG_WARN([AC_PACKAGE_NAME will be compiled without SELinux support.]) >- esac > ]) > > AC_DEFUN([gl_LIBSELINUX], > [ > AC_REQUIRE([AC_CANONICAL_HOST]) > AC_REQUIRE([AC_CANONICAL_BUILD]) >+ >+ AC_ARG_WITH([selinux], >+ AS_HELP_STRING([--without-selinux], [do not use SELinux, even on systems with SELinux]), >+ [], [with_selinux=maybe]) >+ > LIB_SELINUX= >- gl_save_LIBS=$LIBS >- AC_SEARCH_LIBS([setfilecon], [selinux], >- [test "$ac_cv_search_setfilecon" = "none required" || >- LIB_SELINUX=$ac_cv_search_setfilecon]) >+ if test "$with_selinux" != no; then >+ gl_save_LIBS=$LIBS >+ AC_SEARCH_LIBS([setfilecon], [selinux], >+ [test "$ac_cv_search_setfilecon" = "none required" || >+ LIB_SELINUX=$ac_cv_search_setfilecon]) >+ LIBS=$gl_save_LIBS >+ fi > AC_SUBST([LIB_SELINUX]) >- LIBS=$gl_save_LIBS > > # Warn if SELinux is found but libselinux is absent; > if test "$ac_cv_search_setfilecon" = no &&
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 330139
:
240385
| 246291