testsuite update

35 files changed, 230 insertions, 228 deletions

diff --git a/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log b/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log
index 45f982c..4f61e42 100644
--- a/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log
+++ b/testsuite/cdebootstrap/pbuilder-build-dsh-etch.log
@@ -409,7 +409,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sun May 27 13:05:15 UTC 2007
+Mon May 28 00:07:19 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -422,6 +422,18 @@ 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
@@ -436,18 +448,6 @@ 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
@@ -479,7 +479,7 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Sun May 27 13:05:20 UTC 2007
+Mon May 28 00:07:24 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
diff --git a/testsuite/cdebootstrap/pbuilder-build-dsh-lenny.log b/testsuite/cdebootstrap/pbuilder-build-dsh-lenny.log
index 2f926f2..c1cbd58 100644
--- a/testsuite/cdebootstrap/pbuilder-build-dsh-lenny.log
+++ b/testsuite/cdebootstrap/pbuilder-build-dsh-lenny.log
@@ -395,9 +395,9 @@ success
 success
 success
 a: 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
+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
@@ -409,7 +409,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sun May 27 13:41:35 UTC 2007
+Mon May 28 00:16:56 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -422,6 +422,18 @@ 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
@@ -436,18 +448,6 @@ 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
@@ -479,14 +479,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Sun May 27 13:41:40 UTC 2007
+Mon May 28 00:17:01 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
+a: a
+dsh: Process terminated (before write).
 b: b
 c: c
-dsh: Process terminated (before write).
-a: a
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
diff --git a/testsuite/cdebootstrap/pbuilder-build-dsh-sid.log b/testsuite/cdebootstrap/pbuilder-build-dsh-sid.log
index 3555319..cd9e9d8 100644
--- a/testsuite/cdebootstrap/pbuilder-build-dsh-sid.log
+++ b/testsuite/cdebootstrap/pbuilder-build-dsh-sid.log
@@ -394,10 +394,10 @@ success
 success
 success
 success
-c: dsh: Failed executing ./invalid-exec-file with llexec call
-d: dsh: Failed executing ./invalid-exec-file with llexec call
 a: 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
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -409,7 +409,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sun May 27 12:31:50 UTC 2007
+Sun May 27 23:54:30 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -422,6 +422,18 @@ 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
@@ -436,18 +448,6 @@ 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
@@ -479,14 +479,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Sun May 27 12:31:56 UTC 2007
+Sun May 27 23:54:35 UTC 2007
 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).
 c: c
+dsh: Process terminated (before write).
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
diff --git a/testsuite/cdebootstrap/pbuilder-create-etch.log b/testsuite/cdebootstrap/pbuilder-create-etch.log
index a2a601c..82bfa05 100644
--- a/testsuite/cdebootstrap/pbuilder-create-etch.log
+++ b/testsuite/cdebootstrap/pbuilder-create-etch.log
@@ -323,23 +323,23 @@ O: Selecting previously deselected package base-passwd.
 O: (Reading database ... 0 files and directories currently installed.)
 O: Unpacking base-passwd (from .../base-passwd_3.5.11_amd64.deb) ...
 P: Unpacking package base-passwd
+O: Setting up base-passwd (3.5.11) ...
+P: Configuring package base-passwd
 O: dpkg: base-passwd: dependency problems, but configuring anyway as you request:
 O:  base-passwd depends on libc6 (>= 2.3.5-1); however:
 O:   Package libc6 is not installed.
-O: Setting up base-passwd (3.5.11) ...
-P: Configuring package base-passwd
 O: 
 P: Configuring helper cdebootstrap-helper-diverts
 O: Selecting previously deselected package cdebootstrap-helper-diverts.
-O: (Reading database ... 
-O: 24 files and directories currently installed.)
+O: (Reading database ... 24 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'
 O: Setting up cdebootstrap-helper-diverts (1) ...
 P: Configuring helper cdebootstrap-helper-makedev
 O: Selecting previously deselected package cdebootstrap-helper-makedev.
-O: (Reading database ... 29 files and directories currently installed.)
+O: (Reading database ... 
+O: 29 files and directories currently installed.)
 O: Unpacking cdebootstrap-helper-makedev (from .../cdebootstrap-helper-makedev.deb) ...
 O: Setting up cdebootstrap-helper-makedev (1) ...
 O: 
@@ -363,7 +363,8 @@ O: Setting up dpkg (1.13.25) ...
 P: Configuring package dpkg
 O: 
 O: Selecting previously deselected package tzdata.
-O: (Reading database ... 254 files and directories currently installed.)
+O: (Reading database ... 
+O: 254 files and directories currently installed.)
 O: Unpacking tzdata (from .../tzdata_2007b-1_all.deb) ...
 P: Unpacking package tzdata
 O: Selecting previously deselected package libc6.
@@ -887,7 +888,8 @@ O: Setting up debconf (1.5.11) ...
 P: Configuring package debconf
 O: 
 O: Selecting previously deselected package libbz2-1.0.
-O: (Reading database ... 4813 files and directories currently installed.)
+O: (Reading database ... 
+O: 4813 files and directories currently installed.)
 O: Unpacking libbz2-1.0 (from .../libbz2-1.0_1.0.3-6_amd64.deb) ...
 P: Unpacking package libbz2-1.0
 O: Selecting previously deselected package libgpg-error0.
@@ -1056,7 +1058,8 @@ O:   vim-tiny wget whiptail
 O: debconf: delaying package configuration, since apt-utils is not installed
 O: Authentication warning overridden.
 O: Selecting previously deselected package adduser.
-O: (Reading database ... 5216 files and directories currently installed.)
+O: (Reading database ... 
+O: 5216 files and directories currently installed.)
 O: Unpacking adduser (from .../adduser_3.102_all.deb) ...
 P: Unpacking package adduser
 O: Selecting previously deselected package libdb4.4.
diff --git a/testsuite/cdebootstrap/pbuilder-create-lenny.log b/testsuite/cdebootstrap/pbuilder-create-lenny.log
index 9f03f27..bf6728a 100644
--- a/testsuite/cdebootstrap/pbuilder-create-lenny.log
+++ b/testsuite/cdebootstrap/pbuilder-create-lenny.log
@@ -320,8 +320,7 @@ P: Extracting sysvinit
 P: Extracting tar
 P: Extracting util-linux
 O: Selecting previously deselected package base-passwd.
-O: (Reading database ... 
-O: 0 files and directories currently installed.)
+O: (Reading database ... 0 files and directories currently installed.)
 O: Unpacking base-passwd (from .../base-passwd_3.5.11_amd64.deb) ...
 P: Unpacking package base-passwd
 O: dpkg: base-passwd: dependency problems, but configuring anyway as you request:
@@ -365,13 +364,12 @@ O: Setting up dpkg (1.13.25) ...
 P: Configuring package dpkg
 O: 
 O: Selecting previously deselected package perl-base.
+O: (Reading database ... 254 files and directories currently installed.)
+O: Unpacking perl-base (from .../perl-base_5.8.8-7_amd64.deb) ...
+P: Unpacking package perl-base
 O: dpkg: regarding .../perl-base_5.8.8-7_amd64.deb containing perl-base, pre-dependency problem:
 O:  perl-base pre-depends on libc6 (>= 2.3.5-1)
 O: dpkg: warning - ignoring pre-dependency problem !
-O: (Reading database ... 
-O: 254 files and directories currently installed.)
-O: Unpacking perl-base (from .../perl-base_5.8.8-7_amd64.deb) ...
-P: Unpacking package perl-base
 O: Selecting previously deselected package libtext-iconv-perl.
 O: Unpacking libtext-iconv-perl (from .../libtext-iconv-perl_1.4-3_amd64.deb) ...
 P: Unpacking package libtext-iconv-perl
@@ -746,8 +744,8 @@ O: Setting up tzdata (2007f-3) ...
 P: Configuring package tzdata
 O: 
 O: Current default timezone: 'Etc/UTC'
-O: Local time is now:      Sun May 27 13:31:31 UTC 2007.
-O: Universal Time is now:  Sun May 27 13:31:31 UTC 2007.
+O: Local time is now:      Mon May 28 00:15:11 UTC 2007.
+O: Universal Time is now:  Mon May 28 00:15:11 UTC 2007.
 O: Run 'dpkg-reconfigure tzdata' if you wish to change it.
 O: 
 O: 
@@ -991,8 +989,6 @@ P: Configuring package gnupg
 O: Setting up debian-archive-keyring (2007.02.19) ...
 P: Configuring package debian-archive-keyring
 O: gpg: 
-O: keyring `/etc/apt/secring.gpg' created
-O: gpg: 
 O: keyring `/etc/apt/trusted.gpg' created
 O: gpg: 
 O: /etc/apt/trustdb.gpg: trustdb created
diff --git a/testsuite/cdebootstrap/pbuilder-create-sid.log b/testsuite/cdebootstrap/pbuilder-create-sid.log
index bfd1fa5..c718d29 100644
--- a/testsuite/cdebootstrap/pbuilder-create-sid.log
+++ b/testsuite/cdebootstrap/pbuilder-create-sid.log
@@ -334,7 +334,8 @@ P: Configuring package base-passwd
 O: 
 P: Configuring helper cdebootstrap-helper-diverts
 O: Selecting previously deselected package cdebootstrap-helper-diverts.
-O: (Reading database ... 24 files and directories currently installed.)
+O: (Reading database ... 
+O: 24 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'
@@ -894,8 +895,8 @@ O: Setting up tzdata (2007f-4) ...
 P: Configuring package tzdata
 O: 
 O: Current default timezone: 'Etc/UTC'
-O: Local time is now:      Sun May 27 12:23:27 UTC 2007.
-O: Universal Time is now:  Sun May 27 12:23:27 UTC 2007.
+O: Local time is now:      Sun May 27 23:51:37 UTC 2007.
+O: Universal Time is now:  Sun May 27 23:51:37 UTC 2007.
 O: Run 'dpkg-reconfigure tzdata' if you wish to change it.
 O: 
 O: 
@@ -903,7 +904,8 @@ O: Setting up util-linux (2.12r-19) ...
 P: Configuring package util-linux
 O: 
 O: Selecting previously deselected package libbz2-1.0.
-O: (Reading database ... 4876 files and directories currently installed.)
+O: (Reading database ... 
+O: 4876 files and directories currently installed.)
 O: Unpacking libbz2-1.0 (from .../libbz2-1.0_1.0.3-7_amd64.deb) ...
 P: Unpacking package libbz2-1.0
 O: Selecting previously deselected package libgpg-error0.
@@ -922,7 +924,7 @@ O: Selecting previously deselected package libtasn1-3.
 O: Unpacking libtasn1-3 (from .../libtasn1-3_0.3.9-1_amd64.deb) ...
 P: Unpacking package libtasn1-3
 O: Selecting previously deselected package libgnutls13.
-O: Unpacking libgnutls13 (from .../libgnutls13_1.6.2-2_amd64.deb) ...
+O: Unpacking libgnutls13 (from .../libgnutls13_1.6.3-1_amd64.deb) ...
 P: Unpacking package libgnutls13
 O: Selecting previously deselected package libdb4.2.
 O: Unpacking libdb4.2 (from .../libdb4.2_4.2.52+dfsg-2_amd64.deb) ...
@@ -972,7 +974,7 @@ O:
 O: Setting up libtasn1-3 (0.3.9-1) ...
 P: Configuring package libtasn1-3
 O: 
-O: Setting up libgnutls13 (1.6.2-2) ...
+O: Setting up libgnutls13 (1.6.3-1) ...
 P: Configuring package libgnutls13
 O: 
 O: Setting up libdb4.2 (4.2.52+dfsg-2) ...
@@ -1040,7 +1042,6 @@ O: Get:2 bootstrap: . Release [79.6kB]
 O: Reading package lists...
 O: 
 O: Reading package lists...
-O: 
 O: Building dependency tree...
 O: 
 O: Suggested packages:
@@ -1382,7 +1383,7 @@ Refreshing the base.tgz
  -> installing dummy policy-rc.d
 Get:1 http://cdn.debian.or.jp sid Release.gpg [189B]
 Get:2 http://cdn.debian.or.jp sid Release [79.6kB]
-Get:3 http://cdn.debian.or.jp sid/main Packages [6219kB]
+Get:3 http://cdn.debian.or.jp sid/main Packages [6238kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
diff --git a/testsuite/cdebootstrap/pbuilder-update-etch-etch.log b/testsuite/cdebootstrap/pbuilder-update-etch-etch.log
index b21a98b..d990ff6 100644
--- a/testsuite/cdebootstrap/pbuilder-update-etch-etch.log
+++ b/testsuite/cdebootstrap/pbuilder-update-etch-etch.log
@@ -118,8 +118,8 @@ Setting up debconf (1.5.13) ...
 Setting up tzdata (2007f-3) ...
 
 Current default timezone: 'Etc/UTC'
-Local time is now:      Sun May 27 13:14:40 UTC 2007.
-Universal Time is now:  Sun May 27 13:14:40 UTC 2007.
+Local time is now:      Mon May 28 00:10:36 UTC 2007.
+Universal Time is now:  Mon May 28 00:10:36 UTC 2007.
 Run 'dpkg-reconfigure tzdata' if you wish to change it.
 
 
diff --git a/testsuite/cdebootstrap/pbuilder-update-etch-lenny-sid-experimental.log b/testsuite/cdebootstrap/pbuilder-update-etch-lenny-sid-experimental.log
index 06e1e85..096ae27 100644
--- a/testsuite/cdebootstrap/pbuilder-update-etch-lenny-sid-experimental.log
+++ b/testsuite/cdebootstrap/pbuilder-update-etch-lenny-sid-experimental.log
@@ -15,7 +15,7 @@ Get:2 http://cdn.debian.or.jp experimental Release.gpg [189B]
 Hit http://cdn.debian.or.jp sid Release
 Get:3 http://cdn.debian.or.jp experimental Release [79.6kB]
 Get:4 http://cdn.debian.or.jp sid/main Packages/DiffIndex [2038B]
-Get:5 http://cdn.debian.or.jp experimental/main Packages [331kB]
+Get:5 http://cdn.debian.or.jp experimental/main Packages [336kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
@@ -108,7 +108,7 @@ gpg:              unchanged: 3
 (Reading database ... 10854 files and directories currently installed.)
 Preparing to replace libgcrypt11 1.2.4-2 (using .../libgcrypt11_1.3.0-1_amd64.deb) ...
 Unpacking replacement libgcrypt11 ...
-Preparing to replace libgnutls13 1.6.2-2 (using .../libgnutls13_1.7.7-1_amd64.deb) ...
+Preparing to replace libgnutls13 1.6.3-1 (using .../libgnutls13_1.7.7-1_amd64.deb) ...
 Unpacking replacement libgnutls13 ...
 Preparing to replace libncursesw5 5.6-3 (using .../libncursesw5_5.6+20070512-1_amd64.deb) ...
 Unpacking replacement libncursesw5 ...
diff --git a/testsuite/cdebootstrap/pbuilder-update-etch-sid.log b/testsuite/cdebootstrap/pbuilder-update-etch-sid.log
index 84dc86a..2e8c7d5 100644
--- a/testsuite/cdebootstrap/pbuilder-update-etch-sid.log
+++ b/testsuite/cdebootstrap/pbuilder-update-etch-sid.log
@@ -11,7 +11,7 @@ Refreshing the base.tgz
  -> upgrading packages
 Get:1 http://cdn.debian.or.jp sid Release.gpg [189B]
 Get:2 http://cdn.debian.or.jp sid Release [79.6kB]
-Get:3 http://cdn.debian.or.jp sid/main Packages [6219kB]
+Get:3 http://cdn.debian.or.jp sid/main Packages [6238kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
@@ -32,7 +32,7 @@ The following packages will be upgraded:
   tzdata vim-common vim-tiny zlib1g
 56 upgraded, 3 newly installed, 2 to remove and 0 not upgraded.
 Need to get 30.6MB of archives.
-After unpacking 1552kB of additional disk space will be used.
+After unpacking 1565kB of additional disk space will be used.
 Get:1 http://cdn.debian.or.jp sid/main gcc-4.2-base 4.2-20070525-1 [209kB]
 Get:2 http://cdn.debian.or.jp sid/main binutils 2.17cvs20070426-7 [2559kB]
 Get:3 http://cdn.debian.or.jp sid/main libc6-dev 2.5-9 [2472kB]
@@ -74,7 +74,7 @@ Get:38 http://cdn.debian.or.jp sid/main iputils-ping 3:20070202-1 [45.5kB]
 Get:39 http://cdn.debian.or.jp sid/main laptop-detect 0.13.1 [4574B]
 Get:40 http://cdn.debian.or.jp sid/main libbz2-1.0 1.0.3-7 [41.6kB]
 Get:41 http://cdn.debian.or.jp sid/main liblzo2-2 2.02-2 [54.7kB]
-Get:42 http://cdn.debian.or.jp sid/main libgnutls13 1.6.2-2 [346kB]
+Get:42 http://cdn.debian.or.jp sid/main libgnutls13 1.6.3-1 [354kB]
 Get:43 http://cdn.debian.or.jp sid/main libncursesw5 5.6-3 [358kB]
 Get:44 http://cdn.debian.or.jp sid/main readline-common 5.2-3 [50.8kB]
 Get:45 http://cdn.debian.or.jp sid/main libreadline5 5.2-3 [144kB]
@@ -241,8 +241,8 @@ Unpacking replacement tzdata ...
 Setting up tzdata (2007f-4) ...
 
 Current default timezone: 'Etc/UTC'
-Local time is now:      Sun May 27 13:18:03 UTC 2007.
-Universal Time is now:  Sun May 27 13:18:03 UTC 2007.
+Local time is now:      Mon May 28 00:11:46 UTC 2007.
+Universal Time is now:  Mon May 28 00:11:46 UTC 2007.
 Run 'dpkg-reconfigure tzdata' if you wish to change it.
 
 
@@ -264,7 +264,7 @@ Preparing to replace libbz2-1.0 1.0.3-6 (using .../libbz2-1.0_1.0.3-7_amd64.deb)
 Unpacking replacement libbz2-1.0 ...
 Selecting previously deselected package liblzo2-2.
 Unpacking liblzo2-2 (from .../liblzo2-2_2.02-2_amd64.deb) ...
-Preparing to replace libgnutls13 1.4.4-3 (using .../libgnutls13_1.6.2-2_amd64.deb) ...
+Preparing to replace libgnutls13 1.4.4-3 (using .../libgnutls13_1.6.3-1_amd64.deb) ...
 Unpacking replacement libgnutls13 ...
 Preparing to replace libncursesw5 5.5-5 (using .../libncursesw5_5.6-3_amd64.deb) ...
 Unpacking replacement libncursesw5 ...
@@ -320,7 +320,7 @@ Setting up libbz2-1.0 (1.0.3-7) ...
 
 Setting up liblzo2-2 (2.02-2) ...
 
-Setting up libgnutls13 (1.6.2-2) ...
+Setting up libgnutls13 (1.6.3-1) ...
 
 Setting up libncursesw5 (5.6-3) ...
 
diff --git a/testsuite/cdebootstrap/pbuilder-update-lenny-sid-experimental.log b/testsuite/cdebootstrap/pbuilder-update-lenny-sid-experimental.log
index 06e1e85..096ae27 100644
--- a/testsuite/cdebootstrap/pbuilder-update-lenny-sid-experimental.log
+++ b/testsuite/cdebootstrap/pbuilder-update-lenny-sid-experimental.log
@@ -15,7 +15,7 @@ Get:2 http://cdn.debian.or.jp experimental Release.gpg [189B]
 Hit http://cdn.debian.or.jp sid Release
 Get:3 http://cdn.debian.or.jp experimental Release [79.6kB]
 Get:4 http://cdn.debian.or.jp sid/main Packages/DiffIndex [2038B]
-Get:5 http://cdn.debian.or.jp experimental/main Packages [331kB]
+Get:5 http://cdn.debian.or.jp experimental/main Packages [336kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
@@ -108,7 +108,7 @@ gpg:              unchanged: 3
 (Reading database ... 10854 files and directories currently installed.)
 Preparing to replace libgcrypt11 1.2.4-2 (using .../libgcrypt11_1.3.0-1_amd64.deb) ...
 Unpacking replacement libgcrypt11 ...
-Preparing to replace libgnutls13 1.6.2-2 (using .../libgnutls13_1.7.7-1_amd64.deb) ...
+Preparing to replace libgnutls13 1.6.3-1 (using .../libgnutls13_1.7.7-1_amd64.deb) ...
 Unpacking replacement libgnutls13 ...
 Preparing to replace libncursesw5 5.6-3 (using .../libncursesw5_5.6+20070512-1_amd64.deb) ...
 Unpacking replacement libncursesw5 ...
diff --git a/testsuite/cdebootstrap/pbuilder-update-lenny-sid.log b/testsuite/cdebootstrap/pbuilder-update-lenny-sid.log
index 79b3bc3..17789aa 100644
--- a/testsuite/cdebootstrap/pbuilder-update-lenny-sid.log
+++ b/testsuite/cdebootstrap/pbuilder-update-lenny-sid.log
@@ -11,7 +11,7 @@ Refreshing the base.tgz
  -> upgrading packages
 Get:1 http://cdn.debian.or.jp sid Release.gpg [189B]
 Get:2 http://cdn.debian.or.jp sid Release [79.6kB]
-Get:3 http://cdn.debian.or.jp sid/main Packages [6219kB]
+Get:3 http://cdn.debian.or.jp sid/main Packages [6238kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
@@ -32,7 +32,7 @@ The following packages will be upgraded:
   tzdata vim-common vim-tiny zlib1g
 56 upgraded, 3 newly installed, 2 to remove and 0 not upgraded.
 Need to get 30.6MB of archives.
-After unpacking 1552kB of additional disk space will be used.
+After unpacking 1565kB of additional disk space will be used.
 Get:1 http://cdn.debian.or.jp sid/main gcc-4.2-base 4.2-20070525-1 [209kB]
 Get:2 http://cdn.debian.or.jp sid/main binutils 2.17cvs20070426-7 [2559kB]
 Get:3 http://cdn.debian.or.jp sid/main libc6-dev 2.5-9 [2472kB]
@@ -74,7 +74,7 @@ Get:38 http://cdn.debian.or.jp sid/main iputils-ping 3:20070202-1 [45.5kB]
 Get:39 http://cdn.debian.or.jp sid/main laptop-detect 0.13.1 [4574B]
 Get:40 http://cdn.debian.or.jp sid/main libbz2-1.0 1.0.3-7 [41.6kB]
 Get:41 http://cdn.debian.or.jp sid/main liblzo2-2 2.02-2 [54.7kB]
-Get:42 http://cdn.debian.or.jp sid/main libgnutls13 1.6.2-2 [346kB]
+Get:42 http://cdn.debian.or.jp sid/main libgnutls13 1.6.3-1 [354kB]
 Get:43 http://cdn.debian.or.jp sid/main libncursesw5 5.6-3 [358kB]
 Get:44 http://cdn.debian.or.jp sid/main readline-common 5.2-3 [50.8kB]
 Get:45 http://cdn.debian.or.jp sid/main libreadline5 5.2-3 [144kB]
@@ -241,8 +241,8 @@ Unpacking replacement tzdata ...
 Setting up tzdata (2007f-4) ...
 
 Current default timezone: 'Etc/UTC'
-Local time is now:      Sun May 27 13:54:26 UTC 2007.
-Universal Time is now:  Sun May 27 13:54:26 UTC 2007.
+Local time is now:      Mon May 28 00:20:45 UTC 2007.
+Universal Time is now:  Mon May 28 00:20:45 UTC 2007.
 Run 'dpkg-reconfigure tzdata' if you wish to change it.
 
 
@@ -264,7 +264,7 @@ Preparing to replace libbz2-1.0 1.0.3-6 (using .../libbz2-1.0_1.0.3-7_amd64.deb)
 Unpacking replacement libbz2-1.0 ...
 Selecting previously deselected package liblzo2-2.
 Unpacking liblzo2-2 (from .../liblzo2-2_2.02-2_amd64.deb) ...
-Preparing to replace libgnutls13 1.4.4-3 (using .../libgnutls13_1.6.2-2_amd64.deb) ...
+Preparing to replace libgnutls13 1.4.4-3 (using .../libgnutls13_1.6.3-1_amd64.deb) ...
 Unpacking replacement libgnutls13 ...
 Preparing to replace libncursesw5 5.5-5 (using .../libncursesw5_5.6-3_amd64.deb) ...
 Unpacking replacement libncursesw5 ...
@@ -320,7 +320,7 @@ Setting up libbz2-1.0 (1.0.3-7) ...
 
 Setting up liblzo2-2 (2.02-2) ...
 
-Setting up libgnutls13 (1.6.2-2) ...
+Setting up libgnutls13 (1.6.3-1) ...
 
 Setting up libncursesw5 (5.6-3) ...
 
diff --git a/testsuite/cdebootstrap/pdebuild-internal-etch.log b/testsuite/cdebootstrap/pdebuild-internal-etch.log
index 0f3a2e1..12bc56d 100644
--- a/testsuite/cdebootstrap/pdebuild-internal-etch.log
+++ b/testsuite/cdebootstrap/pdebuild-internal-etch.log
@@ -416,10 +416,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
-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
+b: 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
@@ -431,7 +431,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sun May 27 13:12:34 UTC 2007
+Mon May 28 00:09:31 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -501,14 +501,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Sun May 27 13:12:39 UTC 2007
+Mon May 28 00:09:36 UTC 2007
 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
diff --git a/testsuite/cdebootstrap/pdebuild-internal-lenny.log b/testsuite/cdebootstrap/pdebuild-internal-lenny.log
index 7795ca3..8404bfc 100644
--- a/testsuite/cdebootstrap/pdebuild-internal-lenny.log
+++ b/testsuite/cdebootstrap/pdebuild-internal-lenny.log
@@ -416,9 +416,9 @@ success
 success
 success
 success
-d: dsh: Failed executing ./invalid-exec-file with llexec call
 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
 c: dsh: Failed executing ./invalid-exec-file with llexec call
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -431,7 +431,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sun May 27 13:50:59 UTC 2007
+Mon May 28 00:19:26 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -501,14 +501,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Sun May 27 13:51:04 UTC 2007
+Mon May 28 00:19:31 UTC 2007
 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
diff --git a/testsuite/cdebootstrap/pdebuild-internal-sid.log b/testsuite/cdebootstrap/pdebuild-internal-sid.log
index 969c65c..e77f9fc 100644
--- a/testsuite/cdebootstrap/pdebuild-internal-sid.log
+++ b/testsuite/cdebootstrap/pdebuild-internal-sid.log
@@ -392,6 +392,7 @@ 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
@@ -415,10 +416,10 @@ success
 success
 success
 success
-a: dsh: Failed executing ./invalid-exec-file with llexec call
-b: dsh: Failed executing ./invalid-exec-file with llexec call
 c: dsh: Failed executing ./invalid-exec-file with llexec call
 d: dsh: Failed executing ./invalid-exec-file with llexec call
+a: dsh: Failed executing ./invalid-exec-file with llexec call
+b: 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
@@ -430,7 +431,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sun May 27 12:43:10 UTC 2007
+Sun May 27 23:59:49 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -500,14 +501,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Sun May 27 12:43:17 UTC 2007
+Sun May 27 23:59:54 UTC 2007
 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
diff --git a/testsuite/cdebootstrap/pdebuild-normal-etch.log b/testsuite/cdebootstrap/pdebuild-normal-etch.log
index eb25563..118f24d 100644
--- a/testsuite/cdebootstrap/pdebuild-normal-etch.log
+++ b/testsuite/cdebootstrap/pdebuild-normal-etch.log
@@ -423,9 +423,9 @@ success
 success
 success
 a: 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
+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
@@ -437,7 +437,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sun May 27 13:09:10 UTC 2007
+Mon May 28 00:08:34 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -507,14 +507,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Sun May 27 13:09:15 UTC 2007
+Mon May 28 00:08:39 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
+a: a
+dsh: Process terminated (before write).
 b: b
 c: c
-dsh: Process terminated (before write).
-a: a
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
diff --git a/testsuite/cdebootstrap/pdebuild-normal-lenny.log b/testsuite/cdebootstrap/pdebuild-normal-lenny.log
index 9f980dc..cde8623 100644
--- a/testsuite/cdebootstrap/pdebuild-normal-lenny.log
+++ b/testsuite/cdebootstrap/pdebuild-normal-lenny.log
@@ -422,10 +422,10 @@ success
 success
 success
 success
-c: dsh: Failed executing ./invalid-exec-file with llexec call
-d: dsh: Failed executing ./invalid-exec-file with llexec call
 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
+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
@@ -437,7 +437,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sun May 27 13:46:56 UTC 2007
+Mon May 28 00:18:15 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -450,6 +450,18 @@ 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
@@ -464,18 +476,6 @@ 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
@@ -507,7 +507,7 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Sun May 27 13:47:01 UTC 2007
+Mon May 28 00:18:20 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
diff --git a/testsuite/cdebootstrap/pdebuild-normal-sid.log b/testsuite/cdebootstrap/pdebuild-normal-sid.log
index 7340db3..86ac5b1 100644
--- a/testsuite/cdebootstrap/pdebuild-normal-sid.log
+++ b/testsuite/cdebootstrap/pdebuild-normal-sid.log
@@ -433,11 +433,11 @@ dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
 success
 PASS: tests/param-r-invalid.sh
-1: 1
 2: 2
+1: 1
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sun May 27 12:37:05 UTC 2007
+Sun May 27 23:56:42 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -507,13 +507,12 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Sun May 27 12:37:11 UTC 2007
+Sun May 27 23:56:47 UTC 2007
 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).
 c: c
 PASS: tests/segv-catcher.sh
 l w
diff --git a/testsuite/normal/pbuilder-build-dsh-etch.log b/testsuite/normal/pbuilder-build-dsh-etch.log
index e141648..202d4ad 100644
--- a/testsuite/normal/pbuilder-build-dsh-etch.log
+++ b/testsuite/normal/pbuilder-build-dsh-etch.log
@@ -353,7 +353,6 @@ make[2]: Entering directory `/tmp/buildd/dsh-0.25.8/po'
 make[2]: Nothing to be done for `check'.
 make[2]: Leaving directory `/tmp/buildd/dsh-0.25.8/po'
 make[2]: Entering directory `/tmp/buildd/dsh-0.25.8'
-sed -e 's,[@]sysconfdir[@],/etc/dsh,' < ./dsh.1 > build-man/dsh.1
 /usr/bin/make  dsh
 make[3]: Entering directory `/tmp/buildd/dsh-0.25.8'
 make[3]: `dsh' is up to date.
@@ -396,9 +395,9 @@ success
 success
 success
 a: 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
+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
@@ -410,7 +409,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sun May 27 11:32:53 UTC 2007
+Sun May 27 23:36:14 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -480,14 +479,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Sun May 27 11:32:58 UTC 2007
+Sun May 27 23:36:19 UTC 2007
 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
diff --git a/testsuite/normal/pbuilder-build-dsh-lenny.log b/testsuite/normal/pbuilder-build-dsh-lenny.log
index 46ab0db..2e61a25 100644
--- a/testsuite/normal/pbuilder-build-dsh-lenny.log
+++ b/testsuite/normal/pbuilder-build-dsh-lenny.log
@@ -394,10 +394,10 @@ success
 success
 success
 success
-c: dsh: Failed executing ./invalid-exec-file with llexec call
-d: dsh: Failed executing ./invalid-exec-file with llexec call
 a: 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
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -409,7 +409,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sun May 27 11:51:51 UTC 2007
+Sun May 27 23:44:40 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -422,6 +422,18 @@ 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
@@ -436,18 +448,6 @@ 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
@@ -479,14 +479,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Sun May 27 11:51:56 UTC 2007
+Sun May 27 23:44:45 UTC 2007
 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).
 c: c
+dsh: Process terminated (before write).
+a: a
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
diff --git a/testsuite/normal/pbuilder-build-dsh-sid.log b/testsuite/normal/pbuilder-build-dsh-sid.log
index cb008d4..540f804 100644
--- a/testsuite/normal/pbuilder-build-dsh-sid.log
+++ b/testsuite/normal/pbuilder-build-dsh-sid.log
@@ -355,6 +355,7 @@ make[2]: Leaving directory `/tmp/buildd/dsh-0.25.8/po'
 make[2]: Entering directory `/tmp/buildd/dsh-0.25.8'
 /usr/bin/make  dsh
 make[3]: Entering directory `/tmp/buildd/dsh-0.25.8'
+make[3]: `dsh' is up to date.
 make[3]: Leaving directory `/tmp/buildd/dsh-0.25.8'
 /usr/bin/make  check-TESTS
 make[3]: Entering directory `/tmp/buildd/dsh-0.25.8'
@@ -394,9 +395,9 @@ success
 success
 success
 a: dsh: Failed executing ./invalid-exec-file with llexec call
+b: dsh: Failed executing ./invalid-exec-file with llexec call
 c: dsh: Failed executing ./invalid-exec-file with llexec call
 d: dsh: Failed executing ./invalid-exec-file with llexec call
-b: 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
@@ -408,7 +409,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sun May 27 11:21:46 UTC 2007
+Sun May 27 23:30:51 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -478,14 +479,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Sun May 27 11:21:52 UTC 2007
+Sun May 27 23:30:56 UTC 2007
 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
diff --git a/testsuite/normal/pbuilder-create-etch.log b/testsuite/normal/pbuilder-create-etch.log
index 01b5827..c138b21 100644
--- a/testsuite/normal/pbuilder-create-etch.log
+++ b/testsuite/normal/pbuilder-create-etch.log
@@ -593,7 +593,7 @@ Get:1 http://cdn.debian.or.jp etch Release.gpg [378B]
 Hit http://cdn.debian.or.jp etch Release
 Ign http://cdn.debian.or.jp etch/main Packages/DiffIndex
 Hit http://cdn.debian.or.jp etch/main Packages
-Fetched 378B in 0s (1299B/s)
+Fetched XXXB in Xs (XXXXXB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Reading package lists...
diff --git a/testsuite/normal/pbuilder-create-lenny.log b/testsuite/normal/pbuilder-create-lenny.log
index 23e6c8d..752a1fb 100644
--- a/testsuite/normal/pbuilder-create-lenny.log
+++ b/testsuite/normal/pbuilder-create-lenny.log
@@ -592,7 +592,7 @@ Refreshing the base.tgz
 Get:1 http://cdn.debian.or.jp lenny Release.gpg [189B]
 Hit http://cdn.debian.or.jp lenny Release
 Get:2 http://cdn.debian.or.jp lenny/main Packages/DiffIndex [2038B]
-Fetched 2227B in 0s (2751B/s)
+Fetched XXXB in Xs (XXXXXB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Reading package lists...
diff --git a/testsuite/normal/pbuilder-create-sid.log b/testsuite/normal/pbuilder-create-sid.log
index d2a1e42..802bdd9 100644
--- a/testsuite/normal/pbuilder-create-sid.log
+++ b/testsuite/normal/pbuilder-create-sid.log
@@ -598,7 +598,7 @@ Refreshing the base.tgz
 Get:1 http://cdn.debian.or.jp sid Release.gpg [189B]
 Hit http://cdn.debian.or.jp sid Release
 Get:2 http://cdn.debian.or.jp sid/main Packages/DiffIndex [2038B]
-Fetched 2227B in 0s (2919B/s)
+Fetched XXXB in Xs (XXXXXB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Reading package lists...
diff --git a/testsuite/normal/pbuilder-update-etch-etch.log b/testsuite/normal/pbuilder-update-etch-etch.log
index abc58b0..4cd80fa 100644
--- a/testsuite/normal/pbuilder-update-etch-etch.log
+++ b/testsuite/normal/pbuilder-update-etch-etch.log
@@ -118,8 +118,8 @@ Setting up debconf (1.5.13) ...
 Setting up tzdata (2007f-3) ...
 
 User defined timezone, leaving /etc/localtime unchanged.
-Local time is now:      Sun May 27 11:36:15 UTC 2007.
-Universal Time is now:  Sun May 27 11:36:15 UTC 2007.
+Local time is now:      Sun May 27 23:38:57 UTC 2007.
+Universal Time is now:  Sun May 27 23:38:57 UTC 2007.
 Run 'dpkg-reconfigure tzdata' if you wish to change it.
 
 
diff --git a/testsuite/normal/pbuilder-update-etch-lenny-sid-experimental.log b/testsuite/normal/pbuilder-update-etch-lenny-sid-experimental.log
index 06e1e85..096ae27 100644
--- a/testsuite/normal/pbuilder-update-etch-lenny-sid-experimental.log
+++ b/testsuite/normal/pbuilder-update-etch-lenny-sid-experimental.log
@@ -15,7 +15,7 @@ Get:2 http://cdn.debian.or.jp experimental Release.gpg [189B]
 Hit http://cdn.debian.or.jp sid Release
 Get:3 http://cdn.debian.or.jp experimental Release [79.6kB]
 Get:4 http://cdn.debian.or.jp sid/main Packages/DiffIndex [2038B]
-Get:5 http://cdn.debian.or.jp experimental/main Packages [331kB]
+Get:5 http://cdn.debian.or.jp experimental/main Packages [336kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
@@ -108,7 +108,7 @@ gpg:              unchanged: 3
 (Reading database ... 10854 files and directories currently installed.)
 Preparing to replace libgcrypt11 1.2.4-2 (using .../libgcrypt11_1.3.0-1_amd64.deb) ...
 Unpacking replacement libgcrypt11 ...
-Preparing to replace libgnutls13 1.6.2-2 (using .../libgnutls13_1.7.7-1_amd64.deb) ...
+Preparing to replace libgnutls13 1.6.3-1 (using .../libgnutls13_1.7.7-1_amd64.deb) ...
 Unpacking replacement libgnutls13 ...
 Preparing to replace libncursesw5 5.6-3 (using .../libncursesw5_5.6+20070512-1_amd64.deb) ...
 Unpacking replacement libncursesw5 ...
diff --git a/testsuite/normal/pbuilder-update-etch-sid.log b/testsuite/normal/pbuilder-update-etch-sid.log
index 607bb02..9b789c3 100644
--- a/testsuite/normal/pbuilder-update-etch-sid.log
+++ b/testsuite/normal/pbuilder-update-etch-sid.log
@@ -11,7 +11,7 @@ Refreshing the base.tgz
  -> upgrading packages
 Get:1 http://cdn.debian.or.jp sid Release.gpg [189B]
 Get:2 http://cdn.debian.or.jp sid Release [79.6kB]
-Get:3 http://cdn.debian.or.jp sid/main Packages [6219kB]
+Get:3 http://cdn.debian.or.jp sid/main Packages [6238kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
@@ -32,7 +32,7 @@ The following packages will be upgraded:
   tzdata vim-common vim-tiny zlib1g
 56 upgraded, 3 newly installed, 2 to remove and 0 not upgraded.
 Need to get 30.6MB of archives.
-After unpacking 1552kB of additional disk space will be used.
+After unpacking 1565kB of additional disk space will be used.
 Get:1 http://cdn.debian.or.jp sid/main gcc-4.2-base 4.2-20070525-1 [209kB]
 Get:2 http://cdn.debian.or.jp sid/main binutils 2.17cvs20070426-7 [2559kB]
 Get:3 http://cdn.debian.or.jp sid/main libc6-dev 2.5-9 [2472kB]
@@ -74,7 +74,7 @@ Get:38 http://cdn.debian.or.jp sid/main iputils-ping 3:20070202-1 [45.5kB]
 Get:39 http://cdn.debian.or.jp sid/main laptop-detect 0.13.1 [4574B]
 Get:40 http://cdn.debian.or.jp sid/main libbz2-1.0 1.0.3-7 [41.6kB]
 Get:41 http://cdn.debian.or.jp sid/main liblzo2-2 2.02-2 [54.7kB]
-Get:42 http://cdn.debian.or.jp sid/main libgnutls13 1.6.2-2 [346kB]
+Get:42 http://cdn.debian.or.jp sid/main libgnutls13 1.6.3-1 [354kB]
 Get:43 http://cdn.debian.or.jp sid/main libncursesw5 5.6-3 [358kB]
 Get:44 http://cdn.debian.or.jp sid/main readline-common 5.2-3 [50.8kB]
 Get:45 http://cdn.debian.or.jp sid/main libreadline5 5.2-3 [144kB]
@@ -241,8 +241,8 @@ Unpacking replacement tzdata ...
 Setting up tzdata (2007f-4) ...
 
 User defined timezone, leaving /etc/localtime unchanged.
-Local time is now:      Sun May 27 11:39:27 UTC 2007.
-Universal Time is now:  Sun May 27 11:39:27 UTC 2007.
+Local time is now:      Sun May 27 23:40:12 UTC 2007.
+Universal Time is now:  Sun May 27 23:40:12 UTC 2007.
 Run 'dpkg-reconfigure tzdata' if you wish to change it.
 
 
@@ -264,7 +264,7 @@ Preparing to replace libbz2-1.0 1.0.3-6 (using .../libbz2-1.0_1.0.3-7_amd64.deb)
 Unpacking replacement libbz2-1.0 ...
 Selecting previously deselected package liblzo2-2.
 Unpacking liblzo2-2 (from .../liblzo2-2_2.02-2_amd64.deb) ...
-Preparing to replace libgnutls13 1.4.4-3 (using .../libgnutls13_1.6.2-2_amd64.deb) ...
+Preparing to replace libgnutls13 1.4.4-3 (using .../libgnutls13_1.6.3-1_amd64.deb) ...
 Unpacking replacement libgnutls13 ...
 Preparing to replace libncursesw5 5.5-5 (using .../libncursesw5_5.6-3_amd64.deb) ...
 Unpacking replacement libncursesw5 ...
@@ -320,7 +320,7 @@ Setting up libbz2-1.0 (1.0.3-7) ...
 
 Setting up liblzo2-2 (2.02-2) ...
 
-Setting up libgnutls13 (1.6.2-2) ...
+Setting up libgnutls13 (1.6.3-1) ...
 
 Setting up libncursesw5 (5.6-3) ...
 
diff --git a/testsuite/normal/pbuilder-update-lenny-sid-experimental.log b/testsuite/normal/pbuilder-update-lenny-sid-experimental.log
index 06e1e85..096ae27 100644
--- a/testsuite/normal/pbuilder-update-lenny-sid-experimental.log
+++ b/testsuite/normal/pbuilder-update-lenny-sid-experimental.log
@@ -15,7 +15,7 @@ Get:2 http://cdn.debian.or.jp experimental Release.gpg [189B]
 Hit http://cdn.debian.or.jp sid Release
 Get:3 http://cdn.debian.or.jp experimental Release [79.6kB]
 Get:4 http://cdn.debian.or.jp sid/main Packages/DiffIndex [2038B]
-Get:5 http://cdn.debian.or.jp experimental/main Packages [331kB]
+Get:5 http://cdn.debian.or.jp experimental/main Packages [336kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
@@ -108,7 +108,7 @@ gpg:              unchanged: 3
 (Reading database ... 10854 files and directories currently installed.)
 Preparing to replace libgcrypt11 1.2.4-2 (using .../libgcrypt11_1.3.0-1_amd64.deb) ...
 Unpacking replacement libgcrypt11 ...
-Preparing to replace libgnutls13 1.6.2-2 (using .../libgnutls13_1.7.7-1_amd64.deb) ...
+Preparing to replace libgnutls13 1.6.3-1 (using .../libgnutls13_1.7.7-1_amd64.deb) ...
 Unpacking replacement libgnutls13 ...
 Preparing to replace libncursesw5 5.6-3 (using .../libncursesw5_5.6+20070512-1_amd64.deb) ...
 Unpacking replacement libncursesw5 ...
diff --git a/testsuite/normal/pbuilder-update-lenny-sid.log b/testsuite/normal/pbuilder-update-lenny-sid.log
index f1f60ef..b46e4cc 100644
--- a/testsuite/normal/pbuilder-update-lenny-sid.log
+++ b/testsuite/normal/pbuilder-update-lenny-sid.log
@@ -11,7 +11,7 @@ Refreshing the base.tgz
  -> upgrading packages
 Get:1 http://cdn.debian.or.jp sid Release.gpg [189B]
 Get:2 http://cdn.debian.or.jp sid Release [79.6kB]
-Get:3 http://cdn.debian.or.jp sid/main Packages [6219kB]
+Get:3 http://cdn.debian.or.jp sid/main Packages [6238kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
@@ -32,7 +32,7 @@ The following packages will be upgraded:
   tzdata vim-common vim-tiny zlib1g
 56 upgraded, 3 newly installed, 2 to remove and 0 not upgraded.
 Need to get 30.6MB of archives.
-After unpacking 1552kB of additional disk space will be used.
+After unpacking 1565kB of additional disk space will be used.
 Get:1 http://cdn.debian.or.jp sid/main gcc-4.2-base 4.2-20070525-1 [209kB]
 Get:2 http://cdn.debian.or.jp sid/main binutils 2.17cvs20070426-7 [2559kB]
 Get:3 http://cdn.debian.or.jp sid/main libc6-dev 2.5-9 [2472kB]
@@ -74,7 +74,7 @@ Get:38 http://cdn.debian.or.jp sid/main iputils-ping 3:20070202-1 [45.5kB]
 Get:39 http://cdn.debian.or.jp sid/main laptop-detect 0.13.1 [4574B]
 Get:40 http://cdn.debian.or.jp sid/main libbz2-1.0 1.0.3-7 [41.6kB]
 Get:41 http://cdn.debian.or.jp sid/main liblzo2-2 2.02-2 [54.7kB]
-Get:42 http://cdn.debian.or.jp sid/main libgnutls13 1.6.2-2 [346kB]
+Get:42 http://cdn.debian.or.jp sid/main libgnutls13 1.6.3-1 [354kB]
 Get:43 http://cdn.debian.or.jp sid/main libncursesw5 5.6-3 [358kB]
 Get:44 http://cdn.debian.or.jp sid/main readline-common 5.2-3 [50.8kB]
 Get:45 http://cdn.debian.or.jp sid/main libreadline5 5.2-3 [144kB]
@@ -241,8 +241,8 @@ Unpacking replacement tzdata ...
 Setting up tzdata (2007f-4) ...
 
 Current default timezone: 'Etc/UTC'
-Local time is now:      Sun May 27 12:06:02 UTC 2007.
-Universal Time is now:  Sun May 27 12:06:02 UTC 2007.
+Local time is now:      Sun May 27 23:47:20 UTC 2007.
+Universal Time is now:  Sun May 27 23:47:20 UTC 2007.
 Run 'dpkg-reconfigure tzdata' if you wish to change it.
 
 
@@ -264,7 +264,7 @@ Preparing to replace libbz2-1.0 1.0.3-6 (using .../libbz2-1.0_1.0.3-7_amd64.deb)
 Unpacking replacement libbz2-1.0 ...
 Selecting previously deselected package liblzo2-2.
 Unpacking liblzo2-2 (from .../liblzo2-2_2.02-2_amd64.deb) ...
-Preparing to replace libgnutls13 1.4.4-3 (using .../libgnutls13_1.6.2-2_amd64.deb) ...
+Preparing to replace libgnutls13 1.4.4-3 (using .../libgnutls13_1.6.3-1_amd64.deb) ...
 Unpacking replacement libgnutls13 ...
 Preparing to replace libncursesw5 5.5-5 (using .../libncursesw5_5.6-3_amd64.deb) ...
 Unpacking replacement libncursesw5 ...
@@ -320,7 +320,7 @@ Setting up libbz2-1.0 (1.0.3-7) ...
 
 Setting up liblzo2-2 (2.02-2) ...
 
-Setting up libgnutls13 (1.6.2-2) ...
+Setting up libgnutls13 (1.6.3-1) ...
 
 Setting up libncursesw5 (5.6-3) ...
 
diff --git a/testsuite/normal/pdebuild-internal-etch.log b/testsuite/normal/pdebuild-internal-etch.log
index 69a81b0..201d4c3 100644
--- a/testsuite/normal/pdebuild-internal-etch.log
+++ b/testsuite/normal/pdebuild-internal-etch.log
@@ -416,10 +416,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
 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
@@ -431,7 +431,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sun May 27 11:34:42 UTC 2007
+Sun May 27 23:38:03 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -501,14 +501,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Sun May 27 11:34:47 UTC 2007
+Sun May 27 23:38:08 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
 a: a
-dsh: Process terminated (before write).
 b: b
 c: c
+dsh: Process terminated (before write).
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
diff --git a/testsuite/normal/pdebuild-internal-lenny.log b/testsuite/normal/pdebuild-internal-lenny.log
index c2f2643..544f0df 100644
--- a/testsuite/normal/pdebuild-internal-lenny.log
+++ b/testsuite/normal/pdebuild-internal-lenny.log
@@ -418,8 +418,8 @@ success
 success
 a: 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
+b: 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
@@ -431,7 +431,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sun May 27 12:03:14 UTC 2007
+Sun May 27 23:46:15 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -444,6 +444,18 @@ 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
@@ -458,18 +470,6 @@ 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
@@ -501,14 +501,14 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Sun May 27 12:03:19 UTC 2007
+Sun May 27 23:46:20 UTC 2007
 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
+c: c
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
diff --git a/testsuite/normal/pdebuild-internal-sid.log b/testsuite/normal/pdebuild-internal-sid.log
index 4535909..1af6a3d 100644
--- a/testsuite/normal/pdebuild-internal-sid.log
+++ b/testsuite/normal/pdebuild-internal-sid.log
@@ -431,7 +431,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sun May 27 11:26:21 UTC 2007
+Sun May 27 23:32:43 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -501,7 +501,7 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Sun May 27 11:26:26 UTC 2007
+Sun May 27 23:32:48 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
diff --git a/testsuite/normal/pdebuild-normal-etch.log b/testsuite/normal/pdebuild-normal-etch.log
index 9ebc08a..b8c0728 100644
--- a/testsuite/normal/pdebuild-normal-etch.log
+++ b/testsuite/normal/pdebuild-normal-etch.log
@@ -437,7 +437,7 @@ PASS: tests/param-r-invalid.sh
 1: 1
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sun May 27 11:33:53 UTC 2007
+Sun May 27 23:37:09 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -507,7 +507,7 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Sun May 27 11:33:58 UTC 2007
+Sun May 27 23:37:14 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
diff --git a/testsuite/normal/pdebuild-normal-lenny.log b/testsuite/normal/pdebuild-normal-lenny.log
index 0e2f0d0..0129d6d 100644
--- a/testsuite/normal/pdebuild-normal-lenny.log
+++ b/testsuite/normal/pdebuild-normal-lenny.log
@@ -422,9 +422,9 @@ success
 success
 success
 success
+b: dsh: Failed executing ./invalid-exec-file with llexec call
 d: dsh: Failed executing ./invalid-exec-file with llexec call
 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
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -437,7 +437,7 @@ PASS: tests/param-r-invalid.sh
 2: 2
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sun May 27 11:56:54 UTC 2007
+Sun May 27 23:45:29 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -450,6 +450,18 @@ 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
@@ -464,18 +476,6 @@ 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
@@ -507,7 +507,7 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Sun May 27 11:56:59 UTC 2007
+Sun May 27 23:45:34 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
diff --git a/testsuite/normal/pdebuild-normal-sid.log b/testsuite/normal/pdebuild-normal-sid.log
index 433b077..8a5db62 100644
--- a/testsuite/normal/pdebuild-normal-sid.log
+++ b/testsuite/normal/pdebuild-normal-sid.log
@@ -422,10 +422,10 @@ success
 success
 success
 success
-c: dsh: Failed executing ./invalid-exec-file with llexec call
-d: dsh: Failed executing ./invalid-exec-file with llexec call
 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
+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
@@ -433,11 +433,11 @@ dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
 success
 PASS: tests/param-r-invalid.sh
-1: 1
 2: 2
+1: 1
 dsh: fork limit and wait shell cannot be specified at the same time
 PASS: tests/param-F-invalid.sh
-Sun May 27 11:24:01 UTC 2007
+Sun May 27 23:31:51 UTC 2007
 2: Using sleep as the remote shell
 2: Show machine names on output
 2: Adding machine 5,4,3,2,1 to list
@@ -507,7 +507,7 @@ Adding machine 5,4,3,2,1 to list
 Setting forklimit to 3 and wait_shell to 0
 ... Waiting for process to end with waitpid
 ... Waiting for process to end with waitpid
-Sun May 27 11:24:06 UTC 2007
+Sun May 27 23:31:56 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
diff --git a/testsuite/run-test.sh b/testsuite/run-test.sh
index f2e083e..a6135d2 100755
--- a/testsuite/run-test.sh
+++ b/testsuite/run-test.sh
@@ -107,6 +107,8 @@ for DEBOOTSTRAP in debootstrap cdebootstrap; do
 	    -e "s,^Fetched .*B in .*s (.*B/s),Fetched XXXB in Xs (XXXXXB/s)," \
 	    -e "s,/var/cache/pbuilder/build//[0-9]*,/var/cache/pbuilder/build//NUM,g" \
 	    -e "s,\(/TESTDIR/dir[123]\)/[0-9]\+,\1/NUM,g" \
+	    -e "s,^Local time is now:.*,Local time is now: XXXX," \
+	    -e "s,^Universal time is now:.*,Universal time is now: XXXX," \
 	    < $A > ${A/.orig} && \
 	rm -f $A
     done