fcddc38b0f
* Fix build on DragonFly. * The patches regen. Tested on DragonFly/i386 2.10.1 and NetBSD/i386 5.99.55.
78 lines
4.9 KiB
Text
78 lines
4.9 KiB
Text
$NetBSD: patch-aa,v 1.28 2011/09/18 14:18:25 ryoon Exp $
|
|
|
|
* Fix libtools's link option.
|
|
* Prevent to install sudoers files and directory.
|
|
* Use standard instal(8) option instead of shell wrapper.
|
|
* Don't setuid here.
|
|
|
|
--- Makefile.in.orig 2011-08-13 17:29:18 +0000
|
|
+++ Makefile.in
|
|
@@ -222,7 +222,7 @@ sudo_noexec.lo: $(srcdir)/sudo_noexec.c
|
|
$(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/sudo_noexec.c
|
|
|
|
libsudo_noexec.la: sudo_noexec.lo
|
|
- $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ sudo_noexec.lo -avoid-version -rpath $(noexecdir)
|
|
+ $(LIBTOOL) --mode=link $(CC) -module $(LDFLAGS) -o $@ sudo_noexec.lo -avoid-version -rpath $(noexecdir)
|
|
|
|
# Uncomment the following if you want "make distclean" to clean the parser
|
|
@DEV@GENERATED = gram.h gram.c toke.c def_data.c def_data.h getdate
|
|
@@ -543,43 +543,43 @@ pre-install:
|
|
./visudo -c -f $(DESTDIR)$(sudoersdir)/sudoers; \
|
|
fi
|
|
|
|
-install: pre-install install-dirs install-binaries @INSTALL_NOEXEC@ install-sudoers install-doc
|
|
+install: install-binaries @INSTALL_NOEXEC@ install-doc
|
|
|
|
install-dirs:
|
|
$(SHELL) $(srcdir)/mkinstalldirs $(DESTDIR)$(sudodir) \
|
|
$(DESTDIR)$(visudodir) $(DESTDIR)$(noexecdir) \
|
|
- $(DESTDIR)$(sudoersdir) $(DESTDIR)$(docdir) \
|
|
+ $(DESTDIR)$(docdir) \
|
|
$(DESTDIR)$(mandirsu) $(DESTDIR)$(mandirform)
|
|
$(SHELL) $(srcdir)/mkinstalldirs -m 0700 $(DESTDIR)$(timedir)
|
|
|
|
install-binaries: install-dirs $(PROGS)
|
|
- $(INSTALL) -b~ -O $(install_uid) -G $(install_gid) -M 04111 sudo $(DESTDIR)$(sudodir)/sudo
|
|
+ $(INSTALL) sudo $(DESTDIR)$(sudodir)/sudo
|
|
rm -f $(DESTDIR)$(sudodir)/sudoedit
|
|
ln $(DESTDIR)$(sudodir)/sudo $(DESTDIR)$(sudodir)/sudoedit
|
|
- if [ -f sudoreplay ]; then $(INSTALL) -b~ -O $(install_uid) -G $(install_gid) -M 0111 sudoreplay $(DESTDIR)$(sudodir)/sudoreplay; fi
|
|
- $(INSTALL) -b~ -O $(install_uid) -G $(install_gid) -M 0111 visudo $(DESTDIR)$(visudodir)/visudo
|
|
- if [ -f sesh ]; then $(INSTALL) -b~ -O $(install_uid) -G $(install_gid) -M 0111 sesh $(DESTDIR)$(libexecdir)/sesh; fi
|
|
+ if [ -f sudoreplay ]; then $(INSTALL) sudoreplay $(DESTDIR)$(sudodir)/sudoreplay; fi
|
|
+ $(INSTALL) visudo $(DESTDIR)$(visudodir)/visudo
|
|
+ if [ -f sesh ]; then $(INSTALL) sesh $(DESTDIR)$(libexecdir)/sesh; fi
|
|
|
|
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) -m 0755 .libs/lib$(noexecfile) $(DESTDIR)$(noexecdir)/$(noexecfile); 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 -f $(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
|
|
|
|
install-doc: install-dirs ChangeLog
|
|
- (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)
|
|
- @LDAP@(cd $(srcdir) && for f in README.LDAP schema.* sudoers2ldif; 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)
|
|
+ (cd $(srcdir) && for f in ChangeLog HISTORY LICENSE NEWS README TROUBLESHOOTING UPGRADE sample.*; do $(INSTALL) -m 0444 $$f $(DESTDIR)$(docdir); done)
|
|
+ @LDAP@(cd $(srcdir) && for f in README.LDAP schema.* sudoers2ldif; do $(INSTALL) -m 0444 $$f $(DESTDIR)$(docdir); done)
|
|
+ $(INSTALL) -m 0444 @mansrcdir@/sudo.$(mantype) $(DESTDIR)$(mandirsu)/sudo.$(mansectsu)
|
|
@rm -f $(DESTDIR)$(mandirsu)/sudoedit.$(mansectsu)
|
|
ln $(DESTDIR)$(mandirsu)/sudo.$(mansectsu) $(DESTDIR)$(mandirsu)/sudoedit.$(mansectsu)
|
|
- @REPLAY@$(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)
|
|
+ @REPLAY@$(INSTALL) -m 0444 @mansrcdir@/sudoreplay.$(mantype) $(DESTDIR)$(mandirsu)/sudoreplay.$(mansectsu)
|
|
+ $(INSTALL) -m 0444 @mansrcdir@/visudo.$(mantype) $(DESTDIR)$(mandirsu)/visudo.$(mansectsu)
|
|
+ $(INSTALL) -m 0444 @mansrcdir@/sudoers.$(mantype) $(DESTDIR)$(mandirform)/sudoers.$(mansectform)
|
|
+ @LDAP@$(INSTALL) -m 0444 @mansrcdir@/sudoers.ldap.$(mantype) $(DESTDIR)$(mandirform)/sudoers.ldap.$(mansectform)
|
|
@MAN_POSTINSTALL@
|
|
|
|
check:
|