8 files changed, 20 insertions, 10 deletions

diff --git a/news/inn-current/Makefile b/news/inn-current/Makefile
index 90bc0c8f54bc..c939a658530b 100644
--- a/news/inn-current/Makefile
+++ b/news/inn-current/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	inn
-PORTVERSION=	2.3.0
+PORTVERSION=	2.3.1
 CATEGORIES=	news
 MASTER_SITES=	ftp://ftp.isc.org/isc/inn/
 
@@ -38,8 +38,9 @@ CONFIGURE_ARGS+=	--with-largefiles
 # is somewhat slower
 #CONFIGURE_ARGS+=	--enable-tagged-hash
 
-MAN1=	convdate.1 getlist.1 grephistory.1 inews.1 innconfval.1 innfeed.1 \
-	nntpget.1 rnews.1 shlock.1 shrinkfile.1 simpleftp.1 startinnfeed.1
+MAN1=	ckpasswd.1 convdate.1 getlist.1 grephistory.1 inews.1 innconfval.1 \
+	innfeed.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 buffindexed.conf.5 control.ctl.5 cycbuff.conf.5 \
@@ -62,6 +63,8 @@ pre-install:
 	${MKDIR} ${INN_NEWSSPOOL}
 
 post-install:
+	@${CHOWN} root:news ${PREFIX}/news/bin/auth/passwd/ckpasswd
+	@${CHMOD} 4755 ${PREFIX}/news/bin/auth/passwd/ckpasswd
 	@(if [ ! -f ${PREFIX}/news/db/history ] ; then \
 	    ${ECHO} 'Creating empty history database...' ; \
 	    cd ${PREFIX}/news/db ; \
diff --git a/news/inn-current/distinfo b/news/inn-current/distinfo
index b75ea5725b6e..da8c1381da47 100644
--- a/news/inn-current/distinfo
+++ b/news/inn-current/distinfo
@@ -1 +1 @@
-MD5 (inn-2.3.0.tar.gz) = 8be0e895c227eeccdcbd5cb1ea23f267
+MD5 (inn-2.3.1.tar.gz) = 2032f076fb18f5fa87c8b763e83fbdd4
diff --git a/news/inn-current/pkg-install b/news/inn-current/pkg-install
index a44c3c526e73..7732199e100c 100644
--- a/news/inn-current/pkg-install
+++ b/news/inn-current/pkg-install
@@ -6,13 +6,14 @@ case $2 in
     PRE-INSTALL)
 	;;
     POST-INSTALL)
-	NEWSBASE=${PREFIX:-/usr/local}/news
+	NEWSBASE=${PKG_PREFIX:-/usr/local}/news
         install -d -o news -g news -m 755 \
 	    ${NEWSBASE}/run \
 	    ${NEWSBASE}/spool \
 	    ${NEWSBASE}/spool/archive \
 	    ${NEWSBASE}/spool/articles \
 	    ${NEWSBASE}/spool/incoming \
+	    ${NEWSBASE}/spool/incoming/bad \
 	    ${NEWSBASE}/spool/innfeed \
 	    ${NEWSBASE}/spool/outgoing \
 	    ${NEWSBASE}/spool/overview \
diff --git a/news/inn-current/pkg-plist b/news/inn-current/pkg-plist
index 88eff66b2dab..94c33da99e15 100644
--- a/news/inn-current/pkg-plist
+++ b/news/inn-current/pkg-plist
@@ -150,6 +150,7 @@ share/doc/inn/LICENSE
 @dirrm news/spool/overview
 @dirrm news/spool/outgoing
 @dirrm news/spool/innfeed
+@dirrm news/spool/incoming/bad
 @dirrm news/spool/incoming
 @dirrm news/spool/articles
 @dirrm news/spool/archive
diff --git a/news/inn/Makefile b/news/inn/Makefile
index 90bc0c8f54bc..c939a658530b 100644
--- a/news/inn/Makefile
+++ b/news/inn/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	inn
-PORTVERSION=	2.3.0
+PORTVERSION=	2.3.1
 CATEGORIES=	news
 MASTER_SITES=	ftp://ftp.isc.org/isc/inn/
 
@@ -38,8 +38,9 @@ CONFIGURE_ARGS+=	--with-largefiles
 # is somewhat slower
 #CONFIGURE_ARGS+=	--enable-tagged-hash
 
-MAN1=	convdate.1 getlist.1 grephistory.1 inews.1 innconfval.1 innfeed.1 \
-	nntpget.1 rnews.1 shlock.1 shrinkfile.1 simpleftp.1 startinnfeed.1
+MAN1=	ckpasswd.1 convdate.1 getlist.1 grephistory.1 inews.1 innconfval.1 \
+	innfeed.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 buffindexed.conf.5 control.ctl.5 cycbuff.conf.5 \
@@ -62,6 +63,8 @@ pre-install:
 	${MKDIR} ${INN_NEWSSPOOL}
 
 post-install:
+	@${CHOWN} root:news ${PREFIX}/news/bin/auth/passwd/ckpasswd
+	@${CHMOD} 4755 ${PREFIX}/news/bin/auth/passwd/ckpasswd
 	@(if [ ! -f ${PREFIX}/news/db/history ] ; then \
 	    ${ECHO} 'Creating empty history database...' ; \
 	    cd ${PREFIX}/news/db ; \
diff --git a/news/inn/distinfo b/news/inn/distinfo
index b75ea5725b6e..da8c1381da47 100644
--- a/news/inn/distinfo
+++ b/news/inn/distinfo
@@ -1 +1 @@
-MD5 (inn-2.3.0.tar.gz) = 8be0e895c227eeccdcbd5cb1ea23f267
+MD5 (inn-2.3.1.tar.gz) = 2032f076fb18f5fa87c8b763e83fbdd4
diff --git a/news/inn/pkg-install b/news/inn/pkg-install
index a44c3c526e73..7732199e100c 100644
--- a/news/inn/pkg-install
+++ b/news/inn/pkg-install
@@ -6,13 +6,14 @@ case $2 in
     PRE-INSTALL)
 	;;
     POST-INSTALL)
-	NEWSBASE=${PREFIX:-/usr/local}/news
+	NEWSBASE=${PKG_PREFIX:-/usr/local}/news
         install -d -o news -g news -m 755 \
 	    ${NEWSBASE}/run \
 	    ${NEWSBASE}/spool \
 	    ${NEWSBASE}/spool/archive \
 	    ${NEWSBASE}/spool/articles \
 	    ${NEWSBASE}/spool/incoming \
+	    ${NEWSBASE}/spool/incoming/bad \
 	    ${NEWSBASE}/spool/innfeed \
 	    ${NEWSBASE}/spool/outgoing \
 	    ${NEWSBASE}/spool/overview \
diff --git a/news/inn/pkg-plist b/news/inn/pkg-plist
index 88eff66b2dab..94c33da99e15 100644
--- a/news/inn/pkg-plist
+++ b/news/inn/pkg-plist
@@ -150,6 +150,7 @@ share/doc/inn/LICENSE
 @dirrm news/spool/overview
 @dirrm news/spool/outgoing
 @dirrm news/spool/innfeed
+@dirrm news/spool/incoming/bad
 @dirrm news/spool/incoming
 @dirrm news/spool/articles
 @dirrm news/spool/archive