From 7ca4c4a7c223df2a99c8772a5e19f212fafa68a2 Mon Sep 17 00:00:00 2001
From: David Lawrence <tale@isc.org>
Date: Mon, 15 Jun 1998 13:35:35 +0000
Subject: [PATCH] Version 1.10.  Minor diddling for INN 2.0: use $inn/pathtmp
 if it exists, and work with the new subst method to find innshellvars.pl.  Do
 not truncate the tmp file when opening, in case it is really linked to
 another file.

---
 pgpverify | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/pgpverify b/pgpverify
index 012b24e..97547e5 100755
--- a/pgpverify
+++ b/pgpverify
@@ -1,6 +1,16 @@
 #! /usr/bin/perl -ws
 # written April 1996, tale@isc.org (David C Lawrence)
-# Version 1.9
+# Version 1.10
+#
+# NOTICE TO INN MAINTAINERS:  The version that is shipped with INN
+# is the same as the version that I make available to the rest of the
+# world (including non-INN sites), so please make all changes through me.
+#
+# Changes from 1.9 -> 1.10
+# -- minor diddling for INN 2.0: use $inn/pathtmp if it exists, and
+#    work with the new subst method to find innshellvars.pl
+# -- do not truncate the tmp file when opening, in case it is really linked
+#    to another file
 #
 # Changes from 1.8 -> 1.9
 # -- match 'Bad signature' pgp output to return exit status 3 by removing
@@ -40,7 +50,7 @@ $pgp = '/usr/local/bin/pgp';
 # uncomment the next line and set appropriately.
 # $ENV{'PGPPATH'} = '/path/to/your/pgp/config';
 
-$tmp = "/tmp/pgp$$";
+$tmpdir = "/tmp";
 
 ### Exit value:
 ### 0  good signature
@@ -53,8 +63,9 @@ die "Usage: $0 < message\n" if @ARGV != 0;
 
 $0 =~ s%^.*/%%;                 # trim /path/to/prog to prog
 
-do "_INNSHELLVARS_.pl";
+do '@ETCDIR@/innshellvars.pl';
 $pgp = $inn'pgp if $inn'pgp && $inn'pgp ne "no-pgp-found-during-configure";
+$tmp = ($inn'pathtmp ? $inn'pathtmp : $tmpdir) . "/pgp$$";
 
 if (! -x $pgp) {
   die "$0: $pgp: ", (-e _ ? "cannot execute" : "no such file"), "\n";
@@ -135,13 +146,16 @@ $message .= "Version: $version\n";
 $message .= $signature;
 $message .= "\n-----END PGP SIGNATURE-----\n";
 
-open(TMP,"> $tmp") || &fail("$0: open > $tmp: $!\n");
+open(TMP,">> $tmp") || &fail("$0: open > $tmp: $!\n");
 
 -f TMP ||
   &fail("$0: $tmp not a plain file, possible security violation attempt\n");
 (stat(_))[3] == 1 ||
   &fail("$0: $tmp has hard links, possible security violation attempt\n");
 
+seek TMP, 0, 0;                 # make sure pointer is at beginning of file
+truncate TMP, 0;                # make sure file is zero length
+
 print TMP $message;
 close(TMP) || warn "$0: close > $tmp: $!\n";
 &fail("$0: write error for message to check\n")