From schizo@debian.org  Sun May  8 07:40:02 2005
Return-Path: <schizo@debian.org>
Delivered-To: unknown
Received: from scooby.scoobynet (192.168.0.1) by localhost.localdomain with
  POP3; 07 May 2005 21:40:02 -0000
Delivered-To: lbreyer-laird@lbreyer.com
Received: from pop.adventcreative.co.uk [81.21.72.109]
	by localhost with POP3 (fetchmail-6.2.5)
	for laird@localhost (single-drop); Sun, 08 May 2005 07:35:03 +1000 (EST)
Received: (qmail 12211 invoked from network); 7 May 2005 21:29:11 -0000
Received: from schizo@debian.org by ds520.dedicated.turbodns.co.uk by uid 1005 with qmail-scanner-1.22 
 ( Clear:RC:0(216.254.112.45):. 
 Processed in 0.818369 secs); 07 May 2005 21:29:11 -0000
Received: from unknown (HELO acolyte.scowler.net) (216.254.112.45)
  by ds520.dedicated.turbodns.co.uk with SMTP; 7 May 2005 21:29:09 -0000
Received: by acolyte.scowler.net (Postfix, from userid 1000)
	id ADD0170046; Sat,  7 May 2005 17:27:27 -0400 (EDT)
Date: Sat, 7 May 2005 17:27:27 -0400
From: Clint Adams <schizo@debian.org>
To: laird@lbreyer.com
Subject: vpath patch
Message-ID: <20050507212727.GA4477@scowler.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.5.9i
X-DBACL-Says: notspam # 100%
Status: RO
X-Status: A
Content-Length: 14971
Lines: 532

With these changes, dbacl will build and pass all tests in a directory
other than the source directory.  Please incorporate.

--- dbacl-1.9.orig/src/Makefile.am
+++ dbacl-1.9/src/Makefile.am
@@ -28,10 +28,10 @@
 EXTRA_DIST = README mailcross.in mailtoe.in mailfoot.in mailtest.functions.in plot-scores.sh
 
 mb.o: mbw.c dbacl.h mbw.h
-	$(COMPILE) -DMBW_MB -c mbw.c -o $@
+	$(COMPILE) -DMBW_MB -c $(srcdir)/mbw.c -o $@
 
 wc.o: mbw.c dbacl.h mbw.h
-	$(COMPILE) -DMBW_WIDE -c mbw.c -o $@
+	$(COMPILE) -DMBW_WIDE -c $(srcdir)/mbw.c -o $@
 
 SUFFIXES = .in
 
@@ -50,4 +50,4 @@
 
 pcheck_SOURCES = hparse.c
 pcheck: hparse.c hmine.h dbacl.h rfc822.c rfc2822.c
-	$(COMPILE) -DTEST_PARSER hparse.c rfc822.c rfc2822.c util.o fram.o jenkins.o -o pcheck
+	$(COMPILE) -DTEST_PARSER $(srcdir)/hparse.c $(srcdir)/rfc822.c $(srcdir)/rfc2822.c util.o fram.o jenkins.o -o pcheck
--- dbacl-1.9.orig/src/tests/Makefile.am
+++ dbacl-1.9/src/tests/Makefile.am
@@ -42,7 +42,7 @@
 TESTS = $(BTESTS) $(LTESTS) $(MLTESTS) $(EMTESTS) $(CTESTS) $(HTESTS)
 
 # tests expected to fail in OSes with incomplete unicode
-XFAIL_TESTS= email-forms.sh email-pgp.sh html-alt.sh email-badmime1.sh
+#XFAIL_TESTS= email-forms.sh email-pgp.sh html-alt.sh email-badmime1.sh
 
 SAMPLEIN = sample.spam-1 sample.spam-2 sample.spam-3 sample.spam-4 \
 	sample.email-5 sample.email-6 sample.spam-7 sample.spam-8 \
@@ -61,7 +61,7 @@
 
 # use this for debugging test scripts
 #TESTS_ENVIRONMENT = TESTBIN=$(srcdir)/.. DOCDIR=$(srcdir)/../../doc $(SHELL) -x
-TESTS_ENVIRONMENT = TESTBIN=$(srcdir)/.. DOCDIR=$(srcdir)/../../doc
+TESTS_ENVIRONMENT = TESTBIN=$(CURDIR)/.. DOCDIR=$(srcdir)/../../doc sourcedir=$(srcdir)
 
 check_SCRIPTS = $(BTESTS) $(LTESTS) $(MLTESTS) $(EMTESTS) $(CTESTS) $(HTESTS)
 
--- dbacl-1.9.orig/src/tests/dbacl-a.shin
+++ dbacl-1.9/src/tests/dbacl-a.shin
@@ -13,5 +13,5 @@
 
 prerequisite_command $0 tr
 
-test 91 -eq `cat sample.spam-1 | $DBACL -R -a -n -v | wc -l`
+test 91 -eq `cat ${sourcedir}/sample.spam-1 | $DBACL -R -a -n -v | wc -l`
 
--- dbacl-1.9.orig/src/tests/dbacl-o.shin
+++ dbacl-1.9/src/tests/dbacl-o.shin
@@ -18,15 +18,15 @@
 
 mkdir "$DBACL_PATH"
 
-(echo "From -" ; cat sample.spam-1 ; echo ; echo "From -" ; cat sample.spam-2) \
+(echo "From -" ; cat ${sourcedir}/sample.spam-1 ; echo ; echo "From -" ; cat ${sourcedir}/sample.spam-2) \
     | $DBACL -0 -l dummy -T email
 head -3 $DBACL_PATH/dummy \
     | grep '^# hash' \
     > $DBACL_PATH/out1
 
-(echo "From -" ; cat sample.spam-1) \
+(echo "From -" ; cat ${sourcedir}/sample.spam-1) \
     | $DBACL -0 -l dummy -T email -o dummy.onl
-(echo "From -" ; cat sample.spam-2) \
+(echo "From -" ; cat ${sourcedir}/sample.spam-2) \
     | $DBACL -0 -l dummy -T email -o dummy.onl
 head -3 $DBACL_PATH/dummy \
     | grep '^# hash' \
--- dbacl-1.9.orig/src/tests/html.shin
+++ dbacl-1.9/src/tests/html.shin
@@ -19,12 +19,12 @@
 
 mkdir "$DBACL_PATH"
 
-cat sample.spam-2 \
+cat ${sourcedir}/sample.spam-2 \
     | $DBACL -R -D -T html \
     | tr -s '[ \t\r\n]' \
     > "$DBACL_PATH/out"
 
-diff verify.html "$DBACL_PATH/out"
+diff ${sourcedir}/verify.html "$DBACL_PATH/out"
 
 RESULT=$?
 rm -rf "$DBACL_PATH"
--- dbacl-1.9.orig/src/tests/html-links.shin
+++ dbacl-1.9/src/tests/html-links.shin
@@ -19,12 +19,12 @@
 
 mkdir "$DBACL_PATH"
 
-cat sample.spam-2 \
+cat ${sourcedir}/sample.spam-2 \
     | $DBACL -R -D -T html -T html:links \
     | tr -s '[ \t\r\n]' \
     > "$DBACL_PATH/out"
 
-diff verify.html-links "$DBACL_PATH/out"
+diff ${sourcedir}/verify.html-links "$DBACL_PATH/out"
 
 RESULT=$?
 rm -rf "$DBACL_PATH"
--- dbacl-1.9.orig/src/tests/html-alt.shin
+++ dbacl-1.9/src/tests/html-alt.shin
@@ -19,12 +19,12 @@
 
 mkdir "$DBACL_PATH"
 
-cat sample.spam-3 \
+cat ${sourcedir}/sample.spam-3 \
     | $DBACL -R -D -T html -T html:alt \
     | tr -s '[ \t\r\n]' \
     > "$DBACL_PATH/out"
 
-diff verify.html-alt "$DBACL_PATH/out"
+diff ${sourcedir}/verify.html-alt "$DBACL_PATH/out"
 
 RESULT=$?
 rm -rf "$DBACL_PATH"
--- dbacl-1.9.orig/src/tests/xml.shin
+++ dbacl-1.9/src/tests/xml.shin
@@ -18,11 +18,11 @@
 
 mkdir "$DBACL_PATH"
 
-cat sample.spam-2 \
+cat ${sourcedir}/sample.spam-2 \
     | $DBACL -R -D -T xml | tr -s '[ \t\r\n]' \
     > "$DBACL_PATH/out"
 
-diff verify.xml "$DBACL_PATH/out"
+diff ${sourcedir}/verify.xml "$DBACL_PATH/out"
 
 RESULT=$?
 rm -rf "$DBACL_PATH"
--- dbacl-1.9.orig/src/tests/email-mbox.shin
+++ dbacl-1.9/src/tests/email-mbox.shin
@@ -20,11 +20,11 @@
 
 mkdir "$DBACL_PATH"
 
-(echo "From -" ; cat sample.spam-1 ; echo ; echo "From -" ; cat sample.spam-2) \
+(echo "From -" ; cat ${sourcedir}/sample.spam-1 ; echo ; echo "From -" ; cat ${sourcedir}/sample.spam-2) \
     | $DBACL -l dummy -T email \
     > "$DBACL_PATH/out"
 NUM=`head -3 "$DBACL_PATH/dummy" | grep '# hash_size' | cut -d ' ' -f 9`
 
 rm -rf "$DBACL_PATH"
 
-test x$NUM = x"2"
\ No newline at end of file
+test x$NUM = x"2"
--- dbacl-1.9.orig/src/tests/email-maildir.shin
+++ dbacl-1.9/src/tests/email-maildir.shin
@@ -19,10 +19,10 @@
 
 mkdir "$DBACL_PATH"
 
-$DBACL -l dummy -T email sample.spam-1 sample.spam-2 \
+$DBACL -l dummy -T email ${sourcedir}/sample.spam-1 ${sourcedir}/sample.spam-2 \
     > "$DBACL_PATH/out"
 NUM=`head -3 "$DBACL_PATH/dummy" | grep '# hash_size' | cut -d ' ' -f 9`
 
 rm -rf "$DBACL_PATH"
 
-test x$NUM = x"2"
\ No newline at end of file
+test x$NUM = x"2"
--- dbacl-1.9.orig/src/tests/email-l.shin
+++ dbacl-1.9/src/tests/email-l.shin
@@ -19,14 +19,14 @@
 
 mkdir "$DBACL_PATH"
 
-cat sample.spam-2 \
+cat ${sourcedir}/sample.spam-2 \
     | $DBACL -R -D -T email \
     | tr -s '[ \t\n\r]' \
     > "$DBACL_PATH/out"
 
-diff verify.email-l "$DBACL_PATH/out"
+diff ${sourcedir}/verify.email-l "$DBACL_PATH/out"
 
 RESULT=$?
 rm -rf "$DBACL_PATH"
 
-exit $RESULT
\ No newline at end of file
+exit $RESULT
--- dbacl-1.9.orig/src/tests/email-pgp.shin
+++ dbacl-1.9/src/tests/email-pgp.shin
@@ -19,12 +19,12 @@
 
 mkdir "$DBACL_PATH"
 
-cat sample.spam-4 \
+cat ${sourcedir}/sample.spam-4 \
     | $DBACL -R -D -T email \
     | tr -s '[ \t\n\r]' \
     > "$DBACL_PATH/out"
 
-diff verify.email-pgp "$DBACL_PATH/out"
+diff ${sourcedir}/verify.email-pgp "$DBACL_PATH/out"
 
 RESULT=$?
 rm -rf "$DBACL_PATH"
--- dbacl-1.9.orig/src/tests/email-uu.shin
+++ dbacl-1.9/src/tests/email-uu.shin
@@ -19,12 +19,12 @@
 
 mkdir "$DBACL_PATH"
 
-cat sample.email-5 \
+cat ${sourcedir}/sample.email-5 \
     | $DBACL -R -D -T email \
     | tr -s '[ \t\n\r]' \
     > "$DBACL_PATH/out"
 
-diff verify.email-uu "$DBACL_PATH/out"
+diff ${sourcedir}/verify.email-uu "$DBACL_PATH/out"
 
 RESULT=$?
 rm -rf "$DBACL_PATH"
--- dbacl-1.9.orig/src/tests/email-headers.shin
+++ dbacl-1.9/src/tests/email-headers.shin
@@ -19,14 +19,14 @@
 
 mkdir "$DBACL_PATH"
 
-cat sample.spam-2 \
+cat ${sourcedir}/sample.spam-2 \
     | $DBACL -R -D -T email -T email:headers \
     | tr -s '[ \t\n\r]' \
     > "$DBACL_PATH/out"
 
-diff verify.email-headers "$DBACL_PATH/out"
+diff ${sourcedir}/verify.email-headers "$DBACL_PATH/out"
 
 RESULT=$?
 rm -rf "$DBACL_PATH"
 
-exit $RESULT
\ No newline at end of file
+exit $RESULT
--- dbacl-1.9.orig/src/tests/email-xheaders.shin
+++ dbacl-1.9/src/tests/email-xheaders.shin
@@ -19,12 +19,12 @@
 
 mkdir "$DBACL_PATH"
 
-cat sample.spam-2 \
+cat ${sourcedir}/sample.spam-2 \
     | $DBACL -R -D -T email -T email:xheaders \
     | tr -s '[ \t\n\r]' \
     > "$DBACL_PATH/out"
 
-diff verify.email-xheaders "$DBACL_PATH/out"
+diff ${sourcedir}/verify.email-xheaders "$DBACL_PATH/out"
 
 RESULT=$?
 rm -rf "$DBACL_PATH"
--- dbacl-1.9.orig/src/tests/email-theaders.shin
+++ dbacl-1.9/src/tests/email-theaders.shin
@@ -19,12 +19,12 @@
 
 mkdir "$DBACL_PATH"
 
-cat sample.spam-4 \
+cat ${sourcedir}/sample.spam-4 \
     | $DBACL -R -D -T email -T email:theaders \
     | tr -s '[ \t\n\r]' \
     > "$DBACL_PATH/out"
 
-diff verify.email-theaders "$DBACL_PATH/out"
+diff ${sourcedir}/verify.email-theaders "$DBACL_PATH/out"
 
 RESULT=$?
 rm -rf "$DBACL_PATH"
--- dbacl-1.9.orig/src/tests/email-badmime1.shin
+++ dbacl-1.9/src/tests/email-badmime1.shin
@@ -19,14 +19,14 @@
 
 mkdir "$DBACL_PATH"
 
-cat sample.email-6 \
+cat ${sourcedir}/sample.email-6 \
     | $DBACL -R -D -T email -T email:headers \
     | tr -s '[ \t\n\r]' \
     > "$DBACL_PATH/out"
 
-diff verify.email-badmime1 "$DBACL_PATH/out"
+diff ${sourcedir}/verify.email-badmime1 "$DBACL_PATH/out"
 
 RESULT=$?
 rm -rf "$DBACL_PATH"
 
-exit $RESULT
\ No newline at end of file
+exit $RESULT
--- dbacl-1.9.orig/src/tests/email-badmime2.shin
+++ dbacl-1.9/src/tests/email-badmime2.shin
@@ -19,14 +19,14 @@
 
 mkdir "$DBACL_PATH"
 
-cat sample.spam-7 \
+cat ${sourcedir}/sample.spam-7 \
     | $DBACL -R -D -T email -T email:headers \
     | tr -s '[ \t\n\r]' \
     > "$DBACL_PATH/out"
 
-diff verify.email-badmime2 "$DBACL_PATH/out"
+diff ${sourcedir}/verify.email-badmime2 "$DBACL_PATH/out"
 
 RESULT=$?
 rm -rf "$DBACL_PATH"
 
-exit $RESULT
\ No newline at end of file
+exit $RESULT
--- dbacl-1.9.orig/src/tests/email-uri.shin
+++ dbacl-1.9/src/tests/email-uri.shin
@@ -19,12 +19,12 @@
 
 mkdir "$DBACL_PATH"
 
-cat sample.spam-8 \
+cat ${sourcedir}/sample.spam-8 \
     | $DBACL -R -D -T email -T email:headers -T html:links \
     | tr -s '[ \t\n\r]' \
     > "$DBACL_PATH/out"
 
-diff verify.email-uri "$DBACL_PATH/out"
+diff ${sourcedir}/verify.email-uri "$DBACL_PATH/out"
 
 RESULT=$?
 rm -rf "$DBACL_PATH"
--- dbacl-1.9.orig/src/tests/email-forms.shin
+++ dbacl-1.9/src/tests/email-forms.shin
@@ -19,14 +19,14 @@
 
 mkdir "$DBACL_PATH"
 
-cat sample.spam-9 \
+cat ${sourcedir}/sample.spam-9 \
     | $DBACL -R -D -T email -T html:forms \
     | tr -s '[ \t\r\n]' \
     > "$DBACL_PATH/out"
 
-diff verify.email-forms "$DBACL_PATH/out"
+diff ${sourcedir}/verify.email-forms "$DBACL_PATH/out"
 
 RESULT=$?
 rm -rf "$DBACL_PATH"
 
-exit $RESULT
\ No newline at end of file
+exit $RESULT
--- dbacl-1.9.orig/src/tests/email-scripts.shin
+++ dbacl-1.9/src/tests/email-scripts.shin
@@ -19,12 +19,12 @@
 
 mkdir "$DBACL_PATH"
 
-cat sample.spam-10 \
+cat ${sourcedir}/sample.spam-10 \
     | $DBACL -R -D -T email -T html:scripts \
     | tr -s '[ \t\r\n]' \
     > "$DBACL_PATH/out"
 
-diff verify.email-scripts "$DBACL_PATH/out"
+diff ${sourcedir}/verify.email-scripts "$DBACL_PATH/out"
 
 RESULT=$?
 rm -rf "$DBACL_PATH"
--- dbacl-1.9.orig/src/tests/shannon-1.shin
+++ dbacl-1.9/src/tests/shannon-1.shin
@@ -23,10 +23,10 @@
 
 mkdir "$DBACL_PATH"
 
-(echo ; echo "From - -" ; cat sample.spam-1 ; \
- echo ; echo "From - -" ; cat sample.spam-1 ; \
- echo ; echo "From - -" ; cat sample.spam-1 ; \
- echo ; echo "From - -" ; cat sample.spam-1 ; ) \
+(echo ; echo "From - -" ; cat ${sourcedir}/sample.spam-1 ; \
+ echo ; echo "From - -" ; cat ${sourcedir}/sample.spam-1 ; \
+ echo ; echo "From - -" ; cat ${sourcedir}/sample.spam-1 ; \
+ echo ; echo "From - -" ; cat ${sourcedir}/sample.spam-1 ; ) \
     > "$DBACL_PATH/mbox"
 
 cat $DBACL_PATH/mbox \
--- dbacl-1.9.orig/src/tests/shannon-2.shin
+++ dbacl-1.9/src/tests/shannon-2.shin
@@ -24,10 +24,10 @@
 
 mkdir "$DBACL_PATH"
 
-(echo ; echo "From - -" ; cat sample.spam-1 ; \
- echo ; echo "From - -" ; cat sample.spam-1 ; \
- echo ; echo "From - -" ; cat sample.spam-1 ; \
- echo ; echo "From - -" ; cat sample.spam-1 ; ) \
+(echo ; echo "From - -" ; cat ${sourcedir}/sample.spam-1 ; \
+ echo ; echo "From - -" ; cat ${sourcedir}/sample.spam-1 ; \
+ echo ; echo "From - -" ; cat ${sourcedir}/sample.spam-1 ; \
+ echo ; echo "From - -" ; cat ${sourcedir}/sample.spam-1 ; ) \
     > "$DBACL_PATH/mbox"
 
 cat "$DBACL_PATH/mbox" \
--- dbacl-1.9.orig/src/tests/score-1.shin
+++ dbacl-1.9/src/tests/score-1.shin
@@ -20,14 +20,14 @@
 
 mkdir "$DBACL_PATH"
 
-cat sample.spam-2 \
+cat ${sourcedir}/sample.spam-2 \
     | $DBACL -0 -l dummy -X -d -T email \
     | grep '# shannon' \
     | awk '{print $5/log(2)}' \
     | tr '\n' ' ' \
     > "$DBACL_PATH/out1"
 
-cat sample.spam-2 \
+cat ${sourcedir}/sample.spam-2 \
     | $DBACL -c dummy -vX \
     | awk '{print $3, $5}' \
     > "$DBACL_PATH/out2"
--- dbacl-1.9.orig/src/tests/score-2.shin
+++ dbacl-1.9/src/tests/score-2.shin
@@ -21,10 +21,10 @@
 
 mkdir "$DBACL_PATH"
 
-(cat sample.spam-8 ; echo ; \
- cat sample.spam-9 ; echo ; \
- cat sample.spam-7 ; echo ; \
- cat sample.spam-3 ) \
+(cat ${sourcedir}/sample.spam-8 ; echo ; \
+ cat ${sourcedir}/sample.spam-9 ; echo ; \
+ cat ${sourcedir}/sample.spam-7 ; echo ; \
+ cat ${sourcedir}/sample.spam-3 ) \
     > "$DBACL_PATH/mbox"
 
 cat "$DBACL_PATH/mbox" \
--- dbacl-1.9.orig/src/tests/reservoir.shin
+++ dbacl-1.9/src/tests/reservoir.shin
@@ -20,10 +20,10 @@
 
 mkdir "$DBACL_PATH"
 
-(cat sample.spam-8 ; echo ; \
- cat sample.spam-9 ; echo ; \
- cat sample.spam-7 ; echo ; \
- cat sample.spam-3 ) \
+(cat ${sourcedir}/sample.spam-8 ; echo ; \
+ cat ${sourcedir}/sample.spam-9 ; echo ; \
+ cat ${sourcedir}/sample.spam-7 ; echo ; \
+ cat ${sourcedir}/sample.spam-3 ) \
     > "$DBACL_PATH/mbox"
 
 cat "$DBACL_PATH/mbox" \
--- dbacl-1.9.orig/src/tests/pcheck-822g.shin
+++ dbacl-1.9/src/tests/pcheck-822g.shin
@@ -6,4 +6,4 @@
 DBACL=$TESTBIN/dbacl
 PCHECK=$TESTBIN/pcheck
 
-cat sample.headers-822g | $PCHECK 822 good
+cat ${sourcedir}/sample.headers-822g | $PCHECK 822 good
--- dbacl-1.9.orig/src/tests/pcheck-822b.shin
+++ dbacl-1.9/src/tests/pcheck-822b.shin
@@ -6,4 +6,4 @@
 DBACL=$TESTBIN/dbacl
 PCHECK=$TESTBIN/pcheck
 
-cat sample.headers-822b | $PCHECK 822 bad
+cat ${sourcedir}/sample.headers-822b | $PCHECK 822 bad
--- dbacl-1.9.orig/src/tests/pcheck-821g.shin
+++ dbacl-1.9/src/tests/pcheck-821g.shin
@@ -6,4 +6,4 @@
 DBACL=$TESTBIN/dbacl
 PCHECK=$TESTBIN/pcheck
 
-cat sample.headers-821g | $PCHECK 821 good
+cat ${sourcedir}/sample.headers-821g | $PCHECK 821 good
--- dbacl-1.9.orig/src/tests/pcheck-821b.shin
+++ dbacl-1.9/src/tests/pcheck-821b.shin
@@ -6,4 +6,4 @@
 DBACL=$TESTBIN/dbacl
 PCHECK=$TESTBIN/pcheck
 
-cat sample.headers-821b | $PCHECK 821 bad
+cat ${sourcedir}/sample.headers-821b | $PCHECK 821 bad
--- dbacl-1.9.orig/src/tests/pcheck-2822g.shin
+++ dbacl-1.9/src/tests/pcheck-2822g.shin
@@ -6,4 +6,4 @@
 DBACL=$TESTBIN/dbacl
 PCHECK=$TESTBIN/pcheck
 
-cat sample.headers-2822g | $PCHECK 2822 good
+cat ${sourcedir}/sample.headers-2822g | $PCHECK 2822 good
--- dbacl-1.9.orig/src/tests/pcheck-2822b.shin
+++ dbacl-1.9/src/tests/pcheck-2822b.shin
@@ -6,4 +6,4 @@
 DBACL=$TESTBIN/dbacl
 PCHECK=$TESTBIN/pcheck
 
-cat sample.headers-2822b | $PCHECK 2822 bad
+cat ${sourcedir}/sample.headers-2822b | $PCHECK 2822 bad
--- dbacl-1.9.orig/src/tests/pcheck-2821g.shin
+++ dbacl-1.9/src/tests/pcheck-2821g.shin
@@ -6,4 +6,4 @@
 DBACL=$TESTBIN/dbacl
 PCHECK=$TESTBIN/pcheck
 
-cat sample.headers-2821g | $PCHECK 2821 good
+cat ${sourcedir}/sample.headers-2821g | $PCHECK 2821 good
--- dbacl-1.9.orig/src/tests/pcheck-2821b.shin
+++ dbacl-1.9/src/tests/pcheck-2821b.shin
@@ -6,4 +6,4 @@
 DBACL=$TESTBIN/dbacl
 PCHECK=$TESTBIN/pcheck
 
-cat sample.headers-2821b | $PCHECK 2821 bad
+cat ${sourcedir}/sample.headers-2821b | $PCHECK 2821 bad

From laird@lbreyer.com Sun May  8 14:59:27 2005
Date: Sun, 8 May 2005 14:59:27 +1000
From: Laird Breyer <laird@lbreyer.com>
To: Clint Adams <schizo@debian.org>
Subject: Re: vpath patch
Message-ID: <20050508045927.GA8287@ender>
Reply-To: laird@lbreyer.com
References: <20050507212727.GA4477@scowler.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20050507212727.GA4477@scowler.net>
User-Agent: Mutt/1.5.9i
Status: RO
Content-Length: 450
Lines: 13

On May 07 2005, Clint Adams wrote:
> With these changes, dbacl will build and pass all tests in a directory
> other than the source directory.  Please incorporate.

Hi Clint,

Many thanks for the patch. I'm happy to add it into the next version
which will be ready very soon. As this is a small logical change, can I
assume you disclaim any copyright for your patch? Please let me know
and I will add it to the code base.

Best regards
Laird Breyer.

From schizo@debian.org  Sun May  8 23:30:02 2005
Return-Path: <schizo@debian.org>
Delivered-To: unknown
Received: from scooby.scoobynet (192.168.0.1) by localhost.localdomain with
  POP3; 08 May 2005 13:30:02 -0000
Delivered-To: lbreyer-laird@lbreyer.com
Received: from pop.adventcreative.co.uk [81.21.72.109]
	by localhost with POP3 (fetchmail-6.2.5)
	for laird@localhost (single-drop); Sun, 08 May 2005 23:28:09 +1000 (EST)
Received: (qmail 16480 invoked from network); 8 May 2005 13:26:05 -0000
Received: from schizo@debian.org by ds520.dedicated.turbodns.co.uk by uid 1005 with qmail-scanner-1.22 
 ( Clear:RC:0(216.254.112.45):. 
 Processed in 0.031019 secs); 08 May 2005 13:26:05 -0000
Received: from unknown (HELO acolyte.scowler.net) (216.254.112.45)
  by ds520.dedicated.turbodns.co.uk with SMTP; 8 May 2005 13:26:05 -0000
Received: by acolyte.scowler.net (Postfix, from userid 1000)
	id 68C6A70046; Sun,  8 May 2005 09:24:19 -0400 (EDT)
Date: Sun, 8 May 2005 09:24:19 -0400
From: Clint Adams <schizo@debian.org>
To: Laird Breyer <laird@lbreyer.com>
Subject: Re: vpath patch
Message-ID: <20050508132419.GA31627@scowler.net>
References: <20050507212727.GA4477@scowler.net> <20050508045927.GA8287@ender>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20050508045927.GA8287@ender>
User-Agent: Mutt/1.5.9i
X-DBACL-Says: notspam # 100%
Status: RO
Content-Length: 301
Lines: 6

> Many thanks for the patch. I'm happy to add it into the next version
> which will be ready very soon. As this is a small logical change, can I
> assume you disclaim any copyright for your patch? Please let me know
> and I will add it to the code base.

Yes, I don't think it's copyrightable either.