source: patches/coreutils-6.4-suppress_uptime_kill_su-1.patch@ 6704f71

clfs-1.2 clfs-2.1 clfs-3.0.0-systemd clfs-3.0.0-sysvinit systemd sysvinit
Last change on this file since 6704f71 was 7c0b4b3, checked in by Jim Gifford <clfs@…>, 18 years ago

Update to Coreutils 6.4
  • Property mode set to 100644
File size: 15.0 KB

  • coreutils-6.4 

    Submitted By: Matthew Burgess <matthew at linuxfromscratch dot org>
Date: 2006-10-22
Initial Package Version: 6.4
Origin: original suppress_hotname_uptame_kill_su patch (Robert Connolly)
Upstream Status: N/A
Description: This patch supresses the building of uptime, and kill.  The su
	     command is built so the testsuite can run, use './src/su', but
	     it will not be installed. Also see:

	     Updated for 6.3 and 6.4 by Jim Gifford

diff -Naur coreutils-6.4.orig/AUTHORS coreutils-6.4/AUTHORS
    old new  
    3535hostname: Jim Meyering
    3636id: Arnold Robbins, David MacKenzie
    3737join: Mike Haertel
    38 kill: Paul Eggert
    3938link: Michael Stone
    4039ln: Mike Parker, David MacKenzie
    4140logname: FIXME: unknown
    … …  
    8988unexpand: David MacKenzie
    9089uniq: Richard Stallman, David MacKenzie
    9190unlink: Michael Stone
    92 uptime: Joseph Arceneaux, David MacKenzie, Kaveh Ghazi
    9391users: Joseph Arceneaux, David MacKenzie
    9492vdir: Richard Stallman, David MacKenzie
    9593wc: Paul Rubin, David MacKenzie

  • coreutils-6.4 

    diff -Naur coreutils-6.4.orig/configure coreutils-6.4/configure
    old new  
    4951749517{ echo "$as_me:$LINENO: result: $gnulib_cv_have_boot_time" >&5
    4951849518echo "${ECHO_T}$gnulib_cv_have_boot_time" >&6; }
    4951949519  if test $gnulib_cv_have_boot_time = yes; then
    49520   OPTIONAL_BIN_PROGS="$OPTIONAL_BIN_PROGS uptime\$(EXEEXT)"
    49521   MAN="$MAN uptime.1"
     49520echo "uptime is suppressed"
    4952249521fi
    4952349522
    4952449523

  • coreutils-6.4 

    diff -Naur coreutils-6.4.orig/Makefile.in coreutils-6.4/Makefile.in
    old new  
    175175        $(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/unicodeio.m4 \
    176176        $(top_srcdir)/m4/unistd-safer.m4 $(top_srcdir)/m4/unistd_h.m4 \
    177177        $(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
    178         $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
     178        $(top_srcdir)/m4/unlocked-io.m4 \
    179179        $(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
    180180        $(top_srcdir)/m4/utime.m4 $(top_srcdir)/m4/utimecmp.m4 \
    181181        $(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimes-null.m4 \

  • man/Makefile.in 

    diff -Naur coreutils-6.4.orig/man/Makefile.in coreutils-6.4/man/Makefile.in
    old new  
    170170        $(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/unicodeio.m4 \
    171171        $(top_srcdir)/m4/unistd-safer.m4 $(top_srcdir)/m4/unistd_h.m4 \
    172172        $(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
    173         $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
     173        $(top_srcdir)/m4/unlocked-io.m4 \
    174174        $(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
    175175        $(top_srcdir)/m4/utime.m4 $(top_srcdir)/m4/utimecmp.m4 \
    176176        $(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimes-null.m4 \
    … …  
    380380  base64.1 basename.1 cat.1 chgrp.1 chmod.1 chown.1 chroot.1 cksum.1 comm.1 \
    381381  cp.1 csplit.1 cut.1 date.1 dd.1 df.1 dir.1 dircolors.1 dirname.1 du.1 \
    382382  echo.1 env.1 expand.1 expr.1 factor.1 false.1 fmt.1 fold.1 groups.1 \
    383   head.1 hostid.1 hostname.1 id.1 install.1 join.1 kill.1 \
     383  head.1 hostid.1 hostname.1 id.1 install.1 join.1 \
    384384  link.1 ln.1 logname.1 \
    385385  ls.1 md5sum.1 mkdir.1 mkfifo.1 mknod.1 mv.1 nice.1 nl.1 nohup.1 od.1 \
    386386  paste.1 pathchk.1 pinky.1 pr.1 printenv.1 printf.1 ptx.1 pwd.1 readlink.1 \
    387387  rm.1 rmdir.1 seq.1 sha1sum.1 sha224sum.1 sha256sum.1 sha384sum.1 sha512sum.1 \
    388388  shred.1 shuf.1 sleep.1 sort.1 split.1 stat.1 stty.1 \
    389   su.1 sum.1 sync.1 tac.1 tail.1 tee.1 test.1 touch.1 tr.1 true.1 tsort.1 \
    390   tty.1 uname.1 unexpand.1 uniq.1 unlink.1 uptime.1 users.1 vdir.1 wc.1 \
     389  sum.1 sync.1 tac.1 tail.1 tee.1 test.1 touch.1 tr.1 true.1 tsort.1 \
     390  tty.1 uname.1 unexpand.1 uniq.1 unlink.1 users.1 vdir.1 wc.1 \
    391391  who.1 whoami.1 yes.1
    392392
    393393man_aux = $(dist_man_MANS:.1=.x)
    … …  
    663663id.1:           $(common_dep)   $(srcdir)/id.x          ../src/id.c
    664664install.1:      $(common_dep)   $(srcdir)/install.x     ../src/install.c
    665665join.1:         $(common_dep)   $(srcdir)/join.x        ../src/join.c
    666 kill.1:         $(common_dep)   $(srcdir)/kill.x        ../src/kill.c
    667666link.1:         $(common_dep)   $(srcdir)/link.x        ../src/link.c
    668667ln.1:           $(common_dep)   $(srcdir)/ln.x          ../src/ln.c
    669668logname.1:      $(common_dep)   $(srcdir)/logname.x     ../src/logname.c
    … …  
    701700split.1:        $(common_dep)   $(srcdir)/split.x       ../src/split.c
    702701stat.1:         $(common_dep)   $(srcdir)/stat.x        ../src/stat.c
    703702stty.1:         $(common_dep)   $(srcdir)/stty.x        ../src/stty.c
    704 su.1:           $(common_dep)   $(srcdir)/su.x          ../src/su.c
    705703sum.1:          $(common_dep)   $(srcdir)/sum.x         ../src/sum.c
    706704sync.1:         $(common_dep)   $(srcdir)/sync.x        ../src/sync.c
    707705tac.1:          $(common_dep)   $(srcdir)/tac.x         ../src/tac.c
    … …  
    717715unexpand.1:     $(common_dep)   $(srcdir)/unexpand.x    ../src/unexpand.c
    718716uniq.1:         $(common_dep)   $(srcdir)/uniq.x        ../src/uniq.c
    719717unlink.1:       $(common_dep)   $(srcdir)/unlink.x      ../src/unlink.c
    720 uptime.1:       $(common_dep)   $(srcdir)/uptime.x      ../src/uptime.c
    721718users.1:        $(common_dep)   $(srcdir)/users.x       ../src/users.c
    722719vdir.1:         $(common_dep)   $(srcdir)/vdir.x        ../src/ls.c
    723720wc.1:           $(common_dep)   $(srcdir)/wc.x          ../src/wc.c
    … …  
    749746check-x-vs-1:
    750747        PATH=../src$(PATH_SEPARATOR)$$PATH; export PATH;                \
    751748        t=ls-files.$$$$;                                                \
    752         (cd $(srcdir) && ls -1 *.x) | sed 's/\.x$$//' | $(ASSORT) > $$t;\
     749        (cd $(srcdir) && ls -1 *.x) | grep -v -e 'kill.x' -e 'su.x' -e 'uptime.x' | sed 's/\.x$$//' | $(ASSORT) > $$t;\
    753750        echo $(dist_man_MANS) | tr -s ' ' '\n' | sed 's/\.1$$//'        \
    754751          | $(ASSORT) | diff - $$t || { rm $$t; exit 1; };              \
    755752        rm $$t

  • coreutils-6.4 

    diff -Naur coreutils-6.4.orig/README coreutils-6.4/README
    old new  
    99
    1010  [ base64 basename cat chgrp chmod chown chroot cksum comm cp csplit cut date
    1111  dd df dir dircolors dirname du echo env expand expr factor false fmt fold
    12   ginstall groups head hostid hostname id join kill link ln logname ls
     12  ginstall groups head hostid hostname id join link ln logname ls
    1313  md5sum mkdir mkfifo mknod mv nice nl nohup od paste pathchk pinky pr
    1414  printenv printf ptx pwd readlink rm rmdir seq sha1sum sha224sum sha256sum
    1515  sha384sum sha512sum shred shuf sleep sort split stat stty su sum sync tac
    16   tail tee test touch tr true tsort tty uname unexpand uniq unlink uptime
     16  tail tee test touch tr true tsort tty uname unexpand uniq unlink
    1717  users vdir wc who whoami yes
    1818
    1919See the file NEWS for a list of major changes in the current release.

  • src/Makefile.in 

    diff -Naur coreutils-6.4.orig/src/Makefile.in coreutils-6.4/src/Makefile.in
    old new  
    3535host_triplet = @host@
    3636EXTRA_PROGRAMS = chroot$(EXEEXT) df$(EXEEXT) hostid$(EXEEXT) \
    3737        nice$(EXEEXT) pinky$(EXEEXT) stty$(EXEEXT) su$(EXEEXT) \
    38         uname$(EXEEXT) uptime$(EXEEXT) users$(EXEEXT) who$(EXEEXT)
     38        uname$(EXEEXT) users$(EXEEXT) who$(EXEEXT)
    3939bin_PROGRAMS = [$(EXEEXT) chgrp$(EXEEXT) chown$(EXEEXT) chmod$(EXEEXT) \
    4040        cp$(EXEEXT) dd$(EXEEXT) dircolors$(EXEEXT) du$(EXEEXT) \
    4141        ginstall$(EXEEXT) link$(EXEEXT) ln$(EXEEXT) dir$(EXEEXT) \
    … …  
    5353        tsort$(EXEEXT) unexpand$(EXEEXT) uniq$(EXEEXT) wc$(EXEEXT) \
    5454        basename$(EXEEXT) date$(EXEEXT) dirname$(EXEEXT) echo$(EXEEXT) \
    5555        env$(EXEEXT) expr$(EXEEXT) factor$(EXEEXT) false$(EXEEXT) \
    56         hostname$(EXEEXT) id$(EXEEXT) kill$(EXEEXT) logname$(EXEEXT) \
     56        hostname$(EXEEXT) id$(EXEEXT) logname$(EXEEXT) \
    5757        pathchk$(EXEEXT) printenv$(EXEEXT) printf$(EXEEXT) \
    5858        pwd$(EXEEXT) seq$(EXEEXT) sleep$(EXEEXT) tee$(EXEEXT) \
    5959        test$(EXEEXT) true$(EXEEXT) tty$(EXEEXT) whoami$(EXEEXT) \
    … …  
    178178        $(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/unicodeio.m4 \
    179179        $(top_srcdir)/m4/unistd-safer.m4 $(top_srcdir)/m4/unistd_h.m4 \
    180180        $(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
    181         $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
     181        $(top_srcdir)/m4/unlocked-io.m4 \
    182182        $(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
    183183        $(top_srcdir)/m4/utime.m4 $(top_srcdir)/m4/utimecmp.m4 \
    184184        $(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimes-null.m4 \
    … …  
    364364join_LDADD = $(LDADD)
    365365join_DEPENDENCIES = ../lib/libcoreutils.a $(am__DEPENDENCIES_1) \
    366366        ../lib/libcoreutils.a
    367 kill_SOURCES = kill.c
    368 kill_OBJECTS = kill.$(OBJEXT)
    369 kill_LDADD = $(LDADD)
    370 kill_DEPENDENCIES = ../lib/libcoreutils.a $(am__DEPENDENCIES_1) \
    371         ../lib/libcoreutils.a
    372367link_SOURCES = link.c
    373368link_OBJECTS = link.$(OBJEXT)
    374369link_LDADD = $(LDADD)
    … …  
    617612unlink_LDADD = $(LDADD)
    618613unlink_DEPENDENCIES = ../lib/libcoreutils.a $(am__DEPENDENCIES_1) \
    619614        ../lib/libcoreutils.a
    620 uptime_SOURCES = uptime.c
    621 uptime_OBJECTS = uptime.$(OBJEXT)
    622 uptime_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
    623         $(am__DEPENDENCIES_1)
    624615users_SOURCES = users.c
    625616users_OBJECTS = users.$(OBJEXT)
    626617users_LDADD = $(LDADD)
    … …  
    664655        csplit.c cut.c date.c dd.c df.c $(dir_SOURCES) dircolors.c \
    665656        dirname.c du.c echo.c env.c expand.c expr.c factor.c false.c \
    666657        fmt.c fold.c $(ginstall_SOURCES) head.c hostid.c hostname.c \
    667         id.c join.c kill.c link.c ln.c logname.c $(ls_SOURCES) \
     658        id.c join.c link.c ln.c logname.c $(ls_SOURCES) \
    668659        $(md5sum_SOURCES) mkdir.c mkfifo.c mknod.c $(mv_SOURCES) \
    669660        nice.c nl.c nohup.c od.c paste.c pathchk.c pinky.c pr.c \
    670661        printenv.c printf.c ptx.c pwd.c readlink.c $(rm_SOURCES) \
    … …  
    673664        $(sha512sum_SOURCES) shred.c shuf.c sleep.c sort.c split.c \
    674665        stat.c stty.c su.c sum.c sync.c tac.c tail.c tee.c test.c \
    675666        touch.c tr.c true.c tsort.c tty.c uname.c unexpand.c uniq.c \
    676         unlink.c uptime.c users.c $(vdir_SOURCES) wc.c who.c whoami.c \
     667        unlink.c users.c $(vdir_SOURCES) wc.c who.c whoami.c \
    677668        yes.c
    678669DIST_SOURCES = $(__SOURCES) base64.c basename.c cat.c $(chgrp_SOURCES) \
    679670        chmod.c $(chown_SOURCES) chroot.c cksum.c comm.c $(cp_SOURCES) \
    680671        csplit.c cut.c date.c dd.c df.c $(dir_SOURCES) dircolors.c \
    681672        dirname.c du.c echo.c env.c expand.c expr.c factor.c false.c \
    682673        fmt.c fold.c $(ginstall_SOURCES) head.c hostid.c hostname.c \
    683         id.c join.c kill.c link.c ln.c logname.c $(ls_SOURCES) \
     674        id.c join.c link.c ln.c logname.c $(ls_SOURCES) \
    684675        $(md5sum_SOURCES) mkdir.c mkfifo.c mknod.c $(mv_SOURCES) \
    685676        nice.c nl.c nohup.c od.c paste.c pathchk.c pinky.c pr.c \
    686677        printenv.c printf.c ptx.c pwd.c readlink.c $(rm_SOURCES) \
    … …  
    689680        $(sha512sum_SOURCES) shred.c shuf.c sleep.c sort.c split.c \
    690681        stat.c stty.c su.c sum.c sync.c tac.c tail.c tee.c test.c \
    691682        touch.c tr.c true.c tsort.c tty.c uname.c unexpand.c uniq.c \
    692         unlink.c uptime.c users.c $(vdir_SOURCES) wc.c who.c whoami.c \
     683        unlink.c users.c $(vdir_SOURCES) wc.c who.c whoami.c \
    693684        yes.c
    694685HEADERS = $(noinst_HEADERS)
    695686ETAGS = etags
    … …  
    947938tail_LDADD = $(nanosec_libs)
    948939
    949940# If necessary, add -lm to resolve use of pow in lib/strtod.c.
    950 uptime_LDADD = $(LDADD) $(POW_LIB) $(GETLOADAVG_LIBS)
    951941su_LDADD = $(LDADD) $(LIB_CRYPT)
    952942SUFFIXES = .sh
    953943installed_su = $(DESTDIR)$(bindir)/`echo su|sed '$(transform)'`
    … …  
    11941184join$(EXEEXT): $(join_OBJECTS) $(join_DEPENDENCIES)
    11951185        @rm -f join$(EXEEXT)
    11961186        $(LINK) $(join_OBJECTS) $(join_LDADD) $(LIBS)
    1197 kill$(EXEEXT): $(kill_OBJECTS) $(kill_DEPENDENCIES)
    1198         @rm -f kill$(EXEEXT)
    1199         $(LINK) $(kill_OBJECTS) $(kill_LDADD) $(LIBS)
    12001187link$(EXEEXT): $(link_OBJECTS) $(link_DEPENDENCIES)
    12011188        @rm -f link$(EXEEXT)
    12021189        $(LINK) $(link_OBJECTS) $(link_LDADD) $(LIBS)
    … …  
    13591346unlink$(EXEEXT): $(unlink_OBJECTS) $(unlink_DEPENDENCIES)
    13601347        @rm -f unlink$(EXEEXT)
    13611348        $(LINK) $(unlink_OBJECTS) $(unlink_LDADD) $(LIBS)
    1362 uptime$(EXEEXT): $(uptime_OBJECTS) $(uptime_DEPENDENCIES)
    1363         @rm -f uptime$(EXEEXT)
    1364         $(LINK) $(uptime_OBJECTS) $(uptime_LDADD) $(LIBS)
    13651349users$(EXEEXT): $(users_OBJECTS) $(users_DEPENDENCIES)
    13661350        @rm -f users$(EXEEXT)
    13671351        $(LINK) $(users_OBJECTS) $(users_LDADD) $(LIBS)
    … …  
    14561440@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/id.Po@am__quote@
    14571441@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/install.Po@am__quote@
    14581442@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/join.Po@am__quote@
    1459 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kill.Po@am__quote@
    14601443@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lbracket.Po@am__quote@
    14611444@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/link.Po@am__quote@
    14621445@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ln.Po@am__quote@
    … …  
    15161499@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unexpand.Po@am__quote@
    15171500@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uniq.Po@am__quote@
    15181501@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unlink.Po@am__quote@
    1519 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uptime.Po@am__quote@
    15201502@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/users.Po@am__quote@
    15211503@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wc.Po@am__quote@
    15221504@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/who.Po@am__quote@
    … …  
    18371819          && can_create_suid_root_executable=yes; \
    18381820        rm -f $$TMPFILE; \
    18391821        if test $$can_create_suid_root_executable = yes; then \
    1840           $(INSTALL_SU); \
     1822          echo "Installation of su is suppressed"; \
    18411823        else \
    18421824          echo "WARNING: insufficient access; not installing su"; \
    18431825          echo "NOTE: to install su, run 'make install-root' as root"; \

  • src/Makefile.in.rej 

    diff -Naur coreutils-6.4.orig/src/Makefile.in.rej coreutils-6.4/src/Makefile.in.rej
    old new  
     1***************
     2*** 1196,1204 ****
     3  join$(EXEEXT): $(join_OBJECTS) $(join_DEPENDENCIES)
     4        @rm -f join$(EXEEXT)
     5        $(LINK) $(join_LDFLAGS) $(join_OBJECTS) $(join_LDADD) $(LIBS)
     6- kill$(EXEEXT): $(kill_OBJECTS) $(kill_DEPENDENCIES)
     7-       @rm -f kill$(EXEEXT)
     8-       $(LINK) $(kill_LDFLAGS) $(kill_OBJECTS) $(kill_LDADD) $(LIBS)
     9  link$(EXEEXT): $(link_OBJECTS) $(link_DEPENDENCIES)
     10        @rm -f link$(EXEEXT)
     11        $(LINK) $(link_LDFLAGS) $(link_OBJECTS) $(link_LDADD) $(LIBS)
     12--- 1186,1191 ----
     13  join$(EXEEXT): $(join_OBJECTS) $(join_DEPENDENCIES)
     14        @rm -f join$(EXEEXT)
     15        $(LINK) $(join_LDFLAGS) $(join_OBJECTS) $(join_LDADD) $(LIBS)
     16  link$(EXEEXT): $(link_OBJECTS) $(link_DEPENDENCIES)
     17        @rm -f link$(EXEEXT)
     18        $(LINK) $(link_LDFLAGS) $(link_OBJECTS) $(link_LDADD) $(LIBS)
     19***************
     20*** 1361,1369 ****
     21  unlink$(EXEEXT): $(unlink_OBJECTS) $(unlink_DEPENDENCIES)
     22        @rm -f unlink$(EXEEXT)
     23        $(LINK) $(unlink_LDFLAGS) $(unlink_OBJECTS) $(unlink_LDADD) $(LIBS)
     24- uptime$(EXEEXT): $(uptime_OBJECTS) $(uptime_DEPENDENCIES)
     25-       @rm -f uptime$(EXEEXT)
     26-       $(LINK) $(uptime_LDFLAGS) $(uptime_OBJECTS) $(uptime_LDADD) $(LIBS)
     27  users$(EXEEXT): $(users_OBJECTS) $(users_DEPENDENCIES)
     28        @rm -f users$(EXEEXT)
     29        $(LINK) $(users_LDFLAGS) $(users_OBJECTS) $(users_LDADD) $(LIBS)
     30--- 1348,1353 ----
     31  unlink$(EXEEXT): $(unlink_OBJECTS) $(unlink_DEPENDENCIES)
     32        @rm -f unlink$(EXEEXT)
     33        $(LINK) $(unlink_LDFLAGS) $(unlink_OBJECTS) $(unlink_LDADD) $(LIBS)
     34  users$(EXEEXT): $(users_OBJECTS) $(users_DEPENDENCIES)
     35        @rm -f users$(EXEEXT)
     36        $(LINK) $(users_LDFLAGS) $(users_OBJECTS) $(users_LDADD) $(LIBS)
Note: See TracBrowser for help on using the repository browser.