diff options
| author | Jim Meyering <meyering@redhat.com> | 2008-05-31 22:42:20 +0200 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2008-05-31 22:42:20 +0200 |
| commit | eba365275bdbb35df80fedcc08598ef21ace4061 (patch) | |
| tree | 99f1882239ea60970c250c2a65213767d7ff1e85 | |
| parent | eb4b2d462ea462547269b6380c6074e3ffcb60cf (diff) | |
| download | coreutils-eba365275bdbb35df80fedcc08598ef21ace4061.tar.xz | |
install: reenable matchpathcon-related code
The underlying performance problem is being dealt with in Automake
by limiting the number of install invocations, and in SELinux with
incremental changes as well as a potential new implementation.
* src/Makefile.am (ginstall_CPPFLAGS) [ENABLE_MATCHPATHCON]: Define.
* src/install.c [ENABLE_WHEN_MATCHPATHCON_IS_MORE_EFFICIENT]:
Rename to ENABLE_MATCHPATHCON.
* NEWS: mention this change
| -rw-r--r-- | NEWS | 5 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/install.c | 2 |
3 files changed, 8 insertions, 1 deletions
@@ -25,6 +25,11 @@ GNU coreutils NEWS -*- outline -*- tac: avoid segfault with --regex (-r) and multiple files, e.g., "echo > x; tac -r x x". [bug present at least in textutils-1.8b, from 1992] +** Changes in behavior + + install once again sets SELinux context, when possible + [it was deliberately disabled in 6.9.90] + * Noteworthy changes in release 6.11 (2008-04-19) [stable] diff --git a/src/Makefile.am b/src/Makefile.am index 8e0091fbd..14906bc09 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -256,6 +256,8 @@ sha384sum_CPPFLAGS = -DHASH_ALGO_SHA384=1 $(AM_CPPFLAGS) sha512sum_SOURCES = md5sum.c sha512sum_CPPFLAGS = -DHASH_ALGO_SHA512=1 $(AM_CPPFLAGS) +ginstall_CPPFLAGS = -DENABLE_MATCHPATHCON=1 $(AM_CPPFLAGS) + editpl = sed -e 's,@''PERL''@,$(PERL),g' BUILT_SOURCES += dircolors.h diff --git a/src/install.c b/src/install.c index 308b022ac..10fcae71f 100644 --- a/src/install.c +++ b/src/install.c @@ -199,7 +199,7 @@ cp_option_init (struct cp_options *x) x->src_info = NULL; } -#ifdef ENABLE_WHEN_MATCHPATHCON_IS_MORE_EFFICIENT +#ifdef ENABLE_MATCHPATHCON /* Modify file context to match the specified policy. If an error occurs the file will remain with the default directory context. */ |