source: clfs-sysroot/patches/coreutils-6.9-suppress_uptime_kill_su-1.patch@ b07cfb1

Last change on this file since b07cfb1 was 88f5ffd, checked in by Joe Ciccone <jciccone@…>, 18 years ago

Update Coreutils Patches.
  • Property mode set to 100644
File size: 13.0 KB
RevLine 
[8f3d581]1Submitted By: Matthew Burgess <matthew at linuxfromscratch dot org>
2Date: 2006-11-20
3Initial Package Version: 6.5
4Origin: original suppress_hotname_uptame_kill_su patch (Robert Connolly)
5Upstream Status: N/A
6Description: This patch supresses the building of uptime, and kill. The su
7 command is built so the testsuite can run, use './src/su', but
8 it will not be installed.
9
10 Updated for 6.3, 6.4, and 6.5 by Jim Gifford
11
12diff -Naur coreutils-6.5.orig/AUTHORS coreutils-6.5/AUTHORS
13--- coreutils-6.5.orig/AUTHORS 2006-10-22 09:54:15.000000000 -0700
14+++ coreutils-6.5/AUTHORS 2006-11-20 10:40:52.000000000 -0800
15@@ -35,7 +35,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@@ -89,7 +88,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
31diff -Naur coreutils-6.5.orig/Makefile.in coreutils-6.5/Makefile.in
32--- coreutils-6.5.orig/Makefile.in 2006-11-19 02:10:23.000000000 -0800
33+++ coreutils-6.5/Makefile.in 2006-11-20 10:41:25.000000000 -0800
34@@ -177,7 +177,7 @@
35 $(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
36 $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlink-busy.m4 \
37 $(top_srcdir)/m4/unlinkdir.m4 $(top_srcdir)/m4/unlocked-io.m4 \
38- $(top_srcdir)/m4/uptime.m4 $(top_srcdir)/m4/userspec.m4 \
39+ $(top_srcdir)/m4/userspec.m4 \
40 $(top_srcdir)/m4/utimbuf.m4 $(top_srcdir)/m4/utime.m4 \
41 $(top_srcdir)/m4/utimecmp.m4 $(top_srcdir)/m4/utimens.m4 \
42 $(top_srcdir)/m4/utimes-null.m4 $(top_srcdir)/m4/utimes.m4 \
43diff -Naur coreutils-6.5.orig/README coreutils-6.5/README
44--- coreutils-6.5.orig/README 2006-10-22 09:54:15.000000000 -0700
45+++ coreutils-6.5/README 2006-11-20 10:40:52.000000000 -0800
46@@ -9,11 +9,11 @@
47
48 [ base64 basename cat chgrp chmod chown chroot cksum comm cp csplit cut date
49 dd 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 sha224sum sha256sum
54 sha384sum sha512sum shred shuf sleep sort split stat stty su sum sync tac
55- tail tee test touch tr true tsort tty uname unexpand uniq unlink uptime
56+ tail tee test touch tr true tsort tty uname unexpand uniq unlink
57 users vdir wc who whoami yes
58
59 See the file NEWS for a list of major changes in the current release.
60diff -Naur coreutils-6.5.orig/configure coreutils-6.5/configure
61--- coreutils-6.5.orig/configure 2006-11-19 02:10:10.000000000 -0800
62+++ coreutils-6.5/configure 2006-11-20 10:40:52.000000000 -0800
63@@ -49467,8 +49467,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
73diff -Naur coreutils-6.5.orig/man/Makefile.in coreutils-6.5/man/Makefile.in
74--- coreutils-6.5.orig/man/Makefile.in 2006-11-19 02:10:19.000000000 -0800
75+++ coreutils-6.5/man/Makefile.in 2006-11-20 10:43:26.000000000 -0800
76@@ -172,7 +172,7 @@
77 $(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
78 $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlink-busy.m4 \
79 $(top_srcdir)/m4/unlinkdir.m4 $(top_srcdir)/m4/unlocked-io.m4 \
80- $(top_srcdir)/m4/uptime.m4 $(top_srcdir)/m4/userspec.m4 \
81+ $(top_srcdir)/m4/userspec.m4 \
82 $(top_srcdir)/m4/utimbuf.m4 $(top_srcdir)/m4/utime.m4 \
83 $(top_srcdir)/m4/utimecmp.m4 $(top_srcdir)/m4/utimens.m4 \
84 $(top_srcdir)/m4/utimes-null.m4 $(top_srcdir)/m4/utimes.m4 \
85@@ -382,13 +382,13 @@
86 base64.1 basename.1 cat.1 chgrp.1 chmod.1 chown.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 hostname.1 id.1 install.1 join.1 kill.1 \
90+ head.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 nl.1 nohup.1 od.1 \
93 paste.1 pathchk.1 pr.1 printenv.1 printf.1 ptx.1 pwd.1 readlink.1 \
94 rm.1 rmdir.1 seq.1 sha1sum.1 sha224sum.1 sha256sum.1 sha384sum.1 sha512sum.1 \
95 shred.1 shuf.1 sleep.1 sort.1 split.1 stat.1 \
96- su.1 sum.1 sync.1 tac.1 tail.1 tee.1 test.1 touch.1 tr.1 true.1 tsort.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 unexpand.1 uniq.1 unlink.1 vdir.1 wc.1 \
99 whoami.1 yes.1 $(MAN)
100
101@@ -668,7 +668,6 @@
102 id.1: $(common_dep) $(srcdir)/id.x ../src/id.c
103 install.1: $(common_dep) $(srcdir)/install.x ../src/install.c
104 join.1: $(common_dep) $(srcdir)/join.x ../src/join.c
105-kill.1: $(common_dep) $(srcdir)/kill.x ../src/kill.c
106 link.1: $(common_dep) $(srcdir)/link.x ../src/link.c
107 ln.1: $(common_dep) $(srcdir)/ln.x ../src/ln.c
108 logname.1: $(common_dep) $(srcdir)/logname.x ../src/logname.c
109@@ -706,7 +705,6 @@
110 split.1: $(common_dep) $(srcdir)/split.x ../src/split.c
111 stat.1: $(common_dep) $(srcdir)/stat.x ../src/stat.c
112 stty.1: $(common_dep) $(srcdir)/stty.x ../src/stty.c
113-su.1: $(common_dep) $(srcdir)/su.x ../src/su.c
114 sum.1: $(common_dep) $(srcdir)/sum.x ../src/sum.c
115 sync.1: $(common_dep) $(srcdir)/sync.x ../src/sync.c
116 tac.1: $(common_dep) $(srcdir)/tac.x ../src/tac.c
117@@ -722,7 +720,6 @@
118 unexpand.1: $(common_dep) $(srcdir)/unexpand.x ../src/unexpand.c
119 uniq.1: $(common_dep) $(srcdir)/uniq.x ../src/uniq.c
120 unlink.1: $(common_dep) $(srcdir)/unlink.x ../src/unlink.c
121-uptime.1: $(common_dep) $(srcdir)/uptime.x ../src/uptime.c
122 users.1: $(common_dep) $(srcdir)/users.x ../src/users.c
123 vdir.1: $(common_dep) $(srcdir)/vdir.x ../src/ls.c
124 wc.1: $(common_dep) $(srcdir)/wc.x ../src/wc.c
125@@ -754,7 +751,7 @@
126 check-x-vs-1:
127 PATH=../src$(PATH_SEPARATOR)$$PATH; export PATH; \
128 t=ls-files.$$$$; \
129- (cd $(srcdir) && ls -1 *.x) | sed 's/\.x$$//' | $(ASSORT) > $$t;\
130+ (cd $(srcdir) && ls -1 *.x) | grep -v -e 'kill.x' -e 'su.x' -e 'uptime.x' | sed 's/\.x$$//' | $(ASSORT) > $$t;\
131 echo $(dist_man_MANS) | tr -s ' ' '\n' | sed 's/\.1$$//' \
132 | $(ASSORT) | diff - $$t || { rm $$t; exit 1; }; \
133 rm $$t
134diff -Naur coreutils-6.5.orig/src/Makefile.in coreutils-6.5/src/Makefile.in
135--- coreutils-6.5.orig/src/Makefile.in 2006-11-19 04:59:23.000000000 -0800
136+++ coreutils-6.5/src/Makefile.in 2006-11-20 10:44:00.000000000 -0800
137@@ -35,7 +35,7 @@
138 host_triplet = @host@
139 EXTRA_PROGRAMS = chroot$(EXEEXT) df$(EXEEXT) hostid$(EXEEXT) \
140 nice$(EXEEXT) pinky$(EXEEXT) stty$(EXEEXT) su$(EXEEXT) \
141- uname$(EXEEXT) uptime$(EXEEXT) users$(EXEEXT) who$(EXEEXT)
142+ uname$(EXEEXT) users$(EXEEXT) who$(EXEEXT)
143 bin_PROGRAMS = [$(EXEEXT) chgrp$(EXEEXT) chown$(EXEEXT) chmod$(EXEEXT) \
144 cp$(EXEEXT) dd$(EXEEXT) dircolors$(EXEEXT) du$(EXEEXT) \
145 ginstall$(EXEEXT) link$(EXEEXT) ln$(EXEEXT) dir$(EXEEXT) \
146@@ -53,7 +53,7 @@
147 tsort$(EXEEXT) unexpand$(EXEEXT) uniq$(EXEEXT) wc$(EXEEXT) \
148 basename$(EXEEXT) date$(EXEEXT) dirname$(EXEEXT) echo$(EXEEXT) \
149 env$(EXEEXT) expr$(EXEEXT) factor$(EXEEXT) false$(EXEEXT) \
150- hostname$(EXEEXT) id$(EXEEXT) kill$(EXEEXT) logname$(EXEEXT) \
151+ hostname$(EXEEXT) id$(EXEEXT) logname$(EXEEXT) \
152 pathchk$(EXEEXT) printenv$(EXEEXT) printf$(EXEEXT) \
153 pwd$(EXEEXT) seq$(EXEEXT) sleep$(EXEEXT) tee$(EXEEXT) \
154 test$(EXEEXT) true$(EXEEXT) tty$(EXEEXT) whoami$(EXEEXT) \
155@@ -180,7 +180,7 @@
156 $(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
157 $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlink-busy.m4 \
158 $(top_srcdir)/m4/unlinkdir.m4 $(top_srcdir)/m4/unlocked-io.m4 \
159- $(top_srcdir)/m4/uptime.m4 $(top_srcdir)/m4/userspec.m4 \
160+ $(top_srcdir)/m4/userspec.m4 \
161 $(top_srcdir)/m4/utimbuf.m4 $(top_srcdir)/m4/utime.m4 \
162 $(top_srcdir)/m4/utimecmp.m4 $(top_srcdir)/m4/utimens.m4 \
163 $(top_srcdir)/m4/utimes-null.m4 $(top_srcdir)/m4/utimes.m4 \
164@@ -366,11 +366,6 @@
165 join_LDADD = $(LDADD)
166 join_DEPENDENCIES = ../lib/libcoreutils.a $(am__DEPENDENCIES_1) \
167 ../lib/libcoreutils.a
168-kill_SOURCES = kill.c
169-kill_OBJECTS = kill.$(OBJEXT)
170-kill_LDADD = $(LDADD)
171-kill_DEPENDENCIES = ../lib/libcoreutils.a $(am__DEPENDENCIES_1) \
172- ../lib/libcoreutils.a
173 link_SOURCES = link.c
174 link_OBJECTS = link.$(OBJEXT)
175 link_LDADD = $(LDADD)
176@@ -619,10 +614,6 @@
177 unlink_LDADD = $(LDADD)
178 unlink_DEPENDENCIES = ../lib/libcoreutils.a $(am__DEPENDENCIES_1) \
179 ../lib/libcoreutils.a
180-uptime_SOURCES = uptime.c
181-uptime_OBJECTS = uptime.$(OBJEXT)
182-uptime_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
183- $(am__DEPENDENCIES_1)
184 users_SOURCES = users.c
185 users_OBJECTS = users.$(OBJEXT)
186 users_LDADD = $(LDADD)
187@@ -666,7 +657,7 @@
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@@ -675,14 +666,14 @@
197 $(sha512sum_SOURCES) shred.c shuf.c sleep.c sort.c split.c \
198 stat.c stty.c su.c sum.c sync.c tac.c tail.c tee.c test.c \
199 touch.c tr.c true.c tsort.c tty.c uname.c unexpand.c uniq.c \
200- unlink.c uptime.c users.c $(vdir_SOURCES) wc.c who.c whoami.c \
201+ unlink.c users.c $(vdir_SOURCES) wc.c who.c whoami.c \
202 yes.c
203 DIST_SOURCES = $(__SOURCES) base64.c basename.c cat.c $(chgrp_SOURCES) \
204 chmod.c $(chown_SOURCES) chroot.c cksum.c comm.c $(cp_SOURCES) \
205 csplit.c cut.c date.c dd.c df.c $(dir_SOURCES) dircolors.c \
206 dirname.c du.c echo.c env.c expand.c expr.c factor.c false.c \
207 fmt.c fold.c $(ginstall_SOURCES) head.c hostid.c hostname.c \
208- id.c join.c kill.c link.c ln.c logname.c $(ls_SOURCES) \
209+ id.c join.c link.c ln.c logname.c $(ls_SOURCES) \
210 $(md5sum_SOURCES) mkdir.c mkfifo.c mknod.c $(mv_SOURCES) \
211 nice.c nl.c nohup.c od.c paste.c pathchk.c pinky.c pr.c \
212 printenv.c printf.c ptx.c pwd.c readlink.c $(rm_SOURCES) \
213@@ -691,7 +682,7 @@
214 $(sha512sum_SOURCES) shred.c shuf.c sleep.c sort.c split.c \
215 stat.c stty.c su.c sum.c sync.c tac.c tail.c tee.c test.c \
216 touch.c tr.c true.c tsort.c tty.c uname.c unexpand.c uniq.c \
217- unlink.c uptime.c users.c $(vdir_SOURCES) wc.c who.c whoami.c \
218+ unlink.c users.c $(vdir_SOURCES) wc.c who.c whoami.c \
219 yes.c
220 HEADERS = $(noinst_HEADERS)
221 ETAGS = etags
222@@ -949,7 +940,6 @@
223 tail_LDADD = $(nanosec_libs)
224
225 # If necessary, add -lm to resolve use of pow in lib/strtod.c.
226-uptime_LDADD = $(LDADD) $(POW_LIB) $(GETLOADAVG_LIBS)
227 su_LDADD = $(LDADD) $(LIB_CRYPT)
228 SUFFIXES = .sh
229 installed_su = $(DESTDIR)$(bindir)/`echo su|sed '$(transform)'`
230@@ -1196,9 +1186,6 @@
231 join$(EXEEXT): $(join_OBJECTS) $(join_DEPENDENCIES)
232 @rm -f join$(EXEEXT)
233 $(LINK) $(join_OBJECTS) $(join_LDADD) $(LIBS)
234-kill$(EXEEXT): $(kill_OBJECTS) $(kill_DEPENDENCIES)
235- @rm -f kill$(EXEEXT)
236- $(LINK) $(kill_OBJECTS) $(kill_LDADD) $(LIBS)
237 link$(EXEEXT): $(link_OBJECTS) $(link_DEPENDENCIES)
238 @rm -f link$(EXEEXT)
239 $(LINK) $(link_OBJECTS) $(link_LDADD) $(LIBS)
240@@ -1361,9 +1348,6 @@
241 unlink$(EXEEXT): $(unlink_OBJECTS) $(unlink_DEPENDENCIES)
242 @rm -f unlink$(EXEEXT)
243 $(LINK) $(unlink_OBJECTS) $(unlink_LDADD) $(LIBS)
244-uptime$(EXEEXT): $(uptime_OBJECTS) $(uptime_DEPENDENCIES)
245- @rm -f uptime$(EXEEXT)
246- $(LINK) $(uptime_OBJECTS) $(uptime_LDADD) $(LIBS)
247 users$(EXEEXT): $(users_OBJECTS) $(users_DEPENDENCIES)
248 @rm -f users$(EXEEXT)
249 $(LINK) $(users_OBJECTS) $(users_LDADD) $(LIBS)
250@@ -1458,7 +1442,6 @@
251 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/id.Po@am__quote@
252 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/install.Po@am__quote@
253 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/join.Po@am__quote@
254-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kill.Po@am__quote@
255 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lbracket.Po@am__quote@
256 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/link.Po@am__quote@
257 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ln.Po@am__quote@
258@@ -1518,7 +1501,6 @@
259 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unexpand.Po@am__quote@
260 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uniq.Po@am__quote@
261 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unlink.Po@am__quote@
262-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uptime.Po@am__quote@
263 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/users.Po@am__quote@
264 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wc.Po@am__quote@
265 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/who.Po@am__quote@
266@@ -1839,7 +1821,7 @@
267 && can_create_suid_root_executable=yes; \
268 rm -f $$TMPFILE; \
269 if test $$can_create_suid_root_executable = yes; then \
270- $(INSTALL_SU); \
271+ echo "Installation of su is suppressed"; \
272 else \
273 echo "WARNING: insufficient access; not installing su"; \
274 echo "NOTE: to install su, run 'make install-root' as root"; \
Note: See TracBrowser for help on using the repository browser.