Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/sudo/patches/Makefile.in.patch
author April Chin <april.chin@oracle.com>
Thu, 02 Jun 2011 09:52:40 -0700
changeset 279 c6af843791cd
permissions -rw-r--r--
7044076 move sudo from sfw to userland 7048938 $(BITS) not being set for .installed targets
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
279
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
     1
 
--- sudo-1.7.4p4/Makefile.in.orig	Fri Sep  3 14:43:57 2010
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
     2
 
+++ sudo-1.7.4p4/Makefile.in	Wed May 25 14:19:46 2011
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
     3
 
@@ -86,6 +86,9 @@
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
     4
 
 mandirsu = $(mandir)/$(mantype)$(mansectsu)
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
     5
 
 mandirform = $(mandir)/$(mantype)$(mansectform)
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
     6
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
     7
 
+datadir = @datadir@
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
     8
 
+ldifdir = $(datadir)/lib/ldif
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
     9
 
+
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    10
 
 # User and group ids the installed files should be "owned" by
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    11
 
 install_uid = 0
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    12
 
 install_gid = 0
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    13
 
@@ -205,8 +208,10 @@
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    14
 
 	$(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/sudo_noexec.c
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    15
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    16
 
 libsudo_noexec.la: sudo_noexec.lo
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    17
 
-	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ sudo_noexec.lo -avoid-version -rpath $(noexecdir)
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    18
 
+	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ sudo_noexec.lo -avoid-version -rpath $(noexecdir)
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    19
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    20
 
+libsudo_noexec: libsudo_noexec.la
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    21
 
+
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    22
 
 # Uncomment the following if you want "make distclean" to clean the parser
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    23
 
 @DEV@GENERATED = gram.h gram.c toke.c def_data.c def_data.h getdate
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    24
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    25
 
@@ -475,45 +480,52 @@
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    26
 
 	    hg log --style=changelog -b default --date '<2010-01-18 00:00:00' >> $@; \
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    27
 
 	fi
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    28
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    29
 
-install: install-dirs install-binaries @INSTALL_NOEXEC@ install-sudoers install-doc
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    30
 
+install: install-dirs install-binaries @INSTALL_NOEXEC@ install-sudoers install-doc install-ldif
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    31
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    32
 
+# only create $(MACH64) directory if $(MACH64) is set to a non-empty string
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    33
 
 install-dirs:
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    34
 
 	$(SHELL) $(srcdir)/mkinstalldirs $(DESTDIR)$(sudodir) \
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    35
 
-	    $(DESTDIR)$(visudodir) $(DESTDIR)$(noexecdir) \
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    36
 
+	    $(DESTDIR)$(visudodir) $(DESTDIR)$(noexecdir)/$(MACH64) \
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    37
 
 	    $(DESTDIR)$(sudoersdir) $(DESTDIR)$(docdir) \
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    38
 
-	    $(DESTDIR)$(mandirsu) $(DESTDIR)$(mandirform)
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    39
 
-	$(SHELL) $(srcdir)/mkinstalldirs -m 0700 $(DESTDIR)$(timedir)
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    40
 
+	    $(DESTDIR)$(mandirsu) $(DESTDIR)$(mandirform) \
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    41
 
+	    $(DESTDIR)$(ldifdir)
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    42
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    43
 
 install-binaries: install-dirs $(PROGS)
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    44
 
-	$(INSTALL) -b~ -O $(install_uid) -G $(install_gid) -M 04111 sudo $(DESTDIR)$(sudodir)/sudo
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    45
 
+	$(INSTALL) -O $(install_uid) -G $(install_gid) -m 04511 sudo $(DESTDIR)$(sudodir)/sudo
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    46
 
 	rm -f $(DESTDIR)$(sudodir)/sudoedit
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    47
 
 	ln $(DESTDIR)$(sudodir)/sudo $(DESTDIR)$(sudodir)/sudoedit
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    48
 
-	if [ -f sudoreplay ]; then $(INSTALL) -b~ -O $(install_uid) -G $(install_gid) -M 0111 sudoreplay $(DESTDIR)$(sudodir)/sudoreplay; fi
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    49
 
-	$(INSTALL) -b~ -O $(install_uid) -G $(install_gid) -M 0111 visudo $(DESTDIR)$(visudodir)/visudo
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    50
 
-	if [ -f sesh ]; then $(INSTALL) -b~ -O $(install_uid) -G $(install_gid) -M 0111 sesh $(DESTDIR)$(libexecdir)/sesh; fi
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    51
 
+	if [ -f sudoreplay ]; then $(INSTALL) -O $(install_uid) -G $(install_gid) -m 0111 sudoreplay $(DESTDIR)$(sudodir)/sudoreplay; fi
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    52
 
+	$(INSTALL) -O $(install_uid) -G $(install_gid) -m 0511 visudo $(DESTDIR)$(visudodir)/visudo
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    53
 
+	if [ -f sesh ]; then $(INSTALL) -O $(install_uid) -G $(install_gid) -m 0511 sesh $(DESTDIR)$(libexecdir)/sesh; fi
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    54
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    55
 
+	# XXX only installs into $(MACH64) directory if $(MACH64) is non-empty
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    56
 
 install-noexec: install-dirs libsudo_noexec.la
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    57
 
-	if [ -f .libs/lib$(noexecfile) ]; then $(INSTALL) -b~ -O $(install_uid) -G $(install_gid) -M 0755 .libs/lib$(noexecfile) $(DESTDIR)$(noexecdir)/$(noexecfile); fi
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    58
 
+	if [ -f .libs/lib$(noexecfile) ]; then $(INSTALL) -O $(install_uid) -G $(install_gid) -m 0755 .libs/lib$(noexecfile) $(DESTDIR)$(noexecdir)/$(MACH64)/$(noexecfile); fi
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    59
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    60
 
 install-sudoers: install-dirs
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    61
 
-	$(INSTALL) -d -O $(sudoers_uid) -G $(sudoers_gid) -M 0750 \
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    62
 
+	$(INSTALL) -d -O $(sudoers_uid) -G $(sudoers_gid) -m 0750 \
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    63
 
 	    $(DESTDIR)$(sudoersdir)/sudoers.d
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    64
 
 	test -f $(DESTDIR)$(sudoersdir)/sudoers || \
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    65
 
-	    $(INSTALL) -O $(sudoers_uid) -G $(sudoers_gid) -M $(sudoers_mode) \
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    66
 
+	    $(INSTALL) -O $(sudoers_uid) -G $(sudoers_gid) -m $(sudoers_mode) \
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    67
 
 		sudoers $(DESTDIR)$(sudoersdir)/sudoers
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    68
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    69
 
 install-doc: install-dirs ChangeLog
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    70
 
-	(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)
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    71
 
-	@LDAP@(cd $(srcdir) && for f in README.LDAP schema.* sudoers2ldif; do $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 $$f $(DESTDIR)$(docdir); done)
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    72
 
-	$(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 @mansrcdir@/sudo.$(mantype) $(DESTDIR)$(mandirsu)/sudo.$(mansectsu)
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    73
 
+	(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)
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    74
 
+	@LDAP@(cd $(srcdir) && for f in README.LDAP schema.* sudoers2ldif; do $(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 $$f $(DESTDIR)$(docdir); done)
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    75
 
+	$(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 @mansrcdir@/sudo.$(mantype) $(DESTDIR)$(mandirsu)/sudo.$(mansectsu)
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    76
 
 	@rm -f $(DESTDIR)$(mandirsu)/sudoedit.$(mansectsu)
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    77
 
 	ln $(DESTDIR)$(mandirsu)/sudo.$(mansectsu) $(DESTDIR)$(mandirsu)/sudoedit.$(mansectsu)
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    78
 
-	@REPLAY@$(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 @mansrcdir@/sudoreplay.$(mantype) $(DESTDIR)$(mandirsu)/sudoreplay.$(mansectsu)
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    79
 
-	$(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 @mansrcdir@/visudo.$(mantype) $(DESTDIR)$(mandirsu)/visudo.$(mansectsu)
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    80
 
-	$(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 @mansrcdir@/sudoers.$(mantype) $(DESTDIR)$(mandirform)/sudoers.$(mansectform)
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    81
 
-	@LDAP@$(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 @mansrcdir@/sudoers.ldap.$(mantype) $(DESTDIR)$(mandirform)/sudoers.ldap.$(mansectform)
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    82
 
+	@REPLAY@$(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 @mansrcdir@/sudoreplay.$(mantype) $(DESTDIR)$(mandirsu)/sudoreplay.$(mansectsu)
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    83
 
+	$(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 @mansrcdir@/visudo.$(mantype) $(DESTDIR)$(mandirsu)/visudo.$(mansectsu)
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    84
 
+	$(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 @mansrcdir@/sudoers.$(mantype) $(DESTDIR)$(mandirform)/sudoers.$(mansectform)
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    85
 
+	@LDAP@$(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 @mansrcdir@/sudoers.ldap.$(mantype) $(DESTDIR)$(mandirform)/sudoers.ldap.$(mansectform)
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    86
 
 @MAN_POSTINSTALL@
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    87
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    88
 
+install-ldif:
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    89
 
+	$(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 $(srcdir)/schema.OpenLDAP $(DESTDIR)$(ldifdir)/sudo-schema.OpenLDAP
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    90
 
+	$(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 $(srcdir)/schema.iPlanet $(DESTDIR)$(ldifdir)/sudo-schema.iPlanet
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    91
 
+	$(INSTALL) -O $(install_uid) -G $(install_gid) -m 0444 $(srcdir)/sudoers2ldif $(DESTDIR)$(ldifdir)/sudoers2ldif
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    92
 
+
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    93
 
 check:
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    94
 
 	@echo nothing to check
c6af843791cd 7044076 move sudo from sfw to userland
April Chin <april.chin@oracle.com>
parents:
diff changeset 
    95
upstream/oracle/userland-gate