.

30 files changed, 138 insertions, 128 deletions

diff --git a/checks/Makefile.am b/checks/Makefile.am
index 985778a1a..bd7d11199 100644
--- a/checks/Makefile.am
+++ b/checks/Makefile.am
@@ -12,7 +12,7 @@ TESTS = version.test mds.test \
 	conventional.test
 
 
-TEST_FILES = pubring.asc secring.asc plain-1 plain-2 plain-3o.asc \
+TEST_FILES = pubring.asc secring.asc plain-1o.asc plain-2o.asc plain-3o.asc \
 	     plain-1.asc plain-2.asc plain-3.asc plain-1-pgp.asc \
 	     pubring.pkr.asc secring.skr.asc
 
@@ -21,30 +21,44 @@ DATA_FILES = data-500 data-9000 data-32000 data-80000
 EXTRA_DIST = defs.inc run-gpg run-gpgm $(TESTS) $(TEST_FILES)
 CLEANFILES = prepared.stamp x y z out err  $(DATA_FILES)
 
+
 check: prepared.stamp
 
-prepared.stamp: pubring.gpg secring.gpg plain-3 \
-		pubring.pkr secring.skr $(DATA_FILES)
+prepared.stamp: ./pubring.gpg ./secring.gpg ./plain-1 ./plain-2 ./plain-3 \
+		./pubring.pkr ./secring.skr $(DATA_FILES)
 	 echo timestamp >./prepared.stamp
 
-pubring.gpg: pubring.asc
-	../g10/gpgm --yes --dearmor -o pubring.gpg pubring.asc
-secring.gpg: secring.asc
-	../g10/gpgm --yes --dearmor -o secring.gpg secring.asc
-plain-3: plain-3o.asc
-	../g10/gpgm --yes --dearmor -o plain-3 plain-3o.asc
-pubring.pkr: pubring.pkr.asc
-	../g10/gpgm --yes --dearmor -o pubring.pkr pubring.pkr.asc
-secring.skr: secring.skr.asc
-	../g10/gpgm --yes --dearmor -o secring.skr secring.skr.asc
+
+./pubring.gpg: $(srcdir)/pubring.asc
+	 ../g10/gpgm --yes --dearmor -o ./pubring.gpg $(srcdir)/pubring.asc
+
+./secring.gpg: $(srcdir)/secring.asc
+	 ../g10/gpgm --yes --dearmor -o ./secring.gpg $(srcdir)/secring.asc
+
+./pubring.pkr: $(srcdir)/pubring.pkr.asc
+	 ../g10/gpgm --yes --dearmor -o ./pubring.pkr $(srcdir)/pubring.pkr.asc
+
+./secring.skr: $(srcdir)/secring.skr.asc
+	 ../g10/gpgm --yes --dearmor -o ./secring.skr $(srcdir)/secring.skr.asc
+
+./plain-1: $(srcdir)/plain-1o.asc
+	 ../g10/gpgm --yes --dearmor -o ./plain-1 $(srcdir)/plain-1o.asc
+
+./plain-2: $(srcdir)/plain-2o.asc
+	 ../g10/gpgm --yes --dearmor -o ./plain-2 $(srcdir)/plain-2o.asc
+
+./plain-3: $(srcdir)/plain-3o.asc
+	 ../g10/gpgm --yes --dearmor -o ./plain-3 $(srcdir)/plain-3o.asc
+
+
 
 data-500:
-	../tools/mk-tdata   500 /dev/urandom >data-500
+	../tools/mk-tdata   500  >data-500
 data-9000:
-	../tools/mk-tdata  9000 /dev/urandom >data-9000
+	../tools/mk-tdata  9000  >data-9000
 data-32000:
-	../tools/mk-tdata 32000 /dev/urandom >data-32000
+	../tools/mk-tdata 32000  >data-32000
 data-80000:
-	../tools/mk-tdata 80000 /dev/urandom >data-80000
+	../tools/mk-tdata 80000  >data-80000
 
 
diff --git a/checks/armdetach.test b/checks/armdetach.test
index 0e22cb574..16d4efe76 100755
--- a/checks/armdetach.test
+++ b/checks/armdetach.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. defs.inc || exit 3
+. $srcdir/defs.inc || exit 3
 
 
 #info Checking armored detached signatures
diff --git a/checks/armdetachm.test b/checks/armdetachm.test
index dcbab1c47..5d8d077c2 100755
--- a/checks/armdetachm.test
+++ b/checks/armdetachm.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. defs.inc || exit 3
+. $srcdir/defs.inc || exit 3
 
 #info Checking armored detached signatures of multiple files
 i="$plain_files $data_files"
diff --git a/checks/armencrypt.test b/checks/armencrypt.test
index c82cd1158..48c60a8b8 100755
--- a/checks/armencrypt.test
+++ b/checks/armencrypt.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. defs.inc || exit 3
+. $srcdir/defs.inc || exit 3
 
 #info Checking armored encryption
 for i in $plain_files $data_files ; do
diff --git a/checks/armencryptp.test b/checks/armencryptp.test
index 4452d0534..37cb4a34b 100755
--- a/checks/armencryptp.test
+++ b/checks/armencryptp.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. defs.inc || exit 3
+. $srcdir/defs.inc || exit 3
 
 #info Checking armored encryption with a pipe
 for i in $plain_files $data_files ; do
diff --git a/checks/armsignencrypt.test b/checks/armsignencrypt.test
index c9bdb1bd9..daa1b9676 100755
--- a/checks/armsignencrypt.test
+++ b/checks/armsignencrypt.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. defs.inc || exit 3
+. $srcdir/defs.inc || exit 3
 
 
 #info Checking armored signing and encryption
diff --git a/checks/armsigs.test b/checks/armsigs.test
index 2cba37de9..5152c2de0 100755
--- a/checks/armsigs.test
+++ b/checks/armsigs.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. defs.inc || exit 3
+. $srcdir/defs.inc || exit 3
 
 #info Checking armored signatures
 for i in $plain_files $data_files ; do
diff --git a/checks/clearsig.test b/checks/clearsig.test
index 768c59d9b..d633713c9 100755
--- a/checks/clearsig.test
+++ b/checks/clearsig.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. defs.inc || exit 3
+. $srcdir/defs.inc || exit 3
 
 # I can't compare the out because plain-3 has no LF as last charcater
 # but the output has always one.  I do not thinkl this is a bug, because
diff --git a/checks/conventional.test b/checks/conventional.test
index 0a2aabe57..9176c0c44 100755
--- a/checks/conventional.test
+++ b/checks/conventional.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. defs.inc || exit 3
+. $srcdir/defs.inc || exit 3
 
 #info Checking conventional encryption
 for i in plain-2 data-32000 ; do
diff --git a/checks/decrypt-dsa.test b/checks/decrypt-dsa.test
index bd3f4b99e..08fe2de7e 100755
--- a/checks/decrypt-dsa.test
+++ b/checks/decrypt-dsa.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. defs.inc || exit 3
+. $srcdir/defs.inc || exit 3
 
 #info Checking decryption of supplied DSA encrypted file
 for i in "plain-1" ; do
diff --git a/checks/decrypt.test b/checks/decrypt.test
index edd32a24a..843c9be9d 100755
--- a/checks/decrypt.test
+++ b/checks/decrypt.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. defs.inc || exit 3
+. $srcdir/defs.inc || exit 3
 
 #info Checking decryption of supplied files
 for i in $plain_files ; do
diff --git a/checks/detach.test b/checks/detach.test
index de5fefb60..37700e517 100755
--- a/checks/detach.test
+++ b/checks/detach.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. defs.inc || exit 3
+. $srcdir/defs.inc || exit 3
 
 #info Checking detached signatures
 for i in $plain_files $data_files ; do
diff --git a/checks/detachm.test b/checks/detachm.test
index 4130ea33f..5af856f75 100755
--- a/checks/detachm.test
+++ b/checks/detachm.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. defs.inc || exit 3
+. $srcdir/defs.inc || exit 3
 
 #info Checking detached signatures of multiple files
 i="$plain_files $data_files"
diff --git a/checks/encrypt-dsa.test b/checks/encrypt-dsa.test
index d83cdd968..b809700b1 100755
--- a/checks/encrypt-dsa.test
+++ b/checks/encrypt-dsa.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. defs.inc || exit 3
+. $srcdir/defs.inc || exit 3
 
 #info Checking encryption
 for i in $plain_files $data_files ; do
diff --git a/checks/encrypt.test b/checks/encrypt.test
index 85a67eb37..07e9a3a24 100755
--- a/checks/encrypt.test
+++ b/checks/encrypt.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. defs.inc || exit 3
+. $srcdir/defs.inc || exit 3
 
 #info Checking encryption
 for i in $plain_files $data_files ; do
diff --git a/checks/encryptp.test b/checks/encryptp.test
index f9b66792f..b0af2c626 100755
--- a/checks/encryptp.test
+++ b/checks/encryptp.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. defs.inc || exit 3
+. $srcdir/defs.inc || exit 3
 
 #info Checking encryption with a pipe
 for i in $plain_files $data_files ; do
diff --git a/checks/genkey1024.test b/checks/genkey1024.test
index ee282b28e..f963cf356 100755
--- a/checks/genkey1024.test
+++ b/checks/genkey1024.test
@@ -1,13 +1,13 @@
 #!/bin/sh
 
-. defs.inc || exit 3
+. $srcdir/defs.inc || exit 3
 
 expect - <<EOF
 #set timeout -1
 set timeout 5
 match_max 100000
 spawn ../g10/gpg --no-batch --quick-random --homedir . --gen-key
-expect { 
+expect {
     -exact "Please select what kind of key you want:\r
    (1) DSA and ElGamal (default)\r
    (2) ElGamal (sign and encrypt)\r
@@ -18,18 +18,18 @@ Your selection? "  { send -- "1\r" }
     timeout { exit 1 } }
 expect {
     -exact "1\r
-\r                 \rDSA keypair will have 1024 bits.\r
+\r		   \rDSA keypair will have 1024 bits.\r
 About to generate a new ELG-E keypair.\r
-              minimum keysize is  768 bits\r
-              default keysize is 1024 bits\r
+	      minimum keysize is  768 bits\r
+	      default keysize is 1024 bits\r
     highest suggested keysize is 2048 bits\r
 What keysize do you want? (1024) " { send -- "\r" }
     timeout { exit 1 } }
 expect {
     -exact "\r
-\r                                 \rRequested keysize is 1024 bits\r
+\r				   \rRequested keysize is 1024 bits\r
 Please specify how long the key should be valid.\r
-         0 = key does not expire\r
+	 0 = key does not expire\r
       <n>  = key expires in n days\r
       <n>w = key expires in n weeks\r
       <n>m = key expires in n months\r
@@ -38,9 +38,9 @@ Key is valid for? (0) " { send -- "1\r" }
     timeout { exit 1 } }
 expect {
      -exact "1\r
-\r                       \rKey expires at " { }
+\r			 \rKey expires at " { }
     timeout { exit 1 } }
-expect { 
+expect {
      -re "(.*)\r
 " {}
     timeout { exit 1 } }
@@ -49,7 +49,7 @@ expect {
     timeout { exit 1 } }
 expect {
     -exact "y\r
-\r                        \r\r
+\r			  \r\r
 You need a User-ID to identify your key; the software constructs the user id\r
 from Real Name, Comment and Email Address in this form:\r
     \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\r
@@ -58,29 +58,29 @@ Real name: " { send -- "Harry H.\r" }
     timeout { exit 1 } }
 expect {
    -exact "Harry H.\r
-\r                   \rEmail address: " { send -- "hh@ddorf.de\r" }
+\r		     \rEmail address: " { send -- "hh@ddorf.de\r" }
     timeout { exit 1 } }
 expect {
    -exact "hh@ddorf.de\r
-\r                          \rComment: " { send -- "a test\r" }
+\r			    \rComment: " { send -- "a test\r" }
     timeout { exit 1 } }
 expect {
    -exact "a test\r
-\r               \rYou selected this USER-ID:\r
+\r		 \rYou selected this USER-ID:\r
     \"Harry H. (a test) <hh@ddorf.de> (INSECURE!)\"\r
 \r
 Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " { send -- "o\r" }
     timeout { exit 1 } }
 expect {
    -exact "o\r
-\r                                                     \rYou need a Passphrase to protect your secret key.\r
+\r						       \rYou need a Passphrase to protect your secret key.\r
 \r
 Enter pass phrase: " { sleep 1; send -- "abc\r" }
     timeout { exit 1 } }
 expect {
   -ex "\r                   \rRepeat pass phrase: " { sleep 1; send -- "abc\r" }
     timeout { exit 1 } }
-expect { 
+expect {
   -ex "\r                    \rWe need to generate a lot of random bytes. It is a good idea to perform\r
 some other action (work in another window, move the mouse, utilize the\r
 network and the disks) during the prime generation; this gives the random\r
diff --git a/checks/mds.test b/checks/mds.test
index fe5622c35..ff07e1a5f 100755
--- a/checks/mds.test
+++ b/checks/mds.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. defs.inc || exit 3
+. $srcdir/defs.inc || exit 3
 
 test_one () {
    if [ "$(grep $1 y | sed -e 's/.*=[ ]\(.*\)/\1/' -e 's/ //g')" != "$2" ]; then
diff --git a/checks/plain-1 b/checks/plain-1
deleted file mode 100644
index f336a1228..000000000
--- a/checks/plain-1
+++ /dev/null
@@ -1,23 +0,0 @@
-<!-- Dies ist Seite 3, dort ist keine Seitenzahl angegeben,
-     oben rechts ist wieder der Stempel von meinem Opa zu finden -->
-
-<sect1>Name <q>Groß-Bartloff</>
-
-<p>
-Der Name <q/Bartloff/ ist schwer zu deuten. Man hat viele Mutmaßungen
-angestellt, von denen man aber bislang keine einzige als unbedingt
-richtig erklären kann.
-<fontinfo rem="mit Leerzeichen geschrieben">Urkundlich</> wird das
-Dorf bis zur Reformation stets <q/Bartorf/ (anno 1253) und
-<q/Bardorf/ (1306, 1318, 1329, 1429) genannt und das_ sowohl Klein-
-wie Großbartloff. Erst 1586 im Bischofssteiner Jurisdiktionalbuch
-heißt unser Dorf <q/Bartteloff/ und so auch in der ältesten noch
-vorhandenen Kirchenrechnung vom Jahre 1651. NAch dem Jahre 1700 wird
-in den Urkunden begonnen, den vollen Namen <q/Groß-Bartloff/ und
-<q/Klein-Bartloff/ zu schreiben.
----------------- [wegen dashed escaped text]
-<p>
-Nimmt man an, daß die urkundliche, älteste Bezeichnung Bartorf die
-ursprüngliche ist und nicht die mundartliche Bartloff, so könnte der
-Name gut gedeutet werden als Dorf an der <q/Borde/ oder am Rande
-oder an der Grenze entweder des Waldes
diff --git a/checks/plain-1o.asc b/checks/plain-1o.asc
new file mode 100644
index 000000000..973b29395
--- /dev/null
+++ b/checks/plain-1o.asc
@@ -0,0 +1,28 @@
+-----BEGIN PGP ARMORED FILE-----
+Version: GNUPG v0.3.4 (GNU/Linux)
+Comment: Get GNUPG from ftp://ftp.guug.de/pub/gcrypt/
+Comment: Use "gpgm --dearmor" for unpacking
+
+PCEtLSBEaWVzIGlzdCBTZWl0ZSAzLCBkb3J0IGlzdCBrZWluZSBTZWl0ZW56YWhsIGFuZ2Vn
+ZWJlbiwKICAgICBvYmVuIHJlY2h0cyBpc3Qgd2llZGVyIGRlciBTdGVtcGVsIHZvbiBtZWlu
+ZW0gT3BhIHp1IGZpbmRlbiAtLT4KCjxzZWN0MT5OYW1lIDxxPkdyb98tQmFydGxvZmY8Lz4K
+CjxwPgpEZXIgTmFtZSA8cS9CYXJ0bG9mZi8gaXN0IHNjaHdlciB6dSBkZXV0ZW4uIE1hbiBo
+YXQgdmllbGUgTXV0bWHfdW5nZW4KYW5nZXN0ZWxsdCwgdm9uIGRlbmVuIG1hbiBhYmVyIGJp
+c2xhbmcga2VpbmUgZWluemlnZSBhbHMgdW5iZWRpbmd0CnJpY2h0aWcgZXJrbORyZW4ga2Fu
+bi4KPGZvbnRpbmZvIHJlbT0ibWl0IExlZXJ6ZWljaGVuIGdlc2NocmllYmVuIj5Vcmt1bmRs
+aWNoPC8+IHdpcmQgZGFzCkRvcmYgYmlzIHp1ciBSZWZvcm1hdGlvbiBzdGV0cyA8cS9CYXJ0
+b3JmLyAoYW5ubyAxMjUzKSB1bmQKPHEvQmFyZG9yZi8gKDEzMDYsIDEzMTgsIDEzMjksIDE0
+MjkpIGdlbmFubnQgdW5kIGRhc18gc293b2hsIEtsZWluLQp3aWUgR3Jv32JhcnRsb2ZmLiBF
+cnN0IDE1ODYgaW0gQmlzY2hvZnNzdGVpbmVyIEp1cmlzZGlrdGlvbmFsYnVjaApoZWnfdCB1
+bnNlciBEb3JmIDxxL0JhcnR0ZWxvZmYvIHVuZCBzbyBhdWNoIGluIGRlciDkbHRlc3RlbiBu
+b2NoCnZvcmhhbmRlbmVuIEtpcmNoZW5yZWNobnVuZyB2b20gSmFocmUgMTY1MS4gTkFjaCBk
+ZW0gSmFocmUgMTcwMCB3aXJkCmluIGRlbiBVcmt1bmRlbiBiZWdvbm5lbiwgZGVuIHZvbGxl
+biBOYW1lbiA8cS9Hcm/fLUJhcnRsb2ZmLyB1bmQKPHEvS2xlaW4tQmFydGxvZmYvIHp1IHNj
+aHJlaWJlbi4KLS0tLS0tLS0tLS0tLS0tLSBbd2VnZW4gZGFzaGVkIGVzY2FwZWQgdGV4dF0K
+PHA+Ck5pbW10IG1hbiBhbiwgZGHfIGRpZSB1cmt1bmRsaWNoZSwg5Gx0ZXN0ZSBCZXplaWNo
+bnVuZyBCYXJ0b3JmIGRpZQp1cnNwcvxuZ2xpY2hlIGlzdCB1bmQgbmljaHQgZGllIG11bmRh
+cnRsaWNoZSBCYXJ0bG9mZiwgc28ga/ZubnRlIGRlcgpOYW1lIGd1dCBnZWRldXRldCB3ZXJk
+ZW4gYWxzIERvcmYgYW4gZGVyIDxxL0JvcmRlLyBvZGVyIGFtIFJhbmRlCm9kZXIgYW4gZGVy
+IEdyZW56ZSBlbnR3ZWRlciBkZXMgV2FsZGVzCg==
+=m1k/
+-----END PGP ARMORED FILE-----
diff --git a/checks/plain-2 b/checks/plain-2
deleted file mode 100644
index 5a10a970e..000000000
--- a/checks/plain-2
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-<sect>Vorwort
-<p>
-Der Wert einer Ortschronik ist offenbar und bedarf keiner Erörterung.
-Mit Ausbruch des Weltkrieges_, inmitten der gewaltigen Geschehnisse, fühlte
-der Klerus_ unseres_ Eichs_feldes_ das_ mehr wie früher und so
-erstarkte das_ Streben, eine solche Orts_geschichte zu scahffen, um
-unseren Nachkommen zu berichten, was_ auch die kleinsten Dörfer in
-der großen Zeit geleistet, erlebt und erlitten haben.
-<p>
-Und so begann auch ich im Dezember 1914, den ?????????
-Stoff, wo immer ich ihn auch nur so spärlich finden konnte, zu
-sammeln, ich befragte zunächst emsig die ältesten Leute,
-durchforschte sodann das ganze Pfarrarchiv, das Schulzenarchiv
-beider Pfarrdörfer, das Kommissariats_archiv zu Heiligenstadt,
-endlich auch 1916 das Staats_archiv zu Magdeburg. Selbstverständlich
-arbeitete ich auch die einschlägige Literatur durch. Gar viele Zeit
-und Mühe hat es_ gekostet um nach mehr als 8 Jahren die Ortschronik von
-Großbartloff und vom Filialdorf Wilbich gesondert zu schaffen.
-<p vspace="2ex">
-<bf>Großbartloff,</> den 23. März 1923.
-<p vspace="3ex" align=right>
-<bf/Nikolaus Göring,/ Pfarrer.
-</p>
-
-<!-- Hier folgt ein Stempel von meinem Opa:
-	  Rud. Koch
-     Großbartloff/Eichsfeld
-	Anger 161
--->
-<!-- FIXME: hier kommt einen Zierlinie -->
-
-<p vspace=fill> <!-- Der Rest kam am Ende der Seite -->
-<p align=center> Literatur: </p>
-1) Joh. Wolf: Politische Geschichte des Eichsf. Gött. 1792 und
-Löffler 1921. 2) K. Geschichte, Wolf 1816 Gött.  3) Knieb: Gesch.
-der Ref. u. Gegenref???
-
-<!-- FIXME: Der Rest fehlt noch -->
-
-
-
-
-
-
-
-
-</sect>
diff --git a/checks/plain-2o.asc b/checks/plain-2o.asc
new file mode 100644
index 000000000..562e5f06e
--- /dev/null
+++ b/checks/plain-2o.asc
@@ -0,0 +1,36 @@
+-----BEGIN PGP ARMORED FILE-----
+Version: GNUPG v0.3.4 (GNU/Linux)
+Comment: Get GNUPG from ftp://ftp.guug.de/pub/gcrypt/
+Comment: Use "gpgm --dearmor" for unpacking
+
+Cgo8c2VjdD5Wb3J3b3J0CjxwPgpEZXIgV2VydCBlaW5lciBPcnRzY2hyb25payBpc3Qgb2Zm
+ZW5iYXIgdW5kIGJlZGFyZiBrZWluZXIgRXL2cnRlcnVuZy4KTWl0IEF1c2JydWNoIGRlcyBX
+ZWx0a3JpZWdlc18sIGlubWl0dGVuIGRlciBnZXdhbHRpZ2VuIEdlc2NoZWhuaXNzZSwgZvxo
+bHRlCmRlciBLbGVydXNfIHVuc2VyZXNfIEVpY2hzX2ZlbGRlc18gZGFzXyBtZWhyIHdpZSBm
+cvxoZXIgdW5kIHNvCmVyc3Rhcmt0ZSBkYXNfIFN0cmViZW4sIGVpbmUgc29sY2hlIE9ydHNf
+Z2VzY2hpY2h0ZSB6dSBzY2FoZmZlbiwgdW0KdW5zZXJlbiBOYWNoa29tbWVuIHp1IGJlcmlj
+aHRlbiwgd2FzXyBhdWNoIGRpZSBrbGVpbnN0ZW4gRPZyZmVyIGluCmRlciBncm/fZW4gWmVp
+dCBnZWxlaXN0ZXQsIGVybGVidCB1bmQgZXJsaXR0ZW4gaGFiZW4uCjxwPgpVbmQgc28gYmVn
+YW5uIGF1Y2ggaWNoIGltIERlemVtYmVyIDE5MTQsIGRlbiA/Pz8/Pz8/Pz8KU3RvZmYsIHdv
+IGltbWVyIGljaCBpaG4gYXVjaCBudXIgc28gc3DkcmxpY2ggZmluZGVuIGtvbm50ZSwgenUK
+c2FtbWVsbiwgaWNoIGJlZnJhZ3RlIHp1buRjaHN0IGVtc2lnIGRpZSDkbHRlc3RlbiBMZXV0
+ZSwKZHVyY2hmb3JzY2h0ZSBzb2Rhbm4gZGFzIGdhbnplIFBmYXJyYXJjaGl2LCBkYXMgU2No
+dWx6ZW5hcmNoaXYKYmVpZGVyIFBmYXJyZPZyZmVyLCBkYXMgS29tbWlzc2FyaWF0c19hcmNo
+aXYgenUgSGVpbGlnZW5zdGFkdCwKZW5kbGljaCBhdWNoIDE5MTYgZGFzIFN0YWF0c19hcmNo
+aXYgenUgTWFnZGVidXJnLiBTZWxic3R2ZXJzdORuZGxpY2gKYXJiZWl0ZXRlIGljaCBhdWNo
+IGRpZSBlaW5zY2hs5GdpZ2UgTGl0ZXJhdHVyIGR1cmNoLiBHYXIgdmllbGUgWmVpdAp1bmQg
+TfxoZSBoYXQgZXNfIGdla29zdGV0IHVtIG5hY2ggbWVociBhbHMgOCBKYWhyZW4gZGllIE9y
+dHNjaHJvbmlrIHZvbgpHcm/fYmFydGxvZmYgdW5kIHZvbSBGaWxpYWxkb3JmIFdpbGJpY2gg
+Z2Vzb25kZXJ0IHp1IHNjaGFmZmVuLgo8cCB2c3BhY2U9IjJleCI+CjxiZj5Hcm/fYmFydGxv
+ZmYsPC8+IGRlbiAyMy4gTeRyeiAxOTIzLgo8cCB2c3BhY2U9IjNleCIgYWxpZ249cmlnaHQ+
+CjxiZi9OaWtvbGF1cyBH9nJpbmcsLyBQZmFycmVyLgo8L3A+Cgo8IS0tIEhpZXIgZm9sZ3Qg
+ZWluIFN0ZW1wZWwgdm9uIG1laW5lbSBPcGE6CgkgIFJ1ZC4gS29jaAogICAgIEdyb99iYXJ0
+bG9mZi9FaWNoc2ZlbGQKCUFuZ2VyIDE2MQotLT4KPCEtLSBGSVhNRTogaGllciBrb21tdCBl
+aW5lbiBaaWVybGluaWUgLS0+Cgo8cCB2c3BhY2U9ZmlsbD4gPCEtLSBEZXIgUmVzdCBrYW0g
+YW0gRW5kZSBkZXIgU2VpdGUgLS0+CjxwIGFsaWduPWNlbnRlcj4gTGl0ZXJhdHVyOiA8L3A+
+CjEpIEpvaC4gV29sZjogUG9saXRpc2NoZSBHZXNjaGljaHRlIGRlcyBFaWNoc2YuIEf2dHQu
+IDE3OTIgdW5kCkz2ZmZsZXIgMTkyMS4gMikgSy4gR2VzY2hpY2h0ZSwgV29sZiAxODE2IEf2
+dHQuICAzKSBLbmllYjogR2VzY2guCmRlciBSZWYuIHUuIEdlZ2VucmVmPz8/Cgo8IS0tIEZJ
+WE1FOiBEZXIgUmVzdCBmZWhsdCBub2NoIC0tPgoKCgoKCgoKCjwvc2VjdD4K
+=9nnj
+-----END PGP ARMORED FILE-----
diff --git a/checks/run-gpg b/checks/run-gpg
index 936ebf76d..4128e00d9 100755
--- a/checks/run-gpg
+++ b/checks/run-gpg
@@ -2,7 +2,9 @@
 
 [ -n "$show_cmds" ] && echo "../g10/gpg --homedir . $*"
 
-if ! ../g10/gpg --homedir . $* 2>err.tmp.$$ ; then
+if ../g10/gpg --homedir . $* 2>err.tmp.$$ ; then
+    :
+else
     echo "(../g10/gpg --homedir . $*) failed" >&2
     cat err.tmp.$$ >&2
     rm err.tmp.$$
diff --git a/checks/run-gpgm b/checks/run-gpgm
index 847ce15b9..9afbee393 100755
--- a/checks/run-gpgm
+++ b/checks/run-gpgm
@@ -1,6 +1,8 @@
 #!/bin/sh
 
-if ! ../g10/gpgm --homedir . $* 2>err.tmp.$$ ; then
+if ../g10/gpgm --homedir . $* 2>err.tmp.$$ ; then
+    :
+else
     echo "(../g10/gpgm --homedir . $*) failed" >&2
     cat err.tmp.$$ >&2
     rm err.tmp.$$
diff --git a/checks/seat.test b/checks/seat.test
index 7e95b8bd8..25fa54a53 100755
--- a/checks/seat.test
+++ b/checks/seat.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. defs.inc || exit 3
+. $srcdir/defs.inc || exit 3
 
 for i in $plain_files ; do
     echo "$usrpass1" | ./run-gpg --passphrase-fd 0 -seat -r two -o x --yes $i
diff --git a/checks/signencrypt-dsa.test b/checks/signencrypt-dsa.test
index 9a7f46bd7..eae61ffeb 100755
--- a/checks/signencrypt-dsa.test
+++ b/checks/signencrypt-dsa.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. defs.inc || exit 3
+. $srcdir/defs.inc || exit 3
 
 #info Checking signing and encryption for DSA
 for i in $plain_files $data_files ; do
diff --git a/checks/signencrypt.test b/checks/signencrypt.test
index 9a0418779..5e79b4c88 100755
--- a/checks/signencrypt.test
+++ b/checks/signencrypt.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. defs.inc || exit 3
+. $srcdir/defs.inc || exit 3
 
 
 #info Checking signing and encryption
diff --git a/checks/sigs-dsa.test b/checks/sigs-dsa.test
index 4e532c0c0..8d4bfd556 100755
--- a/checks/sigs-dsa.test
+++ b/checks/sigs-dsa.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. defs.inc || exit 3
+. $srcdir/defs.inc || exit 3
 
 #info Checking DSA signatures (default digest algo)
 for i in $plain_files $data_files; do
diff --git a/checks/sigs.test b/checks/sigs.test
index f3766a814..298c9b358 100755
--- a/checks/sigs.test
+++ b/checks/sigs.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. defs.inc || exit 3
+. $srcdir/defs.inc || exit 3
 
 #info Checking signatures
 for i in $plain_files $data_files; do
diff --git a/checks/version.test b/checks/version.test
index d7845bbc1..55dfe80df 100755
--- a/checks/version.test
+++ b/checks/version.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. defs.inc || exit 3
+. $srcdir/defs.inc || exit 3
 
 # print the GPG version
 ./run-gpg --version