|
|
@ -19,15 +19,15 @@ |
|
|
|
|
|
|
|
--- ./Makefile.in.orig 2004-10-01 19:05:13.027154464 +0200
|
|
|
|
+++ ./Makefile.in 2004-10-01 19:04:44.930425816 +0200
|
|
|
|
@@ -127,7 +127,7 @@
|
|
|
|
$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ |
|
|
|
@@ -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/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/utimens.m4 \ |
|
|
|
$(top_srcdir)/m4/utimes-null.m4 $(top_srcdir)/m4/utimes.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 @@
|
|
|
@ -42,16 +42,16 @@ |
|
|
|
|
|
|
|
--- ./man/Makefile.in.orig 2004-10-01 19:05:24.542403880 +0200
|
|
|
|
+++ ./man/Makefile.in 2004-10-01 19:05:56.565535624 +0200
|
|
|
|
@@ -122,7 +122,7 @@
|
|
|
|
$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ |
|
|
|
@@ -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/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/utimens.m4 \ |
|
|
|
$(top_srcdir)/m4/utimes-null.m4 $(top_srcdir)/m4/utimes.m4 \ |
|
|
|
@@ -265,14 +265,14 @@
|
|
|
|
$(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 \ |
|
|
@ -70,7 +70,7 @@ |
|
|
|
who.1 whoami.1 yes.1 |
|
|
|
|
|
|
|
man_aux = $(dist_man_MANS:.1=.x) |
|
|
|
@@ -532,14 +532,11 @@
|
|
|
|
@@ -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 |
|
|
@ -85,7 +85,7 @@ |
|
|
|
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 |
|
|
|
@@ -572,7 +569,6 @@
|
|
|
|
@@ -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 |
|
|
@ -93,7 +93,7 @@ |
|
|
|
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 |
|
|
|
@@ -588,7 +584,6 @@
|
|
|
|
@@ -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 |
|
|
@ -101,7 +101,7 @@ |
|
|
|
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 |
|
|
|
@@ -619,7 +614,7 @@
|
|
|
|
@@ -656,7 +651,7 @@
|
|
|
|
check-x-vs-1: |
|
|
|
PATH=../src$(PATH_SEPARATOR)$$PATH; export PATH; \ |
|
|
|
t=ls-files.$$$$; \ |
|
|
@ -112,16 +112,7 @@ |
|
|
|
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
|
|
|
|
@@ -16,7 +16,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
-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) $(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) wc.c who.c whoami.c yes.c
|
|
|
|
+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 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 users.c $(vdir_SOURCES) wc.c who.c whoami.c yes.c
|
|
|
|
|
|
|
|
srcdir = @srcdir@ |
|
|
|
top_srcdir = @top_srcdir@ |
|
|
|
@@ -40,7 +40,7 @@
|
|
|
|
@@ -39,7 +39,7 @@
|
|
|
|
host_triplet = @host@ |
|
|
|
EXTRA_PROGRAMS = chroot$(EXEEXT) df$(EXEEXT) hostid$(EXEEXT) \ |
|
|
|
nice$(EXEEXT) pinky$(EXEEXT) stty$(EXEEXT) su$(EXEEXT) \ |
|
|
@ -130,7 +121,7 @@ |
|
|
|
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) \ |
|
|
|
@@ -56,8 +56,8 @@
|
|
|
|
@@ -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) \ |
|
|
@ -141,71 +132,16 @@ |
|
|
|
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) \ |
|
|
|
@@ -151,7 +151,7 @@
|
|
|
|
$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ |
|
|
|
@@ -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/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/utimens.m4 \ |
|
|
|
$(top_srcdir)/m4/utimes-null.m4 $(top_srcdir)/m4/utimes.m4 \ |
|
|
|
@@ -320,11 +320,6 @@
|
|
|
|
hostid_LDADD = $(LDADD) |
|
|
|
hostid_DEPENDENCIES = ../lib/libfetish.a $(am__DEPENDENCIES_1) \ |
|
|
|
../lib/libfetish.a |
|
|
|
-hostname_SOURCES = hostname.c
|
|
|
|
-hostname_OBJECTS = hostname.$(OBJEXT)
|
|
|
|
-hostname_LDADD = $(LDADD)
|
|
|
|
-hostname_DEPENDENCIES = ../lib/libfetish.a $(am__DEPENDENCIES_1) \
|
|
|
|
- ../lib/libfetish.a
|
|
|
|
id_SOURCES = id.c |
|
|
|
id_OBJECTS = id.$(OBJEXT) |
|
|
|
id_LDADD = $(LDADD) |
|
|
|
@@ -335,11 +330,6 @@
|
|
|
|
join_LDADD = $(LDADD) |
|
|
|
join_DEPENDENCIES = ../lib/libfetish.a $(am__DEPENDENCIES_1) \ |
|
|
|
../lib/libfetish.a |
|
|
|
-kill_SOURCES = kill.c
|
|
|
|
-kill_OBJECTS = kill.$(OBJEXT)
|
|
|
|
-kill_LDADD = $(LDADD)
|
|
|
|
-kill_DEPENDENCIES = ../lib/libfetish.a $(am__DEPENDENCIES_1) \
|
|
|
|
- ../lib/libfetish.a
|
|
|
|
link_SOURCES = link.c |
|
|
|
link_OBJECTS = link.$(OBJEXT) |
|
|
|
link_LDADD = $(LDADD) |
|
|
|
@@ -574,9 +564,6 @@
|
|
|
|
unlink_LDADD = $(LDADD) |
|
|
|
unlink_DEPENDENCIES = ../lib/libfetish.a $(am__DEPENDENCIES_1) \ |
|
|
|
../lib/libfetish.a |
|
|
|
-uptime_SOURCES = uptime.c
|
|
|
|
-uptime_OBJECTS = uptime.$(OBJEXT)
|
|
|
|
-uptime_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
|
|
|
|
users_SOURCES = users.c |
|
|
|
users_OBJECTS = users.$(OBJEXT) |
|
|
|
users_LDADD = $(LDADD) |
|
|
|
@@ -625,9 +612,9 @@
|
|
|
|
@AMDEP_TRUE@ ./$(DEPDIR)/factor.Po ./$(DEPDIR)/false.Po \ |
|
|
|
@AMDEP_TRUE@ ./$(DEPDIR)/fmt.Po ./$(DEPDIR)/fold.Po \ |
|
|
|
@AMDEP_TRUE@ ./$(DEPDIR)/head.Po ./$(DEPDIR)/hostid.Po \ |
|
|
|
-@AMDEP_TRUE@ ./$(DEPDIR)/hostname.Po ./$(DEPDIR)/id.Po \
|
|
|
|
+@AMDEP_TRUE@ ./$(DEPDIR)/id.Po \
|
|
|
|
@AMDEP_TRUE@ ./$(DEPDIR)/install.Po ./$(DEPDIR)/join.Po \ |
|
|
|
-@AMDEP_TRUE@ ./$(DEPDIR)/kill.Po ./$(DEPDIR)/lbracket.Po \
|
|
|
|
+@AMDEP_TRUE@ ./$(DEPDIR)/lbracket.Po \
|
|
|
|
@AMDEP_TRUE@ ./$(DEPDIR)/link.Po ./$(DEPDIR)/ln.Po \ |
|
|
|
@AMDEP_TRUE@ ./$(DEPDIR)/logname.Po ./$(DEPDIR)/ls-dir.Po \ |
|
|
|
@AMDEP_TRUE@ ./$(DEPDIR)/ls-ls.Po ./$(DEPDIR)/ls-vdir.Po \ |
|
|
|
@@ -655,7 +642,7 @@
|
|
|
|
@AMDEP_TRUE@ ./$(DEPDIR)/tsort.Po ./$(DEPDIR)/tty.Po \ |
|
|
|
@AMDEP_TRUE@ ./$(DEPDIR)/uname.Po ./$(DEPDIR)/unexpand.Po \ |
|
|
|
@AMDEP_TRUE@ ./$(DEPDIR)/uniq.Po ./$(DEPDIR)/unlink.Po \ |
|
|
|
-@AMDEP_TRUE@ ./$(DEPDIR)/uptime.Po ./$(DEPDIR)/users.Po \
|
|
|
|
+@AMDEP_TRUE@ ./$(DEPDIR)/users.Po \
|
|
|
|
@AMDEP_TRUE@ ./$(DEPDIR)/wc.Po ./$(DEPDIR)/who.Po \ |
|
|
|
@AMDEP_TRUE@ ./$(DEPDIR)/whoami.Po ./$(DEPDIR)/yes.Po |
|
|
|
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ |
|
|
|
@@ -666,29 +653,29 @@
|
|
|
|
$(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 \ |
|
|
@ -241,7 +177,7 @@ |
|
|
|
wc.c who.c whoami.c yes.c |
|
|
|
HEADERS = $(noinst_HEADERS) |
|
|
|
ETAGS = etags |
|
|
|
@@ -816,14 +803,14 @@
|
|
|
|
@@ -786,14 +786,14 @@
|
|
|
|
sharedstatedir = @sharedstatedir@ |
|
|
|
sysconfdir = @sysconfdir@ |
|
|
|
target_alias = @target_alias@ |
|
|
@ -258,15 +194,15 @@ |
|
|
|
|
|
|
|
CLEANFILES = $(SCRIPTS) su |
|
|
|
AM_CPPFLAGS = -I.. -I$(srcdir) -I$(top_srcdir)/lib -I../lib |
|
|
|
@@ -860,7 +847,6 @@
|
|
|
|
|
|
|
|
@@ -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)'` |
|
|
|
@@ -1083,18 +1069,12 @@
|
|
|
|
@@ -1067,18 +1066,12 @@
|
|
|
|
hostid$(EXEEXT): $(hostid_OBJECTS) $(hostid_DEPENDENCIES) |
|
|
|
@rm -f hostid$(EXEEXT) |
|
|
|
$(LINK) $(hostid_LDFLAGS) $(hostid_OBJECTS) $(hostid_LDADD) $(LIBS) |
|
|
@ -285,7 +221,7 @@ |
|
|
|
link$(EXEEXT): $(link_OBJECTS) $(link_DEPENDENCIES) |
|
|
|
@rm -f link$(EXEEXT) |
|
|
|
$(LINK) $(link_LDFLAGS) $(link_OBJECTS) $(link_LDADD) $(LIBS) |
|
|
|
@@ -1242,9 +1222,6 @@
|
|
|
|
@@ -1226,9 +1219,6 @@
|
|
|
|
unlink$(EXEEXT): $(unlink_OBJECTS) $(unlink_DEPENDENCIES) |
|
|
|
@rm -f unlink$(EXEEXT) |
|
|
|
$(LINK) $(unlink_LDFLAGS) $(unlink_OBJECTS) $(unlink_LDADD) $(LIBS) |
|
|
@ -295,7 +231,7 @@ |
|
|
|
users$(EXEEXT): $(users_OBJECTS) $(users_DEPENDENCIES) |
|
|
|
@rm -f users$(EXEEXT) |
|
|
|
$(LINK) $(users_LDFLAGS) $(users_OBJECTS) $(users_LDADD) $(LIBS) |
|
|
|
@@ -1333,11 +1310,9 @@
|
|
|
|
@@ -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@ |
|
|
@ -307,7 +243,7 @@ |
|
|
|
@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@ |
|
|
|
@@ -1393,7 +1368,6 @@
|
|
|
|
@@ -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@ |
|
|
@ -315,7 +251,7 @@ |
|
|
|
@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@ |
|
|
|
@@ -1623,7 +1597,7 @@
|
|
|
|
@@ -1606,7 +1593,7 @@
|
|
|
|
&& can_create_suid_root_executable=yes; \ |
|
|
|
rm -f $$TMPFILE; \ |
|
|
|
if test $$can_create_suid_root_executable = yes; then \ |
|
|
|