--- Makefile +++ Makefile 1996/03/23 01:43:34 @@ -4,15 +4,15 @@ # The program that knows how to deal with makefiles. [Uncomment if needed.] # MAKE=make # set CFLAGS to be -Ipath/to/special/includes if needed -CFLAGS= -O +CFLAGS= -O6 -fomit-frame-pointer -pipe -I../../c-news/libdbz #Uncomment the following for Solaris (and similiar SVR4 systems) #NETLIBS = -lsocket -lnsl #Uncomment the following if the previous one does not work #NETLIBS = -lnsl -lnet -lsocket # set DBLIBS to be -lneededlibrary if needed #DBLIBS = -ldbz -#DBLIBS = /usr/local/lib/dbz.o #/usr/local/lib/dbzdbm.o -#DBLIBS = -ldbm +DBLIBS = ../../c-news/libdbz/dbz.o ../../c-news/libdbz/dbzdbm.o +#DBLIBS = -ldb # add the resolver library if needed #RESLIB = -lresolv # add the kmem library if needed @@ -20,11 +20,11 @@ #Uncomment the following for Solaris (and similiar SVR4 systems) #KVMLIB = -lelf # Where nntpd is going to live -ETCDIR = /etc +ETCDIR = /usr/sbin # Where nntpxmit and nntpxfer is going to live -BINDIR = /usr/local/bin +BINDIR = /usr/bin # Where manual pages live -MANDIR = /usr/local/man +MANDIR = /usr/man # LIBS = $(DBLIBS) $(RESLIB) $(NETLIBS) $(KVMLIB) SUBMAKEFLAGS="LIBS=${LIBS}" "CFLAGS=${CFLAGS}" "ETCDIR=${ETCDIR}" "BINDIR=${BINDIR}" "MANDIR=${MANDIR}" --- Makefile.Linux +++ Makefile.Linux 1996/03/23 01:48:41 @@ -0,0 +1,9 @@ +conf.h: conf.h.dist + ln -s conf.h.dist conf.h + +compile: conf.h + make + +install: + make install + --- conf.h.dist +++ conf.h.dist 1996/03/23 01:42:31 @@ -8,13 +8,13 @@ */ -#undef ALONE /* True if we're running without inetd */ +#define ALONE /* True if we're running without inetd */ #ifdef ALONE -#undef FASTFORK /* True if we don't want to read active file on start*/ +#define FASTFORK /* True if we don't want to read active file on start*/ #endif -#define LOAD 5 /* Loadav above which server refuses connections */ +#define LOAD 8 /* Loadav above which server refuses connections */ /* * If you want the article array to be dynamically allocated instead of * being fixed at a preset size, define DYNAMIC_ART_ARRAY. @@ -40,23 +40,23 @@ #undef TLI /* Define this if you want to use TLI instead of */ /* sockets */ -#define NDBM /* Use new-style (4.3) ndbm(3x) libraries */ +#undef NDBM /* Use new-style (4.3) ndbm(3x) libraries */ #undef DBM /* True if we want to use the old dbm(3x) libraries */ /* IF YOU DEFINE THIS, change CFLAGS in makefile to */ /* be -ldbm */ -#undef DBZ /* True if we want to use dbz libraries */ +#define DBZ /* True if we want to use dbz libraries */ /* IF YOU DEFINE THIS, change CFLAGS in makefile to */ /* be /usr/lib/dbz.o and install dbz.h */ #undef USGHIST /* Use USG style history file (no DBM) */ /* IF YOU DO NOT DEFINE NDBM or DBM, this is DEFAULT!*/ -#undef CNEWS /* define this if you are running C News */ -#undef CNEWS_CLEARTEXT /* define this if you have a modern C News that handles +#define CNEWS /* define this if you are running C News */ +#define CNEWS_CLEARTEXT /* define this if you have a modern C News that handles input files ending in ".t" as cleartext */ -#undef BATCHED_INPUT /* define if you want to support C News style +#define BATCHED_INPUT /* define if you want to support C News style batched input (not supported by B-NEWS) */ #undef MSGID /* define this if you want to run msgidd to keep track of recent msgids via daemon */ @@ -70,9 +70,9 @@ /* typedefs for u_long */ #define VOIDSIG /* Newfangled signal() returns void, old returns int */ -#undef MMAP /* if your OS supports mmap() */ +#define MMAP /* if your OS supports mmap() */ -#undef DIRENT /* If you have define this */ +#define DIRENT /* If you have define this */ /* * If you DON'T have vfork, make this "#define vfork fork" @@ -95,7 +95,7 @@ /* Things that vary in network implementations */ #define SUBNET /* If you have 4.3 subnetting */ -#undef DAMAGED_NETMASK /* If your subnet mask is not a multiple of */ +#define DAMAGED_NETMASK /* If your subnet mask is not a multiple of */ /* four bits (e.g., UCSD) */ #undef NETMASK /* If you don't have subnet ioctls, define */ @@ -110,7 +110,7 @@ * if you are running BNEWS. At least, not yet. :-) */ -/* #define UMASK 022 */ +#define UMASK 022 /* * If you have the syslog library routine, define SYSLOG to @@ -133,7 +133,7 @@ */ /*#define FAKESYSLOG "/usr/lib/news/nntplog"*/ -#undef FAKEAPPEND +#define FAKEAPPEND #define SYSLOG LOG_NEWS @@ -183,7 +183,7 @@ * directory. However, if you want a separate hierarchy of overview * files, define it here. */ -/*#define OVERVIEW_DIR "/usr/spool/overviews" /* base directory */ +#define OVERVIEW_DIR "/var/spool/news/over.view" /* base directory */ #define XROVER /* xrover -- Return reference overview data */ @@ -215,7 +215,7 @@ * Person (user name) to post news as. */ -#define POSTER "usenet" +#define POSTER "news" /* * Define DOMAINMATCH if you want to use domain specifications in the @@ -262,7 +262,7 @@ #define SUBSCRIPTIONS_FILE "/usr/lib/news/subscriptions" #define NEWSGROUPS_FILE "/usr/lib/news/newsgroups" #define HISTORY_FILE "/usr/lib/news/history" -#define SPOOLDIR "/usr/spool/news" +#define SPOOLDIR "/var/spool/news" #define INEWS "/usr/lib/news/inews" #define RNEWS "/usr/bin/rnews" /* Link to inews? */ --- server/common.h +++ server/common.h 1996/03/23 01:40:52 @@ -86,7 +86,7 @@ #ifdef TIMEOUT #ifdef USG #include -#if !defined(SVR4) && !defined(hpux) +#if !defined(SVR4) && !defined(hpux) && !defined(linux) typedef struct { int fds_bits[1]; } fd_set; #endif #endif --- server/misc.c +++ server/misc.c 1996/03/23 01:40:52 @@ -695,7 +695,7 @@ */ #ifndef READ_SUPER #ifndef SVR4 -#if defined(sun) || defined(hpux) || defined(pyr) || defined(hp300) || defined(NeXT) +#if defined(sun) || defined(hpux) || defined(pyr) || defined(hp300) || defined(NeXT) || defined(linux) #include #define statfilesys statfs /* routine to call when trying to */ /* stat a file system to get the # */ @@ -965,7 +965,7 @@ ** none. */ -#if defined(USG) && !defined(SVR4) +#if (defined(USG) && !defined(SVR4)) || defined(linux) int getla() { --- support/acttimes.c +++ support/acttimes.c 1996/03/23 01:40:52 @@ -25,6 +25,7 @@ #ifdef NNTP_SUPPORT #include "../conf.h" #endif +#define USG #ifdef USG #include #else --- xfer/nntpxfer.c +++ xfer/nntpxfer.c 1996/03/23 01:40:52 @@ -454,11 +454,13 @@ #ifdef apollo rd_fp->_flag |= _SIERR; #else +#if 0 # if defined(BSD_44) && !defined(__osf__) rd_fp->_flags |= __SERR; # else rd_fp->_flag |= _IOERR; /* set stdio error */ # endif +#endif #endif #ifndef ETIMEDOUT errno = EPIPE; /* USG doesn't have ETIMEDOUT */ --- xmit/remote.c +++ xmit/remote.c 1996/03/23 01:40:52 @@ -333,10 +333,12 @@ #ifdef apollo fp->_flag |= _SIERR; #else -#if defined(BSD_44) && !defined(__osf__) +#if defined(BSD_44) && !defined(__osf__) && !defined(linux) fp->_flags |= __SERR; /* set stdio error */ # else +#if 0 fp->_flag |= _IOERR; /* set stdio error */ +#endif # endif #endif #ifndef ETIMEDOUT