utils/mgetty/patches/001-mgetty.patch

   1 --- a/Makefile
   2 +++ b/Makefile
   3 @@ -164,7 +164,9 @@
   4  #
   5  # if your systems doesn't have one, use the shell script that I provide
   6  # in "inst.sh" (taken from X11R5). Needed on IRIX5.2
   7 -INSTALL=install -c -o bin -g bin
   8 +STRIP=$(STAGING_DIR)sstrip
   9 +INSTALL=install -c -o root -g root
  10 +#INSTALL=install -c -o bin -g bin
  11  #INSTALL=install -c -o root -g wheel           # NeXT/BSD
  12  #INSTALL=/usr/ucb/install -c -o bin -g bin     # AIX, Solaris 2.x
  13  #INSTALL=installbsd -c -o bin -g bin           # OSF/1, AIX 4.1, 4.2
  14 @@ -216,7 +218,7 @@
  15  # (it's possible to run faxrunq(d) as root, but the FAX_OUT_USER
  16  #  MUST NOT BE root or any other privileged account).
  17  #
  18 -FAX_OUT_USER=fax
  19 +FAX_OUT_USER=root
  20  #
  21  #
  22  # Where section 1 manual pages should be placed
  23 @@ -421,7 +423,12 @@
  24         ./mksed >sedscript
  25         chmod +x sedscript
  26
  27 -mksed: mksed.c policy.h Makefile
  28 +REALGCC:=/usr/bin/gcc
  29 +mksed: mksed.c policy.h Makefile
  30 +       ( echo $(REALGCC); $(MAKE) "CC=$(REALGCC)" "CFLAGS=$(CFLAGS)" mksed-wrong;\
  31 +       );
  32 +
  33 +mksed-wrong: mksed.c policy.h Makefile
  34         $(CC) $(CFLAGS) -DBINDIR=\"$(BINDIR)\" -DSBINDIR=\"$(SBINDIR)\" \
  35                 -DLIBDIR=\"$(LIBDIR)\" \
  36                 -DCONFDIR=\"$(CONFDIR)\" \
  37 @@ -586,8 +593,10 @@
  38         -test -d $(SBINDIR) || ( ./mkidirs $(SBINDIR) ; chmod 755 $(SBINDIR) )
  39         -mv -f $(SBINDIR)/mgetty $(SBINDIR)/mgetty.old
  40         -mv -f $(SBINDIR)/sendfax $(SBINDIR)/sendfax.old
  41 -       $(INSTALL) -s -m 700 mgetty $(SBINDIR)
  42 -       $(INSTALL) -s -m 755 sendfax $(SBINDIR)
  43 +       $(INSTALL) -m 700 mgetty $(SBINDIR)
  44 +       $(STRIP) $(SBINDIR)/mgetty
  45 +       $(INSTALL) -m 755 sendfax $(SBINDIR)
  46 +       $(STRIP) $(SBINDIR)/sendfax
  47  #
  48  # data files + directories
  49  #
  50 @@ -649,7 +658,8 @@
  51         if [ ! -z "$(INSTALL_MECHO)" ] ; then \
  52             cd compat ; \
  53             $(CC) $(CFLAGS) -o mg.echo mg.echo.c && \
  54 -           $(INSTALL) -s -m 755 mg.echo $(BINDIR) ; \
  55 +           $(INSTALL) -m 755 mg.echo $(BINDIR) && \
  56 +           $(STRIP) $(BINDIR)/mg.echo ; \
  57         fi
  58
  59  #
  60 --- a/g3/Makefile
  61 +++ b/g3/Makefile
  62 @@ -37,7 +37,8 @@
  63  # install programs
  64  #
  65         for f in $(G3_PROGRAMS) ; do \
  66 -               $(INSTALL) -s -m 755 $$f $(BINDIR) ; \
  67 +               $(INSTALL) -m 755 $$f $(BINDIR) ; \
  68 +               $(STRIP) $(BINDIR)/$$f ; \
  69         done
  70  #
  71  # make symlink for "g3topbm" (so third-party fax viewers won't fail)
  72 --- a/logfile.c
  73 +++ b/logfile.c
  74 @@ -327,12 +327,11 @@
  75      }
  76      else               /* ERROR or FATAL */
  77      {
  78 -       fprintf(log_fp, "\n%02d/%02d %02d:%02d:%02d %s %s: %s",
  79 +       fprintf(log_fp, "\n%02d/%02d %02d:%02d:%02d %s %s: #%d",
  80                              tm->tm_mon+1,  tm->tm_mday,
  81                              tm->tm_hour, tm->tm_min, tm->tm_sec,
  82                              log_infix, ws,
  83 -                            ( errnr <= sys_nerr ) ? sys_errlist[errnr]:
  84 -                            "<error not in list>" );
  85 +                            errnr );
  86  #ifdef SYSLOG
  87         syslog( level == L_FATAL? LOG_ALERT: LOG_ERR, "%s: %m", ws );
  88  #endif