- Add support for NEWSCTL

- patched pmcheck to work with more groups like documented
- patched pmcheck to give error result in more cases
- patched patch-pmdaemon to use FreeBSD paths.

3 files changed, 106 insertions, 0 deletions

diff --git a/news/pgpmoose/Makefile b/news/pgpmoose/Makefile
index d711b4f7173d..ae6eac076cc1 100644
--- a/news/pgpmoose/Makefile
+++ b/news/pgpmoose/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pgpmoose
 PORTVERSION=	1.19
+PORTREVISION=	1
 CATEGORIES=	news security
 MASTER_SITES=	http://people.qualcomm.com/ggr/ \
 		ftp://ftp.dinoex.de/pub/FreeBSD/distfiles/
@@ -21,6 +22,12 @@ BIN1=		pmapp pmcanon pmcheck pmnewsgroups \
 		pmdaemon pmcancel
 
 NO_WRKSUBDIR=	yes
+NEWSCTL?=	${PREFIX}/news/lib
+
+post-patch:
+	@${MV} ${WRKSRC}/pmapp ${WRKSRC}/pmapp.sed
+	${SED} -e "s=/usr/local/news=${NEWSCTL}=" \
+		${WRKSRC}/pmapp.sed >${WRKSRC}/pmapp
 
 do-install:
 .for i in ${BIN1}
diff --git a/news/pgpmoose/files/patch-pmcheck b/news/pgpmoose/files/patch-pmcheck
new file mode 100644
index 000000000000..53f8dbf1c36e
--- /dev/null
+++ b/news/pgpmoose/files/patch-pmcheck
@@ -0,0 +1,73 @@
+--- pmcheck.orig	Fri Nov 27 00:03:49 1998
++++ pmcheck	Wed Oct 10 08:52:07 2001
+@@ -54,7 +54,7 @@
+ 
+ # Find all the authentication headers we can handle
+ grep -i '^X-Auth.*:  *PGPMoose ' $FILE | \
+-    sed -e 's/.* //' >$TF.g
++    sed -e 's/X-Auth.*:  *PGPMoose V[0-9]*[.][0-9]* [A-Z]* //' >$TF.g
+ 
+ # For the time being, simply avoid cancel messages.
+ # Note that pmdaemon authenticates them, but you probably don't
+@@ -77,10 +77,10 @@
+ 
+ # Make the document we are going to check signatures on.
+ pmcanon $FILE >$TF.m
+-    
++
+ # Loop checking all X-Auth: lines required
+ echo 0 >$TF.b
+-while read GROUP; do
++while read GROUP ARMOR; do
+     # Check whether this is an interesting X-Auth: line.
+     # This is determined by the existence of the $ACCEPT file.
+     # If it exists, only the groups/individuals mentioned are
+@@ -96,7 +96,7 @@
+     fi
+     # $1      $2       $3   $4  $5
+     # X-Auth: PGPMoose V1.1 PGP sci.crypt.research
+-    set -- `grep -i "^X-Auth.*:  *PGPMoose .* $GROUP\$" $FILE`
++    set -- `grep -i "^X-Auth.*:  *PGPMoose .* $GROUP" $FILE`
+ 
+     # Check for version mismatch, but at the moment we just warn.
+     # It is pretty hard to know just what to do in this case.
+@@ -110,11 +110,21 @@
+ 	Version: 2.6
+ 
+ 	END_OF_SIG
+-    sed -n -e "1,/^[Xx]-[Aa][Uu][Tt][Hh].*:  *PGPMoose .* $GROUP\$/d" \
++    if [ "x$ARMOR" != "x" ]; then
++	for WORD in $ARMOR
++	do
++		echo $WORD >>$TF.s
++	done
++    fi
++    for WORD in `
++    sed -n -e "1,/^[Xx]-[Aa][Uu][Tt][Hh].*:  *PGPMoose .* $GROUP/d" \
+ 	-e '/^ *$/,$d' \
+ 	-e '/^[^ 	]/,$d' \
+ 	-e 's/^[ 	]*//p' \
+-	$FILE >>$TF.s
++	$FILE`
++	do
++		echo $WORD >>$TF.s
++	done
+     cat <<-END_OF_SIG >>$TF.s
+ 	-----END PGP MESSAGE-----
+ 	END_OF_SIG
+@@ -146,6 +156,7 @@
+ 	if [ "$VERBOSE" = true ]; then
+ 	    echo "No public key for signature $GROUP"
+ 	fi
++	echo 2 >$TF.b
+ 	continue
+ 	;;
+     30)
+@@ -160,6 +171,7 @@
+ 	    echo "Unknown PGP error, status = $STATUS"
+ 	    cat $TF.e
+ 	fi
++	echo 2 >$TF.b
+ 	continue
+ 	;;
+     esac
diff --git a/news/pgpmoose/files/patch-pmdaemon b/news/pgpmoose/files/patch-pmdaemon
new file mode 100644
index 000000000000..5c77a6e9b90e
--- /dev/null
+++ b/news/pgpmoose/files/patch-pmdaemon
@@ -0,0 +1,26 @@
+--- pmdaemon.orig	Thu Nov 26 01:53:45 1998
++++ pmdaemon	Mon Dec 28 07:58:08 1998
+@@ -5,8 +5,8 @@
+ # Written by Greg Rose, RoSecure Software, Copyright C 1995.
+ 
+ # search path usually needs to be set, because this is invoked by "news"
+-cd ~usenet/PGPmoose
+-export PATH=$PATH:/pkg/pgp/bin:.:/usr/local/bin
++#cd ~usenet/PGPmoose
++export PATH=$PATH:.:/usr/local/bin
+ 
+ # Probably need a PGPPATH too.
+ export PGPPATH=.
+@@ -29,10 +29,10 @@
+ 
+ # Command to run to send mail to someone.
+ # If it isn't "sendmail" you might also have to fix the arguments.
+-MAIL=/usr/lib/sendmail
++MAIL=/usr/sbin/sendmail
+ 
+ # Command to run to submit a cancel article (assumed to be the path to inews)
+-INEWS="/var/spool/news/usenet_home/inews -h"
++INEWS="/usr/local/bin/inews -h"
+ 
+ # An email address to send all failing articles to.
+ MANAGER=ggr