From: hiramatu@mico.semicon.sony.co.jp (HIRAMATSU Satoshi/平松 智) Newsgroups: sony.sources.unix Subject: qpopper2.1.4-r3 for NEWS-OS 4.2.1a+ Message-ID: Date: 20 Feb 1996 18:45:59 JST Distribution: sony Organization: Semiconductor Company, Sony Corporation, Tokyo, Japan. Mime-Version: 1.0 (generated by tm-edit 7.41) こんにちは, 平松＠まいこんです. すでに動かされている方は大勢いらっしゃるかとは思いますが, qpoper2.1.4-r3をNEWS-OS 4.2.1a+でコンパイルして動かすためのパッチを 作ったので, ポストしておきます. なお, 以前, 南山＠BISさんがポストされたNEWS-OS 6.1用のパッチとはマー ジしていません. パッチを当てて, "make newsos4" でpopper.newsos4が出来上がります. あとは, INSTALL読んで適当に設定して上げて下さい. --- 平松＠生まれて此の方東京人 HIRAMATSU Satoshi E-mail: hiramatu@mico.semicon.sony.co.jp http://stf.mico.semicon.sony.co.jp/~hiramatu/ --------8<--------8<--------8<--------8<--------8<--------8<-------- diff -crN qpopper2.1.4.orig/Makefile qpopper2.1.4/Makefile *** qpopper2.1.4.orig/Makefile Thu May 11 02:14:21 1995 --- qpopper2.1.4/Makefile Tue Feb 20 17:03:01 1996 *************** *** 47,53 **** --- 47,57 ---- @echo " make pyramid" @echo " make linux" @echo " make osf1" + @echo " make newsos4" @echo "" + + newsos4: + make -f make.newsos4 sunos: make -f make.sunos diff -crN qpopper2.1.4.orig/make.newsos4 qpopper2.1.4/make.newsos4 *** qpopper2.1.4.orig/make.newsos4 Thu Jan 1 09:00:00 1970 --- qpopper2.1.4/make.newsos4 Tue Feb 20 18:31:38 1996 *************** *** 0 **** --- 1,80 ---- + #@(#)@(#)Makefile 2.5 2.5 4/3/91 + + CSRCS = flock.c pop_dele.c pop_dropcopy.c \ + pop_get_command.c pop_get_subcommand.c pop_init.c \ + pop_last.c pop_list.c pop_log.c pop_lower.c \ + pop_msg.c pop_parse.c pop_pass.c pop_quit.c \ + pop_rset.c pop_send.c pop_stat.c pop_updt.c \ + pop_user.c pop_xtnd.c pop_xmit.c popper.c \ + pop_bull.c xtnd_xlst.c pop_uidl.c mktemp.c pop_rpop.c + + OBJS = flock.o pop_dele.o pop_dropcopy.o \ + pop_get_command.o pop_get_subcommand.o pop_init.o \ + pop_last.o pop_list.o pop_log.o pop_lower.o \ + pop_msg.o pop_parse.o pop_pass.o pop_quit.o \ + pop_rset.o pop_send.o pop_stat.o pop_updt.o \ + pop_user.o pop_xtnd.o pop_xmit.o popper.o \ + pop_bull.o xtnd_xlst.o pop_uidl.o mktemp.o pop_rpop.o + + DOCS = README pop3.rfc1081 pop3e.rfc1082 popper.8 + + INCLUDES = popper.h version.h + + SRCS = ${CSRCS} ${INCLUDES} + + SCCS = /usr/ucb/sccs + + REL = + + #CC = gcc -fstrength-reduce -fpcc-struct-return + CC = cc + + MAKEFILE = Makefile + + # Defines are described in the INSTALL document. + + CFLAGS = -DHAVE_VSPRINTF -DNEWSOS4 + + TARGET = popper.newsos4 + + TAR = ${TARGET}.tar + + INSTALLDIR = /usr/local/lib + + MANPAGE = popper.8 + + CATPAGE = popper.0 + + MANDIR = /usr/local/man/cat8 + + + + ${TARGET}: ${OBJS} + ${CC} ${OBJS} -o ${TARGET} + + tar: ${SRCS} ${DOCS} ${MAKEFILE} + rm -f ${TAR} *.Z* + tar -cvf ${TAR} ${SRCS} ${DOCS} ${MAKEFILE} + compress ${TAR} + uuencode ${TAR}.Z ${TAR}.Z > ${TAR}.Z.uuencoded + split -300 ${TAR}.Z.uuencoded + mv xaa ${TAR}.Z.uuencoded.xaa + mv xab ${TAR}.Z.uuencoded.xab + mv xac ${TAR}.Z.uuencoded.xac + mv xad ${TAR}.Z.uuencoded.xad + mv xae ${TAR}.Z.uuencoded.xae + + clean: + rm -f core *.o *.Z* + ${SCCS} clean + + sources: ${SRCS} + + ${SRCS}: + ${SCCS} get ${REL} $@ -p | expand -4 > $@ + + ${DOCS}: + ${SCCS} get README -p | expand -4 > README + ${SCCS} get popper.8 -p | expand -4 > popper.8 + + ${OBJS}: popper.h version.h diff -crN qpopper2.1.4.orig/pop_bull.c qpopper2.1.4/pop_bull.c *** qpopper2.1.4.orig/pop_bull.c Wed May 24 05:27:52 1995 --- qpopper2.1.4/pop_bull.c Tue Feb 20 17:15:43 1996 *************** *** 5,10 **** --- 5,11 ---- #include #include + #include #ifdef NODIRENT #include #include diff -crN qpopper2.1.4.orig/pop_xmit.c qpopper2.1.4/pop_xmit.c *** qpopper2.1.4.orig/pop_xmit.c Fri May 26 01:52:49 1995 --- qpopper2.1.4/pop_xmit.c Tue Feb 20 18:28:42 1996 *************** *** 28,33 **** --- 28,37 ---- #include "popper.h" + #ifdef NEWSOS4 + #define WEXITSTATUS(s) (((s).w_status >> 8) & 0377) + #endif + /* * xmit: POP XTND function to receive a message from * a client and send it in the mail *************** *** 42,47 **** --- 46,52 ---- char buffer[MAXLINELEN]; /* Read buffer */ char temp_xmit[MAXDROPLEN]; /* Name of the temporary filedrop */ + #ifndef NEWSOS4 /* #if defined(SOLARIS2) || defined (POPSCO) || (defined(BSD) && (BSD >= 199306)) || defined(OSF1) */ *************** *** 51,56 **** --- 56,65 ---- union wait stat; #endif */ + #else + union wait stat; + struct rusage rusage; + #endif PID_T id, pid; /* Create a temporary file into which to copy the user's message */ *************** *** 125,131 **** --- 134,144 ---- /* #ifdef PID_WAIT */ + #ifndef NEWSOS4 id = waitpid(pid, &stat, 0); + #else + id = wait4(pid, &stat, 0, &rusage); + #endif /* #else while((id = wait(&stat)) >=0 && id != pid); diff -crN qpopper2.1.4.orig/popper.h qpopper2.1.4/popper.h *** qpopper2.1.4.orig/popper.h Fri May 26 02:18:54 1995 --- qpopper2.1.4/popper.h Tue Feb 20 17:10:26 1996 *************** *** 156,162 **** --- 156,166 ---- /* Set these to the types your OS returns if they are not already typedefed for you */ #define OFF_T off_t + #ifndef NEWSOS4 #define PID_T pid_t + #else + #define PID_T int + #endif #define UID_T uid_t #define GID_T gid_t