source: patches/coreutils-6.3-suppress_uptime_kill_su-1.patch @ 862e2c0

clfs-1.2clfs-2.1clfs-3.0.0-systemdclfs-3.0.0-sysvinitsystemdsysvinit
Last change on this file since 862e2c0 was 862e2c0, checked in by Jim Gifford <clfs@…>, 18 years ago

Updated CLFS patches
  • Property mode set to 100644
File size: 13.3 KB

  • coreutils-6.3 

    Submitted By: Matthew Burgess <matthew at linuxfromscratch dot org>
Date: 2006-03-15
Initial Package Version: 5.94
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:
           http://www.linuxfromscratch.org/patches/downloads/coreutils/
           coreutils-5.0-dupes-2.patch

diff -Naur coreutils-6.3.orig/AUTHORS coreutils-6.3/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.3 

    diff -Naur coreutils-6.3.orig/configure coreutils-6.3/configure
    old new  
    5817558175{ echo "$as_me:$LINENO: result: $gnulib_cv_have_boot_time" >&5
    5817658176echo "${ECHO_T}$gnulib_cv_have_boot_time" >&6; }
    5817758177  if test $gnulib_cv_have_boot_time = yes; then
    58178   OPTIONAL_BIN_PROGS="$OPTIONAL_BIN_PROGS uptime\$(EXEEXT)"
    58179   MAN="$MAN uptime.1"
     58178echo "uptime is suppressed"
    5818058179fi
    5818158180
    5818258181

  • coreutils-6.3 

    diff -Naur coreutils-6.3.orig/Makefile.in coreutils-6.3/Makefile.in
    old new  
    179179        $(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/unicodeio.m4 \
    180180        $(top_srcdir)/m4/unistd-safer.m4 $(top_srcdir)/m4/unistd_h.m4 \
    181181        $(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
    182         $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
     182        $(top_srcdir)/m4/unlocked-io.m4 \
    183183        $(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
    184184        $(top_srcdir)/m4/utime.m4 $(top_srcdir)/m4/utimecmp.m4 \
    185185        $(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimes-null.m4 \

  • man/Makefile.in 

    diff -Naur coreutils-6.3.orig/man/Makefile.in coreutils-6.3/man/Makefile.in
    old new  
    174174        $(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/unicodeio.m4 \
    175175        $(top_srcdir)/m4/unistd-safer.m4 $(top_srcdir)/m4/unistd_h.m4 \
    176176        $(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
    177         $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
     177        $(top_srcdir)/m4/unlocked-io.m4 \
    178178        $(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
    179179        $(top_srcdir)/m4/utime.m4 $(top_srcdir)/m4/utimecmp.m4 \
    180180        $(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimes-null.m4 \
    … …  
    377377  base64.1 basename.1 cat.1 chgrp.1 chmod.1 chown.1 chroot.1 cksum.1 comm.1 \
    378378  cp.1 csplit.1 cut.1 date.1 dd.1 df.1 dir.1 dircolors.1 dirname.1 du.1 \
    379379  echo.1 env.1 expand.1 expr.1 factor.1 false.1 fmt.1 fold.1 groups.1 \
    380   head.1 hostid.1 hostname.1 id.1 install.1 join.1 kill.1 \
     380  head.1 hostid.1 hostname.1 id.1 install.1 join.1 \
    381381  link.1 ln.1 logname.1 \
    382382  ls.1 md5sum.1 mkdir.1 mkfifo.1 mknod.1 mv.1 nice.1 nl.1 nohup.1 od.1 \
    383383  paste.1 pathchk.1 pinky.1 pr.1 printenv.1 printf.1 ptx.1 pwd.1 readlink.1 \
    384384  rm.1 rmdir.1 seq.1 sha1sum.1 sha224sum.1 sha256sum.1 sha384sum.1 sha512sum.1 \
    385385  shred.1 shuf.1 sleep.1 sort.1 split.1 stat.1 stty.1 \
    386   su.1 sum.1 sync.1 tac.1 tail.1 tee.1 test.1 touch.1 tr.1 true.1 tsort.1 \
    387   tty.1 uname.1 unexpand.1 uniq.1 unlink.1 uptime.1 users.1 vdir.1 wc.1 \
     386  sum.1 sync.1 tac.1 tail.1 tee.1 test.1 touch.1 tr.1 true.1 tsort.1 \
     387  tty.1 uname.1 unexpand.1 uniq.1 unlink.1 users.1 vdir.1 wc.1 \
    388388  who.1 whoami.1 yes.1
    389389
    390390man_aux = $(dist_man_MANS:.1=.x)
    … …  
    651651id.1:           $(common_dep)   $(srcdir)/id.x          ../src/id.c
    652652install.1:      $(common_dep)   $(srcdir)/install.x     ../src/install.c
    653653join.1:         $(common_dep)   $(srcdir)/join.x        ../src/join.c
    654 kill.1:         $(common_dep)   $(srcdir)/kill.x        ../src/kill.c
    655654link.1:         $(common_dep)   $(srcdir)/link.x        ../src/link.c
    656655ln.1:           $(common_dep)   $(srcdir)/ln.x          ../src/ln.c
    657656logname.1:      $(common_dep)   $(srcdir)/logname.x     ../src/logname.c
    … …  
    689688split.1:        $(common_dep)   $(srcdir)/split.x       ../src/split.c
    690689stat.1:         $(common_dep)   $(srcdir)/stat.x        ../src/stat.c
    691690stty.1:         $(common_dep)   $(srcdir)/stty.x        ../src/stty.c
    692 su.1:           $(common_dep)   $(srcdir)/su.x          ../src/su.c
    693691sum.1:          $(common_dep)   $(srcdir)/sum.x         ../src/sum.c
    694692sync.1:         $(common_dep)   $(srcdir)/sync.x        ../src/sync.c
    695693tac.1:          $(common_dep)   $(srcdir)/tac.x         ../src/tac.c
    … …  
    705703unexpand.1:     $(common_dep)   $(srcdir)/unexpand.x    ../src/unexpand.c
    706704uniq.1:         $(common_dep)   $(srcdir)/uniq.x        ../src/uniq.c
    707705unlink.1:       $(common_dep)   $(srcdir)/unlink.x      ../src/unlink.c
    708 uptime.1:       $(common_dep)   $(srcdir)/uptime.x      ../src/uptime.c
    709706users.1:        $(common_dep)   $(srcdir)/users.x       ../src/users.c
    710707vdir.1:         $(common_dep)   $(srcdir)/vdir.x        ../src/ls.c
    711708wc.1:           $(common_dep)   $(srcdir)/wc.x          ../src/wc.c
    … …  
    737734check-x-vs-1:
    738735        PATH=../src$(PATH_SEPARATOR)$$PATH; export PATH;                \
    739736        t=ls-files.$$$$;                                                \
    740         (cd $(srcdir) && ls -1 *.x) | sed 's/\.x$$//' | $(ASSORT) > $$t;\
     737        (cd $(srcdir) && ls -1 *.x) | grep -v -e 'kill.x' -e 'su.x' -e 'uptime.x' | sed 's/\.x$$//' | $(ASSORT) > $$t;\
    741738        echo $(dist_man_MANS) | tr -s ' ' '\n' | sed 's/\.1$$//'        \
    742739          | $(ASSORT) | diff - $$t || { rm $$t; exit 1; };              \
    743740        rm $$t

  • coreutils-6.3 

    diff -Naur coreutils-6.3.orig/README coreutils-6.3/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.3.orig/src/Makefile.in coreutils-6.3/src/Makefile.in
    old new  
    3939host_triplet = @host@
    4040EXTRA_PROGRAMS = chroot$(EXEEXT) df$(EXEEXT) hostid$(EXEEXT) \
    4141        nice$(EXEEXT) pinky$(EXEEXT) stty$(EXEEXT) su$(EXEEXT) \
    42         uname$(EXEEXT) uptime$(EXEEXT) users$(EXEEXT) who$(EXEEXT)
     42        uname$(EXEEXT) users$(EXEEXT) who$(EXEEXT)
    4343bin_PROGRAMS = [$(EXEEXT) chgrp$(EXEEXT) chown$(EXEEXT) chmod$(EXEEXT) \
    4444        cp$(EXEEXT) dd$(EXEEXT) dircolors$(EXEEXT) du$(EXEEXT) \
    4545        ginstall$(EXEEXT) link$(EXEEXT) ln$(EXEEXT) dir$(EXEEXT) \
    … …  
    5757        tsort$(EXEEXT) unexpand$(EXEEXT) uniq$(EXEEXT) wc$(EXEEXT) \
    5858        basename$(EXEEXT) date$(EXEEXT) dirname$(EXEEXT) echo$(EXEEXT) \
    5959        env$(EXEEXT) expr$(EXEEXT) factor$(EXEEXT) false$(EXEEXT) \
    60         hostname$(EXEEXT) id$(EXEEXT) kill$(EXEEXT) logname$(EXEEXT) \
     60        hostname$(EXEEXT) id$(EXEEXT) logname$(EXEEXT) \
    6161        pathchk$(EXEEXT) printenv$(EXEEXT) printf$(EXEEXT) \
    6262        pwd$(EXEEXT) seq$(EXEEXT) sleep$(EXEEXT) tee$(EXEEXT) \
    6363        test$(EXEEXT) true$(EXEEXT) tty$(EXEEXT) whoami$(EXEEXT) \
    … …  
    182182        $(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/unicodeio.m4 \
    183183        $(top_srcdir)/m4/unistd-safer.m4 $(top_srcdir)/m4/unistd_h.m4 \
    184184        $(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
    185         $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
     185        $(top_srcdir)/m4/unlocked-io.m4 \
    186186        $(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
    187187        $(top_srcdir)/m4/utime.m4 $(top_srcdir)/m4/utimecmp.m4 \
    188188        $(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimes-null.m4 \
    … …  
    370370join_LDADD = $(LDADD)
    371371join_DEPENDENCIES = ../lib/libcoreutils.a $(am__DEPENDENCIES_1) \
    372372        ../lib/libcoreutils.a
    373 kill_SOURCES = kill.c
    374 kill_OBJECTS = kill.$(OBJEXT)
    375 kill_LDADD = $(LDADD)
    376 kill_DEPENDENCIES = ../lib/libcoreutils.a $(am__DEPENDENCIES_1) \
    377         ../lib/libcoreutils.a
    378373link_SOURCES = link.c
    379374link_OBJECTS = link.$(OBJEXT)
    380375link_LDADD = $(LDADD)
    … …  
    623618unlink_LDADD = $(LDADD)
    624619unlink_DEPENDENCIES = ../lib/libcoreutils.a $(am__DEPENDENCIES_1) \
    625620        ../lib/libcoreutils.a
    626 uptime_SOURCES = uptime.c
    627 uptime_OBJECTS = uptime.$(OBJEXT)
    628 uptime_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
    629         $(am__DEPENDENCIES_1)
    630621users_SOURCES = users.c
    631622users_OBJECTS = users.$(OBJEXT)
    632623users_LDADD = $(LDADD)
    … …  
    670661        csplit.c cut.c date.c dd.c df.c $(dir_SOURCES) dircolors.c \
    671662        dirname.c du.c echo.c env.c expand.c expr.c factor.c false.c \
    672663        fmt.c fold.c $(ginstall_SOURCES) head.c hostid.c hostname.c \
    673         id.c join.c kill.c link.c ln.c logname.c $(ls_SOURCES) \
     664        id.c join.c link.c ln.c logname.c $(ls_SOURCES) \
    674665        $(md5sum_SOURCES) mkdir.c mkfifo.c mknod.c $(mv_SOURCES) \
    675666        nice.c nl.c nohup.c od.c paste.c pathchk.c pinky.c pr.c \
    676667        printenv.c printf.c ptx.c pwd.c readlink.c $(rm_SOURCES) \
    … …  
    679670        $(sha512sum_SOURCES) shred.c shuf.c sleep.c sort.c split.c \
    680671        stat.c stty.c su.c sum.c sync.c tac.c tail.c tee.c test.c \
    681672        touch.c tr.c true.c tsort.c tty.c uname.c unexpand.c uniq.c \
    682         unlink.c uptime.c users.c $(vdir_SOURCES) wc.c who.c whoami.c \
     673        unlink.c users.c $(vdir_SOURCES) wc.c who.c whoami.c \
    683674        yes.c
    684675DIST_SOURCES = $(__SOURCES) base64.c basename.c cat.c $(chgrp_SOURCES) \
    685676        chmod.c $(chown_SOURCES) chroot.c cksum.c comm.c $(cp_SOURCES) \
    686677        csplit.c cut.c date.c dd.c df.c $(dir_SOURCES) dircolors.c \
    687678        dirname.c du.c echo.c env.c expand.c expr.c factor.c false.c \
    688679        fmt.c fold.c $(ginstall_SOURCES) head.c hostid.c hostname.c \
    689         id.c join.c kill.c link.c ln.c logname.c $(ls_SOURCES) \
     680        id.c join.c link.c ln.c logname.c $(ls_SOURCES) \
    690681        $(md5sum_SOURCES) mkdir.c mkfifo.c mknod.c $(mv_SOURCES) \
    691682        nice.c nl.c nohup.c od.c paste.c pathchk.c pinky.c pr.c \
    692683        printenv.c printf.c ptx.c pwd.c readlink.c $(rm_SOURCES) \
    … …  
    695686        $(sha512sum_SOURCES) shred.c shuf.c sleep.c sort.c split.c \
    696687        stat.c stty.c su.c sum.c sync.c tac.c tail.c tee.c test.c \
    697688        touch.c tr.c true.c tsort.c tty.c uname.c unexpand.c uniq.c \
    698         unlink.c uptime.c users.c $(vdir_SOURCES) wc.c who.c whoami.c \
     689        unlink.c users.c $(vdir_SOURCES) wc.c who.c whoami.c \
    699690        yes.c
    700691HEADERS = $(noinst_HEADERS)
    701692ETAGS = etags
    … …  
    946937tail_LDADD = $(nanosec_libs)
    947938
    948939# If necessary, add -lm to resolve use of pow in lib/strtod.c.
    949 uptime_LDADD = $(LDADD) $(POW_LIB) $(GETLOADAVG_LIBS)
    950940su_LDADD = $(LDADD) $(LIB_CRYPT)
    951941SUFFIXES = .sh
    952942installed_su = $(DESTDIR)$(bindir)/`echo su|sed '$(transform)'`
    … …  
    11931183join$(EXEEXT): $(join_OBJECTS) $(join_DEPENDENCIES)
    11941184        @rm -f join$(EXEEXT)
    11951185        $(LINK) $(join_LDFLAGS) $(join_OBJECTS) $(join_LDADD) $(LIBS)
    1196 kill$(EXEEXT): $(kill_OBJECTS) $(kill_DEPENDENCIES)
    1197         @rm -f kill$(EXEEXT)
    1198         $(LINK) $(kill_LDFLAGS) $(kill_OBJECTS) $(kill_LDADD) $(LIBS)
    11991186link$(EXEEXT): $(link_OBJECTS) $(link_DEPENDENCIES)
    12001187        @rm -f link$(EXEEXT)
    12011188        $(LINK) $(link_LDFLAGS) $(link_OBJECTS) $(link_LDADD) $(LIBS)
    … …  
    13581345unlink$(EXEEXT): $(unlink_OBJECTS) $(unlink_DEPENDENCIES)
    13591346        @rm -f unlink$(EXEEXT)
    13601347        $(LINK) $(unlink_LDFLAGS) $(unlink_OBJECTS) $(unlink_LDADD) $(LIBS)
    1361 uptime$(EXEEXT): $(uptime_OBJECTS) $(uptime_DEPENDENCIES)
    1362         @rm -f uptime$(EXEEXT)
    1363         $(LINK) $(uptime_LDFLAGS) $(uptime_OBJECTS) $(uptime_LDADD) $(LIBS)
    13641348users$(EXEEXT): $(users_OBJECTS) $(users_DEPENDENCIES)
    13651349        @rm -f users$(EXEEXT)
    13661350        $(LINK) $(users_LDFLAGS) $(users_OBJECTS) $(users_LDADD) $(LIBS)
    … …  
    14551439@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/id.Po@am__quote@
    14561440@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/install.Po@am__quote@
    14571441@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/join.Po@am__quote@
    1458 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kill.Po@am__quote@
    14591442@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lbracket.Po@am__quote@
    14601443@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/link.Po@am__quote@
    14611444@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ln.Po@am__quote@
    … …  
    15151498@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unexpand.Po@am__quote@
    15161499@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uniq.Po@am__quote@
    15171500@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unlink.Po@am__quote@
    1518 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uptime.Po@am__quote@
    15191501@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/users.Po@am__quote@
    15201502@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wc.Po@am__quote@
    15211503@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/who.Po@am__quote@
    … …  
    18261808          && can_create_suid_root_executable=yes; \
    18271809        rm -f $$TMPFILE; \
    18281810        if test $$can_create_suid_root_executable = yes; then \
    1829           $(INSTALL_SU); \
     1811          echo "Installation of su is suppressed"; \
    18301812        else \
    18311813          echo "WARNING: insufficient access; not installing su"; \
    18321814          echo "NOTE: to install su, run 'make install-root' as root"; \
Note: See TracBrowser for help on using the repository browser.