[69cde8d] | 1 | Submitted By: Matthew Burgess <matthew at linuxfromscratch dot org>
|
---|
[7c0b4b3] | 2 | Date: 2006-10-22
|
---|
| 3 | Initial Package Version: 6.4
|
---|
[69cde8d] | 4 | Origin: original suppress_hotname_uptame_kill_su patch (Robert Connolly)
|
---|
| 5 | Upstream Status: N/A
|
---|
| 6 | Description: This patch supresses the building of uptime, and kill. The su
|
---|
[7c0b4b3] | 7 | command is built so the testsuite can run, use './src/su', but
|
---|
| 8 | it will not be installed. Also see:
|
---|
[69cde8d] | 9 |
|
---|
[7c0b4b3] | 10 | Updated for 6.3 and 6.4 by Jim Gifford
|
---|
| 11 |
|
---|
| 12 | diff -Naur coreutils-6.4.orig/AUTHORS coreutils-6.4/AUTHORS
|
---|
| 13 | --- coreutils-6.4.orig/AUTHORS 2006-10-22 09:54:15.000000000 -0700
|
---|
| 14 | +++ coreutils-6.4/AUTHORS 2006-10-22 20:47:10.000000000 -0700
|
---|
[862e2c0] | 15 | @@ -35,7 +35,6 @@
|
---|
[69cde8d] | 16 | hostname: Jim Meyering
|
---|
| 17 | id: Arnold Robbins, David MacKenzie
|
---|
| 18 | join: Mike Haertel
|
---|
| 19 | -kill: Paul Eggert
|
---|
| 20 | link: Michael Stone
|
---|
| 21 | ln: Mike Parker, David MacKenzie
|
---|
| 22 | logname: FIXME: unknown
|
---|
[862e2c0] | 23 | @@ -89,7 +88,6 @@
|
---|
[69cde8d] | 24 | unexpand: David MacKenzie
|
---|
| 25 | uniq: Richard Stallman, David MacKenzie
|
---|
| 26 | unlink: Michael Stone
|
---|
| 27 | -uptime: Joseph Arceneaux, David MacKenzie, Kaveh Ghazi
|
---|
| 28 | users: Joseph Arceneaux, David MacKenzie
|
---|
| 29 | vdir: Richard Stallman, David MacKenzie
|
---|
| 30 | wc: Paul Rubin, David MacKenzie
|
---|
[7c0b4b3] | 31 | diff -Naur coreutils-6.4.orig/configure coreutils-6.4/configure
|
---|
| 32 | --- coreutils-6.4.orig/configure 2006-10-22 13:36:16.000000000 -0700
|
---|
| 33 | +++ coreutils-6.4/configure 2006-10-22 20:47:10.000000000 -0700
|
---|
| 34 | @@ -49517,8 +49517,7 @@
|
---|
[69cde8d] | 35 | { echo "$as_me:$LINENO: result: $gnulib_cv_have_boot_time" >&5
|
---|
| 36 | echo "${ECHO_T}$gnulib_cv_have_boot_time" >&6; }
|
---|
| 37 | if test $gnulib_cv_have_boot_time = yes; then
|
---|
| 38 | - OPTIONAL_BIN_PROGS="$OPTIONAL_BIN_PROGS uptime\$(EXEEXT)"
|
---|
| 39 | - MAN="$MAN uptime.1"
|
---|
| 40 | +echo "uptime is suppressed"
|
---|
| 41 | fi
|
---|
| 42 |
|
---|
| 43 |
|
---|
[7c0b4b3] | 44 | diff -Naur coreutils-6.4.orig/Makefile.in coreutils-6.4/Makefile.in
|
---|
| 45 | --- coreutils-6.4.orig/Makefile.in 2006-10-22 13:36:28.000000000 -0700
|
---|
| 46 | +++ coreutils-6.4/Makefile.in 2006-10-22 20:47:10.000000000 -0700
|
---|
| 47 | @@ -175,7 +175,7 @@
|
---|
[862e2c0] | 48 | $(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/unicodeio.m4 \
|
---|
| 49 | $(top_srcdir)/m4/unistd-safer.m4 $(top_srcdir)/m4/unistd_h.m4 \
|
---|
[69cde8d] | 50 | $(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
|
---|
| 51 | - $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
|
---|
| 52 | + $(top_srcdir)/m4/unlocked-io.m4 \
|
---|
| 53 | $(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
|
---|
| 54 | $(top_srcdir)/m4/utime.m4 $(top_srcdir)/m4/utimecmp.m4 \
|
---|
| 55 | $(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimes-null.m4 \
|
---|
[7c0b4b3] | 56 | diff -Naur coreutils-6.4.orig/man/Makefile.in coreutils-6.4/man/Makefile.in
|
---|
| 57 | --- coreutils-6.4.orig/man/Makefile.in 2006-10-22 13:36:24.000000000 -0700
|
---|
| 58 | +++ coreutils-6.4/man/Makefile.in 2006-10-22 20:47:10.000000000 -0700
|
---|
| 59 | @@ -170,7 +170,7 @@
|
---|
[862e2c0] | 60 | $(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/unicodeio.m4 \
|
---|
| 61 | $(top_srcdir)/m4/unistd-safer.m4 $(top_srcdir)/m4/unistd_h.m4 \
|
---|
| 62 | $(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
|
---|
| 63 | - $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
|
---|
| 64 | + $(top_srcdir)/m4/unlocked-io.m4 \
|
---|
| 65 | $(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
|
---|
| 66 | $(top_srcdir)/m4/utime.m4 $(top_srcdir)/m4/utimecmp.m4 \
|
---|
| 67 | $(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimes-null.m4 \
|
---|
[7c0b4b3] | 68 | @@ -380,14 +380,14 @@
|
---|
[862e2c0] | 69 | base64.1 basename.1 cat.1 chgrp.1 chmod.1 chown.1 chroot.1 cksum.1 comm.1 \
|
---|
[69cde8d] | 70 | cp.1 csplit.1 cut.1 date.1 dd.1 df.1 dir.1 dircolors.1 dirname.1 du.1 \
|
---|
| 71 | echo.1 env.1 expand.1 expr.1 factor.1 false.1 fmt.1 fold.1 groups.1 \
|
---|
| 72 | - head.1 hostid.1 hostname.1 id.1 install.1 join.1 kill.1 \
|
---|
| 73 | + head.1 hostid.1 hostname.1 id.1 install.1 join.1 \
|
---|
| 74 | link.1 ln.1 logname.1 \
|
---|
| 75 | ls.1 md5sum.1 mkdir.1 mkfifo.1 mknod.1 mv.1 nice.1 nl.1 nohup.1 od.1 \
|
---|
| 76 | paste.1 pathchk.1 pinky.1 pr.1 printenv.1 printf.1 ptx.1 pwd.1 readlink.1 \
|
---|
[862e2c0] | 77 | rm.1 rmdir.1 seq.1 sha1sum.1 sha224sum.1 sha256sum.1 sha384sum.1 sha512sum.1 \
|
---|
| 78 | shred.1 shuf.1 sleep.1 sort.1 split.1 stat.1 stty.1 \
|
---|
[69cde8d] | 79 | - su.1 sum.1 sync.1 tac.1 tail.1 tee.1 test.1 touch.1 tr.1 true.1 tsort.1 \
|
---|
| 80 | - tty.1 uname.1 unexpand.1 uniq.1 unlink.1 uptime.1 users.1 vdir.1 wc.1 \
|
---|
| 81 | + sum.1 sync.1 tac.1 tail.1 tee.1 test.1 touch.1 tr.1 true.1 tsort.1 \
|
---|
| 82 | + tty.1 uname.1 unexpand.1 uniq.1 unlink.1 users.1 vdir.1 wc.1 \
|
---|
| 83 | who.1 whoami.1 yes.1
|
---|
| 84 |
|
---|
| 85 | man_aux = $(dist_man_MANS:.1=.x)
|
---|
[7c0b4b3] | 86 | @@ -663,7 +663,6 @@
|
---|
[69cde8d] | 87 | id.1: $(common_dep) $(srcdir)/id.x ../src/id.c
|
---|
| 88 | install.1: $(common_dep) $(srcdir)/install.x ../src/install.c
|
---|
| 89 | join.1: $(common_dep) $(srcdir)/join.x ../src/join.c
|
---|
| 90 | -kill.1: $(common_dep) $(srcdir)/kill.x ../src/kill.c
|
---|
| 91 | link.1: $(common_dep) $(srcdir)/link.x ../src/link.c
|
---|
| 92 | ln.1: $(common_dep) $(srcdir)/ln.x ../src/ln.c
|
---|
| 93 | logname.1: $(common_dep) $(srcdir)/logname.x ../src/logname.c
|
---|
[7c0b4b3] | 94 | @@ -701,7 +700,6 @@
|
---|
[69cde8d] | 95 | split.1: $(common_dep) $(srcdir)/split.x ../src/split.c
|
---|
| 96 | stat.1: $(common_dep) $(srcdir)/stat.x ../src/stat.c
|
---|
| 97 | stty.1: $(common_dep) $(srcdir)/stty.x ../src/stty.c
|
---|
| 98 | -su.1: $(common_dep) $(srcdir)/su.x ../src/su.c
|
---|
| 99 | sum.1: $(common_dep) $(srcdir)/sum.x ../src/sum.c
|
---|
| 100 | sync.1: $(common_dep) $(srcdir)/sync.x ../src/sync.c
|
---|
| 101 | tac.1: $(common_dep) $(srcdir)/tac.x ../src/tac.c
|
---|
[7c0b4b3] | 102 | @@ -717,7 +715,6 @@
|
---|
[69cde8d] | 103 | unexpand.1: $(common_dep) $(srcdir)/unexpand.x ../src/unexpand.c
|
---|
| 104 | uniq.1: $(common_dep) $(srcdir)/uniq.x ../src/uniq.c
|
---|
| 105 | unlink.1: $(common_dep) $(srcdir)/unlink.x ../src/unlink.c
|
---|
| 106 | -uptime.1: $(common_dep) $(srcdir)/uptime.x ../src/uptime.c
|
---|
| 107 | users.1: $(common_dep) $(srcdir)/users.x ../src/users.c
|
---|
| 108 | vdir.1: $(common_dep) $(srcdir)/vdir.x ../src/ls.c
|
---|
| 109 | wc.1: $(common_dep) $(srcdir)/wc.x ../src/wc.c
|
---|
[7c0b4b3] | 110 | @@ -749,7 +746,7 @@
|
---|
[69cde8d] | 111 | check-x-vs-1:
|
---|
| 112 | PATH=../src$(PATH_SEPARATOR)$$PATH; export PATH; \
|
---|
| 113 | t=ls-files.$$$$; \
|
---|
| 114 | - (cd $(srcdir) && ls -1 *.x) | sed 's/\.x$$//' | $(ASSORT) > $$t;\
|
---|
| 115 | + (cd $(srcdir) && ls -1 *.x) | grep -v -e 'kill.x' -e 'su.x' -e 'uptime.x' | sed 's/\.x$$//' | $(ASSORT) > $$t;\
|
---|
| 116 | echo $(dist_man_MANS) | tr -s ' ' '\n' | sed 's/\.1$$//' \
|
---|
| 117 | | $(ASSORT) | diff - $$t || { rm $$t; exit 1; }; \
|
---|
| 118 | rm $$t
|
---|
[7c0b4b3] | 119 | diff -Naur coreutils-6.4.orig/README coreutils-6.4/README
|
---|
| 120 | --- coreutils-6.4.orig/README 2006-10-22 09:54:15.000000000 -0700
|
---|
| 121 | +++ coreutils-6.4/README 2006-10-22 20:47:10.000000000 -0700
|
---|
[862e2c0] | 122 | @@ -9,11 +9,11 @@
|
---|
| 123 |
|
---|
| 124 | [ base64 basename cat chgrp chmod chown chroot cksum comm cp csplit cut date
|
---|
| 125 | dd df dir dircolors dirname du echo env expand expr factor false fmt fold
|
---|
| 126 | - ginstall groups head hostid hostname id join kill link ln logname ls
|
---|
| 127 | + ginstall groups head hostid hostname id join link ln logname ls
|
---|
| 128 | md5sum mkdir mkfifo mknod mv nice nl nohup od paste pathchk pinky pr
|
---|
| 129 | printenv printf ptx pwd readlink rm rmdir seq sha1sum sha224sum sha256sum
|
---|
| 130 | sha384sum sha512sum shred shuf sleep sort split stat stty su sum sync tac
|
---|
| 131 | - tail tee test touch tr true tsort tty uname unexpand uniq unlink uptime
|
---|
| 132 | + tail tee test touch tr true tsort tty uname unexpand uniq unlink
|
---|
| 133 | users vdir wc who whoami yes
|
---|
| 134 |
|
---|
| 135 | See the file NEWS for a list of major changes in the current release.
|
---|
[7c0b4b3] | 136 | diff -Naur coreutils-6.4.orig/src/Makefile.in coreutils-6.4/src/Makefile.in
|
---|
| 137 | --- coreutils-6.4.orig/src/Makefile.in 2006-10-22 14:41:18.000000000 -0700
|
---|
| 138 | +++ coreutils-6.4/src/Makefile.in 2006-10-22 20:48:20.000000000 -0700
|
---|
| 139 | @@ -35,7 +35,7 @@
|
---|
[69cde8d] | 140 | host_triplet = @host@
|
---|
| 141 | EXTRA_PROGRAMS = chroot$(EXEEXT) df$(EXEEXT) hostid$(EXEEXT) \
|
---|
| 142 | nice$(EXEEXT) pinky$(EXEEXT) stty$(EXEEXT) su$(EXEEXT) \
|
---|
| 143 | - uname$(EXEEXT) uptime$(EXEEXT) users$(EXEEXT) who$(EXEEXT)
|
---|
| 144 | + uname$(EXEEXT) users$(EXEEXT) who$(EXEEXT)
|
---|
| 145 | bin_PROGRAMS = [$(EXEEXT) chgrp$(EXEEXT) chown$(EXEEXT) chmod$(EXEEXT) \
|
---|
| 146 | cp$(EXEEXT) dd$(EXEEXT) dircolors$(EXEEXT) du$(EXEEXT) \
|
---|
| 147 | ginstall$(EXEEXT) link$(EXEEXT) ln$(EXEEXT) dir$(EXEEXT) \
|
---|
[7c0b4b3] | 148 | @@ -53,7 +53,7 @@
|
---|
[862e2c0] | 149 | tsort$(EXEEXT) unexpand$(EXEEXT) uniq$(EXEEXT) wc$(EXEEXT) \
|
---|
| 150 | basename$(EXEEXT) date$(EXEEXT) dirname$(EXEEXT) echo$(EXEEXT) \
|
---|
| 151 | env$(EXEEXT) expr$(EXEEXT) factor$(EXEEXT) false$(EXEEXT) \
|
---|
| 152 | - hostname$(EXEEXT) id$(EXEEXT) kill$(EXEEXT) logname$(EXEEXT) \
|
---|
| 153 | + hostname$(EXEEXT) id$(EXEEXT) logname$(EXEEXT) \
|
---|
| 154 | pathchk$(EXEEXT) printenv$(EXEEXT) printf$(EXEEXT) \
|
---|
| 155 | pwd$(EXEEXT) seq$(EXEEXT) sleep$(EXEEXT) tee$(EXEEXT) \
|
---|
| 156 | test$(EXEEXT) true$(EXEEXT) tty$(EXEEXT) whoami$(EXEEXT) \
|
---|
[7c0b4b3] | 157 | @@ -178,7 +178,7 @@
|
---|
[862e2c0] | 158 | $(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/unicodeio.m4 \
|
---|
| 159 | $(top_srcdir)/m4/unistd-safer.m4 $(top_srcdir)/m4/unistd_h.m4 \
|
---|
[69cde8d] | 160 | $(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
|
---|
| 161 | - $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
|
---|
| 162 | + $(top_srcdir)/m4/unlocked-io.m4 \
|
---|
| 163 | $(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
|
---|
| 164 | $(top_srcdir)/m4/utime.m4 $(top_srcdir)/m4/utimecmp.m4 \
|
---|
| 165 | $(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimes-null.m4 \
|
---|
[7c0b4b3] | 166 | @@ -364,11 +364,6 @@
|
---|
[69cde8d] | 167 | join_LDADD = $(LDADD)
|
---|
| 168 | join_DEPENDENCIES = ../lib/libcoreutils.a $(am__DEPENDENCIES_1) \
|
---|
| 169 | ../lib/libcoreutils.a
|
---|
| 170 | -kill_SOURCES = kill.c
|
---|
| 171 | -kill_OBJECTS = kill.$(OBJEXT)
|
---|
| 172 | -kill_LDADD = $(LDADD)
|
---|
| 173 | -kill_DEPENDENCIES = ../lib/libcoreutils.a $(am__DEPENDENCIES_1) \
|
---|
| 174 | - ../lib/libcoreutils.a
|
---|
| 175 | link_SOURCES = link.c
|
---|
| 176 | link_OBJECTS = link.$(OBJEXT)
|
---|
| 177 | link_LDADD = $(LDADD)
|
---|
[7c0b4b3] | 178 | @@ -617,10 +612,6 @@
|
---|
[69cde8d] | 179 | unlink_LDADD = $(LDADD)
|
---|
| 180 | unlink_DEPENDENCIES = ../lib/libcoreutils.a $(am__DEPENDENCIES_1) \
|
---|
| 181 | ../lib/libcoreutils.a
|
---|
| 182 | -uptime_SOURCES = uptime.c
|
---|
| 183 | -uptime_OBJECTS = uptime.$(OBJEXT)
|
---|
[862e2c0] | 184 | -uptime_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
|
---|
| 185 | - $(am__DEPENDENCIES_1)
|
---|
[69cde8d] | 186 | users_SOURCES = users.c
|
---|
| 187 | users_OBJECTS = users.$(OBJEXT)
|
---|
| 188 | users_LDADD = $(LDADD)
|
---|
[7c0b4b3] | 189 | @@ -664,7 +655,7 @@
|
---|
[69cde8d] | 190 | csplit.c cut.c date.c dd.c df.c $(dir_SOURCES) dircolors.c \
|
---|
| 191 | dirname.c du.c echo.c env.c expand.c expr.c factor.c false.c \
|
---|
| 192 | fmt.c fold.c $(ginstall_SOURCES) head.c hostid.c hostname.c \
|
---|
| 193 | - id.c join.c kill.c link.c ln.c logname.c $(ls_SOURCES) \
|
---|
| 194 | + id.c join.c link.c ln.c logname.c $(ls_SOURCES) \
|
---|
| 195 | $(md5sum_SOURCES) mkdir.c mkfifo.c mknod.c $(mv_SOURCES) \
|
---|
| 196 | nice.c nl.c nohup.c od.c paste.c pathchk.c pinky.c pr.c \
|
---|
| 197 | printenv.c printf.c ptx.c pwd.c readlink.c $(rm_SOURCES) \
|
---|
[7c0b4b3] | 198 | @@ -673,14 +664,14 @@
|
---|
[862e2c0] | 199 | $(sha512sum_SOURCES) shred.c shuf.c sleep.c sort.c split.c \
|
---|
| 200 | stat.c stty.c su.c sum.c sync.c tac.c tail.c tee.c test.c \
|
---|
| 201 | touch.c tr.c true.c tsort.c tty.c uname.c unexpand.c uniq.c \
|
---|
| 202 | - unlink.c uptime.c users.c $(vdir_SOURCES) wc.c who.c whoami.c \
|
---|
| 203 | + unlink.c users.c $(vdir_SOURCES) wc.c who.c whoami.c \
|
---|
| 204 | yes.c
|
---|
| 205 | DIST_SOURCES = $(__SOURCES) base64.c basename.c cat.c $(chgrp_SOURCES) \
|
---|
| 206 | chmod.c $(chown_SOURCES) chroot.c cksum.c comm.c $(cp_SOURCES) \
|
---|
[69cde8d] | 207 | csplit.c cut.c date.c dd.c df.c $(dir_SOURCES) dircolors.c \
|
---|
| 208 | dirname.c du.c echo.c env.c expand.c expr.c factor.c false.c \
|
---|
| 209 | fmt.c fold.c $(ginstall_SOURCES) head.c hostid.c hostname.c \
|
---|
| 210 | - id.c join.c kill.c link.c ln.c logname.c $(ls_SOURCES) \
|
---|
| 211 | + id.c join.c link.c ln.c logname.c $(ls_SOURCES) \
|
---|
| 212 | $(md5sum_SOURCES) mkdir.c mkfifo.c mknod.c $(mv_SOURCES) \
|
---|
| 213 | nice.c nl.c nohup.c od.c paste.c pathchk.c pinky.c pr.c \
|
---|
| 214 | printenv.c printf.c ptx.c pwd.c readlink.c $(rm_SOURCES) \
|
---|
[7c0b4b3] | 215 | @@ -689,7 +680,7 @@
|
---|
[862e2c0] | 216 | $(sha512sum_SOURCES) shred.c shuf.c sleep.c sort.c split.c \
|
---|
| 217 | stat.c stty.c su.c sum.c sync.c tac.c tail.c tee.c test.c \
|
---|
| 218 | touch.c tr.c true.c tsort.c tty.c uname.c unexpand.c uniq.c \
|
---|
| 219 | - unlink.c uptime.c users.c $(vdir_SOURCES) wc.c who.c whoami.c \
|
---|
| 220 | + unlink.c users.c $(vdir_SOURCES) wc.c who.c whoami.c \
|
---|
| 221 | yes.c
|
---|
[69cde8d] | 222 | HEADERS = $(noinst_HEADERS)
|
---|
| 223 | ETAGS = etags
|
---|
[7c0b4b3] | 224 | @@ -947,7 +938,6 @@
|
---|
[69cde8d] | 225 | tail_LDADD = $(nanosec_libs)
|
---|
[862e2c0] | 226 |
|
---|
| 227 | # If necessary, add -lm to resolve use of pow in lib/strtod.c.
|
---|
| 228 | -uptime_LDADD = $(LDADD) $(POW_LIB) $(GETLOADAVG_LIBS)
|
---|
[69cde8d] | 229 | su_LDADD = $(LDADD) $(LIB_CRYPT)
|
---|
| 230 | SUFFIXES = .sh
|
---|
| 231 | installed_su = $(DESTDIR)$(bindir)/`echo su|sed '$(transform)'`
|
---|
[7c0b4b3] | 232 | @@ -1194,9 +1184,6 @@
|
---|
[69cde8d] | 233 | join$(EXEEXT): $(join_OBJECTS) $(join_DEPENDENCIES)
|
---|
| 234 | @rm -f join$(EXEEXT)
|
---|
[7c0b4b3] | 235 | $(LINK) $(join_OBJECTS) $(join_LDADD) $(LIBS)
|
---|
[69cde8d] | 236 | -kill$(EXEEXT): $(kill_OBJECTS) $(kill_DEPENDENCIES)
|
---|
| 237 | - @rm -f kill$(EXEEXT)
|
---|
[7c0b4b3] | 238 | - $(LINK) $(kill_OBJECTS) $(kill_LDADD) $(LIBS)
|
---|
[69cde8d] | 239 | link$(EXEEXT): $(link_OBJECTS) $(link_DEPENDENCIES)
|
---|
| 240 | @rm -f link$(EXEEXT)
|
---|
[7c0b4b3] | 241 | $(LINK) $(link_OBJECTS) $(link_LDADD) $(LIBS)
|
---|
| 242 | @@ -1359,9 +1346,6 @@
|
---|
[69cde8d] | 243 | unlink$(EXEEXT): $(unlink_OBJECTS) $(unlink_DEPENDENCIES)
|
---|
| 244 | @rm -f unlink$(EXEEXT)
|
---|
[7c0b4b3] | 245 | $(LINK) $(unlink_OBJECTS) $(unlink_LDADD) $(LIBS)
|
---|
[69cde8d] | 246 | -uptime$(EXEEXT): $(uptime_OBJECTS) $(uptime_DEPENDENCIES)
|
---|
| 247 | - @rm -f uptime$(EXEEXT)
|
---|
[7c0b4b3] | 248 | - $(LINK) $(uptime_OBJECTS) $(uptime_LDADD) $(LIBS)
|
---|
[69cde8d] | 249 | users$(EXEEXT): $(users_OBJECTS) $(users_DEPENDENCIES)
|
---|
| 250 | @rm -f users$(EXEEXT)
|
---|
[7c0b4b3] | 251 | $(LINK) $(users_OBJECTS) $(users_LDADD) $(LIBS)
|
---|
| 252 | @@ -1456,7 +1440,6 @@
|
---|
[69cde8d] | 253 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/id.Po@am__quote@
|
---|
| 254 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/install.Po@am__quote@
|
---|
| 255 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/join.Po@am__quote@
|
---|
| 256 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kill.Po@am__quote@
|
---|
| 257 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lbracket.Po@am__quote@
|
---|
| 258 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/link.Po@am__quote@
|
---|
| 259 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ln.Po@am__quote@
|
---|
[7c0b4b3] | 260 | @@ -1516,7 +1499,6 @@
|
---|
[69cde8d] | 261 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unexpand.Po@am__quote@
|
---|
| 262 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uniq.Po@am__quote@
|
---|
| 263 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unlink.Po@am__quote@
|
---|
| 264 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uptime.Po@am__quote@
|
---|
| 265 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/users.Po@am__quote@
|
---|
| 266 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wc.Po@am__quote@
|
---|
| 267 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/who.Po@am__quote@
|
---|
[7c0b4b3] | 268 | @@ -1837,7 +1819,7 @@
|
---|
[69cde8d] | 269 | && can_create_suid_root_executable=yes; \
|
---|
| 270 | rm -f $$TMPFILE; \
|
---|
| 271 | if test $$can_create_suid_root_executable = yes; then \
|
---|
| 272 | - $(INSTALL_SU); \
|
---|
| 273 | + echo "Installation of su is suppressed"; \
|
---|
| 274 | else \
|
---|
| 275 | echo "WARNING: insufficient access; not installing su"; \
|
---|
| 276 | echo "NOTE: to install su, run 'make install-root' as root"; \
|
---|
[7c0b4b3] | 277 | diff -Naur coreutils-6.4.orig/src/Makefile.in.rej coreutils-6.4/src/Makefile.in.rej
|
---|
| 278 | --- coreutils-6.4.orig/src/Makefile.in.rej 1969-12-31 16:00:00.000000000 -0800
|
---|
| 279 | +++ coreutils-6.4/src/Makefile.in.rej 2006-10-22 20:47:10.000000000 -0700
|
---|
| 280 | @@ -0,0 +1,36 @@
|
---|
| 281 | +***************
|
---|
| 282 | +*** 1196,1204 ****
|
---|
| 283 | + join$(EXEEXT): $(join_OBJECTS) $(join_DEPENDENCIES)
|
---|
| 284 | + @rm -f join$(EXEEXT)
|
---|
| 285 | + $(LINK) $(join_LDFLAGS) $(join_OBJECTS) $(join_LDADD) $(LIBS)
|
---|
| 286 | +- kill$(EXEEXT): $(kill_OBJECTS) $(kill_DEPENDENCIES)
|
---|
| 287 | +- @rm -f kill$(EXEEXT)
|
---|
| 288 | +- $(LINK) $(kill_LDFLAGS) $(kill_OBJECTS) $(kill_LDADD) $(LIBS)
|
---|
| 289 | + link$(EXEEXT): $(link_OBJECTS) $(link_DEPENDENCIES)
|
---|
| 290 | + @rm -f link$(EXEEXT)
|
---|
| 291 | + $(LINK) $(link_LDFLAGS) $(link_OBJECTS) $(link_LDADD) $(LIBS)
|
---|
| 292 | +--- 1186,1191 ----
|
---|
| 293 | + join$(EXEEXT): $(join_OBJECTS) $(join_DEPENDENCIES)
|
---|
| 294 | + @rm -f join$(EXEEXT)
|
---|
| 295 | + $(LINK) $(join_LDFLAGS) $(join_OBJECTS) $(join_LDADD) $(LIBS)
|
---|
| 296 | + link$(EXEEXT): $(link_OBJECTS) $(link_DEPENDENCIES)
|
---|
| 297 | + @rm -f link$(EXEEXT)
|
---|
| 298 | + $(LINK) $(link_LDFLAGS) $(link_OBJECTS) $(link_LDADD) $(LIBS)
|
---|
| 299 | +***************
|
---|
| 300 | +*** 1361,1369 ****
|
---|
| 301 | + unlink$(EXEEXT): $(unlink_OBJECTS) $(unlink_DEPENDENCIES)
|
---|
| 302 | + @rm -f unlink$(EXEEXT)
|
---|
| 303 | + $(LINK) $(unlink_LDFLAGS) $(unlink_OBJECTS) $(unlink_LDADD) $(LIBS)
|
---|
| 304 | +- uptime$(EXEEXT): $(uptime_OBJECTS) $(uptime_DEPENDENCIES)
|
---|
| 305 | +- @rm -f uptime$(EXEEXT)
|
---|
| 306 | +- $(LINK) $(uptime_LDFLAGS) $(uptime_OBJECTS) $(uptime_LDADD) $(LIBS)
|
---|
| 307 | + users$(EXEEXT): $(users_OBJECTS) $(users_DEPENDENCIES)
|
---|
| 308 | + @rm -f users$(EXEEXT)
|
---|
| 309 | + $(LINK) $(users_LDFLAGS) $(users_OBJECTS) $(users_LDADD) $(LIBS)
|
---|
| 310 | +--- 1348,1353 ----
|
---|
| 311 | + unlink$(EXEEXT): $(unlink_OBJECTS) $(unlink_DEPENDENCIES)
|
---|
| 312 | + @rm -f unlink$(EXEEXT)
|
---|
| 313 | + $(LINK) $(unlink_LDFLAGS) $(unlink_OBJECTS) $(unlink_LDADD) $(LIBS)
|
---|
| 314 | + users$(EXEEXT): $(users_OBJECTS) $(users_DEPENDENCIES)
|
---|
| 315 | + @rm -f users$(EXEEXT)
|
---|
| 316 | + $(LINK) $(users_LDFLAGS) $(users_OBJECTS) $(users_LDADD) $(LIBS)
|
---|