update

20 files changed, 628 insertions, 528 deletions

diff --git a/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log b/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log
index 8db3fb7..da816a6 100644
--- a/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log
+++ b/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log
@@ -1,10 +1,10 @@
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Fri Oct 14 12:16:32 JST 2005
-pbuilder-time-stamp: 1129259792
+Current time: Sat Oct 15 12:19:14 JST 2005
+pbuilder-time-stamp: 1129346354
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -72,11 +72,11 @@ Setting up libdshconfig1 (0.20.11-1) ...
 Setting up libdshconfig1-dev (0.20.11-1) ...
  -> Finished parsing the build-deps
 Copying back the cached apt archive contents
-grep: /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir1/19023/etc/shadow: No such file or directory
+grep: /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir1/22250/etc/shadow: No such file or directory
 Copying source file
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir1/dsh_0.25.6-1.dsc]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir1/dsh_0.25.6.orig.tar.gz]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir1/dsh_0.25.6-1.diff.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir1/dsh_0.25.6-1.dsc]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir1/dsh_0.25.6.orig.tar.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir1/dsh_0.25.6-1.diff.gz]
 Extracting source
 dpkg-source: warning: no utmp entry available and LOGNAME not defined; using uid of process (0)
 dpkg-source: extracting dsh in dsh-0.25.6
@@ -388,11 +388,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
-Fri Oct 14 03:17:01 UTC 2005
+Sat Oct 15 03:19:54 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -462,13 +462,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
-Fri Oct 14 03:17:06 UTC 2005
+Sat Oct 15 03:19:59 UTC 2005
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
-b: b
 dsh: Process terminated (before write).
+b: b
 c: c
 PASS: tests/segv-catcher.sh
 l w
@@ -575,7 +575,7 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Fri Oct 14 12:17:08 JST 2005
-pbuilder-time-stamp: 1129259828
+Current time: Sat Oct 15 12:20:01 JST 2005
+pbuilder-time-stamp: 1129346401
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir1/19023 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir1/22250 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-build-dsh-sarge.log b/testsuite/cdebootstrap/pbuilder-build-dsh-sarge.log
index 88d8d24..d5fcbec 100644
--- a/testsuite/cdebootstrap/pbuilder-build-dsh-sarge.log
+++ b/testsuite/cdebootstrap/pbuilder-build-dsh-sarge.log
@@ -1,10 +1,10 @@
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Fri Oct 14 12:09:34 JST 2005
-pbuilder-time-stamp: 1129259374
+Current time: Sat Oct 15 12:10:15 JST 2005
+pbuilder-time-stamp: 1129345815
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -72,11 +72,11 @@ Setting up libdshconfig1 (0.20.11-1) ...
 Setting up libdshconfig1-dev (0.20.11-1) ...
  -> Finished parsing the build-deps
 Copying back the cached apt archive contents
-grep: /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir1/9562/etc/shadow: No such file or directory
+grep: /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir1/10995/etc/shadow: No such file or directory
 Copying source file
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir1/dsh_0.25.6-1.dsc]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir1/dsh_0.25.6.orig.tar.gz]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir1/dsh_0.25.6-1.diff.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir1/dsh_0.25.6-1.dsc]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir1/dsh_0.25.6.orig.tar.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir1/dsh_0.25.6-1.diff.gz]
 Extracting source
 dpkg-source: warning: no utmp entry available and LOGNAME not defined; using uid of process (0)
 dpkg-source: extracting dsh in dsh-0.25.6
@@ -351,7 +351,6 @@ test to check that unknown parameter checking is right.
 PASS: tests/param-unknown.sh
 test1
 test2
-dsh: Process terminated (before write).
 PASS: tests/param-i.sh
 Check that cn4 option is working.
 PASS: tests/param-cn4.sh
@@ -386,11 +385,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
-Fri Oct 14 03:10:00 UTC 2005
+Sat Oct 15 03:10:48 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -460,13 +459,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
-Fri Oct 14 03:10:05 UTC 2005
+Sat Oct 15 03:10:53 UTC 2005
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
+a: a
 b: b
 dsh: Process terminated (before write).
-a: a
 c: c
 PASS: tests/segv-catcher.sh
 l w
@@ -573,7 +572,7 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Fri Oct 14 12:10:07 JST 2005
-pbuilder-time-stamp: 1129259407
+Current time: Sat Oct 15 12:10:55 JST 2005
+pbuilder-time-stamp: 1129345855
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir1/9562 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir1/10995 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-build-dsh-sid.log b/testsuite/cdebootstrap/pbuilder-build-dsh-sid.log
index 7e85f02..1100783 100644
--- a/testsuite/cdebootstrap/pbuilder-build-dsh-sid.log
+++ b/testsuite/cdebootstrap/pbuilder-build-dsh-sid.log
@@ -1,10 +1,10 @@
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Fri Oct 14 12:04:57 JST 2005
-pbuilder-time-stamp: 1129259097
+Current time: Sat Oct 15 12:05:23 JST 2005
+pbuilder-time-stamp: 1129345523
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -32,18 +32,19 @@ The following NEW packages will be installed:
   debconf-utils debhelper file gettext html2text intltool-debian libdshconfig1
   libdshconfig1-dev libmagic1 po-debconf
 0 upgraded, 10 newly installed, 0 to remove and 0 not upgraded.
-Need to get 505kB/2860kB of archives.
-After unpacking 9437kB of additional disk space will be used.
+Need to get 293kB/2890kB of archives.
+After unpacking 9572kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   libmagic1 file debconf-utils html2text gettext intltool-debian po-debconf
   debhelper libdshconfig1 libdshconfig1-dev
-Get:1 http://ftp.jp.debian.org sid/main debhelper 4.9.13 [505kB]
-Fetched 505kB in 0s (1176kB/s)
+Get:1 http://ftp.jp.debian.org sid/main libmagic1 4.15-2 [262kB]
+Get:2 http://ftp.jp.debian.org sid/main file 4.15-2 [30.8kB]
+Fetched 293kB in 0s (606kB/s)
 Selecting previously deselected package libmagic1.
-(Reading database ... 11275 files and directories currently installed.)
-Unpacking libmagic1 (from .../libmagic1_4.12-1_amd64.deb) ...
+(Reading database ... 11516 files and directories currently installed.)
+Unpacking libmagic1 (from .../libmagic1_4.15-2_amd64.deb) ...
 Selecting previously deselected package file.
-Unpacking file (from .../archives/file_4.12-1_amd64.deb) ...
+Unpacking file (from .../archives/file_4.15-2_amd64.deb) ...
 Selecting previously deselected package debconf-utils.
 Unpacking debconf-utils (from .../debconf-utils_1.4.58_all.deb) ...
 Selecting previously deselected package html2text.
@@ -60,9 +61,9 @@ Selecting previously deselected package libdshconfig1.
 Unpacking libdshconfig1 (from .../libdshconfig1_0.20.11-1_amd64.deb) ...
 Selecting previously deselected package libdshconfig1-dev.
 Unpacking libdshconfig1-dev (from .../libdshconfig1-dev_0.20.11-1_amd64.deb) ...
-Setting up libmagic1 (4.12-1) ...
+Setting up libmagic1 (4.15-2) ...
 
-Setting up file (4.12-1) ...
+Setting up file (4.15-2) ...
 Setting up debconf-utils (1.4.58) ...
 
 Setting up html2text (1.3.2a-3) ...
@@ -77,12 +78,13 @@ Setting up libdshconfig1 (0.20.11-1) ...
 Setting up libdshconfig1-dev (0.20.11-1) ...
  -> Finished parsing the build-deps
 Copying back the cached apt archive contents
- -> new cache content debhelper_4.9.13_all.deb added
-grep: /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir1/6305/etc/shadow: No such file or directory
+ -> new cache content libmagic1_4.15-2_amd64.deb added
+ -> new cache content file_4.15-2_amd64.deb added
+grep: /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir1/7647/etc/shadow: No such file or directory
 Copying source file
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir1/dsh_0.25.6-1.dsc]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir1/dsh_0.25.6.orig.tar.gz]
-    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir1/dsh_0.25.6-1.diff.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir1/dsh_0.25.6-1.dsc]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir1/dsh_0.25.6.orig.tar.gz]
+    -> copying [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir1/dsh_0.25.6-1.diff.gz]
 Extracting source
 dpkg-source: warning: no utmp entry available and LOGNAME not defined; using uid of process (0)
 dpkg-source: extracting dsh in dsh-0.25.6
@@ -398,7 +400,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
-Fri Oct 14 03:05:33 UTC 2005
+Sat Oct 15 03:06:02 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -468,14 +470,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
-Fri Oct 14 03:05:38 UTC 2005
+Sat Oct 15 03:06:07 UTC 2005
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
 b: b
-c: c
 dsh: Process terminated (before write).
+c: c
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -581,7 +583,7 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Fri Oct 14 12:05:39 JST 2005
-pbuilder-time-stamp: 1129259139
+Current time: Sat Oct 15 12:06:09 JST 2005
+pbuilder-time-stamp: 1129345569
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir1/6305 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir1/7647 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-create-etch.log b/testsuite/cdebootstrap/pbuilder-create-etch.log
index 0475c4a..e7ac9e2 100644
--- a/testsuite/cdebootstrap/pbuilder-create-etch.log
+++ b/testsuite/cdebootstrap/pbuilder-create-etch.log
@@ -848,7 +848,8 @@ P: Configuring package debconf
 O: 
 P: Configuring helper cdebootstrap-helper-apt
 O: Selecting previously deselected package cdebootstrap-helper-apt.
-O: (Reading database ... 4514 files and directories currently installed.)
+O: (Reading database ... 
+O: 4514 files and directories currently installed.)
 O: Unpacking cdebootstrap-helper-apt (from /cdebootstrap-helper-apt.deb) ...
 O: Setting up cdebootstrap-helper-apt (1) ...
 P: Configuring helper cdebootstrap-helper-diverts
@@ -860,8 +861,7 @@ O: Adding `diversion of /usr/sbin/invoke-rc.d to /usr/sbin/invoke-rc.d.REAL by c
 O: Setting up cdebootstrap-helper-diverts (1) ...
 P: Configuring helper cdebootstrap-helper-makedev
 O: Selecting previously deselected package cdebootstrap-helper-makedev.
-O: (Reading database ... 
-O: 4519 files and directories currently installed.)
+O: (Reading database ... 4519 files and directories currently installed.)
 O: Unpacking cdebootstrap-helper-makedev (from .../cdebootstrap-helper-makedev.deb) ...
 O: Setting up cdebootstrap-helper-makedev (1) ...
 O: 
@@ -1292,9 +1292,9 @@ Refreshing the base.tgz
  -> mounting /proc filesystem
  -> mounting /dev/pts filesystem
  -> installing dummy policy-rc.d
-Get:1 http://ftp.jp.debian.org etch/main Packages [3364kB]
+Get:1 http://ftp.jp.debian.org etch/main Packages [3365kB]
 Get:2 http://ftp.jp.debian.org etch/main Release [96B]
-Fetched 3364kB in 1s (1920kB/s)
+Fetched 3365kB in 1s (1887kB/s)
 Reading Package Lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
@@ -1378,6 +1378,6 @@ Setting up build-essential (11.1) ...
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//3425 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//6727 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-create-sarge.log b/testsuite/cdebootstrap/pbuilder-create-sarge.log
index e4abde4..75bb081 100644
--- a/testsuite/cdebootstrap/pbuilder-create-sarge.log
+++ b/testsuite/cdebootstrap/pbuilder-create-sarge.log
@@ -758,7 +758,8 @@ O: Architecture-specific modutils configuration not found, using defaults
 O: 
 P: Configuring helper cdebootstrap-helper-apt
 O: Selecting previously deselected package cdebootstrap-helper-apt.
-O: (Reading database ... 4193 files and directories currently installed.)
+O: (Reading database ... 
+O: 4193 files and directories currently installed.)
 O: Unpacking cdebootstrap-helper-apt (from /cdebootstrap-helper-apt.deb) ...
 O: Setting up cdebootstrap-helper-apt (1) ...
 P: Configuring helper cdebootstrap-helper-diverts
@@ -771,14 +772,12 @@ O: Adding `diversion of /usr/sbin/invoke-rc.d to /usr/sbin/invoke-rc.d.REAL by c
 O: Setting up cdebootstrap-helper-diverts (1) ...
 P: Configuring helper cdebootstrap-helper-makedev
 O: Selecting previously deselected package cdebootstrap-helper-makedev.
-O: (Reading database ... 
-O: 4198 files and directories currently installed.)
+O: (Reading database ... 4198 files and directories currently installed.)
 O: Unpacking cdebootstrap-helper-makedev (from .../cdebootstrap-helper-makedev.deb) ...
 O: Setting up cdebootstrap-helper-makedev (1) ...
 O: 
 O: Selecting previously deselected package apt.
-O: (Reading database ... 
-O: 4198 files and directories currently installed.)
+O: (Reading database ... 4198 files and directories currently installed.)
 O: Unpacking apt (from .../apt_0.5.28.6_amd64.deb) ...
 P: Unpacking package apt
 O: Setting up apt (0.5.28.6) ...
@@ -787,7 +786,6 @@ O:
 O: Reading Package Lists...
 O: 
 O: Reading Package Lists...
-O: 
 O: Building Dependency Tree...
 O: 
 O: Suggested packages:
@@ -1217,7 +1215,7 @@ Refreshing the base.tgz
  -> installing dummy policy-rc.d
 Get:1 http://ftp.jp.debian.org sarge/main Packages [3223kB]
 Get:2 http://ftp.jp.debian.org sarge/main Release [110B]
-Fetched 3223kB in 1s (1950kB/s)
+Fetched 3223kB in 1s (1943kB/s)
 Reading Package Lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
@@ -1300,6 +1298,6 @@ Setting up build-essential (10.1) ...
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//25768 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//27160 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-create-sid.log b/testsuite/cdebootstrap/pbuilder-create-sid.log
index c3ee92a..3594975 100644
--- a/testsuite/cdebootstrap/pbuilder-create-sid.log
+++ b/testsuite/cdebootstrap/pbuilder-create-sid.log
@@ -73,8 +73,8 @@ P: Retrieving netbase
 P: Validating netbase
 P: Retrieving telnet
 P: Validating telnet
-P: Retrieving libssl0.9.7
-P: Validating libssl0.9.7
+P: Retrieving libssl0.9.8
+P: Validating libssl0.9.8
 P: Retrieving wget
 P: Validating wget
 P: Retrieving info
@@ -311,12 +311,13 @@ O: Setting up base-passwd (3.5.10) ...
 P: Configuring package base-passwd
 O: 
 O: Selecting previously deselected package dpkg.
-O: (Reading database ... 21 files and directories currently installed.)
-O: Unpacking dpkg (from .../dpkg_1.13.11_amd64.deb) ...
-P: Unpacking package dpkg
 O: dpkg: regarding .../dpkg_1.13.11_amd64.deb containing dpkg, pre-dependency problem:
 O:  dpkg pre-depends on libc6 (>= 2.3.5-1)
 O: dpkg: warning - ignoring pre-dependency problem !
+O: (Reading database ... 
+O: 21 files and directories currently installed.)
+O: Unpacking dpkg (from .../dpkg_1.13.11_amd64.deb) ...
+P: Unpacking package dpkg
 O: dpkg: dpkg: dependency problems, but configuring anyway as you request:
 O:  dpkg depends on libc6 (>= 2.3.5-1); however:
 O:   Package libc6 is not installed.
@@ -343,11 +344,11 @@ O: Selecting previously deselected package libstdc++6.
 O: Unpacking libstdc++6 (from .../libstdc++6_4.0.2-2_amd64.deb) ...
 P: Unpacking package libstdc++6
 O: Selecting previously deselected package perl-base.
-O: dpkg: regarding .../perl-base_5.8.7-5_amd64.deb containing perl-base, pre-dependency problem:
+O: dpkg: regarding .../perl-base_5.8.7-6_amd64.deb containing perl-base, pre-dependency problem:
 O:  perl-base pre-depends on libc6 (>= 2.3.5-1)
 O:   libc6 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: Unpacking perl-base (from .../perl-base_5.8.7-5_amd64.deb) ...
+O: Unpacking perl-base (from .../perl-base_5.8.7-6_amd64.deb) ...
 P: Unpacking package perl-base
 O: Selecting previously deselected package liblocale-gettext-perl.
 O: dpkg: regarding .../liblocale-gettext-perl_1.05-1_amd64.deb containing liblocale-gettext-perl, pre-dependency problem:
@@ -397,15 +398,15 @@ O: dpkg: warning - ignoring pre-dependency problem !
 O: Unpacking coreutils (from .../coreutils_5.2.1-2.1_amd64.deb) ...
 P: Unpacking package coreutils
 O: Selecting previously deselected package debianutils.
-O: dpkg: regarding .../debianutils_2.14.3_amd64.deb containing debianutils, pre-dependency problem:
+O: dpkg: regarding .../debianutils_2.15_amd64.deb containing debianutils, pre-dependency problem:
 O:  debianutils pre-depends on libc6 (>= 2.3.5-1)
 O:   libc6 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: dpkg: regarding .../debianutils_2.14.3_amd64.deb containing debianutils, pre-dependency problem:
+O: dpkg: regarding .../debianutils_2.15_amd64.deb containing debianutils, pre-dependency problem:
 O:  debianutils pre-depends on coreutils (>= 4.5.8-1)
 O:   coreutils is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: Unpacking debianutils (from .../debianutils_2.14.3_amd64.deb) ...
+O: Unpacking debianutils (from .../debianutils_2.15_amd64.deb) ...
 P: Unpacking package debianutils
 O: Selecting previously deselected package sed.
 O: dpkg: regarding .../sed_4.1.4-4_amd64.deb containing sed, pre-dependency problem:
@@ -451,28 +452,28 @@ O: Selecting previously deselected package libcap1.
 O: Unpacking libcap1 (from .../libcap1_1.10-14_amd64.deb) ...
 P: Unpacking package libcap1
 O: Selecting previously deselected package libdb4.3.
-O: Unpacking libdb4.3 (from .../libdb4.3_4.3.28-3_amd64.deb) ...
+O: Unpacking libdb4.3 (from .../libdb4.3_4.3.29-1_amd64.deb) ...
 P: Unpacking package libdb4.3
 O: Selecting previously deselected package libpam-modules.
 O: Unpacking libpam-modules (from .../libpam-modules_0.79-3_amd64.deb) ...
 P: Unpacking package libpam-modules
 O: Selecting previously deselected package login.
-O: dpkg: regarding .../login_4.0.12-6_amd64.deb containing login, pre-dependency problem:
+O: dpkg: regarding .../login_4.0.13-1_amd64.deb containing login, pre-dependency problem:
 O:  login pre-depends on libc6 (>= 2.3.5-1)
 O:   libc6 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: dpkg: regarding .../login_4.0.12-6_amd64.deb containing login, pre-dependency problem:
+O: dpkg: regarding .../login_4.0.13-1_amd64.deb containing login, pre-dependency problem:
 O:  login pre-depends on libpam0g (>= 0.76)
 O:   libpam0g is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: dpkg: regarding .../login_4.0.12-6_amd64.deb containing login, pre-dependency problem:
+O: dpkg: regarding .../login_4.0.13-1_amd64.deb containing login, pre-dependency problem:
 O:  login pre-depends on libpam-runtime (>= 0.76-14)
 O:   libpam-runtime is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: Unpacking login (from .../login_4.0.12-6_amd64.deb) ...
+O: Unpacking login (from .../login_4.0.13-1_amd64.deb) ...
 P: Unpacking package login
 O: Selecting previously deselected package passwd.
-O: Unpacking passwd (from .../passwd_4.0.12-6_amd64.deb) ...
+O: Unpacking passwd (from .../passwd_4.0.13-1_amd64.deb) ...
 P: Unpacking package passwd
 O: Selecting previously deselected package zlib1g.
 O: Unpacking zlib1g (from .../zlib1g_1.2.3-4_amd64.deb) ...
@@ -653,15 +654,15 @@ O: dpkg: warning - ignoring pre-dependency problem !
 O: Unpacking mount (from .../mount_2.12p-8_amd64.deb) ...
 P: Unpacking package mount
 O: Selecting previously deselected package bash.
-O: dpkg: regarding .../bash_3.0-16_amd64.deb containing bash, pre-dependency problem:
+O: dpkg: regarding .../bash_3.0-17_amd64.deb containing bash, pre-dependency problem:
 O:  bash pre-depends on libc6 (>= 2.3.5-1)
 O:   libc6 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: dpkg: regarding .../bash_3.0-16_amd64.deb containing bash, pre-dependency problem:
+O: dpkg: regarding .../bash_3.0-17_amd64.deb containing bash, pre-dependency problem:
 O:  bash pre-depends on libncurses5 (>= 5.4-5)
 O:   libncurses5 is unpacked, but has never been configured.
 O: dpkg: warning - ignoring pre-dependency problem !
-O: Unpacking bash (from .../bash_3.0-16_amd64.deb) ...
+O: Unpacking bash (from .../bash_3.0-17_amd64.deb) ...
 P: Unpacking package bash
 O: Selecting previously deselected package findutils.
 O: dpkg: regarding .../findutils_4.2.25-1_amd64.deb containing findutils, pre-dependency problem:
@@ -700,7 +701,7 @@ O:
 O: Setting up bsdutils (2.12p-8) ...
 P: Configuring package bsdutils
 O: 
-O: Setting up perl-base (5.8.7-5) ...
+O: Setting up perl-base (5.8.7-6) ...
 P: Configuring package perl-base
 O: Setting up libsepol1 (1.8-1) ...
 P: Configuring package libsepol1
@@ -735,7 +736,7 @@ O:
 O: Setting up mawk (1.3.3-11) ...
 P: Configuring package mawk
 O: 
-O: Setting up libdb4.3 (4.3.28-3) ...
+O: Setting up libdb4.3 (4.3.29-1) ...
 P: Configuring package libdb4.3
 O: Setting up grep (2.5.1.ds2-1) ...
 P: Configuring package grep
@@ -781,7 +782,7 @@ P: Configuring package libtext-wrapi18n-perl
 O: Setting up coreutils (5.2.1-2.1) ...
 P: Configuring package coreutils
 O: 
-O: Setting up debianutils (2.14.3) ...
+O: Setting up debianutils (2.15) ...
 P: Configuring package debianutils
 O: 
 O: Setting up procps (3.2.5-1) ...
@@ -808,18 +809,18 @@ P: Configuring package gzip
 O: 
 O: Setting up dselect (1.13.11) ...
 P: Configuring package dselect
-O: Setting up login (4.0.12-6) ...
+O: Setting up login (4.0.13-1) ...
 P: Configuring package login
 O: 
 O: Setting up lsb-base (3.0-9) ...
 P: Configuring package lsb-base
-O: Setting up passwd (4.0.12-6) ...
+O: Setting up passwd (4.0.13-1) ...
 P: Configuring package passwd
 O: 
 O: Setting up initscripts (2.86.ds1-4) ...
 P: Configuring package initscripts
 O: 
-O: Setting up bash (3.0-16) ...
+O: Setting up bash (3.0-17) ...
 P: Configuring package bash
 O: 
 O: Setting up sysvinit (2.86.ds1-4) ...
@@ -835,13 +836,14 @@ P: Configuring package debconf
 O: 
 P: Configuring helper cdebootstrap-helper-apt
 O: Selecting previously deselected package cdebootstrap-helper-apt.
-O: (Reading database ... 4508 files and directories currently installed.)
+O: (Reading database ... 
+O: 4510 files and directories currently installed.)
 O: Unpacking cdebootstrap-helper-apt (from /cdebootstrap-helper-apt.deb) ...
 O: Setting up cdebootstrap-helper-apt (1) ...
 P: Configuring helper cdebootstrap-helper-diverts
 O: Selecting previously deselected package cdebootstrap-helper-diverts.
 O: (Reading database ... 
-O: 4511 files and directories currently installed.)
+O: 4513 files and directories currently installed.)
 O: Unpacking cdebootstrap-helper-diverts (from .../cdebootstrap-helper-diverts.deb) ...
 O: Adding `diversion of /sbin/start-stop-daemon to /sbin/start-stop-daemon.REAL by cdebootstrap-helper-diverts'
 O: Adding `diversion of /usr/sbin/invoke-rc.d to /usr/sbin/invoke-rc.d.REAL by cdebootstrap-helper-diverts'
@@ -849,13 +851,12 @@ O: Setting up cdebootstrap-helper-diverts (1) ...
 P: Configuring helper cdebootstrap-helper-makedev
 O: Selecting previously deselected package cdebootstrap-helper-makedev.
 O: (Reading database ... 
-O: 4513 files and directories currently installed.)
+O: 4515 files and directories currently installed.)
 O: Unpacking cdebootstrap-helper-makedev (from .../cdebootstrap-helper-makedev.deb) ...
 O: Setting up cdebootstrap-helper-makedev (1) ...
 O: 
 O: Selecting previously deselected package apt.
-O: (Reading database ... 
-O: 4513 files and directories currently installed.)
+O: (Reading database ... 4515 files and directories currently installed.)
 O: Unpacking apt (from .../bootstrap/apt_0.6.41_amd64.deb) ...
 P: Unpacking package apt
 O: Setting up apt (0.6.41) ...
@@ -864,7 +865,7 @@ O:
 O: Get:1 bootstrap: . Release.gpg [189B]
 O: Get:2 bootstrap: . Release [4800B]
 O: Ign bootstrap: . Release
-O: Fetched 4989B in 0s (45.2kB/s)
+O: Fetched 4989B in 0s (41.4kB/s)
 O: Reading package lists...
 O: 
 O: W: 
@@ -874,7 +875,6 @@ O: W:
 O: You may want to run apt-get update to correct these problems
 O: 
 O: Reading package lists...
-O: 
 O: Building dependency tree...
 O: 
 O: Suggested packages:
@@ -889,25 +889,25 @@ O:   console-data console-tools cpio cron dhcp3-client dhcp3-common dmidecode ed
 O:   exim4 exim4-base exim4-config exim4-daemon-light gettext-base groff-base
 O:   ifupdown info iptables iputils-ping klogd laptop-detect libconsole libdb4.2
 O:   libgcrypt11 libgdbm3 libgnutls12 libgpg-error0 liblzo1 libncursesw5
-O:   libopencdk8 libpcre3 libpopt0 libsigc++-1.2-5c2 libssl0.9.7 libtasn1-2
+O:   libopencdk8 libpcre3 libpopt0 libsigc++-1.2-5c2 libssl0.9.8 libtasn1-2
 O:   libwrap0 logrotate man-db manpages nano net-tools netbase netkit-inetd nvi
 O:   psmisc sysklogd tasksel tcpd telnet wget whiptail
 O: 0 upgraded, 57 newly installed, 0 to remove and 0 not upgraded.
-O: Need to get 14.7MB of archives.
-O: After unpacking 45.5MB of additional disk space will be used.
+O: Need to get 14.9MB of archives.
+O: After unpacking 45.9MB of additional disk space will be used.
 O: WARNING: The following packages cannot be authenticated!
 O:   console-data libconsole console-tools console-common adduser libdb4.2
 O:   apt-utils libsigc++-1.2-5c2 aptitude gettext-base base-config bsdmainutils
 O:   cpio cron dmidecode ed groff-base net-tools ifupdown info iptables
 O:   iputils-ping sysklogd klogd laptop-detect libgpg-error0 libgcrypt11 libgdbm3
 O:   liblzo1 libopencdk8 libtasn1-2 libgnutls12 libncursesw5 libpcre3 libpopt0
-O:   libssl0.9.7 libwrap0 logrotate man-db manpages nano netkit-inetd tcpd netbase
+O:   libssl0.9.8 libwrap0 logrotate man-db manpages nano netkit-inetd tcpd netbase
 O:   nvi tasksel wget whiptail exim4-config exim4-base exim4-daemon-light at exim4
 O:   telnet dhcp3-common dhcp3-client psmisc
 O: Authentication warning overridden.
 O: Selecting previously deselected package console-data.
 O: (Reading database ... 
-O: 4679 files and directories currently installed.)
+O: 4681 files and directories currently installed.)
 O: Unpacking console-data (from .../console-data_2002.12.04dbs-49_all.deb) ...
 P: Unpacking package console-data
 O: Selecting previously deselected package libconsole.
@@ -1012,9 +1012,9 @@ P: Unpacking package libpcre3
 O: Selecting previously deselected package libpopt0.
 O: Unpacking libpopt0 (from .../libpopt0_1.7-5_amd64.deb) ...
 P: Unpacking package libpopt0
-O: Selecting previously deselected package libssl0.9.7.
-O: Unpacking libssl0.9.7 (from .../libssl0.9.7_0.9.7g-4_amd64.deb) ...
-P: Unpacking package libssl0.9.7
+O: Selecting previously deselected package libssl0.9.8.
+O: Unpacking libssl0.9.8 (from .../libssl0.9.8_0.9.8-3_amd64.deb) ...
+P: Unpacking package libssl0.9.8
 O: Selecting previously deselected package libwrap0.
 O: Unpacking libwrap0 (from .../libwrap0_7.6.dbs-8_amd64.deb) ...
 P: Unpacking package libwrap0
@@ -1046,7 +1046,7 @@ O: Selecting previously deselected package tasksel.
 O: Unpacking tasksel (from .../bootstrap/tasksel_2.32_all.deb) ...
 P: Unpacking package tasksel
 O: Selecting previously deselected package wget.
-O: Unpacking wget (from .../wget_1.10.1-2_amd64.deb) ...
+O: Unpacking wget (from .../wget_1.10.2-1_amd64.deb) ...
 P: Unpacking package wget
 O: Selecting previously deselected package whiptail.
 O: Unpacking whiptail (from .../whiptail_0.51.6-31_amd64.deb) ...
@@ -1167,9 +1167,6 @@ O:
 O: Setting up libpopt0 (1.7-5) ...
 P: Configuring package libpopt0
 O: 
-O: Setting up libssl0.9.7 (0.9.7g-4) ...
-P: Configuring package libssl0.9.7
-O: 
 O: Setting up libwrap0 (7.6.dbs-8) ...
 P: Configuring package libwrap0
 O: 
@@ -1202,9 +1199,6 @@ O:
 O: Setting up tasksel (2.32) ...
 P: Configuring package tasksel
 O: 
-O: Setting up wget (1.10.1-2) ...
-P: Configuring package wget
-O: 
 O: Setting up whiptail (0.51.6-31) ...
 P: Configuring package whiptail
 O: Setting up exim4-config (4.54-1) ...
@@ -1248,6 +1242,12 @@ O:
 O: Setting up sysklogd (1.4.1-17) ...
 P: Configuring package sysklogd
 O: 
+O: Setting up libssl0.9.8 (0.9.8-3) ...
+P: Configuring package libssl0.9.8
+O: 
+O: Setting up wget (1.10.2-1) ...
+P: Configuring package wget
+O: 
 O: Setting up console-common (0.7.54) ...
 P: Configuring package console-common
 O: Looking for keymap to install:
@@ -1266,18 +1266,18 @@ P: Configuring package base-config
 O: 
 P: Deconfiguring helper cdebootstrap-helper-apt
 O: (Reading database ... 
-O: 7407 files and directories currently installed.)
+O: 7414 files and directories currently installed.)
 O: Removing cdebootstrap-helper-apt ...
 P: Deconfiguring helper cdebootstrap-helper-diverts
 O: (Reading database ... 
-O: 7406 files and directories currently installed.)
+O: 7413 files and directories currently installed.)
 O: Removing cdebootstrap-helper-diverts ...
 O: Purging configuration files for cdebootstrap-helper-diverts ...
 O: Removing `diversion of /sbin/start-stop-daemon to /sbin/start-stop-daemon.REAL by cdebootstrap-helper-diverts'
 O: Removing `diversion of /usr/sbin/invoke-rc.d to /usr/sbin/invoke-rc.d.REAL by cdebootstrap-helper-diverts'
 P: Deconfiguring helper cdebootstrap-helper-makedev
 O: (Reading database ... 
-O: 7404 files and directories currently installed.)
+O: 7411 files and directories currently installed.)
 O: Removing cdebootstrap-helper-makedev ...
 O: Reading package lists...
 O: 
@@ -1292,8 +1292,8 @@ Refreshing the base.tgz
 Get:1 http://ftp.jp.debian.org sid Release.gpg [189B]
 Get:2 http://ftp.jp.debian.org sid Release [4800B]
 Ign http://ftp.jp.debian.org sid Release
-Get:3 http://ftp.jp.debian.org sid/main Packages [3708kB]
-Fetched 3713kB in 2s (1823kB/s)
+Get:3 http://ftp.jp.debian.org sid/main Packages [3709kB]
+Fetched 3714kB in 1s (1925kB/s)
 Reading package lists...
 W: GPG error: http://ftp.jp.debian.org sid Release: Could not execute /usr/bin/gpgv to verify signature (is gnupg installed?)
 W: You may want to run apt-get update to correct these problems
@@ -1320,15 +1320,16 @@ The following NEW packages will be installed:
   libc6-dev libstdc++6-4.0-dev linux-kernel-headers make patch perl
   perl-modules
 0 upgraded, 16 newly installed, 0 to remove and 0 not upgraded.
-Need to get 2326kB/20.4MB of archives.
-After unpacking 79.7MB of additional disk space will be used.
+Need to get 5677kB/20.5MB of archives.
+After unpacking 80.7MB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   binutils cpp-4.0 cpp perl-modules perl patch make dpkg-dev gcc-4.0 gcc
   libstdc++6-4.0-dev g++-4.0 g++ linux-kernel-headers libc6-dev build-essential
-Get:1 http://ftp.jp.debian.org sid/main perl-modules 5.8.7-6 [2326kB]
-Fetched 2326kB in 1s (1731kB/s)
+Get:1 http://ftp.jp.debian.org sid/main perl 5.8.7-6 [4035kB]
+Get:2 http://ftp.jp.debian.org sid/main linux-kernel-headers 2.6.13+0rc3-2 [1643kB]
+Fetched 5677kB in 3s (1650kB/s)
 Selecting previously deselected package binutils.
-(Reading database ... 7404 files and directories currently installed.)
+(Reading database ... 7411 files and directories currently installed.)
 Unpacking binutils (from .../binutils_2.16.1cvs20050902-1_amd64.deb) ...
 Selecting previously deselected package cpp-4.0.
 Unpacking cpp-4.0 (from .../cpp-4.0_4.0.2-2_amd64.deb) ...
@@ -1337,7 +1338,7 @@ Unpacking cpp (from .../cpp_4%3a4.0.2-1_amd64.deb) ...
 Selecting previously deselected package perl-modules.
 Unpacking perl-modules (from .../perl-modules_5.8.7-6_all.deb) ...
 Selecting previously deselected package perl.
-Unpacking perl (from .../perl_5.8.7-5_amd64.deb) ...
+Unpacking perl (from .../perl_5.8.7-6_amd64.deb) ...
 Selecting previously deselected package patch.
 Unpacking patch (from .../patch_2.5.9-2_amd64.deb) ...
 Selecting previously deselected package make.
@@ -1355,7 +1356,7 @@ Unpacking g++-4.0 (from .../g++-4.0_4.0.2-2_amd64.deb) ...
 Selecting previously deselected package g++.
 Unpacking g++ (from .../g++_4%3a4.0.2-1_amd64.deb) ...
 Selecting previously deselected package linux-kernel-headers.
-Unpacking linux-kernel-headers (from .../linux-kernel-headers_2.6.13+0rc3-1.1_amd64.deb) ...
+Unpacking linux-kernel-headers (from .../linux-kernel-headers_2.6.13+0rc3-2_amd64.deb) ...
 Selecting previously deselected package libc6-dev.
 Unpacking libc6-dev (from .../libc6-dev_2.3.5-6_amd64.deb) ...
 Selecting previously deselected package build-essential.
@@ -1370,21 +1371,22 @@ Setting up make (3.80-11) ...
 Setting up gcc-4.0 (4.0.2-2) ...
 Setting up gcc (4.0.2-1) ...
 
-Setting up linux-kernel-headers (2.6.13+0rc3-1.1) ...
+Setting up linux-kernel-headers (2.6.13+0rc3-2) ...
 Setting up libc6-dev (2.3.5-6) ...
 Setting up libstdc++6-4.0-dev (4.0.2-2) ...
 Setting up perl-modules (5.8.7-6) ...
 Setting up g++-4.0 (4.0.2-2) ...
 Setting up g++ (4.0.2-1) ...
 
-Setting up perl (5.8.7-5) ...
+Setting up perl (5.8.7-6) ...
 
 Setting up dpkg-dev (1.13.11) ...
 Setting up build-essential (11.1) ...
 Copying back the cached apt archive contents
- -> new cache content perl-modules_5.8.7-6_all.deb added
+ -> new cache content perl_5.8.7-6_amd64.deb added
+ -> new cache content linux-kernel-headers_2.6.13+0rc3-2_amd64.deb added
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//23191 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//24522 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-execute-etch.log b/testsuite/cdebootstrap/pbuilder-execute-etch.log
index 5151dba..cbd81bc 100644
--- a/testsuite/cdebootstrap/pbuilder-execute-etch.log
+++ b/testsuite/cdebootstrap/pbuilder-execute-etch.log
@@ -1,5 +1,5 @@
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -12,4 +12,4 @@ Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//5604 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//8940 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-execute-sarge.log b/testsuite/cdebootstrap/pbuilder-execute-sarge.log
index ad26d94..29b2014 100644
--- a/testsuite/cdebootstrap/pbuilder-execute-sarge.log
+++ b/testsuite/cdebootstrap/pbuilder-execute-sarge.log
@@ -1,5 +1,5 @@
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -12,4 +12,4 @@ Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//28463 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//29999 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-execute-sid.log b/testsuite/cdebootstrap/pbuilder-execute-sid.log
index d8b2e42..9335844 100644
--- a/testsuite/cdebootstrap/pbuilder-execute-sid.log
+++ b/testsuite/cdebootstrap/pbuilder-execute-sid.log
@@ -1,5 +1,5 @@
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -12,4 +12,4 @@ Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//25221 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//26601 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-update-etch-sid-experimental.log b/testsuite/cdebootstrap/pbuilder-update-etch-sid-experimental.log
index e14d647..667fece 100644
--- a/testsuite/cdebootstrap/pbuilder-update-etch-sid-experimental.log
+++ b/testsuite/cdebootstrap/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.hBmCMI/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -17,8 +17,8 @@ Ign http://ftp.jp.debian.org sid Release
 Get:4 http://ftp.jp.debian.org ../project/experimental Release [4245B]
 Ign http://ftp.jp.debian.org ../project/experimental Release
 Hit http://ftp.jp.debian.org sid/main Packages
-Get:5 http://ftp.jp.debian.org ../project/experimental/main Packages [103kB]
-Fetched 113kB in 0s (474kB/s)
+Get:5 http://ftp.jp.debian.org ../project/experimental/main Packages [104kB]
+Fetched 114kB in 0s (384kB/s)
 Reading package lists...
 W: GPG error: http://ftp.jp.debian.org sid Release: Could not execute /usr/bin/gpgv to verify signature (is gnupg installed?)
 W: GPG error: http://ftp.jp.debian.org ../project/experimental Release: Could not execute /usr/bin/gpgv to verify signature (is gnupg installed?)
@@ -36,11 +36,11 @@ Need to get 0B/3019kB of archives.
 After unpacking 2007kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   diff adduser libsigc++-2.0-0c2 aptitude
-(Reading database ... 11298 files and directories currently installed.)
+(Reading database ... 11551 files and directories currently installed.)
 Preparing to replace diff 2.8.1-11 (using .../diff_2.8.7-0.2_amd64.deb) ...
 Unpacking replacement diff ...
 Setting up diff (2.8.7-0.2) ...
-(Reading database ... 11306 files and directories currently installed.)
+(Reading database ... 11559 files and directories currently installed.)
 Preparing to replace adduser 3.67.2 (using .../archives/adduser_3.71_all.deb) ...
 Unpacking replacement adduser ...
 Selecting previously deselected package libsigc++-2.0-0c2.
@@ -62,6 +62,6 @@ apt is already the newest version.
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//7509 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//11021 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-update-etch-sid.log b/testsuite/cdebootstrap/pbuilder-update-etch-sid.log
index 1249039..e76a423 100644
--- a/testsuite/cdebootstrap/pbuilder-update-etch-sid.log
+++ b/testsuite/cdebootstrap/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.hBmCMI/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -9,9 +9,9 @@ Building the build Environment
   -> Installing apt-lines
 Refreshing the base.tgz 
  -> upgrading packages
-Get:1 http://ftp.jp.debian.org sid/main Packages [3708kB]
+Get:1 http://ftp.jp.debian.org sid/main Packages [3709kB]
 Get:2 http://ftp.jp.debian.org sid/main Release [97B]
-Fetched 3708kB in 1s (1889kB/s)
+Fetched 3710kB in 2s (1717kB/s)
 Reading Package Lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
@@ -20,16 +20,17 @@ Building Dependency Tree...
 The following packages will be REMOVED:
   libsigc++-1.2-5c102
 The following NEW packages will be installed:
-  libsigc++-1.2-5c2
+  libsigc++-1.2-5c2 libssl0.9.8
 The following packages will be upgraded:
-  apt apt-utils aptitude binutils bsdutils console-common console-tools cpp
-  exim4 exim4-base exim4-config exim4-daemon-light g++ gcc gcc-3.3-base info
-  libacl1 libattr1 libconsole libdb4.2 libdb4.3 libpcre3 libssl0.9.7 libstdc++5
-  libtext-charwidth-perl libtext-iconv-perl libtext-wrapi18n-perl mount perl
-  perl-base perl-modules sed tar telnet util-linux wget
-36 upgraded, 1 newly installed, 1 to remove and 0 not upgraded.
-Need to get 0B/20.4MB of archives.
-After unpacking 2281kB of additional disk space will be used.
+  apt apt-utils aptitude bash binutils bsdutils console-common console-tools
+  cpp debianutils exim4 exim4-base exim4-config exim4-daemon-light g++ gcc
+  gcc-3.3-base info libacl1 libattr1 libconsole libdb4.2 libdb4.3 libpcre3
+  libssl0.9.7 libstdc++5 libtext-charwidth-perl libtext-iconv-perl
+  libtext-wrapi18n-perl linux-kernel-headers login mount passwd perl perl-base
+  perl-modules sed tar telnet util-linux wget
+41 upgraded, 2 newly installed, 1 to remove and 0 not upgraded.
+Need to get 0B/25.0MB of archives.
+After unpacking 5591kB of additional disk space will be used.
 (Reading database ... 11174 files and directories currently installed.)
 Preparing to replace libdb4.2 4.2.52-18 (using .../libdb4.2_4.2.52-20_amd64.deb) ...
 Unpacking replacement libdb4.2 ...
@@ -50,41 +51,77 @@ Unpacking replacement apt ...
 Setting up apt (0.6.41) ...
 
 (Reading database ... 11172 files and directories currently installed.)
+Preparing to replace debianutils 2.14.3 (using .../debianutils_2.15_amd64.deb) ...
+Unpacking replacement debianutils ...
+Replacing files in old package passwd ...
+Setting up debianutils (2.15) ...
+
+(Reading database ... 11171 files and directories currently installed.)
+Preparing to replace login 1:4.0.12-6 (using .../login_1%3a4.0.13-1_amd64.deb) ...
+Unpacking replacement login ...
+Setting up login (4.0.13-1) ...
+Installing new version of config file /etc/pam.d/login ...
+Installing new version of config file /etc/pam.d/su ...
+Installing new version of config file /etc/login.defs ...
+
+(Reading database ... 11172 files and directories currently installed.)
+Preparing to replace passwd 1:4.0.12-6 (using .../passwd_1%3a4.0.13-1_amd64.deb) ...
+Unpacking replacement passwd ...
+Setting up passwd (4.0.13-1) ...
+Installing new version of config file /etc/pam.d/chage ...
+Installing new version of config file /etc/pam.d/chfn ...
+Installing new version of config file /etc/pam.d/chsh ...
+Installing new version of config file /etc/pam.d/useradd ...
+Installing new version of config file /etc/pam.d/userdel ...
+Installing new version of config file /etc/pam.d/usermod ...
+Installing new version of config file /etc/pam.d/groupadd ...
+Installing new version of config file /etc/pam.d/groupdel ...
+Installing new version of config file /etc/pam.d/groupmod ...
+Installing new version of config file /etc/pam.d/newusers ...
+
+(Reading database ... 11174 files and directories currently installed.)
+Preparing to replace bash 3.0-16 (using .../archives/bash_3.0-17_amd64.deb) ...
+Unpacking replacement bash ...
+Setting up bash (3.0-17) ...
+Installing new version of config file /etc/bash.bashrc ...
+Installing new version of config file /etc/bash_completion ...
+
+(Reading database ... 11174 files and directories currently installed.)
 Preparing to replace bsdutils 1:2.12p-4 (using .../bsdutils_1%3a2.12p-8_amd64.deb) ...
 Unpacking replacement bsdutils ...
 Setting up bsdutils (2.12p-8) ...
 
-(Reading database ... 11172 files and directories currently installed.)
+(Reading database ... 11174 files and directories currently installed.)
 Preparing to replace mount 2.12p-4 (using .../mount_2.12p-8_amd64.deb) ...
 Unpacking replacement mount ...
 Setting up mount (2.12p-8) ...
 
-(Reading database ... 11172 files and directories currently installed.)
+(Reading database ... 11174 files and directories currently installed.)
 Preparing to replace perl-modules 5.8.7-3 (using .../perl-modules_5.8.7-6_all.deb) ...
 Unpacking replacement perl-modules ...
-Preparing to replace perl 5.8.7-3 (using .../perl_5.8.7-5_amd64.deb) ...
+Preparing to replace perl 5.8.7-3 (using .../perl_5.8.7-6_amd64.deb) ...
 Unpacking replacement perl ...
-Preparing to replace perl-base 5.8.7-3 (using .../perl-base_5.8.7-5_amd64.deb) ...
+Preparing to replace perl-base 5.8.7-3 (using .../perl-base_5.8.7-6_amd64.deb) ...
 Unpacking replacement perl-base ...
-Setting up perl-base (5.8.7-5) ...
-(Reading database ... 11279 files and directories currently installed.)
+Setting up perl-base (5.8.7-6) ...
+(Reading database ... 11281 files and directories currently installed.)
 Preparing to replace sed 4.1.2-8 (using .../archives/sed_4.1.4-4_amd64.deb) ...
 Unpacking replacement sed ...
 Setting up sed (4.1.4-4) ...
 
-(Reading database ... 11280 files and directories currently installed.)
+(Reading database ... 11282 files and directories currently installed.)
 Preparing to replace tar 1.14-2 (using .../tar_1.15.1-2_amd64.deb) ...
 Unpacking replacement tar ...
 Setting up tar (1.15.1-2) ...
 
-(Reading database ... 11284 files and directories currently installed.)
+(Reading database ... 11286 files and directories currently installed.)
 Preparing to replace util-linux 2.12p-4 (using .../util-linux_2.12p-8_amd64.deb) ...
 Unpacking replacement util-linux ...
 Setting up util-linux (2.12p-8) ...
 Installing new version of config file /etc/init.d/hwclock.sh ...
 Installing new version of config file /etc/init.d/hwclockfirst.sh ...
 
-(Reading database ... 11284 files and directories currently installed.)
+(Reading database ... 11286 files and directories currently installed.)
 Preparing to replace console-tools 1:0.2.3dbs-56 (using .../console-tools_1%3a0.2.3dbs-57_amd64.deb) ...
 Unpacking replacement console-tools ...
 Preparing to replace libconsole 1:0.2.3dbs-56 (using .../libconsole_1%3a0.2.3dbs-57_amd64.deb) ...
@@ -99,7 +136,7 @@ Setting up libattr1 (2.4.25-1) ...
 
 Setting up libacl1 (2.2.32-1) ...
 
-(Reading database ... 11284 files and directories currently installed.)
+(Reading database ... 11286 files and directories currently installed.)
 Preparing to replace gcc-3.3-base 1:3.3.6-7 (using .../gcc-3.3-base_1%3a3.3.6-10_amd64.deb) ...
 Unpacking replacement gcc-3.3-base ...
 Preparing to replace libstdc++5 1:3.3.6-7 (using .../libstdc++5_1%3a3.3.6-10_amd64.deb) ...
@@ -107,14 +144,16 @@ Unpacking replacement libstdc++5 ...
 Setting up gcc-3.3-base (3.3.6-10) ...
 Setting up libstdc++5 (3.3.6-10) ...
 
-(Reading database ... 11284 files and directories currently installed.)
+(Reading database ... 11286 files and directories currently installed.)
 Preparing to replace info 4.7-2.2 (using .../archives/info_4.8-1_amd64.deb) ...
 Unpacking replacement info ...
 Preparing to replace libpcre3 6.3-1 (using .../libpcre3_6.4-1_amd64.deb) ...
 Unpacking replacement libpcre3 ...
-Preparing to replace libssl0.9.7 0.9.7g-2 (using .../libssl0.9.7_0.9.7g-4_amd64.deb) ...
+Preparing to replace libssl0.9.7 0.9.7g-2 (using .../libssl0.9.7_0.9.7g-5_amd64.deb) ...
 Unpacking replacement libssl0.9.7 ...
-Preparing to replace wget 1.10.1-1 (using .../wget_1.10.1-2_amd64.deb) ...
+Selecting previously deselected package libssl0.9.8.
+Unpacking libssl0.9.8 (from .../libssl0.9.8_0.9.8-3_amd64.deb) ...
+Preparing to replace wget 1.10.1-1 (using .../wget_1.10.2-1_amd64.deb) ...
 Unpacking replacement wget ...
 Preparing to replace libtext-charwidth-perl 0.04-2 (using .../libtext-charwidth-perl_0.04-3_amd64.deb) ...
 Unpacking replacement libtext-charwidth-perl ...
@@ -139,8 +178,10 @@ Removing old gcc doc directory.
 Unpacking replacement gcc ...
 Preparing to replace g++ 4:4.0.1-3 (using .../g++_4%3a4.0.2-1_amd64.deb) ...
 Unpacking replacement g++ ...
-Preparing to replace libdb4.3 4.3.28-2 (using .../libdb4.3_4.3.28-3_amd64.deb) ...
+Preparing to replace libdb4.3 4.3.28-2 (using .../libdb4.3_4.3.29-1_amd64.deb) ...
 Unpacking replacement libdb4.3 ...
+Preparing to replace linux-kernel-headers 2.6.13+0rc3-1.1 (using .../linux-kernel-headers_2.6.13+0rc3-2_amd64.deb) ...
+Unpacking replacement linux-kernel-headers ...
 Preparing to replace telnet 0.17-31 (using .../telnet_0.17-32_amd64.deb) ...
 Unpacking replacement telnet ...
 Setting up libdb4.2 (4.2.52-20) ...
@@ -156,9 +197,7 @@ Setting up info (4.8-1) ...
 
 Setting up libpcre3 (6.4-1) ...
 
-Setting up libssl0.9.7 (0.9.7g-4) ...
-
-Setting up wget (1.10.1-2) ...
+Setting up libssl0.9.7 (0.9.7g-5) ...
 
 Setting up libtext-charwidth-perl (0.04-3) ...
 Setting up libtext-iconv-perl (1.4-2) ...
@@ -183,14 +222,20 @@ Setting up gcc (4.0.2-1) ...
 
 Setting up g++ (4.0.2-1) ...
 
-Setting up libdb4.3 (4.3.28-3) ...
+Setting up libdb4.3 (4.3.29-1) ...
+Setting up linux-kernel-headers (2.6.13+0rc3-2) ...
 Setting up telnet (0.17-32) ...
 
+Setting up libssl0.9.8 (0.9.8-3) ...
+
+Setting up wget (1.10.2-1) ...
+Installing new version of config file /etc/wgetrc ...
+
 Setting up perl-modules (5.8.7-6) ...
 Setting up console-tools (0.2.3dbs-57) ...
 Installing new version of config file /etc/init.d/console-screen.sh ...
 
-Setting up perl (5.8.7-5) ...
+Setting up perl (5.8.7-6) ...
 
 Setting up console-common (0.7.54) ...
 Installing new version of config file /etc/init.d/keymap.sh ...
@@ -206,6 +251,6 @@ apt is already the newest version.
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//6152 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//9515 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-update-sarge-etch-sid-experimental.log b/testsuite/cdebootstrap/pbuilder-update-sarge-etch-sid-experimental.log
index f5a3dd7..7a86c02 100644
--- a/testsuite/cdebootstrap/pbuilder-update-sarge-etch-sid-experimental.log
+++ b/testsuite/cdebootstrap/pbuilder-update-sarge-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.hBmCMI/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -17,8 +17,8 @@ Ign http://ftp.jp.debian.org sid Release
 Get:4 http://ftp.jp.debian.org ../project/experimental Release [4245B]
 Ign http://ftp.jp.debian.org ../project/experimental Release
 Hit http://ftp.jp.debian.org sid/main Packages
-Get:5 http://ftp.jp.debian.org ../project/experimental/main Packages [103kB]
-Fetched 113kB in 0s (223kB/s)
+Get:5 http://ftp.jp.debian.org ../project/experimental/main Packages [104kB]
+Fetched 114kB in 0s (340kB/s)
 Reading package lists...
 W: GPG error: http://ftp.jp.debian.org sid Release: Could not execute /usr/bin/gpgv to verify signature (is gnupg installed?)
 W: GPG error: http://ftp.jp.debian.org ../project/experimental Release: Could not execute /usr/bin/gpgv to verify signature (is gnupg installed?)
@@ -36,11 +36,11 @@ Need to get 0B/3019kB of archives.
 After unpacking 2007kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   diff adduser libsigc++-2.0-0c2 aptitude
-(Reading database ... 11717 files and directories currently installed.)
+(Reading database ... 11970 files and directories currently installed.)
 Preparing to replace diff 2.8.1-11 (using .../diff_2.8.7-0.2_amd64.deb) ...
 Unpacking replacement diff ...
 Setting up diff (2.8.7-0.2) ...
-(Reading database ... 11725 files and directories currently installed.)
+(Reading database ... 11978 files and directories currently installed.)
 Preparing to replace adduser 3.67.2 (using .../archives/adduser_3.71_all.deb) ...
 Unpacking replacement adduser ...
 Selecting previously deselected package libsigc++-2.0-0c2.
@@ -62,6 +62,6 @@ apt is already the newest version.
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//2785 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//6064 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-update-sarge-etch-sid.log b/testsuite/cdebootstrap/pbuilder-update-sarge-etch-sid.log
index 83d9464..83a7ecd 100644
--- a/testsuite/cdebootstrap/pbuilder-update-sarge-etch-sid.log
+++ b/testsuite/cdebootstrap/pbuilder-update-sarge-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.hBmCMI/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -9,9 +9,9 @@ Building the build Environment
   -> Installing apt-lines
 Refreshing the base.tgz 
  -> upgrading packages
-Get:1 http://ftp.jp.debian.org sid/main Packages [3708kB]
+Get:1 http://ftp.jp.debian.org sid/main Packages [3709kB]
 Get:2 http://ftp.jp.debian.org sid/main Release [97B]
-Fetched 3708kB in 2s (1755kB/s)
+Fetched 3710kB in 2s (1654kB/s)
 Reading Package Lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
@@ -20,19 +20,28 @@ Building Dependency Tree...
 The following packages will be REMOVED:
   libsigc++-1.2-5c102
 The following NEW packages will be installed:
-  libsigc++-1.2-5c2
+  libsigc++-1.2-5c2 libssl0.9.8
 The following packages will be upgraded:
-  apt apt-utils aptitude binutils bsdutils console-common console-tools cpp
-  cpp-3.3 exim4 exim4-base exim4-config exim4-daemon-light g++ g++-3.3 gcc
-  gcc-3.3 gcc-3.3-base info libacl1 libattr1 libconsole libdb4.2 libdb4.3
-  libpcre3 libssl0.9.7 libstdc++5 libstdc++5-3.3-dev libtext-charwidth-perl
-  libtext-iconv-perl libtext-wrapi18n-perl module-init-tools mount perl
-  perl-base perl-modules sed tar telnet util-linux wget
-41 upgraded, 1 newly installed, 1 to remove and 0 not upgraded.
-Need to get 207kB/26.3MB of archives.
-After unpacking 2204kB of additional disk space will be used.
-Get:1 http://ftp.jp.debian.org sid/main info 4.8-1 [207kB]
-Fetched 207kB in 0s (832kB/s)
+  apt apt-utils aptitude bash binutils bsdutils console-common console-tools
+  cpp cpp-3.3 debianutils exim4 exim4-base exim4-config exim4-daemon-light g++
+  g++-3.3 gcc gcc-3.3 gcc-3.3-base info libacl1 libattr1 libconsole libdb4.2
+  libdb4.3 libpcre3 libssl0.9.7 libstdc++5 libstdc++5-3.3-dev
+  libtext-charwidth-perl libtext-iconv-perl libtext-wrapi18n-perl
+  linux-kernel-headers login module-init-tools mount passwd perl perl-base
+  perl-modules sed tar telnet util-linux wget
+46 upgraded, 2 newly installed, 1 to remove and 0 not upgraded.
+Need to get 5617kB/31.0MB of archives.
+After unpacking 5513kB of additional disk space will be used.
+Get:1 http://ftp.jp.debian.org sid/main debianutils 2.15 [57.4kB]
+Get:2 http://ftp.jp.debian.org sid/main login 1:4.0.13-1 [569kB]
+Get:3 http://ftp.jp.debian.org sid/main passwd 1:4.0.13-1 [661kB]
+Get:4 http://ftp.jp.debian.org sid/main bash 3.0-17 [846kB]
+Get:5 http://ftp.jp.debian.org sid/main perl-base 5.8.7-6 [819kB]
+Get:6 http://ftp.jp.debian.org sid/main libssl0.9.7 0.9.7g-5 [740kB]
+Get:7 http://ftp.jp.debian.org sid/main libssl0.9.8 0.9.8-3 [869kB]
+Get:8 http://ftp.jp.debian.org sid/main wget 1.10.2-1 [622kB]
+Get:9 http://ftp.jp.debian.org sid/main libdb4.3 4.3.29-1 [434kB]
+Fetched 5617kB in 3s (1561kB/s)
 (Reading database ... 11593 files and directories currently installed.)
 Preparing to replace libdb4.2 4.2.52-18 (using .../libdb4.2_4.2.52-20_amd64.deb) ...
 Unpacking replacement libdb4.2 ...
@@ -53,41 +62,77 @@ Unpacking replacement apt ...
 Setting up apt (0.6.41) ...
 
 (Reading database ... 11591 files and directories currently installed.)
+Preparing to replace debianutils 2.14.3 (using .../debianutils_2.15_amd64.deb) ...
+Unpacking replacement debianutils ...
+Replacing files in old package passwd ...
+Setting up debianutils (2.15) ...
+
+(Reading database ... 11590 files and directories currently installed.)
+Preparing to replace login 1:4.0.12-6 (using .../login_1%3a4.0.13-1_amd64.deb) ...
+Unpacking replacement login ...
+Setting up login (4.0.13-1) ...
+Installing new version of config file /etc/pam.d/login ...
+Installing new version of config file /etc/pam.d/su ...
+Installing new version of config file /etc/login.defs ...
+
+(Reading database ... 11591 files and directories currently installed.)
+Preparing to replace passwd 1:4.0.12-6 (using .../passwd_1%3a4.0.13-1_amd64.deb) ...
+Unpacking replacement passwd ...
+Setting up passwd (4.0.13-1) ...
+Installing new version of config file /etc/pam.d/chage ...
+Installing new version of config file /etc/pam.d/chfn ...
+Installing new version of config file /etc/pam.d/chsh ...
+Installing new version of config file /etc/pam.d/useradd ...
+Installing new version of config file /etc/pam.d/userdel ...
+Installing new version of config file /etc/pam.d/usermod ...
+Installing new version of config file /etc/pam.d/groupadd ...
+Installing new version of config file /etc/pam.d/groupdel ...
+Installing new version of config file /etc/pam.d/groupmod ...
+Installing new version of config file /etc/pam.d/newusers ...
+
+(Reading database ... 11593 files and directories currently installed.)
+Preparing to replace bash 3.0-16 (using .../archives/bash_3.0-17_amd64.deb) ...
+Unpacking replacement bash ...
+Setting up bash (3.0-17) ...
+Installing new version of config file /etc/bash.bashrc ...
+Installing new version of config file /etc/bash_completion ...
+
+(Reading database ... 11593 files and directories currently installed.)
 Preparing to replace bsdutils 1:2.12p-4 (using .../bsdutils_1%3a2.12p-8_amd64.deb) ...
 Unpacking replacement bsdutils ...
 Setting up bsdutils (2.12p-8) ...
 
-(Reading database ... 11591 files and directories currently installed.)
+(Reading database ... 11593 files and directories currently installed.)
 Preparing to replace mount 2.12p-4 (using .../mount_2.12p-8_amd64.deb) ...
 Unpacking replacement mount ...
 Setting up mount (2.12p-8) ...
 
-(Reading database ... 11591 files and directories currently installed.)
+(Reading database ... 11593 files and directories currently installed.)
 Preparing to replace perl-modules 5.8.7-3 (using .../perl-modules_5.8.7-6_all.deb) ...
 Unpacking replacement perl-modules ...
-Preparing to replace perl 5.8.7-3 (using .../perl_5.8.7-5_amd64.deb) ...
+Preparing to replace perl 5.8.7-3 (using .../perl_5.8.7-6_amd64.deb) ...
 Unpacking replacement perl ...
-Preparing to replace perl-base 5.8.7-3 (using .../perl-base_5.8.7-5_amd64.deb) ...
+Preparing to replace perl-base 5.8.7-3 (using .../perl-base_5.8.7-6_amd64.deb) ...
 Unpacking replacement perl-base ...
-Setting up perl-base (5.8.7-5) ...
-(Reading database ... 11698 files and directories currently installed.)
+Setting up perl-base (5.8.7-6) ...
+(Reading database ... 11700 files and directories currently installed.)
 Preparing to replace sed 4.1.2-8 (using .../archives/sed_4.1.4-4_amd64.deb) ...
 Unpacking replacement sed ...
 Setting up sed (4.1.4-4) ...
 
-(Reading database ... 11699 files and directories currently installed.)
+(Reading database ... 11701 files and directories currently installed.)
 Preparing to replace tar 1.14-2 (using .../tar_1.15.1-2_amd64.deb) ...
 Unpacking replacement tar ...
 Setting up tar (1.15.1-2) ...
 
-(Reading database ... 11703 files and directories currently installed.)
+(Reading database ... 11705 files and directories currently installed.)
 Preparing to replace util-linux 2.12p-4 (using .../util-linux_2.12p-8_amd64.deb) ...
 Unpacking replacement util-linux ...
 Setting up util-linux (2.12p-8) ...
 Installing new version of config file /etc/init.d/hwclock.sh ...
 Installing new version of config file /etc/init.d/hwclockfirst.sh ...
 
-(Reading database ... 11703 files and directories currently installed.)
+(Reading database ... 11705 files and directories currently installed.)
 Preparing to replace console-tools 1:0.2.3dbs-56 (using .../console-tools_1%3a0.2.3dbs-57_amd64.deb) ...
 Unpacking replacement console-tools ...
 Preparing to replace libconsole 1:0.2.3dbs-56 (using .../libconsole_1%3a0.2.3dbs-57_amd64.deb) ...
@@ -102,7 +147,7 @@ Setting up libattr1 (2.4.25-1) ...
 
 Setting up libacl1 (2.2.32-1) ...
 
-(Reading database ... 11703 files and directories currently installed.)
+(Reading database ... 11705 files and directories currently installed.)
 Preparing to replace gcc-3.3-base 1:3.3.6-7 (using .../gcc-3.3-base_1%3a3.3.6-10_amd64.deb) ...
 Unpacking replacement gcc-3.3-base ...
 Preparing to replace libstdc++5 1:3.3.6-7 (using .../libstdc++5_1%3a3.3.6-10_amd64.deb) ...
@@ -110,16 +155,18 @@ Unpacking replacement libstdc++5 ...
 Setting up gcc-3.3-base (3.3.6-10) ...
 Setting up libstdc++5 (3.3.6-10) ...
 
-(Reading database ... 11703 files and directories currently installed.)
+(Reading database ... 11705 files and directories currently installed.)
 Preparing to replace info 4.7-2.2 (using .../archives/info_4.8-1_amd64.deb) ...
 Unpacking replacement info ...
 Preparing to replace libpcre3 6.3-1 (using .../libpcre3_6.4-1_amd64.deb) ...
 Unpacking replacement libpcre3 ...
-Preparing to replace libssl0.9.7 0.9.7g-2 (using .../libssl0.9.7_0.9.7g-4_amd64.deb) ...
+Preparing to replace libssl0.9.7 0.9.7g-2 (using .../libssl0.9.7_0.9.7g-5_amd64.deb) ...
 Unpacking replacement libssl0.9.7 ...
+Selecting previously deselected package libssl0.9.8.
+Unpacking libssl0.9.8 (from .../libssl0.9.8_0.9.8-3_amd64.deb) ...
 Preparing to replace module-init-tools 3.2-pre8-1 (using .../module-init-tools_3.2-pre9-2_amd64.deb) ...
 Unpacking replacement module-init-tools ...
-Preparing to replace wget 1.10.1-1 (using .../wget_1.10.1-2_amd64.deb) ...
+Preparing to replace wget 1.10.1-1 (using .../wget_1.10.2-1_amd64.deb) ...
 Unpacking replacement wget ...
 Preparing to replace libtext-charwidth-perl 0.04-2 (using .../libtext-charwidth-perl_0.04-3_amd64.deb) ...
 Unpacking replacement libtext-charwidth-perl ...
@@ -144,8 +191,10 @@ Removing old gcc doc directory.
 Unpacking replacement gcc ...
 Preparing to replace g++ 4:4.0.1-3 (using .../g++_4%3a4.0.2-1_amd64.deb) ...
 Unpacking replacement g++ ...
-Preparing to replace libdb4.3 4.3.28-2 (using .../libdb4.3_4.3.28-3_amd64.deb) ...
+Preparing to replace libdb4.3 4.3.28-2 (using .../libdb4.3_4.3.29-1_amd64.deb) ...
 Unpacking replacement libdb4.3 ...
+Preparing to replace linux-kernel-headers 2.6.13+0rc3-1.1 (using .../linux-kernel-headers_2.6.13+0rc3-2_amd64.deb) ...
+Unpacking replacement linux-kernel-headers ...
 Preparing to replace telnet 0.17-31 (using .../telnet_0.17-32_amd64.deb) ...
 Unpacking replacement telnet ...
 Preparing to replace cpp-3.3 1:3.3.6-7 (using .../cpp-3.3_1%3a3.3.6-10_amd64.deb) ...
@@ -169,14 +218,12 @@ Setting up info (4.8-1) ...
 
 Setting up libpcre3 (6.4-1) ...
 
-Setting up libssl0.9.7 (0.9.7g-4) ...
+Setting up libssl0.9.7 (0.9.7g-5) ...
 
 Setting up module-init-tools (3.2-pre9-2) ...
 Installing new version of config file /etc/modprobe.d/aliases ...
 Installing new version of config file /etc/init.d/module-init-tools ...
 
-Setting up wget (1.10.1-2) ...
-
 Setting up libtext-charwidth-perl (0.04-3) ...
 Setting up libtext-iconv-perl (1.4-2) ...
 Setting up libtext-wrapi18n-perl (0.06-3) ...
@@ -200,14 +247,20 @@ Setting up gcc (4.0.2-1) ...
 
 Setting up g++ (4.0.2-1) ...
 
-Setting up libdb4.3 (4.3.28-3) ...
+Setting up libdb4.3 (4.3.29-1) ...
+Setting up linux-kernel-headers (2.6.13+0rc3-2) ...
 Setting up telnet (0.17-32) ...
 
 Setting up cpp-3.3 (3.3.6-10) ...
 Setting up gcc-3.3 (3.3.6-10) ...
 Setting up perl-modules (5.8.7-6) ...
+Setting up libssl0.9.8 (0.9.8-3) ...
+
+Setting up wget (1.10.2-1) ...
+Installing new version of config file /etc/wgetrc ...
+
 Setting up libstdc++5-3.3-dev (3.3.6-10) ...
-Setting up perl (5.8.7-5) ...
+Setting up perl (5.8.7-6) ...
 
 Setting up console-common (0.7.54) ...
 Installing new version of config file /etc/init.d/keymap.sh ...
@@ -225,9 +278,17 @@ dpkg-dev is already the newest version.
 apt is already the newest version.
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
 Copying back the cached apt archive contents
- -> new cache content info_4.8-1_amd64.deb added
+ -> new cache content debianutils_2.15_amd64.deb added
+ -> new cache content login_1%3a4.0.13-1_amd64.deb added
+ -> new cache content passwd_1%3a4.0.13-1_amd64.deb added
+ -> new cache content bash_3.0-17_amd64.deb added
+ -> new cache content perl-base_5.8.7-6_amd64.deb added
+ -> new cache content libssl0.9.7_0.9.7g-5_amd64.deb added
+ -> new cache content libssl0.9.8_0.9.8-3_amd64.deb added
+ -> new cache content wget_1.10.2-1_amd64.deb added
+ -> new cache content libdb4.3_4.3.29-1_amd64.deb added
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//1314 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//4432 and its subdirectories
diff --git a/testsuite/cdebootstrap/pbuilder-update-sarge-etch.log b/testsuite/cdebootstrap/pbuilder-update-sarge-etch.log
index a595acd..bf4fd9b 100644
--- a/testsuite/cdebootstrap/pbuilder-update-sarge-etch.log
+++ b/testsuite/cdebootstrap/pbuilder-update-sarge-etch.log
@@ -1,6 +1,6 @@
 Upgrading for distribution etch
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -9,9 +9,9 @@ Building the build Environment
   -> Installing apt-lines
 Refreshing the base.tgz 
  -> upgrading packages
-Get:1 http://ftp.jp.debian.org etch/main Packages [3364kB]
+Get:1 http://ftp.jp.debian.org etch/main Packages [3365kB]
 Get:2 http://ftp.jp.debian.org etch/main Release [96B]
-Fetched 3364kB in 1s (1866kB/s)
+Fetched 3365kB in 3s (1034kB/s)
 Reading Package Lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Obtaining the cached apt archive contents
@@ -69,8 +69,8 @@ Unpacking replacement libc6 ...
 Setting up libc6 (2.3.5-6) ...
 Checking for services that may need to be restarted...done.
 Current default timezone: 'UTC'.
-Local time is now:      Fri Oct 14 03:11:50 UTC 2005.
-Universal Time is now:  Fri Oct 14 03:11:50 UTC 2005.
+Local time is now:      Sat Oct 15 03:13:10 UTC 2005.
+Universal Time is now:  Sat Oct 15 03:13:10 UTC 2005.
 Run 'tzconfig' if you wish to change it.
 
 (Reading database ... 10830 files and directories currently installed.)
@@ -634,6 +634,6 @@ apt is already the newest version.
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//29009 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//30568 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-internal-etch.log b/testsuite/cdebootstrap/pdebuild-internal-etch.log
index cef30c3..220e0ce 100644
--- a/testsuite/cdebootstrap/pdebuild-internal-etch.log
+++ b/testsuite/cdebootstrap/pdebuild-internal-etch.log
@@ -1,11 +1,11 @@
 W: /home/dancer/.pbuilderrc does not exist
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2
+-> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2
  -> policy-rc.d already exists
 Obtaining the cached apt archive contents
 Using: : pdebuild-internal,v 1.6 2005/07/02 05:39:44 dancer Exp $
@@ -99,12 +99,12 @@ Building Dependency Tree...
 The following NEW packages will be installed:
   fakeroot
 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
-Need to get 0B/94.0kB of archives.
+Need to get 0B/94.1kB of archives.
 After unpacking 360kB of additional disk space will be used.
 Selecting previously deselected package fakeroot.
 (Reading database ... 11857 files and directories currently installed.)
-Unpacking fakeroot (from .../fakeroot_1.5.1_amd64.deb) ...
-Setting up fakeroot (1.5.1) ...
+Unpacking fakeroot (from .../fakeroot_1.5.4_amd64.deb) ...
+Setting up fakeroot (1.5.4) ...
 
 dpkg-buildpackage: source package is dsh
 dpkg-buildpackage: source version is 0.25.6-1
@@ -115,14 +115,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.hBmCMI/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.6
@@ -310,18 +310,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.hBmCMI/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
 Making all in m4
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/m4'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/po'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/po'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
 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; \
@@ -334,26 +334,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.hBmCMI/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
 Making check in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/m4'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/po'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
 PASS: tests/param-f.sh
 dsh: File ./tests/nonexistent.file could not be opened for read
 PASS: tests/param-f-fail.sh
@@ -390,8 +390,8 @@ success
 success
 success
 a: 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
+b: 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
@@ -404,7 +404,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
-Fri Oct 14 03:18:17 UTC 2005
+Sat Oct 15 03:21:53 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -474,7 +474,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
-Fri Oct 14 03:18:22 UTC 2005
+Sat Oct 15 03:21:58 UTC 2005
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
@@ -490,9 +490,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -500,58 +500,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.hBmCMI/dir2/dsh-0.25.6/debian/dsh
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
+/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
 Making install in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/m4'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/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.hBmCMI/dir2/dsh-0.25.6/m4'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
-installing ja.gmo as /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
+installing ja.gmo as /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/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.hBmCMI/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po; \
+  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/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.hBmCMI/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
+		    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
   done; \
 else \
   : ; \
 fi
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
-test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/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.hBmCMI/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
-install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
- /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/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.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
+install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
+ /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
 for LANGS in ja ; do \
-	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
-	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
+	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
+	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
 	sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
-		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/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.hBmCMI/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/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.hBmCMI/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
- /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
-test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/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.hBmCMI/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
+test -z "/usr/share/man/man1" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
+ /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
+test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/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.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
+install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
+install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -575,6 +575,6 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2 filesystem
+ -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2 filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/31848 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/2691 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-internal-sarge.log b/testsuite/cdebootstrap/pdebuild-internal-sarge.log
index f45db53..508a7f9 100644
--- a/testsuite/cdebootstrap/pdebuild-internal-sarge.log
+++ b/testsuite/cdebootstrap/pdebuild-internal-sarge.log
@@ -1,11 +1,11 @@
 W: /home/dancer/.pbuilderrc does not exist
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2
+-> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2
  -> policy-rc.d already exists
 Obtaining the cached apt archive contents
 Using: : pdebuild-internal,v 1.6 2005/07/02 05:39:44 dancer Exp $
@@ -109,14 +109,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.hBmCMI/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.6
@@ -304,18 +304,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.hBmCMI/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
 Making all in m4
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/m4'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/po'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/po'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
 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; \
@@ -328,26 +328,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.hBmCMI/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
 Making check in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/m4'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/po'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
 PASS: tests/param-f.sh
 dsh: File ./tests/nonexistent.file could not be opened for read
 PASS: tests/param-f-fail.sh
@@ -398,7 +398,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
-Fri Oct 14 03:11:11 UTC 2005
+Sat Oct 15 03:12:18 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -411,18 +411,6 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 DUMPing parameters passed to llexec
 [2] 
-3: Using sleep as the remote shell
-3: Show machine names on output
-3: Adding machine 5,4,3,2,1 to list
-3: Setting forklimit to 3 and wait_shell to 0
-3: DUMPing parameters passed to llexec
-3: [3] 
-Using sleep as the remote shell
-Show machine names on output
-Adding machine 5,4,3,2,1 to list
-Setting forklimit to 3 and wait_shell to 0
-DUMPing parameters passed to llexec
-[3] 
 1: Using sleep as the remote shell
 1: Show machine names on output
 1: Adding machine 5,4,3,2,1 to list
@@ -437,6 +425,18 @@ Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 DUMPing parameters passed to llexec
 [1] 
+3: Using sleep as the remote shell
+3: Show machine names on output
+3: Adding machine 5,4,3,2,1 to list
+3: Setting forklimit to 3 and wait_shell to 0
+3: DUMPing parameters passed to llexec
+3: [3] 
+Using sleep as the remote shell
+Show machine names on output
+Adding machine 5,4,3,2,1 to list
+Setting forklimit to 3 and wait_shell to 0
+DUMPing parameters passed to llexec
+[3] 
 4: Using sleep as the remote shell
 4: Show machine names on output
 4: Adding machine 5,4,3,2,1 to list
@@ -468,14 +468,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
-Fri Oct 14 03:11:16 UTC 2005
+Sat Oct 15 03:12:23 UTC 2005
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
-a: a
 b: b
 c: c
 dsh: Process terminated (before write).
+a: a
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -484,9 +484,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -494,58 +494,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.hBmCMI/dir2/dsh-0.25.6/debian/dsh
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
+/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
 Making install in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/m4'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/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.hBmCMI/dir2/dsh-0.25.6/m4'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
-installing ja.gmo as /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
+installing ja.gmo as /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/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.hBmCMI/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po; \
+  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/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.hBmCMI/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
+		    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
   done; \
 else \
   : ; \
 fi
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
-test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/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.hBmCMI/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
-install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
- /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/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.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
+install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
+ /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
 for LANGS in ja ; do \
-	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
-	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
+	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
+	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
 	sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
-		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/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.hBmCMI/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/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.hBmCMI/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
- /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
-test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/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.hBmCMI/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
+test -z "/usr/share/man/man1" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
+ /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
+test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/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.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
+install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
+install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -569,6 +569,6 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2 filesystem
+ -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2 filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/22395 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/23830 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-internal-sid.log b/testsuite/cdebootstrap/pdebuild-internal-sid.log
index 308d2d0..d62ba60 100644
--- a/testsuite/cdebootstrap/pdebuild-internal-sid.log
+++ b/testsuite/cdebootstrap/pdebuild-internal-sid.log
@@ -1,11 +1,11 @@
 W: /home/dancer/.pbuilderrc does not exist
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
  -> mounting /dev/pts filesystem
--> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2
+-> Mounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2
  -> policy-rc.d already exists
 Obtaining the cached apt archive contents
 Using: : pdebuild-internal,v 1.6 2005/07/02 05:39:44 dancer Exp $
@@ -25,7 +25,7 @@ After unpacking 741kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   libdebian-installer4 libdebian-installer-extra4 cdebootstrap pbuilder
 Selecting previously deselected package libdebian-installer4.
-(Reading database ... 11275 files and directories currently installed.)
+(Reading database ... 11516 files and directories currently installed.)
 Unpacking libdebian-installer4 (from .../libdebian-installer4_0.35_amd64.deb) ...
 Selecting previously deselected package libdebian-installer-extra4.
 Unpacking libdebian-installer-extra4 (from .../libdebian-installer-extra4_0.35_amd64.deb) ...
@@ -57,16 +57,16 @@ The following NEW packages will be installed:
   debconf-utils debhelper file gettext html2text intltool-debian libdshconfig1
   libdshconfig1-dev libmagic1 po-debconf
 0 upgraded, 10 newly installed, 0 to remove and 0 not upgraded.
-Need to get 0B/2860kB of archives.
-After unpacking 9437kB of additional disk space will be used.
+Need to get 0B/2890kB of archives.
+After unpacking 9572kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   libmagic1 file debconf-utils html2text gettext intltool-debian po-debconf
   debhelper libdshconfig1 libdshconfig1-dev
 Selecting previously deselected package libmagic1.
-(Reading database ... 11369 files and directories currently installed.)
-Unpacking libmagic1 (from .../libmagic1_4.12-1_amd64.deb) ...
+(Reading database ... 11610 files and directories currently installed.)
+Unpacking libmagic1 (from .../libmagic1_4.15-2_amd64.deb) ...
 Selecting previously deselected package file.
-Unpacking file (from .../archives/file_4.12-1_amd64.deb) ...
+Unpacking file (from .../archives/file_4.15-2_amd64.deb) ...
 Selecting previously deselected package debconf-utils.
 Unpacking debconf-utils (from .../debconf-utils_1.4.58_all.deb) ...
 Selecting previously deselected package html2text.
@@ -83,9 +83,9 @@ Selecting previously deselected package libdshconfig1.
 Unpacking libdshconfig1 (from .../libdshconfig1_0.20.11-1_amd64.deb) ...
 Selecting previously deselected package libdshconfig1-dev.
 Unpacking libdshconfig1-dev (from .../libdshconfig1-dev_0.20.11-1_amd64.deb) ...
-Setting up libmagic1 (4.12-1) ...
+Setting up libmagic1 (4.15-2) ...
 
-Setting up file (4.12-1) ...
+Setting up file (4.15-2) ...
 Setting up debconf-utils (1.4.58) ...
 
 Setting up html2text (1.3.2a-3) ...
@@ -109,7 +109,7 @@ After unpacking 360kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   fakeroot
 Selecting previously deselected package fakeroot.
-(Reading database ... 11959 files and directories currently installed.)
+(Reading database ... 12201 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.5.4_amd64.deb) ...
 Setting up fakeroot (1.5.4) ...
 
@@ -122,14 +122,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.hBmCMI/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.6
@@ -317,18 +317,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.hBmCMI/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
 /usr/bin/make  all-recursive
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
 Making all in m4
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/m4'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/m4'
 Making all in po
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/po'
 make[3]: Nothing to be done for `all'.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/po'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/po'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
 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; \
@@ -341,26 +341,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.hBmCMI/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
 /usr/bin/make check
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
 Making check in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/m4'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/m4'
 Making check in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/po'
 make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
 /usr/bin/make  dsh
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
 make[3]: `dsh' is up to date.
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
 /usr/bin/make  check-TESTS
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
 PASS: tests/param-f.sh
 dsh: File ./tests/nonexistent.file could not be opened for read
 PASS: tests/param-f-fail.sh
@@ -397,8 +397,8 @@ success
 success
 success
 a: 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
+c: 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
@@ -411,7 +411,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
-Fri Oct 14 03:06:57 UTC 2005
+Sat Oct 15 03:07:36 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -481,7 +481,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
-Fri Oct 14 03:07:02 UTC 2005
+Sat Oct 15 03:07:41 UTC 2005
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
@@ -497,9 +497,9 @@ PASS: tests/machinelist-order.sh
 ===================
 All 17 tests passed
 ===================
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
 touch build-stamp
  fakeroot debian/rules binary
 dh_testdir
@@ -507,58 +507,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.hBmCMI/dir2/dsh-0.25.6/debian/dsh
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
+/usr/bin/make install DESTDIR=/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
 Making install in m4
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/m4'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/m4'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/m4'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/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.hBmCMI/dir2/dsh-0.25.6/m4'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/m4'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/m4'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/m4'
 Making install in po
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/po'
-/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/debian/dsh/usr/share
-mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
-installing ja.gmo as /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES/dsh.mo
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/po'
+/bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share
+mkdir -p -- /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share/locale/ja/LC_MESSAGES
+installing ja.gmo as /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/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.hBmCMI/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po; \
+  /bin/sh `case "./mkinstalldirs" in /*) echo "./mkinstalldirs" ;; *) echo ".././mkinstalldirs" ;; esac` /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/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.hBmCMI/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
+		    /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share/gettext/po/$file; \
   done; \
 else \
   : ; \
 fi
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/po'
-make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
-make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
-test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/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.hBmCMI/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
-install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
-test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
- /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/po'
+make[2]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[3]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+test -z "/usr/bin" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/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.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh'
+install -p -o root -g root -m 755 -s dsh /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/bin/dsh
+test -z "/etc/dsh" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/etc/dsh"
+ /usr/bin/install -c -m 644 'dsh.conf' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf'
 for LANGS in ja ; do \
-	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
-	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
+	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1 ;\
+	mkdir -p /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5 ;\
 	sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.$LANGS.1 \
-		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man1/dsh.1 ; \
+		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/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.hBmCMI/dir2/dsh-0.25.6/debian/dsh/usr/share/man/$LANGS/man5/dsh.conf.5 ; \
+		> /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/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.hBmCMI/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
- /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
-test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/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.hBmCMI/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
-make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
-make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
-cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
-ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
-install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
-install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
+test -z "/usr/share/man/man1" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1"
+ /usr/bin/install -c -m 644 './build-man/dsh.1' '/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man1/dsh.1'
+test -z "/usr/share/man/man5" || mkdir -p -- . "/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/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.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/share/man/man5/dsh.conf.5'
+make[3]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[2]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/etc/dsh/machines.list
+cp /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/dsh.conf /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/etc/dsh/dsh.conf
+ln -s ../machines.list /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/etc/dsh/group/all
+install -d /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster
+install -m 755 /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh.updatelist /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6/debian/dsh/usr/lib/update-cluster/
 dh_testdir
 dh_testroot
 dh_installdocs NEWS
@@ -582,6 +582,6 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2 filesystem
+ -> unmounting /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2 filesystem
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/19130 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/20501 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-normal-etch.log b/testsuite/cdebootstrap/pdebuild-normal-etch.log
index 312bc95..a3ae97f 100644
--- a/testsuite/cdebootstrap/pdebuild-normal-etch.log
+++ b/testsuite/cdebootstrap/pdebuild-normal-etch.log
@@ -8,14 +8,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.hBmCMI/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.6
@@ -31,10 +31,10 @@ W: /home/dancer/.pbuilderrc does not exist
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Fri Oct 14 12:17:10 JST 2005
-pbuilder-time-stamp: 1129259830
+Current time: Sat Oct 15 12:20:06 JST 2005
+pbuilder-time-stamp: 1129346406
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -102,7 +102,7 @@ Setting up libdshconfig1 (0.20.11-1) ...
 Setting up libdshconfig1-dev (0.20.11-1) ...
  -> Finished parsing the build-deps
 Copying back the cached apt archive contents
-grep: /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/25548/etc/shadow: No such file or directory
+grep: /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/28812/etc/shadow: No such file or directory
 Copying source file
     -> copying [../dsh_0.25.6-1.dsc]
     -> copying [../dsh_0.25.6.orig.tar.gz]
@@ -412,8 +412,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
@@ -425,7 +425,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
-Fri Oct 14 03:17:42 UTC 2005
+Sat Oct 15 03:20:41 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -495,7 +495,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
-Fri Oct 14 03:17:47 UTC 2005
+Sat Oct 15 03:20:46 UTC 2005
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
@@ -608,7 +608,7 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Fri Oct 14 12:17:49 JST 2005
-pbuilder-time-stamp: 1129259869
+Current time: Sat Oct 15 12:20:56 JST 2005
+pbuilder-time-stamp: 1129346456
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/25548 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/28812 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-normal-sarge.log b/testsuite/cdebootstrap/pdebuild-normal-sarge.log
index 941040b..59855b4 100644
--- a/testsuite/cdebootstrap/pdebuild-normal-sarge.log
+++ b/testsuite/cdebootstrap/pdebuild-normal-sarge.log
@@ -8,14 +8,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.hBmCMI/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.6
@@ -31,10 +31,10 @@ W: /home/dancer/.pbuilderrc does not exist
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Fri Oct 14 12:10:10 JST 2005
-pbuilder-time-stamp: 1129259410
+Current time: Sat Oct 15 12:10:59 JST 2005
+pbuilder-time-stamp: 1129345859
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -102,7 +102,7 @@ Setting up libdshconfig1 (0.20.11-1) ...
 Setting up libdshconfig1-dev (0.20.11-1) ...
  -> Finished parsing the build-deps
 Copying back the cached apt archive contents
-grep: /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/16105/etc/shadow: No such file or directory
+grep: /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/17524/etc/shadow: No such file or directory
 Copying source file
     -> copying [../dsh_0.25.6-1.dsc]
     -> copying [../dsh_0.25.6.orig.tar.gz]
@@ -423,7 +423,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
-Fri Oct 14 03:10:37 UTC 2005
+Sat Oct 15 03:11:32 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -436,18 +436,6 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 DUMPing parameters passed to llexec
 [2] 
-3: Using sleep as the remote shell
-3: Show machine names on output
-3: Adding machine 5,4,3,2,1 to list
-3: Setting forklimit to 3 and wait_shell to 0
-3: DUMPing parameters passed to llexec
-3: [3] 
-Using sleep as the remote shell
-Show machine names on output
-Adding machine 5,4,3,2,1 to list
-Setting forklimit to 3 and wait_shell to 0
-DUMPing parameters passed to llexec
-[3] 
 1: Using sleep as the remote shell
 1: Show machine names on output
 1: Adding machine 5,4,3,2,1 to list
@@ -462,6 +450,12 @@ Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 DUMPing parameters passed to llexec
 [1] 
+Using sleep as the remote shell
+Show machine names on output
+Adding machine 5,4,3,2,1 to list
+Setting forklimit to 3 and wait_shell to 0
+DUMPing parameters passed to llexec
+[3] 
 4: Using sleep as the remote shell
 4: Show machine names on output
 4: Adding machine 5,4,3,2,1 to list
@@ -493,7 +487,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
-Fri Oct 14 03:10:42 UTC 2005
+Sat Oct 15 03:11:37 UTC 2005
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
@@ -606,7 +600,7 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Fri Oct 14 12:10:44 JST 2005
-pbuilder-time-stamp: 1129259444
+Current time: Sat Oct 15 12:11:39 JST 2005
+pbuilder-time-stamp: 1129345899
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/16105 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/17524 and its subdirectories
diff --git a/testsuite/cdebootstrap/pdebuild-normal-sid.log b/testsuite/cdebootstrap/pdebuild-normal-sid.log
index cd75cea..d977a91 100644
--- a/testsuite/cdebootstrap/pdebuild-normal-sid.log
+++ b/testsuite/cdebootstrap/pdebuild-normal-sid.log
@@ -8,14 +8,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.hBmCMI/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `clean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 /usr/bin/make distclean
-make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
+make[1]: Entering directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
 make[1]: *** No rule to make target `distclean'.  Stop.
-make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/dsh-0.25.6'
+make[1]: Leaving directory `/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/dsh-0.25.6'
 make: [clean] Error 2 (ignored)
 dh_clean
  dpkg-source -b dsh-0.25.6
@@ -31,10 +31,10 @@ W: /home/dancer/.pbuilderrc does not exist
 pbuilder-buildpackage/amd64 $Id$
 $Id$
 
-Current time: Fri Oct 14 12:05:43 JST 2005
-pbuilder-time-stamp: 1129259143
+Current time: Sat Oct 15 12:06:12 JST 2005
+pbuilder-time-stamp: 1129345572
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
@@ -62,16 +62,16 @@ The following NEW packages will be installed:
   debconf-utils debhelper file gettext html2text intltool-debian libdshconfig1
   libdshconfig1-dev libmagic1 po-debconf
 0 upgraded, 10 newly installed, 0 to remove and 0 not upgraded.
-Need to get 0B/2860kB of archives.
-After unpacking 9437kB of additional disk space will be used.
+Need to get 0B/2890kB of archives.
+After unpacking 9572kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
   libmagic1 file debconf-utils html2text gettext intltool-debian po-debconf
   debhelper libdshconfig1 libdshconfig1-dev
 Selecting previously deselected package libmagic1.
-(Reading database ... 11275 files and directories currently installed.)
-Unpacking libmagic1 (from .../libmagic1_4.12-1_amd64.deb) ...
+(Reading database ... 11516 files and directories currently installed.)
+Unpacking libmagic1 (from .../libmagic1_4.15-2_amd64.deb) ...
 Selecting previously deselected package file.
-Unpacking file (from .../archives/file_4.12-1_amd64.deb) ...
+Unpacking file (from .../archives/file_4.15-2_amd64.deb) ...
 Selecting previously deselected package debconf-utils.
 Unpacking debconf-utils (from .../debconf-utils_1.4.58_all.deb) ...
 Selecting previously deselected package html2text.
@@ -88,9 +88,9 @@ Selecting previously deselected package libdshconfig1.
 Unpacking libdshconfig1 (from .../libdshconfig1_0.20.11-1_amd64.deb) ...
 Selecting previously deselected package libdshconfig1-dev.
 Unpacking libdshconfig1-dev (from .../libdshconfig1-dev_0.20.11-1_amd64.deb) ...
-Setting up libmagic1 (4.12-1) ...
+Setting up libmagic1 (4.15-2) ...
 
-Setting up file (4.12-1) ...
+Setting up file (4.15-2) ...
 Setting up debconf-utils (1.4.58) ...
 
 Setting up html2text (1.3.2a-3) ...
@@ -105,7 +105,7 @@ Setting up libdshconfig1 (0.20.11-1) ...
 Setting up libdshconfig1-dev (0.20.11-1) ...
  -> Finished parsing the build-deps
 Copying back the cached apt archive contents
-grep: /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/12834/etc/shadow: No such file or directory
+grep: /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/14190/etc/shadow: No such file or directory
 Copying source file
     -> copying [../dsh_0.25.6-1.dsc]
     -> copying [../dsh_0.25.6.orig.tar.gz]
@@ -389,7 +389,6 @@ test to check that unknown parameter checking is right.
 PASS: tests/param-unknown.sh
 test1
 test2
-dsh: Process terminated (before write).
 PASS: tests/param-i.sh
 Check that cn4 option is working.
 PASS: tests/param-cn4.sh
@@ -413,10 +412,10 @@ success
 success
 success
 success
-d: dsh: Failed executing ./invalid-exec-file with llexec call
 a: 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
+c: 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
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -424,11 +423,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
-Fri Oct 14 03:06:15 UTC 2005
+Sat Oct 15 03:06:45 UTC 2005
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -498,14 +497,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
-Fri Oct 14 03:06:20 UTC 2005
+Sat Oct 15 03:06:50 UTC 2005
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
-b: b
-c: c
 dsh: Process terminated (before write).
+c: c
+b: b
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
@@ -611,7 +610,7 @@ dpkg-buildpackage: full upload (original source is included)
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
-Current time: Fri Oct 14 12:06:22 JST 2005
-pbuilder-time-stamp: 1129259182
+Current time: Sat Oct 15 12:06:52 JST 2005
+pbuilder-time-stamp: 1129345612
  -> cleaning the build env 
-    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.hBmCMI/dir2/12834 and its subdirectories
+    -> removing directory /home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Zw4RBz/dir2/14190 and its subdirectories