diff -ruN inn-2.2.2/ChangeLog inn-2.2.3/ChangeLog --- inn-2.2.2/ChangeLog Mon Dec 13 05:18:37 1999 +++ inn-2.2.3/ChangeLog Tue Jul 18 16:54:07 2000 @@ -1,261 +1,466 @@ -This file lists the change logs applicable to version 2.2.2 made since the -2.2.1 release. +2000-07-17 02:16 rra + + * storage/overview.c: Fix uninitialized variable in OVERcheckmmap. + From Kees Bakker . + +2000-07-17 02:11 rra + + * backends/actsync.c: Fix the check for Collabra "yg" flags; a typo + was causing it to corrupt the newsgroup flags and may have been + causing other problems. From Kees Bakker . + +2000-07-13 01:01 rra + + * config.guess, config.sub: Update to the 2000-06-13 versions. + +2000-07-11 23:27 rra + + * include/innversion.h: Bump version number to 2.2.3, update date. + +2000-07-11 23:26 rra + + * README, INSTALL, Makefile: Version number is now 2.2.3. + +2000-07-11 23:26 rra + + * NEWS: 2.2.3 updates. + +2000-06-30 02:16 rra + + * INSTALL: Document --enable-uucp-rnews and --enable-setgid-inews. + +2000-06-30 02:15 rra + + * frontends/Makefile: rnews's group and inews's and rnews's + permissions are controlled by make variables. + +2000-06-30 02:15 rra + + * Makefile.global.in: Propagate the inews and rnews mode and the + rnews group to all the individual makefiles now that they're set by + configure. + +2000-06-30 02:14 rra + + * configure, configure.in: Add --enable-setgid-inews and + --enable-uucp-rnews options. + +2000-06-29 22:25 rra + + * innfeed/misc.c: SECURITY: Possible stack overflow in innfeed + caused by passing potential user data to syslog as the format + parameter. + +2000-06-29 03:45 kondou + + * backends/batcher.c: + BUFSIZ is too short for some Unix boxes + +2000-06-27 09:16 rra + + * lib/getconfig.c: innconf->mailcmd is supposed to default to + pathbin/innmail, but didn't. Fixed. + +2000-06-24 08:34 rra + + * include/nntp.h: Lower the message ID limit to 250 octets, + reflecting additional discussion on USEFOR, and include more + details on the history of this limit. + +2000-06-21 23:31 rra + + * lib/clientlib.c: Guard against buffer overflows in + getserverbyfile. + +2000-06-21 08:30 rra + + * backends/nntpget.c: Catch the case where no host is given on the + command line and server isn't set in inn.conf and print a more + comprehensible error message. + +2000-06-21 02:43 rra + + * nnrpd/perl.c: Don't include the space after the colon as part of + the value of the header when loading the Perl hash; it causes + introduction of an extra space in all non-standard headers when + $modify_headers is set, not to mention being slightly + counterintuitive. + +2000-06-15 02:55 kondou + + * samples/innreport.in: + From: Dave Shrimpton + + The bug is due to /o switch being used in the pattern match in the + Rotate function, causing only the first filename called with to be + matched. Therefore only news-notice.*.html is cycled and the other + filenames are ignored. + +2000-06-13 08:26 rra + + * include/nntp.h, innd/art.c: Reject excessively long message IDs + (> 497 characters). + +2000-06-09 00:39 rra + + * innd/nc.c: Limit errors from the Perl message ID filter to 200 + characters out of paranoia. + +2000-06-06 19:58 rra + + * innd/art.c: SECURITY: Possible buffer overflow in the log message + for a mismatch between the addresses of a cancel and the original + message if verifycancels is enabled in inn.conf. Use MaxLength to + cap the length of the logged message ID on verifycancels, cap the + length of filter message returns at 200 characters out of paranoia, + and use MaxLength to cap the length of a newsgroup one isn't + allowed to post to (paranoia). + +2000-05-22 22:51 kondou + + * frontends/rnews.c: + From: Florian Laroche + + fixed uncommitted for 2.2.2 + +2000-05-13 04:37 kondou + + * doc/mailpost.8: + From: Kenichi Okada + + typo fixed + +2000-05-12 04:12 kondou + + * storage/overview.c: + null pattern was not detected correctly in overview.ctl + +2000-05-08 22:25 kondou + + * nnrpd/nnrpd.c: + From: Heiko Schlichting + + If nnrpd is started in daemon mode (and only then) and two or more + nnrpd processes try to access articles in the same CNFS buffer + simultaneously there are conflicts which cause article loss for the + reader. The problem seems to be the opening of the CNFS buffer, + which are done in SetupDaemon() *before* the daemon forks. + +2000-05-07 13:48 kondou + + * lib/dbz.c: + From: Kiyokazu SUTO + + fix for compilation error on linux box(kernel 2.2.14 and libc + 5.4.46) + +2000-05-03 02:00 rra + + * samples/sendbatch.in: Fix syntax error in uustat invocation line. + +2000-05-01 02:23 rra + + * innd/art.c: In the keyword generation code, don't add the number + of ignored keywords to the end of the keyword line because it + causes a potential buffer overflow if the number of ignored + keywords is greater than 100. + +2000-04-29 14:08 kondou + + * innd/art.c: + From: Karl Kleinpaste + + fixed the problem that if "Newsgroups:full" is added to + overview.fmt, then overviews get the proper contents added, but + with an incorrect '\0' as the separator between group names + + fixed the problem tossed out before appending the result to the + overview buffer + +2000-04-13 19:03 rra + + * samples/control.ctl: Remove all checkgroups:*:...:drop or + checkgroups:*@*:...:drop lines. The third field is not checked for + checkgroups until after the drop or process decision is made, so + these lines were causing valid checkgroups for other hierarchies to + be dropped since they match all checkgroups. Reported by Michael + Schroeder . + +2000-04-13 18:47 rra + + * include/: clibrary.h.in, config.h.in: Include sys/select.h in + clibrary.h if the platform has it to get the right definition of + fd_set on AIX. (The mainline has a better fix for this, but it + isn't suitable for this branch.) + +2000-04-13 18:29 rra + + * innd/rc.c: Import Heath Kehoe's bug fix from CURRENT: + + max-connections and hold-time were not getting set to their default + values. If you did not set them anywhere in incoming.conf, they'd + wind up with uninitialized values. + + If you put a hostname: and a hold-time: in the same block, it would + bomb with 'duplicate key'. This is because the *_CONFIG macros + were wrong. Same would happen with streaming: and noresendid:. + +2000-04-09 21:13 rra + + * doc/ctlinnd.8: The creator for ctlinnd newgroup defaults to + newsmaster if not given, not the empty string. + +2000-04-07 08:35 rra + + * include/ppport.h: Apply portability fixes from mainline. + +2000-04-05 22:09 kondou + + * samples/innreport.in: + From: "Yury B.Razbegin" + + In innreport 3.0.2 there is old error in transmission of the + parameter to a tag - between "BODY" and $body no space - + thus it is not worked. + +2000-04-05 22:06 kondou + + * backends/actsyncd.sh.in: + From: Olaf Titz + + actsyncd failing with a shell syntax error in the line if [ + "$status" -ne "$NOSYNC" ]; then where status="". + +2000-04-05 13:51 kondou + + * storage/cnfs/cnfs.c: + skip checking bit maps to see if they are not unset for article + size when retrieving + +2000-04-04 22:42 kondou + + * nnrpd/misc.c: + %m in syslog() is meaningless for error of strchr() + +2000-04-04 22:36 kondou + + * doc/libinn.3: + fixed incorrect definition of NNTPconnect() and NNTPremoteopen() + +2000-03-20 22:33 kondou + + * frontends/rnews.c: + fixed spooling failure if pathtmp and pathincoming are not the same + partition + +2000-03-11 16:50 kondou + + * lib/clientactive.c: + From: Eugene Gladchenko + + the path of active is innconf->pathdb + +2000-02-24 15:22 kondou + + * configure, configure.in: + reported by Joe St Sauver + + specifying both --with-largefiles and --disable-tagged-hash caused + an error + +2000-02-24 12:21 kondou + + * samples/mailpost.in: + From: Steve Campbell + + mailpost was not catching duplicate headers if the header names + were in different cases + +2000-02-21 13:10 kondou + + * innd/: lc.c, rc.c: + returned value of NCcreate() was not checked + +2000-02-10 17:37 kondou + + * samples/cnfsstat.in: + From: KIDZU takashi + + did not logged thru syslog for alpha + +2000-01-30 15:05 kondou + + * storage/cnfs/cnfs.c: + last article in the buffer was missed in SMnext() + +2000-01-26 14:07 kondou + + * samples/innreport.in: + From: Fabien Tassin + + A bug *could* occur Jan 1st depending upon both when innreport was + invoked and what the last date found in the log was compared to the + new year + +2000-01-25 03:58 kondou + + * samples/controlchan.in: + 'all' was ignored + +2000-01-17 13:31 kondou + + * innd/nc.c: + From: "N.KomaZaki" + + might cause SIGSEGV + +2000-01-17 03:26 kondou + + * samples/sendbatch.in: + From: Paul Taylor + + get the sendbatch script working under Solaris 2.6 - it doesn't + have uuq, so uustat with some filtering was used instead + +2000-01-17 03:16 kondou + + * samples/checkgroups.in: + From: Paul Taylor + + fixes a syntax error in the checkgroups script - the single quotes + prevent expansion of the NEWSGROUPPATS variable, so they have been + replaced with double quotes + +2000-01-15 08:51 kondou + + * INSTALL, configure.in, configure: + --with-largefiles can not be used with --enable-tagged-hash + +2000-01-11 14:56 kondou + + * innd/rc.c: + extend read buffer to BIG_BUFFER(8192) + +2000-01-11 14:43 kondou + + * backends/overchan.c: + From: Usenet.News@msfc.nasa.gov (Unknown News Administrator) -samples/inncheck.in: - - From: Wolfgang Breyha - - The "inncheck" Util doesn't check for lines of the style "%DEFINEx:" - in nnrp.access. - -innd/art.c: - - previous patch still does not fix the problem which leads innd - dumping core - -innd/art.c: - - From: Don Lewis - - There's a bug in the ARTpost() function - when it sees an article - with a distribution header such as "Distribution: ," (note the - comma), the DISTparse() function returns a distribution[] array with - a null pointer as it's first element (i.e., an empty list). The later - call to MaxLength() in the arguments to sprintf() dereferences this - and dies in flames. - -doc/innfeed.1: -doc/innfeed.conf.5: - - drop beta description - -README: - - drop beta description - - Add documentation of innflags in inn.conf and of the syntax of - incoming.conf. By Richard Kettlewell . - -samples/innreport_inn.pm: - - From: Michael Hall - - fixes the error that says "Use of uninitialized value at ..." - -nnrpd/udp.c: - - fix for ULTRIX (strdup() does not exist) - -frontends/innconfval.c: - - fix for ULTRIX (strdup() does not exist) - -backends/inndf.c: - - From: Hiroshi MIZOGUCHI - - patch to make ULTRIX work - - Add support for alphaev6. - -lib/endian.c: - - From: Hiroshi MIZOGUCHI - - fixed for ULTRIX - -innd/art:c - - check of path in ListHas() was incorrect - -nnrpd/misc.c: - - From: Russell Vincent - - broken newnews (y2k problem) fixed - -samples/innreport.in: - - From: David Shrimpton - - If you set cycle to other than none , eg 7 in innreport.conf then - index.html is missing all the daily reports that are listed in - innreport.db - -samples/pgpverify.in: - - From: David Shrimpton - - Bug in errmsg subroutine in pgpverify which causes pgpverifies to be - syslogged with undefined facility - -backends/batcher.c: - - From: David Shrimpton - - "Reading config from /usr/local/news/etc/inn.conf" messages to be - syslogged with undefined facility. - -samples/innshellvars.pl.in: -samples/innshellvars.tcl.in: - - delete useless variable - - The innreport.conf setting for graph was ignored. - - Typo in openlog(). - - The fcntl() flag is F_SETFD, not FD_SETFD. - -frontends/sm.c: - - do not call SMinit() if there is no token in arguments - -samples/cnfsstat.in: - - skip if no article is stored - -samples/control.ctl: - - add drop entry for PGP signed hierarchy - - Use space instead of tab after To: to work around a bug in Solaris - sendmail. - -innd/art.c: - - From: Sven Paulus - - innd may dump core when copying Bytes header - -innd/nc.c: - - From: Heiko Schlichting - - When streaming is enabled and INN gets a NNTP "check" command WITHOUT - a following space/tab and message-id, it prints some memory dump to - the requestor - -innd/status.c: - - From: Heiko Schlichting - - inn crashes immediately if status was enabled and the compile-time - "MAX_PEER" limit is reached - -samples/innreport_inn.pm: - - 'ME' was included for innfeed stats - -nnrpd/post.c: - - '\r' was lost, if header is folded - -innd/chan.c: - - From: rmtodd@skywalker.ecn.ou.edu (Richard Todd) - - This patch clears cp->In.Data and cp->Out.Data after the data they - point to are freed in CHANclose, thus making sure that we don't try - to free the same data again in CHANshutdown, thus littering the - errlog with - innd in free(): warning: page is already free. - warnings from the malloc/free code. - -samples/innreport_inn.pm: - - cancel message which recorded as 'c' was counted twice (also recorded - as '+') ($inn_flow_total was incorrectly incremented) - - Fix typo causing make distclean not to remove include/autoconfig.h. - - Use ppport.h for cross-version Perl compatibility rather than - individual #define's in each file. Also convert the last few - occurances of na to PL_na and remove some duplicate #include's. - - Rename include/patchlevel.h to include/innversion.h to avoid conflicts - with Perl header files. - -doc/newsfeeds.5: - - description of ME/exclude was dropped - -doc/Makefile: - - mod-active.8 and simpleftp.1 were still not installed - - mod-active.8 was missing from the list of man pages. Reported by John - Summerfield . - -innd/art.c: - - replic data was broken if storage api and xrefslave is true -innd/innd.h: -innd/status.c: - - Size may be overflow - -frontends/inews.c: - - From: Steve Campbell - - the comparison of mail address should be case-insensitive - -samples/innreport_inn.pm: - - still did not calculate outgoing feed correctly - -samples/innreport_inn.pm: - - innreport should see 'global' log message, or outgoing feed is much - less than reality - -innd/chan.c: - - paused connection might not be revived correctly when another active - connection is closed - -innfeed/host.c: - - fixed a problem that 'final' stats was not out if the connection - is vanished - -innd/chan.c: -innd/innd.h: -innd/rc.c: - - 'max-connections' in incoming.conf was effective on each IP address, - not each label - -backends/batcher.c: - - From: KIZU takashi - - still had a bug, and fixed it - -backends/batcher.c: - - From: KIZU takashi - - If any batch file is not opend yet and some kind of signals is - trapped, the function RequeueAndExit(-1, NULL, 0L) will be called and - the top line in a queue file will be lost. - - If (BytesInBatch > 0 && BytesInCB + BytesInArt >= BytesInBatch) and - (MaxBytes > 0 BytesWritten + BytesInArt >= MaxBytes), then `while - (fgets...)' loop is breaked. But the function BATCHclose(F) usually - returns 0. Hence `Cookie' is ignored in the function RequeueAndExit(). - -innd/nc.c: - - reported by Paul Tomblin - - 'internal rejecting huge article ..' should not be informed as L_ERROR - -innd/art.c: - - reported by Paul Gamble - - the Xref header in the article as it appears on the reader server - contains the reader's hostname and not the transit server's - in slave mode - -samples/parsecontrol.in: - - From: YOKOTA yoshinori - - gnu sed was failed to parse - -frontends/inews.c: - - From: Russell Vincent - - missing '\n' in a couple of error reports - - Clean up the environment initialization and fix a potential buffer - overflow reported by Stan Bubrouski . Allocate - memory for each environment variable in-place without copying things - through a buffer. - -configure: -configure.in: - - From: "Boyd Lynn Gerber (801) 250-O795 Work" - - Patch for configure.in for SCO OpenServer 5.0.X and UnixWare 7.1.0 - -samples/nntpsend.in: - - From: Russell Vincent - - prevent nntpsend from overwriting its own batches when using - storageapi and under certain circumstances (most likely when - innxmit to a site isn't running and there is already a backlog). - -README: - - From: ambar@clock.org - - typo fixed - -nnrpd/article.c: - - reported by Damien Masse - - I found this bug in INN version 2.2 (and version 2.1) : - when you ask for the last header of the overview file with the 'xhdr' - command, nnrp displays each header followed by a "\n ". - -nnrpd/perl.c: - - From: Jan-Erik Eriksson - - Using the --with-perl on inn-2.2.1 (RedHat 5.2, perl5.00405) will - cause make to fail. - -lib/perl.c: - - From: Jan-Erik Eriksson - - Using the --with-perl on inn-2.2.1 (RedHat 5.2, perl5.00405) will - cause make to fail. - -innd/cc.c: -innd/perl.c: - - From: Jan-Erik Eriksson - - Using the --with-perl on inn-2.2.1 (RedHat 5.2, perl5.00405) will - cause make to fail. - -nnrpd/newnews.c: - - '>' was missed for the response - - -Local Variables: -mode: text -End: + overchan did not see Xref header carefully + +2000-01-08 18:05 kondou + + * innd/rc.c: + duplicated key/value entry is now logged and treated as syntax + error + + reading incoming.conf after previous reading failure failed even if + there is no syntax error(innd: SERVER Unknown value line 0: + /usr/lib/news/etc/incoming.conf) + +2000-01-08 18:03 kondou + + * doc/incoming.conf.5: + duplicated key/value entry is now logged and treated as syntax + error + +2000-01-07 16:34 kondou + + * samples/control.ctl: + From: J{rvinen Hannu-Matti + + Coordinator of the sfnet groups is changed + + did not contain last update in CURRENT + +2000-01-07 15:59 kondou + + * lib/parsedate.y: + did not care closest century + +2000-01-03 06:44 kondou + + * lib/parsedate.y: + Bettina Fink + + articles posted before epoch were not rejected in a certain case + +1999-12-31 18:10 kondou + + * innd/nc.c: + innd still pushed banner even when throttled + +1999-12-28 17:13 kondou + + * configure.in, configure: + From: Motoyuki Kasahara + + configure script in INN-2.2.2 sets `DO_TCL' to `DO' even when I + specify `--without-tcl' option. Also `--without-perl' and + `--without-largefiles' seem to have the same bug + +1999-12-23 22:05 kondou + + * backends/batcher.c: + From: Heinz Diehl + + every posted article will be batched again and again every time + batcher is called. Also the file + $NEWSSPOOL/outgoing/.uucp does contain the entry for the + article(s) to be send forever, it gets not erased or set to zero, + and so batcher batches these articles again and again + +1999-12-20 02:41 kondou + + * storage/cnfs/cnfs.c: storage/cnfs/cnfs.c + + set art->token to NULL if art->len is 0 in cnfs_next() + +1999-12-20 02:40 kondou + + * expire/makehistory.c: + do not call SMcancel if art->token is NULL + +1999-12-17 10:00 kondou + + * samples/checkgroups.in: + '\' should not be included in '-EOF-' + + ${NEWSGROUPPATS} was not extracted, since it was quoted by ' + +1999-12-15 16:00 kondou + + * doc/storage.conf.5: + reported by Kenichi Okada + + drop tradspool which is not supported for 2.2.* + +1999-12-13 13:05 brister + + * Makefile: Changed a couple rules from single-colon to + double-colon + +1999-12-13 12:47 brister + + * NEWS: 2.2.2 update + +1999-12-13 12:36 brister + + * include/innversion.h: 2.2.2 update + +1999-12-13 12:32 brister + + * README: 2.2.2 updates. + +1999-12-13 12:30 brister + + * Makefile: Version update Fixed rules from the pre-CVS days. + +1999-12-13 12:28 brister + + * INSTALL: Changes for 2.2.2 + +1999-12-13 12:24 brister + + * ChangeLog: 2.2.2-only changes + diff -ruN inn-2.2.2/INSTALL inn-2.2.3/INSTALL --- inn-2.2.2/INSTALL Mon Dec 13 05:18:37 1999 +++ inn-2.2.3/INSTALL Tue Jul 18 16:54:07 2000 @@ -1,11 +1,11 @@ -Welcome to INN 2.2.2! +Welcome to INN 2.2.3! Please read this document thoroughly before trying to install INN. You'll be glad you did. If you are upgrading from a previous release of INN (pre-2.0) then it is recommended that you make copies of your old configuration files and use them - as guides for doing a clean installation and configuration of 2.2.2. Many + as guides for doing a clean installation and configuration of 2.2.3. Many config files have changed, some have been added, and some have been removed. You'll find it much easier to start with a fresh install than to try to update your old installation. @@ -169,6 +169,8 @@ extendeddbz: extendeddbz in inn.conf tablesize: value in 3rd field on the 1st line in history.dir + NOTE: --with-largefiles can not be used with + --enable-tagged-hash --with-perl Enables support for Perl, allowing you to install filter scripts written in Perl. Highly recommended, @@ -186,6 +188,32 @@ --disable-shared Do not create shared libraries --disable-static Do not create static libraries + + --enable-uucp-rnews If this option is given to configure, rnews will be + installed setuid root, owned by group uucp, and mode + 4550. This will allow the UUCP subsystem to run + rnews to process UUCP batches of news articles (rnews + changes UID to the news user right after it starts). + Prior to INN 2.2.3, installing rnews setuid news was + standard; since most sites no longer use UUCP, it is + no longer the default as of INN 2.2.3 and must be + requested at configure time. You probably don't want + to use this option unless your server accepts UUCP + news batches. + + --enable-setgid-inews If this option is given to configure, inews will be + installed setgid news and world-executable so that + non-privileged users on the news server machine can + use inews to post articles locally (somewhat faster + than opening a new network connection). For + standalone news servers, by far the most common + configuration now, there's no need to use this + option; even if you have regular login accounts on + your news server, INN's inews can post fine via a + network connection to your running news server and + doesn't need to use the local socket (which is what + setgid enables it to do). Installing inews setgid + was the default prior to INN 2.2.3. A suggested set of options, provided you have the necessary software installed, is "./configure --with-perl". diff -ruN inn-2.2.2/Makefile inn-2.2.3/Makefile --- inn-2.2.2/Makefile Mon Dec 13 05:18:37 1999 +++ inn-2.2.3/Makefile Tue Jul 18 16:54:07 2000 @@ -1,11 +1,11 @@ -## $Revision: 1.18.2.9 $ +## $Revision: 1.18.2.10 $ include Makefile.global CFLAGS = $(GCFLAGS) RELEASE=2 -PATCHLEVEL=2.2 +PATCHLEVEL=2.3 VERSION=$(RELEASE).$(PATCHLEVEL) #TARDIR=inn diff -ruN inn-2.2.2/Makefile.global.in inn-2.2.3/Makefile.global.in --- inn-2.2.2/Makefile.global.in Mon Dec 13 05:18:37 1999 +++ inn-2.2.3/Makefile.global.in Tue Jul 18 16:54:07 2000 @@ -1,4 +1,4 @@ -## $Id: Makefile.global.in,v 1.23 1998/10/13 12:23:08 coneill Exp $ +## $Id: Makefile.global.in,v 1.23.2.1 2000/06/30 02:15:22 rra Exp $ ## This file is meant to be the central Makefile that configure works with ## and that all other Makefiles include @@ -40,8 +40,10 @@ EXTRA_SRC = @EXTRA_SRC@ OWNER = -O @NEWSUSER@ -G @NEWSGRP@ -ROWNER = -O @NEWSUSER@ -G uucp +ROWNER = -O @NEWSUSER@ -G @RNEWSGRP@ NEWSGROUP = @NEWSGRP@ +INEWSMODE = @INEWSMODE@ +RNEWSMODE = @RNEWSMODE@ PATHNEWS = @prefix@ PATHBIN = @prefix@/bin diff -ruN inn-2.2.2/NEWS inn-2.2.3/NEWS --- inn-2.2.2/NEWS Mon Dec 13 05:18:37 1999 +++ inn-2.2.3/NEWS Tue Jul 18 16:54:07 2000 @@ -1,6 +1,20 @@ Here are the changes for the latest version of INN. +Version 2.2.3 + + - INN no longer installs inews setgid news or rnews setuid root by + default. If you need the old behavior, --enable-uucp-rnews or + --enable-setgid-inews must be given to configure. See INSTALL + for more information. + - A security hole when verifycancels is turned on in inn.conf (not + the default) was fixed. + - Message IDs are now limited to 250 octets to prevent + interoperability problems with other servers. + - Various other security paranoia fixes have been made. + - Embedded Perl filters fixed to work with Perl 5.6.0. + - Lots of bug fixes. + Version 2.2.2 - Various minor bug fixes and a y2k bug fix. The y2k bug is in version diff -ruN inn-2.2.2/README inn-2.2.3/README --- inn-2.2.2/README Mon Dec 13 05:18:37 1999 +++ inn-2.2.3/README Tue Jul 18 16:54:07 2000 @@ -1,4 +1,4 @@ -Welcome to INN 2.2.2! +Welcome to INN 2.2.3! This work is sponsored by the Internet Software Consortium. @@ -211,6 +211,6 @@ more about the ISC's goals and accomplishments from the web page at . -James Brister +Russ Allbery & Katsuhiro Kondou inn-bugs@isc.org -- bug reports. inn@isc.org -- general INN related mail diff -ruN inn-2.2.2/backends/actsync.c inn-2.2.3/backends/actsync.c --- inn-2.2.2/backends/actsync.c Mon Dec 13 05:18:37 1999 +++ inn-2.2.3/backends/actsync.c Tue Jul 18 16:54:07 2000 @@ -1,4 +1,4 @@ -/* @(#) $Id: actsync.c,v 1.18.2.1 1999/03/18 04:17:23 kondou Exp $ */ +/* @(#) $Id: actsync.c,v 1.18.2.2 2000/07/17 02:11:13 rra Exp $ */ /* @(#) Under RCS control in /usr/local/news/src/inn/local/RCS/actsync.c,v */ /* * actsync - sync or merge two active files @@ -1436,7 +1436,7 @@ case 'y': /* of COURSE: collabra has incompatible flags. but it */ /* looks like they can be fixed easily enough. */ - if (cur->type[1] = 'g') { + if (cur->type[1] == 'g') { cur->type[1] = '\0'; } case 'm': diff -ruN inn-2.2.2/backends/actsyncd.sh.in inn-2.2.3/backends/actsyncd.sh.in --- inn-2.2.2/backends/actsyncd.sh.in Mon Dec 13 05:18:37 1999 +++ inn-2.2.3/backends/actsyncd.sh.in Tue Jul 18 16:54:07 2000 @@ -1,5 +1,5 @@ #!@_PATH_SH@ -# @(#) $Id: actsyncd.sh.in,v 1.3.2.2 1999/04/07 08:05:00 kondou Exp $ +# @(#) $Id: actsyncd.sh.in,v 1.3.2.3 2000/04/05 22:06:58 kondou Exp $ # @(#) Under RCS control in /usr/local/news/src/inn/local/RCS/actsyncd.sh,v # # actsyncd - actsync daemon @@ -155,6 +155,7 @@ for loop in 1 2 3 4 5 6 7 8 9 10; do # get the active file to compare against + status=0 case $host in /*) cp $host active ;; .*) cp $origdir/$host active ;; diff -ruN inn-2.2.2/backends/batcher.c inn-2.2.3/backends/batcher.c --- inn-2.2.2/backends/batcher.c Mon Dec 13 05:18:37 1999 +++ inn-2.2.3/backends/batcher.c Tue Jul 18 16:54:07 2000 @@ -1,4 +1,4 @@ -/* $Revision: 1.9.2.3 $ +/* $Revision: 1.9.2.5 $ ** ** Read batchfiles on standard input and spew out batches. */ @@ -94,8 +94,8 @@ static char LINE1[] = "batcher %s times user %.3f system %.3f elapsed %.3f"; static char LINE2[] ="batcher %s stats batches %d articles %d bytes %ld"; static char NOWRITE[] = "batcher %s cant write spool %s\n"; - char temp[BUFSIZ]; - char buff[BUFSIZ]; + char temp[BIG_BUFFER]; + char buff[BIG_BUFFER]; int i; FILE *F; TIMEINFO Now; @@ -122,7 +122,7 @@ /* Last batch exit okay? */ if (BATCHstatus == 0) { - if (feof(stdin) && Cookie == -1) { + if (feof(stdin) && Cookie != -1) { /* Yes, and we're all done -- remove input and exit. */ (void)fclose(stdin); if (Input) @@ -219,8 +219,8 @@ TIMEINFO Now; char *p; char *data; - char line[BUFSIZ]; - char buff[BUFSIZ]; + char line[BIG_BUFFER]; + char buff[BIG_BUFFER]; long BytesInArt; long BytesInCB; OFFSET_T Cookie; diff -ruN inn-2.2.2/backends/nntpget.c inn-2.2.3/backends/nntpget.c --- inn-2.2.2/backends/nntpget.c Mon Dec 13 05:18:37 1999 +++ inn-2.2.3/backends/nntpget.c Tue Jul 18 16:54:07 2000 @@ -1,4 +1,4 @@ -/* $Revision: 1.11.4.1 $ +/* $Revision: 1.11.4.2 $ ** Connect to a remote site, and get news from it to offer to our local ** server. Read list on stdin, or get it via NEWNEWS command. Writes ** list of articles still needed to stdout. @@ -135,6 +135,11 @@ i = NNTPconnect(host, NNTP_PORT, &From, &To, (char *)NULL); else { host = innconf->server; + if (host == NULL) { + fprintf(stderr, + "No server specified and server not set in inn.conf\n"); + exit(1); + } i = NNTPlocalopen(&From, &To, (char *)NULL); } if (i < 0) { diff -ruN inn-2.2.2/backends/overchan.c inn-2.2.3/backends/overchan.c --- inn-2.2.2/backends/overchan.c Mon Dec 13 05:18:37 1999 +++ inn-2.2.3/backends/overchan.c Tue Jul 18 16:54:07 2000 @@ -1,4 +1,4 @@ -/* $Revision: 1.20 $ +/* $Revision: 1.20.2.1 $ ** ** Parse input to add to news overview database. */ @@ -227,7 +227,7 @@ } } else { /* Find the groups and article numbers. */ - if ((Xref = strstr(Data, "Xref:")) == NULL) { + if ((Xref = strstr(Data, "\tXref:")) == NULL) { fprintf(stderr, "overchan missing xref header\n"); continue; } diff -ruN inn-2.2.2/config.guess inn-2.2.3/config.guess --- inn-2.2.2/config.guess Mon Dec 13 05:18:37 1999 +++ inn-2.2.3/config.guess Tue Jul 18 16:54:07 2000 @@ -1,7 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 93, 94, 95, 96, 1997 Free Software Foundation, Inc. -# +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000 +# Free Software Foundation, Inc. + +version='2000-06-13' + # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or @@ -22,7 +25,7 @@ # the same distribution terms that you use for the rest of that program. # Written by Per Bothner . -# The master version of this file is at the FSF in /home/gd/gnu/lib. +# Please send patches to . # # This script attempts to guess a canonical system name similar to # config.sub. If it succeeds, it prints the system name on stdout, and @@ -35,6 +38,60 @@ # (but try to keep the structure clean). # +me=`echo "$0" | sed -e 's,.*/,,'` + +usage="\ +Usage: $0 [OPTION] + +Output the configuration name of this system. + +Operation modes: + -h, --help print this help, then exit + -V, --version print version number, then exit" + +help=" +Try \`$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case "$1" in + --version | --vers* | -V ) + echo "$version" ; exit 0 ;; + --help | --h* | -h ) + echo "$usage"; exit 0 ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + exec >&2 + echo "$me: invalid option $1" + echo "$help" + exit 1 ;; + * ) + break ;; + esac +done + +if test $# != 0; then + echo "$me: too many arguments$help" >&2 + exit 1 +fi + +# Use $HOST_CC if defined. $CC may point to a cross-compiler +if test x"$CC_FOR_BUILD" = x; then + if test x"$HOST_CC" != x; then + CC_FOR_BUILD="$HOST_CC" + else + if test x"$CC" != x; then + CC_FOR_BUILD="$CC" + else + CC_FOR_BUILD=cc + fi + fi +fi + + # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 8/24/94.) if (test -f /.attbin/uname) >/dev/null 2>&1 ; then @@ -46,11 +103,49 @@ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown -trap 'rm -f dummy.c dummy.o dummy; exit 1' 1 2 15 +dummy=dummy-$$ +trap 'rm -f $dummy.c $dummy.o $dummy; exit 1' 1 2 15 # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + *:NetBSD:*:*) + # Netbsd (nbsd) targets should (where applicable) match one or + # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently + # switched to ELF, *-*-netbsd* would select the old + # object file format. This provides both forward + # compatibility and a consistent mechanism for selecting the + # object file format. + # Determine the machine/vendor (is the vendor relevant). + case "${UNAME_MACHINE}" in + amiga) machine=m68k-cbm ;; + arm32) machine=arm-unknown ;; + atari*) machine=m68k-atari ;; + sun3*) machine=m68k-sun ;; + mac68k) machine=m68k-apple ;; + macppc) machine=powerpc-apple ;; + hp3[0-9][05]) machine=m68k-hp ;; + ibmrt|romp-ibm) machine=romp-ibm ;; + *) machine=${UNAME_MACHINE}-unknown ;; + esac + # The Operating System including object format. + if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep __ELF__ >/dev/null + then + # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). + # Return netbsd for either. FIX? + os=netbsd + else + os=netbsdelf + fi + # The OS release + release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: + # contains redundant information, the shorter form: + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. + echo "${machine}-${os}${release}" + exit 0 ;; alpha:OSF1:*:*) if test $UNAME_RELEASE = "V4.0"; then UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` @@ -59,46 +154,62 @@ # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - cat <dummy.s + cat <$dummy.s + .data +\$Lformat: + .byte 37,100,45,37,120,10,0 # "%d-%x\n" + + .text .globl main + .align 4 .ent main main: - .frame \$30,0,\$26,0 - .prologue 0 - .long 0x47e03d80 # implver $0 - lda \$2,259 - .long 0x47e20c21 # amask $2,$1 - srl \$1,8,\$2 - sll \$2,2,\$2 - sll \$0,3,\$0 - addl \$1,\$0,\$0 - addl \$2,\$0,\$0 - ret \$31,(\$26),1 + .frame \$30,16,\$26,0 + ldgp \$29,0(\$27) + .prologue 1 + .long 0x47e03d80 # implver \$0 + lda \$2,-1 + .long 0x47e20c21 # amask \$2,\$1 + lda \$16,\$Lformat + mov \$0,\$17 + not \$1,\$18 + jsr \$26,printf + ldgp \$29,0(\$26) + mov 0,\$16 + jsr \$26,exit .end main EOF - ${CC-cc} dummy.s -o dummy 2>/dev/null + $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null if test "$?" = 0 ; then - ./dummy - case "$?" in - 7) + case `./$dummy` in + 0-0) UNAME_MACHINE="alpha" ;; - 15) + 1-0) UNAME_MACHINE="alphaev5" ;; - 14) + 1-1) UNAME_MACHINE="alphaev56" ;; - 10) + 1-101) UNAME_MACHINE="alphapca56" ;; - 16) + 2-303) UNAME_MACHINE="alphaev6" ;; + 2-307) + UNAME_MACHINE="alphaev67" + ;; esac fi - rm -f dummy.s dummy - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr [[A-Z]] [[a-z]]` + rm -f $dummy.s $dummy + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + exit 0 ;; + Alpha\ *:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # Should we change UNAME_MACHINE based on the output of uname instead + # of the specific Alpha model? + echo alpha-pc-interix exit 0 ;; 21064:Windows_NT:50:3) echo alpha-dec-winnt3.5 @@ -106,12 +217,12 @@ Amiga*:UNIX_System_V:4.0:*) echo m68k-cbm-sysv4 exit 0;; - amiga:NetBSD:*:*) - echo m68k-cbm-netbsd${UNAME_RELEASE} - exit 0 ;; amiga:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; + *:[Aa]miga[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-amigaos + exit 0 ;; arc64:OpenBSD:*:*) echo mips64el-unknown-openbsd${UNAME_RELEASE} exit 0 ;; @@ -130,16 +241,16 @@ wgrisc:OpenBSD:*:*) echo mipsel-unknown-openbsd${UNAME_RELEASE} exit 0 ;; + *:OS/390:*:*) + echo i370-ibm-openedition + exit 0 ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit 0;; - arm32:NetBSD:*:*) - echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` - exit 0 ;; SR2?01:HI-UX/MPP:*:*) echo hppa1.1-hitachi-hiuxmpp exit 0;; - Pyramid*:OSx*:*:*|MIS*:OSx*:*:*) + Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. if test "`(/bin/universe) 2>/dev/null`" = att ; then echo pyramid-pyramid-sysv3 @@ -147,9 +258,12 @@ echo pyramid-pyramid-bsd fi exit 0 ;; - NILE:*:*:dcosx) + NILE*:*:*:dcosx) echo pyramid-pyramid-svr4 exit 0 ;; + sun4H:SunOS:5.*:*) + echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit 0 ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit 0 ;; @@ -189,21 +303,38 @@ aushp:SunOS:*:*) echo sparc-auspex-sunos${UNAME_RELEASE} exit 0 ;; - atari*:NetBSD:*:*) - echo m68k-atari-netbsd${UNAME_RELEASE} - exit 0 ;; atari*:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; - sun3*:NetBSD:*:*) - echo m68k-sun-netbsd${UNAME_RELEASE} + # The situation for MiNT is a little confusing. The machine name + # can be virtually everything (everything which is not + # "atarist" or "atariste" at least should have a processor + # > m68000). The system name ranges from "MiNT" over "FreeMiNT" + # to the lowercase version "mint" (or "freemint"). Finally + # the system name "TOS" denotes a system which is actually not + # MiNT. But MiNT is downward compatible to TOS, so this should + # be no problem. + atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} exit 0 ;; + atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit 0 ;; + *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit 0 ;; + milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) + echo m68k-milan-mint${UNAME_RELEASE} + exit 0 ;; + hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) + echo m68k-hades-mint${UNAME_RELEASE} + exit 0 ;; + *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) + echo m68k-unknown-mint${UNAME_RELEASE} + exit 0 ;; sun3*:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; - mac68k:NetBSD:*:*) - echo m68k-apple-netbsd${UNAME_RELEASE} - exit 0 ;; mac68k:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; @@ -225,12 +356,17 @@ VAX*:ULTRIX*:*:*) echo vax-dec-ultrix${UNAME_RELEASE} exit 0 ;; - 2020:CLIX:*:*) + 2020:CLIX:*:* | 2430:CLIX:*:*) echo clipper-intergraph-clix${UNAME_RELEASE} exit 0 ;; mips:*:*:UMIPS | mips:*:*:RISCos) - sed 's/^ //' << EOF >dummy.c - int main (argc, argv) int argc; char **argv; { + sed 's/^ //' << EOF >$dummy.c +#ifdef __cplusplus +#include /* for printf() prototype */ + int main (int argc, char *argv[]) { +#else + int main (argc, argv) int argc; char *argv[]; { +#endif #if defined (host_mips) && defined (MIPSEB) #if defined (SYSTYPE_SYSV) printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); @@ -245,10 +381,10 @@ exit (-1); } EOF - ${CC-cc} dummy.c -o dummy \ - && ./dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ - && rm dummy.c dummy && exit 0 - rm -f dummy.c dummy + $CC_FOR_BUILD $dummy.c -o $dummy \ + && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ + && rm $dummy.c $dummy && exit 0 + rm -f $dummy.c $dummy echo mips-mips-riscos${UNAME_RELEASE} exit 0 ;; Night_Hawk:Power_UNIX:*:*) @@ -266,15 +402,18 @@ AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \ - -o ${TARGET_BINARY_INTERFACE}x = x ] ; then + if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + then + if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ + [ ${TARGET_BINARY_INTERFACE}x = x ] + then echo m88k-dg-dgux${UNAME_RELEASE} - else + else echo m88k-dg-dguxbcs${UNAME_RELEASE} + fi + else + echo i586-dg-dgux${UNAME_RELEASE} fi - else echo i586-dg-dgux${UNAME_RELEASE} - fi exit 0 ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 @@ -300,7 +439,7 @@ exit 0 ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - sed 's/^ //' << EOF >dummy.c + sed 's/^ //' << EOF >$dummy.c #include main() @@ -311,8 +450,8 @@ exit(0); } EOF - ${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0 - rm -f dummy.c dummy + $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0 + rm -f $dummy.c $dummy echo rs6000-ibm-aix3.2.5 elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then echo rs6000-ibm-aix3.2.4 @@ -321,7 +460,8 @@ fi exit 0 ;; *:AIX:*:4) - if /usr/sbin/lsattr -EHl proc0 | grep POWER >/dev/null 2>&1; then + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'` + if /usr/sbin/lsattr -EHl ${IBM_CPU_ID} | grep POWER >/dev/null 2>&1; then IBM_ARCH=rs6000 else IBM_ARCH=powerpc @@ -339,7 +479,7 @@ ibmrt:4.4BSD:*|romp-ibm:BSD:*) echo romp-ibm-bsd4.4 exit 0 ;; - ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC NetBSD and + ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to exit 0 ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) @@ -354,18 +494,52 @@ hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) echo m68k-hp-bsd4.4 exit 0 ;; - 9000/[3478]??:HP-UX:*:*) + 9000/[34678]??:HP-UX:*:*) case "${UNAME_MACHINE}" in 9000/31? ) HP_ARCH=m68000 ;; 9000/[34]?? ) HP_ARCH=m68k ;; - 9000/7?? | 9000/8?[1679] ) HP_ARCH=hppa1.1 ;; - 9000/8?? ) HP_ARCH=hppa1.0 ;; + 9000/[678][0-9][0-9]) + sed 's/^ //' << EOF >$dummy.c + + #define _HPUX_SOURCE + #include + #include + + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); + + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } +EOF + (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy` + rm -f $dummy.c $dummy esac HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` echo ${HP_ARCH}-hp-hpux${HPUX_REV} exit 0 ;; 3050*:HI-UX:*:*) - sed 's/^ //' << EOF >dummy.c + sed 's/^ //' << EOF >$dummy.c #include int main () @@ -390,8 +564,8 @@ exit (0); } EOF - ${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0 - rm -f dummy.c dummy + $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0 + rm -f $dummy.c $dummy echo unknown-hitachi-hiuxwe2 exit 0 ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) @@ -400,6 +574,9 @@ 9000/8??:4.3bsd:*:*) echo hppa1.0-hp-bsd exit 0 ;; + *9??*:MPE/iX:*:*) + echo hppa1.0-hp-mpeix + exit 0 ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) echo hppa1.1-hp-osf exit 0 ;; @@ -416,6 +593,9 @@ parisc*:Lites*:*:*) echo hppa1.1-hp-lites exit 0 ;; + hppa*:OpenBSD:*:*) + echo hppa-unknown-openbsd + exit 0 ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd exit 0 ;; @@ -446,45 +626,60 @@ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ exit 0 ;; CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} + echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit 0 ;; + CRAY*T3E:*:*:*) + echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit 0 ;; + CRAY*SV1:*:*:*) + echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; CRAY-2:*:*:*) echo cray2-cray-unicos exit 0 ;; F300:UNIX_System_V:*:*) - FUJITSU_SYS=`uname -p | tr [A-Z] [a-z] | sed -e 's/\///'` + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit 0 ;; F301:UNIX_System_V:*:*) echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'` exit 0 ;; - hp3[0-9][05]:NetBSD:*:*) - echo m68k-hp-netbsd${UNAME_RELEASE} - exit 0 ;; hp300:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; - i?86:BSD/386:*:* | *:BSD/OS:*:*) + i?86:BSD/386:*:* | i?86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} exit 0 ;; + sparc*:BSD/OS:*:*) + echo sparc-unknown-bsdi${UNAME_RELEASE} + exit 0 ;; + *:BSD/OS:*:*) + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + exit 0 ;; *:FreeBSD:*:*) echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit 0 ;; - *:NetBSD:*:*) - echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` - exit 0 ;; *:OpenBSD:*:*) echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` exit 0 ;; i*:CYGWIN*:*) - echo i386-pc-cygwin32 + echo ${UNAME_MACHINE}-pc-cygwin exit 0 ;; i*:MINGW*:*) - echo i386-pc-mingw32 + echo ${UNAME_MACHINE}-pc-mingw32 + exit 0 ;; + i*:Windows_NT*:* | Pentium*:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we + # UNAME_MACHINE based on the output of uname instead of i386? + echo i386-pc-interix + exit 0 ;; + i*:UWIN*:*) + echo ${UNAME_MACHINE}-pc-uwin exit 0 ;; p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin32 + echo powerpcle-unknown-cygwin exit 0 ;; prep*:SunOS:5.*:*) echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` @@ -492,10 +687,15 @@ *:GNU:*:*) echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit 0 ;; + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix + exit 0 ;; *:Linux:*:*) + # The BFD linker knows what the default object file format is, so - # first see if it will tell us. - ld_help_string=`ld --help 2>&1` + # first see if it will tell us. cd to the root directory to prevent + # problems with other programs or directories called `ld' in the path. + ld_help_string=`cd /; ld --help 2>&1` ld_supported_emulations=`echo $ld_help_string \ | sed -ne '/supported emulations:/!d s/[ ][ ]*/ /g @@ -503,67 +703,146 @@ s/ .*// p'` case "$ld_supported_emulations" in - i?86linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" ; exit 0 ;; - i?86coff) echo "${UNAME_MACHINE}-pc-linux-gnucoff" ; exit 0 ;; - sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;; - m68klinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;; - elf32ppc) echo "powerpc-unknown-linux-gnu" ; exit 0 ;; + *ia64) + echo "${UNAME_MACHINE}-unknown-linux" + exit 0 + ;; + i?86linux) + echo "${UNAME_MACHINE}-pc-linux-gnuaout" + exit 0 + ;; + elf_i?86) + echo "${UNAME_MACHINE}-pc-linux" + exit 0 + ;; + i?86coff) + echo "${UNAME_MACHINE}-pc-linux-gnucoff" + exit 0 + ;; + sparclinux) + echo "${UNAME_MACHINE}-unknown-linux-gnuaout" + exit 0 + ;; + armlinux) + echo "${UNAME_MACHINE}-unknown-linux-gnuaout" + exit 0 + ;; + elf32arm*) + echo "${UNAME_MACHINE}-unknown-linux-gnuoldld" + exit 0 + ;; + armelf_linux*) + echo "${UNAME_MACHINE}-unknown-linux-gnu" + exit 0 + ;; + m68klinux) + echo "${UNAME_MACHINE}-unknown-linux-gnuaout" + exit 0 + ;; + elf32ppc | elf32ppclinux) + # Determine Lib Version + cat >$dummy.c < +#if defined(__GLIBC__) +extern char __libc_version[]; +extern char __libc_release[]; +#endif +main(argc, argv) + int argc; + char *argv[]; +{ +#if defined(__GLIBC__) + printf("%s %s\n", __libc_version, __libc_release); +#else + printf("unkown\n"); +#endif + return 0; +} +EOF + LIBC="" + $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null + if test "$?" = 0 ; then + ./$dummy | grep 1\.99 > /dev/null + if test "$?" = 0 ; then + LIBC="libc1" + fi + fi + rm -f $dummy.c $dummy + echo powerpc-unknown-linux-gnu${LIBC} + exit 0 + ;; + shelf_linux) + echo "${UNAME_MACHINE}-unknown-linux-gnu" + exit 0 + ;; esac if test "${UNAME_MACHINE}" = "alpha" ; then - sed 's/^ //' <dummy.s - .globl main - .ent main - main: - .frame \$30,0,\$26,0 - .prologue 0 - .long 0x47e03d80 # implver $0 - lda \$2,259 - .long 0x47e20c21 # amask $2,$1 - srl \$1,8,\$2 - sll \$2,2,\$2 - sll \$0,3,\$0 - addl \$1,\$0,\$0 - addl \$2,\$0,\$0 - ret \$31,(\$26),1 - .end main + cat <$dummy.s + .data + \$Lformat: + .byte 37,100,45,37,120,10,0 # "%d-%x\n" + + .text + .globl main + .align 4 + .ent main + main: + .frame \$30,16,\$26,0 + ldgp \$29,0(\$27) + .prologue 1 + .long 0x47e03d80 # implver \$0 + lda \$2,-1 + .long 0x47e20c21 # amask \$2,\$1 + lda \$16,\$Lformat + mov \$0,\$17 + not \$1,\$18 + jsr \$26,printf + ldgp \$29,0(\$26) + mov 0,\$16 + jsr \$26,exit + .end main EOF LIBC="" - ${CC-cc} dummy.s -o dummy 2>/dev/null + $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null if test "$?" = 0 ; then - ./dummy - case "$?" in - 7) + case `./$dummy` in + 0-0) UNAME_MACHINE="alpha" ;; - 15) + 1-0) UNAME_MACHINE="alphaev5" ;; - 14) + 1-1) UNAME_MACHINE="alphaev56" ;; - 10) + 1-101) UNAME_MACHINE="alphapca56" ;; - 16) + 2-303) UNAME_MACHINE="alphaev6" ;; - esac + 2-307) + UNAME_MACHINE="alphaev67" + ;; + esac - objdump --private-headers dummy | \ + objdump --private-headers $dummy | \ grep ld.so.1 > /dev/null if test "$?" = 0 ; then LIBC="libc1" fi - fi - rm -f dummy.s dummy + fi + rm -f $dummy.s $dummy echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0 elif test "${UNAME_MACHINE}" = "mips" ; then - cat >dummy.c <$dummy.c < /* for printf() prototype */ + int main (int argc, char *argv[]) { +#else + int main (argc, argv) int argc; char *argv[]; { +#endif #ifdef __MIPSEB__ printf ("%s-unknown-linux-gnu\n", argv[1]); #endif @@ -573,8 +852,10 @@ return 0; } EOF - ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0 - rm -f dummy.c dummy + $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0 + rm -f $dummy.c $dummy + elif test "${UNAME_MACHINE}" = "s390"; then + echo s390-ibm-linux && exit 0 else # Either a pre-BFD a.out linker (linux-gnuoldld) # or one that does not give us useful --help. @@ -593,12 +874,14 @@ ;; esac # Determine whether the default compiler is a.out or elf - cat >dummy.c <$dummy.c < -main(argc, argv) - int argc; - char *argv[]; -{ +#ifdef __cplusplus +#include /* for printf() prototype */ + int main (int argc, char *argv[]) { +#else + int main (argc, argv) int argc; char *argv[]; { +#endif #ifdef __ELF__ # ifdef __GLIBC__ # if __GLIBC__ >= 2 @@ -615,8 +898,8 @@ return 0; } EOF - ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0 - rm -f dummy.c dummy + $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0 + rm -f $dummy.c $dummy fi ;; # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. earlier versions # are messed up and put the nodename in both sysname and nodename. @@ -632,10 +915,20 @@ echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit 0 ;; i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*) + UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE} + echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE} + echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} + fi + exit 0 ;; + i?86:*:5:7*) + # Fixed at (any) Pentium or better + UNAME_MACHINE=i586 + if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then + echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION} + else + echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE} fi exit 0 ;; i?86:*:3.2:*) @@ -647,12 +940,20 @@ (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486 (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \ && UNAME_MACHINE=i586 + (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \ + && UNAME_MACHINE=i686 + (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \ + && UNAME_MACHINE=i686 echo ${UNAME_MACHINE}-pc-sco$UNAME_REL else echo ${UNAME_MACHINE}-pc-sysv32 fi exit 0 ;; + i?86:*DOS:*:*) + echo ${UNAME_MACHINE}-pc-msdosdjgpp + exit 0 ;; pc:*:*:*) + # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about # the processor, so we play safe by assuming i386. echo i386-pc-msdosdjgpp @@ -693,7 +994,7 @@ mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 exit 0 ;; - i?86:LynxOS:2.*:*) + i?86:LynxOS:2.*:* | i?86:LynxOS:3.[01]*:*) echo i386-unknown-lynxos${UNAME_RELEASE} exit 0 ;; TSUNAMI:LynxOS:2.*:*) @@ -705,6 +1006,9 @@ SM[BE]S:UNIX_SV:*:*) echo mips-dde-sysv${UNAME_RELEASE} exit 0 ;; + RM*:ReliantUNIX-*:*:*) + echo mips-sni-sysv4 + exit 0 ;; RM*:SINIX-*:*:*) echo mips-sni-sysv4 exit 0 ;; @@ -735,19 +1039,61 @@ news*:NEWS-OS:*:6*) echo mips-sony-newsos6 exit 0 ;; - R3000:*System_V*:*:* | R*000:UNIX_S*V:*:*) + R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then echo mips-nec-sysv${UNAME_RELEASE} else echo mips-unknown-sysv${UNAME_RELEASE} fi exit 0 ;; + BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. + echo powerpc-be-beos + exit 0 ;; + BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. + echo powerpc-apple-beos + exit 0 ;; + BePC:BeOS:*:*) # BeOS running on Intel PC compatible. + echo i586-pc-beos + exit 0 ;; + SX-4:SUPER-UX:*:*) + echo sx4-nec-superux${UNAME_RELEASE} + exit 0 ;; + SX-5:SUPER-UX:*:*) + echo sx5-nec-superux${UNAME_RELEASE} + exit 0 ;; + Power*:Rhapsody:*:*) + echo powerpc-apple-rhapsody${UNAME_RELEASE} + exit 0 ;; + *:Rhapsody:*:*) + echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} + exit 0 ;; + *:Darwin:*:*) + echo `uname -p`-apple-darwin${UNAME_RELEASE} + exit 0 ;; + *:procnto*:*:* | *:QNX:[0123456789]*:*) + if test "${UNAME_MACHINE}" = "x86pc"; then + UNAME_MACHINE=pc + fi + echo `uname -p`-${UNAME_MACHINE}-nto-qnx + exit 0 ;; + *:QNX:*:4*) + echo i386-pc-qnx + exit 0 ;; + NSR-W:NONSTOP_KERNEL:*:*) + echo nsr-tandem-nsk${UNAME_RELEASE} + exit 0 ;; + BS2000:POSIX*:*:*) + echo bs2000-siemens-sysv + exit 0 ;; + DS/*:UNIX_System_V:*:*) + echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} + exit 0 ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 -cat >dummy.c <$dummy.c < # include @@ -785,7 +1131,10 @@ #endif int version; version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); + if (version < 4) + printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); + else + printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); exit (0); #endif @@ -845,8 +1194,8 @@ } EOF -${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy && rm dummy.c dummy && exit 0 -rm -f dummy.c dummy +$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm $dummy.c $dummy && exit 0 +rm -f $dummy.c $dummy # Apollos put the system type in the environment. @@ -878,6 +1227,47 @@ esac fi -#echo '(Unable to guess system type)' 1>&2 +cat >&2 < in order to provide the needed +information to handle your system. + +config.guess version = $version + +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` + +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null` + +hostinfo = `(hostinfo) 2>/dev/null` +/bin/universe = `(/bin/universe) 2>/dev/null` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` +/bin/arch = `(/bin/arch) 2>/dev/null` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` + +UNAME_MACHINE = ${UNAME_MACHINE} +UNAME_RELEASE = ${UNAME_RELEASE} +UNAME_SYSTEM = ${UNAME_SYSTEM} +UNAME_VERSION = ${UNAME_VERSION} +EOF exit 1 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "version='" +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: diff -ruN inn-2.2.2/config.sub inn-2.2.3/config.sub --- inn-2.2.2/config.sub Mon Dec 13 05:18:37 1999 +++ inn-2.2.3/config.sub Tue Jul 18 16:54:07 2000 @@ -1,6 +1,10 @@ #! /bin/sh # Configuration validation subroutine script, version 1.1. -# Copyright (C) 1991, 92, 93, 94, 95, 96, 1997 Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000 +# Free Software Foundation, Inc. + +version='2000-07-06' + # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software # can handle that machine. It does not imply ALL GNU software can. @@ -25,6 +29,8 @@ # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. +# Please send patches to . +# # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. # If it is invalid, we print an error message on stderr and exit with code 1. @@ -45,30 +51,61 @@ # CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM # It is wrong to echo any other type of specification. -if [ x$1 = x ] -then - echo Configuration name missing. 1>&2 - echo "Usage: $0 CPU-MFR-OPSYS" 1>&2 - echo "or $0 ALIAS" 1>&2 - echo where ALIAS is a recognized configuration type. 1>&2 - exit 1 -fi +me=`echo "$0" | sed -e 's,.*/,,'` -# First pass through any local machine types. -case $1 in - *local*) - echo $1 - exit 0 - ;; - *) - ;; +usage="\ +Usage: $0 [OPTION] CPU-MFR-OPSYS + $0 [OPTION] ALIAS + +Canonicalize a configuration name. + +Operation modes: + -h, --help print this help, then exit + -V, --version print version number, then exit" + +help=" +Try \`$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case "$1" in + --version | --vers* | -V ) + echo "$version" ; exit 0 ;; + --help | --h* | -h ) + echo "$usage"; exit 0 ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + exec >&2 + echo "$me: invalid option $1" + echo "$help" + exit 1 ;; + + *local*) + # First pass through any local machine types. + echo $1 + exit 0;; + + * ) + break ;; + esac +done + +case $# in + 0) echo "$me: missing argument$help" >&2 + exit 1;; + 1) ;; + *) echo "$me: too many arguments$help" >&2 + exit 1;; esac # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - linux-gnu*) + nto-qnx* | linux-gnu*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; @@ -94,15 +131,25 @@ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple) + -apple | -axis) os= basic_machine=$1 ;; + -sim | -cisco | -oki | -wec | -winbond) + os= + basic_machine=$1 + ;; + -scout) + ;; + -wrs) + os=-vxworks + basic_machine=$1 + ;; -hiux*) os=-hiuxwe2 ;; -sco5) - os=sco3.2v5 + os=-sco3.2v5 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; -sco4) @@ -121,6 +168,9 @@ os=-sco3.2v2 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -udk*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -isc) os=-isc2.2 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -143,26 +193,46 @@ -psos*) os=-psos ;; + -mint | -mint[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; esac # Decode aliases for certain CPU-COMPANY combinations. case $basic_machine in # Recognize the basic CPU types without company name. # Some are omitted here because they have special meanings below. - tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \ - | arme[lb] | pyramid | mn10200 | mn10300 \ - | tron | a29k | 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 \ - | alpha | alphaev[56] | alphaev56 | we32k | ns16k | clipper \ - | i370 | sh | powerpc | powerpcle | 1750a | dsp16xx | pdp11 \ - | mips64 | mipsel | mips64el | mips64orion | mips64orionel \ - | mipstx39 | mipstx39el \ - | sparc | sparclet | sparclite | sparc64 | v850) + tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \ + | arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \ + | 580 | i960 | h8300 \ + | x86 | ppcbe | mipsbe | mipsle | shbe | shle | armbe | armle \ + | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \ + | hppa64 \ + | alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \ + | alphaev6[78] \ + | we32k | ns16k | clipper | i370 | sh | sh[34] \ + | powerpc | powerpcle \ + | 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \ + | mips64orion | mips64orionel | mipstx39 | mipstx39el \ + | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \ + | mips64vr5000 | miprs64vr5000el | mcore \ + | sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \ + | thumb | d10v | d30v | fr30 | avr) + basic_machine=$basic_machine-unknown + ;; + m6811 | m68hc11 | m6812 | m68hc12) + # Motorola 68HC11/12. basic_machine=$basic_machine-unknown + os=-none ;; + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl) + ;; + # We use `pc' rather than `unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. - i[3456]86) + i[234567]86) basic_machine=$basic_machine-pc ;; # Object if more than one company name word. @@ -171,27 +241,49 @@ exit 1 ;; # Recognize the basic CPU types with company name. - vax-* | tahoe-* | i[3456]86-* | i860-* | m32r-* | m68k-* | m68000-* \ + # FIXME: clean up the formatting here. + vax-* | tahoe-* | i[234567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \ | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \ | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \ - | power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \ - | xmp-* | ymp-* | hppa-* | hppa1.0-* | hppa1.1-* \ - | alpha-* | alphaev[56]-* | alphaev56-* | we32k-* | cydra-* \ - | ns16k-* | pn-* | np1-* | xps100-* | clipper-* | orion-* \ + | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \ + | xmp-* | ymp-* \ + | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* | armbe-* | armle-* \ + | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \ + | hppa2.0n-* | hppa64-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \ + | alphaev6[78]-* \ + | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \ + | clipper-* | orion-* \ | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \ - | sparc64-* | mips64-* | mipsel-* \ - | mips64el-* | mips64orion-* | mips64orionel-* \ - | mipstx39-* | mipstx39el-* \ - | f301-*) + | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \ + | mips64el-* | mips64orion-* | mips64orionel-* \ + | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \ + | mipstx39-* | mipstx39el-* | mcore-* \ + | f301-* | armv*-* | s390-* | sv1-* | t3e-* \ + | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \ + | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* \ + | bs2000-* | tic54x-* | c54x-*) ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. + 386bsd) + basic_machine=i386-unknown + os=-bsd + ;; 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) basic_machine=m68000-att ;; 3b*) basic_machine=we32k-att ;; + a29khif) + basic_machine=a29k-amd + os=-udi + ;; + adobe68k) + basic_machine=m68010-adobe + os=-scout + ;; alliant | fx80) basic_machine=fx80-alliant ;; @@ -221,6 +313,10 @@ basic_machine=m68k-apollo os=-sysv ;; + apollo68bsd) + basic_machine=m68k-apollo + os=-bsd + ;; aux) basic_machine=m68k-apple os=-aux @@ -264,6 +360,9 @@ crds | unos) basic_machine=m68k-crds ;; + cris | cris-* | etrax*) + basic_machine=cris-axis + ;; da30 | da30-*) basic_machine=m68k-da30 ;; @@ -297,6 +396,10 @@ encore | umax | mmax) basic_machine=ns32k-encore ;; + es1800 | OSE68k | ose68k | ose | OSE) + basic_machine=m68k-ericsson + os=-ose + ;; fx2800) basic_machine=i860-alliant ;; @@ -315,6 +418,14 @@ basic_machine=h8300-hitachi os=-hms ;; + h8300xray) + basic_machine=h8300-hitachi + os=-xray + ;; + h8500hms) + basic_machine=h8500-hitachi + os=-hms + ;; harris) basic_machine=m88k-harris os=-sysv3 @@ -330,13 +441,30 @@ basic_machine=m68k-hp os=-hpux ;; + hp3k9[0-9][0-9] | hp9[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; hp9k2[0-9][0-9] | hp9k31[0-9]) basic_machine=m68000-hp ;; hp9k3[2-9][0-9]) basic_machine=m68k-hp ;; - hp9k7[0-9][0-9] | hp7[0-9][0-9] | hp9k8[0-9]7 | hp8[0-9]7) + hp9k6[0-9][0-9] | hp6[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hp9k7[0-79][0-9] | hp7[0-79][0-9]) + basic_machine=hppa1.1-hp + ;; + hp9k78[0-9] | hp78[0-9]) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[0-9][13679] | hp8[0-9][13679]) basic_machine=hppa1.1-hp ;; hp9k8[0-9][0-9] | hp8[0-9][0-9]) @@ -345,27 +473,50 @@ hppa-next) os=-nextstep3 ;; + hppaosf) + basic_machine=hppa1.1-hp + os=-osf + ;; + hppro) + basic_machine=hppa1.1-hp + os=-proelf + ;; i370-ibm* | ibm*) basic_machine=i370-ibm - os=-mvs ;; # I'm not sure what "Sysv32" means. Should this be sysv3.2? - i[3456]86v32) + i[34567]86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv32 ;; - i[3456]86v4*) + i[34567]86v4*) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv4 ;; - i[3456]86v) + i[34567]86v) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv ;; - i[3456]86sol2) + i[34567]86sol2) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-solaris2 ;; + i386mach) + basic_machine=i386-mach + os=-mach + ;; + i386-vsta | vsta) + basic_machine=i386-unknown + os=-vsta + ;; + i386-go32 | go32) + basic_machine=i386-unknown + os=-go32 + ;; + i386-mingw32 | mingw32) + basic_machine=i386-unknown + os=-mingw32 + ;; iris | iris4d) basic_machine=mips-sgi case $os in @@ -394,6 +545,10 @@ miniframe) basic_machine=m68000-convergent ;; + *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; mipsel*-linux*) basic_machine=mipsel-unknown os=-linux-gnu @@ -408,10 +563,34 @@ mips3*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown ;; + mmix*) + basic_machine=mmix-knuth + os=-mmixware + ;; + monitor) + basic_machine=m68k-rom68k + os=-coff + ;; + msdos) + basic_machine=i386-unknown + os=-msdos + ;; + mvs) + basic_machine=i370-ibm + os=-mvs + ;; ncr3000) basic_machine=i486-ncr os=-sysv4 ;; + netbsd386) + basic_machine=i386-unknown + os=-netbsd + ;; + netwinder) + basic_machine=armv4l-rebel + os=-linux + ;; news | news700 | news800 | news900) basic_machine=m68k-sony os=-newsos @@ -424,6 +603,10 @@ basic_machine=mips-sony os=-newsos ;; + necv70) + basic_machine=v70-nec + os=-sysv + ;; next | m*-next ) basic_machine=m68k-next case $os in @@ -449,9 +632,28 @@ basic_machine=i960-intel os=-nindy ;; + mon960) + basic_machine=i960-intel + os=-mon960 + ;; np1) basic_machine=np1-gould ;; + nsr-tandem) + basic_machine=nsr-tandem + ;; + op50n-* | op60c-*) + basic_machine=hppa1.1-oki + os=-proelf + ;; + OSE68000 | ose68000) + basic_machine=m68000-ericsson + os=-ose + ;; + os68k) + basic_machine=m68k-none + os=-os68k + ;; pa-hitachi) basic_machine=hppa1.1-hitachi os=-hiuxwe2 @@ -469,25 +671,23 @@ pc532 | pc532-*) basic_machine=ns32k-pc532 ;; - pentium | p5) - basic_machine=i586-intel + pentium | p5 | k5 | k6 | nexen) + basic_machine=i586-pc ;; - pentiumpro | p6) - basic_machine=i686-intel + pentiumpro | p6 | 6x86 | athlon) + basic_machine=i686-pc ;; - pentium-* | p5-*) + pentiumii | pentium2) + basic_machine=i786-pc + ;; + pentium-* | p5-* | k5-* | k6-* | nexen-*) basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - pentiumpro-* | p6-*) + pentiumpro-* | p6-* | 6x86-* | athlon-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - k5) - # We don't have specific support for AMD's K5 yet, so just call it a Pentium - basic_machine=i586-amd - ;; - nexen) - # We don't have specific support for Nexgen yet, so just call it a Pentium - basic_machine=i586-nexgen + pentiumii-* | pentium2-*) + basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pn) basic_machine=pn-gould @@ -507,12 +707,20 @@ ps2) basic_machine=i386-ibm ;; + rom68k) + basic_machine=m68k-rom68k + os=-coff + ;; rm[46]00) basic_machine=mips-siemens ;; rtpc | rtpc-*) basic_machine=romp-ibm ;; + sa29200) + basic_machine=a29k-amd + os=-udi + ;; sequent) basic_machine=i386-sequent ;; @@ -520,6 +728,10 @@ basic_machine=sh-hitachi os=-hms ;; + sparclite-wrs) + basic_machine=sparclite-wrs + os=-vxworks + ;; sps7) basic_machine=m68k-bull os=-sysv2 @@ -527,6 +739,13 @@ spur) basic_machine=spur-unknown ;; + st2000) + basic_machine=m68k-tandem + ;; + stratus) + basic_machine=i860-stratus + os=-sysv4 + ;; sun2) basic_machine=m68000-sun ;; @@ -567,10 +786,22 @@ sun386 | sun386i | roadrunner) basic_machine=i386-sun ;; + sv1) + basic_machine=sv1-cray + os=-unicos + ;; symmetry) basic_machine=i386-sequent os=-dynix ;; + t3e) + basic_machine=t3e-cray + os=-unicos + ;; + tic54x | c54x*) + basic_machine=tic54x-unknown + os=-coff + ;; tx39) basic_machine=mipstx39-unknown ;; @@ -588,6 +819,10 @@ basic_machine=a29k-nyu os=-sym1 ;; + v810 | necv810) + basic_machine=v810-nec + os=-none + ;; vaxv) basic_machine=vax-dec os=-sysv @@ -611,6 +846,14 @@ basic_machine=a29k-wrs os=-vxworks ;; + w65*) + basic_machine=w65-wdc + os=-none + ;; + w89k-*) + basic_machine=hppa1.1-winbond + os=-proelf + ;; xmp) basic_machine=xmp-cray os=-unicos @@ -618,6 +861,10 @@ xps | xps100) basic_machine=xps100-honeywell ;; + z8k-*-coff) + basic_machine=z8k-unknown + os=-sim + ;; none) basic_machine=none-none os=-none @@ -625,6 +872,15 @@ # Here we handle the default manufacturer of certain CPU types. It is in # some cases the only manufacturer, in others, it is the most popular. + w89k) + basic_machine=hppa1.1-winbond + ;; + op50n) + basic_machine=hppa1.1-oki + ;; + op60c) + basic_machine=hppa1.1-oki + ;; mips) if [ x$os = x-linux-gnu ]; then basic_machine=mips-unknown @@ -647,7 +903,10 @@ we32k) basic_machine=we32k-att ;; - sparc) + sh3 | sh4) + base_machine=sh-unknown + ;; + sparc | sparcv9) basic_machine=sparc-sun ;; cydra) @@ -659,6 +918,16 @@ orion105) basic_machine=clipper-highlevel ;; + mac | mpw | mac-mpw) + basic_machine=m68k-apple + ;; + pmac | pmac-mpw) + basic_machine=powerpc-apple + ;; + c4x*) + basic_machine=c4x-none + os=-coff + ;; *) echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 exit 1 @@ -712,13 +981,34 @@ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ - | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \ + | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -cygwin32* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -uxpv*) + | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit*) # Remember, each alternative MUST END IN *, to match a version number. ;; + -qnx*) + case $basic_machine in + x86-* | i[34567]86-*) + ;; + *) + os=-nto$os + ;; + esac + ;; + -nto*) + os=-nto-qnx + ;; + -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ + | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ + | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) + ;; + -mac*) + os=`echo $os | sed -e 's|mac|macos|'` + ;; -linux*) os=`echo $os | sed -e 's|linux|linux-gnu|'` ;; @@ -728,6 +1018,12 @@ -sunos6*) os=`echo $os | sed -e 's|sunos6|solaris3|'` ;; + -opened*) + os=-openedition + ;; + -wince*) + os=-wince + ;; -osfrose*) os=-osfrose ;; @@ -743,12 +1039,18 @@ -acis*) os=-aos ;; + -386bsd) + os=-bsd + ;; -ctix* | -uts*) os=-sysv ;; -ns2 ) os=-nextstep2 ;; + -nsk) + os=-nsk + ;; # Preserve the version number of sinix5. -sinix5.*) os=`echo $os | sed -e 's|sinix|sysv|'` @@ -774,9 +1076,18 @@ # This must come after -sysvr4. -sysv*) ;; + -ose*) + os=-ose + ;; + -es1800*) + os=-ose + ;; -xenix) os=-xenix ;; + -*mint | -*MiNT) + os=-mint + ;; -none) ;; *) @@ -802,6 +1113,9 @@ *-acorn) os=-riscix1.2 ;; + arm*-rebel) + os=-linux + ;; arm*-semi) os=-aout ;; @@ -823,15 +1137,36 @@ # default. # os=-sunos4 ;; + m68*-cisco) + os=-aout + ;; + mips*-cisco) + os=-elf + ;; + mips*-*) + os=-elf + ;; *-tti) # must be before sparc entry or we get the wrong os. os=-sysv3 ;; sparc-* | *-sun) os=-sunos4.1.1 ;; + *-be) + os=-beos + ;; *-ibm) os=-aix ;; + *-wec) + os=-proelf + ;; + *-winbond) + os=-proelf + ;; + *-oki) + os=-proelf + ;; *-hp) os=-hpux ;; @@ -895,6 +1230,18 @@ f301-fujitsu) os=-uxpv ;; + *-rom68k) + os=-coff + ;; + *-*bug) + os=-coff + ;; + *-apple) + os=-macos + ;; + *-atari*) + os=-mint + ;; *) os=-none ;; @@ -916,9 +1263,15 @@ -aix*) vendor=ibm ;; + -beos*) + vendor=be + ;; -hpux*) vendor=hp ;; + -mpeix*) + vendor=hp + ;; -hiux*) vendor=hitachi ;; @@ -934,7 +1287,7 @@ -genix*) vendor=ns ;; - -mvs*) + -mvs* | -opened*) vendor=ibm ;; -ptx*) @@ -946,9 +1299,26 @@ -aux*) vendor=apple ;; + -hms*) + vendor=hitachi + ;; + -mpw* | -macos*) + vendor=apple + ;; + -*mint | -*MiNT) + vendor=atari + ;; esac basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` ;; esac echo $basic_machine$os +exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "version='" +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: diff -ruN inn-2.2.2/configure inn-2.2.3/configure --- inn-2.2.2/configure Mon Dec 13 05:18:37 1999 +++ inn-2.2.3/configure Tue Jul 18 16:54:07 2000 @@ -21,11 +21,11 @@ ac_help="$ac_help --enable-static build static libraries [default=yes]" ac_help="$ac_help - --with-tcl TCL script support" + --with-tcl TCL script support [default=no]" ac_help="$ac_help - --with-perl Perl script support" + --with-perl Perl script support [default=no]" ac_help="$ac_help - --with-largefiles Support for files greater than 2gb" + --with-largefiles Support for files greater than 2gb [default=no]" ac_help="$ac_help --with-db-dir=PATH News database files [PREFIX/db]" ac_help="$ac_help @@ -49,6 +49,10 @@ ac_help="$ac_help --with-sendmail=PATH Specify sendmail" ac_help="$ac_help + --enable-setgid-inews Install inews setgid" +ac_help="$ac_help + --enable-uucp-rnews Install rnews setuid, group uucp" +ac_help="$ac_help --with-log-compress=METHOD Log compression method (default gzip)" ac_help="$ac_help --enable-tagged-hash use tagged hash table for history" @@ -593,7 +597,7 @@ fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:597: checking host system type" >&5 +echo "configure:601: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -616,7 +620,7 @@ # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:620: checking for $ac_word" >&5 +echo "configure:624: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -646,7 +650,7 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:650: checking for $ac_word" >&5 +echo "configure:654: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -676,7 +680,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:680: checking for $ac_word" >&5 +echo "configure:684: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -727,7 +731,7 @@ # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:731: checking for $ac_word" >&5 +echo "configure:735: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -759,7 +763,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:763: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:767: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -770,12 +774,12 @@ cat > conftest.$ac_ext << EOF -#line 774 "configure" +#line 778 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:779: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -801,12 +805,12 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:805: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:809: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:810: checking whether we are using GNU C" >&5 +echo "configure:814: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -815,7 +819,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:819: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:823: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -834,7 +838,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:838: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:842: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -878,7 +882,7 @@ if test "$ac_cv_prog_gcc" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:882: checking for ld used by GCC" >&5 +echo "configure:886: checking for ld used by GCC" >&5 ac_prog=`($CC -print-prog-name=ld) 2>&5` case "$ac_prog" in # Accept absolute paths. @@ -896,10 +900,10 @@ esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:900: checking for GNU ld" >&5 +echo "configure:904: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:903: checking for non-GNU ld" >&5 +echo "configure:907: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -935,7 +939,7 @@ test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:939: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:943: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -951,7 +955,7 @@ echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:955: checking for BSD-compatible nm" >&5 +echo "configure:959: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -988,7 +992,7 @@ echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:992: checking whether ln -s works" >&5 +echo "configure:996: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1120,15 +1124,22 @@ # Check whether --with-tcl or --without-tcl was given. if test "${with_tcl+set}" = set; then withval="$with_tcl" - DO_TCL=DO - TCL_LIB="-ltcl -lm" - TCL_INC="-I/usr/local/include" + case "${withval}" in + yes) DO_TCL=DO ;; + no) DO_TCL=DONT ;; + *) { echo "configure: error: invalid argument to --with-tcl or --without-tcl" 1>&2; exit 1; } ;; + esac else DO_TCL=DONT - TCL_LIB="" - TCL_INC="" fi +if test $DO_TCL = DO ; then + TCL_LIB="-ltcl -lm" + TCL_INC="-I/usr/local/include" +else + TCL_LIB="" + TCL_INC="" +fi @@ -1136,7 +1147,11 @@ # Check whether --with-perl or --without-perl was given. if test "${with_perl+set}" = set; then withval="$with_perl" - DO_PERL=DO + case "${withval}" in + yes) DO_PERL=DO ;; + no) DO_PERL=DONT ;; + *) { echo "configure: error: invalid argument to --with-perl or --without-perl" 1>&2; exit 1; } ;; + esac else DO_PERL=DONT fi @@ -1146,7 +1161,11 @@ # Check whether --with-largefiles or --without-largefiles was given. if test "${with_largefiles+set}" = set; then withval="$with_largefiles" - DO_LFS=DO + case "${withval}" in + yes) DO_LFS=DO ;; + no) DO_LFS=DONT ;; + *) { echo "configure: error: invalid argument to --with-largefiles or --without-largefiles" 1>&2; exit 1; } ;; + esac else DO_LFS=DONT fi @@ -1260,6 +1279,31 @@ fi +INEWSMODE=0550 +# Check whether --enable-setgid-inews or --disable-setgid-inews was given. +if test "${enable_setgid_inews+set}" = set; then + enableval="$enable_setgid_inews" + if test "x$enableval" = xyes ; then + INEWSMODE=2555 + fi +fi + + + +RNEWSGRP=$NEWSGRP +RNEWSMODE=0500 +# Check whether --enable-uucp-rnews or --disable-uucp-rnews was given. +if test "${enable_uucp_rnews+set}" = set; then + enableval="$enable_uucp_rnews" + if test "x$enableval" = xyes ; then + RNEWSGRP=uucp + RNEWSMODE=4550 + fi +fi + + + + MANDIR=`eval echo $mandir` @@ -1271,7 +1315,7 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1275: checking for $ac_word" >&5 +echo "configure:1319: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1301,7 +1345,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1305: checking for $ac_word" >&5 +echo "configure:1349: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1352,7 +1396,7 @@ # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1356: checking for $ac_word" >&5 +echo "configure:1400: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1384,7 +1428,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1388: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1432: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1395,12 +1439,12 @@ cat > conftest.$ac_ext << EOF -#line 1399 "configure" +#line 1443 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1426,12 +1470,12 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1430: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1474: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1435: checking whether we are using GNU C" >&5 +echo "configure:1479: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1440,7 +1484,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1444: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1488: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1459,7 +1503,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1463: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1507: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1491,7 +1535,7 @@ fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1495: checking whether ln -s works" >&5 +echo "configure:1539: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1512,7 +1556,7 @@ fi echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:1516: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:1560: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1543,7 +1587,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1547: checking for $ac_word" >&5 +echo "configure:1591: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1576,7 +1620,7 @@ # Extract the first word of "flex", so it can be a program name with args. set dummy flex; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1580: checking for $ac_word" >&5 +echo "configure:1624: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1610,7 +1654,7 @@ *) ac_lib=l ;; esac echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6 -echo "configure:1614: checking for yywrap in -l$ac_lib" >&5 +echo "configure:1658: checking for yywrap in -l$ac_lib" >&5 ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1618,7 +1662,7 @@ ac_save_LIBS="$LIBS" LIBS="-l$ac_lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1654,7 +1698,7 @@ # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1658: checking for $ac_word" >&5 +echo "configure:1702: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1683,7 +1727,7 @@ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1687: checking how to run the C preprocessor" >&5 +echo "configure:1731: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1698,13 +1742,13 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1708: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1752: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1715,13 +1759,13 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1725: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1769: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1732,13 +1776,13 @@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1742: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1786: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1763,9 +1807,9 @@ echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for AIX""... $ac_c" 1>&6 -echo "configure:1767: checking for AIX" >&5 +echo "configure:1811: checking for AIX" >&5 cat > conftest.$ac_ext <&6 -echo "configure:1791: checking for POSIXized ISC" >&5 +echo "configure:1835: checking for POSIXized ISC" >&5 if test -d /etc/conf/kconfig.d && grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 then @@ -1808,7 +1852,7 @@ fi echo $ac_n "checking for Digital Unix""... $ac_c" 1>&6 -echo "configure:1812: checking for Digital Unix" >&5 +echo "configure:1856: checking for Digital Unix" >&5 if test -f /osf_boot then echo "$ac_t""yes" 1>&6 @@ -1825,7 +1869,7 @@ # Extract the first word of "uname", so it can be a program name with args. set dummy uname; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1829: checking for $ac_word" >&5 +echo "configure:1873: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_uname_prog'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1859,7 +1903,7 @@ fi echo $ac_n "checking operating system""... $ac_c" 1>&6 -echo "configure:1863: checking operating system" >&5 +echo "configure:1907: checking operating system" >&5 if eval "test \"`echo '$''{'inn_cv_sys_os'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1888,7 +1932,7 @@ *-belf*) echo $ac_n "checking -belf""... $ac_c" 1>&6 -echo "configure:1892: checking -belf" >&5 +echo "configure:1936: checking -belf" >&5 OLD_CFLAGS="$CFLAGS" if eval "test \"`echo '$''{'inn_cv_option_sco_belf_option'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1899,11 +1943,11 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then inn_cv_option_sco_belf_option=yes else @@ -1932,7 +1976,7 @@ *) echo $ac_n "checking -belf""... $ac_c" 1>&6 -echo "configure:1936: checking -belf" >&5 +echo "configure:1980: checking -belf" >&5 OLD_CFLAGS="$CFLAGS" if eval "test \"`echo '$''{'inn_cv_option_sco_belf_option'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1943,11 +1987,11 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then inn_cv_option_sco_belf_option=yes else @@ -2009,7 +2053,7 @@ # Extract the first word of "ctags", so it can be a program name with args. set dummy ctags; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2013: checking for $ac_word" >&5 +echo "configure:2057: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PATH_CTAGS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2044,7 +2088,7 @@ echo $ac_n "checking for path to ctags""... $ac_c" 1>&6 -echo "configure:2048: checking for path to ctags" >&5 +echo "configure:2092: checking for path to ctags" >&5 if eval "test \"`echo '$''{'ac_cv_subst_ctags'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2066,7 +2110,7 @@ # Extract the first word of "awk", so it can be a program name with args. set dummy awk; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2070: checking for $ac_word" >&5 +echo "configure:2114: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path__PATH_AWK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2107,7 +2151,7 @@ # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2111: checking for $ac_word" >&5 +echo "configure:2155: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path__PATH_PERL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2148,7 +2192,7 @@ # Extract the first word of "sed", so it can be a program name with args. set dummy sed; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2152: checking for $ac_word" >&5 +echo "configure:2196: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path__PATH_SED'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2190,7 +2234,7 @@ # Extract the first word of "egrep", so it can be a program name with args. set dummy egrep; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2194: checking for $ac_word" >&5 +echo "configure:2238: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path__PATH_EGREP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2231,7 +2275,7 @@ # Extract the first word of "sort", so it can be a program name with args. set dummy sort; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2235: checking for $ac_word" >&5 +echo "configure:2279: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path__PATH_SORT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2272,7 +2316,7 @@ # Extract the first word of "sh", so it can be a program name with args. set dummy sh; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2276: checking for $ac_word" >&5 +echo "configure:2320: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path__PATH_SH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2315,7 +2359,7 @@ # Extract the first word of "pgpv", so it can be a program name with args. set dummy pgpv; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2319: checking for $ac_word" >&5 +echo "configure:2363: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path__PATH_PGP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2352,7 +2396,7 @@ # Extract the first word of "pgp", so it can be a program name with args. set dummy pgp; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2356: checking for $ac_word" >&5 +echo "configure:2400: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path__PATH_PGP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2397,7 +2441,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2401: checking for $ac_word" >&5 +echo "configure:2445: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GETFTP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2439,7 +2483,7 @@ # Extract the first word of "getconf", so it can be a program name with args. set dummy getconf; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2443: checking for $ac_word" >&5 +echo "configure:2487: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GETCONF'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2482,7 +2526,7 @@ # Extract the first word of "compress", so it can be a program name with args. set dummy compress; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2486: checking for $ac_word" >&5 +echo "configure:2530: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_COMPRESS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2520,7 +2564,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2524: checking for $ac_word" >&5 +echo "configure:2568: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GZIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2580,11 +2624,20 @@ # Check whether --enable-tagged-hash or --disable-tagged-hash was given. if test "${enable_tagged_hash+set}" = set; then enableval="$enable_tagged_hash" - DO_DBZ_TAGGED_HASH=DO -else - DO_DBZ_TAGGED_HASH=DONT + if test "x$enableval" = xyes ; then + DO_DBZ_TAGGED_HASH=DO + else + DO_DBZ_TAGGED_HASH=DONT + fi fi +if test "x$DO_LFS" = "xDO" +then + if test "x$DO_DBZ_TAGGED_HASH" = "xDO" + then + { echo "configure: error: --enable-tagged-hash and --with-largefiles can not be used at the same time." 1>&2; exit 1; } + fi +fi if test "${with_sendmail+set}" = set then @@ -2593,7 +2646,7 @@ # Extract the first word of "sendmail", so it can be a program name with args. set dummy sendmail; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2597: checking for $ac_word" >&5 +echo "configure:2650: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_SENDMAIL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2632,7 +2685,7 @@ # Extract the first word of "sendmail", so it can be a program name with args. set dummy sendmail; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2636: checking for $ac_word" >&5 +echo "configure:2689: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_SENDMAIL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2690,7 +2743,7 @@ EXTRA_SRC="" echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 -echo "configure:2694: checking for crypt in -lcrypt" >&5 +echo "configure:2747: checking for crypt in -lcrypt" >&5 ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2698,7 +2751,7 @@ ac_save_LIBS="$LIBS" LIBS="-lcrypt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2737,7 +2790,7 @@ fi echo $ac_n "checking for setproctitle in -lutil""... $ac_c" 1>&6 -echo "configure:2741: checking for setproctitle in -lutil" >&5 +echo "configure:2794: checking for setproctitle in -lutil" >&5 ac_lib_var=`echo util'_'setproctitle | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2745,7 +2798,7 @@ ac_save_LIBS="$LIBS" LIBS="-lutil $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2784,7 +2837,7 @@ fi echo $ac_n "checking for inet_addr in -l44bsd""... $ac_c" 1>&6 -echo "configure:2788: checking for inet_addr in -l44bsd" >&5 +echo "configure:2841: checking for inet_addr in -l44bsd" >&5 ac_lib_var=`echo 44bsd'_'inet_addr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2792,7 +2845,7 @@ ac_save_LIBS="$LIBS" LIBS="-l44bsd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2831,7 +2884,7 @@ fi echo $ac_n "checking for __inet_addr in -lbind""... $ac_c" 1>&6 -echo "configure:2835: checking for __inet_addr in -lbind" >&5 +echo "configure:2888: checking for __inet_addr in -lbind" >&5 ac_lib_var=`echo bind'_'__inet_addr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2839,7 +2892,7 @@ ac_save_LIBS="$LIBS" LIBS="-lbind $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2878,7 +2931,7 @@ fi echo $ac_n "checking for gethostbyname in -lresolv""... $ac_c" 1>&6 -echo "configure:2882: checking for gethostbyname in -lresolv" >&5 +echo "configure:2935: checking for gethostbyname in -lresolv" >&5 ac_lib_var=`echo resolv'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2886,7 +2939,7 @@ ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2919,7 +2972,7 @@ fi echo $ac_n "checking for inet_aton in -lresolv""... $ac_c" 1>&6 -echo "configure:2923: checking for inet_aton in -lresolv" >&5 +echo "configure:2976: checking for inet_aton in -lresolv" >&5 ac_lib_var=`echo resolv'_'inet_aton | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2927,7 +2980,7 @@ ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2966,7 +3019,7 @@ if test x$ac_try_bind = x1 then echo $ac_n "checking for inet_aton in -lbind""... $ac_c" 1>&6 -echo "configure:2970: checking for inet_aton in -lbind" >&5 +echo "configure:3023: checking for inet_aton in -lbind" >&5 ac_lib_var=`echo bind'_'inet_aton | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2974,7 +3027,7 @@ ac_save_LIBS="$LIBS" LIBS="-lbind $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3008,7 +3061,7 @@ if test x$ac_need_extra_inet_aton = x then echo $ac_n "checking for __inet_aton in -lbind""... $ac_c" 1>&6 -echo "configure:3012: checking for __inet_aton in -lbind" >&5 +echo "configure:3065: checking for __inet_aton in -lbind" >&5 ac_lib_var=`echo bind'_'__inet_aton | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3016,7 +3069,7 @@ ac_save_LIBS="$LIBS" LIBS="-lbind $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3054,7 +3107,7 @@ fi fi echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:3058: checking for gethostbyname in -lnsl" >&5 +echo "configure:3111: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3062,7 +3115,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3101,7 +3154,7 @@ fi echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:3105: checking for socket in -lsocket" >&5 +echo "configure:3158: checking for socket in -lsocket" >&5 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3109,7 +3162,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3148,7 +3201,7 @@ if test x$ac_try_nsl = x1 then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:3152: checking for gethostbyname in -lnsl" >&5 +echo "configure:3205: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3156,7 +3209,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3193,7 +3246,7 @@ fi fi echo $ac_n "checking for getspnam in -lshadow""... $ac_c" 1>&6 -echo "configure:3197: checking for getspnam in -lshadow" >&5 +echo "configure:3250: checking for getspnam in -lshadow" >&5 ac_lib_var=`echo shadow'_'getspnam | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3201,7 +3254,7 @@ ac_save_LIBS="$LIBS" LIBS="-lshadow $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3240,7 +3293,7 @@ fi echo $ac_n "checking for nlist in -lelf""... $ac_c" 1>&6 -echo "configure:3244: checking for nlist in -lelf" >&5 +echo "configure:3297: checking for nlist in -lelf" >&5 ac_lib_var=`echo elf'_'nlist | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3248,7 +3301,7 @@ ac_save_LIBS="$LIBS" LIBS="-lelf $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3287,7 +3340,7 @@ fi echo $ac_n "checking for flock in -lbsd""... $ac_c" 1>&6 -echo "configure:3291: checking for flock in -lbsd" >&5 +echo "configure:3344: checking for flock in -lbsd" >&5 ac_lib_var=`echo bsd'_'flock | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3295,7 +3348,7 @@ ac_save_LIBS="$LIBS" LIBS="-lbsd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3334,7 +3387,7 @@ fi echo $ac_n "checking for regexec in -lregex""... $ac_c" 1>&6 -echo "configure:3338: checking for regexec in -lregex" >&5 +echo "configure:3391: checking for regexec in -lregex" >&5 ac_lib_var=`echo regex'_'regexec | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3342,7 +3395,7 @@ ac_save_LIBS="$LIBS" LIBS="-lregex $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3382,7 +3435,7 @@ if test x${DO_PERL} = xDO ; then echo $ac_n "checking for Perl configuration""... $ac_c" 1>&6 -echo "configure:3386: checking for Perl configuration" >&5 +echo "configure:3439: checking for Perl configuration" >&5 perl_core_path=`$_PATH_PERL -e 'use Config; print $Config{archlib}'` perl_core_libs=`$_PATH_PERL -MExtUtils::Embed -e ldopts | tail -1` for i in ${LIBS} ; do @@ -3403,12 +3456,12 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 -echo "configure:3407: checking for $ac_hdr that defines DIR" >&5 +echo "configure:3460: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_hdr> @@ -3416,7 +3469,7 @@ DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:3420: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3473: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -3441,7 +3494,7 @@ # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 -echo "configure:3445: checking for opendir in -ldir" >&5 +echo "configure:3498: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3449,7 +3502,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3482,7 +3535,7 @@ else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:3486: checking for opendir in -lx" >&5 +echo "configure:3539: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3490,7 +3543,7 @@ ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3524,12 +3577,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:3528: checking for ANSI C header files" >&5 +echo "configure:3581: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3537,7 +3590,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3541: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3594: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3554,7 +3607,7 @@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -3572,7 +3625,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -3593,7 +3646,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -3604,7 +3657,7 @@ exit (0); } EOF -if { (eval echo configure:3608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -3628,12 +3681,12 @@ fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:3632: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:3685: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3642,7 +3695,7 @@ struct tm *tp; ; return 0; } EOF -if { (eval echo configure:3646: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3699: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -3663,12 +3716,12 @@ fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:3667: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:3720: checking for sys/wait.h that is POSIX.1 compatible" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3684,7 +3737,7 @@ s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:3688: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3741: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -3708,17 +3761,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3712: checking for $ac_hdr" >&5 +echo "configure:3765: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3722: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3775: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3748,17 +3801,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3752: checking for $ac_hdr" >&5 +echo "configure:3805: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3762: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3815: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3788,17 +3841,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3792: checking for $ac_hdr" >&5 +echo "configure:3845: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3802: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3855: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3828,17 +3881,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3832: checking for $ac_hdr" >&5 +echo "configure:3885: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3842: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3895: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3874,17 +3927,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3878: checking for $ac_hdr" >&5 +echo "configure:3931: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3888: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3941: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3913,12 +3966,12 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:3917: checking for working const" >&5 +echo "configure:3970: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4024: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -3988,12 +4041,12 @@ fi echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 -echo "configure:3992: checking for st_blksize in struct stat" >&5 +echo "configure:4045: checking for st_blksize in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4001,7 +4054,7 @@ struct stat s; s.st_blksize; ; return 0; } EOF -if { (eval echo configure:4005: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4058: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blksize=yes else @@ -4022,12 +4075,12 @@ fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:4026: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:4079: checking whether struct tm is in sys/time.h or time.h" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4035,7 +4088,7 @@ struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:4039: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4092: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -4056,12 +4109,12 @@ fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:4060: checking for size_t" >&5 +echo "configure:4113: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -4089,12 +4142,12 @@ fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:4093: checking for uid_t in sys/types.h" >&5 +echo "configure:4146: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -4123,12 +4176,12 @@ fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:4127: checking for off_t" >&5 +echo "configure:4180: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -4156,12 +4209,12 @@ fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:4160: checking for pid_t" >&5 +echo "configure:4213: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -4189,12 +4242,12 @@ fi echo $ac_n "checking for atomical variable""... $ac_c" 1>&6 -echo "configure:4193: checking for atomical variable" >&5 +echo "configure:4246: checking for atomical variable" >&5 if eval "test \"`echo '$''{'ac_cv_type_atomic'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #ifdef HAVE_SYS_SIGNAL_H @@ -4204,7 +4257,7 @@ sig_atomic_t i ; return 0; } EOF -if { (eval echo configure:4208: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4261: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_atomic=sig_atomic_t else @@ -4220,16 +4273,16 @@ echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6 -echo "configure:4224: checking for tm_gmtoff in struct tm" >&5 +echo "configure:4277: checking for tm_gmtoff in struct tm" >&5 cat > conftest.$ac_ext < int main() { struct tm t; t.tm_gmtoff = 0 ; return 0; } EOF -if { (eval echo configure:4233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_TM_GMTOFF 1 @@ -4244,9 +4297,9 @@ rm -f conftest* echo $ac_n "checking for union wait""... $ac_c" 1>&6 -echo "configure:4248: checking for union wait" >&5 +echo "configure:4301: checking for union wait" >&5 cat > conftest.$ac_ext < @@ -4257,7 +4310,7 @@ union wait w ; return 0; } EOF -if { (eval echo configure:4261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_UNION_WAIT 1 @@ -4273,7 +4326,7 @@ # Size of integers echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:4277: checking size of int" >&5 +echo "configure:4330: checking size of int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4281,7 +4334,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -4292,7 +4345,7 @@ exit(0); } EOF -if { (eval echo configure:4296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int=`cat conftestval` else @@ -4315,7 +4368,7 @@ ac_cv_subst_int32_t=int else echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:4319: checking size of long" >&5 +echo "configure:4372: checking size of long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4323,7 +4376,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -4334,7 +4387,7 @@ exit(0); } EOF -if { (eval echo configure:4338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long=`cat conftestval` else @@ -4357,7 +4410,7 @@ ac_cv_subst_int32_t=long else echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:4361: checking size of short" >&5 +echo "configure:4414: checking size of short" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4365,7 +4418,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -4376,7 +4429,7 @@ exit(0); } EOF -if { (eval echo configure:4380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_short=`cat conftestval` else @@ -4406,13 +4459,13 @@ if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:4410: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:4463: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext < Autoconf TIOCGETP @@ -4430,7 +4483,7 @@ if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -4452,7 +4505,7 @@ fi echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:4456: checking for 8-bit clean memcmp" >&5 +echo "configure:4509: checking for 8-bit clean memcmp" >&5 if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4460,7 +4513,7 @@ ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_memcmp_clean=yes else @@ -4488,7 +4541,7 @@ test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}" echo $ac_n "checking whether setvbuf arguments are reversed""... $ac_c" 1>&6 -echo "configure:4492: checking whether setvbuf arguments are reversed" >&5 +echo "configure:4545: checking whether setvbuf arguments are reversed" >&5 if eval "test \"`echo '$''{'ac_cv_func_setvbuf_reversed'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4496,7 +4549,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < /* If setvbuf has the reversed format, exit 0. */ @@ -4510,7 +4563,7 @@ exit(0); /* Non-reversed systems segv here. */ } EOF -if { (eval echo configure:4514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_setvbuf_reversed=yes else @@ -4534,12 +4587,12 @@ fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:4538: checking return type of signal handlers" >&5 +echo "configure:4591: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4556,7 +4609,7 @@ int i; ; return 0; } EOF -if { (eval echo configure:4560: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4613: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -4577,17 +4630,17 @@ ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for vfork.h""... $ac_c" 1>&6 -echo "configure:4581: checking for vfork.h" >&5 +echo "configure:4634: checking for vfork.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4591: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4644: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4612,18 +4665,18 @@ fi echo $ac_n "checking for working vfork""... $ac_c" 1>&6 -echo "configure:4616: checking for working vfork" >&5 +echo "configure:4669: checking for working vfork" >&5 if eval "test \"`echo '$''{'ac_cv_func_vfork_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$cross_compiling" = yes; then echo $ac_n "checking for vfork""... $ac_c" 1>&6 -echo "configure:4622: checking for vfork" >&5 +echo "configure:4675: checking for vfork" >&5 if eval "test \"`echo '$''{'ac_cv_func_vfork'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vfork=yes" else @@ -4668,7 +4721,7 @@ ac_cv_func_vfork_works=$ac_cv_func_vfork else cat > conftest.$ac_ext < @@ -4763,7 +4816,7 @@ } } EOF -if { (eval echo configure:4767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_vfork_works=yes else @@ -4786,12 +4839,12 @@ fi echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:4790: checking for vprintf" >&5 +echo "configure:4843: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -4838,12 +4891,12 @@ if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:4842: checking for _doprnt" >&5 +echo "configure:4895: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -4893,12 +4946,12 @@ for ac_func in fchmod getdtab gethostname getrlimit getrusage do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4897: checking for $ac_func" >&5 +echo "configure:4950: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4948,12 +5001,12 @@ for ac_func in gettimeofday memchr memcmp memcpy memmove memset do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4952: checking for $ac_func" >&5 +echo "configure:5005: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5003,12 +5056,12 @@ for ac_func in mkdir mkfifo mktemp select setbuffer setproctitle do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5007: checking for $ac_func" >&5 +echo "configure:5060: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5058,12 +5111,12 @@ for ac_func in setsid socket strcasecmp strchr strcspn strerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5062: checking for $ac_func" >&5 +echo "configure:5115: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5143: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5113,12 +5166,12 @@ for ac_func in strrchr strspn strstr symlink sysconf syslog ulimit do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5117: checking for $ac_func" >&5 +echo "configure:5170: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5168,12 +5221,12 @@ for ac_func in waitpid socketpair getpagesize getspnam do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5172: checking for $ac_func" >&5 +echo "configure:5225: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5223,12 +5276,12 @@ for ac_func in statvfs do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5227: checking for $ac_func" >&5 +echo "configure:5280: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5278,12 +5331,12 @@ for ac_func in statfs do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5282: checking for $ac_func" >&5 +echo "configure:5335: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5333,17 +5386,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5337: checking for $ac_hdr" >&5 +echo "configure:5390: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5347: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5400: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5375,17 +5428,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5379: checking for $ac_hdr" >&5 +echo "configure:5432: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5389: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5442: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5417,17 +5470,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5421: checking for $ac_hdr" >&5 +echo "configure:5474: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5431: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5484: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5463,7 +5516,7 @@ echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:5467: checking for working mmap" >&5 +echo "configure:5520: checking for working mmap" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_shared'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5471,7 +5524,7 @@ ac_cv_func_mmap_shared=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_shared=yes else @@ -5594,12 +5647,12 @@ for ac_func in madvise do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5598: checking for $ac_func" >&5 +echo "configure:5651: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5652,7 +5705,7 @@ fi echo $ac_n "checking whether msync is needed""... $ac_c" 1>&6 -echo "configure:5656: checking whether msync is needed" >&5 +echo "configure:5709: checking whether msync is needed" >&5 if eval "test \"`echo '$''{'ac_cv_func_need_msync'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5660,7 +5713,7 @@ ac_cv_func_need_msync=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_need_msync=yes else @@ -5790,12 +5843,12 @@ if test $ac_cv_lib_regex_regexec = no; then echo $ac_n "checking for regexec""... $ac_c" 1>&6 -echo "configure:5794: checking for regexec" >&5 +echo "configure:5847: checking for regexec" >&5 if eval "test \"`echo '$''{'ac_cv_func_regexec'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_regexec=yes" else @@ -5842,9 +5895,9 @@ echo $ac_n "checking for msync args""... $ac_c" 1>&6 -echo "configure:5846: checking for msync args" >&5 +echo "configure:5899: checking for msync args" >&5 cat > conftest.$ac_ext < #include @@ -5852,7 +5905,7 @@ char *p; int psize; msync(p,psize,MS_ASYNC); ; return 0; } EOF -if { (eval echo configure:5856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_MSYNC_3_ARG 1 @@ -5867,12 +5920,12 @@ rm -f conftest* echo $ac_n "checking for return type of abort""... $ac_c" 1>&6 -echo "configure:5871: checking for return type of abort" >&5 +echo "configure:5924: checking for return type of abort" >&5 if eval "test \"`echo '$''{'ac_cv_type_abort'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -5881,7 +5934,7 @@ int a;a=abort() ; return 0; } EOF -if { (eval echo configure:5885: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5938: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_abort=int else @@ -5896,12 +5949,12 @@ echo "$ac_t""$ac_cv_type_abort" 1>&6 echo $ac_n "checking for return type of alarm""... $ac_c" 1>&6 -echo "configure:5900: checking for return type of alarm" >&5 +echo "configure:5953: checking for return type of alarm" >&5 if eval "test \"`echo '$''{'ac_cv_type_alarm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -5910,7 +5963,7 @@ unsigned int alarm() ; return 0; } EOF -if { (eval echo configure:5914: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5967: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_alarm="unsigned int" else @@ -5925,12 +5978,12 @@ echo "$ac_t""$ac_cv_type_alarm" 1>&6 echo $ac_n "checking for return type of sleep""... $ac_c" 1>&6 -echo "configure:5929: checking for return type of sleep" >&5 +echo "configure:5982: checking for return type of sleep" >&5 if eval "test \"`echo '$''{'ac_cv_type_sleep'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -5939,7 +5992,7 @@ unsigned int sleep() ; return 0; } EOF -if { (eval echo configure:5943: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5996: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_sleep="unsigned int" else @@ -5954,12 +6007,12 @@ echo "$ac_t""$ac_cv_type_sleep" 1>&6 echo $ac_n "checking for return type of qsort""... $ac_c" 1>&6 -echo "configure:5958: checking for return type of qsort" >&5 +echo "configure:6011: checking for return type of qsort" >&5 if eval "test \"`echo '$''{'ac_cv_type_qsort'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -5968,7 +6021,7 @@ int a;a=qsort(0,0,0,0) ; return 0; } EOF -if { (eval echo configure:5972: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6025: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_qsort=int else @@ -5983,12 +6036,12 @@ echo "$ac_t""$ac_cv_type_qsort" 1>&6 echo $ac_n "checking for return type of free""... $ac_c" 1>&6 -echo "configure:5987: checking for return type of free" >&5 +echo "configure:6040: checking for return type of free" >&5 if eval "test \"`echo '$''{'ac_cv_type_free'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -6005,7 +6058,7 @@ int a;a=free(0) ; return 0; } EOF -if { (eval echo configure:6009: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6062: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_free=int else @@ -6020,12 +6073,12 @@ echo "$ac_t""$ac_cv_type_free" 1>&6 echo $ac_n "checking for return type of exit""... $ac_c" 1>&6 -echo "configure:6024: checking for return type of exit" >&5 +echo "configure:6077: checking for return type of exit" >&5 if eval "test \"`echo '$''{'ac_cv_type_exit'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -6034,7 +6087,7 @@ int a;a=exit(0) ; return 0; } EOF -if { (eval echo configure:6038: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6091: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_exit=int else @@ -6049,12 +6102,12 @@ echo "$ac_t""$ac_cv_type_exit" 1>&6 echo $ac_n "checking for return type of _exit""... $ac_c" 1>&6 -echo "configure:6053: checking for return type of _exit" >&5 +echo "configure:6106: checking for return type of _exit" >&5 if eval "test \"`echo '$''{'ac_cv_type__exit'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -6063,7 +6116,7 @@ int a;a=_exit(0) ; return 0; } EOF -if { (eval echo configure:6067: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6120: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type__exit=int else @@ -6081,12 +6134,12 @@ for ac_func in flock lockf fcntl do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6085: checking for $ac_func" >&5 +echo "configure:6138: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6135,9 +6188,9 @@ echo $ac_n "checking for AF_UNIX""... $ac_c" 1>&6 -echo "configure:6139: checking for AF_UNIX" >&5 +echo "configure:6192: checking for AF_UNIX" >&5 cat > conftest.$ac_ext < #ifdef AF_UNIX @@ -6159,11 +6212,11 @@ echo $ac_n "checking for close on exec style""... $ac_c" 1>&6 -echo "configure:6163: checking for close on exec style" >&5 +echo "configure:6216: checking for close on exec style" >&5 CLX_STYLE=pre_test if test $ac_cv_header_fcntl_h = yes; then cat > conftest.$ac_ext < #ifdef FD_CLOEXEC @@ -6196,7 +6249,7 @@ CLX_STYLE=pre_test if test $ac_cv_header_sys_filio_h = yes; then cat > conftest.$ac_ext < #ifdef FIOCLEX @@ -6228,11 +6281,11 @@ echo $ac_n "checking for nbio style""... $ac_c" 1>&6 -echo "configure:6232: checking for nbio style" >&5 +echo "configure:6285: checking for nbio style" >&5 NBIO_STYLE=pre_test if test $ac_cv_header_fcntl_h = yes; then cat > conftest.$ac_ext < #ifdef O_NONBLOCK @@ -6260,7 +6313,7 @@ NBIO_STYLE=pre_test if test $ac_cv_header_sys_filio_h = yes; then cat > conftest.$ac_ext < #ifdef FIONBIO @@ -6293,9 +6346,9 @@ echo $ac_n "checking log level for news""... $ac_c" 1>&6 -echo "configure:6297: checking log level for news" >&5 +echo "configure:6350: checking log level for news" >&5 cat > conftest.$ac_ext < #ifdef LOG_NEWS @@ -6318,12 +6371,12 @@ echo $ac_n "checking generic pointer""... $ac_c" 1>&6 -echo "configure:6322: checking generic pointer" >&5 +echo "configure:6375: checking generic pointer" >&5 if eval "test \"`echo '$''{'ac_cv_type_generic'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -6338,7 +6391,7 @@ void *a; a = malloc(sizeof(a)) ; return 0; } EOF -if { (eval echo configure:6342: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6395: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_generic=void else @@ -6842,6 +6895,9 @@ s%@NEWSUSER@%$NEWSUSER%g s%@NEWSGRP@%$NEWSGRP%g s%@NEWSMASTER@%$NEWSMASTER%g +s%@INEWSMODE@%$INEWSMODE%g +s%@RNEWSGRP@%$RNEWSGRP%g +s%@RNEWSMODE@%$RNEWSMODE%g s%@MANDIR@%$MANDIR%g s%@HOSTNAME@%$HOSTNAME%g s%@SET_MAKE@%$SET_MAKE%g diff -ruN inn-2.2.2/configure.in inn-2.2.3/configure.in --- inn-2.2.2/configure.in Mon Dec 13 05:18:37 1999 +++ inn-2.2.3/configure.in Tue Jul 18 16:54:07 2000 @@ -15,25 +15,41 @@ dnl Parse the arguments AC_ARG_WITH(tcl, - [ --with-tcl TCL script support], - DO_TCL=DO - TCL_LIB="-ltcl -lm" - TCL_INC="-I/usr/local/include", DO_TCL=DONT - TCL_LIB="" - TCL_INC="") + [ --with-tcl TCL script support [default=no]], + [case "${withval}" in + yes) DO_TCL=DO ;; + no) DO_TCL=DONT ;; + *) AC_MSG_ERROR(invalid argument to --with-tcl or --without-tcl) ;; + esac], + DO_TCL=DONT) +if test $DO_TCL = DO ; then + TCL_LIB="-ltcl -lm" + TCL_INC="-I/usr/local/include" +else + TCL_LIB="" + TCL_INC="" +fi AC_SUBST(DO_TCL) AC_SUBST(TCL_LIB) AC_SUBST(TCL_INC) AC_ARG_WITH(perl, - [ --with-perl Perl script support], - DO_PERL=DO, + [ --with-perl Perl script support [default=no]], + [case "${withval}" in + yes) DO_PERL=DO ;; + no) DO_PERL=DONT ;; + *) AC_MSG_ERROR(invalid argument to --with-perl or --without-perl) ;; + esac], DO_PERL=DONT) AC_SUBST(DO_PERL) AC_ARG_WITH(largefiles, - [ --with-largefiles Support for files greater than 2gb], - DO_LFS=DO, + [ --with-largefiles Support for files greater than 2gb [default=no]], + [case "${withval}" in + yes) DO_LFS=DO ;; + no) DO_LFS=DONT ;; + *) AC_MSG_ERROR(invalid argument to --with-largefiles or --without-largefiles) ;; + esac], DO_LFS=DONT) AC_SUBST(DO_LFS) @@ -101,6 +117,25 @@ [ --with-sendmail=PATH Specify sendmail], SENDMAIL=$with_sendmail) +INEWSMODE=0550 +AC_ARG_ENABLE(setgid-inews, + [ --enable-setgid-inews Install inews setgid], + if test "x$enableval" = xyes ; then + INEWSMODE=2555 + fi) +AC_SUBST(INEWSMODE) + +RNEWSGRP=$NEWSGRP +RNEWSMODE=0500 +AC_ARG_ENABLE(uucp-rnews, + [ --enable-uucp-rnews Install rnews setuid, group uucp], + if test "x$enableval" = xyes ; then + RNEWSGRP=uucp + RNEWSMODE=4550 + fi) +AC_SUBST(RNEWSGRP) +AC_SUBST(RNEWSMODE) + AC_DEFUN(AC_DECUNIX, [AC_REQUIRE([AC_PROG_CC])dnl AC_BEFORE([$0], [AC_TRY_COMPILE])dnl @@ -328,7 +363,19 @@ AC_SUBST(LOG_COMPRESS) AC_SUBST(LOG_COMPRESSEXT) dnl -AC_ARG_ENABLE(tagged-hash,[ --enable-tagged-hash use tagged hash table for history], DO_DBZ_TAGGED_HASH=DO, DO_DBZ_TAGGED_HASH=DONT) +AC_ARG_ENABLE(tagged-hash,[ --enable-tagged-hash use tagged hash table for history], + if test "x$enableval" = xyes ; then + DO_DBZ_TAGGED_HASH=DO + else + DO_DBZ_TAGGED_HASH=DONT + fi) +if test "x$DO_LFS" = "xDO" +then + if test "x$DO_DBZ_TAGGED_HASH" = "xDO" + then + AC_MSG_ERROR(--enable-tagged-hash and --with-largefiles can not be used at the same time.) + fi +fi AC_SUBST(DO_DBZ_TAGGED_HASH) dnl Automatic check for Mail is frequently wrong. Use innmail to have dnl a single interface. diff -ruN inn-2.2.2/doc/ctlinnd.8 inn-2.2.3/doc/ctlinnd.8 --- inn-2.2.2/doc/ctlinnd.8 Mon Dec 13 05:18:37 1999 +++ inn-2.2.3/doc/ctlinnd.8 Tue Jul 18 16:54:07 2000 @@ -1,4 +1,4 @@ -.\" $Revision: 1.1.2.1 $ +.\" $Revision: 1.1.2.2 $ .TH CTLINND 8 .SH NAME ctlinnd \- control the InterNetNews daemon @@ -302,7 +302,8 @@ This is the only command that has defaults. The .I creator -can be omitted and will default to the empty string, and the +can be omitted and will default to the newsmaster (as specified at configure +time, ``usenet'' by default), and the .I rest parameter can be omitted and will default to ``y''. This command can be done while the server is only throttled manually @@ -580,7 +581,7 @@ .de R$ This is revision \\$3, dated \\$4. .. -.R$ $Id: ctlinnd.8,v 1.1.2.1 1999/06/12 08:22:23 kondou Exp $ +.R$ $Id: ctlinnd.8,v 1.1.2.2 2000/04/09 21:13:19 rra Exp $ .SH "SEE ALSO" active(5), expire(8), diff -ruN inn-2.2.2/doc/incoming.conf.5 inn-2.2.3/doc/incoming.conf.5 --- inn-2.2.2/doc/incoming.conf.5 Mon Dec 13 05:18:37 1999 +++ inn-2.2.3/doc/incoming.conf.5 Tue Jul 18 16:54:07 2000 @@ -1,4 +1,4 @@ -.\" $Revision: 1.1.2.1 $ +.\" $Revision: 1.1.2.2 $ .TH INCOMING.CONF 5 .SH NAME incoming.conf \- names and addresses that feed us news @@ -7,7 +7,8 @@ .I consists of three types of entries: key/value, peer and group. Comments are taken from the hash character ``#'' to the end of the line. -Blank lines are ignored. +Blank lines are ignored. All key/value entries within each type +must not be duplicated. .PP Key/value entries are a keyword immediately followed by a colon, at least one blank and a value. For example: @@ -158,7 +159,7 @@ .de R$ This is revision \\$3, dated \\$4. .. -.R$ $Id: incoming.conf.5,v 1.1.2.1 1999/06/12 08:22:32 kondou Exp $ +.R$ $Id: incoming.conf.5,v 1.1.2.2 2000/01/08 18:03:27 kondou Exp $ .SH "SEE ALSO" inn.conf(5), innd(8), diff -ruN inn-2.2.2/doc/libinn.3 inn-2.2.3/doc/libinn.3 --- inn-2.2.2/doc/libinn.3 Mon Dec 13 05:18:37 1999 +++ inn-2.2.3/doc/libinn.3 Tue Jul 18 16:54:07 2000 @@ -1,4 +1,4 @@ -.\" $Revision: 1.1.2.1 $ +.\" $Revision: 1.1.2.2 $ .TH LIBINN 3 .SH NAME libinn \- InterNetNews library routines @@ -98,14 +98,16 @@ .B " char *errbuff;" .B "int" -.B "NNTPremoteopen(FromServerp, ToServerp, errbuff)" +.B "NNTPremoteopen(port, FromServerp, ToServerp, errbuff)" +.B " int port;" .B " FILE **FromServerp;" .B " FILE **ToServerp;" .B " char *errbuff;" .B "int" -.B "NNTPconnect(host, FromServerp, ToServerp, errbuff)" +.B "NNTPconnect(host, port, FromServerp, ToServerp, errbuff)" .B " char *host;" +.B " int port;" .B " FILE **FromServerp;" .B " FILE **ToServerp;" .B " char *errbuff;" @@ -405,7 +407,7 @@ does the same except that it uses .I innconf->server to find the name of the local server, and opens a connection to the -standard NNTP port. +.IR port . Any client program can use this routine. It returns \-1 on failure, or zero on success. .PP @@ -495,10 +497,11 @@ .nf char *p; char *Article; -char buff[256]; +char buff[256], errbuff[256]; FILE *F; FILE *ToServer; FILE *FromServer; +int port = 119; if ((p = HeaderFind(Article, "From", 4)) == NULL) Fatal("Can't find From line"); @@ -517,7 +520,7 @@ /* Close the file. */ CAclose(); -if (NNTPremoteopen(&FromServer, &ToServer) < 0) +if (NNTPremoteopen(port, &FromServer, &ToServer, errbuff) < 0) Fatal("Can't connect to server"); if ((p = GetModeratorAddress("comp.sources.unix")) == NULL) @@ -529,7 +532,7 @@ .de R$ This is revision \\$3, dated \\$4. .. -.R$ $Id: libinn.3,v 1.1.2.1 1999/06/12 08:22:44 kondou Exp $ +.R$ $Id: libinn.3,v 1.1.2.2 2000/04/04 22:36:42 kondou Exp $ .SH "SEE ALSO" active(5), dbz(3z), diff -ruN inn-2.2.2/doc/mailpost.8 inn-2.2.3/doc/mailpost.8 --- inn-2.2.2/doc/mailpost.8 Mon Dec 13 05:18:37 1999 +++ inn-2.2.3/doc/mailpost.8 Tue Jul 18 16:54:07 2000 @@ -72,14 +72,14 @@ used to store the message ids of articles sent on. This is to prevent articles looping around if a news to mail gateway sends them back here. This option may be required if the mailpost process doesn't have write access to the news tmp -directory (the value of \fpathtmp\fP in \fBinn.conf(5)\fP. +directory (the value of \fBpathtmp\fP in \fBinn.conf(5)\fP. .SH HISTORY Written by Paul Vixie long ago and then hacked up by James Brister for INN integration. .de R$ This is revision \\$3, dated \\$4. .. -.R$ $Id: mailpost.8,v 1.1.2.1 1999/06/12 08:22:45 kondou Exp $ +.R$ $Id: mailpost.8,v 1.1.2.2 2000/05/13 04:37:26 kondou Exp $ .SH FILES /mailpost-msgid.db database file .SH BUGS diff -ruN inn-2.2.2/doc/storage.conf.5 inn-2.2.3/doc/storage.conf.5 --- inn-2.2.2/doc/storage.conf.5 Mon Dec 13 05:18:37 1999 +++ inn-2.2.3/doc/storage.conf.5 Tue Jul 18 16:54:07 2000 @@ -1,4 +1,4 @@ -.\" $Revision: 1.1.2.1 $ +.\" $Revision: 1.1.2.2 $ .TH STORAGE.CONF 5 .SH NAME storage.conf \- configuration file for storage manager @@ -176,36 +176,30 @@ alt.binaries.* in the ``BINARIES'' CNFS metacycbuff, all articles over roughly 50KB in any other hierarchy in the ``LARGE'' CNFS metacycbuff, all other articles in alt.* in one timehash class, and all other articles in -any newsgroups in a second timehash class, except for the internal.* -hierarchy which is stored in traditional spool format. +any newsgroups in a second timehash class. .RS .nf -method tradspool { - class: 1 - newsgroups: internal.* -} - method cnfs { - class: 2 + class: 1 newsgroups: alt.binaries.* options: BINARIES } method cnfs { - class: 3 + class: 2 newsgroups: * size: 50000 options: LARGE } method timehash { - class: 4 + class: 3 newsgroups: alt.* } method timehash { - class: 5 + class: 4 newsgroups: * } @@ -222,7 +216,7 @@ .de R$ This is revision \\$3, dated \\$4. .. -.R$ $Id: storage.conf.5,v 1.1.2.1 1999/06/12 08:23:06 kondou Exp $ +.R$ $Id: storage.conf.5,v 1.1.2.2 1999/12/15 16:00:09 kondou Exp $ .SH "SEE ALSO" cycbuff.conf(5), expire.ctl(5), diff -ruN inn-2.2.2/expire/makehistory.c inn-2.2.3/expire/makehistory.c --- inn-2.2.2/expire/makehistory.c Mon Dec 13 05:18:37 1999 +++ inn-2.2.3/expire/makehistory.c Tue Jul 18 16:54:07 2000 @@ -1,4 +1,4 @@ -/* $Revision: 1.51 $ +/* $Revision: 1.51.2.1 $ ** ** Rebuild the history database. ** @@ -1706,7 +1706,7 @@ if (Translate == NO_TRANS) /* Start scanning articles stored by storage api */ while ((art = SMnext(art, RETR_HEAD)) != NULL) { - if (art->len == 0) { + if (art->len == 0 && art->token != NULL) { if (RemoveBad) (void)SMcancel(*art->token); continue; diff -ruN inn-2.2.2/frontends/Makefile inn-2.2.3/frontends/Makefile --- inn-2.2.2/frontends/Makefile Mon Dec 13 05:18:37 1999 +++ inn-2.2.3/frontends/Makefile Tue Jul 18 16:54:07 2000 @@ -1,4 +1,4 @@ -## $Revision: 1.30 $ +## $Revision: 1.30.2.1 $ include ../Makefile.global CFLAGS = $(GCFLAGS) @@ -64,9 +64,9 @@ ## Low-level install actions. $D$(PATHBIN)/inews: inews - $(LIBTOOL) ../installit.sh $(OWNER) -m 02555 -b .OLD $? $@ + $(LIBTOOL) ../installit.sh $(OWNER) -m $(INEWSMODE) -b .OLD $? $@ $D$(PATHBIN)/rnews: rnews - $(LIBTOOL) ../installit.sh $(ROWNER) -m 04550 -b .OLD $? $@ + $(LIBTOOL) ../installit.sh $(ROWNER) -m $(RNEWSMODE) -b .OLD $? $@ $D$(PATHBIN)/ctlinnd: ctlinnd $(LIBTOOL) ../installit.sh $(OWNER) -m 0550 -b .OLD $? $@ $D$(PATHBIN)/sm: sm diff -ruN inn-2.2.2/frontends/rnews.c inn-2.2.3/frontends/rnews.c --- inn-2.2.2/frontends/rnews.c Mon Dec 13 05:18:37 1999 +++ inn-2.2.3/frontends/rnews.c Tue Jul 18 16:54:07 2000 @@ -1,4 +1,4 @@ -/* $Revision: 1.16.2.3 $ +/* $Revision: 1.16.2.5 $ ** ** A front-end for InterNetNews. ** Read UUCP batches and offer them up NNTP-style. Because we may end @@ -279,6 +279,8 @@ default: Reject(article, "unknown_reply after ihave %s", buff); return TRUE; + case NNTP_RESENDIT_VAL: + return FALSE; case NNTP_SENDIT_VAL: break; case NNTP_HAVEIT_VAL: @@ -703,7 +705,14 @@ if(mode == 'N') exit(9); - TempName(innconf->pathtmp, temp); + TempName(innconf->pathincoming, buff); + p = strrchr(buff, '/'); + if (p == NULL) + exit(10); + *p = '\0'; + strcpy(temp, buff); + strcat(temp, "/."); + strcat(temp, ++p); (void)umask(0); if ((spfd = open(temp, O_WRONLY | O_CREAT, BATCHFILE_MODE)) < 0) { syslog(L_FATAL, "cant open %s %m", temp); diff -ruN inn-2.2.2/include/clibrary.h.in inn-2.2.3/include/clibrary.h.in --- inn-2.2.2/include/clibrary.h.in Mon Dec 13 05:18:37 1999 +++ inn-2.2.3/include/clibrary.h.in Tue Jul 18 16:54:07 2000 @@ -1,4 +1,4 @@ -/* $Revision: 1.7 $ +/* $Revision: 1.7.2.1 $ ** ** Here be declarations of routines and variables in the C library. ** You must #include and before this file. @@ -15,6 +15,10 @@ #if defined(HAVE_VFORK_H) # include #endif /* defined(HAVE_VFORK_H) */ + +#if defined(HAVE_SYS_SELECT_H) +# include +#endif /* defined(HAVE_SYS_SELECT_H) */ #if ! defined (DO_NEED_BOOL) && ! defined (DONT_NEED_BOOL) #define DO_NEED_BOOL 1 diff -ruN inn-2.2.2/include/config.h.in inn-2.2.3/include/config.h.in --- inn-2.2.2/include/config.h.in Mon Dec 13 05:18:37 1999 +++ inn-2.2.3/include/config.h.in Tue Jul 18 16:54:07 2000 @@ -1,4 +1,4 @@ -/* $Revision: 1.30.2.1 $ +/* $Revision: 1.30.2.2 $ ** ** Here be configuration data used by various InterNetNews programs. ** The numbers refer to sections in the config.dist file. @@ -127,6 +127,9 @@ /* Define if you have sys/sysinfo.h */ #undef HAVE_SYS_SYSINFO_H + +/* Define if you have sys/select.h */ +#undef HAVE_SYS_SELECT_H /* if I understand how configure does this, if 'const' isn't valid, * it will remove the 'const' declarations from the typedef's below diff -ruN inn-2.2.2/include/configdata.h inn-2.2.3/include/configdata.h --- inn-2.2.2/include/configdata.h Mon Dec 13 05:18:37 1999 +++ inn-2.2.3/include/configdata.h Tue Jul 18 16:54:07 2000 @@ -138,7 +138,7 @@ #define SITE_BUFFER_SIZE (16 * 1024) /* How your DBZ be compiled? Use tagged-hash or splitted tables */ /* =()<#define @@_TAGGED_HASH>()= */ -#define DONT_TAGGED_HASH +#define _TAGGED_HASH /* Function that returns no value, and a pointer to it. */ @@ -239,7 +239,7 @@ */ /* =()<#define @@_PERL>()= */ -#define DO_PERL +#define DONT_PERL /* diff -ruN inn-2.2.2/include/innconf.h inn-2.2.3/include/innconf.h --- inn-2.2.2/include/innconf.h Mon Dec 13 05:18:37 1999 +++ inn-2.2.3/include/innconf.h Tue Jul 18 16:54:07 2000 @@ -2,7 +2,7 @@ These are the definitions used for inn.conf variables and used primarily in lib/getconfig.c - $Header: /proj/cvs/isc/inn/inn/include/innconf.h,v 1.14.2.2 1998/11/07 03:00:24 kondou Exp $ + $Header: /dist1/cvs/isc/inn/inn/include/innconf.h,v 1.14.2.2 1998/11/07 03:00:24 kondou Exp $ */ /* diff -ruN inn-2.2.2/include/innversion.h inn-2.2.3/include/innversion.h --- inn-2.2.2/include/innversion.h Mon Dec 13 05:18:37 1999 +++ inn-2.2.3/include/innversion.h Tue Jul 18 16:54:07 2000 @@ -1,5 +1,5 @@ /* - * $Revision: 1.1.2.2 $ + * $Revision: 1.1.2.3 $ */ @@ -13,11 +13,8 @@ ** Try to avoid changing these. */ #define RELEASE "2" -#define PATCHLEVEL "2.2" -#define DATE "13-Dec-1999" -#define RELEASE "2" -#define PATCHLEVEL "2.2" -#define SUB_PATCHLEVEL_C 1 +#define PATCHLEVEL "2.3" +#define DATE "18-Jul-2000" /* diff -ruN inn-2.2.2/include/nntp.h inn-2.2.3/include/nntp.h --- inn-2.2.2/include/nntp.h Mon Dec 13 05:18:37 1999 +++ inn-2.2.3/include/nntp.h Tue Jul 18 16:54:07 2000 @@ -1,4 +1,4 @@ -/* $Revision: 1.2 $ +/* $Id: nntp.h,v 1.2.4.2 2000/06/24 08:34:14 rra Exp $ ** ** Here be a set of NNTP response codes as defined in RFC977 and elsewhere. ** The reponse codes are three digits, RFI, defined like this: @@ -139,3 +139,20 @@ #define NNTP_XBATCH_BADSIZE "501 Invalid or missing size for xbatch" #define NNTP_STRLEN 512 + +/* Consensus on the USEFOR mailing list in June of 2000 indicates that the + next revision of the Usenet article standard will limit the length of the + message ID to 250 characters. This is also the limit recommended by + son-of-1036. + + You can increase this limit if you want, but don't increase it above 497. + RFC 977 limits each line of the NNTP protocol to 512 octets, including + the terminating CRLF. For a message ID to be passed using the TAKETHIS + command, it can therefore be a maximum of 501 octets. The November 1999 + draft of the replacement RFC limits it to 497 octets. + + Both Cyclone and DNews are known to reject message IDs longer than 500 + octets as of June of 2000. DNews has been reported to have problems with + message IDs of 494 octets. */ + +#define NNTP_MSGID_MAXLEN 250 diff -ruN inn-2.2.2/include/ppport.h inn-2.2.3/include/ppport.h --- inn-2.2.2/include/ppport.h Mon Dec 13 05:18:37 1999 +++ inn-2.2.3/include/ppport.h Tue Jul 18 16:54:07 2000 @@ -13,6 +13,11 @@ /* If you needed to customize this file for your project, please mention your changes. */ +/* + Modified for Perl 5.6.0 by Russ Allbery (use PERL_VERSION instead of + PERL_PATCHLEVEL). +*/ + /* In order for a Perl extension module to be as portable as possible @@ -139,21 +144,25 @@ */ -#ifndef PERL_PATCHLEVEL +#if !defined(PERL_VERSION) && !defined(PERL_PATCHLEVEL) # ifndef __PATCHLEVEL_H_INCLUDED__ # include # endif #endif -#ifndef PERL_PATCHLEVEL -# define PERL_PATCHLEVEL PATCHLEVEL -# define PERL_SUBVERSION SUBVERSION +#ifndef PERL_VERSION +# ifdef PERL_PATCHLEVEL +# define PERL_VERSION PERL_PATCHLEVEL +# else +# define PERL_VERSION PATCHLEVEL +# define PERL_SUBVERSION SUBVERSION +# endif #endif #ifndef ERRSV # define ERRSV perl_get_sv("@",FALSE) #endif -#if (PERL_PATCHLEVEL < 4) || ((PERL_PATCHLEVEL == 4) && (PERL_SUBVERSION <= 4)) +#if (PERL_VERSION < 4) || ((PERL_VERSION == 4) && (PERL_SUBVERSION <= 4)) # define PL_sv_undef sv_undef # define PL_sv_yes sv_yes # define PL_sv_no sv_no @@ -165,7 +174,7 @@ # define PL_copline copline #endif -#if (PERL_PATCHLEVEL < 5) +#if (PERL_VERSION < 5) # ifdef WIN32 # define dTHR extern int Perl___notused # else @@ -176,61 +185,5 @@ #ifndef boolSV # define boolSV(b) ((b) ? &PL_sv_yes : &PL_sv_no) #endif - - - -/* Provide: newCONSTSUB */ - -/* newCONSTSUB from IO.xs is in the core starting with 5.004_63 */ -#if (PATCHLEVEL < 4) || ((PATCHLEVEL == 4) && (SUBVERSION < 63)) - -/* Prototype */ -#if !defined(NEED_newCONSTSUB_GLOBAL) -static -#endif -void newCONSTSUB _((HV * stash, char * name, SV *sv)); - -/* Warning */ -#if !defined(NEED_newCONSTSUB) && !defined(NEED_newCONSTSUB_GLOBAL) -#define newCONSTSUB Please_define_NEED_newCONSTSUB -#endif - -/* Definition */ -#if defined(NEED_newCONSTSUB) -static -#endif -#if defined(NEED_newCONSTSUB) || defined(NEED_newCONSTSUB_GLOBAL) -void -newCONSTSUB(stash,name,sv) -HV *stash; -char *name; -SV *sv; -{ - U32 oldhints = PL_hints; - HV *old_cop_stash = PL_curcop->cop_stash; - HV *old_curstash = PL_curstash; - line_t oldline = PL_curcop->cop_line; - PL_curcop->cop_line = PL_copline; - - PL_hints &= ~HINT_BLOCK_SCOPE; - if (stash) - PL_curstash = PL_curcop->cop_stash = stash; - - newSUB( - start_subparse(FALSE, 0), - newSVOP(OP_CONST, 0, newSVpv(name,0)), - newSVOP(OP_CONST, 0, &PL_sv_no), /* SvPV(&PL_sv_no) == "" -- GMB */ - newSTATEOP(0, Nullch, newSVOP(OP_CONST, 0, sv)) - ); - - PL_hints = oldhints; - PL_curcop->cop_stash = old_cop_stash; - PL_curstash = old_curstash; - PL_curcop->cop_line = oldline; -} -#endif - -#endif /* newCONSTSUB */ - #endif /* _P_P_PORTABILITY_H_ */ diff -ruN inn-2.2.2/innd/art.c inn-2.2.3/innd/art.c --- inn-2.2.2/innd/art.c Mon Dec 13 05:18:37 1999 +++ inn-2.2.3/innd/art.c Tue Jul 18 16:54:07 2000 @@ -1,4 +1,4 @@ -/* $Id: art.c,v 1.90.2.15 1999/11/19 01:30:39 kondou Exp $ +/* $Id: art.c,v 1.90.2.19 2000/06/13 08:26:02 rra Exp $ ** ** Article-processing. */ @@ -873,6 +873,10 @@ int c; const char *p; + /* Check the length of the message ID. */ + if (MessageID == NULL || strlen(MessageID) > NNTP_MSGID_MAXLEN) + return FALSE; + /* Scan local-part: "< atom|quoted [ . atom|quoted]" */ p = MessageID; if (*p++ != '<') @@ -1211,7 +1215,7 @@ if (!EQ(local, p)) { files = NULL; (void)sprintf(buff, "\"%.50s\" wants to cancel %s by \"%.50s\"", - p, MessageID, local); + p, MaxLength(MessageID, MessageID), local); ARTlog(Data, ART_REJECT, buff); } DISPOSE(p); @@ -2007,8 +2011,13 @@ break; } /* note #words we didn't get to add. */ + /* This code can potentially lead to a buffer overflow if the number of + ignored words is greater than 100, under some circumstances. It's + temporarily disabled until fixed. */ +#if 0 if (word_index < distinct_words - 1) sprintf(chase, ",%d", (distinct_words - word_index) - 1); +#endif hp->Length = strlen(hp->Value); out: @@ -2074,6 +2083,16 @@ BUFFappend(&Overview, COLONSPACE, STRLEN(COLONSPACE)); } i = Overview.Left; + if (caseEQ(hp->Name, "Newsgroups")) { + /* HDR(_newsgroups) is separated by '\0', so use Data->Newsgroups + instead */ + BUFFappend(&Overview, Data->Newsgroups, Data->NewsgroupsLength); + } else { + BUFFappend(&Overview, hp->Value, hp->Length); + } + for (p = &Overview.Data[i]; i < Overview.Left; p++, i++) + if (*p == '\t' || *p == '\n' || *p == '\r') + *p = ' '; #if defined(DO_KEYWORDS) if (innconf->keywords) { @@ -2087,11 +2106,6 @@ } } #endif /* defined(DO_KEYWORDS) */ - - BUFFappend(&Overview, hp->Value, hp->Length); - for (p = &Overview.Data[i]; i < Overview.Left; p++, i++) - if (*p == '\t' || *p == '\n' || *p == '\r') - *p = ' '; } } @@ -2212,7 +2226,7 @@ perlrc = (char *)HandleArticle(Data.Body, Data.LinesValue); TMRstop(TMR_PERL); if (perlrc != NULL) { - (void)sprintf(buff, "%d %s", NNTP_REJECTIT_VAL, perlrc); + (void)sprintf(buff, "%d %.200s", NNTP_REJECTIT_VAL, perlrc); syslog(L_NOTICE, "rejecting[perl] %s %s", Data.MessageID, buff); ARTlog(&Data, ART_REJECT, buff); if (innconf->remembertrash && (Mode == OMrunning) && @@ -2253,7 +2267,7 @@ (void)Tcl_UnsetVar(TCLInterpreter, "Headers", TCL_GLOBAL_ONLY); if (code == TCL_OK) { if (strcmp(TCLInterpreter->result, "accept") != 0) { - (void)sprintf(buff, "%d %s", NNTP_REJECTIT_VAL, + (void)sprintf(buff, "%d %.200s", NNTP_REJECTIT_VAL, TCLInterpreter->result); syslog(L_NOTICE, "rejecting[tcl] %s %s", Data.MessageID, buff); ARTlog(&Data, ART_REJECT, buff); @@ -2446,7 +2460,7 @@ continue; else if (canpost < 0) { (void)sprintf(buff, "%d Won't accept posts in \"%s\"", - NNTP_REJECTIT_VAL, p); + NNTP_REJECTIT_VAL, MaxLength(p, p)); ARTlog(&Data, ART_REJECT, buff); if (distributions) DISPOSE(distributions); diff -ruN inn-2.2.2/innd/lc.c inn-2.2.3/innd/lc.c --- inn-2.2.2/innd/lc.c Mon Dec 13 05:18:37 1999 +++ inn-2.2.3/innd/lc.c Tue Jul 18 16:54:07 2000 @@ -1,4 +1,4 @@ -/* $Id: lc.c,v 1.7 1998/06/03 07:22:06 kondou Exp $ +/* $Id: lc.c,v 1.7.4.1 2000/02/21 13:10:49 kondou Exp $ ** ** Routines for the local connect channel. Create a Unix-domain stream ** socket that processes on the local server connect to. Once the @@ -38,9 +38,10 @@ syslog(L_ERROR, "%s cant accept CCreader %m", LogName); return; } - new = NCcreate(fd, FALSE, TRUE); - new->Address.s_addr = MyAddress.s_addr; - syslog(L_NOTICE, "%s connected %d", "localhost", new->fd); + if ((new = NCcreate(fd, FALSE, TRUE)) != NULL) { + new->Address.s_addr = MyAddress.s_addr; + syslog(L_NOTICE, "%s connected %d", "localhost", new->fd); + } } diff -ruN inn-2.2.2/innd/nc.c inn-2.2.3/innd/nc.c --- inn-2.2.2/innd/nc.c Mon Dec 13 05:18:37 1999 +++ inn-2.2.3/innd/nc.c Tue Jul 18 16:54:07 2000 @@ -1,4 +1,4 @@ -/* $Id: nc.c,v 1.37.2.7 1999/10/04 02:43:50 kondou Exp $ +/* $Id: nc.c,v 1.37.2.10 2000/06/09 00:39:14 rra Exp $ ** ** Routines for the NNTP channel. Other channels get the descriptors which ** we turn into NNTP channels, and over which we speak NNTP. @@ -471,7 +471,7 @@ else cp->Sendid.Size = MAXHEADERSIZE; cp->Sendid.Data = NEW(char, cp->Sendid.Size); } - (void)sprintf(cp->Sendid.Data, "%d %s", NNTP_HAVEIT_VAL, perlrc); + (void)sprintf(cp->Sendid.Data, "%d %.200s", NNTP_HAVEIT_VAL, perlrc); NCwritereply(cp, cp->Sendid.Data); DISPOSE(cp->Sendid.Data); cp->Sendid.Size = 0; @@ -782,7 +782,7 @@ int j; char *tmpstr; - tmpstr = NEW(char, bp->Used); + tmpstr = NEW(char, bp->Used + 1); memcpy(tmpstr, bp->Data, bp->Used); tmpstr[bp->Used] = '\0'; @@ -1246,11 +1246,11 @@ NCcount++; if (Mode == OMthrottled) { NCwriteshutdown(cp, ModeReason); - return cp; + return NULL; } if (RejectReason) { NCwriteshutdown(cp, RejectReason); - return cp; + return NULL; } /* See if we have too many channels. */ diff -ruN inn-2.2.2/innd/rc.c inn-2.2.3/innd/rc.c --- inn-2.2.2/innd/rc.c Mon Dec 13 05:18:37 1999 +++ inn-2.2.3/innd/rc.c Tue Jul 18 16:54:07 2000 @@ -1,4 +1,4 @@ -/* $Id: rc.c,v 1.31.2.4 1999/09/13 11:08:50 kondou Exp $ +/* $Id: rc.c,v 1.31.2.8 2000/04/13 18:29:28 rra Exp $ ** ** Routines for the remote connect channel. Create an Internet stream socket ** that processes connect to. If the incoming site is not one of our feeds, @@ -27,6 +27,16 @@ #define COPYADDR(dest, src) \ (void)memcpy((POINTER)dest, (POINTER)src, (SIZE_T)sizeof (INADDR)) +#define TEST_CONFIG(a, b) \ + { \ + b = ((peer_params.Keysetbit & (1 << a)) != 0) ? TRUE : FALSE; \ + } + +#define SET_CONFIG(a) \ + { \ + peer_params.Keysetbit |= (1 << a); \ + } + /* ** A remote host has an address and a password. */ @@ -34,7 +44,7 @@ char *Label; /* Peer label */ char *Name; /* Hostname */ INADDR Address; /* List of ip adresses */ - char *Password; /* Optionnnal password */ + char *Password; /* Optional password */ BOOL Streaming; /* Streaming allowed ? */ BOOL Skip; /* Skip this peer ? */ BOOL NoResendId; /* Don't send RESEND responses ? */ @@ -43,6 +53,7 @@ char *Pattern; /* List of groups allowed (string) */ char *Email; /* Email(s) of contact */ char *Comment; /* Commentary [max size = MAXBUFF] */ + int Keysetbit; /* Bit to check duplicated key */ } REMOTEHOST; typedef struct _REMOTEHOST_DATA { @@ -63,6 +74,7 @@ STATIC REMOTEHOST_DATA *RCpeerlistfile; STATIC REMOTEHOST *RCpeerlist; STATIC int RCnpeerlist; +STATIC char RCbuff[BIG_BUFFER]; #define PEER "peer" #define GROUP "group" @@ -92,6 +104,7 @@ #define MUST_BE_BOOL "%s Must be 'true' or 'false' in %s line %d" #define MUST_BE_INT "%s Must be an integer value in %s line %d" #define HOST_NEEDED "%s 'hostname' needed in %s line %d" +#define DUPLICATE_KEY "%s duplicate key in %s line %d" /* ** Stuff needed for limiting incoming connects. @@ -472,13 +485,15 @@ /* If not a server, and not allowing anyone, hand him off unless not spawning nnrpd in which case we return an error. */ if ((i >= 0) && !rp->Skip) { - new = NCcreate(fd, rp->Password[0] != '\0', FALSE); + if ((new = NCcreate(fd, rp->Password[0] != '\0', FALSE)) == NULL) + return; new->Streaming = rp->Streaming; new->Skip = rp->Skip; new->NoResendId = rp->NoResendId; new->MaxCnx = rp->MaxCnx; } else if (AnyIncoming && !rp->Skip) { - new = NCcreate(fd, FALSE, FALSE); + if ((new = NCcreate(fd, FALSE, FALSE)) == NULL) + return; } else if (!innconf->noreader) { RChandoff(fd, HOnntpd); if (close(fd) < 0) @@ -532,32 +547,31 @@ register char *s; register char *t; char *word; - static char buff[SMBUF]; register BOOL flag; - if (*buff == '\0') { + if (*RCbuff == '\0') { if (feof (F)) return (NULL); - fgets(buff, sizeof buff, F); + fgets(RCbuff, sizeof RCbuff, F); (*num)++; - if (strlen (buff) == sizeof buff) + if (strlen (RCbuff) == sizeof RCbuff) return (NULL); /* Line too long */ } - p = buff; + p = RCbuff; do { /* Ignore blank and comment lines. */ - if ((p = strchr(buff, '\n')) != NULL) + if ((p = strchr(RCbuff, '\n')) != NULL) *p = '\0'; - if ((p = strchr(buff, COMMENT_CHAR)) != NULL) { - if (p == buff || (p > buff && *(p - 1) != '\\')) + if ((p = strchr(RCbuff, COMMENT_CHAR)) != NULL) { + if (p == RCbuff || (p > RCbuff && *(p - 1) != '\\')) *p = '\0'; } - for (p = buff; *p == ' ' || *p == '\t' ; p++); + for (p = RCbuff; *p == ' ' || *p == '\t' ; p++); flag = TRUE; if (*p == '\0' && !feof (F)) { flag = FALSE; - fgets(buff, sizeof buff, F); + fgets(RCbuff, sizeof RCbuff, F); (*num)++; - if (strlen (buff) == sizeof buff) + if (strlen (RCbuff) == sizeof RCbuff) return (NULL); /* Line too long */ continue; } @@ -571,9 +585,9 @@ *t != '\0'; t++); if (*t == '\0') { *t++ = '\n'; - fgets(t, sizeof buff - strlen (buff), F); + fgets(t, sizeof RCbuff - strlen (RCbuff), F); (*num)++; - if (strlen (buff) == sizeof buff) + if (strlen (RCbuff) == sizeof RCbuff) return (NULL); /* Line too long */ if ((s = strchr(t, '\n')) != NULL) *s = '\0'; @@ -590,7 +604,7 @@ } if (*p == '\0' && feof (F)) return (NULL); word = COPY (p); - for (p = buff; *t != '\0'; t++) + for (p = RCbuff; *t != '\0'; t++) *p++ = *t; *p = '\0'; @@ -642,9 +656,10 @@ register REMOTEHOST *group_params = NULL; register REMOTEHOST peer_params; register REMOTEHOST default_params; - BOOL flag; - + BOOL flag, bit; + + *RCbuff = '\0'; if (*list) { for (rp = *list, i = *count; --i >= 0; rp++) { DISPOSE(rp->Name); @@ -707,6 +722,7 @@ default_params.Email = COPY(NOEMAIL); default_params.Comment = COPY(NOCOMMENT); default_params.Pattern = NULL; + peer_params.Keysetbit = 0; /* Read the file to add all the hosts. */ while ((word = RCreaddata (&linecount, F)) != NULL) { @@ -744,6 +760,9 @@ groups[groupcount - 2].Pattern : default_params.Pattern; group_params->Password = groupcount > 1 ? groups[groupcount - 2].Password : default_params.Password; + group_params->MaxCnx = groupcount > 1 ? + groups[groupcount - 2].MaxCnx : default_params.MaxCnx; + if ((word = RCreaddata (&linecount, F)) == NULL) { syslog(L_ERROR, LEFT_BRACE, LogName, filename, linecount); break; @@ -756,6 +775,7 @@ } else DISPOSE(word); + peer_params.Keysetbit = 0; continue; } @@ -791,6 +811,10 @@ group_params->Pattern : default_params.Pattern; peer_params.Password = groupcount > 0 ? group_params->Password : default_params.Password; + peer_params.MaxCnx = groupcount > 0 ? + group_params->MaxCnx : default_params.MaxCnx; + + peer_params.Keysetbit = 0; if ((word = RCreaddata (&linecount, F)) == NULL) { @@ -967,6 +991,11 @@ /* streaming */ if (!strncmp (word, STREAMING, sizeof STREAMING)) { DISPOSE(word); + TEST_CONFIG(K_STREAM, bit); + if (bit) { + syslog(L_ERROR, DUPLICATE_KEY, LogName, filename, linecount); + break; + } if ((word = RCreaddata (&linecount, F)) == NULL) { break; } @@ -987,12 +1016,18 @@ group_params->Streaming = flag; else default_params.Streaming = flag; + SET_CONFIG(K_STREAM); continue; } /* skip */ if (!strncmp (word, SKIP, sizeof SKIP)) { DISPOSE(word); + TEST_CONFIG(K_SKIP, bit); + if (bit) { + syslog(L_ERROR, DUPLICATE_KEY, LogName, filename, linecount); + break; + } if ((word = RCreaddata (&linecount, F)) == NULL) { break; } @@ -1013,11 +1048,18 @@ group_params->Skip = flag; else default_params.Skip = flag; + SET_CONFIG(K_SKIP); continue; } + /* noresendid */ if (!strncmp (word, NORESENDID, sizeof NORESENDID)) { DISPOSE(word); + TEST_CONFIG(K_NORESENDID, bit); + if (bit) { + syslog(L_ERROR, DUPLICATE_KEY, LogName, filename, linecount); + break; + } if ((word = RCreaddata (&linecount, F)) == NULL) { break; } @@ -1038,43 +1080,69 @@ group_params->NoResendId = flag; else default_params.NoResendId = flag; + SET_CONFIG(K_NORESENDID); continue; } /* max-connections */ if (!strncmp (word, MAX_CONN, sizeof MAX_CONN)) { + int max; DISPOSE(word); + TEST_CONFIG(K_MAX_CONN, bit); + if (bit) { + syslog(L_ERROR, DUPLICATE_KEY, LogName, filename, linecount); + break; + } if ((word = RCreaddata (&linecount, F)) == NULL) { break; } RCadddata(data, &infocount, K_MAX_CONN, T_STRING, word); for (p = word; isdigit(*p) && *p != '\0'; p++); if (!strcmp (word, "none") || !strcmp (word, "unlimited")) { - peer_params.MaxCnx = 0; - continue; - } - if (*p != '\0') { - syslog(L_ERROR, MUST_BE_INT, LogName, filename, linecount); - break; + max = 0; + } else { + if (*p != '\0') { + syslog(L_ERROR, MUST_BE_INT, LogName, filename, linecount); + break; + } + max = atoi(word); } - peer_params.MaxCnx = atoi(word); + if (peer_params.Label != NULL) + peer_params.MaxCnx = max; + else + if (groupcount > 0 && group_params->Label != NULL) + group_params->MaxCnx = max; + else + default_params.MaxCnx = max; + SET_CONFIG(K_MAX_CONN); continue; } /* hostname */ if (!strncmp (word, HOSTNAME, sizeof HOSTNAME)) { + TEST_CONFIG(K_HOSTNAME, bit); + if (bit) { + syslog(L_ERROR, DUPLICATE_KEY, LogName, filename, linecount); + break; + } DISPOSE(word); if ((word = RCreaddata (&linecount, F)) == NULL) { break; } RCadddata(data, &infocount, K_HOSTNAME, T_STRING, word); peer_params.Name = word; + SET_CONFIG(K_HOSTNAME); continue; } /* password */ if (!strncmp (word, PASSWORD, sizeof PASSWORD)) { DISPOSE(word); + TEST_CONFIG(K_PASSWORD, bit); + if (bit) { + syslog(L_ERROR, DUPLICATE_KEY, LogName, filename, linecount); + break; + } if ((word = RCreaddata (&linecount, F)) == NULL) { break; } @@ -1086,11 +1154,17 @@ group_params->Password = word; else default_params.Password = word; + SET_CONFIG(K_PASSWORD); continue; } /* patterns */ if (!strncmp (word, PATTERNS, sizeof PATTERNS)) { + TEST_CONFIG(K_PATTERNS, bit); + if (bit) { + syslog(L_ERROR, DUPLICATE_KEY, LogName, filename, linecount); + break; + } DISPOSE(word); if ((word = RCreaddata (&linecount, F)) == NULL) { break; @@ -1103,12 +1177,18 @@ group_params->Pattern = word; else default_params.Pattern = word; + SET_CONFIG(K_PATTERNS); continue; } /* email */ if (!strncmp (word, EMAIL, sizeof EMAIL)) { DISPOSE(word); + TEST_CONFIG(K_EMAIL, bit); + if (bit) { + syslog(L_ERROR, DUPLICATE_KEY, LogName, filename, linecount); + break; + } if ((word = RCreaddata (&linecount, F)) == NULL) { break; } @@ -1120,12 +1200,18 @@ group_params->Email = word; else default_params.Email = word; + SET_CONFIG(K_EMAIL); continue; } /* comment */ if (!strncmp (word, COMMENT, sizeof COMMENT)) { DISPOSE(word); + TEST_CONFIG(K_COMMENT, bit); + if (bit) { + syslog(L_ERROR, DUPLICATE_KEY, LogName, filename, linecount); + break; + } if ((word = RCreaddata (&linecount, F)) == NULL) { break; } @@ -1137,6 +1223,7 @@ group_params->Comment = word; else default_params.Comment = word; + SET_CONFIG(K_COMMENT); continue; } @@ -1221,7 +1308,7 @@ if (*p == '/') q = p + 1; - fprintf (F, "## $Revision: 1.31.2.4 $\n"); + fprintf (F, "## $Revision: 1.31.2.8 $\n"); fprintf (F, "## %s - names and addresses that feed us news\n", q); DISPOSE(r); fprintf (F, "##\n\n"); diff -ruN inn-2.2.2/innfeed/config_l.c inn-2.2.3/innfeed/config_l.c --- inn-2.2.2/innfeed/config_l.c Mon Dec 13 05:18:37 1999 +++ inn-2.2.3/innfeed/config_l.c Tue Jul 18 16:54:07 2000 @@ -1,7 +1,7 @@ /* A lexical scanner generated by flex */ /* Scanner skeleton version: - * $Header: /proj/cvs/isc/inn/inn/innfeed/config_l.c,v 1.6 1998/06/25 06:00:22 kondou Exp $ + * $Header: /dist1/cvs/isc/inn/inn/innfeed/config_l.c,v 1.6 1998/06/25 06:00:22 kondou Exp $ */ #define FLEX_SCANNER diff -ruN inn-2.2.2/innfeed/misc.c inn-2.2.3/innfeed/misc.c --- inn-2.2.2/innfeed/misc.c Mon Dec 13 05:18:37 1999 +++ inn-2.2.3/innfeed/misc.c Tue Jul 18 16:54:07 2000 @@ -4,7 +4,7 @@ * Start Date: Wed Dec 27 17:10:18 1995 * Project: INN (innfeed) * File: misc.c - * RCSId: $Id: misc.c,v 1.7 1998/06/11 23:00:19 kondou Exp $ + * RCSId: $Id: misc.c,v 1.7.2.1 2000/06/29 22:25:45 rra Exp $ * * Copyright: Copyright (c) 1996 by Internet Software Consortium * @@ -29,7 +29,7 @@ */ #if ! defined (lint) -static const char *rcsid = "$Id: misc.c,v 1.7 1998/06/11 23:00:19 kondou Exp $" ; +static const char *rcsid = "$Id: misc.c,v 1.7.2.1 2000/06/29 22:25:45 rra Exp $" ; static void use_rcsid (const char *rid) { /* Never called */ use_rcsid (rcsid) ; use_rcsid (rid) ; } @@ -139,7 +139,7 @@ p = malloc (out + 10) ; vsprintf (p,fmt,args) ; - syslog (level,p) ; + syslog (level,"%s",p) ; } void logOrPrint (int level, FILE *fp, const char *fmt, ...) diff -ruN inn-2.2.2/lib/clientactive.c inn-2.2.3/lib/clientactive.c --- inn-2.2.2/lib/clientactive.c Mon Dec 13 05:18:37 1999 +++ inn-2.2.3/lib/clientactive.c Tue Jul 18 16:54:07 2000 @@ -1,4 +1,4 @@ -/* $Revision: 1.6 $ +/* $Revision: 1.6.4.1 $ ** */ #include @@ -24,7 +24,7 @@ { /* Use a local (or NFS-mounted) copy if available. Make sure we don't * try to delete it when we close it. */ - if ((CAfp = fopen(cpcatpath(innconf->pathetc, _PATH_CLIENTACTIVE), "r")) != NULL) { + if ((CAfp = fopen(cpcatpath(innconf->pathdb, _PATH_CLIENTACTIVE), "r")) != NULL) { CApathname[0] = '\0'; return CAfp; } diff -ruN inn-2.2.2/lib/clientlib.c inn-2.2.3/lib/clientlib.c --- inn-2.2.2/lib/clientlib.c Mon Dec 13 05:18:37 1999 +++ inn-2.2.3/lib/clientlib.c Tue Jul 18 16:54:07 2000 @@ -1,4 +1,4 @@ -/* $Revision: 1.4 $ +/* $Id: clientlib.c,v 1.4.4.1 2000/06/21 23:31:30 rra Exp $ ** ** Routines compatible with the NNTP "clientlib" routines. */ @@ -26,7 +26,8 @@ { static char buff[256]; - (void)strcpy(buff, innconf->server); + strncpy(buff, innconf->server, sizeof(buff)); + buff[255] = '\0'; return buff; } diff -ruN inn-2.2.2/lib/dbz.c inn-2.2.3/lib/dbz.c --- inn-2.2.2/lib/dbz.c Mon Dec 13 05:18:37 1999 +++ inn-2.2.3/lib/dbz.c Tue Jul 18 16:54:07 2000 @@ -71,6 +71,7 @@ #include #include #include +#include #include #include #include diff -ruN inn-2.2.2/lib/getconfig.c inn-2.2.3/lib/getconfig.c --- inn-2.2.2/lib/getconfig.c Mon Dec 13 05:18:37 1999 +++ inn-2.2.3/lib/getconfig.c Tue Jul 18 16:54:07 2000 @@ -1,4 +1,4 @@ -/* $Revision: 1.48.2.6 $ +/* $Revision: 1.48.2.7 $ ** */ #include @@ -340,8 +340,6 @@ (void)fprintf(stderr, "Must set 'mta' in inn.conf"); return(-1); } - if (innconf->mailcmd == NULL) - innconf->mailcmd = innconf->mta; if (innconf->overviewname == NULL) innconf->overviewname = COPY(".overview"); @@ -397,6 +395,9 @@ } if (innconf->pathtmp == NULL) { innconf->pathtmp = COPY(_PATH_TMP); + } + if (innconf->mailcmd == NULL) { + innconf->mailcmd = COPY(cpcatpath(innconf->pathbin, "innmail")); } if (innconf->pathuniover == NULL) { innconf->pathuniover = COPY(cpcatpath(innconf->pathspool, "uniover")); diff -ruN inn-2.2.2/lib/parsedate.y inn-2.2.3/lib/parsedate.y --- inn-2.2.2/lib/parsedate.y Mon Dec 13 05:18:37 1999 +++ inn-2.2.3/lib/parsedate.y Tue Jul 18 16:54:07 2000 @@ -1,5 +1,5 @@ %{ -/* $Revision: 1.4.2.1 $ +/* $Revision: 1.4.2.3 $ ** ** Originally written by Steven M. Bellovin while ** at the University of North Carolina at Chapel Hill. Later tweaked by @@ -256,7 +256,7 @@ yyYear = $5; } else { /* assume year is YY format, so need to add 1900 */ - yyYear = $5 + 1900; + yyYear = $5 + (yyYear / 100 + (yyYear % 100 - $5) / 50) * 100; } } } @@ -272,7 +272,7 @@ yyYear = $4; } else { /* assume year is YY format, so need to add 1900 */ - yyYear = $4 + 1900; + yyYear = $4 + (yyYear / 100 + (yyYear % 100 - $4) / 50) * 100; } } | tUNUMBER tMONTH { @@ -287,7 +287,7 @@ yyYear = $3; } else { /* assume year is YY format, so need to add 1900 */ - yyYear = $3 + 1900; + yyYear = $3 + (yyYear / 100 + (yyYear % 100 - $3) / 50) * 100; } } | tDAY ',' tUNUMBER tMONTH tUNUMBER { @@ -298,7 +298,7 @@ yyYear = $5; } else { /* assume year is YY format, so need to add 1900 */ - yyYear = $5 + 1900; + yyYear = $5 + (yyYear / 100 + (yyYear % 100 - $5) / 50) * 100; } } ; @@ -544,10 +544,11 @@ so this should not happen, but just ensure it */ if (Year < 0) Year = -Year; - if (Year < 100) + if (Year < 100) { Year += 1900; - if (Year < EPOCH) - Year += 100; + if (Year < EPOCH) + Year += 100; + } for (mp = DaysNormal, yp = LeapYears; yp < ENDOF(LeapYears); yp++) if (Year == *yp) { mp = DaysLeap; diff -ruN inn-2.2.2/nnrpd/misc.c inn-2.2.3/nnrpd/misc.c --- inn-2.2.2/nnrpd/misc.c Mon Dec 13 05:18:37 1999 +++ inn-2.2.3/nnrpd/misc.c Tue Jul 18 16:54:07 2000 @@ -1,4 +1,4 @@ -/* $Revision: 1.28.2.6 $ +/* $Revision: 1.28.2.7 $ ** ** Miscellaneous support routines. */ @@ -477,7 +477,7 @@ } buff[entrysize] = '\0'; if (strchr(buff, '\n') == NULL) { - syslog(L_ERROR, "%s cant find end of line %ld %m", ClientHost, offset); + syslog(L_ERROR, "%s cant find end of line %ld", ClientHost, offset); return NULL; } if (innconf->nnrpdoverstats) { diff -ruN inn-2.2.2/nnrpd/nnrpd.c inn-2.2.3/nnrpd/nnrpd.c --- inn-2.2.2/nnrpd/nnrpd.c Mon Dec 13 05:18:37 1999 +++ inn-2.2.3/nnrpd/nnrpd.c Tue Jul 18 16:54:07 2000 @@ -1,4 +1,4 @@ -/* $Revision: 1.49.2.8 $ +/* $Revision: 1.49.2.9 $ ** ** NNTP server for readers (NNRP) for InterNetNews. ** This server doesn't do any real load-limiting, except for what has @@ -951,7 +951,6 @@ /* Set signal handle to care for dead children */ (void)signal(SIGCHLD, WaitChild); - SetupDaemon(); TITLEset("nnrpd: accepting connections"); @@ -984,6 +983,7 @@ close(fd); dup2(0, 1); dup2(0, 2); + SetupDaemon(); /* if we are a daemon innd didn't make us nice, so be nice kids */ if (innconf->nicekids) { diff -ruN inn-2.2.2/nnrpd/perl.c inn-2.2.3/nnrpd/perl.c --- inn-2.2.2/nnrpd/perl.c Mon Dec 13 05:18:37 1999 +++ inn-2.2.3/nnrpd/perl.c Tue Jul 18 16:54:07 2000 @@ -3,13 +3,13 @@ * Author: Christophe Wolfhugel * (although he wouldn't recognise it anymore so don't blame him) * File: perl.c - * RCSId: $Id: perl.c,v 1.8.2.3 1999/09/25 22:42:28 rra Exp $ + * RCSId: $Id: perl.c,v 1.8.2.4 2000/06/21 02:43:19 rra Exp $ * Description: Perl hooks for nnrpd. * */ #if ! defined (lint) -static const char *rcsid = "$Id: perl.c,v 1.8.2.3 1999/09/25 22:42:28 rra Exp $" ; +static const char *rcsid = "$Id: perl.c,v 1.8.2.4 2000/06/21 02:43:19 rra Exp $" ; static void use_rcsid (const char *rid) { /* Never called */ use_rcsid (rcsid) ; use_rcsid (rid) ; } @@ -103,7 +103,8 @@ continue; } s++; - hv_store(hdr, p, (s - p) - 1, newSVpv(s, 0), 0); + t = (*s == ' ' ? s + 1 : s); + hv_store(hdr, p, (s - p) - 1, newSVpv(t, 0), 0); } /* Store user */ sv_setpv(perl_get_sv("user",TRUE), PERMuser); diff -ruN inn-2.2.2/samples/checkgroups.in inn-2.2.3/samples/checkgroups.in --- inn-2.2.2/samples/checkgroups.in Mon Dec 13 05:18:37 1999 +++ inn-2.2.3/samples/checkgroups.in Tue Jul 18 16:54:07 2000 @@ -1,5 +1,5 @@ #!@_PATH_SH@ -## $Revision: 1.14 $ +## $Revision: 1.14.2.2 $ ## Checkgroups control-message handler. . @LIBDIR@/innshellvars @@ -19,14 +19,14 @@ echo 'message into docheckgroups while running as the' echo "\"${NEWSUSER}\" userid:" echo '' - echo "@LIBDIR@/docheckgroups '${NEWSGROUPPATS}' <<\-EOF-" + echo "@LIBDIR@/docheckgroups "${NEWSGROUPPATS}" <<-EOF-" ${SM} ${ARTICLE} | ${SED} -e '1,/^$/d' echo '-EOF-' ) | sed -e 's/^~/~~/' | ${MAILCMD} -s "checkgroups by ${FROM}" ${NEWSMASTER} ;; doit) ${SM} ${ARTICLE} | ${SED} -e '1,/^$/d' \ - | @LIBDIR@/docheckgroups '${NEWSGROUPPATS}' \ + | @LIBDIR@/docheckgroups ${NEWSGROUPPATS} \ | ${WRITELOG} ${LOGFILE} "checkgroups by ${FROM}" ;; esac diff -ruN inn-2.2.2/samples/cnfsstat.in inn-2.2.3/samples/cnfsstat.in --- inn-2.2.2/samples/cnfsstat.in Mon Dec 13 05:18:37 1999 +++ inn-2.2.3/samples/cnfsstat.in Tue Jul 18 16:54:07 2000 @@ -1,5 +1,5 @@ #!@_PATH_PERL@ -# $Id: cnfsstat.in,v 1.3.2.8 1999/10/18 06:54:42 kondou Exp $ +# $Id: cnfsstat.in,v 1.3.2.9 2000/02/10 17:37:35 kondou Exp $ # # Copyright Andreas Lamrecht 1998 # @@ -98,6 +98,13 @@ ## Comment out this eval line if you don't want to try to syslog eval { require Sys::Syslog; import Sys::Syslog; $use_syslog = 1 }; if ($use_syslog) { + if (defined &Sys::Syslog::setlogsock && $] >= 5.00403) { + # we really need a common module to work all this junk out + if ($^O eq "dec_osf") { + sub Sys::Syslog::_PATH_LOG { "/dev/log" } + } + Sys::Syslog::setlogsock('unix') if $^O =~ /linux|dec_osf/; + } openlog ('cnfsstat', 'pid', 'news'); } else { print STDERR "Syslog is not available. -s option is ignored.\n"; diff -ruN inn-2.2.2/samples/control.ctl inn-2.2.3/samples/control.ctl --- inn-2.2.2/samples/control.ctl Mon Dec 13 05:18:37 1999 +++ inn-2.2.3/samples/control.ctl Tue Jul 18 16:54:07 2000 @@ -96,12 +96,17 @@ ## The Big 8. ## COMP, HUMANITIES, MISC, NEWS, REC, SCI, SOC, TALK -# If it *doesn't* come from group-admin@isc.org, forget it +# If it *doesn't* come from group-admin@isc.org, forget it. #newgroup:*:comp.*|humanities.*|misc.*|news.*|rec.*|sci.*|soc.*|talk.*:log #rmgroup:*:comp.*|humanities.*|misc.*|news.*|rec.*|sci.*|soc.*|talk.*:log +# This will weed out forgeries for non-Big 8 hierarchies. +newgroup:group-admin@isc.org:*:drop +newgroup:tale@*uu.net:*:drop +rmgroup:group-admin@isc.org:*:drop +rmgroup:tale@*uu.net:*:drop + # *PGP* See comment at top of file. -checkgroups:*:comp.*|humanities.*|misc.*|news.*|rec.*|sci.*|soc.*|talk.*:drop newgroup:*:comp.*|humanities.*|misc.*|news.*|rec.*|sci.*|soc.*|talk.*:drop rmgroup:*:comp.*|humanities.*|misc.*|news.*|rec.*|sci.*|soc.*|talk.*:drop checkgroups:group-admin@isc.org:*:verify-news.announce.newgroups @@ -147,7 +152,6 @@ ## ALABAMA & HSV (Huntsville, Alabama, USA) # Contact: news@news.msfc.nasa.gov # *PGP* See comment at top of file. -checkgroups:*:alabama.*|hsv.*:drop newgroup:*:alabama.*|hsv.*:drop rmgroup:*:alabama.*|hsv.*:drop checkgroups:news@news.msfc.nasa.gov:alabama.*|hsv.*:verify-alabama-group-admin @@ -174,6 +178,9 @@ ## Hazelrig's WWW pages at http://www.tezcat.com/~haz1/alt/faqindex.html ## newgroup:*:alt.*:doit +# Forgeries +newgroup:group-admin@isc.org:alt.*:drop +newgroup:tale@*uu.net:alt.*:drop rmgroup:*:alt.*:drop #rmgroup:haz1@*nwu.edu:alt.*:doit #rmgroup:grobe@*netins.net:alt.*:doit @@ -210,7 +217,6 @@ # Contact: ausadmin@aus.news-admin.org # URL: http://aus.news-admin.org/ # *PGP* See comment at top of file. -checkgroups:*:aus.*:drop newgroup:*:aus.*:drop rmgroup:*:aus.*:drop checkgroups:ausadmin@aus.news-admin.org:aus.*:verify-ausadmin@aus.news-admin.org @@ -236,7 +242,6 @@ # Contact: # URL: http://ennui.org/ba/ # *PGP* See comment at top of file. -checkgroups:*:ba.*:drop newgroup:*:ba.*:drop rmgroup:*:ba.*:drop checkgroups:ba-mod@nas.nasa.gov:ba.*:verify-ba.news.config @@ -255,7 +260,6 @@ # Key fingerprint = F7 AD 96 D8 7A 3F 7E 84 02 0C 83 9A DB 8F EB B8 # Syncable server: news.mayn.de (contact news@mayn.de if permission denied) # *PGP* See comment at top of file. -checkgroups:*:baynet.*:drop newgroup:*:baynet.*:drop rmgroup:*:baynet.*:drop checkgroups:news@mayn.de:baynet.*:verify-news.mayn.de @@ -274,7 +278,6 @@ # Contact: usenet@innet.be # URL: ftp://ftp.innet.be/pub/staff/stef/ # *PGP* See comment at top of file. -checkgroups:*:be.*:drop newgroup:*:be.*:drop rmgroup:*:be.*:drop checkgroups:news@*innet.be:be.*:verify-be.announce.newgroups @@ -306,7 +309,6 @@ ## BIT (Gatewayed Mailing lists) # *PGP* See comment at top of file. -checkgroups:*:bit.*:drop newgroup:*:bit.*:drop rmgroup:*:bit.*:drop checkgroups:jim@american.edu:bit.*:verify-bit.admin @@ -384,7 +386,6 @@ # Key URL: http://www.use-net.ch/Usenet/adminkey.html # *PGP* See comment at top of file. # Key fingerprint = 71 80 D6 8C A7 DE 2C 70 62 4A 48 6E D9 96 02 DF -checkgroups:*:ch.*:drop newgroup:*:ch.*:drop rmgroup:*:ch.*:drop checkgroups:felix.rauch@nice.ch:ch.*:verify-ch-news-admin@use-net.ch @@ -422,7 +423,6 @@ # Contact: Dave Williams # URL: ftp://ftp.demon.co.uk/pub/news/doc/demon.news.txt # *PGP* See comment at top of file. -checkgroups:*:cityscp.*:drop newgroup:*:cityscp.*:drop rmgroup:*:cityscp.*:drop checkgroups:newsmaster@demon.net:cityscp.*:verify-demon.news @@ -435,7 +435,6 @@ # URL: http://www.zerberus.de/org/cl/index.html # Syncable server: net2.dinoex.sub.de # Key fingerprint: 21 ED D6 CB 05 56 6E E8 F6 F1 11 E9 2F 6C D5 BB -checkgroups:*:cl.*:drop newgroup:*:cl.*:drop rmgroup:*:cl.*:drop checkgroups:cl-koordination@dinoex.sub.org:cl.*:verify-cl.koordination.einstellungen @@ -449,7 +448,6 @@ ## CLARINET ( Features and News, Available on a commercial basis) # *PGP* See comment at top of file. -checkgroups:*:clari.*:drop newgroup:*:clari.*:drop rmgroup:*:clari.*:drop checkgroups:cl*@clarinet.com:clari.*:verify-ClariNet.Group @@ -508,7 +506,6 @@ ## DE (German language) # *PGP* See comment at top of file. -checkgroups:*:de.*:drop rmgroup:*:de.*:drop checkgroups:moderator@dana.de:de.*:verify-de.admin.news.announce newgroup:moderator@dana.de:de.*:verify-de.admin.news.announce @@ -530,7 +527,6 @@ # Key URL: http://www.DK.net/Usenet/pgp.html # Key fingerprint = 7C B2 C7 50 F3 7D 5D 73 8C EE 2E 3F 55 80 72 FF # *PGP* See comment at top of file. -checkgroups:*:dk.*:drop newgroup:*:dk.*:drop rmgroup:*:dk.*:drop newgroup:news@news.dknet.dk:dk.*:verify-news@news.dknet.dk @@ -549,7 +545,6 @@ # Contact: Christiaan Keet # URL: ftp://ftp.easynet.net/pub/usenet/easynet.control.txt # *PGP* See comment at top of file. -checkgroups:*:easynet.*:drop newgroup:*:easynet.*:drop rmgroup:*:easynet.*:drop checkgroups:newsmaster@easynet.net:easynet.*:verify-easynet.news @@ -558,7 +553,6 @@ ## EFN & EUG (Eugene Free Computer Network, Eugene/Springfield, Oregon, USA) # *PGP* See comment at top of file. -checkgroups:*:eug.*:drop newgroup:*:eug.*:drop rmgroup:*:eug.*:drop checkgroups:newsadmin@efn.org:efn.*|eug.*:verify-eug.config @@ -580,7 +574,6 @@ # See: http://news.rediris.es/~moderador/grupos/newsgroups.es # *PGP* See comment at top of file. # Key fingerprint = 3B 63 18 6F 83 EA 89 82 95 1B 7F 8D B6 ED DD 87 -checkgroups:*:es.*:drop newgroup:*:es.*:drop rmgroup:*:es.*:drop checkgroups:moderador@news.rediris.es:es.*:doit @@ -595,7 +588,6 @@ # Contact: # URL: http://ennui.org/esp/ # *PGP* See comment at top of file. -checkgroups:*:esp.*:drop newgroup:*:esp.*:drop rmgroup:*:esp.*:drop checkgroups:mod-ena@ennui.org:esp.*:verify-esp.news.administracion @@ -607,7 +599,6 @@ rmgroup:news@noc.eu.net:eunet.*:doit ## EXAMPLE ( Bogus hierarchy reserved for standards documents ) -checkgroups:*@*:example.*:mail newgroup:*@*:example.*:mail rmgroup:*@*:example.*:doit @@ -623,7 +614,6 @@ ## FIDO.BELG.* newsgroups (FidoNet) # URL: http://www.z2.fidonet.org/news/fido.belg.news/ # *PGP* See comment at top of file. -checkgroups:*:fido.belg.*:drop newgroup:*:fido.belg.*:drop rmgroup:*:fido.belg.*:drop checkgroups:fidobelg@mail.z2.fidonet.org:fido.belg.*:verify-fido.belg.news @@ -632,7 +622,6 @@ ## FIDO7 # *PGP* See comment at top of file. -checkgroups:*:fido7.*:drop newgroup:*:fido7.*:drop rmgroup:*:fido7.*:drop checkgroups:newgroups-request@fido7.ru:fido7.*:verify-fido7.announce.newgroups @@ -650,7 +639,6 @@ # Contact: committee@fj-news.org # URL: http://www.is.tsukuba.ac.jp/~yas/fj/ # Key URL: http://www.is.tsukuba.ac.jp/~yas/fj/fj.asc -checkgroups:*:fj.*:drop newgroup:*:fj.*:drop rmgroup:*:fj.*:drop checkgroups:committee@fj-news.org:fj.*:verify-fj.news.announce @@ -668,7 +656,6 @@ # See: http://news.flora.org/ for newsgroup listings and information # See: http://www.flora.org/russell/ for PGP keys # *PGP* See comment at top of file. -checkgroups:*:flora.*:drop newgroup:*:flora.*:drop rmgroup:*:flora.*:drop checkgroups:news@flora.ottawa.on.ca:flora.*:verify-flora-news @@ -677,7 +664,6 @@ ## FR (French Language) # *PGP* See comment at top of file. -checkgroups:*:fr.*:drop newgroup:*:fr.*:drop rmgroup:*:fr.*:drop checkgroups:control@usenet-fr.news.eu.org:fr.*:verify-control@usenet-fr.news.eu.org @@ -687,8 +673,11 @@ # newgroup:control@usenet.fr.net:fr.*:doit # rmgroup:control@usenet.fr.net:fr.*:doit -## FREE (Open Hierarchy where anyone can craete a group) +## FREE (Open Hierarchy where anyone can create a group) newgroup:*:free.*:doit +# Forgeries. +newgroup:group-admin@isc.org:free.*:drop +newgroup:tale@*uu.net:free.*:drop rmgroup:*:free.*:drop ## FUDAI (Japanese ?) @@ -718,7 +707,6 @@ # *PGP* See comment at top of file. # URL: http://www.govnews.org/govnews/ # PGPKEY URL: http://www.govnews.org/govnews/site-setup/gov.pgpkeys -checkgroups:*:gov.*:drop newgroup:*:gov.*:drop rmgroup:*:gov.*:drop checkgroups:gov-usenet-announce-moderator@govnews.org:gov.*:verify-gov.usenet.announce @@ -738,7 +726,6 @@ # Contact: newgroups-request@usenet.or.kr # PGPKEY URL: ftp://ftp.usenet.or.kr/pub/korea/usenet/pgp/PGPKEY.han # *PGP* See comment at top of file. -checkgroups:*:han.*:drop newgroup:*:han.*:drop rmgroup:*:han.*:drop checkgroups:newgroups-request@usenet.or.kr:han.*:verify-han.news.admin @@ -759,7 +746,6 @@ ## HOUSTON (Houston, Texas, USA) # *PGP* See comment at top of file. -checkgroups:*:houston.*:drop newgroup:*:houston.*:drop rmgroup:*:houston.*:drop checkgroups:news@academ.com:houston.*:verify-houston.usenet.config @@ -770,7 +756,6 @@ # rmgroup:news@academ.com:houston.*:doit ## HUN (Hungary) -checkgroups:*:hun.*:drop newgroup:*:hun.*:drop rmgroup:*:hun.*:drop checkgroups:hun-mnt@news.sztaki.hu:hun.*:verify-hun.admin.news @@ -810,7 +795,6 @@ ## IS (Iceland) # Contact: Marius Olafsson # *PGP* See comment at top of file. -checkgroups:*:is.*:drop newgroup:*:is.*:drop rmgroup:*:is.*:drop newgroup:news@isnet.is:is.*:verify-is.isnet @@ -826,7 +810,6 @@ ## IT (Italian) # *PGP* See comment at top of file. -checkgroups:*:it.*:drop newgroup:*:it.*:drop rmgroup:*:it.*:drop checkgroups:stefano@unipi.it:it.*:verify-it.announce.newgroups @@ -852,7 +835,6 @@ # PGP Key: http://grex.cyberspace.org/~tt/japan.admin.announce.asc # PGP Key: http://www.asahi-net.or.jp/~AE5T-KSN/japan/japan.admin.announce.asc # *PGP* See comment at top of file. -checkgroups:*:japan.*:drop newgroup:*:japan.*:drop rmgroup:*:japan.*:drop checkgroups:japan.admin.announce@news.efnet.com:japan.*:verify-japan.admin.announce@news.efnet.com @@ -876,7 +858,6 @@ # # *PGP* See comment at top of file. # Key fingerprint = DE 19 BB 25 76 19 81 17 F0 67 D2 23 E8 C8 7C 90 -checkgroups:*:ka.*:drop newgroup:*:ka.*:drop rmgroup:*:ka.*:drop checkgroups:usenet@karlsruhe.org:ka.*:verify-usenet@karlsruhe.org @@ -886,7 +867,6 @@ ## KANTO # *PGP* See comment at top of file. -checkgroups:*:kanto.*:drop rmgroup:*:kanto.*:drop checkgroups:ty@kamoi.imasy.or.jp:kanto.*:verify-kanto.news.network # NOTE: newgroups aren't verified... @@ -896,7 +876,6 @@ ## KASSEL (Kassel, Germany) # *PGP* See comment at top of file. # MAIL: pgp-public-keys@keys.de.pgp.net Subject: GET 0xC4D30EE5 -checkgroups:*:kassel.*:drop newgroup:*:kassel.*:drop rmgroup:*:kassel.*:drop checkgroups:dirk.meyer@dinoex.sub.org:kassel.*:verify-kassel-admin @@ -944,7 +923,6 @@ # Contact: cmeli@cis.um.edu.mt # URL: http://www.cis.um.edu.mt/news-malta/malta-news-new-site-faq.html # *PGP* See comment at top of file. -checkgroups:*:malta.*:drop newgroup:*:malta.*:drop rmgroup:*:malta.*:drop checkgroups:cmeli@cis.um.edu.mt:malta.*:verify-malta.config @@ -963,7 +941,6 @@ ## MAUS ( MausNet, German ) # *PGP* See comment at top of file. # Key fingerprint: 82 52 C7 70 26 B9 72 A1 37 98 55 98 3F 26 62 3E -checkgroups:*:maus.*:drop newgroup:*:maus.*:drop rmgroup:*:maus.*:drop checkgroups:guenter@gst0hb.north.de:maus.*:verify-maus-info @@ -1006,7 +983,6 @@ # Contact: usenet@newsgate.mensa.org # Key fingerprint: A7 57 24 49 C0 D4 47 33 84 A0 52 6E F1 A4 00 5B # *PGP* See comment at top of file. -checkgroups:*:mensa.*:drop newgroup:*:mensa.*:drop rmgroup:*:mensa.*:drop checkgroups:usenet@newsgate.mensa.org:mensa.*:verify-mensa.config @@ -1040,7 +1016,6 @@ ## MUC (Munchen (Munich), Germany) # *PGP* See comment at top of file. # Key fingerprint = 43 C7 0E 7C 45 C7 06 E0 BD 6F 76 CE 07 39 5E 66 -checkgroups:*:muc.*:drop newgroup:*:muc.*:drop rmgroup:*:muc.*:drop checkgroups:muc-cmsg@muenchen.pro-bahn.org:muc.*:verify-muc.admin @@ -1099,7 +1074,6 @@ # URL: http://www.usenet2.org # *PGP* See comment at top of file. # Key fingerprint: D7 D3 5C DB 18 6A 29 79 BF 74 D4 58 A3 78 9D 22 -checkgroups:*:net.*:drop newgroup:*:net.*:drop rmgroup:*:net.*:drop checkgroups:control@usenet2.org:net.*:verify-control@usenet2.org @@ -1112,7 +1086,6 @@ # URL: http://www.mozilla.org/community.html # URL: http://www.mozilla.org/newsfeeds.html # Key fingerprint = B7 80 55 12 1F 9C 17 0B 86 66 AD 3B DB 68 35 EC -checkgroups:*:netscape.*:drop newgroup:*:netscape.*:drop rmgroup:*:netscape.*:drop checkgroups:news@netscape.com:netscape.*:verify-netscape.public.admin @@ -1147,7 +1120,6 @@ # URL: http://www.kinkhorst.com/usenet/nladmin.en.html (English) # *PGP* See comment at top of file. # Key fingerprint: 45 20 0B D5 A1 21 EA 7C EF B2 95 6C 25 75 4D 27 -checkgroups:*:nl.*:drop newgroup:*:nl.*:drop rmgroup:*:nl.*:drop checkgroups:nl-admin@nic.surfnet.nl:nl.*:verify-nl.newsgroups @@ -1163,7 +1135,6 @@ # Several options are given in the FAQ for creating and removing groups. # *PGP* See comment at top of file. # Key fingerprint: 6B 62 EB 53 4D 5D 2F 96 35 D9 C8 9C B0 65 0E 4C -checkgroups:*:nl-alt.*:drop rmgroup:*:nl-alt.*:drop rmgroup:*:nl-alt.*:drop checkgroups:nl-alt-janitor@surfer.xs4all.nl:nl-alt.*:verify-nl-alt.config.admin @@ -1182,7 +1153,6 @@ ## NO (Norway) # See also http://www.usenet.no/ # *PGP* See comment at top of file. -checkgroups:*:no.*:drop newgroup:*:no.*:drop rmgroup:*:no.*:drop checkgroups:control@usenet.no:no.*:verify-no-hir-control @@ -1222,7 +1192,6 @@ # URL: http://usenet.net.nz # URL: http://www.faqs.org/faqs/usenet/nz-news-hierarchy # PGP fingerprint: 07 DF 48 AA D0 ED AA 88 16 70 C5 91 65 3D 1A 28 -checkgroups:*:nz.*:drop newgroup:*:nz.*:drop rmgroup:*:nz.*:drop checkgroups:root@usenet.net.nz:nz.*:verify-nz-hir-control @@ -1277,7 +1246,6 @@ ## PGH (Pittsburgh, Pennsylvania, USA) # *PGP* See comment at top of file. -checkgroups:*:pgh.*:drop newgroup:*:pgh.*:drop rmgroup:*:pgh.*:drop checkgroups:pgh-config@psc.edu:pgh.*:verify-pgh.config @@ -1310,7 +1278,6 @@ ## PL (Poland and Polish language) ## For more info, see http://www.ict.pwr.wroc.pl/doc/news-pl-new-site-faq.html # *PGP* See comment at top of file. -checkgroups:*:pl.*:drop newgroup:*:pl.*:drop rmgroup:*:pl.*:drop checkgroups:michalj@*fuw.edu.pl:pl.*:verify-pl.announce.newgroups @@ -1344,7 +1311,6 @@ rmgroup:*@*:psu.*:doit ## PT (Portugal and Portuguese language) -checkgroups:*:pt.*:drop newgroup:*:pt.*:drop rmgroup:*:pt.*:drop checkgroups:pmelo@*.inescc.pt:pt.*:verify-control@usenet-pt.org @@ -1361,7 +1327,6 @@ # The official list of relcom groups is supposed to be available from # URL: ftp://ftp.kiae.su/relcom/netinfo/telconfs.txt # *PGP* See comment at top of file. -checkgroups:*:relcom.*:drop newgroup:*:relcom.*:drop rmgroup:*:relcom.*:drop checkgroups:coord@new*.relcom.ru:relcom.*:verify-relcom.newsgroups @@ -1386,7 +1351,6 @@ # *PGP* See comment at top of file. # Contact: satgroup@endicor.com # URL: http://www.endicor.com/~satgroup/ -checkgroups:*:sat.*:drop newgroup:*:sat.*:drop rmgroup:*:sat.*:drop checkgroups:satgroup@endicor.com:sat.*:verify-satgroup@endicor.com @@ -1409,7 +1373,6 @@ # Key fingerprint = 64 06 F0 AE E1 46 85 0C BD CA 0E 53 8B 1E 73 D2 # Key URL: http://home.pages.de/~schule-admin/schule.asc # *PGP* See comment at top of file. -checkgroups:*:schule.*:drop newgroup:*:schule.*:drop rmgroup:*:schule.*:drop checkgroups:newsctrl@schule.de:schule.*:verify-schule.konfig @@ -1436,7 +1399,6 @@ # Key URL: http://www.usenet-se.net/pgp-key.txt # Key fingerprint = 68 03 F0 FD 0C C3 4E 69 6F 0D 0C 60 3C 58 63 96 # *PGP* See comment at top of file. -checkgroups:*:se.*:drop newgroup:*:se.*:drop rmgroup:*:se.*:drop checkgroups:usenet@usenet-se.net:se.*:verify-usenet-se @@ -1454,8 +1416,8 @@ rmgroup:graham@ee.washington.edu:seattle.*:doit ## SFNET newsgroups (Finland) -newgroup:hmj@*cs.tut.fi:sfnet.*:doit -rmgroup:hmj@*cs.tut.fi:sfnet.*:doit +newgroup:sfnet@*.cs.tut.fi:sfnet.*:doit +rmgroup:sfnet@*.cs.tut.fi:sfnet.*:doit ## SHAMASH (Jewish) newgroup:archives@israel.nysernet.org:shamash.*:doit @@ -1463,7 +1425,6 @@ ## SI (The Republic of Slovenia) # *PGP* See comment at top of file. -checkgroups:*:si.*:drop newgroup:*:si.*:drop rmgroup:*:si.*:drop checkgroups:news-admin@arnes.si:si.*:verify-si.news.announce.newsgroups @@ -1553,7 +1514,6 @@ ## THUR ( Thuringia, Germany ) # *PGP* See comment at top of file. # Key Fingerprint: 7E 3D 73 13 93 D4 CA 78 39 DE 3C E7 37 EE 22 F1 -checkgroups:*:thur.*:drop newgroup:*:thur.*:drop rmgroup:*:thur.*:drop checkgroups:usenet@thur.de:thur.*:verify-thur.net.news.groups @@ -1599,7 +1559,6 @@ ## UCB ( University of California Berkeley, USA) # Contact: Chris van den Berg -checkgroups:*:ucb.*:drop newgroup:*:ucb.*:drop rmgroup:*:ucb.*:drop checkgroups:usenet@agate.berkeley.edu:ucb.*:verify-ucb.news @@ -1618,7 +1577,6 @@ # Key fingerprint = F7 AD 96 D8 7A 3F 7E 84 02 0C 83 9A DB 8F EB B8 # Syncable server: news.mayn.de (contact news@mayn.de if permission denied) # *PGP* See comment at top of file. -checkgroups:*:ufra.*:drop newgroup:*:ufra.*:drop rmgroup:*:ufra.*:drop checkgroups:news@mayn.de:ufra.*:verify-news.mayn.de @@ -1637,7 +1595,6 @@ ## UK (United Kingdom of Great Britain and Northern Ireland) # *PGP* See comment at top of file. -checkgroups:*:uk.*:drop newgroup:*:uk.*:drop rmgroup:*:uk.*:drop checkgroups:control@usenet.org.uk:uk.*:verify-uk.net.news.announce @@ -1670,7 +1627,6 @@ ## UN (The United Nations) # URL: http://www.itu.int/Conferences/un/ # *PGP* See comment at top of file. -checkgroups:*:un.*:drop newgroup:*:un.*:drop rmgroup:*:un.*:drop checkgroups:news@news.itu.int:un.*:verify-ungroups@news.itu.int @@ -1755,7 +1711,6 @@ ## WALES (Wales) # Contact: control@A470.demon.co.uk # *PGP* See comment at top of file. -checkgroups:*:wales.*:drop newgroup:*:wales.*:drop rmgroup:*:wales.*:drop checkgroups:control@*470.demon.co.uk:wales.*:verify-wales.config @@ -1807,7 +1762,6 @@ ## Z-NETZ (German non internet based network.) # *PGP* See comment at top of file. # MAIL: pgp-public-keys@informatik.uni-hamburg.de Subject: GET 0x40145FC9 -checkgroups:*:z-netz.*:drop newgroup:*:z-netz.*:drop rmgroup:*:z-netz.*:drop checkgroups:dirk.meyer@dinoex.sub.org:z-netz.*:verify-checkgroups-dinoex diff -ruN inn-2.2.2/samples/controlchan.in inn-2.2.3/samples/controlchan.in --- inn-2.2.2/samples/controlchan.in Mon Dec 13 05:18:37 1999 +++ inn-2.2.3/samples/controlchan.in Tue Jul 18 16:54:07 2000 @@ -1,5 +1,5 @@ #!@_PATH_PERL@ -# $Id: controlchan.in,v 1.21.2.2 1999/05/07 23:29:40 kondou Exp $ +# $Id: controlchan.in,v 1.21.2.3 2000/01/25 03:58:42 kondou Exp $ # Copyright (c)1998 G.J. Andruk ########################################################################### # controlchan - read a feed, sniff out control messages, and send them @@ -274,6 +274,7 @@ chomp; # Not a comment or blank? Convert wildmat to regex if (/^(\s+)?[^\#]/ && ! (/^$/)) { + s/^all:/\*:/i; s/([\@\$\+\.])/\\$1/g; s/\*/.*/g; s/\?/./g; diff -ruN inn-2.2.2/samples/innreport.in inn-2.2.3/samples/innreport.in --- inn-2.2.2/samples/innreport.in Mon Dec 13 05:18:37 1999 +++ inn-2.2.3/samples/innreport.in Tue Jul 18 16:54:07 2000 @@ -466,8 +466,10 @@ my $ddm = (index ("JanFebMarAprMayJunJulAugSepOctNovDec", $m)) / 3; # Adjust the year because syslog doesn't record it. We assume that # it's the current year unless the last date if in the future. - $dy-- if (&ConvDate ("$last_date") > $ts + 60 * ($tm + 60 * ($th + 24 * - ($dd + substr("000031059090120151181212243273304334", $dm * 3, 3))))); + my $ld = &ConvDate($last_date); + $dy-- if $ld > $ts + 60 * ($tm + 60 * ($th + 24 * ($dd - 1 + + substr("000031059090120151181212243273304334", $dm * 3, 3)))) || + $ld < &ConvDate($first_date); ($dm, $dd, $th, $tm, $ts) = ($ddm, $d, $h, $mn, $s); } $dm++; # because January = 0 and we prefer 1 @@ -637,7 +639,7 @@ $SEPARATOR # Separator : ":" \d\d # Second : 29 $suffix # Suffix : ".html" - $/xo); + $/x); $files{$file}++; } closedir (DIR); @@ -762,7 +764,7 @@ my $result = sprintf < $Title: index - + $HTML_header

@@ -1767,7 +1769,7 @@ print HTML "\n\n$Title: $first_date\n"; print HTML "\n"; - print HTML "\n\n"; + print HTML "\n\n"; print HTML "$HTML_header\n"; print HTML "

$title

\n"; print HTML "

$first_date -- $last_date

\n"; diff -ruN inn-2.2.2/samples/mailpost.in inn-2.2.3/samples/mailpost.in --- inn-2.2.2/samples/mailpost.in Mon Dec 13 05:18:37 1999 +++ inn-2.2.3/samples/mailpost.in Tue Jul 18 16:54:07 2000 @@ -1,9 +1,10 @@ #!@_PATH_PERL@ # mailpost - yet another mail-to-news filter +# 21feb00 [added "lc" to duplicate header fixer stmt to make it case-insensitive] # doka 11may99 [fixed duplicate headers problem] # brister 19oct98 cleaned up somewhat for perl v. 5. and made a little more robust. -# vixie 29jan95 RCS'd [$Id: mailpost.in,v 1.1.2.3 1999/05/11 21:53:00 kondou Exp $] +# vixie 29jan95 RCS'd [$Id: mailpost.in,v 1.1.2.4 2000/02/24 12:21:52 kondou Exp $] # vixie 15jun93 [added -m] # vixie 30jun92 [added -a and -d] # vixie 17jun92 [attempt simple-minded fixup to $path] @@ -261,7 +262,7 @@ # Remove duplicate headers. my %headers = (); -$real_news_hdrs =~ s/((.*?:) .*?($|\n)([ \t]+.*?($|\n))*)/$headers{$2}++?"":"$1"/ges; +$real_news_hdrs =~ s/((.*?:) .*?($|\n)([ \t]+.*?($|\n))*)/$headers{lc$2}++?"":"$1"/ges; # Inews writes error messages to stdout. We want to capture those and mail # them back to the newsmaster. Trying to write and read from a subprocess is diff -ruN inn-2.2.2/samples/sendbatch.in inn-2.2.3/samples/sendbatch.in --- inn-2.2.2/samples/sendbatch.in Mon Dec 13 05:18:37 1999 +++ inn-2.2.3/samples/sendbatch.in Tue Jul 18 16:54:07 2000 @@ -1,5 +1,5 @@ #!@_PATH_SH@ -## $Revision: 1.13 $ +## $Revision: 1.13.2.2 $ ## SH script to send UUCP batches out. By Mike Cooper and Rich $alz. ## Based on B News sendbatch 1.22 10/29/89. . @LIBDIR@/innshellvars @@ -170,7 +170,7 @@ else ## Get queue size from uuq command. - QUEUE=`uuq -l -s${SITE} 2>/dev/null | ${AWK} '{print $4; exit }'` + QUEUE=`uustat -s${SITE} -Sq 2>/dev/null | ${AWK} 'BEGIN {printf "expr "} /queued/ {printf "%s + ", $(NF-1)} END {printf "0\n"}' | sh` fi test -z "${QUEUE}" && QUEUE=0 if [ "${QUEUE}" -gt ${BYTESQUEUED} ] ; then diff -ruN inn-2.2.2/storage/Make.methods inn-2.2.3/storage/Make.methods --- inn-2.2.2/storage/Make.methods Mon Dec 13 05:18:37 1999 +++ inn-2.2.3/storage/Make.methods Tue Jul 18 16:54:07 2000 @@ -1,3 +1,3 @@ # This file is automatically generated by buildconfig -SUBDIR = cnfs timehash +SUBDIR = trash cnfs timehash diff -ruN inn-2.2.2/storage/cnfs/cnfs.c inn-2.2.3/storage/cnfs/cnfs.c --- inn-2.2.2/storage/cnfs/cnfs.c Mon Dec 13 05:18:37 1999 +++ inn-2.2.3/storage/cnfs/cnfs.c Tue Jul 18 16:54:07 2000 @@ -1,4 +1,4 @@ -/* $Id: cnfs.c,v 1.51.2.8 1999/01/29 11:54:37 kondou Exp $ +/* $Id: cnfs.c,v 1.51.2.11 2000/04/05 13:51:15 kondou Exp $ ** ** cyclic news file system */ @@ -1162,27 +1162,7 @@ return NULL; } } - /* check the bitmap to ensure cah.size is not broken */ - /* cannot believe cycbuff->free, since it may not be updated by writer */ - blockfudge = (sizeof(cah) + plusoffset + ntohl(cah.size)) % CNFS_BLOCKSIZE; - limit = offset + sizeof(cah) + plusoffset + ntohl(cah.size) - blockfudge + CNFS_BLOCKSIZE; - for (middle = offset + CNFS_BLOCKSIZE; middle < limit; - middle += CNFS_BLOCKSIZE) { - if (CNFSUsedBlock(cycbuff, middle, FALSE, FALSE) != 0) - /* Bitmap set. This article assumes to be broken */ - break; - } - if (middle != limit) { - char buf1[24], buf2[24], buf3[24]; - strcpy(buf1, CNFSofft2hex(cycbuff->free, FALSE)); - strcpy(buf2, CNFSofft2hex(middle, FALSE)); - strcpy(buf3, CNFSofft2hex(limit, FALSE)); - SMseterror(SMERR_UNDEFINED, "size overflows bitmaps"); - syslog(L_ERROR, "%s: size overflows bitmaps %s %s:0x%s:0x%s:0x%s: %ld", - LocalLogName, TokenToText(token), cycbuffname, buf1, buf2, buf3, ntohl(cah.size)); - DISPOSE(art); - return NULL; - } + /* checking the bitmap to ensure cah.size is not broken was dropped */ private = NEW(PRIV_CNFS, 1); art->private = (void *)private; art->arrived = ntohl(cah.arrived); @@ -1460,6 +1440,7 @@ private->offset += CNFS_BLOCKSIZE; art->data = NULL; art->len = 0; + art->token = NULL; if (!SMpreopen) CNFSshutdowncycbuff(cycbuff); return art; } @@ -1473,10 +1454,11 @@ /* Bitmap set. This article assumes to be broken */ break; } - if ((middle >= cycbuff->free) || (middle != limit)) { + if ((middle > cycbuff->free) || (middle != limit)) { private->offset = middle; art->data = NULL; art->len = 0; + art->token = NULL; if (!SMpreopen) CNFSshutdowncycbuff(cycbuff); return art; } @@ -1491,6 +1473,7 @@ private->offset = middle; art->data = NULL; art->len = 0; + art->token = NULL; if (!SMpreopen) CNFSshutdowncycbuff(cycbuff); return art; } @@ -1511,6 +1494,7 @@ MAP__ARG, cycbuff->fd, mmapoffset)) == (MMAP_PTR) -1) { art->data = NULL; art->len = 0; + art->token = NULL; if (!SMpreopen) CNFSshutdowncycbuff(cycbuff); return art; } @@ -1523,6 +1507,7 @@ if (read(cycbuff->fd, private->base, ntohl(cah.size)) < 0) { art->data = NULL; art->len = 0; + art->token = NULL; if (!SMpreopen) CNFSshutdowncycbuff(cycbuff); DISPOSE(private->base); private->base = 0; @@ -1538,6 +1523,7 @@ if ((p = SMFindBody(innconf->articlemmap ? private->base + pagefudge : private->base, art->len)) == NULL) { art->data = NULL; art->len = 0; + art->token = NULL; if (!SMpreopen) CNFSshutdowncycbuff(cycbuff); return art; } @@ -1563,6 +1549,7 @@ } art->data = NULL; art->len = 0; + art->token = NULL; if (!SMpreopen) CNFSshutdowncycbuff(cycbuff); return art; } diff -ruN inn-2.2.2/storage/overview.c inn-2.2.3/storage/overview.c --- inn-2.2.2/storage/overview.c Mon Dec 13 05:18:37 1999 +++ inn-2.2.3/storage/overview.c Tue Jul 18 16:54:07 2000 @@ -1,4 +1,4 @@ -/* $Id: overview.c,v 1.32.4.1 1999/05/18 21:45:30 kondou Exp $ +/* $Id: overview.c,v 1.32.4.3 2000/07/17 02:16:27 rra Exp $ ** ** unified overview processing */ @@ -86,7 +86,7 @@ */ STATIC BOOL OVERcheckmmap(UNIOVER *config, OFFSET_T offset, unsigned short len) { - int i, j, refcount = 0; + int i, j = 0, refcount = 0; OFFSET_T pagefudge; if ((config == (UNIOVER *)NULL) || (config->size == 0)) @@ -384,6 +384,12 @@ return OVER_ERROR; } newconfig->patterns[i] = COPY(p); + } + if (newconfig->numpatterns != i) { + syslog(L_ERROR, "OVER null pattern, line %d", line); + DISPOSE(newconfig); + (void)Fclose(f); + return OVER_ERROR; } if (prev) prev->next = newconfig; diff -ruN inn-2.2.2/syslog/syslog.c inn-2.2.3/syslog/syslog.c --- inn-2.2.2/syslog/syslog.c Mon Dec 13 05:18:37 1999 +++ inn-2.2.3/syslog/syslog.c Tue Jul 18 16:54:07 2000 @@ -21,7 +21,7 @@ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Header: /proj/cvs/isc/inn/inn/syslog/Attic/syslog.c,v 1.3 1998/05/20 12:18:24 scrappy Exp $ + * $Header: /dist1/cvs/isc/inn/inn/syslog/Attic/syslog.c,v 1.3 1998/05/20 12:18:24 scrappy Exp $ * */