Upgrade to 2.3.0.

Note that unless you already have a /var/news or /var/spool/news directory,
the spool directory now defaults to /usr/local/news/spool.

4 files changed, 92 insertions, 36 deletions

diff --git a/news/inn/Makefile b/news/inn/Makefile
index 6d0df7b22bff..30294eefb6fa 100644
--- a/news/inn/Makefile
+++ b/news/inn/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	inn
-PORTVERSION=	2.2.2
+PORTVERSION=	2.3.0
 CATEGORIES=	news
 MASTER_SITES=	ftp://ftp.isc.org/isc/inn/
 
-MAINTAINER=	torstenb@FreeBSD.org
+MAINTAINER=	des@FreeBSD.org
 
 Y2K=		http://www.isc.org/inn-y2k.html
 
@@ -18,15 +18,16 @@ USE_GMAKE=YES
 
 .if exists(/var/news)
 INN_NEWSSPOOL?=/var/news
-.else
+.elif exists(/var/spool/news)
 INN_NEWSSPOOL?=/var/spool/news
+.else
+INN_NEWSSPOOL?=${PREFIX}/news/spool
 .endif
-INN_NEWSLIB?=${PREFIX}/news
 INN_NEWSLOG?=/var/log/news
 
 HAS_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--mandir=${PREFIX}/man
-CONFIGURE_ARGS+=	--prefix=${INN_NEWSLIB}
+CONFIGURE_ARGS+=	--prefix=${PREFIX}/news
 CONFIGURE_ARGS+=	--with-spool-dir=${INN_NEWSSPOOL}
 CONFIGURE_ARGS+=	--with-log-dir=${INN_NEWSLOG}
 CONFIGURE_ARGS+=	--with-perl
@@ -40,30 +41,45 @@ CONFIGURE_ARGS+=	--with-largefiles
 #CONFIGURE_ARGS+=	--enable-tagged-hash
 
 MAN1=	convdate.1 getlist.1 grephistory.1 inews.1 innconfval.1 innfeed.1 \
-	installit.1 nntpget.1 rnews.1 shlock.1 shrinkfile.1 simpleftp.1 \
-	startinnfeed.1 subst.1
+	nntpget.1 rnews.1 shlock.1 shrinkfile.1 simpleftp.1 startinnfeed.1
 MAN3=	clientlib.3 dbz.3 inndcomm.3 libinn.3 libstorage.3 parsedate.3 qio.3 \
 	wildmat.3
-MAN5=	active.5 control.ctl.5 cycbuff.conf.5 distrib.pats.5 expire.ctl.5 \
-	history.5 incoming.conf.5 inn.conf.5 innfeed.conf.5 innwatch.ctl.5 \
-	moderators.5 motd.news.5 newsfeeds.5 newslog.5 nnrp.access.5 \
-	nnrpd.track.5 nntpsend.ctl.5 overview.ctl.5 overview.fmt.5 \
-	passwd.nntp.5 storage.conf.5 storage.ctl.5
-MAN8=	actived.8 actsync.8 actsyncd.8 archive.8 batcher.8 buffchan.8 \
-	cnfsstat.8 controlchan.8 crosspost.8 ctlinnd.8 cvtbatch.8 expire.8 \
-	expireindex.8 expireover.8 expirerm.8 fastrm.8 filechan.8 inncheck.8 \
-	innd.8 inndf.8 innreport.8 innstat.8 innwatch.8 innxbatch.8 innxmit.8 \
-	mailpost.8 makeactive.8 makehistory.8 mod-active.8 \
-	news-recovery.8 news.daily.8 \
-	news2mail.8 newslog.8 newsrequeue.8 nnrpd.8 nntpsend.8 overchan.8 \
-	pgpverify.8 prunehistory.8 pullnews.8 scanlogs.8 send-uucp.8 sm.8 \
-	tally.control.8 tally.unwanted.8 writelog.8
+MAN5=	active.5 buffindexed.conf.5 control.ctl.5 cycbuff.conf.5 \
+	distrib.pats.5 expire.ctl.5 history.5 incoming.conf.5 inn.conf.5 \
+	innfeed.conf.5 innwatch.ctl.5 moderators.5 motd.news.5 newsfeeds.5 \
+	newslog.5 nnrp.access.5 nnrpd.track.5 nntpsend.ctl.5 ovdb.5 \
+	overview.fmt.5 passwd.nntp.5 readers.conf.5 sasl.conf.5 storage.conf.5
+MAN8=	actsync.8 actsyncd.8 archive.8 batcher.8 buffchan.8 cnfsheadconf.8 \
+	cnfsstat.8 controlchan.8 ctlinnd.8 cvtbatch.8 dbprocs.8 expire.8 \
+	expireover.8 expirerm.8 fastrm.8 filechan.8 inncheck.8 innd.8 inndf.8 \
+	inndstart.8 innreport.8 innstat.8 innwatch.8 innxbatch.8 innxmit.8 \
+	mailpost.8 makedbz.8 makehistory.8 mod-active.8 news.daily.8 \
+	news2mail.8 newsrequeue.8 nnrpd.8 nntpsend.8 ovdb_recover.8 \
+	ovdb_upgrade.8 overchan.8 pgpverify.8 prunehistory.8 pullnews.8 \
+	scanlogs.8 send-uucp.8 sm.8 tally.control.8 writelog.8
+
+EXTRA=	${WRKSRC}/HISTORY ${WRKSRC}/INSTALL ${WRKSRC}/LICENSE 
 
 pre-install:
-	${MKDIR} /var/spool/news
+	${MKDIR} ${INN_NEWSSPOOL}
 
 post-install:
-	${SED} <${FILESDIR}/innd.sh >${PREFIX}/etc/rc.d/innd.sh \
+	@(if [ ! -f ${PREFIX}/news/db/history ] ; then \
+	    echo 'Creating empty history database...' ; \
+	    cd ${PREFIX}/news/db ; \
+	    touch history ; \
+	    chmod 644 history ; \
+	    chown news:news history ; \
+	    ../bin/makedbz -i ; \
+	    for s in dir hash index ; do \
+		install -o news -g news -m 644 history.n.$${s} history.$${s} ; \
+	    done ; \
+	fi)
+	@${SED} <${FILESDIR}/innd.sh >${PREFIX}/etc/rc.d/innd.sh \
 		s+!!PREFIX!!+${PREFIX}+g && chmod +x ${PREFIX}/etc/rc.d/innd.sh
+	@${MKDIR} -p ${PREFIX}/share/doc/inn
+	@${INSTALL_DATA} ${EXTRA} ${PREFIX}/share/doc/inn
+	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.mk>
+
diff --git a/news/inn/distinfo b/news/inn/distinfo
index 5bd316f5994a..b75ea5725b6e 100644
--- a/news/inn/distinfo
+++ b/news/inn/distinfo
@@ -1 +1 @@
-MD5 (inn-2.2.2.tar.gz) = a4220c321aa35cb8c2da0186755fba23
+MD5 (inn-2.3.0.tar.gz) = 8be0e895c227eeccdcbd5cb1ea23f267
diff --git a/news/inn/files/innd.sh b/news/inn/files/innd.sh
index 48bf27abf86e..ebffb30f748f 100644
--- a/news/inn/files/innd.sh
+++ b/news/inn/files/innd.sh
@@ -1,9 +1,9 @@
 #!/bin/sh
 if [ $# -eq 0 -o x$1 = xstart ]; then
    if [ -x !!PREFIX!!/news/bin/rc.news -a -f !!PREFIX!!/news/db/history.dir ]; then
-      limits -C news !!PREFIX!!/news/bin/rc.news && echo ' inn'
+      su -fm news -c !!PREFIX!!/news/bin/rc.news && echo ' inn'
    fi
 fi
 if [ x$1 = xstop ]; then
-   !!PREFIX!!/news/bin/ctlinnd shutdown machine is going down
+      su -fm news -c !!PREFIX!!/news/bin/rc.news stop
 fi
diff --git a/news/inn/pkg-plist b/news/inn/pkg-plist
index 180b639a5138..88eff66b2dab 100644
--- a/news/inn/pkg-plist
+++ b/news/inn/pkg-plist
@@ -1,14 +1,16 @@
-@exec mkdir /var/spool/news
-@exec chown news:news /var/spool/news
-@exec chmod 0775 /var/spool/news
 etc/rc.d/innd.sh
-news/bin/actived
 news/bin/actmerge
 news/bin/actsync
 news/bin/actsyncd
 news/bin/archive
+news/bin/auth/passwd/ckpasswd
+news/bin/auth/passwd/pwcheck
+news/bin/auth/passwd/radius
+news/bin/auth/resolv/domain
+news/bin/auth/resolv/ident
 news/bin/batcher
 news/bin/buffchan
+news/bin/cnfsheadconf
 news/bin/cnfsstat
 news/bin/control/checkgroups
 news/bin/control/checkgroups.pl
@@ -30,19 +32,21 @@ news/bin/control/version.pl
 news/bin/controlbatch
 news/bin/controlchan
 news/bin/convdate
-news/bin/crosspost
 news/bin/ctlinnd
 news/bin/cvtbatch
+news/bin/dbprocs
 news/bin/expire
-news/bin/expireindex
 news/bin/expireover
 news/bin/expirerm
 news/bin/fastrm
 news/bin/filechan
+news/bin/filter/INN.py
 news/bin/filter/filter.tcl
 news/bin/filter/filter_innd.pl
+news/bin/filter/filter_innd.py
 news/bin/filter/filter_nnrpd.pl
 news/bin/filter/nnrpd_auth.pl
+news/bin/filter/nnrpd_auth.py
 news/bin/filter/startup.tcl
 news/bin/filter/startup_innd.pl
 news/bin/getlist
@@ -54,7 +58,6 @@ news/bin/innd
 news/bin/inndf
 news/bin/inndstart
 news/bin/innfeed
-news/bin/innfeed-convcfg
 news/bin/innmail
 news/bin/innreport
 news/bin/innstat
@@ -62,7 +65,7 @@ news/bin/innwatch
 news/bin/innxbatch
 news/bin/innxmit
 news/bin/mailpost
-news/bin/makeactive
+news/bin/makedbz
 news/bin/makehistory
 news/bin/mod-active
 news/bin/news.daily
@@ -71,6 +74,8 @@ news/bin/newsrequeue
 news/bin/nnrpd
 news/bin/nntpget
 news/bin/nntpsend
+news/bin/ovdb_recover
+news/bin/ovdb_upgrade
 news/bin/overchan
 news/bin/parsecontrol
 news/bin/pgpverify
@@ -92,13 +97,22 @@ news/bin/sendbatch
 news/bin/sendxbatches
 news/bin/shlock
 news/bin/shrinkfile
+news/bin/signcontrol
 news/bin/simpleftp
 news/bin/sm
 news/bin/startinnfeed
 news/bin/tally.control
 news/bin/writelog
+news/db/active
+news/db/active.times
+news/db/history
+news/db/history.dir
+news/db/history.hash
+news/db/history.index
+news/db/newsgroups
 news/etc/actsync.cfg
 news/etc/actsync.ign
+news/etc/buffindexed.conf
 news/etc/control.ctl
 news/etc/cycbuff.conf
 news/etc/distrib.pats
@@ -112,12 +126,14 @@ news/etc/moderators
 news/etc/motd.news
 news/etc/news2mail.cf
 news/etc/newsfeeds
-news/etc/nnrp.access
 news/etc/nnrpd.track
 news/etc/nntpsend.ctl
-news/etc/overview.ctl
+news/etc/ovdb.conf
 news/etc/overview.fmt
 news/etc/passwd.nntp
+news/etc/radius.conf
+news/etc/readers.conf
+news/etc/sasl.conf
 news/etc/storage.conf
 news/lib/docheckgroups
 news/lib/innreport_inn.pm
@@ -126,3 +142,27 @@ news/lib/innshellvars.pl
 news/lib/innshellvars.tcl
 news/lib/libinn.a
 news/lib/libstorage.a
+share/doc/inn/HISTORY
+share/doc/inn/INSTALL
+share/doc/inn/LICENSE
+@dirrm share/doc/inn
+@dirrm news/spool/tmp
+@dirrm news/spool/overview
+@dirrm news/spool/outgoing
+@dirrm news/spool/innfeed
+@dirrm news/spool/incoming
+@dirrm news/spool/articles
+@dirrm news/spool/archive
+@dirrm news/spool
+@dirrm news/run
+@dirrm news/lib
+@dirrm news/etc
+@dirrm news/db
+@dirrm news/bin/rnews.libexec
+@dirrm news/bin/filter
+@dirrm news/bin/control
+@dirrm news/bin/auth/resolv
+@dirrm news/bin/auth/passwd
+@dirrm news/bin/auth
+@dirrm news/bin
+@dirrm news