パッチのあてかた
# tar xvf logdaemon-5.6.tar.gz # cd logdaemon-5.6 # patch -p < logdaemon-5.6.patch # setenv LOG_TCP=/usr/local/src/tcp_wrappers_7.2 # make newsos4 GNU diff version 2.6 Patch version 2.1
diff -r -u ./Makefile ../logdaemon-5.6.NEWS/Makefile --- ./Makefile Sun Dec 8 08:09:31 1996 +++ ../logdaemon-5.6.NEWS/Makefile Wed Jan 15 01:05:21 1997 @@ -16,11 +16,12 @@ @echo " hpux10 HP-UX 10.x (no rshd/rlogind/telnetd)" @echo " irix5 IRIX 5.x (no rshd/rlogind/telnetd)" @echo " decosf1 DIGITAL UNIX (no rshd/rlogind/telnetd)" - @echo " newsos4 Sony NEWS/OS 4.x (no rshd/rlogind/telnetd)" + @echo " newsos4 Sony NEWS/OS 4.x" + @echo " (newsos4)Use ftp://skylark.ics.es.osaka-u.ac.jp/pub/missing-func-news/" @echo "" @exit 1; -sunos4 sunos5 ultrix4 freebsd bsdi: +sunos4 sunos5 ultrix4 freebsd bsdi newsos4: for i in $(LIST1); \ do \ (cd $$i; $(MAKE) $@-skey); \ @@ -30,7 +31,7 @@ (cd $$i; $(MAKE) $@); \ done -hpux9 hpux10 newsos4 irix5 decosf1: +hpux9 hpux10 irix5 decosf1: for i in $(LIST1); \ do \ (cd $$i; $(MAKE) $@-skey); \ diff -r -u ./ftpd/vers.c ../logdaemon-5.6.NEWS/ftpd/vers.c --- ./ftpd/vers.c Sun Jan 5 09:36:05 1997 +++ ../logdaemon-5.6.NEWS/ftpd/vers.c Tue Jan 14 23:19:12 1997 @@ -1 +1 @@ -char version[] = "Version 4.118 Sat Jan 4 19:36:05 EST 1997"; +char version[] = "Version 4.119 Tue Jan 14 23:19:12 JST 1997"; diff -r -u ./ftpd/version ../logdaemon-5.6.NEWS/ftpd/version --- ./ftpd/version Sun Jan 5 09:36:05 1997 +++ ../logdaemon-5.6.NEWS/ftpd/version Tue Jan 14 23:19:12 1997 @@ -1 +1 @@ -118 +119 Only in ../logdaemon-5.6.NEWS: patch.1 diff -r -u ./rlogind/Makefile ../logdaemon-5.6.NEWS/rlogind/Makefile --- ./rlogind/Makefile Fri Apr 5 18:56:08 1996 +++ ../logdaemon-5.6.NEWS/rlogind/Makefile Wed Jan 15 00:24:06 1997 @@ -8,7 +8,7 @@ what: @echo Usage: make system-type. System types are: - @echo sunos5 sunos4 ultrix4 hpux9 + @echo sunos5 sunos4 ultrix4 hpux9 newsos4 @exit 1; sysv4: @@ -30,7 +30,7 @@ @$(MAKE) all SYS=$@ XFLAGS=-DHPUX9 newsos4: - @echo newsos4 has not been tested. + @$(MAKE) all SYS=$@ XFLAGS="-DULTRIX4 -DNEWSOS4" SYSLIBS=-lmissing decosf1: @echo decosf1 has not been tested diff -r -u ./rlogind/rlogind.c ../logdaemon-5.6.NEWS/rlogind/rlogind.c --- ./rlogind/rlogind.c Thu Oct 31 23:59:33 1996 +++ ../logdaemon-5.6.NEWS/rlogind/rlogind.c Tue Jan 14 23:53:26 1997 @@ -320,8 +320,13 @@ break; for (i = 0; i < 16; i++) { line[sizeof("/dev/ptyp") - 1] = "0123456789abcdef"[i]; +#ifdef NEWSOS4 + close(open(line, O_RDWR)); + p = open(line, O_RDWR); +#else close(open(line, O_RDWR | O_NOCTTY)); p = open(line, O_RDWR | O_NOCTTY); +#endif if (p > 0) goto gotpty; } @@ -330,7 +335,11 @@ /*NOTREACHED*/ gotpty: line[strlen("/dev/")] = 't'; +#ifdef NEWSOS4 + t = open(line, O_RDWR ); +#else t = open(line, O_RDWR | O_NOCTTY); +#endif if (t < 0) fatalperror(f, line); if (fchmod(t, 0)) diff -r -u ./rshd/Makefile ../logdaemon-5.6.NEWS/rshd/Makefile --- ./rshd/Makefile Wed Jan 24 04:11:51 1996 +++ ../logdaemon-5.6.NEWS/rshd/Makefile Wed Jan 15 01:01:12 1997 @@ -26,7 +26,7 @@ @$(MAKE) all SYS=$@ XFLAGS=-DHPUX9 newsos4: - @echo newsos4 has not been tested. + @$(MAKE) all SYS=$@ XFLAGS=-DULTRIX4 SYSLIBS=-lmissing decosf1: @$(MAKE) all SYS=$@ XFLAGS=-DDECOSF1 diff -r -u ./skey/Makefile ../logdaemon-5.6.NEWS/skey/Makefile --- ./skey/Makefile Fri Sep 20 16:20:05 1996 +++ ../logdaemon-5.6.NEWS/skey/Makefile Tue Jan 14 23:17:47 1997 @@ -5,7 +5,7 @@ KEYACCESS= $(KEY_DIR)/skey.access KEYFILE = $(KEY_DIR)/skeykeys CFLAGS = -O $(XFLAGS) -DPERMIT_CONSOLE -DKEYACCESS=\"$(KEYACCESS)\" \ - -DKEYFILE=\"$(KEYFILE)\" -DMD4 + -DKEYFILE=\"$(KEYFILE)\" -DMD5 OBJS = skeylogin.o skeysubr.o mdx.o put.o skeyaccess.o skey_getpass.o \ skey_crypt.o $(MISSING) BINS = key keyinfo keyinit diff -r -u ./telnetd/Makefile ../logdaemon-5.6.NEWS/telnetd/Makefile --- ./telnetd/Makefile Fri Apr 5 18:54:16 1996 +++ ../logdaemon-5.6.NEWS/telnetd/Makefile Wed Jan 15 00:27:00 1997 @@ -7,7 +7,7 @@ what: @echo Usage: make system-type. System types are: - @echo sunos5 sunos4 ultrix4 + @echo sunos5 sunos4 ultrix4 newsos4 @exit 1; all: lib telnetd @@ -23,6 +23,9 @@ bsd44 freebsd bsdi: @$(MAKE) all SYS=bsd44 XFLAGS=-DBSD44 + +newsos4: + @$(MAKE) all SYS=$@ XFLAGS="-DULTRIX4 -DNEWSOS4" SYSLIBS=-lmissing decosf1: @echo decosf1 has not been tested diff -r -u ./telnetd/telnetd.c ../logdaemon-5.6.NEWS/telnetd/telnetd.c --- ./telnetd/telnetd.c Sun Apr 14 19:55:26 1996 +++ ../logdaemon-5.6.NEWS/telnetd/telnetd.c Tue Jan 14 23:55:45 1997 @@ -362,8 +362,13 @@ break; for (i = 0; i < 16; i++) { line[sizeof("/dev/ptyp") - 1] = "0123456789abcdef"[i]; +#ifdef NEWSOS4 + close(open(line, O_RDWR )); + p = open(line, O_RDWR ); +#else close(open(line, O_RDWR | O_NOCTTY)); p = open(line, O_RDWR | O_NOCTTY); +#endif if (p > 0) goto gotpty; } @@ -373,7 +378,11 @@ gotpty: dup2(f, 0); line[strlen("/dev/")] = 't'; +#ifdef NEWSOS4 + t = open(line, O_RDWR ); +#else t = open(line, O_RDWR | O_NOCTTY); +#endif if (t < 0) fatalperror(f, line); if (fchmod(t, 0))