summaryrefslogtreecommitdiff
path: root/security/sudo/patches/patch-aa
diff options
context:
space:
mode:
Diffstat (limited to 'security/sudo/patches/patch-aa')
-rw-r--r--security/sudo/patches/patch-aa25
1 files changed, 13 insertions, 12 deletions
diff --git a/security/sudo/patches/patch-aa b/security/sudo/patches/patch-aa
index 80705df3382..3227b55ed42 100644
--- a/security/sudo/patches/patch-aa
+++ b/security/sudo/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.19 2008/03/29 14:16:58 taca Exp $
+$NetBSD: patch-aa,v 1.19.12.1 2009/02/05 17:00:25 tron Exp $
---- Makefile.in.orig 2008-03-24 04:43:51.000000000 +0900
+--- Makefile.in.orig 2008-12-04 05:40:58.000000000 +0900
+++ Makefile.in
-@@ -188,7 +188,7 @@ sudo_noexec.lo: $(srcdir)/sudo_noexec.c
+@@ -197,7 +197,7 @@ sudo_noexec.lo: $(srcdir)/sudo_noexec.c
$(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/sudo_noexec.c
sudo_noexec.la: sudo_noexec.lo
@@ -10,10 +10,10 @@ $NetBSD: patch-aa,v 1.19 2008/03/29 14:16:58 taca Exp $
+ $(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@PARSESRCS = sudo.tab.h sudo.tab.c lex.yy.c def_data.c def_data.h
-@@ -304,35 +304,35 @@ sudoers.man:: sudoers.man.in
-
- sudoers.cat: sudoers.man
+ @DEV@GENERATED = gram.h gram.c toke.c def_data.c def_data.h
+@@ -399,36 +399,36 @@ sudoers.ldap.cat: sudoers.ldap.man
+ ChangeLog:
+ cvs2cl --follow-only trunk
-install: install-dirs install-binaries @INSTALL_NOEXEC@ install-sudoers install-man
+install: install-dirs install-binaries @INSTALL_NOEXEC@ install-man
@@ -27,13 +27,13 @@ $NetBSD: patch-aa,v 1.19 2008/03/29 14:16:58 taca Exp $
install-binaries: $(PROGS)
- $(INSTALL) -O $(install_uid) -G $(install_gid) -M 4111 -s sudo $(DESTDIR)$(sudodir)/sudo
-+ $(INSTALL) -o $(install_uid) -g $(install_gid) -m 4511 -s sudo $(DESTDIR)$(sudodir)
++ $(INSTALL) -o $(install_uid) -g $(install_gid) -m 4511 -s sudo $(DESTDIR)$(sudodir)/sudo
rm -f $(DESTDIR)$(sudodir)/sudoedit
ln $(DESTDIR)$(sudodir)/sudo $(DESTDIR)$(sudodir)/sudoedit
- $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0111 -s visudo $(DESTDIR)$(visudodir)/visudo
-@SELINUX@ $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0111 -s sesh $(DESTDIR)$(libexecdir)/sesh
-+ $(INSTALL) -o $(install_uid) -g $(install_gid) -m 0511 -s visudo $(DESTDIR)$(visudodir)
-+@SELINUX@ $(INSTALL) -o $(install_uid) -g $(install_gid) -m 0511 -s sesh $(DESTDIR)$(libexecdir)
++ $(INSTALL) -o $(install_uid) -g $(install_gid) -m 0111 -s visudo $(DESTDIR)$(visudodir)/visudo
++@SELINUX@ $(INSTALL) -o $(install_uid) -g $(install_gid) -m 0511 -s sesh $(DESTDIR)$(libexecdir)/sesh
install-noexec: sudo_noexec.la
- test -f .libs/$(noexecfile) && $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0755 .libs/$(noexecfile) $(DESTDIR)$(noexecdir)
@@ -42,9 +42,8 @@ $NetBSD: patch-aa,v 1.19 2008/03/29 14:16:58 taca Exp $
install-sudoers:
test -f $(DESTDIR)$(sudoersdir)/sudoers || \
- $(INSTALL) -O $(sudoers_uid) -G $(sudoers_gid) -M $(sudoers_mode) \
-- $(srcdir)/sudoers $(DESTDIR)$(sudoersdir)/sudoers
+ $(INSTALL) -o $(sudoers_uid) -g $(sudoers_gid) -m $(sudoers_mode) \
-+ $(srcdir)/sudoers $(DESTDIR)$(sudoersdir)
+ $(srcdir)/sudoers $(DESTDIR)$(sudoersdir)/sudoers
install-man:
- $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 @mansrcdir@/sudo.$(mantype) $(DESTDIR)$(mandirsu)/sudo.$(mansectsu)
@@ -53,8 +52,10 @@ $NetBSD: patch-aa,v 1.19 2008/03/29 14:16:58 taca Exp $
ln $(DESTDIR)$(mandirsu)/sudo.$(mansectsu) $(DESTDIR)$(mandirsu)/sudoedit.$(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@/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@
check: