diff options
author | Dirk Meyer <dinoex@FreeBSD.org> | 2001-04-08 10:51:45 +0000 |
---|---|---|
committer | Dirk Meyer <dinoex@FreeBSD.org> | 2001-04-08 10:51:45 +0000 |
commit | 827d3c4f0fc87cb267cf2453a782e431a81b54ad (patch) | |
tree | 04fab602762e0cd7c996d3020369bcd7bc8113f3 | |
parent | Upgrade to version 2.29 (diff) |
- appied patch from PR 25594
- make portlint happier
- clean pkg-plist
PR: 25534
Submitted by: thierry@thomas.as
Notes
Notes:
svn path=/head/; revision=41060
43 files changed, 1374 insertions, 0 deletions
diff --git a/news/Makefile b/news/Makefile index 96c9fa08fe0d..ec4da446124e 100644 --- a/news/Makefile +++ b/news/Makefile @@ -25,6 +25,7 @@ SUBDIR += leafnode+ SUBDIR += newsfetch SUBDIR += newsfish + SUBDIR += newsx SUBDIR += nn SUBDIR += nntp SUBDIR += nntpbtr diff --git a/news/newsx/Makefile b/news/newsx/Makefile new file mode 100644 index 000000000000..1b0df84f1348 --- /dev/null +++ b/news/newsx/Makefile @@ -0,0 +1,54 @@ +# New ports collection makefile for: newsx +# Date created: 31st August, 2000 +# Whom: Ben Smithurst <ben@FreeBSD.org> +# Date updated: 10th February, 2001 +# Whom: Thierry Thomas <tthomas@mail.dotcom.fr> +# +# $FreeBSD$ +# + +PORTNAME= newsx +PORTVERSION= 1.4 +CATEGORIES= news +MASTER_SITES= ftp://ftp.kvaleberg.com/pub/ + +MAINTAINER= tthomas@mail.dotcom.fr + +BUILD_DEPENDS= ${LOCALBASE}/news/lib/libinn.a:${PORTSDIR}/news/inn:${hdr_dir} + +hdr_dir= ${LOCALBASE}/news/include + +post-extract: + @${ECHO} "*********************************************************" + @${ECHO} "If this step fails, then you probably don't have made inn" + @${ECHO} "Go to ${PORTSDIR}/news/inn, and then make it (no need to" + @${ECHO} "make install again if inn is already installed)." + @${ECHO} "*********************************************************" + ${CP} ${hdr_dir}/storage.h ${WRKSRC}/lib + ${CP} ${hdr_dir}/config.h ${WRKSRC}/lib + ${CP} ${hdr_dir}/libinn.h ${WRKSRC}/src + ${CP} ${hdr_dir}/libinn.h ${WRKSRC}/dbz + ${CP} ${hdr_dir}/clibrary.h ${WRKSRC}/dbz + +# Remark: newsx does not really requires inn, but this port has specially +# been built to run with inn 2.3x. +pre-configure: + @${ECHO} "*********************************************************" + @${ECHO} "If the configure step fails, then you probably don't have" + @${ECHO} "a news server package installed. Try installing INN from" + @${ECHO} "${PORTSDIR}/news/inn, and then try building this port" + @${ECHO} "again." + @${ECHO} "*********************************************************" + +post-configure: + @${PERL} -pi -e "s:^LIBS = :LIBS = -L${LOCALBASE}/news/lib -linn:g" \ + ${WRKSRC}/test/Makefile + +#GNU_CONFIGURE= yes +USE_AUTOCONF= yes + +MAN1= newsq.1 +MAN5= newsx.conf.5 in.hosts.5 +MAN8= newsx.8 + +.include <bsd.port.mk> diff --git a/news/newsx/distinfo b/news/newsx/distinfo new file mode 100644 index 000000000000..9ea8eda908c2 --- /dev/null +++ b/news/newsx/distinfo @@ -0,0 +1 @@ +MD5 (newsx-1.4.tar.gz) = 446214ac6ef1f821dcd96106c6e689c5 diff --git a/news/newsx/files/patch-aa b/news/newsx/files/patch-aa new file mode 100644 index 000000000000..54385f2bcd86 --- /dev/null +++ b/news/newsx/files/patch-aa @@ -0,0 +1,48 @@ +--- configure.in.orig Tue Apr 20 16:49:01 1999 ++++ configure.in Sat Mar 3 17:12:12 2001 +@@ -425,10 +425,10 @@ + dnl $RNEWS + PATHETC="$NEWSHOME" + SPOOL="$NEWSARTS" +- BATCH="$NEWSARTS/out.going" +- INCOMING="$NEWSARTS/in.coming" ++ BATCH="$NEWSARTS/outgoing" ++ INCOMING="$NEWSARTS/incoming" + if test x$INHOSTS = x ; then +- INHOSTS="$NEWSARTS/in.hosts" ++ INHOSTS="$NEWSARTS/inhosts" + fi + + dnl This is pretty standard: +@@ -610,9 +610,10 @@ + if test x$INN_MODE = x1; then + CFLAGS_save="$CFLAGS" + CFLAGS="$CFLAGS -L$NEWSLIB" ++ LIBS_save="$LIBS" ++ LIBS="$LIBS -linn -lstorage" + AC_CHECK_LIB(inn, HashMessageID, HAVE_LIBINN=1) + +- LIBS_save="$LIBS" + dnl + dnl BUG: + dnl Note that double inclusion of -lstorage seem to be required +@@ -702,7 +703,7 @@ + dnl + dnl We must have sensible default values + dnl for all files and directories mentioned in the +-dnl documentation ++dnl documentation. Use new INN names as defaults. + dnl + mkdoc () + { +@@ -718,8 +719,8 @@ + mkdoc SPOOL "/var/spool/news" + mkdoc NEWSHOME "/usr/lib/news" + mkdoc NEWSBIN "/usr/lib/newsbin" +-mkdoc BATCH "$DOC_SPOOL/out.going" +-mkdoc INCOMING "$DOC_SPOOL/in.coming" ++mkdoc BATCH "$DOC_SPOOL/outgoing" ++mkdoc INCOMING "$DOC_SPOOL/incoming" + mkdoc INHOSTS "$DOC_SPOOL/in.hosts" + mkdoc LOCKS "$DOC_NEWSHOME" + mkdoc PATHETC "$DOC_NEWSHOME" diff --git a/news/newsx/files/patch-ab b/news/newsx/files/patch-ab new file mode 100644 index 000000000000..bd631b800a81 --- /dev/null +++ b/news/newsx/files/patch-ab @@ -0,0 +1,76 @@ +--- INSTALL.orig Thu Apr 8 04:12:00 1999 ++++ INSTALL Fri Feb 9 05:54:42 2001 +@@ -1,27 +1,46 @@ ++Installation Summary ++-------------------- + +-Basic Installation +-================== ++To compile and install this package: + +-The easiest way to compile this package is: ++ 1. Set up your local news server first. Newsx auto-configuration ++ checks what news server files and directories exist. + +- 1. Type `make' to configure tha package for your system and compile +- the package. ++ 2. Look over the Installation Details and Special Cases below to see if ++ you need to give ./configure any special options. + +- To run the configuration as a seperate step, type `./configure'. ++ 3. As user 'news' (or whatever owns your USENET News software), do + +- 2. Type `make install' to install the programs and any data files and +- documentation. You will often have to switch to superuser mode for +- this. ++ ./configure (with the options you prefer) + +- 3. Consult the README and FAQ for further advice regarding installation ++ (Note: ./configure produces README from README.in .) ++ ++ make (to build the programs). ++ ++ 4. If you need to be superuser/root to install software, do so, then do ++ ++ make install (installs the programs, data files, and ++ documentation). ++ ++ 5. Consult the README and FAQ for further advice regarding installation + and setting up the package. + +- 4. You can remove the program binaries and object files from the ++ 6. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. + + ++Installation Details and Special Cases ++-------------------------------------- ++ ++Linux ++===== ++ ++Linux users should check "http://web.tiscalinet.it/kalem/newsx.html". ++It has some RPM and Debian-related changes you may find useful. ++ ++ + Support for INN 2.x + =================== + +@@ -131,7 +150,13 @@ + A warning: not all `configure' scripts look for a site script. + + +-$Id: INSTALL,v 1.7 1999/04/08 08:04:32 src Exp $ +- ++WORKAROUNDS ++=========== + ++1) `dbx newsx' complains of a symbol table problem and won't run + ++ Apparently, `gcc -g' can produce things dbx can't handle. This has been ++ seen in dbz/dbz-v3.o, dbz/dbz.o, and dbz/hash.o. Recompile the file ++ without the "-g" option and relink newsx. E.g., if dbx complains about ++ dbz/dbz.o, edit dbz/Makefile to remove "-g " from CFLAGS, ++ `rm dbz/dbz.o src/newsx', and rerun `make'. diff --git a/news/newsx/files/patch-ac b/news/newsx/files/patch-ac new file mode 100644 index 000000000000..6430b09cd88f --- /dev/null +++ b/news/newsx/files/patch-ac @@ -0,0 +1,21 @@ +--- Makefile.in.orig Sun Apr 25 03:08:10 1999 ++++ Makefile.in Fri Feb 9 05:03:35 2001 +@@ -135,12 +135,14 @@ + CTAGS_ARGS = config.h + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-CONFIG_HEADER = config.h + CONFIG_CLEAN_FILES = README newsx.spec ++CONFIG_HEADER = config.h ++CONFIG_STATUS_DEPENDENCIES = ++CONFIGURE_DEPENDENCIES = + DIST_COMMON = README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \ +-Makefile.am Makefile.in NEWS README.in TODO acconfig.h aclocal.m4 \ +-config.guess config.h.in configure configure.in install-sh missing \ +-mkinstalldirs newsx.spec.in ++ Makefile.am Makefile.in NEWS README.in TODO acconfig.h aclocal.m4 \ ++ config.guess config.h.in configure configure.in install-sh missing \ ++ mkinstalldirs newsx.spec.in + + + DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) diff --git a/news/newsx/files/patch-ad b/news/newsx/files/patch-ad new file mode 100644 index 000000000000..33e3f7654970 --- /dev/null +++ b/news/newsx/files/patch-ad @@ -0,0 +1,284 @@ +--- README.in.orig Wed Apr 21 01:16:33 1999 ++++ README.in Fri Feb 9 05:51:35 2001 +@@ -1,9 +1,12 @@ ++[edited by Winston Edmond 02/2001 ++ Note: `./README' will be created by `./configure' from `README.in'] ++ + + Newsx - An NNTP client for posting and fetching news + ==================================================== + +- Version @VERSION@ +- Written by Egil Kvaleberg ++ Version @VERSION@ ++ Written by Egil Kvaleberg + + ------ + +@@ -107,36 +110,66 @@ + test Directory for test code + + +-COMPILE AND INSTALL +-------------------- +- +-1. Type `make', and hopefully you will get the newsx executable. +- Read the INSTALL for further enlightenment. ++CONFIGURE, COMPILE, AND INSTALL ++------------------------------- + +-2. Type `su' to become root, and then `make install' to install the +- executables and the man pages. ++1. Set up your local news server first. Newsx auto-configuration depends ++ on the news server files and directories it finds and where. + ++2. Glance at ./INSTALL to see if you need any special configuration ++ options. Run ./configure with the options you prefer. + +-MAILING LISTS +-------------- ++3. Type `make', and hopefully you will get the newsx executable. + +-If you want to be informed about future newsx versions and receive +-possible bug alerts, you can send an email message to: +- +- majordomo@kvaleberg.no +- +-with the following line in the message body: +- +- subscribe newsx-announce ++4. Type `su' to become root, and then `make install' to install the ++ executables and the man pages. + +-If you want to join the newsx discussion list, you can send an +-email message to the same address with the following line in the +-message body: + +- subscribe newsx ++QUICK START -- GENERAL ++---------------------- + +-The Usenet newsgroup news.software.nntp is also a suitable forum for +-discussing newsx. ++Newsx moves articles between servers, so you need to have a working local ++news server with at least one newsgroup in order to test newsx. There are ++two basic tests: ++ (1) can an article locally posted to the newsgroup and queued by the news ++ server for delivery to the remote server be successfully sent to the ++ remote server, and ++ (2) can articles from the remote server be fetched and placed in the ++ local server's "in" queue. ++The "QUICK START WITH INN/C-NEWS" instructions below walk you through these ++tests. ++ ++By default, an in.hosts/$server file is built automatically and will fetch ++all articles in all groups listed in active (except as limited by the sys ++file or command line options). It is sometimes worthwhile to set up this ++file by hand rather than accept the default. ++ ++Special case #1: ++ * you've been reading news DIRECTLY from one or more REMOTE servers, ++ * you're now setting up a local server, AND ++ * you'd like to avoid downloading articles you've already seen. ++ ++ You can copy your $HOME/.newsrc file and use it as the initial ++ in.hosts/$server file! The (remote server's) article numbers will be ++ extracted, and if you use "--forget-inactive" the first time you call ++ `newsx', groups that were in .newsrc that you've unsubscribed to will be ++ eliminated from in.hosts/$server, and current and future downloading ++ will be limited to only the groups you're subscribed to at the time. ++ (This does not "track" newsgroup subscription changes you make later.) ++ ++Special case #2: ++ * you've been running a local server for some time and have lots of ++ newsgroups in 'active' that you don't want fetched. ++ ++ Use the 'active' file or a .newsrc file, remove the article numbers ++ (assuming they're the local server's article numbers), trim the list ++ down to the groups you want, and use that as the in.hosts/$server ++ file. ++ ++WARNING: ++ Newsgroups can have LOTS of articles. Please look at the newsx man page ++ descriptions of --maxnew, --syncnew, and --maxart before running newsx ++ to pull articles from the remote server the first time. + + + QUICK START WITH INN +@@ -144,6 +177,7 @@ + + We assume that you already have INN installed. What you have to do is: + ++SETUP: + 1. Do all maintenance of the news system as user `@DOC_NEWSUSER@'. Ensure + that the `.profile' of this user defines a path that includes + `@DOC_NEWSBIN@'. E.g.: +@@ -168,14 +202,21 @@ + the special `newsx' in the example above with the particular exclude + string for the newsserver in question. + +- 3. If you haven't done so already, define one or more newsgroups that +- will appear in the `@DOC_ACTIVE@' file: ++ 3. If you haven't done so already, create one or more newsgroups in the ++ `@DOC_ACTIVE@' file that you will be fetching from the remote ++ newsserver: + + ctlinnd newgroup acme.test + +- 4. Try to fetch news articles for these groups by doing: ++FETCH TEST: ++ 4. Dry-run test fetching news articles for these groups by doing: ++ ++ newsx -ddddd -n --maxnew 100 acme news.acme.net ++ ++ If the output looks correct, try running it for real (using your ++ preference of --maxnew, --maxart, and --syncnew options): + +- newsx -ddddd acme news.acme.net ++ newsx -dd --maxnew 100 acme news.acme.net + + 5. The articles should now appear in the incoming batch + `@DOC_INCOMING@'. If you invoke: +@@ -185,13 +226,15 @@ + the incoming articles should appear in the news spool. In the + example, you may look for them in `@DOC_SPOOL@/acme/test'. + ++POST TEST: + 6. Using a newsreader, post an article to a suitable test group. Try to + use a group with as small distribution as possible, preferably local + to the external newsserver you are using. If you haven't done so + already, the group must be in the `@DOC_ACTIVE@' file. + +- The next time that `rnews' is invoked, the articles will be output +- to the spool file `@DOC_BATCH@/acme' specified in the `@DOC_NEWSFEEDS@' file. ++ The next time that `rnews' is invoked, the articles will be output to ++ the spool file `@DOC_BATCH@/acme' specified in the ++ `@DOC_NEWSFEEDS@' file. + + 7. Run: + +@@ -210,16 +253,11 @@ + + newsx -l posted.log -f posted acme news.acme.net + +- 9. To catch up with new newsgroups in a quicker way, you may want to +- limit the number of articles fetched by adding the option: +- +- --maxnew 100 +- +-10. You may want to arrange for automatic news exchange by using `crontab'. ++ 9. You may want to arrange for automatic news exchange by using `crontab'. + It is usually good to invoke `newsrun' before and after the newsx + session. + +-11. For more information about how to set up news and other subjects related ++10. For more information about how to set up news and other subjects related + to use of ordinary ISP accounts, you might want to consult: + + http://www.kvaleberg.com/ISP-Hookup-HOWTO.html +@@ -231,6 +269,7 @@ + + We assume that you already have C News installed. What you have to do is: + ++SETUP: + 1. Do all maintenance of the news system as user `@DOC_NEWSUSER@'. Ensure + that the `.profile' of this user defines a path that includes + `@DOC_NEWSBIN@'. E.g.: +@@ -244,8 +283,9 @@ + ME:all/all:: + acme/newsx:all,!junk,!control/all:FL: + +- The outgoing batch will be named `acme' - replace `acme' with what +- is appropriate for your configuration. ++ The filename of the outgoing batch will be the server's name, `acme' in ++ the example above. Replace `acme' with what is appropriate for your ++ configuration. + + All groups that you do NOT want to exchange with the host in question + should be listed with an `!' before it, the `junk' group being a +@@ -254,27 +294,38 @@ + The L-flag is a double insurance that only actual local postings will + be sent out. + +- NOTE: Depending on how you use the spool, you may want to replace +- the special `newsx' in the example above with the particular exclude +- string for the newsserver in question. +- +- 3. If you haven't done so already, define one or more newsgroups that +- will appear in the `@DOC_ACTIVE@' file: ++ NOTE: Depending on how you use the spool, you may want to replace the ++ special `newsx' in the example above with the particular exclude string ++ for the newsserver in question. This is particularly true if you are ++ sending and receiving news with multiple servers or if the local system ++ names you're using aren't the name the servers use for themselvers in ++ "Path:". ++ ++ 3. If you haven't done so already, create one or more newsgroups in the ++ `@DOC_ACTIVE@' file that you will be fetching from the remote ++ newsserver: + + addgroup acme.test y + +- 4. Try to fetch news articles for these groups by doing: ++FETCH TEST: ++ 4. Dry-run test fetching news articles for these groups by doing: ++ ++ newsx -ddddd -n --maxnew 100 acme news.acme.net + +- newsx -ddddd acme news.acme.net ++ If the output looks correct, try running it for real (using your ++ preference of --maxnew, --maxart, and --syncnew options): ++ ++ newsx -dd --maxnew 100 acme news.acme.net + + 5. The articles should now appear in the incoming batch +- `@DOC_INCOMING@'. If you invoke: ++ `@DOC_INCOMING@'. If you invoke: + + newsrun + +- the incoming articles should appear in the news spool. In the +- example, you may look for them in `@DOC_SPOOL@/acme/test'. ++ the incoming articles should appear in the news spool. For newsgroup ++ acme.test, articles would be placed in `@DOC_SPOOL@/acme/test/'. + ++POST TEST: + 6. Using a newsreader, post an article to a suitable test group. Try to + use a group with as small distribution as possible, preferably local + to the external newsserver you are using. If you haven't done so +@@ -287,6 +338,28 @@ + 7. Continue with point 7 in the INN explanation above. + + ++MAILING LISTS ++------------- ++ ++If you want to be informed about future newsx versions and receive ++possible bug alerts, you can send an email message to: ++ ++ majordomo@kvaleberg.no ++ ++with the following line in the message body: ++ ++ subscribe newsx-announce ++ ++If you want to join the newsx discussion list, you can send an ++email message to the same address with the following line in the ++message body: ++ ++ subscribe newsx ++ ++The Usenet newsgroup news.software.nntp is also a suitable forum for ++discussing newsx. ++ ++ + LEGAL MATTER + ------------ + +@@ -398,6 +471,3 @@ + Husebybakken 14A + N-0379 Oslo + Norway +- +- +-$Id: README.in,v 1.60 1999/04/21 05:16:33 src Exp $ diff --git a/news/newsx/files/patch-ae b/news/newsx/files/patch-ae new file mode 100644 index 000000000000..2a5a4430d9ff --- /dev/null +++ b/news/newsx/files/patch-ae @@ -0,0 +1,15 @@ +--- config.h.in.orig Sun Apr 18 23:08:14 1999 ++++ config.h.in Fri Feb 9 03:35:08 2001 +@@ -72,10 +72,10 @@ + /* "/var/spool/news" */ + #undef SPOOL + +-/* "/var/spool/news/out.going" */ ++/* /var/spool/news/ out.going(C-News) or outgoing(INN) */ + #undef BATCH + +-/* "/var/spool/news/in.coming" */ ++/* /var/spool/news/ in.coming(C-News) or incoming(INN) */ + #undef INCOMING + + /* "/var/spool/news/in.hosts" */ diff --git a/news/newsx/files/patch-af b/news/newsx/files/patch-af new file mode 100644 index 000000000000..aa0cd6f3c47d --- /dev/null +++ b/news/newsx/files/patch-af @@ -0,0 +1,37 @@ +--- lib/getopt.c.orig Sun Sep 27 09:34:20 1998 ++++ lib/getopt.c Thu Feb 15 21:30:54 2001 +@@ -23,6 +23,9 @@ + Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. + + $Log: getopt.c,v $ ++ Revision x.x 2001/02/14 ++ Got rid of another gcc warning (<thierry@thomas.as>) ++ + Revision 1.2 1998/09/27 07:34:20 src + Got rid of gcc warning + +@@ -554,17 +557,20 @@ + else + { + if (opterr) ++ { + if (argv[optind - 1][1] == '-') + /* --option */ + fprintf (stderr, + gettext ("%s: option `--%s' doesn't allow an argument\n"), + argv[0], pfound->name); + else ++ { + /* +option or -option */ +- fprintf (stderr, +- gettext ("%s: option `%c%s' doesn't allow an argument\n"), +- argv[0], argv[optind - 1][0], pfound->name); +- ++ fprintf (stderr, ++ gettext ("%s: option `%c%s' doesn't allow an argument\n"), ++ argv[0], argv[optind - 1][0], pfound->name); ++ } ++ } + nextchar += strlen (nextchar); + return '?'; + } diff --git a/news/newsx/files/patch-ag b/news/newsx/files/patch-ag new file mode 100644 index 000000000000..7a5b1ab5e4a8 --- /dev/null +++ b/news/newsx/files/patch-ag @@ -0,0 +1,11 @@ +--- dbz/Makefile.in.orig Sun Apr 25 03:08:40 1999 ++++ dbz/Makefile.in Fri Feb 9 05:23:08 2001 +@@ -198,7 +198,7 @@ + $(COMPILE) -c $< + + mostlyclean-compile: +- -rm -f *.o core *.core ++ -rm -f *.o core *.core endian *.a + + clean-compile: + diff --git a/news/newsx/files/patch-ah b/news/newsx/files/patch-ah new file mode 100644 index 000000000000..f749e5b16cd7 --- /dev/null +++ b/news/newsx/files/patch-ah @@ -0,0 +1,12 @@ +--- dbz/dbz-v6.c.orig Thu Apr 8 06:48:51 1999 ++++ dbz/dbz-v6.c Sun Jan 21 11:19:14 2001 +@@ -116,6 +116,9 @@ + #if HAVE_SYS_TIME_H + # include <sys/time.h> + #endif ++#if HAVE_MEMORY_H ++# include <memory.h> ++#endif + + #include <stdio.h> + #include <unistd.h> diff --git a/news/newsx/files/patch-ai b/news/newsx/files/patch-ai new file mode 100644 index 000000000000..656bb2f85cc7 --- /dev/null +++ b/news/newsx/files/patch-ai @@ -0,0 +1,19 @@ +--- dbz/hash.c.orig Fri Mar 5 06:20:34 1999 ++++ dbz/hash.c Sun Jan 21 11:31:49 2001 +@@ -23,10 +23,15 @@ + Revision 1.3 1998/07/12 09:39:19 src + NewsX version 1.0 + */ ++#include "configdata.h" ++ ++#if HAVE_MEMORY_H ++# include <memory.h> ++#endif ++ + #include <stdio.h> + #include <sys/types.h> + #include <ctype.h> +-#include "configdata.h" + + #include "clibrary.h" + #include "libinn.h" diff --git a/news/newsx/files/patch-aj b/news/newsx/files/patch-aj new file mode 100644 index 000000000000..86515c32c2ef --- /dev/null +++ b/news/newsx/files/patch-aj @@ -0,0 +1,61 @@ +--- doc/in.hosts.5.in.orig Tue Apr 20 02:45:46 1999 ++++ doc/in.hosts.5.in Sun Jan 21 14:52:33 2001 +@@ -45,29 +45,38 @@ + file that describes what the latest article is that has been fetched from + that particular host. + .PP +-As long as you want to get all news articles in the groups defined at your +-local server, there is no need to do anything to make construct this file, +-it will take care of itself. ++If you want to get all news articles in all the groups defined at your ++local server, do nothing and let the file be constructed automatically. ++Other choices, such as using multiple ++.IR cron (8) ++entries and ++.IR newsx (8) ++end tags to control when certain newsgroups are fetched, ++or using ++.B .newsrc ++article numbers to avoid fetching articles you've already seen, ++require setting up the ++.B in.hosts ++file for the server by hand. + .PP + The format of this file is simple: + .PP +-Blank lines and lines starting with a '#' will be treated as comments. ++Blank lines and lines starting with a '#' are treated as comments. + .PP +-Lines starting with a ':' indicates a tag for use with the +-newsx \fB-e\fP option. ++Lines starting with a ':' indicate a tag for use with the ++newsx \fB-e\fP (end tag) option. + .PP + Otherwise, each line consists of a newsgroup name and the first unread +-article number, separated by whitespace. A missing article number +-corresponds to zero, meaning that all available articles on the +-server will be read. ++article number, separated by whitespace. No article number is the same ++as zero, meaning that all available articles on the server will be read. + .PP + It is important to realize that there is one unique file belonging to + each remote newsserver, and that they should not be mixed. + .PP + If switching from reading news via an NNTP newsreader to fetching with +-newsx, it is possible to use a existing ++newsx, it is possible to use an existing + .B ".newsrc" +-file directly as basis for making an initial ++file directly as the initial + \fB\*j/\fP\fIspoolname\fP + file. + +@@ -77,7 +86,7 @@ + Incoming host state file. + There should be one of these per external news server. + .IP "\*j/\fIspoolname\fP.tmp" +-Incoming spool, temporary (while news are being pulled). ++Incoming spool, temporary (while news is being pulled). + .IP "\*j/\fIspoolname\fP.old" + Previous generation of the external host state file. + .IP "\*j/\fIspoolname\fP.conf" . diff --git a/news/newsx/files/patch-ak b/news/newsx/files/patch-ak new file mode 100644 index 000000000000..8bcd04ae2528 --- /dev/null +++ b/news/newsx/files/patch-ak @@ -0,0 +1,33 @@ +--- doc/newsx.8.in.orig Sat Apr 24 13:55:27 1999 ++++ doc/newsx.8.in Mon Jan 22 21:07:25 2001 +@@ -515,16 +515,15 @@ + .RS + This option is particularily useful to specify unsymmetric behaviour, i.e. + groups where there will be outgoing traffic, but no incoming articles. +-For instance, +-to explicitly avoid fetching of control groups, use: ++For instance, to explicitly avoid fetching of control groups, use: + .br + --groups '!control.*' +-.TP ++.PP + It can also be useful to specify that only a subset of groups should be + fetched for the occasion, e.g: + .br + --groups 'comp.*,!*.advocacy' +-.TP ++.PP + It is recommended to put the argument for --groups in single quotes. + + .SH "GENERAL OPTIONS" +@@ -552,6 +551,10 @@ + Do not update the process status display. + + .SH "OPTIONS FOR NEWSGROUPS" ++.PP ++NOTE: Unless otherwise specified, these options are IN ADDITION TO the usual ++actions and do NOT imply --no-post or --no-fetch. Specify those switches if ++desired. + .TP + \fB--list\fP\fI listname\fP + Obtain a list of newsgroups from the newsserver to diff --git a/news/newsx/files/patch-al b/news/newsx/files/patch-al new file mode 100644 index 000000000000..771787263ace --- /dev/null +++ b/news/newsx/files/patch-al @@ -0,0 +1,19 @@ +--- doc/newsx.conf.5.in.orig Wed Apr 21 01:13:12 1999 ++++ doc/newsx.conf.5.in Sun Jan 21 14:08:22 2001 +@@ -34,14 +34,10 @@ + + .SH DESCRIPTION + .PP +-The + .B "newsx.conf" +-will be +-be read before ++is a profile file read by + .IR newsx (8) +-the command line argument parsing commences. +-.PP +-The profile contains standard ++before processing the command line arguments. It contains standard + .IR newsx (8) + command line options. The leading dashes for options are mandatory. + Several lines may be used. diff --git a/news/newsx/files/patch-am b/news/newsx/files/patch-am new file mode 100644 index 000000000000..230793e60e5d --- /dev/null +++ b/news/newsx/files/patch-am @@ -0,0 +1,11 @@ +--- lib/Makefile.in.orig Sun Apr 25 03:08:26 1999 ++++ lib/Makefile.in Fri Feb 9 05:22:26 2001 +@@ -203,7 +203,7 @@ + $(COMPILE) -c $< + + mostlyclean-compile: +- -rm -f *.o core *.core ++ -rm -f *.o core *.core *.a + + clean-compile: + diff --git a/news/newsx/files/patch-an b/news/newsx/files/patch-an new file mode 100644 index 000000000000..24435366db36 --- /dev/null +++ b/news/newsx/files/patch-an @@ -0,0 +1,25 @@ +--- src/filter.c.orig Mon Nov 23 07:25:48 1998 ++++ src/filter.c Wed Jan 24 06:37:22 2001 +@@ -40,6 +40,22 @@ + static int filter_open = 0; + static SOCKET_D filter_sock; /* BUG: no... */ + ++#ifndef HAVE_STRTOUL ++/* ++ * for systems that doesn't have it, assuming base<=10 ++ */ ++long ++strtoul(char *str,char **endptr,int base) ++{ ++ long u = 0L; ++ char c; ++ while (isspace(*str)) ++str; ++ while (isdigit(c = *str++)) u = u*base + c-'0'; ++ if (endptr) *endptr = str; ++ return u; ++} ++#endif ++ + /* + * start the program if not active already + */ diff --git a/news/newsx/files/patch-ao b/news/newsx/files/patch-ao new file mode 100644 index 000000000000..5c2dfc8380bf --- /dev/null +++ b/news/newsx/files/patch-ao @@ -0,0 +1,12 @@ +--- src/logmsg.c.orig Tue Mar 30 22:38:28 1999 ++++ src/logmsg.c Sun Jan 21 10:47:05 2001 +@@ -121,7 +121,8 @@ + return strerror(err); + #else + static char buf[30]; +- sprintf("errno %d",err); ++ sprintf(buf,"errno %d",err); ++ return buf; + #endif + } + diff --git a/news/newsx/files/patch-ap b/news/newsx/files/patch-ap new file mode 100644 index 000000000000..7da757a87013 --- /dev/null +++ b/news/newsx/files/patch-ap @@ -0,0 +1,21 @@ +--- src/main.c.orig Sun Apr 25 09:00:37 1999 ++++ src/main.c Sat Mar 3 23:06:24 2001 +@@ -20,6 +20,9 @@ + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * $Log: main.c,v $ ++ * Revision x.xx 2001/02/11 ++ * Use libinn.h (<thierry@thomas.as>) ++ * + * Revision 1.46 1999/04/25 07:00:37 src + * Mellowed error message for missing standard profiles + * +@@ -380,6 +383,8 @@ + { + int c; + char *p; ++ ++ optind = 0; /* tell getopt to reset internal variables */ + + for (;;) { + option_index = -1; diff --git a/news/newsx/files/patch-aq b/news/newsx/files/patch-aq new file mode 100644 index 000000000000..bda7749aa058 --- /dev/null +++ b/news/newsx/files/patch-aq @@ -0,0 +1,83 @@ +--- src/pull.c.orig Mon Mar 15 02:45:13 1999 ++++ src/pull.c Wed Jan 24 15:27:03 2001 +@@ -280,36 +280,71 @@ + } + fprintf(pull_tmp,":%s\n",t); + } else { ++ char c = '\0'; + /* must be a group name */ + where = 0; +- if ((n=sscanf(p,"%[^ \n\t!:] %ld",group,&where)) < 1) { ++ if ((n=sscanf(p,"%[^ \n\t!:]%c %ld",group,&c,&where)) < 1) { + if (!skip) { + bad_syntax(p,n,1,"host active"); + fprintf(pull_tmp,"#ERR# %s",buf); + } + } else { ++ /* If .newsrc used for in.hosts file, and it says the ++ group isn't being read, treat the group as inactive, ++ even if it appears in 'active'. */ ++ unsigned int ignore_this_group; ++ if (c == '!' || c == ':') { ++ ignore_this_group = (c == '!'); ++ /* Assume .newsrc format line: get last number and ++ find the end of (potentially very) long lines */ ++ t = p + strlen(p) - 1; /* n>=1 && c ensure t > p */ ++ while (*t != '\n') { ++ /* .newsrc line (still) longer than BUFSIZ! */ ++ while (isdigit(t[-1])) --t; ++ strcpy (buf,t); ++ n = strlen(buf); ++ p = buf+n; ++ if (!fgets(p,BUFSIZ-n,pull_in)) { ++ t = p; /* EOF instead of EOL */ ++ break; ++ } ++ t = p + strlen(p) - 1; ++ } ++ while (isdigit(t[-1])) --t; ++ where = strtol(t,NULL,10); ++ } ++ else ignore_this_group = 0; /* false */ + if (!skip) { +- if (is_active(group)) { ++ if (!ignore_this_group && is_active(group)) { ++ unsigned int ok; + where0 = where; +- log_msg(L_DEBUGMORE,"pull group %s",group); +- if (!pull_group(group,&where,0)) { ++ if (where > 0) { ++ log_msg(L_DEBUGMORE,"pull group %s",group); ++ ok = pull_group(group,&where,0); ++ } else { ++ /* treat groups with where = 0 as new groups */ ++ log_msg(L_DEBUGMORE,"pull unseen group %s",group); ++ ok = pull_group(group,&where,1); ++ if (ok) ++unseen_groups; ++ } ++ if (!ok) { + fetch_aborted = 1; + skip = 1; + /* continue reading active to clean up things */ + } else if (where0 != where) { +- ++pull_anything; ++ ++pull_anything; + fflush(pull_tmp); + } + } else { + if (forget_inactive) { +- /* loose all information about groups ++ /* delete information about groups + no longer in active file */ +- log_msg(L_INFO,"group %s no longer active - removed from host list", +- group); ++ log_msg(L_INFO,"inactive group %s removed from host list", ++ group); + group[0] = '\0'; + ++removed_groups; + } else { +- log_msg(L_DEBUGMORE,"group %s not active",group); ++ log_msg(L_DEBUGMORE,"group %s not active or not read",group); + } + } + } diff --git a/news/newsx/files/patch-ar b/news/newsx/files/patch-ar new file mode 100644 index 000000000000..fbcab734a8b2 --- /dev/null +++ b/news/newsx/files/patch-ar @@ -0,0 +1,25 @@ +--- src/putarticle.c.orig Mon Apr 5 15:01:51 1999 ++++ src/putarticle.c Sun Jan 21 11:27:49 2001 +@@ -85,22 +85,6 @@ + + static int SM_open = 0; + +-#ifndef HAVE_STRTOUL +-/* +- * for systems that doesn't have it, assuming base<=10 +- */ +-long +-strtoul(char *str,char **endptr,int base) +-{ +- long u = 0L; +- char c; +- while (isspace(*str)) ++str; +- while (isdigit(c = *str++)) u = u*base + c-'0'; +- *endptr = str; +- return u; +-} +-#endif +- + /* + * check if header tag + */ diff --git a/news/newsx/files/patch-as b/news/newsx/files/patch-as new file mode 100644 index 000000000000..105b9edfd2c4 --- /dev/null +++ b/news/newsx/files/patch-as @@ -0,0 +1,44 @@ +--- src/sim.c.orig Wed Mar 31 07:53:46 1999 ++++ src/sim.c Sun Feb 18 15:13:00 2001 +@@ -5,6 +5,9 @@ + * that emulates the API to allow consistent handling + * + * $Log: sim.c,v $ ++ * Revision x.xx 2001/02/18 ++ * Use xmalloc and xrealloc from libinn.h + std_error (<thierry@thomas.as>) ++ * + * Revision 1.2 1999/03/31 05:53:46 src + * Seperated MAXHEADERSIZE from NNTP_STRLEN + * +@@ -46,11 +49,12 @@ + SMerrorstr = NULL; + + if ((fp = fopen(name, "r")) == NULL) { +- SMerrorstr = strerror(errno); ++ SMerrorstr = str_error(errno); + return 0; + } + +- line = art = xmalloc(alloc_len); ++/* xmalloc from libinn (<thierry@thomas.as>) */ ++ line = art = xmalloc(alloc_len,"sim.c",57); + art_len = 0; + + for (;;) { +@@ -106,14 +110,14 @@ + line += 3; + + if (ferror(fp)) { +- SMerrorstr = strerror(errno); ++ SMerrorstr = str_error(errno); + fclose(fp); + free(art); + return 0; + } + + /* all set */ +- ap = xmalloc(sizeof(ARTHANDLE)); ++ ap = xmalloc(sizeof(ARTHANDLE),"sim.c",120); + + ap->data = art; + ap->len = line-art; diff --git a/news/newsx/files/patch-at b/news/newsx/files/patch-at new file mode 100644 index 000000000000..294180442e80 --- /dev/null +++ b/news/newsx/files/patch-at @@ -0,0 +1,11 @@ +--- src/statistics.c.orig Thu Apr 1 22:56:59 1999 ++++ src/statistics.c Wed Jan 24 15:42:54 2001 +@@ -117,7 +117,7 @@ + + if (ftell(f) == 0L) { + fprintf(f, +- "# post fetc dupl alre hist miss grps ua-g us-g grossbyt netbytes totaltim fail\n"); ++ "# post fetc dupl alre hist miss grps ua-g us-g grossbyt netbytes totaltim fail bnce\n"); + } + fprintf(f, + "T %s %s", diff --git a/news/newsx/files/patch-au b/news/newsx/files/patch-au new file mode 100644 index 000000000000..d32ba98089c2 --- /dev/null +++ b/news/newsx/files/patch-au @@ -0,0 +1,9 @@ +--- ChangeLog.orig Sun Apr 25 03:04:51 1999 ++++ ChangeLog Fri Feb 9 02:20:49 2001 +@@ -1,3 +1,6 @@ ++02/2001 (WBE): several bugs fixed; a few minor changes; documentation ++ improvements. No response from bug-newsx or Egil to patches sent in. ++ + Update of /home/cvs/newsx + In directory big:/usr/src/newsx + diff --git a/news/newsx/files/patch-av b/news/newsx/files/patch-av new file mode 100644 index 000000000000..d9f3eeacbb10 --- /dev/null +++ b/news/newsx/files/patch-av @@ -0,0 +1,48 @@ +--- src/util.c.orig Wed Apr 7 10:02:11 1999 ++++ src/util.c Sun Feb 18 13:42:53 2001 +@@ -6,6 +6,9 @@ + * the GNU General Public License applies + * + * $Log: util.c,v $ ++ * Revision x.xx 2001/02/11 ++ * Use xmalloc and xrealloc from libinn.h (<thierry@thomas.as>) ++ * + * Revision 1.14 1999/04/07 08:02:11 src + * Implemented --profile + * +@@ -188,7 +191,6 @@ + + /* + * memory allocation - never fail +- */ + void * + xmalloc(unsigned int size) + { +@@ -200,10 +202,10 @@ + } + return p; + } ++ */ + + /* + * memory reallocation - never fail +- */ + void * + xrealloc(void *p,unsigned int size) + { +@@ -213,6 +215,7 @@ + } + return p; + } ++ */ + + /* + * string allocate and copy - never fail +@@ -220,5 +223,6 @@ + char * + xstrcpy(const char *str) + { +- return strcpy(xmalloc(strlen(str)+1),str); ++/* xmalloc from libinn (<thierry@thomas.as>) */ ++ return strcpy(xmalloc(strlen(str)+1,"util.c", 228),str); + } diff --git a/news/newsx/files/patch-aw b/news/newsx/files/patch-aw new file mode 100644 index 000000000000..44931077c2c0 --- /dev/null +++ b/news/newsx/files/patch-aw @@ -0,0 +1,29 @@ +--- src/telnet.c.orig Wed Mar 31 07:53:46 1999 ++++ src/telnet.c Mon Feb 12 21:31:37 2001 +@@ -6,6 +6,9 @@ + * the GNU General Public License applies + * + * $Log: telnet.c,v $ ++ * Revision x.xx 2001/02/11 ++ * Use xmalloc and xrealloc from libinn.h (<thierry@thomas.as>) ++ * + * Revision 1.9 1999/03/31 05:53:46 src + * Seperated MAXHEADERSIZE from NNTP_STRLEN + * +@@ -26,6 +29,7 @@ + #include "proto.h" + #include "nntp.h" + #include "news.h" /* MAXHEADERSIZE */ ++#include "libinn.h" + + #include <signal.h> + #include <setjmp.h> +@@ -161,7 +165,7 @@ + static int buf_m = 0; + static int not_first_time = 0; + +- if (!buf) buf = xmalloc(MAXHEADERSIZE); ++ if (!buf) buf = xmalloc(MAXHEADERSIZE,"telnet.c",168); + + if (!not_first_time) { + not_first_time = 1; diff --git a/news/newsx/files/patch-ax b/news/newsx/files/patch-ax new file mode 100644 index 000000000000..dbe75a724ce0 --- /dev/null +++ b/news/newsx/files/patch-ax @@ -0,0 +1,34 @@ +--- src/common.h.orig Sat Apr 17 09:11:26 1999 ++++ src/common.h Sun Feb 18 11:11:13 2001 +@@ -6,6 +6,9 @@ + * the GNU General Public License applies + * + * $Log: common.h,v $ ++ * Revision x.xx 2001/02/11 ++ * NNTP_PORT already defined in config.h from libinn.h (<thierry@thomas.as>) ++ * + * Revision 1.17 1999/04/17 07:11:26 src + * malloc.h inclusion + * +@@ -58,6 +61,10 @@ + #include <ctype.h> + #include <errno.h> + ++#ifndef __LIBINN_H__ ++# include "libinn.h" ++#endif ++ + #if STDC_HEADERS + # include <stdlib.h> + # include <string.h> +@@ -131,7 +138,9 @@ + char *hostport; /* port for NNTP server */ + char *pname; /* this program */ + char *spooldir; /* news spool */ +-#define NNTP_PORT "nntp" ++#ifndef NNTP_PORT ++ #define NNTP_PORT "nntp" ++#endif + + /* + * misc status diff --git a/news/newsx/files/patch-ay b/news/newsx/files/patch-ay new file mode 100644 index 000000000000..2fd44f14cce5 --- /dev/null +++ b/news/newsx/files/patch-ay @@ -0,0 +1,36 @@ +--- src/proto.h.orig Mon Apr 19 05:32:39 1999 ++++ src/proto.h Sun Feb 11 19:19:59 2001 +@@ -6,6 +6,9 @@ + * the GNU General Public License applies + * + * $Log: proto.h,v $ ++ * Revision x.xx 2001/02/11 ++ * Use xmalloc, xrealloc and wildmat from libinn.h (<thierry@thomas.as>) ++ * + * Revision 1.31 1999/04/19 03:32:39 src + * Standard profile in $PATHETC/newsx.conf + * +@@ -133,10 +136,12 @@ + text_time(time_t t); + char * + skipsp(char *p); ++/* See libinn.h + void * + xmalloc(unsigned int size); + void * + xrealloc(void *p,unsigned int size); ++*/ + char * + xstrcpy(const char *str); + +@@ -289,8 +294,10 @@ + progtitle2(char *what,char *more); + + /* wildmat.c */ ++/* from libinn.h + int + wildmat(char *text, char *p); ++*/ + + /* bounce.c */ + int diff --git a/news/newsx/files/patch-az b/news/newsx/files/patch-az new file mode 100644 index 000000000000..553da2ad0b89 --- /dev/null +++ b/news/newsx/files/patch-az @@ -0,0 +1,11 @@ +--- src/libinn.h.orig Mon Aug 21 08:14:43 2000 ++++ src/libinn.h Thu Feb 15 21:52:47 2001 +@@ -7,7 +7,7 @@ + + /* We've probably already included this; only include it if we need it. */ + #ifndef __CONFIG_H__ +-# include "config.h" ++# include "../lib/config.h" + #endif + + #include <stdio.h> diff --git a/news/newsx/files/patch-ba b/news/newsx/files/patch-ba new file mode 100644 index 000000000000..170508d152ed --- /dev/null +++ b/news/newsx/files/patch-ba @@ -0,0 +1,23 @@ +--- dbz/configdata.h.orig Sun Mar 7 16:41:31 1999 ++++ dbz/configdata.h Sun Feb 18 11:57:39 2001 +@@ -3,6 +3,9 @@ + * extracted from INN version 2.0 + * + * $Log: configdata.h,v $ ++ * Revision x.x 2001/02/18 <thierry@thomas.as> ++ * BOOL already defined (no more configdata.h in inn 2.3) ++ * + * Revision 1.7 1999/03/07 15:41:31 src + * Removed DBZ_VERSION from configuration + * +@@ -22,7 +25,9 @@ + #include "proto.h" + #include "../config.h" + +-typedef int BOOL; ++#ifndef __CONFIG_H__ ++ typedef int BOOL; ++#endif + #ifndef TRUE + #define TRUE 1 + #endif diff --git a/news/newsx/files/patch-bb b/news/newsx/files/patch-bb new file mode 100644 index 000000000000..afdc4abe77b9 --- /dev/null +++ b/news/newsx/files/patch-bb @@ -0,0 +1,22 @@ +--- src/sys.c.orig Sat Apr 24 20:13:31 1999 ++++ src/sys.c Sun Feb 18 13:39:54 2001 +@@ -6,6 +6,9 @@ + * the GNU General Public License applies + * + * $Log: sys.c,v $ ++ * Revision x.xx 2001/02/18 ++ * Use xmalloc and xrealloc from libinn.h (<thierry@thomas.as>) ++ * + * Revision 1.23 1999/04/24 18:13:31 src + * Allowing '@' in newsfeeds syntax, making a special case of it + * in the group list +@@ -96,7 +99,8 @@ + + n = sizeof(SYS_GRP) + strlen(group); + +- sp = xmalloc(n); ++/* xmalloc from libinn (<thierry@thomas.as>) */ ++ sp = xmalloc(n,"sys.c",101); + + /* fill in structure */ + sp->next = 0; diff --git a/news/newsx/files/patch-bc b/news/newsx/files/patch-bc new file mode 100644 index 000000000000..0a08f6cb8bf3 --- /dev/null +++ b/news/newsx/files/patch-bc @@ -0,0 +1,22 @@ +--- src/active.c.orig Tue Mar 16 09:12:46 1999 ++++ src/active.c Sun Feb 18 14:26:47 2001 +@@ -6,6 +6,9 @@ + * the GNU General Public License applies + * + * $Log: active.c,v $ ++ * Revision x.xx 2001/02/18 ++ * Use xmalloc and xrealloc from libinn.h (<thierry@thomas.as>) ++ * + * Revision 1.12 1999/03/16 08:12:46 src + * Moved clean_active() to active.c + * +@@ -82,7 +85,8 @@ + /* BUG: check if already? */ + n = sizeof(ACTIVE_GRP) + strlen(group); + +- ap = xmalloc(n); ++/* xmalloc from libinn (<thierry@thomas.as>) */ ++ ap = xmalloc(n,"active.c",89); + + /* add to list of active groups at that hashindex */ + ap->seen = 0; diff --git a/news/newsx/files/patch-bd b/news/newsx/files/patch-bd new file mode 100644 index 000000000000..d03bf6e2bf0c --- /dev/null +++ b/news/newsx/files/patch-bd @@ -0,0 +1,23 @@ +--- src/msgid.c.orig Sun Mar 7 15:58:18 1999 ++++ src/msgid.c Sun Feb 18 14:33:18 2001 +@@ -7,6 +7,9 @@ + * the GNU General Public License applies + * + * $Log: msgid.c,v $ ++ * Revision x.xx 2001/02/18 ++ * Use xmalloc and xrealloc from libinn.h (<thierry@thomas.as>) ++ * + * Revision 1.6 1999/03/07 14:58:18 src + * Read newsconfig supported. Storage API supported. + * +@@ -53,7 +56,9 @@ + + /* add to list */ + n = sizeof(MESSAGE_ID) + strlen(msgid); +- mp = xmalloc(n); ++ ++/* xmalloc from libinn (<thierry@thomas.as>) */ ++ mp = xmalloc(n,"msgid.c",61); + strcpy(mp->name,msgid); + mp->next = messageids[h]; + messageids[h] = mp; diff --git a/news/newsx/files/patch-be b/news/newsx/files/patch-be new file mode 100644 index 000000000000..a1195526e8a6 --- /dev/null +++ b/news/newsx/files/patch-be @@ -0,0 +1,42 @@ +--- src/split.c.orig Sun Apr 25 09:02:03 1999 ++++ src/split.c Sun Feb 18 14:43:14 2001 +@@ -6,6 +6,9 @@ + * the GNU General Public License applies + * + * $Log: split.c,v $ ++ * Revision x.xx 2001/02/18 ++ * Use xmalloc and xrealloc from libinn.h (<thierry@thomas.as>) ++ * + * Revision 1.1 1999/04/25 07:02:03 src + * Added to CVS, it was omitted by mistake + * +@@ -31,7 +34,8 @@ + char **argv; + int argc_max = 100; + +- argv = xmalloc(argc_max*sizeof(char *)); ++/* xmalloc from libinn (<thierry@thomas.as>) */ ++ argv = xmalloc(argc_max*sizeof(char *),"split.c",38); + + /* program name */ + argv[argc++] = pname; +@@ -46,7 +50,8 @@ + if (start) { + if (argc >= argc_max-3) { + argc_max += 100; +- argv = xrealloc(argv, argc_max*sizeof(char *)); ++/* xmalloc from libinn (<thierry@thomas.as>) */ ++ argv = xrealloc(argv, argc_max*sizeof(char *),"split.c",54); + } + argv[argc++] = start; + } +@@ -112,7 +117,8 @@ + exit_cleanup(8); + } + +- buf = xmalloc(size+1); ++/* xmalloc from libinn (<thierry@thomas.as>) */ ++ buf = xmalloc(size+1,"split.c",121); + buf[size] = '\0'; + + /* load local sys file */ diff --git a/news/newsx/files/patch-bf b/news/newsx/files/patch-bf new file mode 100644 index 000000000000..d7956200e572 --- /dev/null +++ b/news/newsx/files/patch-bf @@ -0,0 +1,22 @@ +--- src/path.c.orig Wed Mar 24 04:53:00 1999 ++++ src/path.c Sun Feb 18 14:56:26 2001 +@@ -6,6 +6,9 @@ + * the GNU General Public License applies + * + * $Log: path.c,v $ ++ * Revision x.xx 2001/02/18 ++ * Use xmalloc and xrealloc from libinn.h (<thierry@thomas.as>) ++ * + * Revision 1.3 1999/03/24 03:53:00 src + * Implemented "newsx" as magic exclude pattern + * +@@ -40,7 +43,8 @@ + + if (PATH_DEBUG) fprintf(stderr,"Add exclusion: %s\n",path); + +- e = xmalloc(sizeof(struct ex_s)); ++/* xmalloc from libinn (<thierry@thomas.as>) */ ++ e = xmalloc(sizeof(struct ex_s),"path.c",47); + e->e_next = exclusion; + e->e_name = xstrcpy(path); + exclusion = e; diff --git a/news/newsx/files/patch-bg b/news/newsx/files/patch-bg new file mode 100644 index 000000000000..314ffc707aa0 --- /dev/null +++ b/news/newsx/files/patch-bg @@ -0,0 +1,22 @@ +--- src/config.c.orig Mon Apr 19 05:32:38 1999 ++++ src/config.c Sun Feb 18 15:03:48 2001 +@@ -12,6 +12,9 @@ + * the GNU General Public License applies + * + * $Log: config.c,v $ ++ * Revision x.xx 2001/02/18 ++ * Use xmalloc and xrealloc from libinn.h (<thierry@thomas.as>) ++ * + * Revision 1.10 1999/04/19 03:32:38 src + * Standard profile in $PATHETC/newsx.conf + * +@@ -100,7 +103,8 @@ + /* BUG: check if already? */ + n = sizeof(CONFIG_S) + strlen(val); + +- cp = xmalloc(n); ++/* xmalloc from libinn (<thierry@thomas.as>) */ ++ cp = xmalloc(n,"config.c",107); + + /* add to list of config tags at that hashindex */ + strcpy(cp->name,tag); diff --git a/news/newsx/files/patch-bh b/news/newsx/files/patch-bh new file mode 100644 index 000000000000..41cb5c421049 --- /dev/null +++ b/news/newsx/files/patch-bh @@ -0,0 +1,10 @@ +--- test/Makefile.am.orig Mon Apr 5 21:01:56 1999 ++++ test/Makefile.am Fri Mar 2 23:01:01 2001 +@@ -37,5 +37,6 @@ + INCLUDES = -I../src + + LDADD = ../src/filter.o ../src/socket.o ../src/logmsg.o ../src/telnet.o \ +- ../src/title.o ../src/exec.o ../src/script.o ../src/util.o ++ ../src/title.o ../src/exec.o ../src/script.o ../src/util.o \ ++ -L/usr/local/news/lib -lstorage ../dbz/libdbzv3.a ../lib/libgetopt.a -linn -lstorage + diff --git a/news/newsx/files/patch-bi b/news/newsx/files/patch-bi new file mode 100644 index 000000000000..4bdab4b9c75d --- /dev/null +++ b/news/newsx/files/patch-bi @@ -0,0 +1,41 @@ +--- lib/config.h.orig Sun Nov 5 01:15:51 2000 ++++ lib/config.h Sun Mar 4 18:06:56 2001 +@@ -1,6 +1,7 @@ + /* include/config.h. Generated automatically by configure. */ + /* include/config.h.in. Generated automatically from configure.in by autoheader. */ + /* $Revision: 1.64.2.4 $ ++** + patch for newsx - some #ifndef <thierry@thomas.as> + ** + ** Here be configuration data used by various InterNetNews programs. This + ** file is used as source for the autoheader script, which from it and +@@ -103,7 +104,7 @@ + #define NNRP_LOADLIMIT 16 + + /* The standard NNTP port. */ +-#define NNTP_PORT 119 ++#define NNTP_PORT "nntp" + + /* What to use for a Path tail for local posts. */ + #define PATHMASTER "not-for-mail" +@@ -253,7 +254,9 @@ + #define NEWSMASTER "usenet" + + /* The umask used by all INN programs. */ +-#define NEWSUMASK 02 ++#ifndef NEWSUMASK ++ #define NEWSUMASK 02 ++#endif + + /* The username and group name that INN should run under. */ + #define NEWSUSER "news" +@@ -546,7 +549,9 @@ + size for some header parsing code. This is currently also used by innd + to determine whether to reject a message for an excessively long header; + this behavior should be fixed. */ +-#define MAXHEADERSIZE 1024 ++#ifndef MAXHEADERSIZE ++ #define MAXHEADERSIZE 1024 ++#endif + + /* Default buffer size for outgoing feeds from innd. */ + #define SITE_BUFFER_SIZE (16 * 1024) diff --git a/news/newsx/files/patch-bj b/news/newsx/files/patch-bj new file mode 100644 index 000000000000..ce0d978f432e --- /dev/null +++ b/news/newsx/files/patch-bj @@ -0,0 +1,23 @@ +--- src/news.h.orig Mon Apr 19 06:20:08 1999 ++++ src/news.h Sun Feb 18 21:53:09 2001 +@@ -8,6 +8,9 @@ + * NOTE: shouldn't normally need to change these + * + * $Log: news.h,v $ ++ * Revision x.x 2001/02/18 <thierry@thomas.as> ++ * Some ifndef. ++ * + * Revision 1.15 1999/04/19 04:20:08 src + * Profile for specific spool + * +@@ -46,7 +49,9 @@ + * length of a news header line + * not to be confused with NNTP_STRLEN + */ +-#define MAXHEADERSIZE 5120 ++#ifndef MAXHEADERSIZE ++ #define MAXHEADERSIZE 5120 ++#endif + + /* + * lock between newsxes accessing same host diff --git a/news/newsx/files/patch-bk b/news/newsx/files/patch-bk new file mode 100644 index 000000000000..c67b2fd43036 --- /dev/null +++ b/news/newsx/files/patch-bk @@ -0,0 +1,11 @@ +--- src/getarticle.c.orig Sun Apr 18 11:28:45 1999 ++++ src/getarticle.c Sat Mar 3 17:49:03 2001 +@@ -292,7 +292,7 @@ + if (a != where) { + if (a==0 && window <= 1) { + /* OK, we'll allow it - presumably a non-conforming server */ +- static told = 0; ++ static int told = 0; + if (!told) { + log_msg(L_INFO,"no article number in ARTICLE response: %s", + status); diff --git a/news/newsx/pkg-comment b/news/newsx/pkg-comment new file mode 100644 index 000000000000..f588ccc3a45a --- /dev/null +++ b/news/newsx/pkg-comment @@ -0,0 +1 @@ +A program to fetch news from and post news to a remote NNTP server diff --git a/news/newsx/pkg-descr b/news/newsx/pkg-descr new file mode 100644 index 000000000000..8fbbe0924d2c --- /dev/null +++ b/news/newsx/pkg-descr @@ -0,0 +1,18 @@ +Newsx is an NNTP client for Unix. It will connect to a remote NNTP +server and post outgoing articles batched by the news system, as well as +fetch incoming articles. + +It provides the NNTP capabilities required for small local news spools +on installations with NNTP access only through limited ISP accounts. It +works well via a dialup SLIP/PPP connection. + +Newsx is also well suited for large spools with normal feeds, being +used for pulling newsgroups from specific NNTP servers that are not +distributed in the usual manner. Since newsx obeys the normal news spool +configuration file and requires little or no specific configuration, the +administrative burden should be minimized. + +WWW: http://www.kvaleberg.com/newsx.html + +- Ben Smithurst + <ben@FreeBSD.org> diff --git a/news/newsx/pkg-plist b/news/newsx/pkg-plist new file mode 100644 index 000000000000..0c87f08f14c9 --- /dev/null +++ b/news/newsx/pkg-plist @@ -0,0 +1,3 @@ +bin/newsx +bin/newsq +bin/testfilter |