Ignore:
Timestamp:
Oct 21, 2006, 9:10:09 PM (18 years ago)
Author:
Jim Gifford <clfs@…>
Branches:
clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
18e9f9f
Parents:
054bf2ad
Message:

Updated CLFS patches

File:
1 moved

Legend:

Unmodified
Added
Removed

  • patches/coreutils-6.3-suppress_uptime_kill_su-1.patch

    r054bf2ad r862e2c0  
    1010           coreutils-5.0-dupes-2.patch
    1111
    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 @@
     12diff -Naur coreutils-6.3.orig/AUTHORS coreutils-6.3/AUTHORS
     13--- coreutils-6.3.orig/AUTHORS  2006-08-09 00:42:31.000000000 -0700
     14+++ coreutils-6.3/AUTHORS       2006-09-30 11:53:24.000000000 -0700
     15@@ -35,7 +35,6 @@
    1616 hostname: Jim Meyering
    1717 id: Arnold Robbins, David MacKenzie
    … …  
    2121 ln: Mike Parker, David MacKenzie
    2222 logname: FIXME: unknown
    23 @@ -83,7 +82,6 @@
     23@@ -89,7 +88,6 @@
    2424 unexpand: David MacKenzie
    2525 uniq: Richard Stallman, David MacKenzie
    … …  
    2929 vdir: Richard Stallman, David MacKenzie
    3030 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 @@
     31diff -Naur coreutils-6.3.orig/configure coreutils-6.3/configure
     32--- coreutils-6.3.orig/configure        2006-09-30 02:09:13.000000000 -0700
     33+++ coreutils-6.3/configure     2006-09-30 11:53:24.000000000 -0700
     34@@ -58175,8 +58175,7 @@
    6435 { echo "$as_me:$LINENO: result: $gnulib_cv_have_boot_time" >&5
    6536 echo "${ECHO_T}$gnulib_cv_have_boot_time" >&6; }
    … …  
    7142 
    7243 
    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 \
     44diff -Naur coreutils-6.3.orig/Makefile.in coreutils-6.3/Makefile.in
     45--- coreutils-6.3.orig/Makefile.in      2006-09-30 02:09:28.000000000 -0700
     46+++ coreutils-6.3/Makefile.in   2006-09-30 11:53:24.000000000 -0700
     47@@ -179,7 +179,7 @@
     48        $(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/unicodeio.m4 \
     49        $(top_srcdir)/m4/unistd-safer.m4 $(top_srcdir)/m4/unistd_h.m4 \
    7950        $(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
    8051-       $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
    … …  
    8354        $(top_srcdir)/m4/utime.m4 $(top_srcdir)/m4/utimecmp.m4 \
    8455        $(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 \
     56diff -Naur coreutils-6.3.orig/man/Makefile.in coreutils-6.3/man/Makefile.in
     57--- coreutils-6.3.orig/man/Makefile.in  2006-09-30 02:09:23.000000000 -0700
     58+++ coreutils-6.3/man/Makefile.in       2006-09-30 11:56:34.000000000 -0700
     59@@ -174,7 +174,7 @@
     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 \
     68@@ -377,14 +377,14 @@
     69   base64.1 basename.1 cat.1 chgrp.1 chmod.1 chown.1 chroot.1 cksum.1 comm.1 \
    8770   cp.1 csplit.1 cut.1 date.1 dd.1 df.1 dir.1 dircolors.1 dirname.1 du.1 \
    8871   echo.1 env.1 expand.1 expr.1 factor.1 false.1 fmt.1 fold.1 groups.1 \
    … …  
    9275   ls.1 md5sum.1 mkdir.1 mkfifo.1 mknod.1 mv.1 nice.1 nl.1 nohup.1 od.1 \
    9376   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 \
     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 \
    9579-  su.1 sum.1 sync.1 tac.1 tail.1 tee.1 test.1 touch.1 tr.1 true.1 tsort.1 \
    9680-  tty.1 uname.1 unexpand.1 uniq.1 unlink.1 uptime.1 users.1 vdir.1 wc.1 \
    … …  
    10084 
    10185 man_aux = $(dist_man_MANS:.1=.x)
    102 @@ -575,7 +575,6 @@
     86@@ -651,7 +651,6 @@
    10387 id.1:          $(common_dep)   $(srcdir)/id.x          ../src/id.c
    10488 install.1:     $(common_dep)   $(srcdir)/install.x     ../src/install.c
    … …  
    10892 ln.1:          $(common_dep)   $(srcdir)/ln.x          ../src/ln.c
    10993 logname.1:     $(common_dep)   $(srcdir)/logname.x     ../src/logname.c
    110 @@ -608,7 +607,6 @@
     94@@ -689,7 +688,6 @@
    11195 split.1:       $(common_dep)   $(srcdir)/split.x       ../src/split.c
    11296 stat.1:                $(common_dep)   $(srcdir)/stat.x        ../src/stat.c
    … …  
    116100 sync.1:                $(common_dep)   $(srcdir)/sync.x        ../src/sync.c
    117101 tac.1:         $(common_dep)   $(srcdir)/tac.x         ../src/tac.c
    118 @@ -624,7 +622,6 @@
     102@@ -705,7 +703,6 @@
    119103 unexpand.1:    $(common_dep)   $(srcdir)/unexpand.x    ../src/unexpand.c
    120104 uniq.1:                $(common_dep)   $(srcdir)/uniq.x        ../src/uniq.c
    … …  
    124108 vdir.1:                $(common_dep)   $(srcdir)/vdir.x        ../src/ls.c
    125109 wc.1:          $(common_dep)   $(srcdir)/wc.x          ../src/wc.c
    126 @@ -656,7 +653,7 @@
     110@@ -737,7 +734,7 @@
    127111 check-x-vs-1:
    128112        PATH=../src$(PATH_SEPARATOR)$$PATH; export PATH;                \
    … …  
    133117          | $(ASSORT) | diff - $$t || { rm $$t; exit 1; };              \
    134118        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
     119diff -Naur coreutils-6.3.orig/README coreutils-6.3/README
     120--- coreutils-6.3.orig/README   2006-09-26 06:02:57.000000000 -0700
     121+++ coreutils-6.3/README        2006-09-30 11:54:45.000000000 -0700
     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.
     136diff -Naur coreutils-6.3.orig/src/Makefile.in coreutils-6.3/src/Makefile.in
     137--- coreutils-6.3.orig/src/Makefile.in  2006-09-30 02:11:14.000000000 -0700
     138+++ coreutils-6.3/src/Makefile.in       2006-09-30 11:58:34.000000000 -0700
    138139@@ -39,7 +39,7 @@
    139140 host_triplet = @host@
    … …  
    145146        cp$(EXEEXT) dd$(EXEEXT) dircolors$(EXEEXT) du$(EXEEXT) \
    146147        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 \
     148@@ -57,7 +57,7 @@
     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) \
     157@@ -182,7 +182,7 @@
     158        $(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/unicodeio.m4 \
     159        $(top_srcdir)/m4/unistd-safer.m4 $(top_srcdir)/m4/unistd_h.m4 \
    159160        $(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
    160161-       $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
    … …  
    163164        $(top_srcdir)/m4/utime.m4 $(top_srcdir)/m4/utimecmp.m4 \
    164165        $(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimes-null.m4 \
    165 @@ -350,11 +350,6 @@
     166@@ -370,11 +370,6 @@
    166167 join_LDADD = $(LDADD)
    167168 join_DEPENDENCIES = ../lib/libcoreutils.a $(am__DEPENDENCIES_1) \
    … …  
    175176 link_OBJECTS = link.$(OBJEXT)
    176177 link_LDADD = $(LDADD)
    177 @@ -577,9 +572,6 @@
     178@@ -623,10 +618,6 @@
    178179 unlink_LDADD = $(LDADD)
    179180 unlink_DEPENDENCIES = ../lib/libcoreutils.a $(am__DEPENDENCIES_1) \
    … …  
    181182-uptime_SOURCES = uptime.c
    182183-uptime_OBJECTS = uptime.$(OBJEXT)
    183 -uptime_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
     184-uptime_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
     185-       $(am__DEPENDENCIES_1)
    184186 users_SOURCES = users.c
    185187 users_OBJECTS = users.$(OBJEXT)
    186188 users_LDADD = $(LDADD)
    187 @@ -622,28 +614,28 @@
     189@@ -670,7 +661,7 @@
    188190        csplit.c cut.c date.c dd.c df.c $(dir_SOURCES) dircolors.c \
    189191        dirname.c du.c echo.c env.c expand.c expr.c factor.c false.c \
    … …  
    194196        nice.c nl.c nohup.c od.c paste.c pathchk.c pinky.c pr.c \
    195197        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) \
     198@@ -679,14 +670,14 @@
     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) \
    204207        csplit.c cut.c date.c dd.c df.c $(dir_SOURCES) dircolors.c \
    205208        dirname.c du.c echo.c env.c expand.c expr.c factor.c false.c \
    … …  
    210213        nice.c nl.c nohup.c od.c paste.c pathchk.c pinky.c pr.c \
    211214        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
     215@@ -695,7 +686,7 @@
     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
    218222 HEADERS = $(noinst_HEADERS)
    219223 ETAGS = etags
    220 @@ -840,7 +832,6 @@
    221  nanosec_libs = $(LDADD) $(POW_LIB) $(LIB_NANOSLEEP)
    222  sleep_LDADD = $(nanosec_libs)
     224@@ -946,7 +937,6 @@
    223225 tail_LDADD = $(nanosec_libs)
    224 -uptime_LDADD = $(LDADD) $(GETLOADAVG_LIBS)
     226 
     227 # If necessary, add -lm to resolve use of pow in lib/strtod.c.
     228-uptime_LDADD = $(LDADD) $(POW_LIB) $(GETLOADAVG_LIBS)
    225229 su_LDADD = $(LDADD) $(LIB_CRYPT)
    226230 SUFFIXES = .sh
    227231 installed_su = $(DESTDIR)$(bindir)/`echo su|sed '$(transform)'`
    228 @@ -1076,9 +1067,6 @@
     232@@ -1193,9 +1183,6 @@
    229233 join$(EXEEXT): $(join_OBJECTS) $(join_DEPENDENCIES)
    230234        @rm -f join$(EXEEXT)
    … …  
    236240        @rm -f link$(EXEEXT)
    237241        $(LINK) $(link_LDFLAGS) $(link_OBJECTS) $(link_LDADD) $(LIBS)
    238 @@ -1226,9 +1214,6 @@
     242@@ -1358,9 +1345,6 @@
    239243 unlink$(EXEEXT): $(unlink_OBJECTS) $(unlink_DEPENDENCIES)
    240244        @rm -f unlink$(EXEEXT)
    … …  
    246250        @rm -f users$(EXEEXT)
    247251        $(LINK) $(users_LDFLAGS) $(users_OBJECTS) $(users_LDADD) $(LIBS)
    248 @@ -1322,7 +1307,6 @@
     252@@ -1455,7 +1439,6 @@
    249253 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/id.Po@am__quote@
    250254 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/install.Po@am__quote@
    … …  
    254258 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/link.Po@am__quote@
    255259 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ln.Po@am__quote@
    256 @@ -1378,7 +1362,6 @@
     260@@ -1515,7 +1498,6 @@
    257261 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unexpand.Po@am__quote@
    258262 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uniq.Po@am__quote@
    … …  
    262266 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wc.Po@am__quote@
    263267 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/who.Po@am__quote@
    264 @@ -1606,7 +1589,7 @@
     268@@ -1826,7 +1808,7 @@
    265269          && can_create_suid_root_executable=yes; \
    266270        rm -f $$TMPFILE; \
Note: See TracChangeset for help on using the changeset viewer.