c5ffb6f2e694c853138f231bbcba7ad1360b8f8a
[openwrt/svn-archive/archive.git] / utils / mgetty / patches / 001-mgetty.patch
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
29 -mksed: mksed.c policy.h Makefile
30 +REALGCC:=/usr/bin/gcc
31 +mksed: mksed.c policy.h Makefile
32 + ( echo $(REALGCC); $(MAKE) "CC=$(REALGCC)" "CFLAGS=$(CFLAGS)" mksed-wrong;\
33 + );
34 +
35 +mksed-wrong: mksed.c policy.h Makefile
36 $(CC) $(CFLAGS) -DBINDIR=\"$(BINDIR)\" -DSBINDIR=\"$(SBINDIR)\" \
37 -DLIBDIR=\"$(LIBDIR)\" \
38 -DCONFDIR=\"$(CONFDIR)\" \
39 @@ -590,8 +597,10 @@
40 -test -d $(SBINDIR) || ( ./mkidirs $(SBINDIR) ; chmod 755 $(SBINDIR) )
41 -mv -f $(SBINDIR)/mgetty $(SBINDIR)/mgetty.old
42 -mv -f $(SBINDIR)/sendfax $(SBINDIR)/sendfax.old
43 - $(INSTALL) -s -m 700 mgetty $(SBINDIR)
44 - $(INSTALL) -s -m 755 sendfax $(SBINDIR)
45 + $(INSTALL) -m 700 mgetty $(SBINDIR)
46 + $(STRIP) $(SBINDIR)/mgetty
47 + $(INSTALL) -m 755 sendfax $(SBINDIR)
48 + $(STRIP) $(SBINDIR)/sendfax
49 #
50 # data files + directories
51 #
52 @@ -653,7 +662,8 @@
53 if [ ! -z "$(INSTALL_MECHO)" ] ; then \
54 cd compat ; \
55 $(CC) $(CFLAGS) -o mg.echo mg.echo.c && \
56 - $(INSTALL) -s -m 755 mg.echo $(BINDIR) ; \
57 + $(INSTALL) -m 755 mg.echo $(BINDIR) && \
58 + $(STRIP) $(BINDIR)/mg.echo ; \
59 fi
60
61 #
62 Only in mgetty-1.1.31-old: Makefile.orig
63 Only in mgetty-1.1.31-old: Makefile.rej
64 diff -ur mgetty-1.1.31-old/g3/Makefile mgetty-1.1.31/g3/Makefile
65 --- mgetty-1.1.31-old/g3/Makefile 2006-01-02 00:37:56.000000000 +0000
66 +++ mgetty-1.1.31/g3/Makefile 2006-01-02 00:42:17.000000000 +0000
67 @@ -40,7 +40,8 @@
68 # install programs
69 #
70 for f in $(G3_PROGRAMS) ; do \
71 - $(INSTALL) -s -m 755 $$f $(BINDIR) ; \
72 + $(INSTALL) -m 755 $$f $(BINDIR) ; \
73 + $(STRIP) $(BINDIR)/$$f ; \
74 done
75 #
76 # make symlink for "g3topbm" (so third-party fax viewers won't fail)
77 diff -ur mgetty-1.1.31-old/logfile.c mgetty-1.1.31/logfile.c
78 --- mgetty-1.1.31-old/logfile.c 2006-01-02 00:37:56.000000000 +0000
79 +++ mgetty-1.1.31/logfile.c 2006-01-02 00:42:17.000000000 +0000
80 @@ -327,12 +327,11 @@
81 }
82 else /* ERROR or FATAL */
83 {
84 - fprintf(log_fp, "\n%02d/%02d %02d:%02d:%02d %s %s: %s",
85 + fprintf(log_fp, "\n%02d/%02d %02d:%02d:%02d %s %s: #%d",
86 tm->tm_mon+1, tm->tm_mday,
87 tm->tm_hour, tm->tm_min, tm->tm_sec,
88 log_infix, ws,
89 - ( errnr <= sys_nerr ) ? sys_errlist[errnr]:
90 - "<error not in list>" );
91 + errnr );
92 #ifdef SYSLOG
93 syslog( level == L_FATAL? LOG_ALERT: LOG_ERR, "%s: %m", ws );
94 #endif
95 Only in mgetty-1.1.31-old/voice/libutil: access.c.orig
96 Only in mgetty-1.1.31-old/voice/libvoice: Lucent.c.orig
97 Only in mgetty-1.1.31-old/voice/libvoice: V253modem.c.orig
98 Only in mgetty-1.1.31-old/voice/pvftools: pvftormd.c.orig