diff options
author | Matthew Hunt <mph@FreeBSD.org> | 1998-12-28 23:19:54 +0000 |
---|---|---|
committer | Matthew Hunt <mph@FreeBSD.org> | 1998-12-28 23:19:54 +0000 |
commit | 5ac223b556df7617d85b10340ea2a2a135303310 (patch) | |
tree | e1c3257b7926101015483b9243725b45d3282454 /news/leafnode+ | |
parent | Upgrade to 4.0.79. (diff) |
Upgrade to 2.3.
PR: 9208
Submitted by: Tom Hukins <tom@eborcom.com>
Notes
Notes:
svn path=/head/; revision=15692
Diffstat (limited to 'news/leafnode+')
-rw-r--r-- | news/leafnode+/Makefile | 14 | ||||
-rw-r--r-- | news/leafnode+/distinfo | 2 | ||||
-rw-r--r-- | news/leafnode+/files/patch-aa | 22 | ||||
-rw-r--r-- | news/leafnode+/files/patch-ab | 348 | ||||
-rw-r--r-- | news/leafnode+/pkg-comment | 2 | ||||
-rw-r--r-- | news/leafnode+/pkg-plist | 6 | ||||
-rw-r--r-- | news/leafnode+/pkg-plist.nodocs | 6 |
7 files changed, 43 insertions, 357 deletions
diff --git a/news/leafnode+/Makefile b/news/leafnode+/Makefile index f1733b46a666..a8179f8fdbc2 100644 --- a/news/leafnode+/Makefile +++ b/news/leafnode+/Makefile @@ -1,18 +1,18 @@ # New ports collection makefile for: leafnode+ -# Version required: 0.9.8a +# Version required: 2.3 # Date created: 19 November 1998 # Whom: Tom Hukins <tom@eborcom.com> # # $Id$ # -DISTNAME= leafnode+-1.2 +DISTNAME= leafnode+-2.3 CATEGORIES= news MASTER_SITES= ftp://ftp.big.or.jp/pub/usr2/jam/leafnode/ MAINTAINER= tom@eborcom.com -MAN8= checkgroups.8 fetch-news.8 leafnode.8 texpire.8 +MAN8= checkgroups.8 fetchnews.8 leafnode.8 texpire.8 .if defined(NOPORTDOCS) PLIST= ${PKGDIR}/PLIST.nodocs @@ -25,11 +25,10 @@ post-patch: .endfor do-install: - @${CP} ${WRKSRC}/fetch.8 ${WRKSRC}/fetch-news.8 -.for file in leafnode fetch-news texpire checkgroups leaftool +.for file in leafnode fetchnews texpire checkgroups leaftool @${INSTALL_PROGRAM} ${WRKSRC}/${file} ${PREFIX}/sbin .endfor -.for file in checkgroups.8 fetch-news.8 leafnode.8 texpire.8 +.for file in checkgroups.8 fetchnews.8 leafnode.8 texpire.8 @${INSTALL_MAN} ${WRKSRC}/${file} ${PREFIX}/man/man8 .endfor .if !defined{NOPORTDOCS} @@ -40,4 +39,7 @@ do-install: .endfor .endif +post-install: + @test -d /var/spool/news || @${CAT} ${FILESDIR}/INSTALL.mesg + .include <bsd.port.mk> diff --git a/news/leafnode+/distinfo b/news/leafnode+/distinfo index 2a741d8cc0a2..af920aa8226f 100644 --- a/news/leafnode+/distinfo +++ b/news/leafnode+/distinfo @@ -1 +1 @@ -MD5 (leafnode+-1.2.tar.gz) = 4b0800a50e40a91ce65295b4291f5e7d +MD5 (leafnode+-2.3.tar.gz) = b6c27866f888c8f916689a640bdd3733 diff --git a/news/leafnode+/files/patch-aa b/news/leafnode+/files/patch-aa index 8d639777b80f..96e37a2528c2 100644 --- a/news/leafnode+/files/patch-aa +++ b/news/leafnode+/files/patch-aa @@ -1,5 +1,5 @@ ---- Makefile.orig Tue Nov 10 03:50:23 1998 -+++ Makefile Thu Nov 19 19:49:05 1998 +--- Makefile.orig Thu Dec 24 01:41:37 1998 ++++ Makefile Sun Dec 27 17:04:30 1998 @@ -1,11 +1,8 @@ # -*- makefile -*- # $Orig-Id: Makefile,v 1.16 1997/07/20 00:28:31 agulbra Exp $ @@ -10,29 +10,19 @@ -BINDIR = /usr/local/sbin -MANDIR = /usr/local/man +BINDIR = $(PREFIX)/sbin - VERSION = 1.2 + VERSION = 2.3 # # if you want to use Socks, use following -@@ -27,14 +24,14 @@ +@@ -27,7 +24,7 @@ # # this is the directory where the configuration and group information is # kept. It should preferably not be on the same partition as spooldir -LIBDIR = /usr/lib/leafnode +LIBDIR = $(PREFIX)/lib/leafnode --all: nntpd fetch texpire checkgroups leaftool -+all: leafnode fetch-news texpire checkgroups leaftool + all: leafnode fetchnews texpire checkgroups leaftool --nntpd: nntpd.o util.o config.o -+leafnode: nntpd.o util.o config.o - $(CC) -g -o $@ nntpd.o util.o config.o $(LIBS) - --fetch: fetch.o util.o config.o -+fetch-news: fetch.o util.o config.o - $(CC) -o $@ fetch.o util.o config.o $(LIBS) - - texpire: texpire.o util.o config.o -@@ -90,7 +87,6 @@ +@@ -91,7 +88,6 @@ $${a}$${b}6 $${a}$${b}7 $${a}$${b}8 \ $${a}$${b}9 ; \ done ; done diff --git a/news/leafnode+/files/patch-ab b/news/leafnode+/files/patch-ab index ab501d72c6d4..b53c4658a7bb 100644 --- a/news/leafnode+/files/patch-ab +++ b/news/leafnode+/files/patch-ab @@ -1,28 +1,5 @@ ---- Changes.orig Tue Nov 10 03:50:24 1998 -+++ Changes Thu Nov 19 20:58:17 1998 -@@ -45,14 +45,14 @@ - this option. - - Add "maxold", "maxlines" and "maxgroups" configuration - values to filter some hated news artcles. "maxold" -- specifies the maximum dates of articles fetch should -+ specifies the maximum dates of articles fetch-news should - fetch from the upstream server in each group. "maxlines" -- specifies the maximum number of lines of articles fetch -- should do so. "maxgroups" specifies the maximum number -- of cross-posted news groups of articles fetch should do -- so. See leafnode.8 also. -+ specifies the maximum number of lines of articles fetch-news -+ should get. "maxgroups" specifies the maximum number -+ of cross-posted news groups of articles fetch-news should -+ get. See leafnode.8 also. - - Change to use asynchronous transmission for looking for -- new articles in news groups. It makes fetch faster. -+ new articles in news groups. It makes fetch-news faster. - - Remove a chdirgroup call from getgroups(). I guess it - is a reason of saving an article to wrong news groups. - - Add preconnect and viahost ability to use SSH. ---- FAQ.orig Tue Nov 10 03:50:24 1998 -+++ FAQ Thu Nov 19 20:49:08 1998 +--- FAQ.orig Sun Dec 6 19:37:53 1998 ++++ FAQ Wed Dec 9 17:36:30 1998 @@ -21,17 +21,17 @@ 3. How do I configure Leafnode+? @@ -55,8 +32,8 @@ ---- INSTALL.orig Tue Nov 10 03:50:24 1998 -+++ INSTALL Thu Nov 19 21:08:41 1998 +--- INSTALL.orig Sun Dec 6 19:37:53 1998 ++++ INSTALL Wed Dec 9 17:34:49 1998 @@ -7,7 +7,8 @@ 3. make installall @@ -67,7 +44,7 @@ (generally, your IP provider's). Make sure $NNTPSERVER or /etc/nntpserver points to your own host so clients will talk to leafnode rather than try to go to the upstream server. -@@ -15,31 +16,31 @@ +@@ -15,25 +16,24 @@ 4. Set up a cron job (as user "news") to run texpire every night or maybe every week. Here is my crontab line, which runs nightly: @@ -82,12 +59,11 @@ tells cron to run texpire at 4am Monday morning. --5. Make sure fetch is run at the appropriate time. If you have a -+5. Make sure fetch-news is run at the appropriate time. If you have a + 5. Make sure fetchnews is run at the appropriate time. If you have a full-time link, run it out of cron (as "news" again), if not, run it when your connection to the net is established. If it is run as -- root, it will change user to "news". I use PPP, and run fetch from -- /etc/ppp/ip-up. +- root, it will change user to "news". I use PPP, and run fetchnews +- from /etc/ppp/ip-up. + root, it will change user to "news". -6. Edit /etc/inetd.conf so $(BINDIR)/leafnode is executed for incoming @@ -100,157 +76,9 @@ This starts leafnode for all connections on the nntp port. --7. Run fetch, then read news using an NNTP client (with $NNTPSERVER or -- /etc/nntpserver pointing to your own host), then run fetch again. -- The second run of fetch should pick up all the groups you read. -+7. Run fetch-news, then read news using an NNTP client (with $NNTPSERVER -+ or /etc/nntpserver pointing to your own host), then run fetch-news -+ again. The second run of fetch-news should pick up all the groups you -+ read. - - Arnt Gulbrandsen <agulbra@troll.no> - Modified by Kazushi (Jam) Marukawa <jam@pobox.com> ---- README.orig Tue Nov 10 03:50:24 1998 -+++ README Thu Nov 19 21:07:08 1998 -@@ -8,7 +8,7 @@ - - Leafnode is the NNTP server. It talks to the normal news clients, - and stores readership data. - -- - Fetch is the NNTP news-gatherer. It looks at the readership data -+ - Fetch-news is the NNTP news-gatherer. It looks at the readership data - Leafnode stores, and selects what groups to pull news from. - - - Texpire is responsible for deleting old and uninteresting news. It -@@ -16,8 +16,8 @@ - - Only groups that someone has been reading in the past week are fetched - from the upstream NNTP server. When someone stops reading a group, --fetch will stop reading that group a week later, and when someone --starts reading a group, fetch will grab all the articles it can in -+fetch-news will stop reading that group a week later, and when someone -+starts reading a group, fetch-news will grab all the articles it can in - that group the next time it runs. - - Here are Leafnode's distinguishing features: -@@ -52,8 +52,8 @@ - information file, and any more long-lived supporting files that may be - added in the future. - --The binaries directory, /usr/local/sbin by default, contains the three --executable programs, texpire, fetch and leafnode. -+The binaries directory, !!PREFIX!!/sbin, contains the three -+executable programs, texpire, fetch-news and leafnode. - - - TIPS & TRICKS! ---- fetch.8.orig Tue Nov 10 03:50:24 1998 -+++ fetch.8 Thu Nov 19 21:01:21 1998 -@@ -10,10 +10,10 @@ - .\" - .\" hilit19 is stupid: " - .SH NAME --fetch \- fetch news via NNTP -+fetch-news \- fetch news via NNTP - - .SH SYNOPSIS --.B fetch [-v] [-x number] [-n] [-s [suck-file]] -+.B fetch-news [-v] [-x number] [-n] [-s [suck-file]] - - .SH DESCRIPTION - .B Leafnode -@@ -26,7 +26,7 @@ - is intended to self-repair after problems, and to require no - manual maintenance. - .PP --.B Fetch -+.B Fetch-news - is the program which submits and retrieves new articles to or from the - upstream NNTP server. - -@@ -46,9 +46,9 @@ - .TP - .I -n - Write server's information file after fetching from each group, --rather than updating it when fetch has finished with that server. -+rather than updating it when fetch-news has finished with that server. - It helps you if you are using unstable connection and get problems --of sudden disconnection. But probably current fetch doesn't need -+of sudden disconnection. But probably current fetch-news doesn't need - this option because codes are changed to check sudden disconnection. - .TP - .I "-s [suck-file]" -@@ -58,11 +58,11 @@ - See - .BR leafnode (8) - for the list of files affected, and for information on configuring --.B fetch. -+.B fetch-news. - - .SH ALGORITHM - Here is a brief description of what --.B fetch -+.B fetch-news - does. - .PP - First, after connecting to the upstream NNTP server, -@@ -81,18 +81,18 @@ - (this step is most often optimized away). - .PP - Third, --.B fetch -+.B fetch-news - iterates over the list of newsgroups, performing a GROUP, an XOVER - and a number of ARTICLE commands for each group which has - been read during the past week. - - .SH NOTES --.B Fetch -+.B Fetch-news - does not use NEWNEWS or XHDR. NEWNEWS is not used because it is - often very expensive, XHDR is not used because its - implementation of some nntpds is slower than XOVER. --.B Fetch --use XOVER. XOVER is used because to get informations in the -+.B Fetch-news -+uses XOVER. XOVER is used because to get informations in the - article headers which are used to filter news articles. - .PP - After some experiments, I decided that it was better to fetch all the -@@ -102,27 +102,27 @@ - is not intended to be all things to all men, and I have sacrificed the - ability to read news from several upstream servers. - .PP --.B Fetch -+.B Fetch-news - happens to support local groups, even though the rest of - .B leafnode - doesn't. - .PP - The only way to control what newsgroups are accessible to local users - is to control what the upstream server lets --.B fetch -+.B fetch-news - read, and that will not keep out all crossposts (endemic in e.g. the - alt.sex groups). If your site is big enough that you need to control - newsgroup access, consider using a news server which is designed for a - big site. - .PP --.B Fetch -+.B Fetch-news - sets its real and effective uid to "news", because almost all of the - problems I have had with - .B leafnode - are due to files which aren't writable for user news. - - .SH BUGS --.B Fetch -+.B Fetch-news - ignores the "Also-Cancel" headers. This needs to be - fixed, or news.answers will suffer. - .PP ---- leafnode.8.orig Tue Nov 10 03:50:24 1998 -+++ leafnode.8 Thu Nov 19 20:56:15 1998 -@@ -74,18 +74,18 @@ +--- leafnode.8.orig Sun Dec 6 19:37:53 1998 ++++ leafnode.8 Wed Dec 9 17:41:40 1998 +@@ -74,23 +74,23 @@ .I must be writable by user "news". .PP @@ -258,47 +86,27 @@ +.I !!PREFIX!!/lib/leafnode/groupinfo contains the information about each USENET group. In case of harm, it is rebuilt by --.BR fetch (8). -+.BR fetch-news (8). + .BR fetchnews (8). .PP -.I /usr/lib/leafnode/news-server-name +.I !!PREFIX!!/lib/leafnode/news-server-name - contains the information about each USENET group on each news server. + contains the information about every USENET group on each news server. In case of harm, it is rebuilt by --.BR fetch (8). -+.BR fetch-news (8). + .BR fetchnews (8). + .PP +-.I /usr/lib/leafnode/news-server-name.active ++.I !!PREFIX!!/lib/leafnode/news-server-name.active + is an empty file created when + .BR fetchnews (8) + get information about every USENET group on each news server. .PP -.I /usr/lib/leafnode/config +.I !!PREFIX!!/lib/leafnode/config contains the configuration parameters for .B leafnode. See CONFIGURATION below. -@@ -106,12 +106,12 @@ - .PP - .I /var/spool/news/out.going - contains local postings that --.BR fetch (8) -+.BR fetch-news (8) - is to pass to the upstream NNTP server. - .PP - .I /var/spool/news/failed.postings - contains local postings that the upstream server rejected. --.BR fetch (8) -+.BR fetch-news (8) - will create files in this directory, but none of the - .B leafnode - programs will delete anything in it. -@@ -130,7 +130,7 @@ - will touch the the relevant file when a LISTGROUP, XOVER, XHDR, STAT, - HEAD, BODY or ARTICLE command is issued immediately after a GROUP - command is issued, and --.BR fetch (8) -+.BR fetch-news (8) - will retrieve all new articles in all groups whose files have been - either - .IP -@@ -147,7 +147,7 @@ +@@ -152,7 +152,7 @@ .SH CONFIGURATION All configuration is done using the file @@ -307,117 +115,3 @@ There is no GUI configuration tool yet. .PP The file is in the common UNIX format: One line per argument, white -@@ -197,31 +197,31 @@ - .in -5 - .PP - "server" is used by --.BR fetch (8) -+.BR fetch-news (8) - to select what NNTP server to retrieve news from. You can - specify several servers. And you can add and decrease servers. - But at least one "server" is required. - .PP - "port" is used by --.BR fetch (8) -+.BR fetch-news (8) - to choose a port number to connect to the NNTP server. - .PP - "username" and "password" are used by --.BR fetch (8) -+.BR fetch-news (8) - to choose a user name and password to be authorized a - NNTP connection by the NNTP server. - .PP - "newsgroups" entries are used by --.BR fetch (8) -+.BR fetch-news (8) - to choose news groups which are feeded by the NNTP server. - .PP - "viahost" is used by --.BR fetch (8) -+.BR fetch-news (8) - to choose a host to connect to the NNTP server. It is useful - to use ssh forwading ability. - .PP - "preconnect" is executed by --.BR fetch (8) -+.BR fetch-news (8) - before making a connection to the NNTP server. It is used - for using ssh forwading ability. Note: you shouldn't break - a line in the string. You have to write as same as what you -@@ -238,7 +238,7 @@ - This parameter is mandatory. - .PP - "maxfetch" specifies the maximum number of articles --.BR fetch (8) -+.BR fetch-news (8) - should fetch from the upstream server in each group. This limits the - size of the backlog a reader of a group will see when first - subscribing. By default there is no limit, so a new reader will see -@@ -251,26 +251,26 @@ - initialfetch=3000 #again, don't use much space - .PP - "initialfetch" specifies the maximum number of articles --.BR fetch (8) -+.BR fetch-news (8) - should fetch from the upstream server in each group at the first - connection to the server. By default there is no limit, so a - new reader will see all of the available postings. - .PP - "maxold" specifies the maximum dates of articles --.BR fetch (8) -+.BR fetch-news (8) - should fetch from the upstream server in each group. - By default there is 10 days limit, so a new reader will - see only new postings. - .PP - "maxlines" specifies the maximum number of lines of articles --.BR fetch (8) -+.BR fetch-news (8) - should fetch from the upstream server in each group. - By default there is no limit, so a new reader will - see all of the available postings. - .PP - "maxgroups" specifies the maximum number of cross-posted - news groups of articles --.BR fetch (8) -+.BR fetch-news (8) - should fetch from the upstream server in each group. - By default there is no limit, so a new reader will - see all of the available postings. -@@ -302,7 +302,7 @@ - .TP - .B IHAVE - Known but rejected. See --.BR fetch (8). -+.BR fetch-news (8). - .TP - .B LAST - Moves the article pointer back by 1. -@@ -331,7 +331,7 @@ - .B POST - Post a new article. Only scant syntax checking is performed. The - article is sent to the upstream NNTP server by --.BR fetch (8). -+.BR fetch-news (8). - .TP - .B QUIT - Quit reading news. -@@ -376,7 +376,7 @@ - .SH SEE ALSO - .BR tcpd (8), - .BR hosts.allow (5), --.BR fetch (8), -+.BR fetch-news (8), - .BR texpire (8), - .BR checkgroups (8), - .B "RFC 977" ---- texpire.8.orig Tue Nov 10 03:50:24 1998 -+++ texpire.8 Thu Nov 19 20:54:48 1998 -@@ -67,5 +67,5 @@ - .BR tcpd (8), - .BR hosts.allow (5), - .BR leafnode (8), --.BR fetch (8), -+.BR fetch-news (8), - .B "RFC 977" diff --git a/news/leafnode+/pkg-comment b/news/leafnode+/pkg-comment index 2d56f7ef5a67..c44486897600 100644 --- a/news/leafnode+/pkg-comment +++ b/news/leafnode+/pkg-comment @@ -1 +1 @@ -A multi-user offline news package for small sites. +Leafnode+ is a multi-user offline news package for small sites. diff --git a/news/leafnode+/pkg-plist b/news/leafnode+/pkg-plist index 47c463c4d388..65d87c670a6f 100644 --- a/news/leafnode+/pkg-plist +++ b/news/leafnode+/pkg-plist @@ -1,8 +1,8 @@ -sbin/checkgroups -sbin/fetch-news sbin/leafnode -sbin/leaftool +sbin/fetchnews sbin/texpire +sbin/checkgroups +sbin/leaftool share/doc/leafnode+/Changes share/doc/leafnode+/FAQ share/doc/leafnode+/INSTALL diff --git a/news/leafnode+/pkg-plist.nodocs b/news/leafnode+/pkg-plist.nodocs index 2e1d6f79280b..5ad718af4cfd 100644 --- a/news/leafnode+/pkg-plist.nodocs +++ b/news/leafnode+/pkg-plist.nodocs @@ -1,5 +1,5 @@ -sbin/checkgroups -sbin/fetch-news sbin/leafnode -sbin/leaftool +sbin/fetchnews sbin/texpire +sbin/checkgroups +sbin/leaftool |