source: clfs-sysroot/patches/coreutils-6.7-suppress_uptime_kill_su-1.patch@ f38c7e1

Last change on this file since f38c7e1 was d26cc6e, checked in by Joe Ciccone <jciccone@…>, 18 years ago

Update Coreutils patches.
  • Property mode set to 100644
File size: 13.0 KB

  • coreutils-6.5 

    Submitted By: Matthew Burgess <matthew at linuxfromscratch dot org>
Date: 2006-11-20
Initial Package Version: 6.5
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.

	     Updated for 6.3, 6.4, and 6.5 by Jim Gifford

diff -Naur coreutils-6.5.orig/AUTHORS coreutils-6.5/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.5 

    diff -Naur coreutils-6.5.orig/Makefile.in coreutils-6.5/Makefile.in
    old new  
    177177        $(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
    178178        $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlink-busy.m4 \
    179179        $(top_srcdir)/m4/unlinkdir.m4 $(top_srcdir)/m4/unlocked-io.m4 \
    180         $(top_srcdir)/m4/uptime.m4 $(top_srcdir)/m4/userspec.m4 \
     180        $(top_srcdir)/m4/userspec.m4 \
    181181        $(top_srcdir)/m4/utimbuf.m4 $(top_srcdir)/m4/utime.m4 \
    182182        $(top_srcdir)/m4/utimecmp.m4 $(top_srcdir)/m4/utimens.m4 \
    183183        $(top_srcdir)/m4/utimes-null.m4 $(top_srcdir)/m4/utimes.m4 \

  • coreutils-6.5 

    diff -Naur coreutils-6.5.orig/README coreutils-6.5/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.

  • coreutils-6.5 

    diff -Naur coreutils-6.5.orig/configure coreutils-6.5/configure
    old new  
    4946749467{ echo "$as_me:$LINENO: result: $gnulib_cv_have_boot_time" >&5
    4946849468echo "${ECHO_T}$gnulib_cv_have_boot_time" >&6; }
    4946949469  if test $gnulib_cv_have_boot_time = yes; then
    49470   OPTIONAL_BIN_PROGS="$OPTIONAL_BIN_PROGS uptime\$(EXEEXT)"
    49471   MAN="$MAN uptime.1"
     49470echo "uptime is suppressed"
    4947249471fi
    4947349472
    4947449473

  • man/Makefile.in 

    diff -Naur coreutils-6.5.orig/man/Makefile.in coreutils-6.5/man/Makefile.in
    old new  
    172172        $(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
    173173        $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlink-busy.m4 \
    174174        $(top_srcdir)/m4/unlinkdir.m4 $(top_srcdir)/m4/unlocked-io.m4 \
    175         $(top_srcdir)/m4/uptime.m4 $(top_srcdir)/m4/userspec.m4 \
     175        $(top_srcdir)/m4/userspec.m4 \
    176176        $(top_srcdir)/m4/utimbuf.m4 $(top_srcdir)/m4/utime.m4 \
    177177        $(top_srcdir)/m4/utimecmp.m4 $(top_srcdir)/m4/utimens.m4 \
    178178        $(top_srcdir)/m4/utimes-null.m4 $(top_srcdir)/m4/utimes.m4 \
    … …  
    382382  base64.1 basename.1 cat.1 chgrp.1 chmod.1 chown.1 cksum.1 comm.1 \
    383383  cp.1 csplit.1 cut.1 date.1 dd.1 df.1 dir.1 dircolors.1 dirname.1 du.1 \
    384384  echo.1 env.1 expand.1 expr.1 factor.1 false.1 fmt.1 fold.1 groups.1 \
    385   head.1 hostname.1 id.1 install.1 join.1 kill.1 \
     385  head.1 hostname.1 id.1 install.1 join.1 \
    386386  link.1 ln.1 logname.1 \
    387387  ls.1 md5sum.1 mkdir.1 mkfifo.1 mknod.1 mv.1 nl.1 nohup.1 od.1 \
    388388  paste.1 pathchk.1 pr.1 printenv.1 printf.1 ptx.1 pwd.1 readlink.1 \
    389389  rm.1 rmdir.1 seq.1 sha1sum.1 sha224sum.1 sha256sum.1 sha384sum.1 sha512sum.1 \
    390390  shred.1 shuf.1 sleep.1 sort.1 split.1 stat.1 \
    391   su.1 sum.1 sync.1 tac.1 tail.1 tee.1 test.1 touch.1 tr.1 true.1 tsort.1 \
     391  sum.1 sync.1 tac.1 tail.1 tee.1 test.1 touch.1 tr.1 true.1 tsort.1 \
    392392  tty.1 unexpand.1 uniq.1 unlink.1 vdir.1 wc.1 \
    393393  whoami.1 yes.1 $(MAN)
    394394
    … …  
    668668id.1:           $(common_dep)   $(srcdir)/id.x          ../src/id.c
    669669install.1:      $(common_dep)   $(srcdir)/install.x     ../src/install.c
    670670join.1:         $(common_dep)   $(srcdir)/join.x        ../src/join.c
    671 kill.1:         $(common_dep)   $(srcdir)/kill.x        ../src/kill.c
    672671link.1:         $(common_dep)   $(srcdir)/link.x        ../src/link.c
    673672ln.1:           $(common_dep)   $(srcdir)/ln.x          ../src/ln.c
    674673logname.1:      $(common_dep)   $(srcdir)/logname.x     ../src/logname.c
    … …  
    706705split.1:        $(common_dep)   $(srcdir)/split.x       ../src/split.c
    707706stat.1:         $(common_dep)   $(srcdir)/stat.x        ../src/stat.c
    708707stty.1:         $(common_dep)   $(srcdir)/stty.x        ../src/stty.c
    709 su.1:           $(common_dep)   $(srcdir)/su.x          ../src/su.c
    710708sum.1:          $(common_dep)   $(srcdir)/sum.x         ../src/sum.c
    711709sync.1:         $(common_dep)   $(srcdir)/sync.x        ../src/sync.c
    712710tac.1:          $(common_dep)   $(srcdir)/tac.x         ../src/tac.c
    … …  
    722720unexpand.1:     $(common_dep)   $(srcdir)/unexpand.x    ../src/unexpand.c
    723721uniq.1:         $(common_dep)   $(srcdir)/uniq.x        ../src/uniq.c
    724722unlink.1:       $(common_dep)   $(srcdir)/unlink.x      ../src/unlink.c
    725 uptime.1:       $(common_dep)   $(srcdir)/uptime.x      ../src/uptime.c
    726723users.1:        $(common_dep)   $(srcdir)/users.x       ../src/users.c
    727724vdir.1:         $(common_dep)   $(srcdir)/vdir.x        ../src/ls.c
    728725wc.1:           $(common_dep)   $(srcdir)/wc.x          ../src/wc.c
    … …  
    754751check-x-vs-1:
    755752        PATH=../src$(PATH_SEPARATOR)$$PATH; export PATH;                \
    756753        t=ls-files.$$$$;                                                \
    757         (cd $(srcdir) && ls -1 *.x) | sed 's/\.x$$//' | $(ASSORT) > $$t;\
     754        (cd $(srcdir) && ls -1 *.x) | grep -v -e 'kill.x' -e 'su.x' -e 'uptime.x' | sed 's/\.x$$//' | $(ASSORT) > $$t;\
    758755        echo $(dist_man_MANS) | tr -s ' ' '\n' | sed 's/\.1$$//'        \
    759756          | $(ASSORT) | diff - $$t || { rm $$t; exit 1; };              \
    760757        rm $$t

  • src/Makefile.in 

    diff -Naur coreutils-6.5.orig/src/Makefile.in coreutils-6.5/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) \
    … …  
    180180        $(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
    181181        $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlink-busy.m4 \
    182182        $(top_srcdir)/m4/unlinkdir.m4 $(top_srcdir)/m4/unlocked-io.m4 \
    183         $(top_srcdir)/m4/uptime.m4 $(top_srcdir)/m4/userspec.m4 \
     183        $(top_srcdir)/m4/userspec.m4 \
    184184        $(top_srcdir)/m4/utimbuf.m4 $(top_srcdir)/m4/utime.m4 \
    185185        $(top_srcdir)/m4/utimecmp.m4 $(top_srcdir)/m4/utimens.m4 \
    186186        $(top_srcdir)/m4/utimes-null.m4 $(top_srcdir)/m4/utimes.m4 \
    … …  
    366366join_LDADD = $(LDADD)
    367367join_DEPENDENCIES = ../lib/libcoreutils.a $(am__DEPENDENCIES_1) \
    368368        ../lib/libcoreutils.a
    369 kill_SOURCES = kill.c
    370 kill_OBJECTS = kill.$(OBJEXT)
    371 kill_LDADD = $(LDADD)
    372 kill_DEPENDENCIES = ../lib/libcoreutils.a $(am__DEPENDENCIES_1) \
    373         ../lib/libcoreutils.a
    374369link_SOURCES = link.c
    375370link_OBJECTS = link.$(OBJEXT)
    376371link_LDADD = $(LDADD)
    … …  
    619614unlink_LDADD = $(LDADD)
    620615unlink_DEPENDENCIES = ../lib/libcoreutils.a $(am__DEPENDENCIES_1) \
    621616        ../lib/libcoreutils.a
    622 uptime_SOURCES = uptime.c
    623 uptime_OBJECTS = uptime.$(OBJEXT)
    624 uptime_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
    625         $(am__DEPENDENCIES_1)
    626617users_SOURCES = users.c
    627618users_OBJECTS = users.$(OBJEXT)
    628619users_LDADD = $(LDADD)
    … …  
    666657        csplit.c cut.c date.c dd.c df.c $(dir_SOURCES) dircolors.c \
    667658        dirname.c du.c echo.c env.c expand.c expr.c factor.c false.c \
    668659        fmt.c fold.c $(ginstall_SOURCES) head.c hostid.c hostname.c \
    669         id.c join.c kill.c link.c ln.c logname.c $(ls_SOURCES) \
     660        id.c join.c link.c ln.c logname.c $(ls_SOURCES) \
    670661        $(md5sum_SOURCES) mkdir.c mkfifo.c mknod.c $(mv_SOURCES) \
    671662        nice.c nl.c nohup.c od.c paste.c pathchk.c pinky.c pr.c \
    672663        printenv.c printf.c ptx.c pwd.c readlink.c $(rm_SOURCES) \
    … …  
    675666        $(sha512sum_SOURCES) shred.c shuf.c sleep.c sort.c split.c \
    676667        stat.c stty.c su.c sum.c sync.c tac.c tail.c tee.c test.c \
    677668        touch.c tr.c true.c tsort.c tty.c uname.c unexpand.c uniq.c \
    678         unlink.c uptime.c users.c $(vdir_SOURCES) wc.c who.c whoami.c \
     669        unlink.c users.c $(vdir_SOURCES) wc.c who.c whoami.c \
    679670        yes.c
    680671DIST_SOURCES = $(__SOURCES) base64.c basename.c cat.c $(chgrp_SOURCES) \
    681672        chmod.c $(chown_SOURCES) chroot.c cksum.c comm.c $(cp_SOURCES) \
    682673        csplit.c cut.c date.c dd.c df.c $(dir_SOURCES) dircolors.c \
    683674        dirname.c du.c echo.c env.c expand.c expr.c factor.c false.c \
    684675        fmt.c fold.c $(ginstall_SOURCES) head.c hostid.c hostname.c \
    685         id.c join.c kill.c link.c ln.c logname.c $(ls_SOURCES) \
     676        id.c join.c link.c ln.c logname.c $(ls_SOURCES) \
    686677        $(md5sum_SOURCES) mkdir.c mkfifo.c mknod.c $(mv_SOURCES) \
    687678        nice.c nl.c nohup.c od.c paste.c pathchk.c pinky.c pr.c \
    688679        printenv.c printf.c ptx.c pwd.c readlink.c $(rm_SOURCES) \
    … …  
    691682        $(sha512sum_SOURCES) shred.c shuf.c sleep.c sort.c split.c \
    692683        stat.c stty.c su.c sum.c sync.c tac.c tail.c tee.c test.c \
    693684        touch.c tr.c true.c tsort.c tty.c uname.c unexpand.c uniq.c \
    694         unlink.c uptime.c users.c $(vdir_SOURCES) wc.c who.c whoami.c \
     685        unlink.c users.c $(vdir_SOURCES) wc.c who.c whoami.c \
    695686        yes.c
    696687HEADERS = $(noinst_HEADERS)
    697688ETAGS = etags
    … …  
    949940tail_LDADD = $(nanosec_libs)
    950941
    951942# If necessary, add -lm to resolve use of pow in lib/strtod.c.
    952 uptime_LDADD = $(LDADD) $(POW_LIB) $(GETLOADAVG_LIBS)
    953943su_LDADD = $(LDADD) $(LIB_CRYPT)
    954944SUFFIXES = .sh
    955945installed_su = $(DESTDIR)$(bindir)/`echo su|sed '$(transform)'`
    … …  
    11961186join$(EXEEXT): $(join_OBJECTS) $(join_DEPENDENCIES)
    11971187        @rm -f join$(EXEEXT)
    11981188        $(LINK) $(join_OBJECTS) $(join_LDADD) $(LIBS)
    1199 kill$(EXEEXT): $(kill_OBJECTS) $(kill_DEPENDENCIES)
    1200         @rm -f kill$(EXEEXT)
    1201         $(LINK) $(kill_OBJECTS) $(kill_LDADD) $(LIBS)
    12021189link$(EXEEXT): $(link_OBJECTS) $(link_DEPENDENCIES)
    12031190        @rm -f link$(EXEEXT)
    12041191        $(LINK) $(link_OBJECTS) $(link_LDADD) $(LIBS)
    … …  
    13611348unlink$(EXEEXT): $(unlink_OBJECTS) $(unlink_DEPENDENCIES)
    13621349        @rm -f unlink$(EXEEXT)
    13631350        $(LINK) $(unlink_OBJECTS) $(unlink_LDADD) $(LIBS)
    1364 uptime$(EXEEXT): $(uptime_OBJECTS) $(uptime_DEPENDENCIES)
    1365         @rm -f uptime$(EXEEXT)
    1366         $(LINK) $(uptime_OBJECTS) $(uptime_LDADD) $(LIBS)
    13671351users$(EXEEXT): $(users_OBJECTS) $(users_DEPENDENCIES)
    13681352        @rm -f users$(EXEEXT)
    13691353        $(LINK) $(users_OBJECTS) $(users_LDADD) $(LIBS)
    … …  
    14581442@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/id.Po@am__quote@
    14591443@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/install.Po@am__quote@
    14601444@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/join.Po@am__quote@
    1461 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kill.Po@am__quote@
    14621445@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lbracket.Po@am__quote@
    14631446@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/link.Po@am__quote@
    14641447@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ln.Po@am__quote@
    … …  
    15181501@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unexpand.Po@am__quote@
    15191502@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uniq.Po@am__quote@
    15201503@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unlink.Po@am__quote@
    1521 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uptime.Po@am__quote@
    15221504@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/users.Po@am__quote@
    15231505@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wc.Po@am__quote@
    15241506@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/who.Po@am__quote@
    … …  
    18391821          && can_create_suid_root_executable=yes; \
    18401822        rm -f $$TMPFILE; \
    18411823        if test $$can_create_suid_root_executable = yes; then \
    1842           $(INSTALL_SU); \
     1824          echo "Installation of su is suppressed"; \
    18431825        else \
    18441826          echo "WARNING: insufficient access; not installing su"; \
    18451827          echo "NOTE: to install su, run 'make install-root' as root"; \
Note: See TracBrowser for help on using the repository browser.