Ticket #1690: coreutils-5.94-suppress_uptime_kill_su-2.patch

File coreutils-5.94-suppress_uptime_kill_su-2.patch, 13.2 KB (added by Matthew Burgess, 19 years ago)

Updated coreutils suppression patch

  • coreutils-5.94 

    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-5.94.orig/AUTHORS coreutils-5.94/AUTHORS
    old new  
    3434hostname: Jim Meyering
    3535id: Arnold Robbins, David MacKenzie
    3636join: Mike Haertel
    37 kill: Paul Eggert
    3837link: Michael Stone
    3938ln: Mike Parker, David MacKenzie
    4039logname: FIXME: unknown
    … …  
    8382unexpand: David MacKenzie
    8483uniq: Richard Stallman, David MacKenzie
    8584unlink: Michael Stone
    86 uptime: Joseph Arceneaux, David MacKenzie, Kaveh Ghazi
    8785users: Joseph Arceneaux, David MacKenzie
    8886vdir: Richard Stallman, David MacKenzie
    8987wc: Paul Rubin, David MacKenzie

  • coreutils-5.94 

    diff -Naur coreutils-5.94.orig/Makefile.in coreutils-5.94/Makefile.in
    old new  
    148148        $(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \
    149149        $(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
    150150        $(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
    151         $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
     151        $(top_srcdir)/m4/unlocked-io.m4 \
    152152        $(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
    153153        $(top_srcdir)/m4/utime.m4 $(top_srcdir)/m4/utimecmp.m4 \
    154154        $(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimes-null.m4 \

  • coreutils-5.94 

    diff -Naur coreutils-5.94.orig/README coreutils-5.94/README
    old new  
    99
    1010  [ basename cat chgrp chmod chown chroot cksum comm cp csplit cut date dd
    1111  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 shred sleep sort
    1515  split stat stty su sum sync tac tail tee test touch tr true tsort tty
    16   uname unexpand uniq unlink uptime users vdir wc who whoami yes
     16  uname unexpand uniq unlink users vdir wc who whoami yes
    1717
    1818See the file NEWS for a list of major changes in the current release.
    1919

  • coreutils-5.94 

    diff -Naur coreutils-5.94.orig/configure coreutils-5.94/configure
    old new  
    5041850418{ echo "$as_me:$LINENO: result: $gnulib_cv_have_boot_time" >&5
    5041950419echo "${ECHO_T}$gnulib_cv_have_boot_time" >&6; }
    5042050420  if test $gnulib_cv_have_boot_time = yes; then
    50421   OPTIONAL_BIN_PROGS="$OPTIONAL_BIN_PROGS uptime\$(EXEEXT)"
    50422   MAN="$MAN uptime.1"
     50421echo "uptime is suppressed"
    5042350422fi
    5042450423
    5042550424

  • man/Makefile.in 

    diff -Naur coreutils-5.94.orig/man/Makefile.in coreutils-5.94/man/Makefile.in
    old new  
    142142        $(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \
    143143        $(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
    144144        $(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
    145         $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
     145        $(top_srcdir)/m4/unlocked-io.m4 \
    146146        $(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
    147147        $(top_srcdir)/m4/utime.m4 $(top_srcdir)/m4/utimecmp.m4 \
    148148        $(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimes-null.m4 \
    … …  
    303303  basename.1 cat.1 chgrp.1 chmod.1 chown.1 chroot.1 cksum.1 comm.1 \
    304304  cp.1 csplit.1 cut.1 date.1 dd.1 df.1 dir.1 dircolors.1 dirname.1 du.1 \
    305305  echo.1 env.1 expand.1 expr.1 factor.1 false.1 fmt.1 fold.1 groups.1 \
    306   head.1 hostid.1 hostname.1 id.1 install.1 join.1 kill.1 \
     306  head.1 hostid.1 hostname.1 id.1 install.1 join.1 \
    307307  link.1 ln.1 logname.1 \
    308308  ls.1 md5sum.1 mkdir.1 mkfifo.1 mknod.1 mv.1 nice.1 nl.1 nohup.1 od.1 \
    309309  paste.1 pathchk.1 pinky.1 pr.1 printenv.1 printf.1 ptx.1 pwd.1 readlink.1 \
    310310  rm.1 rmdir.1 seq.1 sha1sum.1 shred.1 sleep.1 sort.1 split.1 stat.1 stty.1 \
    311   su.1 sum.1 sync.1 tac.1 tail.1 tee.1 test.1 touch.1 tr.1 true.1 tsort.1 \
    312   tty.1 uname.1 unexpand.1 uniq.1 unlink.1 uptime.1 users.1 vdir.1 wc.1 \
     311  sum.1 sync.1 tac.1 tail.1 tee.1 test.1 touch.1 tr.1 true.1 tsort.1 \
     312  tty.1 uname.1 unexpand.1 uniq.1 unlink.1 users.1 vdir.1 wc.1 \
    313313  who.1 whoami.1 yes.1
    314314
    315315man_aux = $(dist_man_MANS:.1=.x)
    … …  
    575575id.1:           $(common_dep)   $(srcdir)/id.x          ../src/id.c
    576576install.1:      $(common_dep)   $(srcdir)/install.x     ../src/install.c
    577577join.1:         $(common_dep)   $(srcdir)/join.x        ../src/join.c
    578 kill.1:         $(common_dep)   $(srcdir)/kill.x        ../src/kill.c
    579578link.1:         $(common_dep)   $(srcdir)/link.x        ../src/link.c
    580579ln.1:           $(common_dep)   $(srcdir)/ln.x          ../src/ln.c
    581580logname.1:      $(common_dep)   $(srcdir)/logname.x     ../src/logname.c
    … …  
    608607split.1:        $(common_dep)   $(srcdir)/split.x       ../src/split.c
    609608stat.1:         $(common_dep)   $(srcdir)/stat.x        ../src/stat.c
    610609stty.1:         $(common_dep)   $(srcdir)/stty.x        ../src/stty.c
    611 su.1:           $(common_dep)   $(srcdir)/su.x          ../src/su.c
    612610sum.1:          $(common_dep)   $(srcdir)/sum.x         ../src/sum.c
    613611sync.1:         $(common_dep)   $(srcdir)/sync.x        ../src/sync.c
    614612tac.1:          $(common_dep)   $(srcdir)/tac.x         ../src/tac.c
    … …  
    624622unexpand.1:     $(common_dep)   $(srcdir)/unexpand.x    ../src/unexpand.c
    625623uniq.1:         $(common_dep)   $(srcdir)/uniq.x        ../src/uniq.c
    626624unlink.1:       $(common_dep)   $(srcdir)/unlink.x      ../src/unlink.c
    627 uptime.1:       $(common_dep)   $(srcdir)/uptime.x      ../src/uptime.c
    628625users.1:        $(common_dep)   $(srcdir)/users.x       ../src/users.c
    629626vdir.1:         $(common_dep)   $(srcdir)/vdir.x        ../src/ls.c
    630627wc.1:           $(common_dep)   $(srcdir)/wc.x          ../src/wc.c
    … …  
    656653check-x-vs-1:
    657654        PATH=../src$(PATH_SEPARATOR)$$PATH; export PATH;                \
    658655        t=ls-files.$$$$;                                                \
    659         (cd $(srcdir) && ls -1 *.x) | sed 's/\.x$$//' | $(ASSORT) > $$t;\
     656        (cd $(srcdir) && ls -1 *.x) | grep -v -e 'kill.x' -e 'su.x' -e 'uptime.x' | sed 's/\.x$$//' | $(ASSORT) > $$t;\
    660657        echo $(dist_man_MANS) | tr -s ' ' '\n' | sed 's/\.1$$//'        \
    661658          | $(ASSORT) | diff - $$t || { rm $$t; exit 1; };              \
    662659        rm $$t

  • src/Makefile.in 

    diff -Naur coreutils-5.94.orig/src/Makefile.in coreutils-5.94/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) \
    … …  
    5656        uniq$(EXEEXT) wc$(EXEEXT) basename$(EXEEXT) date$(EXEEXT) \
    5757        dirname$(EXEEXT) echo$(EXEEXT) env$(EXEEXT) expr$(EXEEXT) \
    5858        factor$(EXEEXT) false$(EXEEXT) hostname$(EXEEXT) id$(EXEEXT) \
    59         kill$(EXEEXT) logname$(EXEEXT) pathchk$(EXEEXT) \
     59        logname$(EXEEXT) pathchk$(EXEEXT) \
    6060        printenv$(EXEEXT) printf$(EXEEXT) pwd$(EXEEXT) seq$(EXEEXT) \
    6161        sleep$(EXEEXT) tee$(EXEEXT) test$(EXEEXT) true$(EXEEXT) \
    6262        tty$(EXEEXT) whoami$(EXEEXT) yes$(EXEEXT) $(am__EXEEXT_1) \
    … …  
    169169        $(top_srcdir)/m4/ullong_max.m4 $(top_srcdir)/m4/ulonglong.m4 \
    170170        $(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
    171171        $(top_srcdir)/m4/unlink-busy.m4 $(top_srcdir)/m4/unlinkdir.m4 \
    172         $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \
     172        $(top_srcdir)/m4/unlocked-io.m4 \
    173173        $(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \
    174174        $(top_srcdir)/m4/utime.m4 $(top_srcdir)/m4/utimecmp.m4 \
    175175        $(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimes-null.m4 \
    … …  
    350350join_LDADD = $(LDADD)
    351351join_DEPENDENCIES = ../lib/libcoreutils.a $(am__DEPENDENCIES_1) \
    352352        ../lib/libcoreutils.a
    353 kill_SOURCES = kill.c
    354 kill_OBJECTS = kill.$(OBJEXT)
    355 kill_LDADD = $(LDADD)
    356 kill_DEPENDENCIES = ../lib/libcoreutils.a $(am__DEPENDENCIES_1) \
    357         ../lib/libcoreutils.a
    358353link_SOURCES = link.c
    359354link_OBJECTS = link.$(OBJEXT)
    360355link_LDADD = $(LDADD)
    … …  
    577572unlink_LDADD = $(LDADD)
    578573unlink_DEPENDENCIES = ../lib/libcoreutils.a $(am__DEPENDENCIES_1) \
    579574        ../lib/libcoreutils.a
    580 uptime_SOURCES = uptime.c
    581 uptime_OBJECTS = uptime.$(OBJEXT)
    582 uptime_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
    583575users_SOURCES = users.c
    584576users_OBJECTS = users.$(OBJEXT)
    585577users_LDADD = $(LDADD)
    … …  
    622614        csplit.c cut.c date.c dd.c df.c $(dir_SOURCES) dircolors.c \
    623615        dirname.c du.c echo.c env.c expand.c expr.c factor.c false.c \
    624616        fmt.c fold.c $(ginstall_SOURCES) head.c hostid.c hostname.c \
    625         id.c join.c kill.c link.c ln.c logname.c $(ls_SOURCES) \
     617        id.c join.c link.c ln.c logname.c $(ls_SOURCES) \
    626618        $(md5sum_SOURCES) mkdir.c mkfifo.c mknod.c $(mv_SOURCES) \
    627619        nice.c nl.c nohup.c od.c paste.c pathchk.c pinky.c pr.c \
    628620        printenv.c printf.c ptx.c pwd.c readlink.c $(rm_SOURCES) \
    629621        rmdir.c seq.c setuidgid.c $(sha1sum_SOURCES) shred.c sleep.c \
    630622        sort.c split.c stat.c stty.c su.c sum.c sync.c tac.c tail.c \
    631623        tee.c test.c touch.c tr.c true.c tsort.c tty.c uname.c \
    632         unexpand.c uniq.c unlink.c uptime.c users.c $(vdir_SOURCES) \
     624        unexpand.c uniq.c unlink.c users.c $(vdir_SOURCES) \
    633625        wc.c who.c whoami.c yes.c
    634626DIST_SOURCES = $(__SOURCES) basename.c cat.c $(chgrp_SOURCES) chmod.c \
    635627        $(chown_SOURCES) chroot.c cksum.c comm.c $(cp_SOURCES) \
    636628        csplit.c cut.c date.c dd.c df.c $(dir_SOURCES) dircolors.c \
    637629        dirname.c du.c echo.c env.c expand.c expr.c factor.c false.c \
    638630        fmt.c fold.c $(ginstall_SOURCES) head.c hostid.c hostname.c \
    639         id.c join.c kill.c link.c ln.c logname.c $(ls_SOURCES) \
     631        id.c join.c link.c ln.c logname.c $(ls_SOURCES) \
    640632        $(md5sum_SOURCES) mkdir.c mkfifo.c mknod.c $(mv_SOURCES) \
    641633        nice.c nl.c nohup.c od.c paste.c pathchk.c pinky.c pr.c \
    642634        printenv.c printf.c ptx.c pwd.c readlink.c $(rm_SOURCES) \
    643635        rmdir.c seq.c setuidgid.c $(sha1sum_SOURCES) shred.c sleep.c \
    644636        sort.c split.c stat.c stty.c su.c sum.c sync.c tac.c tail.c \
    645637        tee.c test.c touch.c tr.c true.c tsort.c tty.c uname.c \
    646         unexpand.c uniq.c unlink.c uptime.c users.c $(vdir_SOURCES) \
     638        unexpand.c uniq.c unlink.c users.c $(vdir_SOURCES) \
    647639        wc.c who.c whoami.c yes.c
    648640HEADERS = $(noinst_HEADERS)
    649641ETAGS = etags
    … …  
    840832nanosec_libs = $(LDADD) $(POW_LIB) $(LIB_NANOSLEEP)
    841833sleep_LDADD = $(nanosec_libs)
    842834tail_LDADD = $(nanosec_libs)
    843 uptime_LDADD = $(LDADD) $(GETLOADAVG_LIBS)
    844835su_LDADD = $(LDADD) $(LIB_CRYPT)
    845836SUFFIXES = .sh
    846837installed_su = $(DESTDIR)$(bindir)/`echo su|sed '$(transform)'`
    … …  
    10761067join$(EXEEXT): $(join_OBJECTS) $(join_DEPENDENCIES)
    10771068        @rm -f join$(EXEEXT)
    10781069        $(LINK) $(join_LDFLAGS) $(join_OBJECTS) $(join_LDADD) $(LIBS)
    1079 kill$(EXEEXT): $(kill_OBJECTS) $(kill_DEPENDENCIES)
    1080         @rm -f kill$(EXEEXT)
    1081         $(LINK) $(kill_LDFLAGS) $(kill_OBJECTS) $(kill_LDADD) $(LIBS)
    10821070link$(EXEEXT): $(link_OBJECTS) $(link_DEPENDENCIES)
    10831071        @rm -f link$(EXEEXT)
    10841072        $(LINK) $(link_LDFLAGS) $(link_OBJECTS) $(link_LDADD) $(LIBS)
    … …  
    12261214unlink$(EXEEXT): $(unlink_OBJECTS) $(unlink_DEPENDENCIES)
    12271215        @rm -f unlink$(EXEEXT)
    12281216        $(LINK) $(unlink_LDFLAGS) $(unlink_OBJECTS) $(unlink_LDADD) $(LIBS)
    1229 uptime$(EXEEXT): $(uptime_OBJECTS) $(uptime_DEPENDENCIES)
    1230         @rm -f uptime$(EXEEXT)
    1231         $(LINK) $(uptime_LDFLAGS) $(uptime_OBJECTS) $(uptime_LDADD) $(LIBS)
    12321217users$(EXEEXT): $(users_OBJECTS) $(users_DEPENDENCIES)
    12331218        @rm -f users$(EXEEXT)
    12341219        $(LINK) $(users_LDFLAGS) $(users_OBJECTS) $(users_LDADD) $(LIBS)
    … …  
    13221307@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/id.Po@am__quote@
    13231308@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/install.Po@am__quote@
    13241309@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/join.Po@am__quote@
    1325 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kill.Po@am__quote@
    13261310@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lbracket.Po@am__quote@
    13271311@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/link.Po@am__quote@
    13281312@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ln.Po@am__quote@
    … …  
    13781362@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unexpand.Po@am__quote@
    13791363@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uniq.Po@am__quote@
    13801364@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unlink.Po@am__quote@
    1381 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uptime.Po@am__quote@
    13821365@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/users.Po@am__quote@
    13831366@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wc.Po@am__quote@
    13841367@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/who.Po@am__quote@
    … …  
    16061589          && can_create_suid_root_executable=yes; \
    16071590        rm -f $$TMPFILE; \
    16081591        if test $$can_create_suid_root_executable = yes; then \
    1609           $(INSTALL_SU); \
     1592          echo "Installation of su is suppressed"; \
    16101593        else \
    16111594          echo "WARNING: insufficient access; not installing su"; \
    16121595          echo "NOTE: to install su, run 'make install-root' as root"; \