From cb66fc6f107ad1d424fda0efb5c46342f8c5e7c1 Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Thu, 9 Feb 2012 11:11:58 -0500 Subject: [PATCH] Use -m not -M for install-sh for everything except setuid. Install locale .mo files mode 0444, not 0644. If timedir parent doesn't exist, use default dir mode, not 0700. --- Makefile.in | 2 +- doc/Makefile.in | 16 ++++++++-------- include/Makefile.in | 2 +- plugins/sample/Makefile.in | 2 +- plugins/sample_group/Makefile.in | 2 +- plugins/sudoers/Makefile.in | 17 +++++++++-------- src/Makefile.in | 4 ++-- 7 files changed, 23 insertions(+), 22 deletions(-) diff --git a/Makefile.in b/Makefile.in index b19f349fe..19b8418c5 100644 --- a/Makefile.in +++ b/Makefile.in @@ -234,7 +234,7 @@ install-nls: test -s $$podir/$$lang.mo || continue; \ echo $(ECHO_N) " $$lang$(ECHO_C)"; \ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \ - $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0644 $$podir/$$lang.mo $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$$domain.mo; \ + $(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 $$podir/$$lang.mo $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$$domain.mo; \ done; \ echo ""; \ done; \ diff --git a/doc/Makefile.in b/doc/Makefile.in index 60f0d49b3..3b99698cb 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -228,16 +228,16 @@ install-binaries: install-includes: install-doc: install-dirs - for f in $(OTHER_DOCS); do $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 $$f $(DESTDIR)$(docdir); done - @LDAP@for f in $(OTHER_DOCS_LDAP); do $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 $$f $(DESTDIR)$(docdir); done - $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 @mansrcdir@/sudo.$(mantype) $(DESTDIR)$(mandirsu)/sudo.$(mansectsu) + for f in $(OTHER_DOCS); do $(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 $$f $(DESTDIR)$(docdir); done + @LDAP@for f in $(OTHER_DOCS_LDAP); do $(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 $$f $(DESTDIR)$(docdir); done + $(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 @mansrcdir@/sudo.$(mantype) $(DESTDIR)$(mandirsu)/sudo.$(mansectsu) @rm -f $(DESTDIR)$(mandirsu)/sudoedit.$(mansectsu) ln $(DESTDIR)$(mandirsu)/sudo.$(mansectsu) $(DESTDIR)$(mandirsu)/sudoedit.$(mansectsu) - $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 @mansrcdir@/sudo_plugin.$(mantype) $(DESTDIR)$(mandirsu)/sudo_plugin.$(mansectsu) - $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 @mansrcdir@/sudoreplay.$(mantype) $(DESTDIR)$(mandirsu)/sudoreplay.$(mansectsu) - $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 @mansrcdir@/visudo.$(mantype) $(DESTDIR)$(mandirsu)/visudo.$(mansectsu) - $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 @mansrcdir@/sudoers.$(mantype) $(DESTDIR)$(mandirform)/sudoers.$(mansectform) - @LDAP@$(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 @mansrcdir@/sudoers.ldap.$(mantype) $(DESTDIR)$(mandirform)/sudoers.ldap.$(mansectform) + $(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 @mansrcdir@/sudo_plugin.$(mantype) $(DESTDIR)$(mandirsu)/sudo_plugin.$(mansectsu) + $(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 @mansrcdir@/sudoreplay.$(mantype) $(DESTDIR)$(mandirsu)/sudoreplay.$(mansectsu) + $(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 @mansrcdir@/visudo.$(mantype) $(DESTDIR)$(mandirsu)/visudo.$(mansectsu) + $(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 @mansrcdir@/sudoers.$(mantype) $(DESTDIR)$(mandirform)/sudoers.$(mansectform) + @LDAP@$(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 @mansrcdir@/sudoers.ldap.$(mantype) $(DESTDIR)$(mandirform)/sudoers.ldap.$(mansectform) @MAN_POSTINSTALL@ install-plugin: diff --git a/include/Makefile.in b/include/Makefile.in index de868daa3..c57657652 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -59,7 +59,7 @@ install-binaries: install-doc: install-includes: install-dirs - $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 $(srcdir)/sudo_plugin.h $(DESTDIR)$(includedir) + $(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 $(srcdir)/sudo_plugin.h $(DESTDIR)$(includedir) install-plugin: diff --git a/plugins/sample/Makefile.in b/plugins/sample/Makefile.in index 52b2f09db..1e7147c0d 100644 --- a/plugins/sample/Makefile.in +++ b/plugins/sample/Makefile.in @@ -97,7 +97,7 @@ install-includes: install-doc: install-plugin: install-dirs sample_plugin.la - $(INSTALL) -b~ -M 0755 .libs/sample_plugin$(soext) $(DESTDIR)$(plugindir) + $(INSTALL) -b~ -m 0755 .libs/sample_plugin$(soext) $(DESTDIR)$(plugindir) uninstall: -rm -f $(DESTDIR)$(plugindir)/sample_plugin$(soext) diff --git a/plugins/sample_group/Makefile.in b/plugins/sample_group/Makefile.in index 40ae2b28e..b9812b50d 100644 --- a/plugins/sample_group/Makefile.in +++ b/plugins/sample_group/Makefile.in @@ -97,7 +97,7 @@ install-includes: install-doc: install-plugin: install-dirs sample_group.la - $(INSTALL) -b~ -M 0755 .libs/sample_group$(soext) $(DESTDIR)$(plugindir) + $(INSTALL) -b~ -m 0755 .libs/sample_group$(soext) $(DESTDIR)$(plugindir) uninstall: -rm -f $(DESTDIR)$(plugindir)/sample_group$(soext) diff --git a/plugins/sudoers/Makefile.in b/plugins/sudoers/Makefile.in index f738462f4..71008d68f 100644 --- a/plugins/sudoers/Makefile.in +++ b/plugins/sudoers/Makefile.in @@ -247,28 +247,29 @@ install: install-plugin install-binaries install-sudoers install-doc install-dirs: $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(plugindir) \ $(DESTDIR)$(visudodir) $(DESTDIR)$(replaydir) \ - $(DESTDIR)$(sudoersdir) $(DESTDIR)$(docdir) - $(SHELL) $(top_srcdir)/mkinstalldirs -m 0700 $(DESTDIR)$(timedir) + $(DESTDIR)$(sudoersdir) $(DESTDIR)$(docdir) \ + `echo $(DESTDIR)$(timedir)|sed 's,/[^/]*$$,,'` + $(INSTALL) -d -O $(install_uid) -G $(install_gid) -m 0700 $(DESTDIR)$(timedir) install-binaries: visudo sudoreplay install-dirs - $(INSTALL) -b~ -O $(install_uid) -G $(install_gid) -M 0111 sudoreplay $(DESTDIR)$(replaydir)/sudoreplay - $(INSTALL) -b~ -O $(install_uid) -G $(install_gid) -M 0111 visudo $(DESTDIR)$(visudodir)/visudo + $(INSTALL) -b~ -O $(install_uid) -G $(install_gid) -m 0111 sudoreplay $(DESTDIR)$(replaydir)/sudoreplay + $(INSTALL) -b~ -O $(install_uid) -G $(install_gid) -m 0111 visudo $(DESTDIR)$(visudodir)/visudo install-includes: install-doc: install-dirs - @LDAP@$(INSTALL) -O $(install_uid) -G $(install_gid) -M 0555 $(srcdir)/sudoers2ldif $(DESTDIR)$(docdir) + @LDAP@$(INSTALL) -O $(install_uid) -G $(install_gid) -m 0555 $(srcdir)/sudoers2ldif $(DESTDIR)$(docdir) install-plugin: sudoers.la install-dirs if [ X"$(soext)" != X"" ]; then \ - $(INSTALL) -b~ -O $(install_uid) -G $(install_gid) -M 0755 .libs/sudoers$(soext) $(DESTDIR)$(plugindir); \ + $(INSTALL) -b~ -O $(install_uid) -G $(install_gid) -m 0755 .libs/sudoers$(soext) $(DESTDIR)$(plugindir); \ fi install-sudoers: install-dirs - $(INSTALL) -d -O $(sudoers_uid) -G $(sudoers_gid) -M 0750 \ + $(INSTALL) -d -O $(sudoers_uid) -G $(sudoers_gid) -m 0750 \ $(DESTDIR)$(sudoersdir)/sudoers.d test -r $(DESTDIR)$(sudoersdir)/sudoers || \ - $(INSTALL) -O $(sudoers_uid) -G $(sudoers_gid) -M $(sudoers_mode) \ + $(INSTALL) -O $(sudoers_uid) -G $(sudoers_gid) -m $(sudoers_mode) \ sudoers $(DESTDIR)$(sudoersdir)/sudoers uninstall: diff --git a/src/Makefile.in b/src/Makefile.in index b6ab4c094..2d366caa1 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -114,7 +114,7 @@ install-binaries: install-dirs $(PROGS) $(INSTALL) -b~ -O $(install_uid) -G $(install_gid) -M 04111 sudo $(DESTDIR)$(bindir)/sudo rm -f $(DESTDIR)$(bindir)/sudoedit ln $(DESTDIR)$(bindir)/sudo $(DESTDIR)$(bindir)/sudoedit - if [ -f sesh ]; then $(INSTALL) -b~ -O $(install_uid) -G $(install_gid) -M 0111 sesh $(DESTDIR)$(libexecdir)/sesh; fi + if [ -f sesh ]; then $(INSTALL) -b~ -O $(install_uid) -G $(install_gid) -m 0111 sesh $(DESTDIR)$(libexecdir)/sesh; fi install-doc: @@ -123,7 +123,7 @@ install-includes: # We install sudo_noexec by hand so we can avoid a "lib" prefix # and a version number. Since we use LD_PRELOAD, neither is needed. install-noexec: install-dirs libsudo_noexec.la - if [ -f .libs/lib$(noexecfile) ]; then $(INSTALL) -b~ -O $(install_uid) -G $(install_gid) -M 0755 .libs/lib$(noexecfile) $(DESTDIR)$(noexecdir)/$(noexecfile); fi + if [ -f .libs/lib$(noexecfile) ]; then $(INSTALL) -b~ -O $(install_uid) -G $(install_gid) -m 0755 .libs/lib$(noexecfile) $(DESTDIR)$(noexecdir)/$(noexecfile); fi install-plugin: -- 2.40.0