diff -urN pinepgp-0.16.0/ChangeLog pinepgp-0.16.0-mwl/ChangeLog --- pinepgp-0.16.0/ChangeLog Tue Jul 10 11:28:54 2001 +++ pinepgp-0.16.0-mwl/ChangeLog Wed Oct 3 18:32:36 2001 @@ -1,3 +1,10 @@ +0.16.0-2 2001/10/03 + mike ledoux +- pinegpgp.in: modified to take advantage of Pine's _TMPFILE_ Token so + I can use 'clear' to make the gpg output more easily readable. +- pinepgpgpg-install.in: modified to work with the new pinegpgp.in +- README: adjusted document to reflect new behaviour + 0.16.0-1 2001/07/10 Peter Hanecak - README: diff -urN pinepgp-0.16.0/README pinepgp-0.16.0-mwl/README --- pinepgp-0.16.0/README Tue Jul 10 11:28:54 2001 +++ pinepgp-0.16.0-mwl/README Wed Oct 3 18:33:25 2001 @@ -178,13 +178,14 @@ # This variable takes a list of programs that message text is piped into # after MIME decoding, prior to display. - display-filters=_LEADING("-----BEGIN PGP MESSAGE-----")_ /usr/bin/gpg-check,\ - _LEADING("-----BEGIN PGP SIGNED MESSAGE-----")_ /usr/bin/gpg-check, + display-filters=_LEADING("-----BEGIN PGP MESSAGE-----")_ /usr/bin/gpg-check _TMPFILE_,\ + _LEADING("-----BEGIN PGP SIGNED MESSAGE-----")_ /usr/bin/gpg-check _TMPFILE_, # This defines a program that message text is piped into before MIME # encoding, prior to sending - sending-filters=/usr/bin/gpg-sign,/usr/bin/gpg-encrypt _RECIPIENTS_,\ - /usr/bin/gpg-sign+encrypt _RECIPIENTS_, + sending-filters=/usr/bin/gpg-sign _TMPFILE_,\ + /usr/bin/gpg-encrypt _TMPFILE_ _RECIPIENTS_,\ + /usr/bin/gpg-sign+encrypt _TMPFILE_ _RECIPIENTS_, If you want to use filters with "encrypt to yourself" feature, use following @@ -192,13 +193,14 @@ # This variable takes a list of programs that message text is piped into # after MIME decoding, prior to display. - display-filters=_LEADING("-----BEGIN PGP MESSAGE-----")_ /usr/bin/gpg-check,\ - _LEADING("-----BEGIN PGP SIGNED MESSAGE-----")_ /usr/bin/gpg-check, + display-filters=_LEADING("-----BEGIN PGP MESSAGE-----")_ /usr/bin/gpg-check _TMPFILE_,\ + _LEADING("-----BEGIN PGP SIGNED MESSAGE-----")_ /usr/bin/gpg-check _TMPFILE_, # This defines a program that message text is piped into before MIME # encoding, prior to sending - sending-filters=/usr/bin/gpg-sign,/usr/bin/gpg-encrypt _RECIPIENTS_ joe@earth.org,\ - /usr/bin/gpg-sign+encrypt _RECIPIENTS_ joe@earth.org, + sending-filters=/usr/bin/gpg-sign _TMPFILE_,\ + /usr/bin/gpg-encrypt _TMPFILE_ _RECIPIENTS_ joe@earth.org,\ + /usr/bin/gpg-sign+encrypt _TMPFILE_ _RECIPIENTS_ joe@earth.org, Your own pine configuration file is ussualy ~/.pinerc . System wide diff -urN pinepgp-0.16.0/pinegpgp.in pinepgp-0.16.0-mwl/pinegpgp.in --- pinepgp-0.16.0/pinegpgp.in Tue Jul 10 11:28:54 2001 +++ pinepgp-0.16.0-mwl/pinegpgp.in Wed Oct 3 18:35:55 2001 @@ -1,5 +1,9 @@ #!/bin/sh +pinetmp=$1 +shift +recipients=$* + tempdir=~/.pinepgp cename=GnuPG @@ -17,32 +21,57 @@ n=1 r=1 case $0 in - *-sign) $ces $*; n=$? ;; + *-sign) + clear + TMP=`$MKTEMP ${tempdir}/pinegpg.XXXXXX` + $ces < $pinetmp > $TMP + n=$? + if [ -s $TMP ]; then + cat $TMP > $pinetmp + fi + rm -f $TMP + ;; *-encrypt) - RCPTS="$*" # not-in: gpg, pgp5x - RCPTS=`echo $* | $SED -e 's/^ */ /' -e 's/ */ -r /g'` # not-in: pgp26x, pgp65x - $cee $RCPTS; + clear + TMP=`$MKTEMP ${tempdir}/pinegpg.XXXXXX` + RCPTS="$recipients" # not-in: gpg, pgp5x + RCPTS=`echo $recipients | $SED -e 's/^ */ /' -e 's/ */ -r /g'` # not-in: pgp26x, pgp65x + $cee $RCPTS < $pinetmp > $TMP; n=$? - ;; + if [ -s $TMP ]; then + cat $TMP > $pinetmp + fi + rm -f $TMP + ;; *-sign+encrypt) - RCPTS="$*" # not-in: gpg, pgp5x - RCPTS=`echo $* | $SED -e 's/^ */ /' -e 's/ */ -r /g'` # not-in: pgp26x, pgp65x + clear + TMP=`$MKTEMP ${tempdir}/pinegpg.XXXXXX` + RCPTS="$recipients" # not-in: gpg, pgp5x + RCPTS=`echo $recipients | $SED -e 's/^ */ /' -e 's/ */ -r /g'` # not-in: pgp26x, pgp65x echo "RCPTS: $RCPTS" >&2 # not-in: pgp26x, pgp65x - $cese $RCPTS; + $cese $RCPTS < $pinetmp > $TMP; n=$? - ;; + if [ -s $TMP ]; then + cat $TMP > $pinetmp + fi + rm -f $TMP + ;; *-check) + clear TMP=`$MKTEMP ${tempdir}/pinegpg.XXXXXX` - $cec $* 2> $TMP + TMP2=`$MKTEMP ${tempdir}/pinegpg.XXXXXX` + $cec < $pinetmp > $TMP2 2> $TMP n=$? if [ -s $TMP ]; then - echo -e "\n----------------------------------------------------------------------" - $CAT $TMP - echo "----------------------------------------------------------------------" - fi + $CAT $TMP2 > $pinetmp + echo -e "\n----------------------------------------------------------------------" >> $pinetmp + $CAT $TMP >> $pinetmp + echo "----------------------------------------------------------------------" >> $pinetmp + fi $RM -f $TMP + $RM -f $TMP2 if [ $n = 0 ]; then r=0; fi - ;; + ;; *) echo "Pine in/out filters for $cename" echo "Use:" diff -urN pinepgp-0.16.0/pinepgpgpg-install.in pinepgp-0.16.0-mwl/pinepgpgpg-install.in --- pinepgp-0.16.0/pinepgpgpg-install.in Tue Jul 10 11:28:54 2001 +++ pinepgp-0.16.0-mwl/pinepgpgpg-install.in Wed Oct 3 16:47:11 2001 @@ -43,19 +43,19 @@ cp $PINERC $PINERC.old sed -e " -s%^display-filters=%display-filters=_LEADING(\"-----BEGIN PGP MESSAGE-----\")_ $bindir/$PGPVER-check,\ -_LEADING(\"-----BEGIN PGP SIGNED MESSAGE-----\")_ $bindir/$PGPVER-check,\ +s%^display-filters=%display-filters=_LEADING(\"-----BEGIN PGP MESSAGE-----\")_ $bindir/$PGPVER-check _TMPFILE_,\ +_LEADING(\"-----BEGIN PGP SIGNED MESSAGE-----\")_ $bindir/$PGPVER-check _TMPFILE_,\ % -s%^sending-filters=%sending-filters=$bindir/$PGPVER-sign,\ -$bindir/$PGPVER-encrypt _RECIPIENTS_$ETY,\ -$bindir/$PGPVER-sign+encrypt _RECIPIENTS_$ETY,\ +s%^sending-filters=%sending-filters=$bindir/$PGPVER-sign _TMPFILE_,\ +$bindir/$PGPVER-encrypt _TMPFILE_ _RECIPIENTS_$ETY,\ +$bindir/$PGPVER-sign+encrypt _TMPFILE_ _RECIPIENTS_$ETY,\ % -s%^display-filters=$%display-filters=_LEADING(\"-----BEGIN PGP MESSAGE-----\")_ $bindir/$PGPVER-check,\ -_LEADING(\"-----BEGIN PGP SIGNED MESSAGE-----\")_ $bindir/$PGPVER-check\ +s%^display-filters=$%display-filters=_LEADING(\"-----BEGIN PGP MESSAGE-----\")_ $bindir/$PGPVER-check _TMPFILE_,\ +_LEADING(\"-----BEGIN PGP SIGNED MESSAGE-----\")_ $bindir/$PGPVER-check _TMPFILE_\ % -s%^sending-filters=$%sending-filters=$bindir/$PGPVER-sign,\ -$bindir/$PGPVER-encrypt _RECIPIENTS_$ETY,\ -$bindir/$PGPVER-sign+encrypt _RECIPIENTS_$ETY\ +s%^sending-filters=$%sending-filters=$bindir/$PGPVER-sign _TMPFILE_,\ +$bindir/$PGPVER-encrypt _TMPFILE_ _RECIPIENTS_$ETY,\ +$bindir/$PGPVER-sign+encrypt _TMPFILE_ _RECIPIENTS_$ETY\ % " $PINERC.old | uniq > $PINERC