mgetty.patch 3.4 KB

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