Changeset 7c0b4b3


Ignore:
Timestamp:
Oct 22, 2006, 8:55:48 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:
4d5dab5
Parents:
60d7c102
Message:

Update to Coreutils 6.4

Location:
patches
Files:
2 moved

Legend:

Unmodified
Added
Removed

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

    r60d7c102 r7c0b4b3  
    11Submitted By: Matthew Burgess <matthew at linuxfromscratch dot org>
    2 Date: 2006-03-15
    3 Initial Package Version: 5.94
     2Date: 2006-10-22
     3Initial Package Version: 6.4
    44Origin: original suppress_hotname_uptame_kill_su patch (Robert Connolly)
    55Upstream Status: N/A
    66Description: 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
     7             command is built so the testsuite can run, use './src/su', but
     8             it will not be installed. Also see:
    119
    12 diff -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
     10             Updated for 6.3 and 6.4 by Jim Gifford
     11
     12diff -Naur coreutils-6.4.orig/AUTHORS coreutils-6.4/AUTHORS
     13--- coreutils-6.4.orig/AUTHORS  2006-10-22 09:54:15.000000000 -0700
     14+++ coreutils-6.4/AUTHORS       2006-10-22 20:47:10.000000000 -0700
    1515@@ -35,7 +35,6 @@
    1616 hostname: Jim Meyering
    … …  
    2929 vdir: Richard Stallman, David MacKenzie
    3030 wc: Paul Rubin, David MacKenzie
    31 diff -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 @@
     31diff -Naur coreutils-6.4.orig/configure coreutils-6.4/configure
     32--- coreutils-6.4.orig/configure        2006-10-22 13:36:16.000000000 -0700
     33+++ coreutils-6.4/configure     2006-10-22 20:47:10.000000000 -0700
     34@@ -49517,8 +49517,7 @@
    3535 { echo "$as_me:$LINENO: result: $gnulib_cv_have_boot_time" >&5
    3636 echo "${ECHO_T}$gnulib_cv_have_boot_time" >&6; }
    … …  
    4242 
    4343 
    44 diff -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 @@
     44diff -Naur coreutils-6.4.orig/Makefile.in coreutils-6.4/Makefile.in
     45--- coreutils-6.4.orig/Makefile.in      2006-10-22 13:36:28.000000000 -0700
     46+++ coreutils-6.4/Makefile.in   2006-10-22 20:47:10.000000000 -0700
     47@@ -175,7 +175,7 @@
    4848        $(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/unicodeio.m4 \
    4949        $(top_srcdir)/m4/unistd-safer.m4 $(top_srcdir)/m4/unistd_h.m4 \
    … …  
    5454        $(top_srcdir)/m4/utime.m4 $(top_srcdir)/m4/utimecmp.m4 \
    5555        $(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimes-null.m4 \
    56 diff -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 @@
     56diff -Naur coreutils-6.4.orig/man/Makefile.in coreutils-6.4/man/Makefile.in
     57--- coreutils-6.4.orig/man/Makefile.in  2006-10-22 13:36:24.000000000 -0700
     58+++ coreutils-6.4/man/Makefile.in       2006-10-22 20:47:10.000000000 -0700
     59@@ -170,7 +170,7 @@
    6060        $(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/unicodeio.m4 \
    6161        $(top_srcdir)/m4/unistd-safer.m4 $(top_srcdir)/m4/unistd_h.m4 \
    … …  
    6666        $(top_srcdir)/m4/utime.m4 $(top_srcdir)/m4/utimecmp.m4 \
    6767        $(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimes-null.m4 \
    68 @@ -377,14 +377,14 @@
     68@@ -380,14 +380,14 @@
    6969   base64.1 basename.1 cat.1 chgrp.1 chmod.1 chown.1 chroot.1 cksum.1 comm.1 \
    7070   cp.1 csplit.1 cut.1 date.1 dd.1 df.1 dir.1 dircolors.1 dirname.1 du.1 \
    … …  
    8484 
    8585 man_aux = $(dist_man_MANS:.1=.x)
    86 @@ -651,7 +651,6 @@
     86@@ -663,7 +663,6 @@
    8787 id.1:          $(common_dep)   $(srcdir)/id.x          ../src/id.c
    8888 install.1:     $(common_dep)   $(srcdir)/install.x     ../src/install.c
    … …  
    9292 ln.1:          $(common_dep)   $(srcdir)/ln.x          ../src/ln.c
    9393 logname.1:     $(common_dep)   $(srcdir)/logname.x     ../src/logname.c
    94 @@ -689,7 +688,6 @@
     94@@ -701,7 +700,6 @@
    9595 split.1:       $(common_dep)   $(srcdir)/split.x       ../src/split.c
    9696 stat.1:                $(common_dep)   $(srcdir)/stat.x        ../src/stat.c
    … …  
    100100 sync.1:                $(common_dep)   $(srcdir)/sync.x        ../src/sync.c
    101101 tac.1:         $(common_dep)   $(srcdir)/tac.x         ../src/tac.c
    102 @@ -705,7 +703,6 @@
     102@@ -717,7 +715,6 @@
    103103 unexpand.1:    $(common_dep)   $(srcdir)/unexpand.x    ../src/unexpand.c
    104104 uniq.1:                $(common_dep)   $(srcdir)/uniq.x        ../src/uniq.c
    … …  
    108108 vdir.1:                $(common_dep)   $(srcdir)/vdir.x        ../src/ls.c
    109109 wc.1:          $(common_dep)   $(srcdir)/wc.x          ../src/wc.c
    110 @@ -737,7 +734,7 @@
     110@@ -749,7 +746,7 @@
    111111 check-x-vs-1:
    112112        PATH=../src$(PATH_SEPARATOR)$$PATH; export PATH;                \
    … …  
    117117          | $(ASSORT) | diff - $$t || { rm $$t; exit 1; };              \
    118118        rm $$t
    119 diff -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
     119diff -Naur coreutils-6.4.orig/README coreutils-6.4/README
     120--- coreutils-6.4.orig/README   2006-10-22 09:54:15.000000000 -0700
     121+++ coreutils-6.4/README        2006-10-22 20:47:10.000000000 -0700
    122122@@ -9,11 +9,11 @@
    123123 
    … …  
    134134 
    135135 See the file NEWS for a list of major changes in the current release.
    136 diff -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
    139 @@ -39,7 +39,7 @@
     136diff -Naur coreutils-6.4.orig/src/Makefile.in coreutils-6.4/src/Makefile.in
     137--- coreutils-6.4.orig/src/Makefile.in  2006-10-22 14:41:18.000000000 -0700
     138+++ coreutils-6.4/src/Makefile.in       2006-10-22 20:48:20.000000000 -0700
     139@@ -35,7 +35,7 @@
    140140 host_triplet = @host@
    141141 EXTRA_PROGRAMS = chroot$(EXEEXT) df$(EXEEXT) hostid$(EXEEXT) \
    … …  
    146146        cp$(EXEEXT) dd$(EXEEXT) dircolors$(EXEEXT) du$(EXEEXT) \
    147147        ginstall$(EXEEXT) link$(EXEEXT) ln$(EXEEXT) dir$(EXEEXT) \
    148 @@ -57,7 +57,7 @@
     148@@ -53,7 +53,7 @@
    149149        tsort$(EXEEXT) unexpand$(EXEEXT) uniq$(EXEEXT) wc$(EXEEXT) \
    150150        basename$(EXEEXT) date$(EXEEXT) dirname$(EXEEXT) echo$(EXEEXT) \
    … …  
    155155        pwd$(EXEEXT) seq$(EXEEXT) sleep$(EXEEXT) tee$(EXEEXT) \
    156156        test$(EXEEXT) true$(EXEEXT) tty$(EXEEXT) whoami$(EXEEXT) \
    157 @@ -182,7 +182,7 @@
     157@@ -178,7 +178,7 @@
    158158        $(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/unicodeio.m4 \
    159159        $(top_srcdir)/m4/unistd-safer.m4 $(top_srcdir)/m4/unistd_h.m4 \
    … …  
    164164        $(top_srcdir)/m4/utime.m4 $(top_srcdir)/m4/utimecmp.m4 \
    165165        $(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimes-null.m4 \
    166 @@ -370,11 +370,6 @@
     166@@ -364,11 +364,6 @@
    167167 join_LDADD = $(LDADD)
    168168 join_DEPENDENCIES = ../lib/libcoreutils.a $(am__DEPENDENCIES_1) \
    … …  
    176176 link_OBJECTS = link.$(OBJEXT)
    177177 link_LDADD = $(LDADD)
    178 @@ -623,10 +618,6 @@
     178@@ -617,10 +612,6 @@
    179179 unlink_LDADD = $(LDADD)
    180180 unlink_DEPENDENCIES = ../lib/libcoreutils.a $(am__DEPENDENCIES_1) \
    … …  
    187187 users_OBJECTS = users.$(OBJEXT)
    188188 users_LDADD = $(LDADD)
    189 @@ -670,7 +661,7 @@
     189@@ -664,7 +655,7 @@
    190190        csplit.c cut.c date.c dd.c df.c $(dir_SOURCES) dircolors.c \
    191191        dirname.c du.c echo.c env.c expand.c expr.c factor.c false.c \
    … …  
    196196        nice.c nl.c nohup.c od.c paste.c pathchk.c pinky.c pr.c \
    197197        printenv.c printf.c ptx.c pwd.c readlink.c $(rm_SOURCES) \
    198 @@ -679,14 +670,14 @@
     198@@ -673,14 +664,14 @@
    199199        $(sha512sum_SOURCES) shred.c shuf.c sleep.c sort.c split.c \
    200200        stat.c stty.c su.c sum.c sync.c tac.c tail.c tee.c test.c \
    … …  
    213213        nice.c nl.c nohup.c od.c paste.c pathchk.c pinky.c pr.c \
    214214        printenv.c printf.c ptx.c pwd.c readlink.c $(rm_SOURCES) \
    215 @@ -695,7 +686,7 @@
     215@@ -689,7 +680,7 @@
    216216        $(sha512sum_SOURCES) shred.c shuf.c sleep.c sort.c split.c \
    217217        stat.c stty.c su.c sum.c sync.c tac.c tail.c tee.c test.c \
    … …  
    222222 HEADERS = $(noinst_HEADERS)
    223223 ETAGS = etags
    224 @@ -946,7 +937,6 @@
     224@@ -947,7 +938,6 @@
    225225 tail_LDADD = $(nanosec_libs)
    226226 
    … …  
    230230 SUFFIXES = .sh
    231231 installed_su = $(DESTDIR)$(bindir)/`echo su|sed '$(transform)'`
    232 @@ -1193,9 +1183,6 @@
     232@@ -1194,9 +1184,6 @@
    233233 join$(EXEEXT): $(join_OBJECTS) $(join_DEPENDENCIES)
    234234        @rm -f join$(EXEEXT)
    235         $(LINK) $(join_LDFLAGS) $(join_OBJECTS) $(join_LDADD) $(LIBS)
     235        $(LINK) $(join_OBJECTS) $(join_LDADD) $(LIBS)
    236236-kill$(EXEEXT): $(kill_OBJECTS) $(kill_DEPENDENCIES)
    237237-       @rm -f kill$(EXEEXT)
    238 -       $(LINK) $(kill_LDFLAGS) $(kill_OBJECTS) $(kill_LDADD) $(LIBS)
     238-       $(LINK) $(kill_OBJECTS) $(kill_LDADD) $(LIBS)
    239239 link$(EXEEXT): $(link_OBJECTS) $(link_DEPENDENCIES)
    240240        @rm -f link$(EXEEXT)
    241         $(LINK) $(link_LDFLAGS) $(link_OBJECTS) $(link_LDADD) $(LIBS)
    242 @@ -1358,9 +1345,6 @@
     241        $(LINK) $(link_OBJECTS) $(link_LDADD) $(LIBS)
     242@@ -1359,9 +1346,6 @@
    243243 unlink$(EXEEXT): $(unlink_OBJECTS) $(unlink_DEPENDENCIES)
    244244        @rm -f unlink$(EXEEXT)
    245         $(LINK) $(unlink_LDFLAGS) $(unlink_OBJECTS) $(unlink_LDADD) $(LIBS)
     245        $(LINK) $(unlink_OBJECTS) $(unlink_LDADD) $(LIBS)
    246246-uptime$(EXEEXT): $(uptime_OBJECTS) $(uptime_DEPENDENCIES)
    247247-       @rm -f uptime$(EXEEXT)
    248 -       $(LINK) $(uptime_LDFLAGS) $(uptime_OBJECTS) $(uptime_LDADD) $(LIBS)
     248-       $(LINK) $(uptime_OBJECTS) $(uptime_LDADD) $(LIBS)
    249249 users$(EXEEXT): $(users_OBJECTS) $(users_DEPENDENCIES)
    250250        @rm -f users$(EXEEXT)
    251         $(LINK) $(users_LDFLAGS) $(users_OBJECTS) $(users_LDADD) $(LIBS)
    252 @@ -1455,7 +1439,6 @@
     251        $(LINK) $(users_OBJECTS) $(users_LDADD) $(LIBS)
     252@@ -1456,7 +1440,6 @@
    253253 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/id.Po@am__quote@
    254254 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/install.Po@am__quote@
    … …  
    258258 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/link.Po@am__quote@
    259259 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ln.Po@am__quote@
    260 @@ -1515,7 +1498,6 @@
     260@@ -1516,7 +1499,6 @@
    261261 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unexpand.Po@am__quote@
    262262 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uniq.Po@am__quote@
    … …  
    266266 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wc.Po@am__quote@
    267267 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/who.Po@am__quote@
    268 @@ -1826,7 +1808,7 @@
     268@@ -1837,7 +1819,7 @@
    269269          && can_create_suid_root_executable=yes; \
    270270        rm -f $$TMPFILE; \
    … …  
    275275          echo "WARNING: insufficient access; not installing su"; \
    276276          echo "NOTE: to install su, run 'make install-root' as root"; \
     277diff -Naur coreutils-6.4.orig/src/Makefile.in.rej coreutils-6.4/src/Makefile.in.rej
     278--- coreutils-6.4.orig/src/Makefile.in.rej      1969-12-31 16:00:00.000000000 -0800
     279+++ coreutils-6.4/src/Makefile.in.rej   2006-10-22 20:47:10.000000000 -0700
     280@@ -0,0 +1,36 @@
     281+***************
     282+*** 1196,1204 ****
     283+  join$(EXEEXT): $(join_OBJECTS) $(join_DEPENDENCIES)
     284+       @rm -f join$(EXEEXT)
     285+       $(LINK) $(join_LDFLAGS) $(join_OBJECTS) $(join_LDADD) $(LIBS)
     286+- kill$(EXEEXT): $(kill_OBJECTS) $(kill_DEPENDENCIES)
     287+-      @rm -f kill$(EXEEXT)
     288+-      $(LINK) $(kill_LDFLAGS) $(kill_OBJECTS) $(kill_LDADD) $(LIBS)
     289+  link$(EXEEXT): $(link_OBJECTS) $(link_DEPENDENCIES)
     290+       @rm -f link$(EXEEXT)
     291+       $(LINK) $(link_LDFLAGS) $(link_OBJECTS) $(link_LDADD) $(LIBS)
     292+--- 1186,1191 ----
     293+  join$(EXEEXT): $(join_OBJECTS) $(join_DEPENDENCIES)
     294+       @rm -f join$(EXEEXT)
     295+       $(LINK) $(join_LDFLAGS) $(join_OBJECTS) $(join_LDADD) $(LIBS)
     296+  link$(EXEEXT): $(link_OBJECTS) $(link_DEPENDENCIES)
     297+       @rm -f link$(EXEEXT)
     298+       $(LINK) $(link_LDFLAGS) $(link_OBJECTS) $(link_LDADD) $(LIBS)
     299+***************
     300+*** 1361,1369 ****
     301+  unlink$(EXEEXT): $(unlink_OBJECTS) $(unlink_DEPENDENCIES)
     302+       @rm -f unlink$(EXEEXT)
     303+       $(LINK) $(unlink_LDFLAGS) $(unlink_OBJECTS) $(unlink_LDADD) $(LIBS)
     304+- uptime$(EXEEXT): $(uptime_OBJECTS) $(uptime_DEPENDENCIES)
     305+-      @rm -f uptime$(EXEEXT)
     306+-      $(LINK) $(uptime_LDFLAGS) $(uptime_OBJECTS) $(uptime_LDADD) $(LIBS)
     307+  users$(EXEEXT): $(users_OBJECTS) $(users_DEPENDENCIES)
     308+       @rm -f users$(EXEEXT)
     309+       $(LINK) $(users_LDFLAGS) $(users_OBJECTS) $(users_LDADD) $(LIBS)
     310+--- 1348,1353 ----
     311+  unlink$(EXEEXT): $(unlink_OBJECTS) $(unlink_DEPENDENCIES)
     312+       @rm -f unlink$(EXEEXT)
     313+       $(LINK) $(unlink_LDFLAGS) $(unlink_OBJECTS) $(unlink_LDADD) $(LIBS)
     314+  users$(EXEEXT): $(users_OBJECTS) $(users_DEPENDENCIES)
     315+       @rm -f users$(EXEEXT)
     316+       $(LINK) $(users_LDFLAGS) $(users_OBJECTS) $(users_LDADD) $(LIBS)
Note: See TracChangeset for help on using the changeset viewer.