testsuite update

12 files changed, 559 insertions, 637 deletions

diff --git a/testsuite/normal/pbuilder-build-dsh-etch.log b/testsuite/normal/pbuilder-build-dsh-etch.log
index 7d5ce19..d386e64 100644
--- a/testsuite/normal/pbuilder-build-dsh-etch.log
+++ b/testsuite/normal/pbuilder-build-dsh-etch.log
@@ -2,20 +2,20 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Sun Oct 29 12:08:25 JST 2006
-pbuilder-time-stamp: 1162091305
+Current time: Mon Nov 13 12:07:47 JST 2006
+pbuilder-time-stamp: 1163387267
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
 Installing the build-deps
- -> Attempting to parse the build-deps : pbuilder-satisfydepends,v 1.28 2006/05/30 23:45:45 dancer Exp $
- -> Considering  debhelper (>> 3.0.0)
+ -> Attempting to parse the build-deps : pbuilder-satisfydepends,v 1.29 2006/11/06 20:20:56 lool Exp $
+ -> Considering build-dep debhelper (>> 3.0.0)
    -> Trying debhelper
- -> Considering  libdshconfig1-dev (>= 0.20.11-1)
+ -> Considering build-dep libdshconfig1-dev (>= 0.20.11-1)
    -> Trying libdshconfig1-dev
  -> Installing  debhelper libdshconfig1-dev
 Reading package lists...
@@ -30,20 +30,20 @@ The following NEW packages will be installed:
   debhelper file gettext html2text intltool-debian libdshconfig1
   libdshconfig1-dev libmagic1 po-debconf
 0 upgraded, 9 newly installed, 0 to remove and 0 not upgraded.
-Need to get 2917kB of archives.
-After unpacking 9544kB of additional disk space will be used.
+Need to get 2912kB of archives.
+After unpacking 9613kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org etch/main libmagic1 4.17-4 [277kB]
 Get:2 http://ftp.jp.debian.org etch/main file 4.17-4 [32.0kB]
 Get:3 http://ftp.jp.debian.org etch/main html2text 1.3.2a-3 [92.7kB]
 Get:4 http://ftp.jp.debian.org etch/main gettext 0.14.6-1 [1827kB]
 Get:5 http://ftp.jp.debian.org etch/main intltool-debian 0.35.0+20060710.1 [30.8kB]
-Get:6 http://ftp.jp.debian.org etch/main po-debconf 1.0.6 [111kB]
+Get:6 http://ftp.jp.debian.org etch/main po-debconf 1.0.7 [106kB]
 Get:7 http://ftp.jp.debian.org etch/main debhelper 5.0.40 [510kB]
 Get:8 http://ftp.jp.debian.org etch/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:9 http://ftp.jp.debian.org etch/main libdshconfig1-dev 0.20.12-2 [25.3kB]
-Fetched 2917kB in 2s (1370kB/s)
+Fetched 2912kB in 1s (1773kB/s)
 Selecting previously deselected package libmagic1.
-(Reading database ... 12071 files and directories currently installed.)
+(Reading database ... 12086 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.17-4_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.17-4_amd64.deb) ...
@@ -54,7 +54,7 @@ Unpacking gettext (from .../gettext_0.14.6-1_amd64.deb) ...
 Selecting previously deselected package intltool-debian.
 Unpacking intltool-debian (from .../intltool-debian_0.35.0+20060710.1_all.deb) ...
 Selecting previously deselected package po-debconf.
-Unpacking po-debconf (from .../po-debconf_1.0.6_all.deb) ...
+Unpacking po-debconf (from .../po-debconf_1.0.7_all.deb) ...
 Selecting previously deselected package debhelper.
 Unpacking debhelper (from .../debhelper_5.0.40_all.deb) ...
 Selecting previously deselected package libdshconfig1.
@@ -69,7 +69,7 @@ Setting up html2text (1.3.2a-3) ...
 Setting up gettext (0.14.6-1) ...
 
 Setting up intltool-debian (0.35.0+20060710.1) ...
-Setting up po-debconf (1.0.6) ...
+Setting up po-debconf (1.0.7) ...
 Setting up debhelper (5.0.40) ...
 Setting up libdshconfig1 (0.20.12-2) ...
 
@@ -83,16 +83,16 @@ The following NEW packages will be installed:
 Need to get 97.4kB of archives.
 After unpacking 406kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org etch/main fakeroot 1.5.10 [97.4kB]
-Fetched 97.4kB in 0s (970kB/s)
+Fetched 97.4kB in 0s (1074kB/s)
 Selecting previously deselected package fakeroot.
-(Reading database ... 12670 files and directories currently installed.)
+(Reading database ... 12683 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.10_amd64.deb) ...
 Setting up fakeroot (1.5.10) ...
 
 Copying source file
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir1/dsh_0.25.7-1.dsc]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir1/dsh_0.25.7.orig.tar.gz]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir1/dsh_0.25.7-1.diff.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir1/dsh_0.25.7-1.dsc]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir1/dsh_0.25.7.orig.tar.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir1/dsh_0.25.7-1.diff.gz]
 Extracting source
 dpkg-source: warning: no utmp entry available and LOGNAME not defined; using uid of process (1234)
 gpg: new configuration file `/tmp/buildd/.gnupg/gpg.conf' created
@@ -421,7 +421,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sun Oct 29 03:09:03 UTC 2006
+Mon Nov 13 03:08:21 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -491,7 +491,7 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Sun Oct 29 03:09:08 UTC 2006
+Mon Nov 13 03:08:26 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
@@ -605,7 +605,7 @@ dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Sun Oct 29 12:09:10 JST 2006
-pbuilder-time-stamp: 1162091350
+Current time: Mon Nov 13 12:08:28 JST 2006
+pbuilder-time-stamp: 1163387308
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir1/5344 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir1/6656 and its subdirectories
diff --git a/testsuite/normal/pbuilder-build-dsh-sid.log b/testsuite/normal/pbuilder-build-dsh-sid.log
index 350a918..bdf63f8 100644
--- a/testsuite/normal/pbuilder-build-dsh-sid.log
+++ b/testsuite/normal/pbuilder-build-dsh-sid.log
@@ -2,20 +2,20 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Sun Oct 29 12:02:40 JST 2006
-pbuilder-time-stamp: 1162090960
+Current time: Mon Nov 13 12:02:49 JST 2006
+pbuilder-time-stamp: 1163386969
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
 Installing the build-deps
- -> Attempting to parse the build-deps : pbuilder-satisfydepends,v 1.28 2006/05/30 23:45:45 dancer Exp $
- -> Considering  debhelper (>> 3.0.0)
+ -> Attempting to parse the build-deps : pbuilder-satisfydepends,v 1.29 2006/11/06 20:20:56 lool Exp $
+ -> Considering build-dep debhelper (>> 3.0.0)
    -> Trying debhelper
- -> Considering  libdshconfig1-dev (>= 0.20.11-1)
+ -> Considering build-dep libdshconfig1-dev (>= 0.20.11-1)
    -> Trying libdshconfig1-dev
  -> Installing  debhelper libdshconfig1-dev
 Reading package lists...
@@ -30,33 +30,33 @@ The following NEW packages will be installed:
   debhelper file gettext html2text intltool-debian libdshconfig1
   libdshconfig1-dev libmagic1 po-debconf
 0 upgraded, 9 newly installed, 0 to remove and 0 not upgraded.
-Need to get 3097kB of archives.
+Need to get 3098kB of archives.
 After unpacking 10.1MB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org sid/main libmagic1 4.17-4 [277kB]
 Get:2 http://ftp.jp.debian.org sid/main file 4.17-4 [32.0kB]
 Get:3 http://ftp.jp.debian.org sid/main html2text 1.3.2a-3 [92.7kB]
-Get:4 http://ftp.jp.debian.org sid/main gettext 0.15-2 [2012kB]
+Get:4 http://ftp.jp.debian.org sid/main gettext 0.15-3 [2012kB]
 Get:5 http://ftp.jp.debian.org sid/main intltool-debian 0.35.0+20060710.1 [30.8kB]
 Get:6 http://ftp.jp.debian.org sid/main po-debconf 1.0.7 [106kB]
-Get:7 http://ftp.jp.debian.org sid/main debhelper 5.0.40 [510kB]
+Get:7 http://ftp.jp.debian.org sid/main debhelper 5.0.41 [512kB]
 Get:8 http://ftp.jp.debian.org sid/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:9 http://ftp.jp.debian.org sid/main libdshconfig1-dev 0.20.12-2 [25.3kB]
-Fetched 3097kB in 4s (710kB/s)
+Fetched 3098kB in 2s (1085kB/s)
 Selecting previously deselected package libmagic1.
-(Reading database ... 12131 files and directories currently installed.)
+(Reading database ... 12145 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.17-4_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.17-4_amd64.deb) ...
 Selecting previously deselected package html2text.
 Unpacking html2text (from .../html2text_1.3.2a-3_amd64.deb) ...
 Selecting previously deselected package gettext.
-Unpacking gettext (from .../gettext_0.15-2_amd64.deb) ...
+Unpacking gettext (from .../gettext_0.15-3_amd64.deb) ...
 Selecting previously deselected package intltool-debian.
 Unpacking intltool-debian (from .../intltool-debian_0.35.0+20060710.1_all.deb) ...
 Selecting previously deselected package po-debconf.
 Unpacking po-debconf (from .../po-debconf_1.0.7_all.deb) ...
 Selecting previously deselected package debhelper.
-Unpacking debhelper (from .../debhelper_5.0.40_all.deb) ...
+Unpacking debhelper (from .../debhelper_5.0.41_all.deb) ...
 Selecting previously deselected package libdshconfig1.
 Unpacking libdshconfig1 (from .../libdshconfig1_0.20.12-2_amd64.deb) ...
 Selecting previously deselected package libdshconfig1-dev.
@@ -66,11 +66,11 @@ Setting up libmagic1 (4.17-4) ...
 Setting up file (4.17-4) ...
 Setting up html2text (1.3.2a-3) ...
 
-Setting up gettext (0.15-2) ...
+Setting up gettext (0.15-3) ...
 
 Setting up intltool-debian (0.35.0+20060710.1) ...
 Setting up po-debconf (1.0.7) ...
-Setting up debhelper (5.0.40) ...
+Setting up debhelper (5.0.41) ...
 Setting up libdshconfig1 (0.20.12-2) ...
 
 Setting up libdshconfig1-dev (0.20.12-2) ...
@@ -83,16 +83,16 @@ The following NEW packages will be installed:
 Need to get 97.4kB of archives.
 After unpacking 406kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org sid/main fakeroot 1.5.10 [97.4kB]
-Fetched 97.4kB in 0s (398kB/s)
+Fetched 97.4kB in 0s (396kB/s)
 Selecting previously deselected package fakeroot.
-(Reading database ... 12736 files and directories currently installed.)
+(Reading database ... 12749 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.10_amd64.deb) ...
 Setting up fakeroot (1.5.10) ...
 
 Copying source file
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir1/dsh_0.25.7-1.dsc]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir1/dsh_0.25.7.orig.tar.gz]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir1/dsh_0.25.7-1.diff.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir1/dsh_0.25.7-1.dsc]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir1/dsh_0.25.7.orig.tar.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir1/dsh_0.25.7-1.diff.gz]
 Extracting source
 dpkg-source: warning: no utmp entry available and LOGNAME not defined; using uid of process (1234)
 gpg: new configuration file `/tmp/buildd/.gnupg/gpg.conf' created
@@ -417,11 +417,11 @@ dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
 success
 PASS: tests/param-r-invalid.sh
-2: 2
 1: 1
+2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sun Oct 29 03:03:31 UTC 2006
+Mon Nov 13 03:03:40 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -491,13 +491,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Sun Oct 29 03:03:36 UTC 2006
+Mon Nov 13 03:03:45 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
-b: b
-a: a
 c: c
+dsh: Process terminated (before write).
+a: a
+b: b
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -603,7 +604,7 @@ dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Sun Oct 29 12:03:38 JST 2006
-pbuilder-time-stamp: 1162091018
+Current time: Mon Nov 13 12:03:47 JST 2006
+pbuilder-time-stamp: 1163387027
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir1/7993 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir1/9388 and its subdirectories
diff --git a/testsuite/normal/pbuilder-create-etch.log b/testsuite/normal/pbuilder-create-etch.log
index 96ee398..79359fe 100644
--- a/testsuite/normal/pbuilder-create-etch.log
+++ b/testsuite/normal/pbuilder-create-etch.log
@@ -7,7 +7,7 @@ I: Retrieving Packages
 I: Validating Packages
 I: Resolving dependencies of required packages...
 I: Resolving dependencies of base packages...
-I: Found additional base dependencies: debian-archive-keyring update-inetd 
+I: Found additional base dependencies: update-inetd 
 I: Checking component main on http://ftp.jp.debian.org/debian...
 I: Retrieving adduser
 I: Validating adduser
@@ -595,7 +595,7 @@ umount: /dev/shm: not mounted
 umount: proc: not mounted
 umount: proc: not mounted
 umount: /dev/pts: not mounted
- -> user script /var/cache/pbuilder/build//25593/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
+ -> user script /var/cache/pbuilder/build//26929/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
 Refreshing the base.tgz 
  -> upgrading packages
  -> mounting /proc filesystem
@@ -604,7 +604,7 @@ Refreshing the base.tgz
 Get:1 http://ftp.jp.debian.org etch Release.gpg [189B]
 Hit http://ftp.jp.debian.org etch Release
 Get:2 http://ftp.jp.debian.org etch/main Packages/DiffIndex [2038B]
-Fetched 2227B in 0s (7411B/s)
+Fetched 2227B in 0s (9399B/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Reading package lists...
@@ -630,30 +630,30 @@ The following NEW packages will be installed:
   perl-modules
 0 upgraded, 17 newly installed, 0 to remove and 0 not upgraded.
 Need to get 21.1MB of archives.
-After unpacking 86.1MB of additional disk space will be used.
+After unpacking 86.2MB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org etch/main binutils 2.17-3 [2630kB]
-Get:2 http://ftp.jp.debian.org etch/main cpp-4.1 4.1.1-13 [2476kB]
+Get:2 http://ftp.jp.debian.org etch/main cpp-4.1 4.1.1-19 [2480kB]
 Get:3 http://ftp.jp.debian.org etch/main cpp 4:4.1.1-13 [10.3kB]
 Get:4 http://ftp.jp.debian.org etch/main perl-modules 5.8.8-6.1 [2309kB]
 Get:5 http://ftp.jp.debian.org etch/main perl 5.8.8-6.1 [4233kB]
 Get:6 http://ftp.jp.debian.org etch/main patch 2.5.9-4 [98.7kB]
 Get:7 http://ftp.jp.debian.org etch/main make 3.81-2 [390kB]
 Get:8 http://ftp.jp.debian.org etch/main dpkg-dev 1.13.22 [109kB]
-Get:9 http://ftp.jp.debian.org etch/main libssp0 4.1.1-13 [4962B]
-Get:10 http://ftp.jp.debian.org etch/main gcc-4.1 4.1.1-13 [463kB]
+Get:9 http://ftp.jp.debian.org etch/main libssp0 4.1.1-19 [4966B]
+Get:10 http://ftp.jp.debian.org etch/main gcc-4.1 4.1.1-19 [469kB]
 Get:11 http://ftp.jp.debian.org etch/main gcc 4:4.1.1-13 [5056B]
-Get:12 http://ftp.jp.debian.org etch/main linux-kernel-headers 2.6.18-3 [1872kB]
-Get:13 http://ftp.jp.debian.org etch/main libc6-dev 2.3.6.ds1-4 [2107kB]
-Get:14 http://ftp.jp.debian.org etch/main libstdc++6-4.1-dev 4.1.1-13 [1632kB]
-Get:15 http://ftp.jp.debian.org etch/main g++-4.1 4.1.1-13 [2780kB]
+Get:12 http://ftp.jp.debian.org etch/main linux-kernel-headers 2.6.18-6 [1872kB]
+Get:13 http://ftp.jp.debian.org etch/main libc6-dev 2.3.6.ds1-7 [2108kB]
+Get:14 http://ftp.jp.debian.org etch/main libstdc++6-4.1-dev 4.1.1-19 [1619kB]
+Get:15 http://ftp.jp.debian.org etch/main g++-4.1 4.1.1-19 [2785kB]
 Get:16 http://ftp.jp.debian.org etch/main g++ 4:4.1.1-13 [1362B]
 Get:17 http://ftp.jp.debian.org etch/main build-essential 11.3 [6982B]
-Fetched 21.1MB in 14s (1420kB/s)
+Fetched 21.1MB in 8s (2447kB/s)
 Selecting previously deselected package binutils.
-(Reading database ... 7200 files and directories currently installed.)
+(Reading database ... 7211 files and directories currently installed.)
 Unpacking binutils (from .../binutils_2.17-3_amd64.deb) ...
 Selecting previously deselected package cpp-4.1.
-Unpacking cpp-4.1 (from .../cpp-4.1_4.1.1-13_amd64.deb) ...
+Unpacking cpp-4.1 (from .../cpp-4.1_4.1.1-19_amd64.deb) ...
 Selecting previously deselected package cpp.
 Unpacking cpp (from .../cpp_4%3a4.1.1-13_amd64.deb) ...
 Selecting previously deselected package perl-modules.
@@ -667,43 +667,43 @@ Unpacking make (from .../archives/make_3.81-2_amd64.deb) ...
 Selecting previously deselected package dpkg-dev.
 Unpacking dpkg-dev (from .../dpkg-dev_1.13.22_all.deb) ...
 Selecting previously deselected package libssp0.
-Unpacking libssp0 (from .../libssp0_4.1.1-13_amd64.deb) ...
+Unpacking libssp0 (from .../libssp0_4.1.1-19_amd64.deb) ...
 Selecting previously deselected package gcc-4.1.
-Unpacking gcc-4.1 (from .../gcc-4.1_4.1.1-13_amd64.deb) ...
+Unpacking gcc-4.1 (from .../gcc-4.1_4.1.1-19_amd64.deb) ...
 Selecting previously deselected package gcc.
 Unpacking gcc (from .../gcc_4%3a4.1.1-13_amd64.deb) ...
 Selecting previously deselected package linux-kernel-headers.
-Unpacking linux-kernel-headers (from .../linux-kernel-headers_2.6.18-3_amd64.deb) ...
+Unpacking linux-kernel-headers (from .../linux-kernel-headers_2.6.18-6_amd64.deb) ...
 Selecting previously deselected package libc6-dev.
-Unpacking libc6-dev (from .../libc6-dev_2.3.6.ds1-4_amd64.deb) ...
+Unpacking libc6-dev (from .../libc6-dev_2.3.6.ds1-7_amd64.deb) ...
 Selecting previously deselected package libstdc++6-4.1-dev.
-Unpacking libstdc++6-4.1-dev (from .../libstdc++6-4.1-dev_4.1.1-13_amd64.deb) ...
+Unpacking libstdc++6-4.1-dev (from .../libstdc++6-4.1-dev_4.1.1-19_amd64.deb) ...
 Selecting previously deselected package g++-4.1.
-Unpacking g++-4.1 (from .../g++-4.1_4.1.1-13_amd64.deb) ...
+Unpacking g++-4.1 (from .../g++-4.1_4.1.1-19_amd64.deb) ...
 Selecting previously deselected package g++.
 Unpacking g++ (from .../g++_4%3a4.1.1-13_amd64.deb) ...
 Selecting previously deselected package build-essential.
 Unpacking build-essential (from .../build-essential_11.3_amd64.deb) ...
 Setting up binutils (2.17-3) ...
 
-Setting up cpp-4.1 (4.1.1-13) ...
+Setting up cpp-4.1 (4.1.1-19) ...
 Setting up cpp (4.1.1-13) ...
 
 Setting up patch (2.5.9-4) ...
 Setting up make (3.81-2) ...
-Setting up libssp0 (4.1.1-13) ...
+Setting up libssp0 (4.1.1-19) ...
 
-Setting up gcc-4.1 (4.1.1-13) ...
+Setting up gcc-4.1 (4.1.1-19) ...
 Setting up gcc (4.1.1-13) ...
 
-Setting up linux-kernel-headers (2.6.18-3) ...
-Setting up libc6-dev (2.3.6.ds1-4) ...
+Setting up linux-kernel-headers (2.6.18-6) ...
+Setting up libc6-dev (2.3.6.ds1-7) ...
 Setting up perl-modules (5.8.8-6.1) ...
-Setting up libstdc++6-4.1-dev (4.1.1-13) ...
+Setting up libstdc++6-4.1-dev (4.1.1-19) ...
 Setting up perl (5.8.8-6.1) ...
 
 Setting up dpkg-dev (1.13.22) ...
-Setting up g++-4.1 (4.1.1-13) ...
+Setting up g++-4.1 (4.1.1-19) ...
 Setting up g++ (4.1.1-13) ...
 
 Setting up build-essential (11.3) ...
@@ -714,9 +714,9 @@ umount: /dev/shm: not mounted
 umount: /lib/init/rw: not found
 cat: /var/run/inetd.pid: No such file or directory
 kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill -l [sigspec]
- -> user script /var/cache/pbuilder/build//25593/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//26929/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//25593 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//26929 and its subdirectories
diff --git a/testsuite/normal/pbuilder-create-sid.log b/testsuite/normal/pbuilder-create-sid.log
index a89c481..98fe0db 100644
--- a/testsuite/normal/pbuilder-create-sid.log
+++ b/testsuite/normal/pbuilder-create-sid.log
@@ -7,7 +7,7 @@ I: Retrieving Packages
 I: Validating Packages
 I: Resolving dependencies of required packages...
 I: Resolving dependencies of base packages...
-I: Found additional base dependencies: debian-archive-keyring update-inetd 
+I: Found additional base dependencies: update-inetd 
 I: Checking component main on http://ftp.jp.debian.org/debian...
 I: Retrieving adduser
 I: Validating adduser
@@ -33,6 +33,8 @@ I: Retrieving cpio
 I: Validating cpio
 I: Retrieving cron
 I: Validating cron
+I: Retrieving cyrus-sasl2-doc
+I: Validating cyrus-sasl2-doc
 I: Retrieving debconf
 I: Validating debconf
 I: Retrieving debconf-i18n
@@ -67,6 +69,8 @@ I: Retrieving gettext-base
 I: Validating gettext-base
 I: Retrieving gnupg
 I: Validating gnupg
+I: Retrieving gpgv
+I: Validating gpgv
 I: Retrieving grep
 I: Validating grep
 I: Retrieving groff-base
@@ -153,6 +157,8 @@ I: Retrieving libreadline5
 I: Validating libreadline5
 I: Retrieving libsasl2
 I: Validating libsasl2
+I: Retrieving libsasl2-2
+I: Validating libsasl2-2
 I: Retrieving libselinux1
 I: Validating libselinux1
 I: Retrieving libsepol1
@@ -459,6 +465,7 @@ I: Unpacking aptitude...
 I: Unpacking bsdmainutils...
 I: Unpacking cpio...
 I: Unpacking cron...
+I: Unpacking cyrus-sasl2-doc...
 I: Unpacking debian-archive-keyring...
 I: Unpacking dhcp3-client...
 I: Unpacking dhcp3-common...
@@ -466,6 +473,7 @@ I: Unpacking dmidecode...
 I: Unpacking ed...
 I: Unpacking gettext-base...
 I: Unpacking gnupg...
+I: Unpacking gpgv...
 I: Unpacking groff-base...
 I: Unpacking ifupdown...
 I: Unpacking info...
@@ -491,6 +499,7 @@ I: Unpacking libopencdk8...
 I: Unpacking libpopt0...
 I: Unpacking libreadline5...
 I: Unpacking libsasl2...
+I: Unpacking libsasl2-2...
 I: Unpacking libsigc++-1.2-5c2...
 I: Unpacking libsigc++-2.0-0c2a...
 I: Unpacking libssl0.9.8...
@@ -520,6 +529,7 @@ I: Unpacking vim-tiny...
 I: Unpacking wget...
 I: Unpacking whiptail...
 I: Configuring the base system...
+I: Configuring gpgv...
 I: Configuring gettext-base...
 I: Configuring module-init-tools...
 I: Configuring libgdbm3...
@@ -545,6 +555,7 @@ I: Configuring libdb4.2...
 I: Configuring libdb4.4...
 I: Configuring net-tools...
 I: Configuring libtasn1-3-bin...
+I: Configuring libsasl2-2...
 I: Configuring bsdmainutils...
 I: Configuring libsigc++-2.0-0c2a...
 I: Configuring libncursesw5...
@@ -554,6 +565,7 @@ I: Configuring libbz2-1.0...
 I: Configuring cron...
 I: Configuring libsasl2...
 I: Configuring nano...
+I: Configuring cyrus-sasl2-doc...
 I: Configuring dhcp3-common...
 I: Configuring libconsole...
 I: Configuring iptables...
@@ -600,7 +612,7 @@ umount: /dev/shm: not mounted
 umount: proc: not mounted
 umount: proc: not mounted
 umount: /dev/pts: not mounted
- -> user script /var/cache/pbuilder/build//28184/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
+ -> user script /var/cache/pbuilder/build//29515/tmp/hooks/G50-initscripts-2.86.ds1-11-cdebootstrap0.3.9.sh finished
 Refreshing the base.tgz 
  -> upgrading packages
  -> mounting /proc filesystem
@@ -609,7 +621,7 @@ Refreshing the base.tgz
 Get:1 http://ftp.jp.debian.org sid Release.gpg [189B]
 Hit http://ftp.jp.debian.org sid Release
 Get:2 http://ftp.jp.debian.org sid/main Packages/DiffIndex [2038B]
-Fetched 2227B in 0s (8989B/s)
+Fetched 2227B in 0s (5685B/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Reading package lists...
@@ -636,28 +648,28 @@ The following NEW packages will be installed:
 Need to get 21.2MB of archives.
 After unpacking 86.4MB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org sid/main binutils 2.17-3 [2630kB]
-Get:2 http://ftp.jp.debian.org sid/main cpp-4.1 4.1.1-18 [2480kB]
+Get:2 http://ftp.jp.debian.org sid/main cpp-4.1 4.1.1-19 [2480kB]
 Get:3 http://ftp.jp.debian.org sid/main cpp 4:4.1.1-13 [10.3kB]
 Get:4 http://ftp.jp.debian.org sid/main perl-modules 5.8.8-6.1 [2309kB]
 Get:5 http://ftp.jp.debian.org sid/main perl 5.8.8-6.1 [4233kB]
 Get:6 http://ftp.jp.debian.org sid/main patch 2.5.9-4 [98.7kB]
 Get:7 http://ftp.jp.debian.org sid/main make 3.81-3 [395kB]
 Get:8 http://ftp.jp.debian.org sid/main dpkg-dev 1.13.24 [164kB]
-Get:9 http://ftp.jp.debian.org sid/main libssp0 4.1.1-18 [4972B]
-Get:10 http://ftp.jp.debian.org sid/main gcc-4.1 4.1.1-18 [469kB]
+Get:9 http://ftp.jp.debian.org sid/main libssp0 4.1.1-19 [4966B]
+Get:10 http://ftp.jp.debian.org sid/main gcc-4.1 4.1.1-19 [469kB]
 Get:11 http://ftp.jp.debian.org sid/main gcc 4:4.1.1-13 [5056B]
 Get:12 http://ftp.jp.debian.org sid/main linux-kernel-headers 2.6.18-6 [1872kB]
-Get:13 http://ftp.jp.debian.org sid/main libc6-dev 2.3.6.ds1-7 [2108kB]
-Get:14 http://ftp.jp.debian.org sid/main libstdc++6-4.1-dev 4.1.1-18 [1619kB]
-Get:15 http://ftp.jp.debian.org sid/main g++-4.1 4.1.1-18 [2785kB]
+Get:13 http://ftp.jp.debian.org sid/main libc6-dev 2.3.6.ds1-8 [2108kB]
+Get:14 http://ftp.jp.debian.org sid/main libstdc++6-4.1-dev 4.1.1-19 [1619kB]
+Get:15 http://ftp.jp.debian.org sid/main g++-4.1 4.1.1-19 [2785kB]
 Get:16 http://ftp.jp.debian.org sid/main g++ 4:4.1.1-13 [1362B]
 Get:17 http://ftp.jp.debian.org sid/main build-essential 11.3 [6982B]
-Fetched 21.2MB in 13s (1550kB/s)
+Fetched 21.2MB in 12s (1661kB/s)
 Selecting previously deselected package binutils.
-(Reading database ... 7235 files and directories currently installed.)
+(Reading database ... 7249 files and directories currently installed.)
 Unpacking binutils (from .../binutils_2.17-3_amd64.deb) ...
 Selecting previously deselected package cpp-4.1.
-Unpacking cpp-4.1 (from .../cpp-4.1_4.1.1-18_amd64.deb) ...
+Unpacking cpp-4.1 (from .../cpp-4.1_4.1.1-19_amd64.deb) ...
 Selecting previously deselected package cpp.
 Unpacking cpp (from .../cpp_4%3a4.1.1-13_amd64.deb) ...
 Selecting previously deselected package perl-modules.
@@ -671,43 +683,43 @@ Unpacking make (from .../archives/make_3.81-3_amd64.deb) ...
 Selecting previously deselected package dpkg-dev.
 Unpacking dpkg-dev (from .../dpkg-dev_1.13.24_all.deb) ...
 Selecting previously deselected package libssp0.
-Unpacking libssp0 (from .../libssp0_4.1.1-18_amd64.deb) ...
+Unpacking libssp0 (from .../libssp0_4.1.1-19_amd64.deb) ...
 Selecting previously deselected package gcc-4.1.
-Unpacking gcc-4.1 (from .../gcc-4.1_4.1.1-18_amd64.deb) ...
+Unpacking gcc-4.1 (from .../gcc-4.1_4.1.1-19_amd64.deb) ...
 Selecting previously deselected package gcc.
 Unpacking gcc (from .../gcc_4%3a4.1.1-13_amd64.deb) ...
 Selecting previously deselected package linux-kernel-headers.
 Unpacking linux-kernel-headers (from .../linux-kernel-headers_2.6.18-6_amd64.deb) ...
 Selecting previously deselected package libc6-dev.
-Unpacking libc6-dev (from .../libc6-dev_2.3.6.ds1-7_amd64.deb) ...
+Unpacking libc6-dev (from .../libc6-dev_2.3.6.ds1-8_amd64.deb) ...
 Selecting previously deselected package libstdc++6-4.1-dev.
-Unpacking libstdc++6-4.1-dev (from .../libstdc++6-4.1-dev_4.1.1-18_amd64.deb) ...
+Unpacking libstdc++6-4.1-dev (from .../libstdc++6-4.1-dev_4.1.1-19_amd64.deb) ...
 Selecting previously deselected package g++-4.1.
-Unpacking g++-4.1 (from .../g++-4.1_4.1.1-18_amd64.deb) ...
+Unpacking g++-4.1 (from .../g++-4.1_4.1.1-19_amd64.deb) ...
 Selecting previously deselected package g++.
 Unpacking g++ (from .../g++_4%3a4.1.1-13_amd64.deb) ...
 Selecting previously deselected package build-essential.
 Unpacking build-essential (from .../build-essential_11.3_amd64.deb) ...
 Setting up binutils (2.17-3) ...
 
-Setting up cpp-4.1 (4.1.1-18) ...
+Setting up cpp-4.1 (4.1.1-19) ...
 Setting up cpp (4.1.1-13) ...
 
 Setting up patch (2.5.9-4) ...
 Setting up make (3.81-3) ...
-Setting up libssp0 (4.1.1-18) ...
+Setting up libssp0 (4.1.1-19) ...
 
-Setting up gcc-4.1 (4.1.1-18) ...
+Setting up gcc-4.1 (4.1.1-19) ...
 Setting up gcc (4.1.1-13) ...
 
 Setting up linux-kernel-headers (2.6.18-6) ...
-Setting up libc6-dev (2.3.6.ds1-7) ...
+Setting up libc6-dev (2.3.6.ds1-8) ...
 Setting up perl-modules (5.8.8-6.1) ...
-Setting up libstdc++6-4.1-dev (4.1.1-18) ...
+Setting up libstdc++6-4.1-dev (4.1.1-19) ...
 Setting up perl (5.8.8-6.1) ...
 
 Setting up dpkg-dev (1.13.24) ...
-Setting up g++-4.1 (4.1.1-18) ...
+Setting up g++-4.1 (4.1.1-19) ...
 Setting up g++ (4.1.1-13) ...
 
 Setting up build-essential (11.3) ...
@@ -715,11 +727,12 @@ umount: /sys: not mounted
 umount: /run: not found
 umount: /proc/bus/usb: not mounted
 umount: /dev/shm: not mounted
+umount: /lib/init/rw: not mounted
 cat: /var/run/inetd.pid: No such file or directory
 kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill -l [sigspec]
- -> user script /var/cache/pbuilder/build//28184/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//29515/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//28184 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//29515 and its subdirectories
diff --git a/testsuite/normal/pbuilder-execute-etch.log b/testsuite/normal/pbuilder-execute-etch.log
index 0a5d841..a403a42 100644
--- a/testsuite/normal/pbuilder-execute-etch.log
+++ b/testsuite/normal/pbuilder-execute-etch.log
@@ -1,5 +1,5 @@
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -10,4 +10,4 @@ Building the build Environment
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//22854 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//24136 and its subdirectories
diff --git a/testsuite/normal/pbuilder-execute-sid.log b/testsuite/normal/pbuilder-execute-sid.log
index 81543dc..7fbb322 100644
--- a/testsuite/normal/pbuilder-execute-sid.log
+++ b/testsuite/normal/pbuilder-execute-sid.log
@@ -1,5 +1,5 @@
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -10,4 +10,4 @@ Building the build Environment
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//25539 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//26873 and its subdirectories
diff --git a/testsuite/normal/pbuilder-update-etch-sid-experimental.log b/testsuite/normal/pbuilder-update-etch-sid-experimental.log
index 01d264c..2fef8a7 100644
--- a/testsuite/normal/pbuilder-update-etch-sid-experimental.log
+++ b/testsuite/normal/pbuilder-update-etch-sid-experimental.log
@@ -1,6 +1,6 @@
 Upgrading for distribution sid
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -13,10 +13,10 @@ Refreshing the base.tgz
 Get:1 http://ftp.jp.debian.org sid Release.gpg [189B]
 Get:2 http://ftp.jp.debian.org experimental Release.gpg [189B]
 Hit http://ftp.jp.debian.org sid Release
-Get:3 http://ftp.jp.debian.org experimental Release [79.3kB]
+Get:3 http://ftp.jp.debian.org experimental Release [79.6kB]
 Get:4 http://ftp.jp.debian.org sid/main Packages/DiffIndex [2038B]
-Get:5 http://ftp.jp.debian.org experimental/main Packages [158kB]
-Fetched 240kB in 0s (480kB/s)
+Get:5 http://ftp.jp.debian.org experimental/main Packages [187kB]
+Fetched 268kB in 0s (472kB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Reading package lists...
@@ -26,55 +26,80 @@ The following NEW packages will be installed:
 The following packages have been kept back:
   libssp0
 The following packages will be upgraded:
-  coreutils libc6 libc6-dev libgcc1 libgnutls13 libstdc++6 wget
-7 upgraded, 1 newly installed, 0 to remove and 1 not upgraded.
-Need to get 11.6MB of archives.
-After unpacking 2179kB of additional disk space will be used.
+  coreutils cpio gettext-base libc6 libc6-dev libgcc1 libgnutls13 libopencdk8
+  libstdc++6 libtasn1-3 libtasn1-3-bin wget
+12 upgraded, 1 newly installed, 0 to remove and 1 not upgraded.
+Need to get 12.1MB of archives.
+After unpacking 2122kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org experimental/main coreutils 6.0-1 [3141kB]
-Get:2 http://ftp.jp.debian.org experimental/main libc6-dev 2.5-0exp2 [2203kB]
-Get:3 http://ftp.jp.debian.org experimental/main libc6 2.5-0exp2 [4804kB]
+Get:2 http://ftp.jp.debian.org experimental/main libc6-dev 2.5-0exp3 [2203kB]
+Get:3 http://ftp.jp.debian.org experimental/main libc6 2.5-0exp3 [4805kB]
 Get:4 http://ftp.jp.debian.org experimental/main gcc-4.2-base 4.2-20061003-1 [200kB]
 Get:5 http://ftp.jp.debian.org experimental/main libgcc1 1:4.2-20061003-1 [25.9kB]
 Get:6 http://ftp.jp.debian.org experimental/main libstdc++6 4.2-20061003-1 [293kB]
-Get:7 http://ftp.jp.debian.org experimental/main libgnutls13 1.5.1.cvs20060930-1 [310kB]
-Get:8 http://ftp.jp.debian.org experimental/main wget 1.10.2+1.11.beta1-1 [635kB]
-Fetched 11.6MB in 6s (1825kB/s)
-(Reading database ... 12131 files and directories currently installed.)
-Preparing to replace coreutils 5.97-5.1 (using .../coreutils_6.0-1_amd64.deb) ...
+Get:7 http://ftp.jp.debian.org experimental/main cpio 2.7-0exp1 [114kB]
+Get:8 http://ftp.jp.debian.org experimental/main gettext-base 0.16-0 [132kB]
+Get:9 http://ftp.jp.debian.org experimental/main libopencdk8 0.5.11-1 [103kB]
+Get:10 http://ftp.jp.debian.org experimental/main libtasn1-3 0.3.7-1 [56.2kB]
+Get:11 http://ftp.jp.debian.org experimental/main libgnutls13 1.5.3-1 [321kB]
+Get:12 http://ftp.jp.debian.org experimental/main libtasn1-3-bin 0.3.7-1 [37.0kB]
+Get:13 http://ftp.jp.debian.org experimental/main wget 1.10.2+1.11.beta1-1 [635kB]
+Fetched 12.1MB in 7s (1691kB/s)
+(Reading database ... 12125 files and directories currently installed.)
+Preparing to replace coreutils 5.97-5.2 (using .../coreutils_6.0-1_amd64.deb) ...
 Unpacking replacement coreutils ...
 Setting up coreutils (6.0-1) ...
 
-(Reading database ... 12143 files and directories currently installed.)
-Preparing to replace libc6-dev 2.3.6.ds1-7 (using .../libc6-dev_2.5-0exp2_amd64.deb) ...
+(Reading database ... 12137 files and directories currently installed.)
+Preparing to replace libc6-dev 2.3.6.ds1-8 (using .../libc6-dev_2.5-0exp3_amd64.deb) ...
 Unpacking replacement libc6-dev ...
-Preparing to replace libc6 2.3.6.ds1-7 (using .../libc6_2.5-0exp2_amd64.deb) ...
+Preparing to replace libc6 2.3.6.ds1-8 (using .../libc6_2.5-0exp3_amd64.deb) ...
 Unpacking replacement libc6 ...
-Setting up libc6 (2.5-0exp2) ...
+Setting up libc6 (2.5-0exp3) ...
 Installing new version of config file /etc/init.d/glibc.sh ...
 init: timeout opening/writing control channel /dev/initctl
 
 Selecting previously deselected package gcc-4.2-base.
-(Reading database ... 12205 files and directories currently installed.)
+(Reading database ... 12201 files and directories currently installed.)
 Unpacking gcc-4.2-base (from .../gcc-4.2-base_4.2-20061003-1_amd64.deb) ...
-Preparing to replace libgcc1 1:4.1.1-18 (using .../libgcc1_1%3a4.2-20061003-1_amd64.deb) ...
+Preparing to replace libgcc1 1:4.1.1-19 (using .../libgcc1_1%3a4.2-20061003-1_amd64.deb) ...
 Unpacking replacement libgcc1 ...
 Setting up gcc-4.2-base (4.2-20061003-1) ...
 
 Setting up libgcc1 (4.2-20061003-1) ...
 
-(Reading database ... 12211 files and directories currently installed.)
-Preparing to replace libstdc++6 4.1.1-18 (using .../libstdc++6_4.2-20061003-1_amd64.deb) ...
+(Reading database ... 12207 files and directories currently installed.)
+Preparing to replace libstdc++6 4.1.1-19 (using .../libstdc++6_4.2-20061003-1_amd64.deb) ...
 Unpacking replacement libstdc++6 ...
 Setting up libstdc++6 (4.2-20061003-1) ...
 
-(Reading database ... 12211 files and directories currently installed.)
-Preparing to replace libgnutls13 1.4.4-2 (using .../libgnutls13_1.5.1.cvs20060930-1_amd64.deb) ...
+(Reading database ... 12207 files and directories currently installed.)
+Preparing to replace cpio 2.6-17 (using .../cpio_2.7-0exp1_amd64.deb) ...
+Unpacking replacement cpio ...
+Preparing to replace gettext-base 0.15-3 (using .../gettext-base_0.16-0_amd64.deb) ...
+Unpacking replacement gettext-base ...
+Preparing to replace libopencdk8 0.5.9-2 (using .../libopencdk8_0.5.11-1_amd64.deb) ...
+Unpacking replacement libopencdk8 ...
+Preparing to replace libtasn1-3 0.3.6-2 (using .../libtasn1-3_0.3.7-1_amd64.deb) ...
+Unpacking replacement libtasn1-3 ...
+Preparing to replace libgnutls13 1.4.4-3 (using .../libgnutls13_1.5.3-1_amd64.deb) ...
 Unpacking replacement libgnutls13 ...
+Preparing to replace libtasn1-3-bin 0.3.6-2 (using .../libtasn1-3-bin_0.3.7-1_amd64.deb) ...
+Unpacking replacement libtasn1-3-bin ...
 Preparing to replace wget 1.10.2-2 (using .../wget_1.10.2+1.11.beta1-1_amd64.deb) ...
 Unpacking replacement wget ...
-Setting up libc6-dev (2.5-0exp2) ...
-Setting up libgnutls13 (1.5.1.cvs20060930-1) ...
+Setting up libc6-dev (2.5-0exp3) ...
+Setting up cpio (2.7-0exp1) ...
 
+Setting up gettext-base (0.16-0) ...
+
+Setting up libopencdk8 (0.5.11-1) ...
+
+Setting up libtasn1-3 (0.3.7-1) ...
+
+Setting up libgnutls13 (1.5.3-1) ...
+
+Setting up libtasn1-3-bin (0.3.7-1) ...
 Setting up wget (1.10.2+1.11.beta1-1) ...
 
 Reading package lists...
@@ -90,9 +115,9 @@ umount: /dev/shm: not mounted
 umount: /lib/init/rw: not mounted
 cat: /var/run/inetd.pid: No such file or directory
 kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill -l [sigspec]
- -> user script /var/cache/pbuilder/build//24256/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//25146/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//24256 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//25146 and its subdirectories
diff --git a/testsuite/normal/pbuilder-update-etch-sid.log b/testsuite/normal/pbuilder-update-etch-sid.log
index f956c6d..1c492fe 100644
--- a/testsuite/normal/pbuilder-update-etch-sid.log
+++ b/testsuite/normal/pbuilder-update-etch-sid.log
@@ -1,6 +1,6 @@
 Upgrading for distribution sid
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -11,187 +11,135 @@ Refreshing the base.tgz
  -> upgrading packages
 Get:1 http://ftp.jp.debian.org sid Release.gpg [189B]
 Get:2 http://ftp.jp.debian.org sid Release [79.6kB]
-Get:3 http://ftp.jp.debian.org sid/main Packages [5688kB]
-Fetched 5767kB in 3s (1669kB/s)
+Get:3 http://ftp.jp.debian.org sid/main Packages [5695kB]
+Fetched 5775kB in 3s (1848kB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Reading package lists...
 Building dependency tree...
 The following NEW packages will be installed:
-  sysvinit-utils
+  gpgv libsasl2-2 sysvinit-utils
 The following packages will be upgraded:
-  adduser aptitude bash coreutils cpp-4.1 cron debconf debconf-i18n
-  debianutils dhcp3-client dhcp3-common dpkg dpkg-dev dselect e2fslibs
-  e2fsprogs g++-4.1 gcc-4.1 gcc-4.1-base gettext-base grep ifupdown
-  initscripts iputils-ping klogd libblkid1 libc6 libc6-dev libcomerr2 libgcc1
-  libgnutls13 libnewt0.52 libopencdk8 libpam-modules libpam-runtime libpam0g
-  libss2 libssp0 libstdc++6 libstdc++6-4.1-dev libtasn1-3 libtasn1-3-bin
-  libuuid1 linux-kernel-headers login lsb-base make man-db nano passwd
-  sysklogd sysv-rc sysvinit tar tasksel tasksel-data tzdata vim-common
-  vim-tiny whiptail
-60 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
-Need to get 34.8MB of archives.
-After unpacking 2085kB of additional disk space will be used.
+  apt apt-utils aptitude bash bsdutils coreutils debianutils dpkg dpkg-dev
+  dselect gettext-base gnupg initscripts iptables klogd libc6 libc6-dev
+  libgnutls13 libldap-2.3-0 libldap2 libsasl2 lsb-base make man-db mount nano
+  sysklogd sysv-rc sysvinit tasksel tasksel-data tzdata util-linux vim-common
+  vim-tiny
+35 upgraded, 3 newly installed, 0 to remove and 0 not upgraded.
+Need to get 25.1MB of archives.
+After unpacking 1221kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org sid/main debianutils 2.17.3 [52.2kB]
 Get:2 http://ftp.jp.debian.org sid/main bash 3.1dfsg-7 [910kB]
-Get:3 http://ftp.jp.debian.org sid/main coreutils 5.97-5.1 [3200kB]
-Get:4 http://ftp.jp.debian.org sid/main dpkg 1.13.24 [1973kB]
-Get:5 http://ftp.jp.debian.org sid/main linux-kernel-headers 2.6.18-6 [1872kB]
-Get:6 http://ftp.jp.debian.org sid/main libc6-dev 2.3.6.ds1-7 [2108kB]
-Get:7 http://ftp.jp.debian.org sid/main tzdata 2006n-1 [315kB]
-Get:8 http://ftp.jp.debian.org sid/main libc6 2.3.6.ds1-7 [4074kB]
-Get:9 http://ftp.jp.debian.org sid/main e2fslibs 1.39+1.40-WIP-2006.10.02+dfsg-2 [89.6kB]
-Get:10 http://ftp.jp.debian.org sid/main e2fsprogs 1.39+1.40-WIP-2006.10.02+dfsg-2 [606kB]
-Get:11 http://ftp.jp.debian.org sid/main grep 2.5.1.ds2-6 [150kB]
-Get:12 http://ftp.jp.debian.org sid/main libpam-runtime 0.79-4 [64.3kB]
-Get:13 http://ftp.jp.debian.org sid/main libpam0g 0.79-4 [81.9kB]
-Get:14 http://ftp.jp.debian.org sid/main libpam-modules 0.79-4 [199kB]
-Get:15 http://ftp.jp.debian.org sid/main login 1:4.0.18.1-5 [804kB]
-Get:16 http://ftp.jp.debian.org sid/main sysvinit-utils 2.86.ds1-33 [66.1kB]
-Get:17 http://ftp.jp.debian.org sid/main sysvinit 2.86.ds1-33 [113kB]
-Get:18 http://ftp.jp.debian.org sid/main tar 1.16-1 [711kB]
-Get:19 http://ftp.jp.debian.org sid/main debconf-i18n 1.5.7 [150kB]
-Get:20 http://ftp.jp.debian.org sid/main debconf 1.5.7 [143kB]
-Get:21 http://ftp.jp.debian.org sid/main lsb-base 3.1-18 [15.8kB]
-Get:22 http://ftp.jp.debian.org sid/main initscripts 2.86.ds1-33 [58.4kB]
-Get:23 http://ftp.jp.debian.org sid/main libblkid1 1.39+1.40-WIP-2006.10.02+dfsg-2 [44.0kB]
-Get:24 http://ftp.jp.debian.org sid/main libcomerr2 1.39+1.40-WIP-2006.10.02+dfsg-2 [31.2kB]
-Get:25 http://ftp.jp.debian.org sid/main cpp-4.1 4.1.1-18 [2480kB]
-Get:26 http://ftp.jp.debian.org sid/main gcc-4.1-base 4.1.1-18 [198kB]
-Get:27 http://ftp.jp.debian.org sid/main libgcc1 1:4.1.1-18 [24.6kB]
-Get:28 http://ftp.jp.debian.org sid/main gcc-4.1 4.1.1-18 [469kB]
-Get:29 http://ftp.jp.debian.org sid/main g++-4.1 4.1.1-18 [2785kB]
-Get:30 http://ftp.jp.debian.org sid/main libstdc++6-4.1-dev 4.1.1-18 [1619kB]
-Get:31 http://ftp.jp.debian.org sid/main libssp0 4.1.1-18 [4972B]
-Get:32 http://ftp.jp.debian.org sid/main libstdc++6 4.1.1-18 [288kB]
-Get:33 http://ftp.jp.debian.org sid/main libss2 1.39+1.40-WIP-2006.10.02+dfsg-2 [37.8kB]
-Get:34 http://ftp.jp.debian.org sid/main libuuid1 1.39+1.40-WIP-2006.10.02+dfsg-2 [32.9kB]
-Get:35 http://ftp.jp.debian.org sid/main sysv-rc 2.86.ds1-33 [56.2kB]
-Get:36 http://ftp.jp.debian.org sid/main passwd 1:4.0.18.1-5 [855kB]
-Get:37 http://ftp.jp.debian.org sid/main adduser 3.99 [175kB]
-Get:38 http://ftp.jp.debian.org sid/main aptitude 0.4.4-1 [2877kB]
-Get:39 http://ftp.jp.debian.org sid/main cron 3.0pl1-99 [82.5kB]
-Get:40 http://ftp.jp.debian.org sid/main dhcp3-client 3.0.4-10 [218kB]
-Get:41 http://ftp.jp.debian.org sid/main dhcp3-common 3.0.4-10 [287kB]
-Get:42 http://ftp.jp.debian.org sid/main gettext-base 0.15-2 [127kB]
-Get:43 http://ftp.jp.debian.org sid/main ifupdown 0.6.8 [51.6kB]
-Get:44 http://ftp.jp.debian.org sid/main iputils-ping 3:20020927-3.1 [44.2kB]
-Get:45 http://ftp.jp.debian.org sid/main sysklogd 1.4.1-20 [60.2kB]
-Get:46 http://ftp.jp.debian.org sid/main klogd 1.4.1-20 [40.7kB]
-Get:47 http://ftp.jp.debian.org sid/main libopencdk8 0.5.9-2 [102kB]
-Get:48 http://ftp.jp.debian.org sid/main libtasn1-3 0.3.6-2 [55.7kB]
-Get:49 http://ftp.jp.debian.org sid/main libgnutls13 1.4.4-2 [316kB]
-Get:50 http://ftp.jp.debian.org sid/main libnewt0.52 0.52.2-8 [68.2kB]
-Get:51 http://ftp.jp.debian.org sid/main libtasn1-3-bin 0.3.6-2 [34.6kB]
-Get:52 http://ftp.jp.debian.org sid/main man-db 2.4.3-4 [711kB]
-Get:53 http://ftp.jp.debian.org sid/main nano 1.9.99pre3-1 [551kB]
-Get:54 http://ftp.jp.debian.org sid/main tasksel-data 2.57 [231kB]
-Get:55 http://ftp.jp.debian.org sid/main tasksel 2.57 [65.8kB]
-Get:56 http://ftp.jp.debian.org sid/main vim-tiny 1:7.0-152+1 [615kB]
-Get:57 http://ftp.jp.debian.org sid/main vim-common 1:7.0-152+1 [231kB]
-Get:58 http://ftp.jp.debian.org sid/main whiptail 0.52.2-8 [35.3kB]
-Get:59 http://ftp.jp.debian.org sid/main dselect 1.13.24 [533kB]
-Get:60 http://ftp.jp.debian.org sid/main make 3.81-3 [395kB]
-Get:61 http://ftp.jp.debian.org sid/main dpkg-dev 1.13.24 [164kB]
-Fetched 34.8MB in 27s (1252kB/s)
-(Reading database ... 12071 files and directories currently installed.)
+Get:3 http://ftp.jp.debian.org sid/main bsdutils 1:2.12r-15 [69.3kB]
+Get:4 http://ftp.jp.debian.org sid/main coreutils 5.97-5.2 [3201kB]
+Get:5 http://ftp.jp.debian.org sid/main dpkg 1.13.24 [1973kB]
+Get:6 http://ftp.jp.debian.org sid/main mount 2.12r-15 [161kB]
+Get:7 http://ftp.jp.debian.org sid/main libc6-dev 2.3.6.ds1-8 [2108kB]
+Get:8 http://ftp.jp.debian.org sid/main tzdata 2006n-1 [315kB]
+Get:9 http://ftp.jp.debian.org sid/main libc6 2.3.6.ds1-8 [4066kB]
+Get:10 http://ftp.jp.debian.org sid/main sysvinit-utils 2.86.ds1-34 [66.5kB]
+Get:11 http://ftp.jp.debian.org sid/main sysvinit 2.86.ds1-34 [111kB]
+Get:12 http://ftp.jp.debian.org sid/main lsb-base 3.1-19 [15.9kB]
+Get:13 http://ftp.jp.debian.org sid/main util-linux 2.12r-15 [395kB]
+Get:14 http://ftp.jp.debian.org sid/main apt 0.6.46.3 [1436kB]
+Get:15 http://ftp.jp.debian.org sid/main initscripts 2.86.ds1-34 [58.8kB]
+Get:16 http://ftp.jp.debian.org sid/main sysv-rc 2.86.ds1-34 [55.3kB]
+Get:17 http://ftp.jp.debian.org sid/main apt-utils 0.6.46.3 [197kB]
+Get:18 http://ftp.jp.debian.org sid/main aptitude 0.4.4-1 [2877kB]
+Get:19 http://ftp.jp.debian.org sid/main gettext-base 0.15-3 [127kB]
+Get:20 http://ftp.jp.debian.org sid/main libgnutls13 1.4.4-3 [316kB]
+Get:21 http://ftp.jp.debian.org sid/main libsasl2-2 2.1.22.dfsg1-1 [105kB]
+Get:22 http://ftp.jp.debian.org sid/main libsasl2 2.1.22.dfsg1-1 [40.0kB]
+Get:23 http://ftp.jp.debian.org sid/main libldap2 2.1.30-13.2 [162kB]
+Get:24 http://ftp.jp.debian.org sid/main gpgv 1.4.5-2 [157kB]
+Get:25 http://ftp.jp.debian.org sid/main gnupg 1.4.5-2 [1876kB]
+Get:26 http://ftp.jp.debian.org sid/main iptables 1.3.6.0debian1-3 [445kB]
+Get:27 http://ftp.jp.debian.org sid/main sysklogd 1.4.1-20 [60.2kB]
+Get:28 http://ftp.jp.debian.org sid/main klogd 1.4.1-20 [40.7kB]
+Get:29 http://ftp.jp.debian.org sid/main libldap-2.3-0 2.3.29-1 [284kB]
+Get:30 http://ftp.jp.debian.org sid/main man-db 2.4.3-4 [711kB]
+Get:31 http://ftp.jp.debian.org sid/main nano 2.0.0-1 [552kB]
+Get:32 http://ftp.jp.debian.org sid/main tasksel-data 2.57 [231kB]
+Get:33 http://ftp.jp.debian.org sid/main tasksel 2.57 [65.8kB]
+Get:34 http://ftp.jp.debian.org sid/main vim-tiny 1:7.0-158+1 [615kB]
+Get:35 http://ftp.jp.debian.org sid/main vim-common 1:7.0-158+1 [197kB]
+Get:36 http://ftp.jp.debian.org sid/main dselect 1.13.24 [533kB]
+Get:37 http://ftp.jp.debian.org sid/main make 3.81-3 [395kB]
+Get:38 http://ftp.jp.debian.org sid/main dpkg-dev 1.13.24 [164kB]
+Fetched 25.1MB in 9s (2668kB/s)
+(Reading database ... 12086 files and directories currently installed.)
 Preparing to replace debianutils 2.17 (using .../debianutils_2.17.3_amd64.deb) ...
 Unpacking replacement debianutils ...
 Setting up debianutils (2.17.3) ...
 
-(Reading database ... 12071 files and directories currently installed.)
+(Reading database ... 12086 files and directories currently installed.)
 Preparing to replace bash 3.1-5 (using .../bash_3.1dfsg-7_amd64.deb) ...
 Unpacking replacement bash ...
 Setting up bash (3.1dfsg-7) ...
 
-(Reading database ... 12070 files and directories currently installed.)
-Preparing to replace coreutils 5.97-5 (using .../coreutils_5.97-5.1_amd64.deb) ...
+(Reading database ... 12085 files and directories currently installed.)
+Preparing to replace bsdutils 1:2.12r-12 (using .../bsdutils_1%3a2.12r-15_amd64.deb) ...
+Unpacking replacement bsdutils ...
+Setting up bsdutils (2.12r-15) ...
+
+(Reading database ... 12085 files and directories currently installed.)
+Preparing to replace coreutils 5.97-5 (using .../coreutils_5.97-5.2_amd64.deb) ...
 Unpacking replacement coreutils ...
-Setting up coreutils (5.97-5.1) ...
+Setting up coreutils (5.97-5.2) ...
 
-(Reading database ... 12070 files and directories currently installed.)
+(Reading database ... 12085 files and directories currently installed.)
 Preparing to replace dpkg 1.13.22 (using .../dpkg_1.13.24_amd64.deb) ...
 Unpacking replacement dpkg ...
 Setting up dpkg (1.13.24) ...
 
-(Reading database ... 12089 files and directories currently installed.)
-Preparing to replace linux-kernel-headers 2.6.18-3 (using .../linux-kernel-headers_2.6.18-6_amd64.deb) ...
-Unpacking replacement linux-kernel-headers ...
-Preparing to replace libc6-dev 2.3.6.ds1-4 (using .../libc6-dev_2.3.6.ds1-7_amd64.deb) ...
+(Reading database ... 12104 files and directories currently installed.)
+Preparing to replace mount 2.12r-12 (using .../mount_2.12r-15_amd64.deb) ...
+Unpacking replacement mount ...
+Setting up mount (2.12r-15) ...
+
+(Reading database ... 12104 files and directories currently installed.)
+Preparing to replace libc6-dev 2.3.6.ds1-7 (using .../libc6-dev_2.3.6.ds1-8_amd64.deb) ...
 Unpacking replacement libc6-dev ...
 Preparing to replace tzdata 2006l-1 (using .../tzdata_2006n-1_all.deb) ...
 Unpacking replacement tzdata ...
-Preparing to replace libc6 2.3.6.ds1-4 (using .../libc6_2.3.6.ds1-7_amd64.deb) ...
-Unpacking replacement libc6 ...
 Setting up tzdata (2006n-1) ...
 Non-interactive mode, setting timezone to UTC.  Run tzconfig to change.
 
-Setting up libc6 (2.3.6.ds1-7) ...
+(Reading database ... 12107 files and directories currently installed.)
+Preparing to replace libc6 2.3.6.ds1-7 (using .../libc6_2.3.6.ds1-8_amd64.deb) ...
+Unpacking replacement libc6 ...
+Setting up libc6 (2.3.6.ds1-8) ...
 init: timeout opening/writing control channel /dev/initctl
 
-(Reading database ... 12092 files and directories currently installed.)
-Preparing to replace e2fslibs 1.39-1 (using .../e2fslibs_1.39+1.40-WIP-2006.10.02+dfsg-2_amd64.deb) ...
-Unpacking replacement e2fslibs ...
-Setting up e2fslibs (1.39+1.40-WIP-2006.10.02+dfsg-2) ...
-
-(Reading database ... 12092 files and directories currently installed.)
-Preparing to replace e2fsprogs 1.39-1 (using .../e2fsprogs_1.39+1.40-WIP-2006.10.02+dfsg-2_amd64.deb) ...
-Unpacking replacement e2fsprogs ...
-Setting up e2fsprogs (1.39+1.40-WIP-2006.10.02+dfsg-2) ...
-(Reading database ... 12093 files and directories currently installed.)
-Preparing to replace grep 2.5.1.ds2-5 (using .../grep_2.5.1.ds2-6_amd64.deb) ...
-Unpacking replacement grep ...
-Setting up grep (2.5.1.ds2-6) ...
-
-(Reading database ... 12093 files and directories currently installed.)
-Preparing to replace libpam-runtime 0.79-3.2 (using .../libpam-runtime_0.79-4_all.deb) ...
-Unpacking replacement libpam-runtime ...
-Setting up libpam-runtime (0.79-4) ...
-
-(Reading database ... 12093 files and directories currently installed.)
-Preparing to replace libpam0g 0.79-3.2 (using .../libpam0g_0.79-4_amd64.deb) ...
-Unpacking replacement libpam0g ...
-Setting up libpam0g (0.79-4) ...
-
-(Reading database ... 12093 files and directories currently installed.)
-Preparing to replace libpam-modules 0.79-3.2 (using .../libpam-modules_0.79-4_amd64.deb) ...
-Unpacking replacement libpam-modules ...
-Setting up libpam-modules (0.79-4) ...
-Installing new version of config file /etc/security/limits.conf ...
-
-(Reading database ... 12093 files and directories currently installed.)
-Preparing to replace login 1:4.0.18.1-3 (using .../login_1%3a4.0.18.1-5_amd64.deb) ...
-Unpacking replacement login ...
-Setting up login (4.0.18.1-5) ...
-
 Selecting previously deselected package sysvinit-utils.
-(Reading database ... 12093 files and directories currently installed.)
-Unpacking sysvinit-utils (from .../sysvinit-utils_2.86.ds1-33_amd64.deb) ...
+(Reading database ... 12107 files and directories currently installed.)
+Unpacking sysvinit-utils (from .../sysvinit-utils_2.86.ds1-34_amd64.deb) ...
 Replacing files in old package sysvinit ...
-Setting up sysvinit-utils (2.86.ds1-33) ...
-(Reading database ... 12097 files and directories currently installed.)
-Preparing to replace sysvinit 2.86.ds1-20 (using .../sysvinit_2.86.ds1-33_amd64.deb) ...
+Setting up sysvinit-utils (2.86.ds1-34) ...
+(Reading database ... 12111 files and directories currently installed.)
+Preparing to replace sysvinit 2.86.ds1-20 (using .../sysvinit_2.86.ds1-34_amd64.deb) ...
 Unpacking replacement sysvinit ...
-Setting up sysvinit (2.86.ds1-33) ...
+Setting up sysvinit (2.86.ds1-34) ...
 init: timeout opening/writing control channel /dev/initctl
 
-(Reading database ... 12097 files and directories currently installed.)
-Preparing to replace tar 1.15.91-2 (using .../archives/tar_1.16-1_amd64.deb) ...
-Unpacking replacement tar ...
-Setting up tar (1.16-1) ...
-
-(Reading database ... 12097 files and directories currently installed.)
-Preparing to replace debconf-i18n 1.5.6 (using .../debconf-i18n_1.5.7_all.deb) ...
-Unpacking replacement debconf-i18n ...
-Preparing to replace debconf 1.5.6 (using .../archives/debconf_1.5.7_all.deb) ...
-Unpacking replacement debconf ...
-Preparing to replace lsb-base 3.1-15 (using .../lsb-base_3.1-18_all.deb) ...
+(Reading database ... 12111 files and directories currently installed.)
+Preparing to replace lsb-base 3.1-15 (using .../lsb-base_3.1-19_all.deb) ...
 Unpacking replacement lsb-base ...
-Setting up lsb-base (3.1-18) ...
-(Reading database ... 12098 files and directories currently installed.)
-Preparing to replace initscripts 2.86.ds1-20 (using .../initscripts_2.86.ds1-33_amd64.deb) ...
+Setting up lsb-base (3.1-19) ...
+(Reading database ... 12111 files and directories currently installed.)
+Preparing to replace util-linux 2.12r-12 (using .../util-linux_2.12r-15_amd64.deb) ...
+Unpacking replacement util-linux ...
+Setting up util-linux (2.12r-15) ...
+
+(Reading database ... 12119 files and directories currently installed.)
+Preparing to replace apt 0.6.46.2 (using .../apt_0.6.46.3_amd64.deb) ...
+Unpacking replacement apt ...
+Setting up apt (0.6.46.3) ...
+
+(Reading database ... 12119 files and directories currently installed.)
+Preparing to replace initscripts 2.86.ds1-20 (using .../initscripts_2.86.ds1-34_amd64.deb) ...
 Unpacking replacement initscripts ...
-Setting up initscripts (2.86.ds1-33) ...
+Setting up initscripts (2.86.ds1-34) ...
 Installing new version of config file /etc/init.d/bootclean ...
 Installing new version of config file /etc/init.d/bootlogd ...
 Installing new version of config file /etc/init.d/stop-bootlogd-single ...
@@ -213,139 +161,89 @@ Installing new version of config file /etc/init.d/umountfs ...
 Installing new version of config file /etc/init.d/umountnfs.sh ...
 Installing new version of config file /etc/init.d/umountroot ...
 Installing new version of config file /etc/init.d/urandom ...
+Installing new version of config file /etc/network/if-up.d/mountnfs ...
 
-(Reading database ... 12099 files and directories currently installed.)
-Preparing to replace libblkid1 1.39-1 (using .../libblkid1_1.39+1.40-WIP-2006.10.02+dfsg-2_amd64.deb) ...
-Unpacking replacement libblkid1 ...
-Setting up libblkid1 (1.39+1.40-WIP-2006.10.02+dfsg-2) ...
-
-(Reading database ... 12099 files and directories currently installed.)
-Preparing to replace libcomerr2 1.39-1 (using .../libcomerr2_1.39+1.40-WIP-2006.10.02+dfsg-2_amd64.deb) ...
-Unpacking replacement libcomerr2 ...
-Setting up libcomerr2 (1.39+1.40-WIP-2006.10.02+dfsg-2) ...
-
-(Reading database ... 12099 files and directories currently installed.)
-Preparing to replace cpp-4.1 4.1.1-13 (using .../cpp-4.1_4.1.1-18_amd64.deb) ...
-Unpacking replacement cpp-4.1 ...
-Preparing to replace gcc-4.1-base 4.1.1-13 (using .../gcc-4.1-base_4.1.1-18_amd64.deb) ...
-Unpacking replacement gcc-4.1-base ...
-Preparing to replace libgcc1 1:4.1.1-13 (using .../libgcc1_1%3a4.1.1-18_amd64.deb) ...
-Unpacking replacement libgcc1 ...
-Setting up gcc-4.1-base (4.1.1-18) ...
-
-Setting up libgcc1 (4.1.1-18) ...
-
-(Reading database ... 12099 files and directories currently installed.)
-Preparing to replace gcc-4.1 4.1.1-13 (using .../gcc-4.1_4.1.1-18_amd64.deb) ...
-Unpacking replacement gcc-4.1 ...
-Preparing to replace g++-4.1 4.1.1-13 (using .../g++-4.1_4.1.1-18_amd64.deb) ...
-Unpacking replacement g++-4.1 ...
-Preparing to replace libstdc++6-4.1-dev 4.1.1-13 (using .../libstdc++6-4.1-dev_4.1.1-18_amd64.deb) ...
-Unpacking replacement libstdc++6-4.1-dev ...
-Preparing to replace libssp0 4.1.1-13 (using .../libssp0_4.1.1-18_amd64.deb) ...
-Unpacking replacement libssp0 ...
-Preparing to replace libstdc++6 4.1.1-13 (using .../libstdc++6_4.1.1-18_amd64.deb) ...
-Unpacking replacement libstdc++6 ...
-Setting up libstdc++6 (4.1.1-18) ...
-
-(Reading database ... 12103 files and directories currently installed.)
-Preparing to replace libss2 1.39-1 (using .../libss2_1.39+1.40-WIP-2006.10.02+dfsg-2_amd64.deb) ...
-Unpacking replacement libss2 ...
-Setting up libss2 (1.39+1.40-WIP-2006.10.02+dfsg-2) ...
-
-(Reading database ... 12103 files and directories currently installed.)
-Preparing to replace libuuid1 1.39-1 (using .../libuuid1_1.39+1.40-WIP-2006.10.02+dfsg-2_amd64.deb) ...
-Unpacking replacement libuuid1 ...
-Setting up libuuid1 (1.39+1.40-WIP-2006.10.02+dfsg-2) ...
-
-(Reading database ... 12103 files and directories currently installed.)
-Preparing to replace sysv-rc 2.86.ds1-20 (using .../sysv-rc_2.86.ds1-33_all.deb) ...
+(Reading database ... 12120 files and directories currently installed.)
+Preparing to replace sysv-rc 2.86.ds1-20 (using .../sysv-rc_2.86.ds1-34_all.deb) ...
 Unpacking replacement sysv-rc ...
-Setting up sysv-rc (2.86.ds1-33) ...
-
-(Reading database ... 12103 files and directories currently installed.)
-Preparing to replace passwd 1:4.0.18.1-3 (using .../passwd_1%3a4.0.18.1-5_amd64.deb) ...
-Unpacking replacement passwd ...
-Preparing to replace adduser 3.97 (using .../archives/adduser_3.99_all.deb) ...
-Unpacking replacement adduser ...
+Setting up sysv-rc (2.86.ds1-34) ...
+(Reading database ... 12119 files and directories currently installed.)
+Preparing to replace apt-utils 0.6.46.2 (using .../apt-utils_0.6.46.3_amd64.deb) ...
+Unpacking replacement apt-utils ...
 Preparing to replace aptitude 0.4.3-1 (using .../aptitude_0.4.4-1_amd64.deb) ...
 Unpacking replacement aptitude ...
-Preparing to replace cron 3.0pl1-97 (using .../cron_3.0pl1-99_amd64.deb) ...
-Unpacking replacement cron ...
-Preparing to replace dhcp3-client 3.0.4-8 (using .../dhcp3-client_3.0.4-10_amd64.deb) ...
-Unpacking replacement dhcp3-client ...
-Preparing to replace dhcp3-common 3.0.4-8 (using .../dhcp3-common_3.0.4-10_amd64.deb) ...
-Unpacking replacement dhcp3-common ...
-Preparing to replace gettext-base 0.14.6-1 (using .../gettext-base_0.15-2_amd64.deb) ...
+Preparing to replace gettext-base 0.14.6-1 (using .../gettext-base_0.15-3_amd64.deb) ...
 Unpacking replacement gettext-base ...
-Preparing to replace ifupdown 0.6.7-0.4 (using .../ifupdown_0.6.8_amd64.deb) ...
-Unpacking replacement ifupdown ...
-Preparing to replace iputils-ping 3:20020927-3 (using .../iputils-ping_3%3a20020927-3.1_amd64.deb) ...
-Unpacking replacement iputils-ping ...
+Preparing to replace libgnutls13 1.4.4-2 (using .../libgnutls13_1.4.4-3_amd64.deb) ...
+Unpacking replacement libgnutls13 ...
+Selecting previously deselected package libsasl2-2.
+Unpacking libsasl2-2 (from .../libsasl2-2_2.1.22.dfsg1-1_amd64.deb) ...
+Replacing files in old package libsasl2 ...
+Preparing to replace libsasl2 2.1.19.dfsg1-0.5 (using .../libsasl2_2.1.22.dfsg1-1_amd64.deb) ...
+Unpacking replacement libsasl2 ...
+Preparing to replace libldap2 2.1.30-13+b1 (using .../libldap2_2.1.30-13.2_amd64.deb) ...
+Unpacking replacement libldap2 ...
+Replaced by files in installed package libldap-2.3-0 ...
+Selecting previously deselected package gpgv.
+Unpacking gpgv (from .../gpgv_1.4.5-2_amd64.deb) ...
+Replacing files in old package gnupg ...
+Preparing to replace gnupg 1.4.5-1 (using .../gnupg_1.4.5-2_amd64.deb) ...
+Unpacking replacement gnupg ...
+Preparing to replace iptables 1.3.6.0debian1-2 (using .../iptables_1.3.6.0debian1-3_amd64.deb) ...
+Unpacking replacement iptables ...
 Preparing to replace sysklogd 1.4.1-18 (using .../sysklogd_1.4.1-20_amd64.deb) ...
 Unpacking replacement sysklogd ...
 Preparing to replace klogd 1.4.1-18 (using .../klogd_1.4.1-20_amd64.deb) ...
 Unpacking replacement klogd ...
-Preparing to replace libopencdk8 0.5.9-1 (using .../libopencdk8_0.5.9-2_amd64.deb) ...
-Unpacking replacement libopencdk8 ...
-Preparing to replace libtasn1-3 0.3.6-1 (using .../libtasn1-3_0.3.6-2_amd64.deb) ...
-Unpacking replacement libtasn1-3 ...
-Preparing to replace libgnutls13 1.4.4-1 (using .../libgnutls13_1.4.4-2_amd64.deb) ...
-Unpacking replacement libgnutls13 ...
-Preparing to replace libnewt0.52 0.52.2-7 (using .../libnewt0.52_0.52.2-8_amd64.deb) ...
-Unpacking replacement libnewt0.52 ...
-Preparing to replace libtasn1-3-bin 0.3.6-1 (using .../libtasn1-3-bin_0.3.6-2_amd64.deb) ...
-Unpacking replacement libtasn1-3-bin ...
+Preparing to replace libldap-2.3-0 2.3.27-1 (using .../libldap-2.3-0_2.3.29-1_amd64.deb) ...
+Unpacking replacement libldap-2.3-0 ...
 Preparing to replace man-db 2.4.3-3 (using .../man-db_2.4.3-4_amd64.deb) ...
 Unpacking replacement man-db ...
-Preparing to replace nano 1.9.99pre2-1 (using .../nano_1.9.99pre3-1_amd64.deb) ...
+Preparing to replace nano 1.9.99pre3-1 (using .../nano_2.0.0-1_amd64.deb) ...
 Unpacking replacement nano ...
 Preparing to replace tasksel-data 2.56 (using .../tasksel-data_2.57_all.deb) ...
 Unpacking replacement tasksel-data ...
 Preparing to replace tasksel 2.56 (using .../archives/tasksel_2.57_all.deb) ...
 Unpacking replacement tasksel ...
-Preparing to replace vim-tiny 1:7.0-122+1 (using .../vim-tiny_1%3a7.0-152+1_amd64.deb) ...
+Preparing to replace vim-tiny 1:7.0-122+1 (using .../vim-tiny_1%3a7.0-158+1_amd64.deb) ...
 Unpacking replacement vim-tiny ...
-Preparing to replace vim-common 1:7.0-122+1 (using .../vim-common_1%3a7.0-152+1_amd64.deb) ...
+Preparing to replace vim-common 1:7.0-122+1 (using .../vim-common_1%3a7.0-158+1_amd64.deb) ...
 Unpacking replacement vim-common ...
-Preparing to replace whiptail 0.52.2-7 (using .../whiptail_0.52.2-8_amd64.deb) ...
-Unpacking replacement whiptail ...
 Preparing to replace dselect 1.13.22 (using .../dselect_1.13.24_amd64.deb) ...
 Unpacking replacement dselect ...
 Preparing to replace make 3.81-2 (using .../archives/make_3.81-3_amd64.deb) ...
 Unpacking replacement make ...
 Preparing to replace dpkg-dev 1.13.22 (using .../dpkg-dev_1.13.24_all.deb) ...
 Unpacking replacement dpkg-dev ...
-Setting up linux-kernel-headers (2.6.18-6) ...
-Setting up libc6-dev (2.3.6.ds1-7) ...
-Setting up cpp-4.1 (4.1.1-18) ...
-Setting up libssp0 (4.1.1-18) ...
-
-Setting up gcc-4.1 (4.1.1-18) ...
-Setting up passwd (4.0.18.1-5) ...
+Setting up libc6-dev (2.3.6.ds1-8) ...
+Setting up apt-utils (0.6.46.3) ...
 
 Setting up aptitude (0.4.4-1) ...
 
-Setting up dhcp3-common (3.0.4-10) ...
-Setting up gettext-base (0.15-2) ...
+Setting up gettext-base (0.15-3) ...
+
+Setting up libgnutls13 (1.4.4-3) ...
+
+Setting up libsasl2-2 (2.1.22.dfsg1-1) ...
 
-Setting up iputils-ping (20020927-3.1) ...
-Setting up libopencdk8 (0.5.9-2) ...
+Setting up libsasl2 (2.1.22.dfsg1-1) ...
+Setting up libldap2 (2.1.30-13.2) ...
 
-Setting up libtasn1-3 (0.3.6-2) ...
+Setting up gpgv (1.4.5-2) ...
+Setting up gnupg (1.4.5-2) ...
+Setting up iptables (1.3.6.0debian1-3) ...
 
-Setting up libgnutls13 (1.4.4-2) ...
+Setting up libldap-2.3-0 (2.3.29-1) ...
 
-Setting up libnewt0.52 (0.52.2-8) ...
+Setting up man-db (2.4.3-4) ...
 
-Setting up libtasn1-3-bin (0.3.6-2) ...
-Setting up nano (1.9.99pre3-1) ...
+Setting up nano (2.0.0-1) ...
+Installing new version of config file /etc/nanorc ...
 
-Setting up vim-common (7.0-152+1) ...
+Setting up vim-common (7.0-158+1) ...
 
-Setting up vim-tiny (7.0-152+1) ...
+Setting up vim-tiny (7.0-158+1) ...
 
-Setting up whiptail (0.52.2-8) ...
 Setting up dselect (1.13.24) ...
 Setting up make (3.81-3) ...
 Setting up dpkg-dev (1.13.24) ...
@@ -357,26 +255,6 @@ Installing new version of config file /etc/init.d/sysklogd ...
 Installing new version of config file /etc/cron.daily/sysklogd ...
 
 Setting up tasksel-data (2.57) ...
-Setting up debconf-i18n (1.5.7) ...
-Setting up libstdc++6-4.1-dev (4.1.1-18) ...
-Setting up g++-4.1 (4.1.1-18) ...
-Setting up debconf (1.5.7) ...
-
-Setting up adduser (3.99) ...
-
-Setting up cron (3.0pl1-99) ...
-Installing new version of config file /etc/init.d/cron ...
-Installing new version of config file /etc/cron.daily/standard ...
-Installing new version of config file /etc/crontab ...
-
-Setting up dhcp3-client (3.0.4-10) ...
-
-Setting up ifupdown (0.6.8) ...
-ifupdown.postinst: Warning: No 'iface lo' definition found in /etc/network/interfaces
-ifupdown.postinst: Warning: No 'auto lo' statement found in /etc/network/interfaces
-
-Setting up man-db (2.4.3-4) ...
-
 Setting up tasksel (2.57) ...
 
 Reading package lists...
@@ -389,11 +267,12 @@ umount: /sys: not mounted
 umount: /run: not found
 umount: /proc/bus/usb: not mounted
 umount: /dev/shm: not mounted
+umount: /lib/init/rw: not mounted
 cat: /var/run/inetd.pid: No such file or directory
 kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill -l [sigspec]
- -> user script /var/cache/pbuilder/build//22906/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//24195/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//22906 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//24195 and its subdirectories
diff --git a/testsuite/normal/pdebuild-internal-etch.log b/testsuite/normal/pdebuild-internal-etch.log
index f384a09..e1bfcf6 100644
--- a/testsuite/normal/pdebuild-internal-etch.log
+++ b/testsuite/normal/pdebuild-internal-etch.log
@@ -1,15 +1,16 @@
 W: /home/dancer/.pbuilderrc does not exist
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2
+-> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2
  -> policy-rc.d already exists
-Using: : pdebuild-internal,v 1.13 2006/06/25 16:39:31 dancer Exp $
+Using: : pdebuild-internal,v 1.16 2006/11/06 20:06:25 lool Exp $
 Reading package lists...
 Building dependency tree...
+passwd is already the newest version.
 The following extra packages will be installed:
   cdebootstrap libdebian-installer-extra4 libdebian-installer4
 Suggested packages:
@@ -20,27 +21,27 @@ The following NEW packages will be installed:
   cdebootstrap libdebian-installer-extra4 libdebian-installer4 pbuilder
 0 upgraded, 4 newly installed, 0 to remove and 0 not upgraded.
 Need to get 143kB of archives.
-After unpacking 799kB of additional disk space will be used.
+After unpacking 782kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org etch/main libdebian-installer4 0.45 [27.3kB]
 Get:2 http://ftp.jp.debian.org etch/main libdebian-installer-extra4 0.45 [10.2kB]
-Get:3 http://ftp.jp.debian.org etch/main cdebootstrap 0.3.11 [26.5kB]
-Get:4 http://ftp.jp.debian.org etch/main pbuilder 0.159 [78.9kB]
-Fetched 143kB in 0s (465kB/s)
+Get:3 http://ftp.jp.debian.org etch/main cdebootstrap 0.3.15 [26.7kB]
+Get:4 http://ftp.jp.debian.org etch/main pbuilder 0.160 [78.9kB]
+Fetched 143kB in 0s (1263kB/s)
 Selecting previously deselected package libdebian-installer4.
-(Reading database ... 12071 files and directories currently installed.)
+(Reading database ... 12086 files and directories currently installed.)
 Unpacking libdebian-installer4 (from .../libdebian-installer4_0.45_amd64.deb) ...
 Selecting previously deselected package libdebian-installer-extra4.
 Unpacking libdebian-installer-extra4 (from .../libdebian-installer-extra4_0.45_amd64.deb) ...
 Selecting previously deselected package cdebootstrap.
-Unpacking cdebootstrap (from .../cdebootstrap_0.3.11_amd64.deb) ...
+Unpacking cdebootstrap (from .../cdebootstrap_0.3.15_amd64.deb) ...
 Selecting previously deselected package pbuilder.
-Unpacking pbuilder (from .../pbuilder_0.159_all.deb) ...
+Unpacking pbuilder (from .../pbuilder_0.160_all.deb) ...
 Setting up libdebian-installer4 (0.45) ...
 
 Setting up libdebian-installer-extra4 (0.45) ...
 
-Setting up cdebootstrap (0.3.11) ...
-Setting up pbuilder (0.159) ...
+Setting up cdebootstrap (0.3.15) ...
+Setting up pbuilder (0.160) ...
 Setting DEBBUILDOPTS=
  -> Attempting to parse the build-deps : pbuilder-satisfydepends,v 1.28 2006/05/30 23:45:45 dancer Exp $
  -> Considering  debhelper (>> 3.0.0)
@@ -60,20 +61,20 @@ The following NEW packages will be installed:
   debhelper file gettext html2text intltool-debian libdshconfig1
   libdshconfig1-dev libmagic1 po-debconf
 0 upgraded, 9 newly installed, 0 to remove and 0 not upgraded.
-Need to get 2917kB of archives.
-After unpacking 9544kB of additional disk space will be used.
+Need to get 2912kB of archives.
+After unpacking 9613kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org etch/main libmagic1 4.17-4 [277kB]
 Get:2 http://ftp.jp.debian.org etch/main file 4.17-4 [32.0kB]
 Get:3 http://ftp.jp.debian.org etch/main html2text 1.3.2a-3 [92.7kB]
 Get:4 http://ftp.jp.debian.org etch/main gettext 0.14.6-1 [1827kB]
 Get:5 http://ftp.jp.debian.org etch/main intltool-debian 0.35.0+20060710.1 [30.8kB]
-Get:6 http://ftp.jp.debian.org etch/main po-debconf 1.0.6 [111kB]
+Get:6 http://ftp.jp.debian.org etch/main po-debconf 1.0.7 [106kB]
 Get:7 http://ftp.jp.debian.org etch/main debhelper 5.0.40 [510kB]
 Get:8 http://ftp.jp.debian.org etch/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:9 http://ftp.jp.debian.org etch/main libdshconfig1-dev 0.20.12-2 [25.3kB]
-Fetched 2917kB in 1s (2563kB/s)
+Fetched 2912kB in 1s (2558kB/s)
 Selecting previously deselected package libmagic1.
-(Reading database ... 12168 files and directories currently installed.)
+(Reading database ... 12179 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.17-4_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.17-4_amd64.deb) ...
@@ -84,7 +85,7 @@ Unpacking gettext (from .../gettext_0.14.6-1_amd64.deb) ...
 Selecting previously deselected package intltool-debian.
 Unpacking intltool-debian (from .../intltool-debian_0.35.0+20060710.1_all.deb) ...
 Selecting previously deselected package po-debconf.
-Unpacking po-debconf (from .../po-debconf_1.0.6_all.deb) ...
+Unpacking po-debconf (from .../po-debconf_1.0.7_all.deb) ...
 Selecting previously deselected package debhelper.
 Unpacking debhelper (from .../debhelper_5.0.40_all.deb) ...
 Selecting previously deselected package libdshconfig1.
@@ -99,7 +100,7 @@ Setting up html2text (1.3.2a-3) ...
 Setting up gettext (0.14.6-1) ...
 
 Setting up intltool-debian (0.35.0+20060710.1) ...
-Setting up po-debconf (1.0.6) ...
+Setting up po-debconf (1.0.7) ...
 Setting up debhelper (5.0.40) ...
 Setting up libdshconfig1 (0.20.12-2) ...
 
@@ -115,7 +116,7 @@ After unpacking 406kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org etch/main fakeroot 1.5.10 [97.4kB]
 Fetched 97.4kB in 0s (1083kB/s)
 Selecting previously deselected package fakeroot.
-(Reading database ... 12767 files and directories currently installed.)
+(Reading database ... 12776 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.10_amd64.deb) ...
 Setting up fakeroot (1.5.10) ...
 
@@ -129,14 +130,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.7
@@ -331,18 +332,18 @@ config.status: creating po/Makefile
 touch configure-stamp
 dh_testdir
 /usr/bin/make
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7'
 Making all in m4
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/m4'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/po'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/po'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7'
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-dsh.o -MD -MP -MF ".deps/dsh-dsh.Tpo" -c -o dsh-dsh.o `test -f 'dsh.c' || echo './'`dsh.c; \
 	then mv -f ".deps/dsh-dsh.Tpo" ".deps/dsh-dsh.Po"; else rm -f ".deps/dsh-dsh.Tpo"; exit 1; fi
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-linkedlist.o -MD -MP -MF ".deps/dsh-linkedlist.Tpo" -c -o dsh-linkedlist.o `test -f 'linkedlist.c' || echo './'`linkedlist.c; \
@@ -355,26 +356,26 @@ gcc -Wall -g -O2 -o dsh dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  /usr/lib/lib
 mkdir build-man
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.1 > build-man/dsh.1
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.5 > build-man/dsh.conf.5
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7'
 Making check in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/m4'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/po'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7'
 PASS: tests/param-f.sh
 dsh: File ./tests/nonexistent.file could not be opened for read
 PASS: tests/param-f-fail.sh
@@ -425,7 +426,7 @@ PASS: tests/param-r-invalid.sh
 1: 1
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sun Oct 29 03:10:37 UTC 2006
+Mon Nov 13 03:09:42 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -495,13 +496,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Sun Oct 29 03:10:42 UTC 2006
+Mon Nov 13 03:09:47 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
+c: c
+dsh: Process terminated (before write).
 a: a
 b: b
-c: c
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -510,9 +512,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -520,58 +522,58 @@ dh_testroot
 dh_clean -k
 dh_installdirs
 # Add here commands to install the package into debian/dsh.
-/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
+/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/debian/dsh
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7'
 Making install in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/m4'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/m4'
 make[3]: Nothing to be done for `install-exec-am'.
 make[3]: Nothing to be done for `install-data-am'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/m4'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES
-installing ja.gmo as /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES
+installing ja.gmo as /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
 if test "dsh" = "gettext"; then \
-	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po; \
+	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po; \
 	  for file in Makefile.in.in Makevars remove-potcdate.sin   ; do \
 	    /usr/bin/install -c -m 644 ./$file \
-			    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po/$file; \
+			    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po/$file; \
 	  done; \
 	else \
 	  : ; \
 	fi
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
-test -z "/usr/bin" || mkdir -p -- "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/bin"
-  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh'
-install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/etc/dsh"
- /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7'
+test -z "/usr/bin" || mkdir -p -- "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/debian/dsh/usr/bin"
+  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh'
+install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/debian/dsh/etc/dsh"
+ /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf'
 for LANGS in ja ; do \
-		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1 ;\
-		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5 ;\
+		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1 ;\
+		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5 ;\
 		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
-			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
 		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.$LANGS.5 \
-			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
 	done
-test -z "/usr/share/man/man1" || mkdir -p -- "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1"
- /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1/dsh.1'
-test -z "/usr/share/man/man5" || mkdir -p -- "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man5"
- /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man5/dsh.conf.5'
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster/
+test -z "/usr/share/man/man1" || mkdir -p -- "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1"
+ /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1/dsh.1'
+test -z "/usr/share/man/man5" || mkdir -p -- "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man5"
+ /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man5/dsh.conf.5'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7'
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/debian/dsh/etc/dsh/machines.list
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/debian/dsh/etc/dsh/group/all
+install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster
+install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -594,8 +596,8 @@ dpkg-deb: building package `dsh' in `../dsh_0.25.7-1_amd64.deb'.
  dpkg-genchanges
 dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
+ -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2 filesystem
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2 filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir3/17086 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir3/18400 and its subdirectories
diff --git a/testsuite/normal/pdebuild-internal-sid.log b/testsuite/normal/pdebuild-internal-sid.log
index 1260dde..da01114 100644
--- a/testsuite/normal/pdebuild-internal-sid.log
+++ b/testsuite/normal/pdebuild-internal-sid.log
@@ -1,15 +1,16 @@
 W: /home/dancer/.pbuilderrc does not exist
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2
+-> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2
  -> policy-rc.d already exists
-Using: : pdebuild-internal,v 1.13 2006/06/25 16:39:31 dancer Exp $
+Using: : pdebuild-internal,v 1.16 2006/11/06 20:06:25 lool Exp $
 Reading package lists...
 Building dependency tree...
+passwd is already the newest version.
 The following extra packages will be installed:
   cdebootstrap libdebian-installer-extra4 libdebian-installer4
 Suggested packages:
@@ -25,9 +26,9 @@ Get:1 http://ftp.jp.debian.org sid/main libdebian-installer4 0.45 [27.3kB]
 Get:2 http://ftp.jp.debian.org sid/main libdebian-installer-extra4 0.45 [10.2kB]
 Get:3 http://ftp.jp.debian.org sid/main cdebootstrap 0.3.15 [26.7kB]
 Get:4 http://ftp.jp.debian.org sid/main pbuilder 0.160 [78.9kB]
-Fetched 143kB in 0s (166kB/s)
+Fetched 143kB in 0s (353kB/s)
 Selecting previously deselected package libdebian-installer4.
-(Reading database ... 12131 files and directories currently installed.)
+(Reading database ... 12145 files and directories currently installed.)
 Unpacking libdebian-installer4 (from .../libdebian-installer4_0.45_amd64.deb) ...
 Selecting previously deselected package libdebian-installer-extra4.
 Unpacking libdebian-installer-extra4 (from .../libdebian-installer-extra4_0.45_amd64.deb) ...
@@ -60,33 +61,33 @@ The following NEW packages will be installed:
   debhelper file gettext html2text intltool-debian libdshconfig1
   libdshconfig1-dev libmagic1 po-debconf
 0 upgraded, 9 newly installed, 0 to remove and 0 not upgraded.
-Need to get 3097kB of archives.
+Need to get 3098kB of archives.
 After unpacking 10.1MB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org sid/main libmagic1 4.17-4 [277kB]
 Get:2 http://ftp.jp.debian.org sid/main file 4.17-4 [32.0kB]
 Get:3 http://ftp.jp.debian.org sid/main html2text 1.3.2a-3 [92.7kB]
-Get:4 http://ftp.jp.debian.org sid/main gettext 0.15-2 [2012kB]
+Get:4 http://ftp.jp.debian.org sid/main gettext 0.15-3 [2012kB]
 Get:5 http://ftp.jp.debian.org sid/main intltool-debian 0.35.0+20060710.1 [30.8kB]
 Get:6 http://ftp.jp.debian.org sid/main po-debconf 1.0.7 [106kB]
-Get:7 http://ftp.jp.debian.org sid/main debhelper 5.0.40 [510kB]
+Get:7 http://ftp.jp.debian.org sid/main debhelper 5.0.41 [512kB]
 Get:8 http://ftp.jp.debian.org sid/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:9 http://ftp.jp.debian.org sid/main libdshconfig1-dev 0.20.12-2 [25.3kB]
-Fetched 3097kB in 1s (2582kB/s)
+Fetched 3098kB in 1s (2564kB/s)
 Selecting previously deselected package libmagic1.
-(Reading database ... 12224 files and directories currently installed.)
+(Reading database ... 12238 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.17-4_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.17-4_amd64.deb) ...
 Selecting previously deselected package html2text.
 Unpacking html2text (from .../html2text_1.3.2a-3_amd64.deb) ...
 Selecting previously deselected package gettext.
-Unpacking gettext (from .../gettext_0.15-2_amd64.deb) ...
+Unpacking gettext (from .../gettext_0.15-3_amd64.deb) ...
 Selecting previously deselected package intltool-debian.
 Unpacking intltool-debian (from .../intltool-debian_0.35.0+20060710.1_all.deb) ...
 Selecting previously deselected package po-debconf.
 Unpacking po-debconf (from .../po-debconf_1.0.7_all.deb) ...
 Selecting previously deselected package debhelper.
-Unpacking debhelper (from .../debhelper_5.0.40_all.deb) ...
+Unpacking debhelper (from .../debhelper_5.0.41_all.deb) ...
 Selecting previously deselected package libdshconfig1.
 Unpacking libdshconfig1 (from .../libdshconfig1_0.20.12-2_amd64.deb) ...
 Selecting previously deselected package libdshconfig1-dev.
@@ -96,11 +97,11 @@ Setting up libmagic1 (4.17-4) ...
 Setting up file (4.17-4) ...
 Setting up html2text (1.3.2a-3) ...
 
-Setting up gettext (0.15-2) ...
+Setting up gettext (0.15-3) ...
 
 Setting up intltool-debian (0.35.0+20060710.1) ...
 Setting up po-debconf (1.0.7) ...
-Setting up debhelper (5.0.40) ...
+Setting up debhelper (5.0.41) ...
 Setting up libdshconfig1 (0.20.12-2) ...
 
 Setting up libdshconfig1-dev (0.20.12-2) ...
@@ -113,9 +114,9 @@ The following NEW packages will be installed:
 Need to get 97.4kB of archives.
 After unpacking 406kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org sid/main fakeroot 1.5.10 [97.4kB]
-Fetched 97.4kB in 0s (1088kB/s)
+Fetched 97.4kB in 0s (1014kB/s)
 Selecting previously deselected package fakeroot.
-(Reading database ... 12829 files and directories currently installed.)
+(Reading database ... 12842 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.10_amd64.deb) ...
 Setting up fakeroot (1.5.10) ...
 
@@ -129,14 +130,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.7
@@ -331,18 +332,18 @@ config.status: creating po/Makefile
 touch configure-stamp
 dh_testdir
 /usr/bin/make
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7'
 Making all in m4
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/m4'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/po'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/po'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7'
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-dsh.o -MD -MP -MF ".deps/dsh-dsh.Tpo" -c -o dsh-dsh.o `test -f 'dsh.c' || echo './'`dsh.c; \
 	then mv -f ".deps/dsh-dsh.Tpo" ".deps/dsh-dsh.Po"; else rm -f ".deps/dsh-dsh.Tpo"; exit 1; fi
 if gcc -DHAVE_CONFIG_H -I. -I. -I.    -DDSHCONFDIR="\"/etc/dsh\"" -DDSH_COMMANDLINE="\"/usr/bin/dsh\"" -DLOCALEDIR="\"/usr/share/locale\"" -Wall -g -O2 -MT dsh-linkedlist.o -MD -MP -MF ".deps/dsh-linkedlist.Tpo" -c -o dsh-linkedlist.o `test -f 'linkedlist.c' || echo './'`linkedlist.c; \
@@ -355,26 +356,26 @@ gcc -Wall -g -O2 -o dsh dsh-dsh.o dsh-linkedlist.o dsh-parameter.o  /usr/lib/lib
 mkdir build-man
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.1 > build-man/dsh.1
 sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.5 > build-man/dsh.conf.5
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7'
 Making check in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/m4'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/po'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7'
 PASS: tests/param-f.sh
 dsh: File ./tests/nonexistent.file could not be opened for read
 PASS: tests/param-f-fail.sh
@@ -412,8 +413,8 @@ success
 success
 a: dsh: Failed executing ./invalid-exec-file with llexec call
 b: dsh: Failed executing ./invalid-exec-file with llexec call
-c: dsh: Failed executing ./invalid-exec-file with llexec call
 d: dsh: Failed executing ./invalid-exec-file with llexec call
+c: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -421,11 +422,11 @@ dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
 success
 PASS: tests/param-r-invalid.sh
-1: 1
 2: 2
+1: 1
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sun Oct 29 03:05:08 UTC 2006
+Mon Nov 13 03:05:15 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -495,14 +496,13 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Sun Oct 29 03:05:13 UTC 2006
+Mon Nov 13 03:05:20 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
-a: a
 b: b
+a: a
 c: c
-dsh: Process terminated (before write).
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -511,9 +511,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -521,58 +521,58 @@ dh_testroot
 dh_clean -k
 dh_installdirs
 # Add here commands to install the package into debian/dsh.
-/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
+/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/debian/dsh
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7'
 Making install in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/m4'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/m4'
 make[3]: Nothing to be done for `install-exec-am'.
 make[3]: Nothing to be done for `install-data-am'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/m4'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES
-installing ja.gmo as /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES
+installing ja.gmo as /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
 if test "dsh" = "gettext"; then \
-	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po; \
+	  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po; \
 	  for file in Makefile.in.in Makevars remove-potcdate.sin   ; do \
 	    /usr/bin/install -c -m 644 ./$file \
-			    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po/$file; \
+			    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/debian/dsh/usr/share/gettext/po/$file; \
 	  done; \
 	else \
 	  : ; \
 	fi
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
-test -z "/usr/bin" || mkdir -p -- "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/bin"
-  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh'
-install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/etc/dsh"
- /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7'
+test -z "/usr/bin" || mkdir -p -- "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/debian/dsh/usr/bin"
+  /bin/sh ./libtool --mode=install install -p    -o root -g root  -m  755 -s 'dsh' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh'
+install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/debian/dsh/etc/dsh"
+ /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf'
 for LANGS in ja ; do \
-		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1 ;\
-		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5 ;\
+		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1 ;\
+		mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5 ;\
 		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
-			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
 		sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.conf.$LANGS.5 \
-			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+			> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
 	done
-test -z "/usr/share/man/man1" || mkdir -p -- "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1"
- /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1/dsh.1'
-test -z "/usr/share/man/man5" || mkdir -p -- "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man5"
- /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man5/dsh.conf.5'
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster/
+test -z "/usr/share/man/man1" || mkdir -p -- "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1"
+ /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man1/dsh.1'
+test -z "/usr/share/man/man5" || mkdir -p -- "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man5"
+ /usr/bin/install -c -m 644 './build-man/dsh.conf.5' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/debian/dsh/usr/share/man/man5/dsh.conf.5'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7'
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/debian/dsh/etc/dsh/machines.list
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/debian/dsh/etc/dsh/group/all
+install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster
+install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -594,8 +594,8 @@ dpkg-deb: building package `dsh' in `../dsh_0.25.7-1_amd64.deb'.
  dpkg-genchanges
 dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
+ -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2 filesystem
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2 filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir3/19733 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir3/21131 and its subdirectories
diff --git a/testsuite/normal/pdebuild-normal-etch.log b/testsuite/normal/pdebuild-normal-etch.log
index 6034fc1..90c265b 100644
--- a/testsuite/normal/pdebuild-normal-etch.log
+++ b/testsuite/normal/pdebuild-normal-etch.log
@@ -7,14 +7,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.7
@@ -31,20 +31,20 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Sun Oct 29 12:09:13 JST 2006
-pbuilder-time-stamp: 1162091353
+Current time: Mon Nov 13 12:08:31 JST 2006
+pbuilder-time-stamp: 1163387311
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
 Installing the build-deps
- -> Attempting to parse the build-deps : pbuilder-satisfydepends,v 1.28 2006/05/30 23:45:45 dancer Exp $
- -> Considering  debhelper (>> 3.0.0)
+ -> Attempting to parse the build-deps : pbuilder-satisfydepends,v 1.29 2006/11/06 20:20:56 lool Exp $
+ -> Considering build-dep debhelper (>> 3.0.0)
    -> Trying debhelper
- -> Considering  libdshconfig1-dev (>= 0.20.11-1)
+ -> Considering build-dep libdshconfig1-dev (>= 0.20.11-1)
    -> Trying libdshconfig1-dev
  -> Installing  debhelper libdshconfig1-dev
 Reading package lists...
@@ -59,20 +59,20 @@ The following NEW packages will be installed:
   debhelper file gettext html2text intltool-debian libdshconfig1
   libdshconfig1-dev libmagic1 po-debconf
 0 upgraded, 9 newly installed, 0 to remove and 0 not upgraded.
-Need to get 2917kB of archives.
-After unpacking 9544kB of additional disk space will be used.
+Need to get 2912kB of archives.
+After unpacking 9613kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org etch/main libmagic1 4.17-4 [277kB]
 Get:2 http://ftp.jp.debian.org etch/main file 4.17-4 [32.0kB]
 Get:3 http://ftp.jp.debian.org etch/main html2text 1.3.2a-3 [92.7kB]
 Get:4 http://ftp.jp.debian.org etch/main gettext 0.14.6-1 [1827kB]
 Get:5 http://ftp.jp.debian.org etch/main intltool-debian 0.35.0+20060710.1 [30.8kB]
-Get:6 http://ftp.jp.debian.org etch/main po-debconf 1.0.6 [111kB]
+Get:6 http://ftp.jp.debian.org etch/main po-debconf 1.0.7 [106kB]
 Get:7 http://ftp.jp.debian.org etch/main debhelper 5.0.40 [510kB]
 Get:8 http://ftp.jp.debian.org etch/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:9 http://ftp.jp.debian.org etch/main libdshconfig1-dev 0.20.12-2 [25.3kB]
-Fetched 2917kB in 1s (2594kB/s)
+Fetched 2912kB in 1s (2550kB/s)
 Selecting previously deselected package libmagic1.
-(Reading database ... 12071 files and directories currently installed.)
+(Reading database ... 12086 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.17-4_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.17-4_amd64.deb) ...
@@ -83,7 +83,7 @@ Unpacking gettext (from .../gettext_0.14.6-1_amd64.deb) ...
 Selecting previously deselected package intltool-debian.
 Unpacking intltool-debian (from .../intltool-debian_0.35.0+20060710.1_all.deb) ...
 Selecting previously deselected package po-debconf.
-Unpacking po-debconf (from .../po-debconf_1.0.6_all.deb) ...
+Unpacking po-debconf (from .../po-debconf_1.0.7_all.deb) ...
 Selecting previously deselected package debhelper.
 Unpacking debhelper (from .../debhelper_5.0.40_all.deb) ...
 Selecting previously deselected package libdshconfig1.
@@ -98,7 +98,7 @@ Setting up html2text (1.3.2a-3) ...
 Setting up gettext (0.14.6-1) ...
 
 Setting up intltool-debian (0.35.0+20060710.1) ...
-Setting up po-debconf (1.0.6) ...
+Setting up po-debconf (1.0.7) ...
 Setting up debhelper (5.0.40) ...
 Setting up libdshconfig1 (0.20.12-2) ...
 
@@ -112,9 +112,9 @@ The following NEW packages will be installed:
 Need to get 97.4kB of archives.
 After unpacking 406kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org etch/main fakeroot 1.5.10 [97.4kB]
-Fetched 97.4kB in 0s (815kB/s)
+Fetched 97.4kB in 0s (1069kB/s)
 Selecting previously deselected package fakeroot.
-(Reading database ... 12670 files and directories currently installed.)
+(Reading database ... 12683 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.10_amd64.deb) ...
 Setting up fakeroot (1.5.10) ...
 
@@ -446,11 +446,11 @@ dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
 success
 PASS: tests/param-r-invalid.sh
-2: 2
 1: 1
+2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sun Oct 29 03:09:51 UTC 2006
+Mon Nov 13 03:09:01 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -520,13 +520,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Sun Oct 29 03:09:56 UTC 2006
+Mon Nov 13 03:09:06 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
-a: a
-c: c
 b: b
+c: c
+dsh: Process terminated (before write).
+a: a
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -633,7 +634,7 @@ dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Sun Oct 29 12:09:58 JST 2006
-pbuilder-time-stamp: 1162091398
+Current time: Mon Nov 13 12:09:08 JST 2006
+pbuilder-time-stamp: 1163387348
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir3/11332 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir3/12647 and its subdirectories
diff --git a/testsuite/normal/pdebuild-normal-sid.log b/testsuite/normal/pdebuild-normal-sid.log
index 95315f3..34fd53f 100644
--- a/testsuite/normal/pdebuild-normal-sid.log
+++ b/testsuite/normal/pdebuild-normal-sid.log
@@ -7,14 +7,14 @@ dh_testdir
 dh_testroot
 rm -f build-stamp configure-stamp
 /usr/bin/make clean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir2/dsh-0.25.7'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir2/dsh-0.25.7'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.7
@@ -31,20 +31,20 @@ I: using fakeroot in build.
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Sun Oct 29 12:03:42 JST 2006
-pbuilder-time-stamp: 1162091022
+Current time: Mon Nov 13 12:03:51 JST 2006
+pbuilder-time-stamp: 1163387031
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
 Installing the build-deps
- -> Attempting to parse the build-deps : pbuilder-satisfydepends,v 1.28 2006/05/30 23:45:45 dancer Exp $
- -> Considering  debhelper (>> 3.0.0)
+ -> Attempting to parse the build-deps : pbuilder-satisfydepends,v 1.29 2006/11/06 20:20:56 lool Exp $
+ -> Considering build-dep debhelper (>> 3.0.0)
    -> Trying debhelper
- -> Considering  libdshconfig1-dev (>= 0.20.11-1)
+ -> Considering build-dep libdshconfig1-dev (>= 0.20.11-1)
    -> Trying libdshconfig1-dev
  -> Installing  debhelper libdshconfig1-dev
 Reading package lists...
@@ -59,33 +59,33 @@ The following NEW packages will be installed:
   debhelper file gettext html2text intltool-debian libdshconfig1
   libdshconfig1-dev libmagic1 po-debconf
 0 upgraded, 9 newly installed, 0 to remove and 0 not upgraded.
-Need to get 3097kB of archives.
+Need to get 3098kB of archives.
 After unpacking 10.1MB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org sid/main libmagic1 4.17-4 [277kB]
 Get:2 http://ftp.jp.debian.org sid/main file 4.17-4 [32.0kB]
 Get:3 http://ftp.jp.debian.org sid/main html2text 1.3.2a-3 [92.7kB]
-Get:4 http://ftp.jp.debian.org sid/main gettext 0.15-2 [2012kB]
+Get:4 http://ftp.jp.debian.org sid/main gettext 0.15-3 [2012kB]
 Get:5 http://ftp.jp.debian.org sid/main intltool-debian 0.35.0+20060710.1 [30.8kB]
 Get:6 http://ftp.jp.debian.org sid/main po-debconf 1.0.7 [106kB]
-Get:7 http://ftp.jp.debian.org sid/main debhelper 5.0.40 [510kB]
+Get:7 http://ftp.jp.debian.org sid/main debhelper 5.0.41 [512kB]
 Get:8 http://ftp.jp.debian.org sid/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:9 http://ftp.jp.debian.org sid/main libdshconfig1-dev 0.20.12-2 [25.3kB]
-Fetched 3097kB in 1s (2366kB/s)
+Fetched 3098kB in 1s (2561kB/s)
 Selecting previously deselected package libmagic1.
-(Reading database ... 12131 files and directories currently installed.)
+(Reading database ... 12145 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.17-4_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.17-4_amd64.deb) ...
 Selecting previously deselected package html2text.
 Unpacking html2text (from .../html2text_1.3.2a-3_amd64.deb) ...
 Selecting previously deselected package gettext.
-Unpacking gettext (from .../gettext_0.15-2_amd64.deb) ...
+Unpacking gettext (from .../gettext_0.15-3_amd64.deb) ...
 Selecting previously deselected package intltool-debian.
 Unpacking intltool-debian (from .../intltool-debian_0.35.0+20060710.1_all.deb) ...
 Selecting previously deselected package po-debconf.
 Unpacking po-debconf (from .../po-debconf_1.0.7_all.deb) ...
 Selecting previously deselected package debhelper.
-Unpacking debhelper (from .../debhelper_5.0.40_all.deb) ...
+Unpacking debhelper (from .../debhelper_5.0.41_all.deb) ...
 Selecting previously deselected package libdshconfig1.
 Unpacking libdshconfig1 (from .../libdshconfig1_0.20.12-2_amd64.deb) ...
 Selecting previously deselected package libdshconfig1-dev.
@@ -95,11 +95,11 @@ Setting up libmagic1 (4.17-4) ...
 Setting up file (4.17-4) ...
 Setting up html2text (1.3.2a-3) ...
 
-Setting up gettext (0.15-2) ...
+Setting up gettext (0.15-3) ...
 
 Setting up intltool-debian (0.35.0+20060710.1) ...
 Setting up po-debconf (1.0.7) ...
-Setting up debhelper (5.0.40) ...
+Setting up debhelper (5.0.41) ...
 Setting up libdshconfig1 (0.20.12-2) ...
 
 Setting up libdshconfig1-dev (0.20.12-2) ...
@@ -112,9 +112,9 @@ The following NEW packages will be installed:
 Need to get 97.4kB of archives.
 After unpacking 406kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org sid/main fakeroot 1.5.10 [97.4kB]
-Fetched 97.4kB in 0s (1077kB/s)
+Fetched 97.4kB in 0s (1071kB/s)
 Selecting previously deselected package fakeroot.
-(Reading database ... 12736 files and directories currently installed.)
+(Reading database ... 12749 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.10_amd64.deb) ...
 Setting up fakeroot (1.5.10) ...
 
@@ -436,8 +436,8 @@ success
 success
 success
 a: dsh: Failed executing ./invalid-exec-file with llexec call
-b: dsh: Failed executing ./invalid-exec-file with llexec call
 c: dsh: Failed executing ./invalid-exec-file with llexec call
+b: dsh: Failed executing ./invalid-exec-file with llexec call
 d: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -450,7 +450,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sun Oct 29 03:04:21 UTC 2006
+Mon Nov 13 03:04:28 UTC 2006
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -520,13 +520,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Sun Oct 29 03:04:26 UTC 2006
+Mon Nov 13 03:04:33 UTC 2006
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
-c: c
 b: b
+c: c
+dsh: Process terminated (before write).
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -632,7 +633,7 @@ dpkg-genchanges: including full source code in upload
 dpkg-buildpackage: full upload (original source is included)
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Sun Oct 29 12:04:27 JST 2006
-pbuilder-time-stamp: 1162091067
+Current time: Mon Nov 13 12:04:35 JST 2006
+pbuilder-time-stamp: 1163387075
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.swJWl28179/dir3/13979 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.cidWl29510/dir3/15378 and its subdirectories