| @@ -1,78 +1,80 @@ | | | @@ -1,78 +1,80 @@ |
1 | $NetBSD: patch-aa,v 1.28 2011/09/18 14:18:25 ryoon Exp $ | | 1 | $NetBSD: patch-aa,v 1.28.6.1 2012/05/19 10:42:03 tron Exp $ |
2 | | | 2 | |
3 | * Fix libtools's link option. | | 3 | * Fix libtools's link option. |
4 | * Prevent to install sudoers files and directory. | | 4 | * Prevent to install sudoers files and directory. |
5 | * Use standard instal(8) option instead of shell wrapper. | | 5 | * Use standard instal(8) option instead of shell wrapper. |
6 | * Don't setuid here. | | 6 | * Don't setuid here. |
7 | | | 7 | |
8 | --- Makefile.in.orig 2011-08-13 17:29:18 +0000 | | 8 | --- Makefile.in.orig 2012-02-10 17:52:13.000000000 +0000 |
9 | +++ Makefile.in | | 9 | +++ Makefile.in |
10 | @@ -222,7 +222,7 @@ sudo_noexec.lo: $(srcdir)/sudo_noexec.c | | 10 | @@ -222,7 +222,7 @@ sudo_noexec.lo: $(srcdir)/sudo_noexec.c |
11 | $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/sudo_noexec.c | | 11 | $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/sudo_noexec.c |
12 | | | 12 | |
13 | libsudo_noexec.la: sudo_noexec.lo | | 13 | libsudo_noexec.la: sudo_noexec.lo |
14 | - $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ sudo_noexec.lo -avoid-version -rpath $(noexecdir) | | 14 | - $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ sudo_noexec.lo -avoid-version -rpath $(noexecdir) |
15 | + $(LIBTOOL) --mode=link $(CC) -module $(LDFLAGS) -o $@ sudo_noexec.lo -avoid-version -rpath $(noexecdir) | | 15 | + $(LIBTOOL) --mode=link $(CC) -module $(LDFLAGS) -o $@ sudo_noexec.lo -avoid-version -rpath $(noexecdir) |
16 | | | 16 | |
17 | # Uncomment the following if you want "make distclean" to clean the parser | | 17 | # Uncomment the following if you want "make distclean" to clean the parser |
18 | @DEV@GENERATED = gram.h gram.c toke.c def_data.c def_data.h getdate | | 18 | @DEV@GENERATED = gram.h gram.c toke.c def_data.c def_data.h getdate |
19 | @@ -543,43 +543,43 @@ pre-install: | | 19 | @@ -545,44 +545,44 @@ pre-install: |
20 | ./visudo -c -f $(DESTDIR)$(sudoersdir)/sudoers; \ | | 20 | ./visudo -c -f $(DESTDIR)$(sudoersdir)/sudoers; \ |
21 | fi | | 21 | fi |
22 | | | 22 | |
23 | -install: pre-install install-dirs install-binaries @INSTALL_NOEXEC@ install-sudoers install-doc | | 23 | -install: pre-install install-dirs install-binaries @INSTALL_NOEXEC@ install-sudoers install-doc |
24 | +install: install-binaries @INSTALL_NOEXEC@ install-doc | | 24 | +install: install-binaries @INSTALL_NOEXEC@ install-doc |
25 | | | 25 | |
26 | install-dirs: | | 26 | install-dirs: |
27 | $(SHELL) $(srcdir)/mkinstalldirs $(DESTDIR)$(sudodir) \ | | 27 | $(SHELL) $(srcdir)/mkinstalldirs $(DESTDIR)$(sudodir) \ |
28 | $(DESTDIR)$(visudodir) $(DESTDIR)$(noexecdir) \ | | 28 | $(DESTDIR)$(visudodir) $(DESTDIR)$(noexecdir) \ |
29 | - $(DESTDIR)$(sudoersdir) $(DESTDIR)$(docdir) \ | | 29 | - $(DESTDIR)$(sudoersdir) $(DESTDIR)$(docdir) \ |
30 | + $(DESTDIR)$(docdir) \ | | 30 | + $(DESTDIR)$(sudoersdir) \ |
31 | $(DESTDIR)$(mandirsu) $(DESTDIR)$(mandirform) | | 31 | $(DESTDIR)$(mandirsu) $(DESTDIR)$(mandirform) \ |
32 | $(SHELL) $(srcdir)/mkinstalldirs -m 0700 $(DESTDIR)$(timedir) | | 32 | `echo $(DESTDIR)$(timedir)|sed 's,/[^/]*$$,,'` |
| | | 33 | - $(INSTALL) -d -O $(install_uid) -G $(install_gid) -m 0700 $(DESTDIR)$(timedir) |
| | | 34 | + $(INSTALL) -d -m 0700 $(DESTDIR)$(timedir) |
33 | | | 35 | |
34 | install-binaries: install-dirs $(PROGS) | | 36 | install-binaries: install-dirs $(PROGS) |
35 | - $(INSTALL) -b~ -O $(install_uid) -G $(install_gid) -M 04111 sudo $(DESTDIR)$(sudodir)/sudo | | 37 | - $(INSTALL) -b~ -O $(install_uid) -G $(install_gid) -M 04111 sudo $(DESTDIR)$(sudodir)/sudo |
36 | + $(INSTALL) sudo $(DESTDIR)$(sudodir)/sudo | | 38 | + $(INSTALL) sudo $(DESTDIR)$(sudodir)/sudo |
37 | rm -f $(DESTDIR)$(sudodir)/sudoedit | | 39 | rm -f $(DESTDIR)$(sudodir)/sudoedit |
38 | ln $(DESTDIR)$(sudodir)/sudo $(DESTDIR)$(sudodir)/sudoedit | | 40 | ln $(DESTDIR)$(sudodir)/sudo $(DESTDIR)$(sudodir)/sudoedit |
39 | - if [ -f sudoreplay ]; then $(INSTALL) -b~ -O $(install_uid) -G $(install_gid) -M 0111 sudoreplay $(DESTDIR)$(sudodir)/sudoreplay; fi | | 41 | - if [ -f sudoreplay ]; then $(INSTALL) -b~ -O $(install_uid) -G $(install_gid) -M 0111 sudoreplay $(DESTDIR)$(sudodir)/sudoreplay; fi |
40 | - $(INSTALL) -b~ -O $(install_uid) -G $(install_gid) -M 0111 visudo $(DESTDIR)$(visudodir)/visudo | | 42 | - $(INSTALL) -b~ -O $(install_uid) -G $(install_gid) -M 0111 visudo $(DESTDIR)$(visudodir)/visudo |
41 | - if [ -f sesh ]; then $(INSTALL) -b~ -O $(install_uid) -G $(install_gid) -M 0111 sesh $(DESTDIR)$(libexecdir)/sesh; fi | | 43 | - if [ -f sesh ]; then $(INSTALL) -b~ -O $(install_uid) -G $(install_gid) -M 0111 sesh $(DESTDIR)$(libexecdir)/sesh; fi |
42 | + if [ -f sudoreplay ]; then $(INSTALL) sudoreplay $(DESTDIR)$(sudodir)/sudoreplay; fi | | 44 | + if [ -f sudoreplay ]; then $(INSTALL) sudoreplay $(DESTDIR)$(sudodir)/sudoreplay; fi |
43 | + $(INSTALL) visudo $(DESTDIR)$(visudodir)/visudo | | 45 | + $(INSTALL) visudo $(DESTDIR)$(visudodir)/visudo |
44 | + if [ -f sesh ]; then $(INSTALL) sesh $(DESTDIR)$(libexecdir)/sesh; fi | | 46 | + if [ -f sesh ]; then $(INSTALL) sesh $(DESTDIR)$(libexecdir)/sesh; fi |
45 | | | 47 | |
46 | install-noexec: install-dirs libsudo_noexec.la | | 48 | install-noexec: install-dirs libsudo_noexec.la |
47 | - if [ -f .libs/lib$(noexecfile) ]; then $(INSTALL) -b~ -O $(install_uid) -G $(install_gid) -M 0755 .libs/lib$(noexecfile) $(DESTDIR)$(noexecdir)/$(noexecfile); fi | | 49 | - if [ -f .libs/lib$(noexecfile) ]; then $(INSTALL) -b~ -O $(install_uid) -G $(install_gid) -m 0755 .libs/lib$(noexecfile) $(DESTDIR)$(noexecdir)/$(noexecfile); fi |
48 | + if [ -f .libs/lib$(noexecfile) ]; then $(INSTALL) -m 0755 .libs/lib$(noexecfile) $(DESTDIR)$(noexecdir)/$(noexecfile); fi | | 50 | + if [ -f .libs/lib$(noexecfile) ]; then $(INSTALL) -m 0755 .libs/lib$(noexecfile) $(DESTDIR)$(noexecdir)/$(noexecfile); fi |
49 | | | 51 | |
50 | install-sudoers: install-dirs | | 52 | install-sudoers: install-dirs |
51 | - $(INSTALL) -d -O $(sudoers_uid) -G $(sudoers_gid) -M 0750 \ | | 53 | - $(INSTALL) -d -O $(sudoers_uid) -G $(sudoers_gid) -m 0750 \ |
52 | + $(INSTALL) -d -o $(sudoers_uid) -g $(sudoers_gid) -m 0750 \ | | 54 | + $(INSTALL) -d -m 0750 \ |
53 | $(DESTDIR)$(sudoersdir)/sudoers.d | | 55 | $(DESTDIR)$(sudoersdir)/sudoers.d |
54 | test -f $(DESTDIR)$(sudoersdir)/sudoers || \ | | 56 | test -f $(DESTDIR)$(sudoersdir)/sudoers || \ |
55 | - $(INSTALL) -O $(sudoers_uid) -G $(sudoers_gid) -M $(sudoers_mode) \ | | 57 | - $(INSTALL) -O $(sudoers_uid) -G $(sudoers_gid) -m $(sudoers_mode) \ |
56 | + $(INSTALL) -o $(sudoers_uid) -g $(sudoers_gid) -m $(sudoers_mode) \ | | 58 | + $(INSTALL) -m $(sudoers_mode) \ |
57 | sudoers $(DESTDIR)$(sudoersdir)/sudoers | | 59 | sudoers $(DESTDIR)$(sudoersdir)/sudoers |
58 | | | 60 | |
59 | install-doc: install-dirs ChangeLog | | 61 | install-doc: install-dirs ChangeLog |
60 | - (cd $(srcdir) && for f in ChangeLog HISTORY LICENSE NEWS README TROUBLESHOOTING UPGRADE sample.*; do $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 $$f $(DESTDIR)$(docdir); done) | | 62 | - (cd $(srcdir) && for f in ChangeLog HISTORY LICENSE NEWS README TROUBLESHOOTING UPGRADE sample.*; do $(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 $$f $(DESTDIR)$(docdir); done) |
61 | - @LDAP@(cd $(srcdir) && for f in README.LDAP schema.* sudoers2ldif; do $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 $$f $(DESTDIR)$(docdir); done) | | 63 | - @LDAP@(cd $(srcdir) && for f in README.LDAP schema.* sudoers2ldif; do $(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 $$f $(DESTDIR)$(docdir); done) |
62 | - $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 @mansrcdir@/sudo.$(mantype) $(DESTDIR)$(mandirsu)/sudo.$(mansectsu) | | 64 | - $(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 @mansrcdir@/sudo.$(mantype) $(DESTDIR)$(mandirsu)/sudo.$(mansectsu) |
63 | + (cd $(srcdir) && for f in ChangeLog HISTORY LICENSE NEWS README TROUBLESHOOTING UPGRADE sample.*; do $(INSTALL) -m 0444 $$f $(DESTDIR)$(docdir); done) | | 65 | + (cd $(srcdir) && for f in ChangeLog HISTORY LICENSE NEWS README TROUBLESHOOTING UPGRADE sample.*; do $(INSTALL) -m 0444 $$f $(DESTDIR)$(docdir); done) |
64 | + @LDAP@(cd $(srcdir) && for f in README.LDAP schema.* sudoers2ldif; do $(INSTALL) -m 0444 $$f $(DESTDIR)$(docdir); done) | | 66 | + @LDAP@(cd $(srcdir) && for f in README.LDAP schema.* sudoers2ldif; do $(INSTALL) -m 0444 $$f $(DESTDIR)$(docdir); done) |
65 | + $(INSTALL) -m 0444 @mansrcdir@/sudo.$(mantype) $(DESTDIR)$(mandirsu)/sudo.$(mansectsu) | | 67 | + $(INSTALL) -m 0444 @mansrcdir@/sudo.$(mantype) $(DESTDIR)$(mandirsu)/sudo.$(mansectsu) |
66 | @rm -f $(DESTDIR)$(mandirsu)/sudoedit.$(mansectsu) | | 68 | @rm -f $(DESTDIR)$(mandirsu)/sudoedit.$(mansectsu) |
67 | ln $(DESTDIR)$(mandirsu)/sudo.$(mansectsu) $(DESTDIR)$(mandirsu)/sudoedit.$(mansectsu) | | 69 | ln $(DESTDIR)$(mandirsu)/sudo.$(mansectsu) $(DESTDIR)$(mandirsu)/sudoedit.$(mansectsu) |
68 | - @REPLAY@$(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 @mansrcdir@/sudoreplay.$(mantype) $(DESTDIR)$(mandirsu)/sudoreplay.$(mansectsu) | | 70 | - @REPLAY@$(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 @mansrcdir@/sudoreplay.$(mantype) $(DESTDIR)$(mandirsu)/sudoreplay.$(mansectsu) |
69 | - $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 @mansrcdir@/visudo.$(mantype) $(DESTDIR)$(mandirsu)/visudo.$(mansectsu) | | 71 | - $(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 @mansrcdir@/visudo.$(mantype) $(DESTDIR)$(mandirsu)/visudo.$(mansectsu) |
70 | - $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 @mansrcdir@/sudoers.$(mantype) $(DESTDIR)$(mandirform)/sudoers.$(mansectform) | | 72 | - $(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 @mansrcdir@/sudoers.$(mantype) $(DESTDIR)$(mandirform)/sudoers.$(mansectform) |
71 | - @LDAP@$(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 @mansrcdir@/sudoers.ldap.$(mantype) $(DESTDIR)$(mandirform)/sudoers.ldap.$(mansectform) | | 73 | - @LDAP@$(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 @mansrcdir@/sudoers.ldap.$(mantype) $(DESTDIR)$(mandirform)/sudoers.ldap.$(mansectform) |
72 | + @REPLAY@$(INSTALL) -m 0444 @mansrcdir@/sudoreplay.$(mantype) $(DESTDIR)$(mandirsu)/sudoreplay.$(mansectsu) | | 74 | + @REPLAY@$(INSTALL) -m 0444 @mansrcdir@/sudoreplay.$(mantype) $(DESTDIR)$(mandirsu)/sudoreplay.$(mansectsu) |
73 | + $(INSTALL) -m 0444 @mansrcdir@/visudo.$(mantype) $(DESTDIR)$(mandirsu)/visudo.$(mansectsu) | | 75 | + $(INSTALL) -m 0444 @mansrcdir@/visudo.$(mantype) $(DESTDIR)$(mandirsu)/visudo.$(mansectsu) |
74 | + $(INSTALL) -m 0444 @mansrcdir@/sudoers.$(mantype) $(DESTDIR)$(mandirform)/sudoers.$(mansectform) | | 76 | + $(INSTALL) -m 0444 @mansrcdir@/sudoers.$(mantype) $(DESTDIR)$(mandirform)/sudoers.$(mansectform) |
75 | + @LDAP@$(INSTALL) -m 0444 @mansrcdir@/sudoers.ldap.$(mantype) $(DESTDIR)$(mandirform)/sudoers.ldap.$(mansectform) | | 77 | + @LDAP@$(INSTALL) -m 0444 @mansrcdir@/sudoers.ldap.$(mantype) $(DESTDIR)$(mandirform)/sudoers.ldap.$(mansectform) |
76 | @MAN_POSTINSTALL@ | | 78 | @MAN_POSTINSTALL@ |
77 | | | 79 | |
78 | check: | | 80 | check: |