|
|
# --- ROCK-COPYRIGHT-NOTE-BEGIN ---# # This copyright note is auto-generated by ./scripts/Create-CopyPatch.# Please add additional copyright information _after_ the line containing# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!# # ROCK Linux: rock-src/package/base/coreutils/no-broken-progs-in.patch# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf# # This patch file is dual-licensed. It is available under the license the# patched project is licensed under, as long as it is an OpenSource license# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms# of the GNU General Public License as published by the Free Software# Foundation; either version 2 of the License, or (at your option) any later# version.# # --- ROCK-COPYRIGHT-NOTE-END ---
--- ./Makefile.in.orig 2004-10-01 19:05:13.027154464 +0200
+++ ./Makefile.in 2004-10-01 19:04:44.930425816 +0200
@@ -148,7 +148,7 @@
$(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \ $(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \ $(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \- $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
+ $(top_srcdir)/m4/unlocked-io.m4 \
$(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \ $(top_srcdir)/m4/utime.m4 $(top_srcdir)/m4/utimecmp.m4 \ $(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimes-null.m4 \--- ./configure.orig 2004-10-01 19:04:58.239402544 +0200
+++ ./configure 2004-10-01 19:04:44.924426728 +0200
@@ -47462,8 +47462,7 @@
echo "$as_me:$LINENO: result: $gnulib_cv_have_boot_time" >&5 echo "${ECHO_T}$gnulib_cv_have_boot_time" >&6 if test $gnulib_cv_have_boot_time = yes; then- OPTIONAL_BIN_PROGS="$OPTIONAL_BIN_PROGS uptime\$(EXEEXT)"
- MAN="$MAN uptime.1"
+echo "uptime is surpressed"
fi --- ./man/Makefile.in.orig 2004-10-01 19:05:24.542403880 +0200
+++ ./man/Makefile.in 2004-10-01 19:05:56.565535624 +0200
@@ -142,7 +142,7 @@
$(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \ $(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \ $(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \- $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
+ $(top_srcdir)/m4/unlocked-io.m4 \
$(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \ $(top_srcdir)/m4/utime.m4 $(top_srcdir)/m4/utimecmp.m4 \ $(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimes-null.m4 \@@ -302,14 +302,14 @@
dist_man_MANS = \ basename.1 cat.1 chgrp.1 chmod.1 chown.1 chroot.1 cksum.1 comm.1 \ cp.1 csplit.1 cut.1 date.1 dd.1 df.1 dir.1 dircolors.1 dirname.1 du.1 \- echo.1 env.1 expand.1 expr.1 factor.1 false.1 fmt.1 fold.1 groups.1 \
- head.1 hostid.1 hostname.1 id.1 install.1 join.1 kill.1 \
+ echo.1 env.1 expand.1 expr.1 factor.1 false.1 fmt.1 fold.1 \
+ head.1 hostid.1 id.1 install.1 join.1 \
link.1 ln.1 logname.1 \ ls.1 md5sum.1 mkdir.1 mkfifo.1 mknod.1 mv.1 nice.1 nl.1 nohup.1 od.1 \ paste.1 pathchk.1 pinky.1 pr.1 printenv.1 printf.1 ptx.1 pwd.1 readlink.1 \ rm.1 rmdir.1 seq.1 sha1sum.1 shred.1 sleep.1 sort.1 split.1 stat.1 stty.1 \- su.1 sum.1 sync.1 tac.1 tail.1 tee.1 test.1 touch.1 tr.1 true.1 tsort.1 \
- tty.1 uname.1 unexpand.1 uniq.1 unlink.1 uptime.1 users.1 vdir.1 wc.1 \
+ sum.1 sync.1 tac.1 tail.1 tee.1 test.1 touch.1 tr.1 true.1 tsort.1 \
+ tty.1 uname.1 unexpand.1 uniq.1 unlink.1 users.1 vdir.1 wc.1 \
who.1 whoami.1 yes.1 man_aux = $(dist_man_MANS:.1=.x)@@ -568,14 +568,11 @@
false.1: $(common_dep) $(srcdir)/false.x ../src/false.c fmt.1: $(common_dep) $(srcdir)/fmt.x ../src/fmt.c fold.1: $(common_dep) $(srcdir)/fold.x ../src/fold.c-groups.1: $(common_dep) $(srcdir)/groups.x ../src/groups.sh
head.1: $(common_dep) $(srcdir)/head.x ../src/head.c hostid.1: $(common_dep) $(srcdir)/hostid.x ../src/hostid.c-hostname.1: $(common_dep) $(srcdir)/hostname.x ../src/hostname.c
id.1: $(common_dep) $(srcdir)/id.x ../src/id.c install.1: $(common_dep) $(srcdir)/install.x ../src/install.c join.1: $(common_dep) $(srcdir)/join.x ../src/join.c-kill.1: $(common_dep) $(srcdir)/kill.x ../src/kill.c
link.1: $(common_dep) $(srcdir)/link.x ../src/link.c ln.1: $(common_dep) $(srcdir)/ln.x ../src/ln.c logname.1: $(common_dep) $(srcdir)/logname.x ../src/logname.c@@ -608,7 +605,6 @@
split.1: $(common_dep) $(srcdir)/split.x ../src/split.c stat.1: $(common_dep) $(srcdir)/stat.x ../src/stat.c stty.1: $(common_dep) $(srcdir)/stty.x ../src/stty.c-su.1: $(common_dep) $(srcdir)/su.x ../src/su.c
sum.1: $(common_dep) $(srcdir)/sum.x ../src/sum.c sync.1: $(common_dep) $(srcdir)/sync.x ../src/sync.c tac.1: $(common_dep) $(srcdir)/tac.x ../src/tac.c@@ -624,7 +620,6 @@
unexpand.1: $(common_dep) $(srcdir)/unexpand.x ../src/unexpand.c uniq.1: $(common_dep) $(srcdir)/uniq.x ../src/uniq.c unlink.1: $(common_dep) $(srcdir)/unlink.x ../src/unlink.c-uptime.1: $(common_dep) $(srcdir)/uptime.x ../src/uptime.c
users.1: $(common_dep) $(srcdir)/users.x ../src/users.c vdir.1: $(common_dep) $(srcdir)/vdir.x ../src/ls.c wc.1: $(common_dep) $(srcdir)/wc.x ../src/wc.c@@ -656,7 +651,7 @@
check-x-vs-1: PATH=../src$(PATH_SEPARATOR)$$PATH; export PATH; \ t=ls-files.$$$$; \- (cd $(srcdir) && ls -1 *.x) | sed 's/\.x$$//' | $(ASSORT) > $$t;\
+ (cd $(srcdir) && ls -1 *.x) | grep -v 'uptime.x' | grep -v 'kill.x' | sed 's/\.x$$//' | $(ASSORT) > $$t; \
echo $(dist_man_MANS) | tr -s ' ' '\n' | sed 's/\.1$$//' \ | $(ASSORT) | diff - $$t || { rm $$t; exit 1; }; \ rm $$t--- ./src/Makefile.in.orig 2004-10-01 19:05:35.737701936 +0200
+++ ./src/Makefile.in 2004-10-01 19:04:44.941424144 +0200
@@ -39,7 +39,7 @@
host_triplet = @host@ EXTRA_PROGRAMS = chroot$(EXEEXT) df$(EXEEXT) hostid$(EXEEXT) \ nice$(EXEEXT) pinky$(EXEEXT) stty$(EXEEXT) su$(EXEEXT) \- uname$(EXEEXT) uptime$(EXEEXT) users$(EXEEXT) who$(EXEEXT)
+ uname$(EXEEXT) users$(EXEEXT) who$(EXEEXT)
bin_PROGRAMS = [$(EXEEXT) chgrp$(EXEEXT) chown$(EXEEXT) chmod$(EXEEXT) \ cp$(EXEEXT) dd$(EXEEXT) dircolors$(EXEEXT) du$(EXEEXT) \ ginstall$(EXEEXT) link$(EXEEXT) ln$(EXEEXT) dir$(EXEEXT) \@@ -55,8 +55,8 @@
tail$(EXEEXT) tr$(EXEEXT) tsort$(EXEEXT) unexpand$(EXEEXT) \ uniq$(EXEEXT) wc$(EXEEXT) basename$(EXEEXT) date$(EXEEXT) \ dirname$(EXEEXT) echo$(EXEEXT) env$(EXEEXT) expr$(EXEEXT) \- factor$(EXEEXT) false$(EXEEXT) hostname$(EXEEXT) id$(EXEEXT) \
- kill$(EXEEXT) logname$(EXEEXT) pathchk$(EXEEXT) \
+ factor$(EXEEXT) false$(EXEEXT) id$(EXEEXT) \
+ logname$(EXEEXT) pathchk$(EXEEXT) \
printenv$(EXEEXT) printf$(EXEEXT) pwd$(EXEEXT) seq$(EXEEXT) \ sleep$(EXEEXT) tee$(EXEEXT) test$(EXEEXT) true$(EXEEXT) \ tty$(EXEEXT) whoami$(EXEEXT) yes$(EXEEXT) $(am__EXEEXT_1) \@@ -169,7 +169,7 @@
$(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \ $(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \ $(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \- $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
+ $(top_srcdir)/m4/unlocked-io.m4 \
$(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \ $(top_srcdir)/m4/utime.m4 $(top_srcdir)/m4/utimecmp.m4 \ $(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimes-null.m4 \@@ -621,29 +621,29 @@
$(chown_SOURCES) chroot.c cksum.c comm.c $(cp_SOURCES) \ csplit.c cut.c date.c dd.c df.c $(dir_SOURCES) dircolors.c \ dirname.c du.c echo.c env.c expand.c expr.c factor.c false.c \- fmt.c fold.c $(ginstall_SOURCES) head.c hostid.c hostname.c \
- id.c join.c kill.c link.c ln.c logname.c $(ls_SOURCES) \
+ fmt.c fold.c $(ginstall_SOURCES) head.c hostid.c \
+ id.c join.c link.c ln.c logname.c $(ls_SOURCES) \
$(md5sum_SOURCES) mkdir.c mkfifo.c mknod.c $(mv_SOURCES) \ nice.c nl.c nohup.c od.c paste.c pathchk.c pinky.c pr.c \ printenv.c printf.c ptx.c pwd.c readlink.c $(rm_SOURCES) \ rmdir.c seq.c setuidgid.c $(sha1sum_SOURCES) shred.c sleep.c \ sort.c split.c stat.c stty.c su.c sum.c sync.c tac.c tail.c \ tee.c test.c touch.c tr.c true.c tsort.c tty.c uname.c \- unexpand.c uniq.c unlink.c uptime.c users.c $(vdir_SOURCES) \
+ unexpand.c uniq.c unlink.c users.c $(vdir_SOURCES) \
wc.c who.c whoami.c yes.c DIST_SOURCES = $(__SOURCES) basename.c cat.c $(chgrp_SOURCES) chmod.c \ $(chown_SOURCES) chroot.c cksum.c comm.c $(cp_SOURCES) \ csplit.c cut.c date.c dd.c df.c $(dir_SOURCES) dircolors.c \ dirname.c du.c echo.c env.c expand.c expr.c factor.c false.c \- fmt.c fold.c $(ginstall_SOURCES) head.c hostid.c hostname.c \
- id.c join.c kill.c link.c ln.c logname.c $(ls_SOURCES) \
+ fmt.c fold.c $(ginstall_SOURCES) head.c hostid.c \
+ id.c join.c link.c ln.c logname.c $(ls_SOURCES) \
$(md5sum_SOURCES) mkdir.c mkfifo.c mknod.c $(mv_SOURCES) \ nice.c nl.c nohup.c od.c paste.c pathchk.c pinky.c pr.c \ printenv.c printf.c ptx.c pwd.c readlink.c $(rm_SOURCES) \ rmdir.c seq.c setuidgid.c $(sha1sum_SOURCES) shred.c sleep.c \ sort.c split.c stat.c stty.c su.c sum.c sync.c tac.c tail.c \ tee.c test.c touch.c tr.c true.c tsort.c tty.c uname.c \- unexpand.c uniq.c unlink.c uptime.c users.c $(vdir_SOURCES) \
+ unexpand.c uniq.c unlink.c users.c $(vdir_SOURCES) \
wc.c who.c whoami.c yes.c HEADERS = $(noinst_HEADERS) ETAGS = etags@@ -786,14 +786,14 @@
sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@-bin_SCRIPTS = groups
+bin_SCRIPTS =
noinst_HEADERS = \ system.h checksum.h copy.h cp-hash.h ls.h dircolors.h remove.h \ chown-core.h fs.h \ wheel.h wheel-size.h EXTRA_DIST = dcgen dircolors.hin tac-pipe.c \- groups.sh wheel-gen.pl extract-magic
+ wheel-gen.pl extract-magic
CLEANFILES = $(SCRIPTS) su AM_CPPFLAGS = -I.. -I$(srcdir) -I$(top_srcdir)/lib -I../lib@@ -840,7 +840,6 @@
nanosec_libs = $(LDADD) $(POW_LIB) $(LIB_NANOSLEEP) sleep_LDADD = $(nanosec_libs) tail_LDADD = $(nanosec_libs)-uptime_LDADD = $(LDADD) $(GETLOADAVG_LIBS)
su_LDADD = $(LDADD) $(LIB_CRYPT) SUFFIXES = .sh installed_su = $(DESTDIR)$(bindir)/`echo su|sed '$(transform)'`@@ -1067,18 +1066,12 @@
hostid$(EXEEXT): $(hostid_OBJECTS) $(hostid_DEPENDENCIES) @rm -f hostid$(EXEEXT) $(LINK) $(hostid_LDFLAGS) $(hostid_OBJECTS) $(hostid_LDADD) $(LIBS)-hostname$(EXEEXT): $(hostname_OBJECTS) $(hostname_DEPENDENCIES)
- @rm -f hostname$(EXEEXT)
- $(LINK) $(hostname_LDFLAGS) $(hostname_OBJECTS) $(hostname_LDADD) $(LIBS)
id$(EXEEXT): $(id_OBJECTS) $(id_DEPENDENCIES) @rm -f id$(EXEEXT) $(LINK) $(id_LDFLAGS) $(id_OBJECTS) $(id_LDADD) $(LIBS) join$(EXEEXT): $(join_OBJECTS) $(join_DEPENDENCIES) @rm -f join$(EXEEXT) $(LINK) $(join_LDFLAGS) $(join_OBJECTS) $(join_LDADD) $(LIBS)-kill$(EXEEXT): $(kill_OBJECTS) $(kill_DEPENDENCIES)
- @rm -f kill$(EXEEXT)
- $(LINK) $(kill_LDFLAGS) $(kill_OBJECTS) $(kill_LDADD) $(LIBS)
link$(EXEEXT): $(link_OBJECTS) $(link_DEPENDENCIES) @rm -f link$(EXEEXT) $(LINK) $(link_LDFLAGS) $(link_OBJECTS) $(link_LDADD) $(LIBS)@@ -1226,9 +1219,6 @@
unlink$(EXEEXT): $(unlink_OBJECTS) $(unlink_DEPENDENCIES) @rm -f unlink$(EXEEXT) $(LINK) $(unlink_LDFLAGS) $(unlink_OBJECTS) $(unlink_LDADD) $(LIBS)-uptime$(EXEEXT): $(uptime_OBJECTS) $(uptime_DEPENDENCIES)
- @rm -f uptime$(EXEEXT)
- $(LINK) $(uptime_LDFLAGS) $(uptime_OBJECTS) $(uptime_LDADD) $(LIBS)
users$(EXEEXT): $(users_OBJECTS) $(users_DEPENDENCIES) @rm -f users$(EXEEXT) $(LINK) $(users_LDFLAGS) $(users_OBJECTS) $(users_LDADD) $(LIBS)@@ -1318,11 +1308,9 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fold.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/head.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hostid.Po@am__quote@-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hostname.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/id.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/install.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/join.Po@am__quote@-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kill.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lbracket.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/link.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ln.Po@am__quote@@@ -1378,7 +1366,6 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unexpand.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uniq.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unlink.Po@am__quote@-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uptime.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/users.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wc.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/who.Po@am__quote@@@ -1606,7 +1593,7 @@
&& can_create_suid_root_executable=yes; \ rm -f $$TMPFILE; \ if test $$can_create_suid_root_executable = yes; then \- $(INSTALL_SU); \
+ echo "Installation of su is surpressed"; \
else \ echo "WARNING: insufficient access; not installing su"; \ echo "NOTE: to install su, run 'make install-root' as root"; \
|
