]>
Commit | Line | Data |
---|---|---|
1 | Submitted By: Matthew Burgess <matthew at linuxfromscratch dot org> | |
2 | Date: 2006-03-15 | |
3 | Initial Package Version: 5.94 | |
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 | |
7 | command is built so the testsuite can run, use './src/su', but it will not | |
8 | be installed. Also see: | |
9 | http://www.linuxfromscratch.org/patches/downloads/coreutils/ | |
10 | coreutils-5.0-dupes-2.patch | |
11 | ||
12 | diff -Naur coreutils-5.94.orig/AUTHORS coreutils-5.94/AUTHORS | |
13 | --- coreutils-5.94.orig/AUTHORS 2004-11-03 23:10:50.000000000 +0000 | |
14 | +++ coreutils-5.94/AUTHORS 2006-03-15 22:20:49.000000000 +0000 | |
15 | @@ -34,7 +34,6 @@ | |
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 | |
23 | @@ -83,7 +82,6 @@ | |
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 | |
31 | diff -Naur coreutils-5.94.orig/Makefile.in coreutils-5.94/Makefile.in | |
32 | --- coreutils-5.94.orig/Makefile.in 2006-02-13 12:52:03.000000000 +0000 | |
33 | +++ coreutils-5.94/Makefile.in 2006-03-15 22:20:49.000000000 +0000 | |
34 | @@ -148,7 +148,7 @@ | |
35 | $(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \ | |
36 | $(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \ | |
37 | $(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \ | |
38 | - $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \ | |
39 | + $(top_srcdir)/m4/unlocked-io.m4 \ | |
40 | $(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \ | |
41 | $(top_srcdir)/m4/utime.m4 $(top_srcdir)/m4/utimecmp.m4 \ | |
42 | $(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimes-null.m4 \ | |
43 | diff -Naur coreutils-5.94.orig/README coreutils-5.94/README | |
44 | --- coreutils-5.94.orig/README 2005-09-28 18:34:26.000000000 +0000 | |
45 | +++ coreutils-5.94/README 2006-03-15 22:20:49.000000000 +0000 | |
46 | @@ -9,11 +9,11 @@ | |
47 | ||
48 | [ basename cat chgrp chmod chown chroot cksum comm cp csplit cut date dd | |
49 | df dir dircolors dirname du echo env expand expr factor false fmt fold | |
50 | - ginstall groups head hostid hostname id join kill link ln logname ls | |
51 | + ginstall groups head hostid hostname id join link ln logname ls | |
52 | md5sum mkdir mkfifo mknod mv nice nl nohup od paste pathchk pinky pr | |
53 | printenv printf ptx pwd readlink rm rmdir seq sha1sum shred sleep sort | |
54 | split stat stty su sum sync tac tail tee test touch tr true tsort tty | |
55 | - uname unexpand uniq unlink uptime users vdir wc who whoami yes | |
56 | + uname unexpand uniq unlink users vdir wc who whoami yes | |
57 | ||
58 | See the file NEWS for a list of major changes in the current release. | |
59 | ||
60 | diff -Naur coreutils-5.94.orig/configure coreutils-5.94/configure | |
61 | --- coreutils-5.94.orig/configure 2006-02-13 12:52:04.000000000 +0000 | |
62 | +++ coreutils-5.94/configure 2006-03-15 22:20:49.000000000 +0000 | |
63 | @@ -50418,8 +50418,7 @@ | |
64 | { echo "$as_me:$LINENO: result: $gnulib_cv_have_boot_time" >&5 | |
65 | echo "${ECHO_T}$gnulib_cv_have_boot_time" >&6; } | |
66 | if test $gnulib_cv_have_boot_time = yes; then | |
67 | - OPTIONAL_BIN_PROGS="$OPTIONAL_BIN_PROGS uptime\$(EXEEXT)" | |
68 | - MAN="$MAN uptime.1" | |
69 | +echo "uptime is suppressed" | |
70 | fi | |
71 | ||
72 | ||
73 | diff -Naur coreutils-5.94.orig/man/Makefile.in coreutils-5.94/man/Makefile.in | |
74 | --- coreutils-5.94.orig/man/Makefile.in 2006-02-13 12:51:58.000000000 +0000 | |
75 | +++ coreutils-5.94/man/Makefile.in 2006-03-15 22:20:50.000000000 +0000 | |
76 | @@ -142,7 +142,7 @@ | |
77 | $(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \ | |
78 | $(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \ | |
79 | $(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \ | |
80 | - $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \ | |
81 | + $(top_srcdir)/m4/unlocked-io.m4 \ | |
82 | $(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \ | |
83 | $(top_srcdir)/m4/utime.m4 $(top_srcdir)/m4/utimecmp.m4 \ | |
84 | $(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimes-null.m4 \ | |
85 | @@ -303,13 +303,13 @@ | |
86 | basename.1 cat.1 chgrp.1 chmod.1 chown.1 chroot.1 cksum.1 comm.1 \ | |
87 | cp.1 csplit.1 cut.1 date.1 dd.1 df.1 dir.1 dircolors.1 dirname.1 du.1 \ | |
88 | echo.1 env.1 expand.1 expr.1 factor.1 false.1 fmt.1 fold.1 groups.1 \ | |
89 | - head.1 hostid.1 hostname.1 id.1 install.1 join.1 kill.1 \ | |
90 | + head.1 hostid.1 hostname.1 id.1 install.1 join.1 \ | |
91 | link.1 ln.1 logname.1 \ | |
92 | ls.1 md5sum.1 mkdir.1 mkfifo.1 mknod.1 mv.1 nice.1 nl.1 nohup.1 od.1 \ | |
93 | paste.1 pathchk.1 pinky.1 pr.1 printenv.1 printf.1 ptx.1 pwd.1 readlink.1 \ | |
94 | rm.1 rmdir.1 seq.1 sha1sum.1 shred.1 sleep.1 sort.1 split.1 stat.1 stty.1 \ | |
95 | - su.1 sum.1 sync.1 tac.1 tail.1 tee.1 test.1 touch.1 tr.1 true.1 tsort.1 \ | |
96 | - tty.1 uname.1 unexpand.1 uniq.1 unlink.1 uptime.1 users.1 vdir.1 wc.1 \ | |
97 | + sum.1 sync.1 tac.1 tail.1 tee.1 test.1 touch.1 tr.1 true.1 tsort.1 \ | |
98 | + tty.1 uname.1 unexpand.1 uniq.1 unlink.1 users.1 vdir.1 wc.1 \ | |
99 | who.1 whoami.1 yes.1 | |
100 | ||
101 | man_aux = $(dist_man_MANS:.1=.x) | |
102 | @@ -575,7 +575,6 @@ | |
103 | id.1: $(common_dep) $(srcdir)/id.x ../src/id.c | |
104 | install.1: $(common_dep) $(srcdir)/install.x ../src/install.c | |
105 | join.1: $(common_dep) $(srcdir)/join.x ../src/join.c | |
106 | -kill.1: $(common_dep) $(srcdir)/kill.x ../src/kill.c | |
107 | link.1: $(common_dep) $(srcdir)/link.x ../src/link.c | |
108 | ln.1: $(common_dep) $(srcdir)/ln.x ../src/ln.c | |
109 | logname.1: $(common_dep) $(srcdir)/logname.x ../src/logname.c | |
110 | @@ -608,7 +607,6 @@ | |
111 | split.1: $(common_dep) $(srcdir)/split.x ../src/split.c | |
112 | stat.1: $(common_dep) $(srcdir)/stat.x ../src/stat.c | |
113 | stty.1: $(common_dep) $(srcdir)/stty.x ../src/stty.c | |
114 | -su.1: $(common_dep) $(srcdir)/su.x ../src/su.c | |
115 | sum.1: $(common_dep) $(srcdir)/sum.x ../src/sum.c | |
116 | sync.1: $(common_dep) $(srcdir)/sync.x ../src/sync.c | |
117 | tac.1: $(common_dep) $(srcdir)/tac.x ../src/tac.c | |
118 | @@ -624,7 +622,6 @@ | |
119 | unexpand.1: $(common_dep) $(srcdir)/unexpand.x ../src/unexpand.c | |
120 | uniq.1: $(common_dep) $(srcdir)/uniq.x ../src/uniq.c | |
121 | unlink.1: $(common_dep) $(srcdir)/unlink.x ../src/unlink.c | |
122 | -uptime.1: $(common_dep) $(srcdir)/uptime.x ../src/uptime.c | |
123 | users.1: $(common_dep) $(srcdir)/users.x ../src/users.c | |
124 | vdir.1: $(common_dep) $(srcdir)/vdir.x ../src/ls.c | |
125 | wc.1: $(common_dep) $(srcdir)/wc.x ../src/wc.c | |
126 | @@ -656,7 +653,7 @@ | |
127 | check-x-vs-1: | |
128 | PATH=../src$(PATH_SEPARATOR)$$PATH; export PATH; \ | |
129 | t=ls-files.$$$$; \ | |
130 | - (cd $(srcdir) && ls -1 *.x) | sed 's/\.x$$//' | $(ASSORT) > $$t;\ | |
131 | + (cd $(srcdir) && ls -1 *.x) | grep -v -e 'kill.x' -e 'su.x' -e 'uptime.x' | sed 's/\.x$$//' | $(ASSORT) > $$t;\ | |
132 | echo $(dist_man_MANS) | tr -s ' ' '\n' | sed 's/\.1$$//' \ | |
133 | | $(ASSORT) | diff - $$t || { rm $$t; exit 1; }; \ | |
134 | rm $$t | |
135 | diff -Naur coreutils-5.94.orig/src/Makefile.in coreutils-5.94/src/Makefile.in | |
136 | --- coreutils-5.94.orig/src/Makefile.in 2006-02-13 13:08:11.000000000 +0000 | |
137 | +++ coreutils-5.94/src/Makefile.in 2006-03-15 22:20:50.000000000 +0000 | |
138 | @@ -39,7 +39,7 @@ | |
139 | host_triplet = @host@ | |
140 | EXTRA_PROGRAMS = chroot$(EXEEXT) df$(EXEEXT) hostid$(EXEEXT) \ | |
141 | nice$(EXEEXT) pinky$(EXEEXT) stty$(EXEEXT) su$(EXEEXT) \ | |
142 | - uname$(EXEEXT) uptime$(EXEEXT) users$(EXEEXT) who$(EXEEXT) | |
143 | + uname$(EXEEXT) users$(EXEEXT) who$(EXEEXT) | |
144 | bin_PROGRAMS = [$(EXEEXT) chgrp$(EXEEXT) chown$(EXEEXT) chmod$(EXEEXT) \ | |
145 | cp$(EXEEXT) dd$(EXEEXT) dircolors$(EXEEXT) du$(EXEEXT) \ | |
146 | ginstall$(EXEEXT) link$(EXEEXT) ln$(EXEEXT) dir$(EXEEXT) \ | |
147 | @@ -56,7 +56,7 @@ | |
148 | uniq$(EXEEXT) wc$(EXEEXT) basename$(EXEEXT) date$(EXEEXT) \ | |
149 | dirname$(EXEEXT) echo$(EXEEXT) env$(EXEEXT) expr$(EXEEXT) \ | |
150 | factor$(EXEEXT) false$(EXEEXT) hostname$(EXEEXT) id$(EXEEXT) \ | |
151 | - kill$(EXEEXT) logname$(EXEEXT) pathchk$(EXEEXT) \ | |
152 | + logname$(EXEEXT) pathchk$(EXEEXT) \ | |
153 | printenv$(EXEEXT) printf$(EXEEXT) pwd$(EXEEXT) seq$(EXEEXT) \ | |
154 | sleep$(EXEEXT) tee$(EXEEXT) test$(EXEEXT) true$(EXEEXT) \ | |
155 | tty$(EXEEXT) whoami$(EXEEXT) yes$(EXEEXT) $(am__EXEEXT_1) \ | |
156 | @@ -169,7 +169,7 @@ | |
157 | $(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \ | |
158 | $(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \ | |
159 | $(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \ | |
160 | - $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \ | |
161 | + $(top_srcdir)/m4/unlocked-io.m4 \ | |
162 | $(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \ | |
163 | $(top_srcdir)/m4/utime.m4 $(top_srcdir)/m4/utimecmp.m4 \ | |
164 | $(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimes-null.m4 \ | |
165 | @@ -350,11 +350,6 @@ | |
166 | join_LDADD = $(LDADD) | |
167 | join_DEPENDENCIES = ../lib/libcoreutils.a $(am__DEPENDENCIES_1) \ | |
168 | ../lib/libcoreutils.a | |
169 | -kill_SOURCES = kill.c | |
170 | -kill_OBJECTS = kill.$(OBJEXT) | |
171 | -kill_LDADD = $(LDADD) | |
172 | -kill_DEPENDENCIES = ../lib/libcoreutils.a $(am__DEPENDENCIES_1) \ | |
173 | - ../lib/libcoreutils.a | |
174 | link_SOURCES = link.c | |
175 | link_OBJECTS = link.$(OBJEXT) | |
176 | link_LDADD = $(LDADD) | |
177 | @@ -577,9 +572,6 @@ | |
178 | unlink_LDADD = $(LDADD) | |
179 | unlink_DEPENDENCIES = ../lib/libcoreutils.a $(am__DEPENDENCIES_1) \ | |
180 | ../lib/libcoreutils.a | |
181 | -uptime_SOURCES = uptime.c | |
182 | -uptime_OBJECTS = uptime.$(OBJEXT) | |
183 | -uptime_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) | |
184 | users_SOURCES = users.c | |
185 | users_OBJECTS = users.$(OBJEXT) | |
186 | users_LDADD = $(LDADD) | |
187 | @@ -622,28 +614,28 @@ | |
188 | csplit.c cut.c date.c dd.c df.c $(dir_SOURCES) dircolors.c \ | |
189 | dirname.c du.c echo.c env.c expand.c expr.c factor.c false.c \ | |
190 | fmt.c fold.c $(ginstall_SOURCES) head.c hostid.c hostname.c \ | |
191 | - id.c join.c kill.c link.c ln.c logname.c $(ls_SOURCES) \ | |
192 | + id.c join.c link.c ln.c logname.c $(ls_SOURCES) \ | |
193 | $(md5sum_SOURCES) mkdir.c mkfifo.c mknod.c $(mv_SOURCES) \ | |
194 | nice.c nl.c nohup.c od.c paste.c pathchk.c pinky.c pr.c \ | |
195 | printenv.c printf.c ptx.c pwd.c readlink.c $(rm_SOURCES) \ | |
196 | rmdir.c seq.c setuidgid.c $(sha1sum_SOURCES) shred.c sleep.c \ | |
197 | sort.c split.c stat.c stty.c su.c sum.c sync.c tac.c tail.c \ | |
198 | tee.c test.c touch.c tr.c true.c tsort.c tty.c uname.c \ | |
199 | - unexpand.c uniq.c unlink.c uptime.c users.c $(vdir_SOURCES) \ | |
200 | + unexpand.c uniq.c unlink.c users.c $(vdir_SOURCES) \ | |
201 | wc.c who.c whoami.c yes.c | |
202 | DIST_SOURCES = $(__SOURCES) basename.c cat.c $(chgrp_SOURCES) chmod.c \ | |
203 | $(chown_SOURCES) chroot.c cksum.c comm.c $(cp_SOURCES) \ | |
204 | csplit.c cut.c date.c dd.c df.c $(dir_SOURCES) dircolors.c \ | |
205 | dirname.c du.c echo.c env.c expand.c expr.c factor.c false.c \ | |
206 | fmt.c fold.c $(ginstall_SOURCES) head.c hostid.c hostname.c \ | |
207 | - id.c join.c kill.c link.c ln.c logname.c $(ls_SOURCES) \ | |
208 | + id.c join.c link.c ln.c logname.c $(ls_SOURCES) \ | |
209 | $(md5sum_SOURCES) mkdir.c mkfifo.c mknod.c $(mv_SOURCES) \ | |
210 | nice.c nl.c nohup.c od.c paste.c pathchk.c pinky.c pr.c \ | |
211 | printenv.c printf.c ptx.c pwd.c readlink.c $(rm_SOURCES) \ | |
212 | rmdir.c seq.c setuidgid.c $(sha1sum_SOURCES) shred.c sleep.c \ | |
213 | sort.c split.c stat.c stty.c su.c sum.c sync.c tac.c tail.c \ | |
214 | tee.c test.c touch.c tr.c true.c tsort.c tty.c uname.c \ | |
215 | - unexpand.c uniq.c unlink.c uptime.c users.c $(vdir_SOURCES) \ | |
216 | + unexpand.c uniq.c unlink.c users.c $(vdir_SOURCES) \ | |
217 | wc.c who.c whoami.c yes.c | |
218 | HEADERS = $(noinst_HEADERS) | |
219 | ETAGS = etags | |
220 | @@ -840,7 +832,6 @@ | |
221 | nanosec_libs = $(LDADD) $(POW_LIB) $(LIB_NANOSLEEP) | |
222 | sleep_LDADD = $(nanosec_libs) | |
223 | tail_LDADD = $(nanosec_libs) | |
224 | -uptime_LDADD = $(LDADD) $(GETLOADAVG_LIBS) | |
225 | su_LDADD = $(LDADD) $(LIB_CRYPT) | |
226 | SUFFIXES = .sh | |
227 | installed_su = $(DESTDIR)$(bindir)/`echo su|sed '$(transform)'` | |
228 | @@ -1076,9 +1067,6 @@ | |
229 | join$(EXEEXT): $(join_OBJECTS) $(join_DEPENDENCIES) | |
230 | @rm -f join$(EXEEXT) | |
231 | $(LINK) $(join_LDFLAGS) $(join_OBJECTS) $(join_LDADD) $(LIBS) | |
232 | -kill$(EXEEXT): $(kill_OBJECTS) $(kill_DEPENDENCIES) | |
233 | - @rm -f kill$(EXEEXT) | |
234 | - $(LINK) $(kill_LDFLAGS) $(kill_OBJECTS) $(kill_LDADD) $(LIBS) | |
235 | link$(EXEEXT): $(link_OBJECTS) $(link_DEPENDENCIES) | |
236 | @rm -f link$(EXEEXT) | |
237 | $(LINK) $(link_LDFLAGS) $(link_OBJECTS) $(link_LDADD) $(LIBS) | |
238 | @@ -1226,9 +1214,6 @@ | |
239 | unlink$(EXEEXT): $(unlink_OBJECTS) $(unlink_DEPENDENCIES) | |
240 | @rm -f unlink$(EXEEXT) | |
241 | $(LINK) $(unlink_LDFLAGS) $(unlink_OBJECTS) $(unlink_LDADD) $(LIBS) | |
242 | -uptime$(EXEEXT): $(uptime_OBJECTS) $(uptime_DEPENDENCIES) | |
243 | - @rm -f uptime$(EXEEXT) | |
244 | - $(LINK) $(uptime_LDFLAGS) $(uptime_OBJECTS) $(uptime_LDADD) $(LIBS) | |
245 | users$(EXEEXT): $(users_OBJECTS) $(users_DEPENDENCIES) | |
246 | @rm -f users$(EXEEXT) | |
247 | $(LINK) $(users_LDFLAGS) $(users_OBJECTS) $(users_LDADD) $(LIBS) | |
248 | @@ -1322,7 +1307,6 @@ | |
249 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/id.Po@am__quote@ | |
250 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/install.Po@am__quote@ | |
251 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/join.Po@am__quote@ | |
252 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kill.Po@am__quote@ | |
253 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lbracket.Po@am__quote@ | |
254 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/link.Po@am__quote@ | |
255 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ln.Po@am__quote@ | |
256 | @@ -1378,7 +1362,6 @@ | |
257 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unexpand.Po@am__quote@ | |
258 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uniq.Po@am__quote@ | |
259 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unlink.Po@am__quote@ | |
260 | -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uptime.Po@am__quote@ | |
261 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/users.Po@am__quote@ | |
262 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wc.Po@am__quote@ | |
263 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/who.Po@am__quote@ | |
264 | @@ -1606,7 +1589,7 @@ | |
265 | && can_create_suid_root_executable=yes; \ | |
266 | rm -f $$TMPFILE; \ | |
267 | if test $$can_create_suid_root_executable = yes; then \ | |
268 | - $(INSTALL_SU); \ | |
269 | + echo "Installation of su is suppressed"; \ | |
270 | else \ | |
271 | echo "WARNING: insufficient access; not installing su"; \ | |
272 | echo "NOTE: to install su, run 'make install-root' as root"; \ |