- upgrade to 1.7.2

- install $PREFIX/etc/rc.d/innd.sh (start and stop)
- change group of $PREFIX/bin/rnews from uucp to dialer to work around
  a problem when using inn with uucp (rnews is not world-executable to prevent
  injection of faked articles)
- don't install binaries in $PREFIX/etc
- use /var/{spool,}/news/tmp instead of /var/tmp for rnews, otherwise
  rename will fail

12 files changed, 78 insertions, 21 deletions

diff --git a/news/inn-current/Makefile b/news/inn-current/Makefile
index 0fb0cf3277f7..11b0cc5e9f49 100644
--- a/news/inn-current/Makefile
+++ b/news/inn-current/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	inn
-# Version required:	1.5.1
+# Version required:	1.7.2
 # Date created:		20 Oct 1994 (1.4), 18 Dec 1996 (1.5.1)
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.23 1997/05/29 06:38:42 charnier Exp $
+# $Id: Makefile,v 1.24 1997/09/15 20:11:44 torstenb Exp $
 #
 
-DISTNAME=	inn-1.5.1sec2
+DISTNAME=	inn-1.7.2
 CATEGORIES=	news
 MASTER_SITES=	ftp://ftp.isc.org/isc/inn/
 
@@ -43,6 +43,8 @@ pre-configure:
 
 pre-install:
 	${MKDIR} ${PREFIX}/news
+	${MKDIR} -m 0755 ${PREFIX}/news/sbin && \
+		chown news.news ${PREFIX}/news/sbin
 
 update: build
 	@(cd ${WRKSRC} ; ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} update)
@@ -56,12 +58,18 @@ post-install:
 	if [ -d /var/spool/news ] && [ ! -d /var/news ]; then \
 		${MKDIR} -m 0775 /var/spool/news/over.view; \
 		chown news.news /var/spool/news/over.view; \
+		${MKDIR} -m 0775 /var/spool/news/tmp; \
+		chown news.news /var/spool/news/tmp; \
 	else \
 		${MKDIR} -m 0775 /var/news/over.view; \
 		chown news.news /var/news/over.view; \
+		${MKDIR} -m 0775 /var/news/tmp; \
+		chown news.news /var/news/tmp; \
 	fi
 	${MKDIR} ${PREFIX}/news/locks
 	chown news.news ${PREFIX}/news/locks
 	chmod 0755 ${PREFIX}/news/locks
+	sed <${FILESDIR}/innd.sh >${PREFIX}/etc/rc.d/innd.sh \
+		s+!!PREFIX!!+${PREFIX}+g && chmod +x ${PREFIX}/etc/rc.d/innd.sh
 
 .include <bsd.port.mk>
diff --git a/news/inn-current/distinfo b/news/inn-current/distinfo
index 23f1e2b0d913..af3e7e0ff049 100644
--- a/news/inn-current/distinfo
+++ b/news/inn-current/distinfo
@@ -1 +1 @@
-MD5 (inn-1.5.1sec2.tar.gz) = fe8f38ca0bad32eef1d14636a998aa19
+MD5 (inn-1.7.2.tar.gz) = 91bd5fedf0111e0476229e13932c5cf4
diff --git a/news/inn-current/files/innd.sh b/news/inn-current/files/innd.sh
new file mode 100644
index 000000000000..18f1d68bd482
--- /dev/null
+++ b/news/inn-current/files/innd.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+if [ $# -eq 0 -o x$1 = xstart ]; then
+   if [ -x !!PREFIX!!/etc/rc.news -a -f !!PREFIX!!/news/lib/history.pag ]; then
+      limits -C news !!PREFIX!!/etc/rc.news && echo ' inn'
+   fi
+fi
+if [ x$1 = xstop ]; then
+	[ -x !!PREFIX!!/news/bin/ctlinnd stop machine is going down
+fi
diff --git a/news/inn-current/pkg-plist b/news/inn-current/pkg-plist
index b52055f3ced5..29c881e62ac5 100644
--- a/news/inn-current/pkg-plist
+++ b/news/inn-current/pkg-plist
@@ -1,9 +1,7 @@
 bin/inews
 bin/rnews
-etc/innd
-etc/inndstart
-etc/in.nnrpd
 etc/rc.news
+etc/rc.d/innd.sh
 include/inndcomm.h
 include/libinn.h
 include/qio.h
@@ -74,6 +72,9 @@ man/man8/innstat.8.gz
 man/man8/news-recovery.8.gz
 man/man8/newsrequeue.8.gz
 man/man8/tally.unwanted.8.gz
+sbin/innd
+sbin/inndstart
+sbin/in.nnrpd
 news/lib/overview.fmt
 news/lib/parsecontrol
 news/lib/send-ihave
@@ -146,6 +147,7 @@ news/bin/makehistory
 news/bin/newsrequeue
 news/bin/prunehistory
 news/bin/writelog
+news/bin/innmail
 news/bin/news.daily
 news/bin/scanlogs
 news/bin/expirerm
diff --git a/news/inn-stable/Makefile b/news/inn-stable/Makefile
index 0fb0cf3277f7..11b0cc5e9f49 100644
--- a/news/inn-stable/Makefile
+++ b/news/inn-stable/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	inn
-# Version required:	1.5.1
+# Version required:	1.7.2
 # Date created:		20 Oct 1994 (1.4), 18 Dec 1996 (1.5.1)
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.23 1997/05/29 06:38:42 charnier Exp $
+# $Id: Makefile,v 1.24 1997/09/15 20:11:44 torstenb Exp $
 #
 
-DISTNAME=	inn-1.5.1sec2
+DISTNAME=	inn-1.7.2
 CATEGORIES=	news
 MASTER_SITES=	ftp://ftp.isc.org/isc/inn/
 
@@ -43,6 +43,8 @@ pre-configure:
 
 pre-install:
 	${MKDIR} ${PREFIX}/news
+	${MKDIR} -m 0755 ${PREFIX}/news/sbin && \
+		chown news.news ${PREFIX}/news/sbin
 
 update: build
 	@(cd ${WRKSRC} ; ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} update)
@@ -56,12 +58,18 @@ post-install:
 	if [ -d /var/spool/news ] && [ ! -d /var/news ]; then \
 		${MKDIR} -m 0775 /var/spool/news/over.view; \
 		chown news.news /var/spool/news/over.view; \
+		${MKDIR} -m 0775 /var/spool/news/tmp; \
+		chown news.news /var/spool/news/tmp; \
 	else \
 		${MKDIR} -m 0775 /var/news/over.view; \
 		chown news.news /var/news/over.view; \
+		${MKDIR} -m 0775 /var/news/tmp; \
+		chown news.news /var/news/tmp; \
 	fi
 	${MKDIR} ${PREFIX}/news/locks
 	chown news.news ${PREFIX}/news/locks
 	chmod 0755 ${PREFIX}/news/locks
+	sed <${FILESDIR}/innd.sh >${PREFIX}/etc/rc.d/innd.sh \
+		s+!!PREFIX!!+${PREFIX}+g && chmod +x ${PREFIX}/etc/rc.d/innd.sh
 
 .include <bsd.port.mk>
diff --git a/news/inn-stable/distinfo b/news/inn-stable/distinfo
index 23f1e2b0d913..af3e7e0ff049 100644
--- a/news/inn-stable/distinfo
+++ b/news/inn-stable/distinfo
@@ -1 +1 @@
-MD5 (inn-1.5.1sec2.tar.gz) = fe8f38ca0bad32eef1d14636a998aa19
+MD5 (inn-1.7.2.tar.gz) = 91bd5fedf0111e0476229e13932c5cf4
diff --git a/news/inn-stable/files/innd.sh b/news/inn-stable/files/innd.sh
new file mode 100644
index 000000000000..18f1d68bd482
--- /dev/null
+++ b/news/inn-stable/files/innd.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+if [ $# -eq 0 -o x$1 = xstart ]; then
+   if [ -x !!PREFIX!!/etc/rc.news -a -f !!PREFIX!!/news/lib/history.pag ]; then
+      limits -C news !!PREFIX!!/etc/rc.news && echo ' inn'
+   fi
+fi
+if [ x$1 = xstop ]; then
+	[ -x !!PREFIX!!/news/bin/ctlinnd stop machine is going down
+fi
diff --git a/news/inn-stable/pkg-plist b/news/inn-stable/pkg-plist
index b52055f3ced5..29c881e62ac5 100644
--- a/news/inn-stable/pkg-plist
+++ b/news/inn-stable/pkg-plist
@@ -1,9 +1,7 @@
 bin/inews
 bin/rnews
-etc/innd
-etc/inndstart
-etc/in.nnrpd
 etc/rc.news
+etc/rc.d/innd.sh
 include/inndcomm.h
 include/libinn.h
 include/qio.h
@@ -74,6 +72,9 @@ man/man8/innstat.8.gz
 man/man8/news-recovery.8.gz
 man/man8/newsrequeue.8.gz
 man/man8/tally.unwanted.8.gz
+sbin/innd
+sbin/inndstart
+sbin/in.nnrpd
 news/lib/overview.fmt
 news/lib/parsecontrol
 news/lib/send-ihave
@@ -146,6 +147,7 @@ news/bin/makehistory
 news/bin/newsrequeue
 news/bin/prunehistory
 news/bin/writelog
+news/bin/innmail
 news/bin/news.daily
 news/bin/scanlogs
 news/bin/expirerm
diff --git a/news/inn/Makefile b/news/inn/Makefile
index 0fb0cf3277f7..11b0cc5e9f49 100644
--- a/news/inn/Makefile
+++ b/news/inn/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	inn
-# Version required:	1.5.1
+# Version required:	1.7.2
 # Date created:		20 Oct 1994 (1.4), 18 Dec 1996 (1.5.1)
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.23 1997/05/29 06:38:42 charnier Exp $
+# $Id: Makefile,v 1.24 1997/09/15 20:11:44 torstenb Exp $
 #
 
-DISTNAME=	inn-1.5.1sec2
+DISTNAME=	inn-1.7.2
 CATEGORIES=	news
 MASTER_SITES=	ftp://ftp.isc.org/isc/inn/
 
@@ -43,6 +43,8 @@ pre-configure:
 
 pre-install:
 	${MKDIR} ${PREFIX}/news
+	${MKDIR} -m 0755 ${PREFIX}/news/sbin && \
+		chown news.news ${PREFIX}/news/sbin
 
 update: build
 	@(cd ${WRKSRC} ; ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} update)
@@ -56,12 +58,18 @@ post-install:
 	if [ -d /var/spool/news ] && [ ! -d /var/news ]; then \
 		${MKDIR} -m 0775 /var/spool/news/over.view; \
 		chown news.news /var/spool/news/over.view; \
+		${MKDIR} -m 0775 /var/spool/news/tmp; \
+		chown news.news /var/spool/news/tmp; \
 	else \
 		${MKDIR} -m 0775 /var/news/over.view; \
 		chown news.news /var/news/over.view; \
+		${MKDIR} -m 0775 /var/news/tmp; \
+		chown news.news /var/news/tmp; \
 	fi
 	${MKDIR} ${PREFIX}/news/locks
 	chown news.news ${PREFIX}/news/locks
 	chmod 0755 ${PREFIX}/news/locks
+	sed <${FILESDIR}/innd.sh >${PREFIX}/etc/rc.d/innd.sh \
+		s+!!PREFIX!!+${PREFIX}+g && chmod +x ${PREFIX}/etc/rc.d/innd.sh
 
 .include <bsd.port.mk>
diff --git a/news/inn/distinfo b/news/inn/distinfo
index 23f1e2b0d913..af3e7e0ff049 100644
--- a/news/inn/distinfo
+++ b/news/inn/distinfo
@@ -1 +1 @@
-MD5 (inn-1.5.1sec2.tar.gz) = fe8f38ca0bad32eef1d14636a998aa19
+MD5 (inn-1.7.2.tar.gz) = 91bd5fedf0111e0476229e13932c5cf4
diff --git a/news/inn/files/innd.sh b/news/inn/files/innd.sh
new file mode 100644
index 000000000000..18f1d68bd482
--- /dev/null
+++ b/news/inn/files/innd.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+if [ $# -eq 0 -o x$1 = xstart ]; then
+   if [ -x !!PREFIX!!/etc/rc.news -a -f !!PREFIX!!/news/lib/history.pag ]; then
+      limits -C news !!PREFIX!!/etc/rc.news && echo ' inn'
+   fi
+fi
+if [ x$1 = xstop ]; then
+	[ -x !!PREFIX!!/news/bin/ctlinnd stop machine is going down
+fi
diff --git a/news/inn/pkg-plist b/news/inn/pkg-plist
index b52055f3ced5..29c881e62ac5 100644
--- a/news/inn/pkg-plist
+++ b/news/inn/pkg-plist
@@ -1,9 +1,7 @@
 bin/inews
 bin/rnews
-etc/innd
-etc/inndstart
-etc/in.nnrpd
 etc/rc.news
+etc/rc.d/innd.sh
 include/inndcomm.h
 include/libinn.h
 include/qio.h
@@ -74,6 +72,9 @@ man/man8/innstat.8.gz
 man/man8/news-recovery.8.gz
 man/man8/newsrequeue.8.gz
 man/man8/tally.unwanted.8.gz
+sbin/innd
+sbin/inndstart
+sbin/in.nnrpd
 news/lib/overview.fmt
 news/lib/parsecontrol
 news/lib/send-ihave
@@ -146,6 +147,7 @@ news/bin/makehistory
 news/bin/newsrequeue
 news/bin/prunehistory
 news/bin/writelog
+news/bin/innmail
 news/bin/news.daily
 news/bin/scanlogs
 news/bin/expirerm