Date: Sat, 27 Nov 1999 15:16:03 -0500 (EST) From: matt@zigg.com To: FreeBSD-gnats-submit@freebsd.org Subject: ports/15120: [PATCH] mail/pine4 pgp support does not honor PREFIX Message-ID: <199911272016.PAA74792@megaweapon.zigg.com>
next in thread | raw e-mail | index | archive | help
>Number: 15120
>Category: ports
>Synopsis: [PATCH] mail/pine4 pgp support does not honor PREFIX
>Confidential: no
>Severity: serious
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Sat Nov 27 12:20:01 PST 1999
>Closed-Date:
>Last-Modified:
>Originator: Matt Behrens
>Release: FreeBSD 3.3-STABLE i386
>Organization:
zigg.com
>Environment:
FreeBSD megaweapon.zigg.com 3.3-STABLE FreeBSD 3.3-STABLE #2: Sat Nov 20 19:51:35 EST 1999 matt@megaweapon.zigg.com:/usr/src/sys/compile/MEGAWEAPON i386
>Description:
The pine4 port contains several additional support files not found
in the source tarball. These include an example .pinerc and three
scripts to integrate pgp support into pine4. However, said scripts
do not honor PREFIX as distributed and installed -- they have
/usr/local hardcoded.
>How-To-Repeat:
# cd /usr/ports/security/pgp
# make PREFIX=/foo/bar install
# cd /usr/ports/mail/pine4
# make PREFIX=/foo/bar install
$ cp /foo/bar/etc/dot.pinerc.pgp.sample ~/.pinerc
$ pine
(pgp support will fail because of missing binaries and scripts)
>Fix:
Cursorily tested patch follows. (Clean builds take awhile on my
rather slow machine.)
diff -ur pine4.broken/Makefile pine4/Makefile
--- pine4.broken/Makefile Sat Nov 27 15:06:42 1999
+++ pine4/Makefile Sat Nov 27 14:59:02 1999
@@ -46,10 +46,19 @@
${INSTALL_PROGRAM} ${WRKSRC}/bin/pico ${PREFIX}/bin/pico
${INSTALL_PROGRAM} ${WRKSRC}/bin/pilot ${PREFIX}/bin/pilot
${INSTALL_PROGRAM} ${WRKSRC}/bin/pine ${PREFIX}/bin/pine
- ${INSTALL_SCRIPT} ${FILESDIR}/pgpencrypt ${PREFIX}/bin/pgpencrypt
- ${INSTALL_SCRIPT} ${FILESDIR}/pgpdecode ${PREFIX}/bin/pgpdecode
- ${INSTALL_SCRIPT} ${FILESDIR}/pgpsign ${PREFIX}/bin/pgpsign
- ${INSTALL_DATA} ${FILESDIR}/dot.pinerc.pgp.sample \
+ ${SED} -e 's,@@PREFIX@@,${PREFIX},g' \
+ < ${FILESDIR}/pgpdecode > ${WRKSRC}/bin/pgpdecode
+ ${SED} -e 's,@@PREFIX@@,${PREFIX},g' \
+ < ${FILESDIR}/pgpencrypt > ${WRKSRC}/bin/pgpencrypt
+ ${SED} -e 's,@@PREFIX@@,${PREFIX},g' \
+ < ${FILESDIR}/pgpsign > ${WRKSRC}/bin/pgpsign
+ ${INSTALL_SCRIPT} ${WRKSRC}/bin/pgpencrypt ${PREFIX}/bin/pgpencrypt
+ ${INSTALL_SCRIPT} ${WRKSRC}/bin/pgpdecode ${PREFIX}/bin/pgpdecode
+ ${INSTALL_SCRIPT} ${WRKSRC}/bin/pgpsign ${PREFIX}/bin/pgpsign
+ ${SED} -e 's,@@PREFIX@@,${PREFIX},g' \
+ < ${FILESDIR}/dot.pinerc.pgp.sample \
+ > ${WRKSRC}/dot.pinerc.pgp.sample
+ ${INSTALL_DATA} ${WRKSRC}/dot.pinerc.pgp.sample \
${PREFIX}/etc/dot.pinerc.pgp.sample
${INSTALL_MAN} ${WRKSRC}/doc/pico.1 ${PREFIX}/man/man1/pico.1
${INSTALL_MAN} ${WRKSRC}/doc/pilot.1 ${PREFIX}/man/man1/pilot.1
diff -ur pine4.broken/files/dot.pinerc.pgp.sample pine4/files/dot.pinerc.pgp.sample
--- pine4.broken/files/dot.pinerc.pgp.sample Sat Nov 27 15:06:41 1999
+++ pine4/files/dot.pinerc.pgp.sample Sat Nov 27 15:01:15 1999
@@ -5,12 +5,12 @@
# This variable takes a list of programs that message text is piped into
# after MIME decoding, prior to display.
-display-filters="-----BEGIN PGP" /usr/local/bin/pgpdecode
+display-filters="-----BEGIN PGP" @@PREFIX@@/bin/pgpdecode
# This defines a program that message text is piped into before MIME
# encoding, prior to sending
-sending-filters=/usr/local/bin/pgpsign,
- /usr/local/bin/pgpencrypt _RECIPIENTS_
+sending-filters=@@PREFIX@@/bin/pgpsign,
+ @@PREFIX@@/bin/pgpencrypt _RECIPIENTS_
# hook, to get rid of the sucking 'quoted printable' ;-))
# enable-8bit-esmtp-negotiation
diff -ur pine4.broken/files/pgpdecode pine4/files/pgpdecode
--- pine4.broken/files/pgpdecode Sat Nov 27 15:06:41 1999
+++ pine4/files/pgpdecode Sat Nov 27 14:54:06 1999
@@ -32,7 +32,7 @@
trap "rm -f $STDOUT $STDERR; exit" 0 1 2 15
-if [ -x /usr/local/bin/pgpv ]
+if [ -x @@PREFIX@@/bin/pgpv ]
then
pgpv 2>&1 > $STDOUT |tee $STDERR > /dev/tty
else
diff -ur pine4.broken/files/pgpencrypt pine4/files/pgpencrypt
--- pine4.broken/files/pgpencrypt Sat Nov 27 15:06:41 1999
+++ pine4/files/pgpencrypt Sat Nov 27 15:01:07 1999
@@ -3,7 +3,7 @@
# 21.03.96 Roland Rosenfeld <roland@spinnaker.rhein.de>
# Wed 16 Sep 1998 23:46:43 WST Anthony Di Pietro <anthony@dino.omen.com.au>
# Modified to work with both PGP v2 and PGP v5.
-if [ -x /usr/local/bin/pgpe ]
+if [ -x @@PREFIX@@/bin/pgpe ]
then
pgpe -s -a -r $*
else
diff -ur pine4.broken/files/pgpsign pine4/files/pgpsign
--- pine4.broken/files/pgpsign Sat Nov 27 15:06:41 1999
+++ pine4/files/pgpsign Sat Nov 27 14:54:28 1999
@@ -3,7 +3,7 @@
# 21.03.96 Roland Rosenfeld <roland@spinnaker.rhein.de>
# Wed 16 Sep 1998 23:48:51 WST Anthony Di Pietro <anthony@dino.omen.com.au>
# Modified to work with both PGP v2 and PGP v5.
-if [ -x /usr/local/bin/pgps ]
+if [ -x @@PREFIX@@/bin/pgps ]
then
pgps -a -t
else
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199911272016.PAA74792>