patches/sysvinit/sysvinit-2.88dfs

   1 --- src/Makefile.orig   2010-04-11 06:30:27.000000000 -0300
   2 +++ src/Makefile        2013-07-04 19:01:38.000000000 -0300
   3 @@ -9,25 +9,22 @@
   4  #
   5
   6  CPPFLAGS =
   7 -CFLAGS ?= -ansi -O2 -fomit-frame-pointer
   8 +CFLAGS ?= -ansi -Os
   9  override CFLAGS += -W -Wall -D_GNU_SOURCE
  10 -STATIC =
  11 +STATIC = -Wl,-static
  12
  13  # For some known distributions we do not build all programs, otherwise we do.
  14  BIN    =
  15  SBIN   = init halt shutdown runlevel killall5 fstab-decode
  16 -USRBIN = last mesg
  17 +USRBIN = mesg
  18
  19 -MAN1   = last.1 lastb.1 mesg.1
  20 +MAN1   = mesg.1
  21  MAN5   = initscript.5 inittab.5
  22  MAN8   = halt.8 init.8 killall5.8 pidof.8 poweroff.8 reboot.8 runlevel.8
  23  MAN8   += shutdown.8 telinit.8 fstab-decode.8
  24
  25  ifeq ($(DISTRO),)
  26 -BIN    += mountpoint
  27  SBIN   += sulogin bootlogd
  28 -USRBIN += utmpdump wall
  29 -MAN1   += utmpdump.1 mountpoint.1 wall.1
  30  MAN8   += sulogin.8 bootlogd.8
  31  endif
  32
  33 @@ -92,16 +89,16 @@
  34  init:          LDLIBS += $(INITLIBS) $(STATIC)
  35  init:          init.o init_utmp.o
  36
  37 -halt:          halt.o ifdown.o hddown.o utmp.o reboot.h
  38 +killall5:      LDLIBS += $(STATIC)
  39 +killall5:      killall5.o
  40
  41 -last:          last.o oldutmp.h
  42 +halt:          LDLIBS += $(STATIC)
  43 +halt:          halt.o ifdown.o hddown.o utmp.o reboot.h
  44
  45 +mesg:          LDLIBS += $(STATIC)
  46  mesg:          mesg.o
  47
  48 -mountpoint:    mountpoint.o
  49 -
  50 -utmpdump:      utmpdump.o
  51 -
  52 +runlevel:      LDLIBS += $(STATIC)
  53  runlevel:      runlevel.o
  54
  55  sulogin:       LDLIBS += $(SULOGINLIBS) $(STATIC)
  56 @@ -109,11 +106,15 @@
  57
  58  wall:          dowall.o wall.o
  59
  60 +shutdown:      LDLIBS += $(STATIC)
  61  shutdown:      dowall.o shutdown.o utmp.o reboot.h
  62
  63 -bootlogd:      LDLIBS += -lutil
  64 +bootlogd:      LDLIBS += -lutil $(STATIC)
  65  bootlogd:      bootlogd.o
  66
  67 +fstab-decode:  LDLIBS += $(STATIC)
  68 +fstab-decode:  fstab-decode.o
  69 +
  70  sulogin.o:     CPPFLAGS += $(SELINUX_DEF)
  71  sulogin.o:     sulogin.c
  72
  73 @@ -155,9 +156,6 @@
  74                 ln -sf halt $(ROOT)/sbin/poweroff
  75                 ln -sf init $(ROOT)/sbin/telinit
  76                 ln -sf /sbin/killall5 $(ROOT)/bin/pidof
  77 -               if [ ! -f $(ROOT)/usr/bin/lastb ]; then \
  78 -                       ln -sf last $(ROOT)/usr/bin/lastb; \
  79 -               fi
  80                 $(INSTALL_DIR) $(ROOT)/usr/include/
  81                 $(INSTALL_DATA) initreq.h $(ROOT)/usr/include/
  82                 $(INSTALL_DIR) $(ROOT)$(MANDIR)/man1/
  83 --- src/ifdown.c.orig   2010-03-23 11:37:01.000000000 -0300
  84 +++ src/ifdown.c        2013-07-04 18:32:42.000000000 -0300
  85 @@ -30,7 +30,7 @@
  86  #include <sys/ioctl.h>
  87  #include <sys/socket.h>
  88  #include <sys/time.h>
  89 -#include <sys/errno.h>
  90 +#include <errno.h>
  91
  92  #include <net/if.h>
  93  #include <netinet/in.h>
  94 --- src/init.c.orig     2010-04-13 06:48:54.000000000 -0300
  95 +++ src/init.c  2013-07-04 18:31:33.000000000 -0300
  96 @@ -46,6 +46,7 @@
  97  #include <string.h>
  98  #include <signal.h>
  99  #include <termios.h>
 100 +#include <sys/ttydefaults.h>
 101  #include <utmp.h>
 102  #include <ctype.h>
 103  #include <stdarg.h>