open new release

14 files changed, 200 insertions, 233 deletions

diff --git a/testsuite/normal/pbuilder-build-dsh-etch.log b/testsuite/normal/pbuilder-build-dsh-etch.log
index 002766d..5dc51e6 100644
--- a/testsuite/normal/pbuilder-build-dsh-etch.log
+++ b/testsuite/normal/pbuilder-build-dsh-etch.log
@@ -406,11 +406,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
-Wed Jun  6 03:08:18 UTC 2007
+Sun Jun 10 03:08: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
@@ -480,13 +480,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
-Wed Jun  6 03:08:23 UTC 2007
+Sun Jun 10 03:08:45 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
+b: b
+a: a
 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 f59e14c..ef8d54d 100644
--- a/testsuite/normal/pbuilder-build-dsh-lenny.log
+++ b/testsuite/normal/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
-Wed Jun  6 03:16:34 UTC 2007
+Sun Jun 10 03:16:53 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
@@ -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
-Wed Jun  6 03:16:39 UTC 2007
+Sun Jun 10 03:16:58 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
diff --git a/testsuite/normal/pbuilder-build-dsh-sid.log b/testsuite/normal/pbuilder-build-dsh-sid.log
index 4939e24..77fb8d6 100644
--- a/testsuite/normal/pbuilder-build-dsh-sid.log
+++ b/testsuite/normal/pbuilder-build-dsh-sid.log
@@ -42,7 +42,7 @@ Get:9 http://cdn.debian.or.jp sid/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:10 http://cdn.debian.or.jp sid/main libdshconfig1-dev 0.20.12-2 [25.3kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Selecting previously deselected package libmagic1.
-(Reading database ... 11066 files and directories currently installed.)
+(Reading database ... 11077 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.21-1_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.21-1_amd64.deb) ...
@@ -88,7 +88,7 @@ After unpacking 451kB of additional disk space will be used.
 Get:1 http://cdn.debian.or.jp sid/main fakeroot 1.7.1 [111kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Selecting previously deselected package fakeroot.
-(Reading database ... 11741 files and directories currently installed.)
+(Reading database ... 11752 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.7.1_amd64.deb) ...
 Setting up fakeroot (1.7.1) ...
 
@@ -396,8 +396,8 @@ 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
 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
-Wed Jun  6 03:03:15 UTC 2007
+Sun Jun 10 03:03:52 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
@@ -479,13 +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
-Wed Jun  6 03:03:20 UTC 2007
+Sun Jun 10 03:03:57 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/normal/pbuilder-create-lenny.log b/testsuite/normal/pbuilder-create-lenny.log
index d60b78b..d21d976 100644
--- a/testsuite/normal/pbuilder-create-lenny.log
+++ b/testsuite/normal/pbuilder-create-lenny.log
@@ -530,8 +530,8 @@ I: Configuring dmidecode...
 I: Configuring liblzo2-2...
 I: Configuring adduser...
 I: Configuring traceroute...
-I: Configuring manpages...
 I: Configuring ed...
+I: Configuring manpages...
 I: Configuring liblzo1...
 I: Configuring wget...
 I: Configuring groff-base...
diff --git a/testsuite/normal/pbuilder-create-sid.log b/testsuite/normal/pbuilder-create-sid.log
index 14e9913..762a056 100644
--- a/testsuite/normal/pbuilder-create-sid.log
+++ b/testsuite/normal/pbuilder-create-sid.log
@@ -139,6 +139,8 @@ I: Retrieving libncursesw5
 I: Validating libncursesw5
 I: Retrieving libnewt0.52
 I: Validating libnewt0.52
+I: Retrieving libopencdk10
+I: Validating libopencdk10
 I: Retrieving libopencdk8
 I: Validating libopencdk8
 I: Retrieving libpam-modules
@@ -483,6 +485,7 @@ I: Unpacking liblzo1...
 I: Unpacking liblzo2-2...
 I: Unpacking libncursesw5...
 I: Unpacking libnewt0.52...
+I: Unpacking libopencdk10...
 I: Unpacking libopencdk8...
 I: Unpacking libpopt0...
 I: Unpacking libreadline5...
@@ -564,6 +567,7 @@ I: Configuring openbsd-inetd...
 I: Configuring libreadline5...
 I: Configuring logrotate...
 I: Configuring libopencdk8...
+I: Configuring libopencdk10...
 I: Configuring libgnutls13...
 I: Configuring libldap2...
 I: Configuring netbase...
@@ -641,7 +645,7 @@ Get:15 http://cdn.debian.or.jp sid/main dpkg-dev 1.14.4 [178kB]
 Get:16 http://cdn.debian.or.jp sid/main build-essential 11.3 [6982B]
 Fetched XXXB in Xs (XXXXXB/s)
 Selecting previously deselected package patch.
-(Reading database ... 7173 files and directories currently installed.)
+(Reading database ... 7184 files and directories currently installed.)
 Unpacking patch (from .../patch_2.5.9-4_amd64.deb) ...
 Selecting previously deselected package perl-modules.
 Unpacking perl-modules (from .../perl-modules_5.8.8-7_all.deb) ...
diff --git a/testsuite/normal/pbuilder-update-etch-etch.log b/testsuite/normal/pbuilder-update-etch-etch.log
index 1ea6cc7..6cdd187 100644
--- a/testsuite/normal/pbuilder-update-etch-etch.log
+++ b/testsuite/normal/pbuilder-update-etch-etch.log
@@ -11,7 +11,7 @@ Refreshing the base.tgz
  -> upgrading packages
 Get:1 http://cdn.debian.or.jp lenny Release.gpg [189B]
 Get:2 http://cdn.debian.or.jp lenny Release [68.5kB]
-Get:3 http://cdn.debian.or.jp lenny/main Packages [5940kB]
+Get:3 http://cdn.debian.or.jp lenny/main Packages [5955kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
@@ -24,16 +24,17 @@ The following packages will be upgraded:
   dhcp3-common diff dmidecode dpkg dpkg-dev dselect findutils gzip info
   iputils-ping klogd laptop-detect libacl1 libattr1 libc6 libc6-dev libgcc1
   libgcrypt11 libgnutls13 libgpg-error0 libldap2 libncurses5 libncursesw5
-  libopencdk8 libreadline5 libsepol1 libslang2 libssl0.9.8 libstdc++6
-  libtasn1-3 libusb-0.1-4 make man-db manpages mktemp module-init-tools nano
-  ncurses-base ncurses-bin netcat readline-common sed sysklogd tar tasksel
-  tasksel-data tzdata vim-common vim-tiny zlib1g
-57 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
-Need to get 24.0MB of archives.
-After unpacking 4174kB of additional disk space will be used.
+  libopencdk8 libreadline5 libselinux1 libsepol1 libslang2 libssl0.9.8
+  libstdc++6 libtasn1-3 libusb-0.1-4 login make man-db manpages mktemp
+  module-init-tools nano ncurses-base ncurses-bin netcat passwd
+  readline-common sed sysklogd tar tasksel tasksel-data tzdata vim-common
+  vim-tiny zlib1g
+60 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
+Need to get 25.7MB of archives.
+After unpacking 4149kB of additional disk space will be used.
 Get:1 http://cdn.debian.or.jp lenny/main debconf-i18n 1.5.13 [151kB]
 Get:2 http://cdn.debian.or.jp lenny/main debconf 1.5.13 [148kB]
-Get:3 http://cdn.debian.or.jp lenny/main tzdata 2007f-3 [384kB]
+Get:3 http://cdn.debian.or.jp lenny/main tzdata 2007f-8 [386kB]
 Get:4 http://cdn.debian.or.jp lenny/main binutils 2.17cvs20070426-8 [2559kB]
 Get:5 http://cdn.debian.or.jp lenny/main libc6-dev 2.5-9 [2472kB]
 Get:6 http://cdn.debian.or.jp lenny/main libc6 2.5-9 [4905kB]
@@ -43,54 +44,57 @@ Get:9 http://cdn.debian.or.jp lenny/main cpio 2.7-3 [115kB]
 Get:10 http://cdn.debian.or.jp lenny/main make 3.81-3 [395kB]
 Get:11 http://cdn.debian.or.jp lenny/main dpkg-dev 1.14.4 [178kB]
 Get:12 http://cdn.debian.or.jp lenny/main dpkg 1.14.4 [2080kB]
-Get:13 http://cdn.debian.or.jp lenny/main findutils 4.2.30-1 [361kB]
+Get:13 http://cdn.debian.or.jp lenny/main findutils 4.2.31-1 [436kB]
 Get:14 http://cdn.debian.or.jp lenny/main gzip 1.3.9-2 [80.5kB]
-Get:15 http://cdn.debian.or.jp lenny/main mktemp 1.5-3 [11.0kB]
-Get:16 http://cdn.debian.or.jp lenny/main ncurses-bin 5.6-3 [235kB]
-Get:17 http://cdn.debian.or.jp lenny/main sed 4.1.5-2 [253kB]
-Get:18 http://cdn.debian.or.jp lenny/main tar 1.16.1-1 [734kB]
-Get:19 http://cdn.debian.or.jp lenny/main base-files 4.0.0 [40.9kB]
-Get:20 http://cdn.debian.or.jp lenny/main libncurses5 5.6-3 [336kB]
-Get:21 http://cdn.debian.or.jp lenny/main ncurses-base 5.6-3 [12.9kB]
-Get:22 http://cdn.debian.or.jp lenny/main libattr1 1:2.4.32-1.1 [9976B]
-Get:23 http://cdn.debian.or.jp lenny/main libacl1 2.2.42-1 [16.1kB]
-Get:24 http://cdn.debian.or.jp lenny/main gcc-4.2-base 4.2-20070528-1 [208kB]
-Get:25 http://cdn.debian.or.jp lenny/main libgcc1 1:4.2-20070528-1 [26.7kB]
-Get:26 http://cdn.debian.or.jp lenny/main libsepol1 2.0.3-1 [126kB]
-Get:27 http://cdn.debian.or.jp lenny/main libslang2 2.0.7-1 [453kB]
-Get:28 http://cdn.debian.or.jp lenny/main libstdc++6 4.2-20070528-1 [312kB]
-Get:29 http://cdn.debian.or.jp lenny/main zlib1g 1:1.2.3-15 [73.5kB]
-Get:30 http://cdn.debian.or.jp lenny/main dhcp3-client 3.0.4-14 [222kB]
-Get:31 http://cdn.debian.or.jp lenny/main dhcp3-common 3.0.4-14 [287kB]
-Get:32 http://cdn.debian.or.jp lenny/main dmidecode 2.9-1 [58.8kB]
-Get:33 http://cdn.debian.or.jp lenny/main info 4.8.dfsg.1-6 [177kB]
-Get:34 http://cdn.debian.or.jp lenny/main iputils-ping 3:20070202-1 [45.5kB]
-Get:35 http://cdn.debian.or.jp lenny/main sysklogd 1.4.1-20 [60.2kB]
-Get:36 http://cdn.debian.or.jp lenny/main klogd 1.4.1-20 [40.7kB]
-Get:37 http://cdn.debian.or.jp lenny/main laptop-detect 0.12.1-0.1 [3666B]
-Get:38 http://cdn.debian.or.jp lenny/main libgpg-error0 1.4-2 [34.8kB]
-Get:39 http://cdn.debian.or.jp lenny/main libgcrypt11 1.2.4-2 [190kB]
-Get:40 http://cdn.debian.or.jp lenny/main liblzo2-2 2.02-2 [54.7kB]
-Get:41 http://cdn.debian.or.jp lenny/main libopencdk8 0.5.13-2 [104kB]
-Get:42 http://cdn.debian.or.jp lenny/main libtasn1-3 0.3.9-1 [57.8kB]
-Get:43 http://cdn.debian.or.jp lenny/main libgnutls13 1.6.3-1 [354kB]
-Get:44 http://cdn.debian.or.jp lenny/main libldap2 2.1.30-13.4 [162kB]
-Get:45 http://cdn.debian.or.jp lenny/main libncursesw5 5.6-3 [358kB]
-Get:46 http://cdn.debian.or.jp lenny/main readline-common 5.2-3 [50.8kB]
-Get:47 http://cdn.debian.or.jp lenny/main libreadline5 5.2-3 [144kB]
-Get:48 http://cdn.debian.or.jp lenny/main libssl0.9.8 0.9.8e-5 [909kB]
-Get:49 http://cdn.debian.or.jp lenny/main libusb-0.1-4 2:0.1.12-7 [20.4kB]
-Get:50 http://cdn.debian.or.jp lenny/main man-db 2.4.4-3 [765kB]
-Get:51 http://cdn.debian.or.jp lenny/main manpages 2.49-1 [495kB]
-Get:52 http://cdn.debian.or.jp lenny/main module-init-tools 3.3-pre11-1 [85.3kB]
-Get:53 http://cdn.debian.or.jp lenny/main nano 2.0.3-1 [570kB]
-Get:54 http://cdn.debian.or.jp lenny/main netcat 1.10-33 [68.3kB]
-Get:55 http://cdn.debian.or.jp lenny/main tasksel 2.67 [76.7kB]
-Get:56 http://cdn.debian.or.jp lenny/main tasksel-data 2.67 [345kB]
-Get:57 http://cdn.debian.or.jp lenny/main vim-tiny 1:7.0-219+1 [617kB]
-Get:58 http://cdn.debian.or.jp lenny/main vim-common 1:7.0-219+1 [185kB]
-Get:59 http://cdn.debian.or.jp lenny/main dselect 1.14.4 [500kB]
-
Extracting templates from packages: 50%
Extracting templates from packages: 100%
+Get:15 http://cdn.debian.or.jp lenny/main login 1:4.0.18.1-9 [798kB]
+Get:16 http://cdn.debian.or.jp lenny/main mktemp 1.5-3 [11.0kB]
+Get:17 http://cdn.debian.or.jp lenny/main ncurses-bin 5.6-3 [235kB]
+Get:18 http://cdn.debian.or.jp lenny/main sed 4.1.5-2 [253kB]
+Get:19 http://cdn.debian.or.jp lenny/main tar 1.16.1-1 [734kB]
+Get:20 http://cdn.debian.or.jp lenny/main base-files 4.0.0 [40.9kB]
+Get:21 http://cdn.debian.or.jp lenny/main libncurses5 5.6-3 [336kB]
+Get:22 http://cdn.debian.or.jp lenny/main ncurses-base 5.6-3 [12.9kB]
+Get:23 http://cdn.debian.or.jp lenny/main libattr1 1:2.4.32-1.1 [9976B]
+Get:24 http://cdn.debian.or.jp lenny/main libacl1 2.2.42-1 [16.1kB]
+Get:25 http://cdn.debian.or.jp lenny/main gcc-4.2-base 4.2-20070528-1 [208kB]
+Get:26 http://cdn.debian.or.jp lenny/main libgcc1 1:4.2-20070528-1 [26.7kB]
+Get:27 http://cdn.debian.or.jp lenny/main libsepol1 2.0.3-1 [126kB]
+Get:28 http://cdn.debian.or.jp lenny/main libselinux1 2.0.15-2 [66.6kB]
+Get:29 http://cdn.debian.or.jp lenny/main libslang2 2.0.7-1 [453kB]
+Get:30 http://cdn.debian.or.jp lenny/main libstdc++6 4.2-20070528-1 [312kB]
+Get:31 http://cdn.debian.or.jp lenny/main zlib1g 1:1.2.3-15 [73.5kB]
+Get:32 http://cdn.debian.or.jp lenny/main dhcp3-client 3.0.4-14 [222kB]
+Get:33 http://cdn.debian.or.jp lenny/main dhcp3-common 3.0.4-14 [287kB]
+Get:34 http://cdn.debian.or.jp lenny/main dmidecode 2.9-1 [58.8kB]
+Get:35 http://cdn.debian.or.jp lenny/main info 4.8.dfsg.1-6 [177kB]
+Get:36 http://cdn.debian.or.jp lenny/main iputils-ping 3:20070202-1 [45.5kB]
+Get:37 http://cdn.debian.or.jp lenny/main sysklogd 1.4.1-20 [60.2kB]
+Get:38 http://cdn.debian.or.jp lenny/main klogd 1.4.1-20 [40.7kB]
+Get:39 http://cdn.debian.or.jp lenny/main laptop-detect 0.12.1-0.1 [3666B]
+Get:40 http://cdn.debian.or.jp lenny/main libgpg-error0 1.4-2 [34.8kB]
+Get:41 http://cdn.debian.or.jp lenny/main libgcrypt11 1.2.4-2 [190kB]
+Get:42 http://cdn.debian.or.jp lenny/main liblzo2-2 2.02-2 [54.7kB]
+Get:43 http://cdn.debian.or.jp lenny/main libopencdk8 0.5.13-2 [104kB]
+Get:44 http://cdn.debian.or.jp lenny/main libtasn1-3 0.3.9-1 [57.8kB]
+Get:45 http://cdn.debian.or.jp lenny/main libgnutls13 1.6.3-1 [354kB]
+Get:46 http://cdn.debian.or.jp lenny/main libldap2 2.1.30-13.4 [162kB]
+Get:47 http://cdn.debian.or.jp lenny/main libncursesw5 5.6-3 [358kB]
+Get:48 http://cdn.debian.or.jp lenny/main readline-common 5.2-3 [50.8kB]
+Get:49 http://cdn.debian.or.jp lenny/main libreadline5 5.2-3 [144kB]
+Get:50 http://cdn.debian.or.jp lenny/main libssl0.9.8 0.9.8e-5 [909kB]
+Get:51 http://cdn.debian.or.jp lenny/main libusb-0.1-4 2:0.1.12-7 [20.4kB]
+Get:52 http://cdn.debian.or.jp lenny/main man-db 2.4.4-3 [765kB]
+Get:53 http://cdn.debian.or.jp lenny/main manpages 2.49-1 [495kB]
+Get:54 http://cdn.debian.or.jp lenny/main module-init-tools 3.3-pre11-1 [85.3kB]
+Get:55 http://cdn.debian.or.jp lenny/main nano 2.0.3-1 [570kB]
+Get:56 http://cdn.debian.or.jp lenny/main netcat 1.10-33 [68.3kB]
+Get:57 http://cdn.debian.or.jp lenny/main tasksel 2.67 [76.7kB]
+Get:58 http://cdn.debian.or.jp lenny/main tasksel-data 2.67 [345kB]
+Get:59 http://cdn.debian.or.jp lenny/main vim-tiny 1:7.0-219+1 [617kB]
+Get:60 http://cdn.debian.or.jp lenny/main vim-common 1:7.0-219+1 [185kB]
+Get:61 http://cdn.debian.or.jp lenny/main dselect 1.14.4 [500kB]
+Get:62 http://cdn.debian.or.jp lenny/main passwd 1:4.0.18.1-9 [788kB]
+
Extracting templates from packages: 48%
Extracting templates from packages: 96%
Extracting templates from packages: 100%
 Preconfiguring packages ...
 Fetched XXXB in Xs (XXXXXB/s)
 (Reading database ... 12033 files and directories currently installed.)
@@ -98,12 +102,12 @@ Preparing to replace debconf-i18n 1.5.11 (using .../debconf-i18n_1.5.13_all.deb)
 Unpacking replacement debconf-i18n ...
 Preparing to replace debconf 1.5.11 (using .../debconf_1.5.13_all.deb) ...
 Unpacking replacement debconf ...
-Preparing to replace tzdata 2007b-1 (using .../tzdata_2007f-3_all.deb) ...
+Preparing to replace tzdata 2007b-1 (using .../tzdata_2007f-8_all.deb) ...
 Unpacking replacement tzdata ...
 Setting up debconf-i18n (1.5.13) ...
 Setting up debconf (1.5.13) ...
 
-Setting up tzdata (2007f-3) ...
+Setting up tzdata (2007f-8) ...
 
 User defined timezone, leaving /etc/localtime unchanged.
 Local time is now: XXXX
@@ -142,9 +146,9 @@ Unpacking replacement dpkg ...
 Setting up dpkg (1.14.4) ...
 
 (Reading database ... 12091 files and directories currently installed.)
-Preparing to replace findutils 4.2.28-1 (using .../findutils_4.2.30-1_amd64.deb) ...
+Preparing to replace findutils 4.2.28-1 (using .../findutils_4.2.31-1_amd64.deb) ...
 Unpacking replacement findutils ...
-Setting up findutils (4.2.30-1) ...
+Setting up findutils (4.2.31-1) ...
 
 (Reading database ... 12091 files and directories currently installed.)
 Preparing to replace gzip 1.3.5-15 (using .../gzip_1.3.9-2_amd64.deb) ...
@@ -152,6 +156,12 @@ Unpacking replacement gzip ...
 Setting up gzip (1.3.9-2) ...
 
 (Reading database ... 12091 files and directories currently installed.)
+Preparing to replace login 1:4.0.18.1-7 (using .../login_1%3a4.0.18.1-9_amd64.deb) ...
+Unpacking replacement login ...
+Setting up login (1:4.0.18.1-9) ...
+Installing new version of config file /etc/login.defs ...
+
+(Reading database ... 12091 files and directories currently installed.)
 Preparing to replace mktemp 1.5-2 (using .../mktemp_1.5-3_amd64.deb) ...
 Unpacking replacement mktemp ...
 Setting up mktemp (1.5-3) ...
@@ -211,6 +221,12 @@ Setting up libsepol1 (2.0.3-1) ...
 telinit: timeout opening/writing control channel /dev/initctl
 
 (Reading database ... 12101 files and directories currently installed.)
+Preparing to replace libselinux1 1.32-3 (using .../libselinux1_2.0.15-2_amd64.deb) ...
+Unpacking replacement libselinux1 ...
+Setting up libselinux1 (2.0.15-2) ...
+init: timeout opening/writing control channel /dev/initctl
+
+(Reading database ... 12101 files and directories currently installed.)
 Preparing to replace libslang2 2.0.6-4 (using .../libslang2_2.0.7-1_amd64.deb) ...
 Unpacking replacement libslang2 ...
 Setting up libslang2 (2.0.7-1) ...
@@ -286,6 +302,8 @@ Preparing to replace vim-common 1:7.0-122+1etch2 (using .../vim-common_1%3a7.0-2
 Unpacking replacement vim-common ...
 Preparing to replace dselect 1.13.25 (using .../dselect_1.14.4_amd64.deb) ...
 Unpacking replacement dselect ...
+Preparing to replace passwd 1:4.0.18.1-7 (using .../passwd_1%3a4.0.18.1-9_amd64.deb) ...
+Unpacking replacement passwd ...
 Setting up binutils (2.17cvs20070426-8) ...
 
 Setting up libc6-dev (2.5-9) ...
@@ -338,6 +356,9 @@ Setting up vim-common (1:7.0-219+1) ...
 Setting up vim-tiny (1:7.0-219+1) ...
 
 Setting up dselect (1.14.4) ...
+Setting up passwd (1:4.0.18.1-9) ...
+Installing new version of config file /etc/default/useradd ...
+
 Setting up klogd (1.4.1-20) ...
 Installing new version of config file /etc/init.d/klogd ...
 
diff --git a/testsuite/normal/pbuilder-update-etch-sid.log b/testsuite/normal/pbuilder-update-etch-sid.log
index 2d373d2..419aa27 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 [6252kB]
+Get:3 http://cdn.debian.or.jp sid/main Packages [6255kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
@@ -22,13 +22,13 @@ The following packages will be REMOVED:
 The following NEW packages will be installed:
   libdevmapper1.02.1
 The following packages will be upgraded:
-  cpp cpp-4.1 debian-archive-keyring debianutils e2fslibs e2fsprogs findutils
-  g++ g++-4.1 gcc gcc-4.1 gcc-4.1-base laptop-detect libblkid1 libbz2-1.0
-  libc6 libc6-dev libcomerr2 libsasl2-2 libselinux1 libss2 libstdc++6-4.1-dev
-  libuuid1 login nano passwd tzdata vim-common vim-tiny
-29 upgraded, 1 newly installed, 2 to remove and 0 not upgraded.
-Need to get 19.5MB of archives.
-After unpacking 2277kB disk space will be freed.
+  cpio cpp cpp-4.1 debian-archive-keyring debianutils e2fslibs e2fsprogs g++
+  g++-4.1 gcc gcc-4.1 gcc-4.1-base laptop-detect libblkid1 libbz2-1.0 libc6
+  libc6-dev libcomerr2 libsasl2-2 libss2 libstdc++6-4.1-dev libuuid1 manpages
+  nano vim-common vim-tiny
+26 upgraded, 1 newly installed, 2 to remove and 0 not upgraded.
+Need to get 17.6MB of archives.
+After unpacking 2245kB disk space will be freed.
 Get:1 http://cdn.debian.or.jp sid/main libc6-dev 2.5-10 [2473kB]
 Get:2 http://cdn.debian.or.jp sid/main libc6 2.5-10 [4890kB]
 Get:3 http://cdn.debian.or.jp sid/main libstdc++6-4.1-dev 4.1.2-12 [1155kB]
@@ -39,27 +39,23 @@ Get:7 http://cdn.debian.or.jp sid/main gcc-4.1-base 4.1.2-12 [202kB]
 Get:8 http://cdn.debian.or.jp sid/main debianutils 2.20.1 [52.9kB]
 Get:9 http://cdn.debian.or.jp sid/main e2fslibs 1.39+1.40-WIP-2007.04.07+dfsg-2 [111kB]
 Get:10 http://cdn.debian.or.jp sid/main e2fsprogs 1.39+1.40-WIP-2007.04.07+dfsg-2 [612kB]
-Get:11 http://cdn.debian.or.jp sid/main findutils 4.2.31-1 [436kB]
-Get:12 http://cdn.debian.or.jp sid/main login 1:4.0.18.1-9 [798kB]
-Get:13 http://cdn.debian.or.jp sid/main debian-archive-keyring 2007.02.19-0.1 [8088B]
-Get:14 http://cdn.debian.or.jp sid/main libselinux1 2.0.15-2 [66.6kB]
-Get:15 http://cdn.debian.or.jp sid/main libdevmapper1.02.1 2:1.02.18-1 [47.4kB]
-Get:16 http://cdn.debian.or.jp sid/main libblkid1 1.39+1.40-WIP-2007.04.07+dfsg-2 [45.2kB]
-Get:17 http://cdn.debian.or.jp sid/main libcomerr2 1.39+1.40-WIP-2007.04.07+dfsg-2 [33.1kB]
-Get:18 http://cdn.debian.or.jp sid/main libss2 1.39+1.40-WIP-2007.04.07+dfsg-2 [39.0kB]
-Get:19 http://cdn.debian.or.jp sid/main libuuid1 1.39+1.40-WIP-2007.04.07+dfsg-2 [34.0kB]
-Get:20 http://cdn.debian.or.jp sid/main tzdata 2007f-8 [386kB]
-Get:21 http://cdn.debian.or.jp sid/main laptop-detect 0.13.1 [4574B]
-Get:22 http://cdn.debian.or.jp sid/main libbz2-1.0 1.0.3-7 [41.6kB]
-Get:23 http://cdn.debian.or.jp sid/main libsasl2-2 2.1.22.dfsg1-10 [107kB]
-Get:24 http://cdn.debian.or.jp sid/main nano 2.0.6-2 [572kB]
-Get:25 http://cdn.debian.or.jp sid/main vim-tiny 1:7.1-000+1 [618kB]
-Get:26 http://cdn.debian.or.jp sid/main vim-common 1:7.1-000+1 [179kB]
-Get:27 http://cdn.debian.or.jp sid/main passwd 1:4.0.18.1-9 [788kB]
-Get:28 http://cdn.debian.or.jp sid/main cpp 4:4.1.2-2 [11.9kB]
-Get:29 http://cdn.debian.or.jp sid/main gcc 4:4.1.2-2 [5056B]
-Get:30 http://cdn.debian.or.jp sid/main g++ 4:4.1.2-2 [1374B]
-Preconfiguring packages ...
+Get:11 http://cdn.debian.or.jp sid/main debian-archive-keyring 2007.02.19-0.1 [8088B]
+Get:12 http://cdn.debian.or.jp sid/main libdevmapper1.02.1 2:1.02.18-1 [47.4kB]
+Get:13 http://cdn.debian.or.jp sid/main libblkid1 1.39+1.40-WIP-2007.04.07+dfsg-2 [45.2kB]
+Get:14 http://cdn.debian.or.jp sid/main libcomerr2 1.39+1.40-WIP-2007.04.07+dfsg-2 [33.1kB]
+Get:15 http://cdn.debian.or.jp sid/main libss2 1.39+1.40-WIP-2007.04.07+dfsg-2 [39.0kB]
+Get:16 http://cdn.debian.or.jp sid/main libuuid1 1.39+1.40-WIP-2007.04.07+dfsg-2 [34.0kB]
+Get:17 http://cdn.debian.or.jp sid/main cpio 2.7-4 [115kB]
+Get:18 http://cdn.debian.or.jp sid/main laptop-detect 0.13.1 [4574B]
+Get:19 http://cdn.debian.or.jp sid/main libbz2-1.0 1.0.3-7 [41.6kB]
+Get:20 http://cdn.debian.or.jp sid/main libsasl2-2 2.1.22.dfsg1-12 [108kB]
+Get:21 http://cdn.debian.or.jp sid/main manpages 2.51-1 [499kB]
+Get:22 http://cdn.debian.or.jp sid/main nano 2.0.6-2 [572kB]
+Get:23 http://cdn.debian.or.jp sid/main vim-tiny 1:7.1-000+1 [618kB]
+Get:24 http://cdn.debian.or.jp sid/main vim-common 1:7.1-000+1 [179kB]
+Get:25 http://cdn.debian.or.jp sid/main cpp 4:4.1.2-2 [11.9kB]
+Get:26 http://cdn.debian.or.jp sid/main gcc 4:4.1.2-2 [5056B]
+Get:27 http://cdn.debian.or.jp sid/main g++ 4:4.1.2-2 [1374B]
 Fetched XXXB in Xs (XXXXXB/s)
 (Reading database ... 12123 files and directories currently installed.)
 Removing libsasl2 ...
@@ -99,17 +95,6 @@ Preparing to replace e2fsprogs 1.39+1.40-WIP-2006.11.14+dfsg-2 (using .../e2fspr
 Unpacking replacement e2fsprogs ...
 Setting up e2fsprogs (1.39+1.40-WIP-2007.04.07+dfsg-2) ...
 (Reading database ... 12115 files and directories currently installed.)
-Preparing to replace findutils 4.2.30-1 (using .../findutils_4.2.31-1_amd64.deb) ...
-Unpacking replacement findutils ...
-Setting up findutils (4.2.31-1) ...
-
-(Reading database ... 12115 files and directories currently installed.)
-Preparing to replace login 1:4.0.18.1-7 (using .../login_1%3a4.0.18.1-9_amd64.deb) ...
-Unpacking replacement login ...
-Setting up login (1:4.0.18.1-9) ...
-Installing new version of config file /etc/login.defs ...
-
-(Reading database ... 12115 files and directories currently installed.)
 Preparing to replace debian-archive-keyring 2007.02.19 (using .../debian-archive-keyring_2007.02.19-0.1_all.deb) ...
 Unpacking replacement debian-archive-keyring ...
 Setting up debian-archive-keyring (2007.02.19-0.1) ...
@@ -119,12 +104,6 @@ gpg: key ADB11277: "Etch Stable Release Key <debian-release@lists.debian.org>" n
 gpg: Total number processed: 3
 gpg:              unchanged: 3
 
-(Reading database ... 12115 files and directories currently installed.)
-Preparing to replace libselinux1 1.32-3 (using .../libselinux1_2.0.15-2_amd64.deb) ...
-Unpacking replacement libselinux1 ...
-Setting up libselinux1 (2.0.15-2) ...
-init: timeout opening/writing control channel /dev/initctl
-
 Selecting previously deselected package libdevmapper1.02.1.
 (Reading database ... 12115 files and directories currently installed.)
 Unpacking libdevmapper1.02.1 (from .../libdevmapper1.02.1_2%3a1.02.18-1_amd64.deb) ...
@@ -150,31 +129,22 @@ Unpacking replacement libuuid1 ...
 Setting up libuuid1 (1.39+1.40-WIP-2007.04.07+dfsg-2) ...
 
 (Reading database ... 12121 files and directories currently installed.)
-Preparing to replace tzdata 2007f-3 (using .../tzdata_2007f-8_all.deb) ...
-Unpacking replacement tzdata ...
-Setting up tzdata (2007f-8) ...
-
-User defined timezone, leaving /etc/localtime unchanged.
-Local time is now: XXXX
-Universal Time is now: XXXX
-Run 'dpkg-reconfigure tzdata' if you wish to change it.
-
-
-(Reading database ... 12121 files and directories currently installed.)
+Preparing to replace cpio 2.7-3 (using .../archives/cpio_2.7-4_amd64.deb) ...
+Unpacking replacement cpio ...
 Preparing to replace laptop-detect 0.12.1-0.1 (using .../laptop-detect_0.13.1_amd64.deb) ...
 Unpacking replacement laptop-detect ...
 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 ...
-Preparing to replace libsasl2-2 2.1.22.dfsg1-8 (using .../libsasl2-2_2.1.22.dfsg1-10_amd64.deb) ...
+Preparing to replace libsasl2-2 2.1.22.dfsg1-8 (using .../libsasl2-2_2.1.22.dfsg1-12_amd64.deb) ...
 Unpacking replacement libsasl2-2 ...
+Preparing to replace manpages 2.49-1 (using .../manpages_2.51-1_all.deb) ...
+Unpacking replacement manpages ...
 Preparing to replace nano 2.0.3-1 (using .../nano_2.0.6-2_amd64.deb) ...
 Unpacking replacement nano ...
 Preparing to replace vim-tiny 1:7.0-219+1 (using .../vim-tiny_1%3a7.1-000+1_amd64.deb) ...
 Unpacking replacement vim-tiny ...
 Preparing to replace vim-common 1:7.0-219+1 (using .../vim-common_1%3a7.1-000+1_amd64.deb) ...
 Unpacking replacement vim-common ...
-Preparing to replace passwd 1:4.0.18.1-7 (using .../passwd_1%3a4.0.18.1-9_amd64.deb) ...
-Unpacking replacement passwd ...
 Preparing to replace cpp 4:4.1.1-15 (using .../cpp_4%3a4.1.2-2_amd64.deb) ...
 Unpacking replacement cpp ...
 Preparing to replace gcc 4:4.1.1-15 (using .../gcc_4%3a4.1.2-2_amd64.deb) ...
@@ -187,20 +157,20 @@ Setting up gcc-4.1-base (4.1.2-12) ...
 
 Setting up cpp-4.1 (4.1.2-12) ...
 Setting up gcc-4.1 (4.1.2-12) ...
+Setting up cpio (2.7-4) ...
+
 Setting up laptop-detect (0.13.1) ...
 Setting up libbz2-1.0 (1.0.3-7) ...
 
-Setting up libsasl2-2 (2.1.22.dfsg1-10) ...
+Setting up libsasl2-2 (2.1.22.dfsg1-12) ...
 
+Setting up manpages (2.51-1) ...
 Setting up nano (2.0.6-2) ...
 
 Setting up vim-common (1:7.1-000+1) ...
 
 Setting up vim-tiny (1:7.1-000+1) ...
 
-Setting up passwd (1:4.0.18.1-9) ...
-Installing new version of config file /etc/default/useradd ...
-
 Setting up cpp (4:4.1.2-2) ...
 
 Setting up gcc (4:4.1.2-2) ...
diff --git a/testsuite/normal/pbuilder-update-lenny-sid.log b/testsuite/normal/pbuilder-update-lenny-sid.log
index e4a3ae1..f77409e 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 [6252kB]
+Get:3 http://cdn.debian.or.jp sid/main Packages [6255kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
@@ -22,13 +22,13 @@ The following packages will be REMOVED:
 The following NEW packages will be installed:
   libdevmapper1.02.1
 The following packages will be upgraded:
-  cpp cpp-4.1 debian-archive-keyring debianutils e2fslibs e2fsprogs findutils
-  g++ g++-4.1 gcc gcc-4.1 gcc-4.1-base laptop-detect libblkid1 libbz2-1.0
-  libc6 libc6-dev libcomerr2 libsasl2-2 libselinux1 libss2 libstdc++6-4.1-dev
-  libuuid1 login nano passwd tzdata vim-common vim-tiny
-29 upgraded, 1 newly installed, 2 to remove and 0 not upgraded.
-Need to get 19.5MB of archives.
-After unpacking 2277kB disk space will be freed.
+  cpio cpp cpp-4.1 debian-archive-keyring debianutils e2fslibs e2fsprogs g++
+  g++-4.1 gcc gcc-4.1 gcc-4.1-base laptop-detect libblkid1 libbz2-1.0 libc6
+  libc6-dev libcomerr2 libsasl2-2 libss2 libstdc++6-4.1-dev libuuid1 manpages
+  nano vim-common vim-tiny
+26 upgraded, 1 newly installed, 2 to remove and 0 not upgraded.
+Need to get 17.6MB of archives.
+After unpacking 2245kB disk space will be freed.
 Get:1 http://cdn.debian.or.jp sid/main libc6-dev 2.5-10 [2473kB]
 Get:2 http://cdn.debian.or.jp sid/main libc6 2.5-10 [4890kB]
 Get:3 http://cdn.debian.or.jp sid/main libstdc++6-4.1-dev 4.1.2-12 [1155kB]
@@ -39,27 +39,23 @@ Get:7 http://cdn.debian.or.jp sid/main gcc-4.1-base 4.1.2-12 [202kB]
 Get:8 http://cdn.debian.or.jp sid/main debianutils 2.20.1 [52.9kB]
 Get:9 http://cdn.debian.or.jp sid/main e2fslibs 1.39+1.40-WIP-2007.04.07+dfsg-2 [111kB]
 Get:10 http://cdn.debian.or.jp sid/main e2fsprogs 1.39+1.40-WIP-2007.04.07+dfsg-2 [612kB]
-Get:11 http://cdn.debian.or.jp sid/main findutils 4.2.31-1 [436kB]
-Get:12 http://cdn.debian.or.jp sid/main login 1:4.0.18.1-9 [798kB]
-Get:13 http://cdn.debian.or.jp sid/main debian-archive-keyring 2007.02.19-0.1 [8088B]
-Get:14 http://cdn.debian.or.jp sid/main libselinux1 2.0.15-2 [66.6kB]
-Get:15 http://cdn.debian.or.jp sid/main libdevmapper1.02.1 2:1.02.18-1 [47.4kB]
-Get:16 http://cdn.debian.or.jp sid/main libblkid1 1.39+1.40-WIP-2007.04.07+dfsg-2 [45.2kB]
-Get:17 http://cdn.debian.or.jp sid/main libcomerr2 1.39+1.40-WIP-2007.04.07+dfsg-2 [33.1kB]
-Get:18 http://cdn.debian.or.jp sid/main libss2 1.39+1.40-WIP-2007.04.07+dfsg-2 [39.0kB]
-Get:19 http://cdn.debian.or.jp sid/main libuuid1 1.39+1.40-WIP-2007.04.07+dfsg-2 [34.0kB]
-Get:20 http://cdn.debian.or.jp sid/main tzdata 2007f-8 [386kB]
-Get:21 http://cdn.debian.or.jp sid/main laptop-detect 0.13.1 [4574B]
-Get:22 http://cdn.debian.or.jp sid/main libbz2-1.0 1.0.3-7 [41.6kB]
-Get:23 http://cdn.debian.or.jp sid/main libsasl2-2 2.1.22.dfsg1-10 [107kB]
-Get:24 http://cdn.debian.or.jp sid/main nano 2.0.6-2 [572kB]
-Get:25 http://cdn.debian.or.jp sid/main vim-tiny 1:7.1-000+1 [618kB]
-Get:26 http://cdn.debian.or.jp sid/main vim-common 1:7.1-000+1 [179kB]
-Get:27 http://cdn.debian.or.jp sid/main passwd 1:4.0.18.1-9 [788kB]
-Get:28 http://cdn.debian.or.jp sid/main cpp 4:4.1.2-2 [11.9kB]
-Get:29 http://cdn.debian.or.jp sid/main gcc 4:4.1.2-2 [5056B]
-Get:30 http://cdn.debian.or.jp sid/main g++ 4:4.1.2-2 [1374B]
-Preconfiguring packages ...
+Get:11 http://cdn.debian.or.jp sid/main debian-archive-keyring 2007.02.19-0.1 [8088B]
+Get:12 http://cdn.debian.or.jp sid/main libdevmapper1.02.1 2:1.02.18-1 [47.4kB]
+Get:13 http://cdn.debian.or.jp sid/main libblkid1 1.39+1.40-WIP-2007.04.07+dfsg-2 [45.2kB]
+Get:14 http://cdn.debian.or.jp sid/main libcomerr2 1.39+1.40-WIP-2007.04.07+dfsg-2 [33.1kB]
+Get:15 http://cdn.debian.or.jp sid/main libss2 1.39+1.40-WIP-2007.04.07+dfsg-2 [39.0kB]
+Get:16 http://cdn.debian.or.jp sid/main libuuid1 1.39+1.40-WIP-2007.04.07+dfsg-2 [34.0kB]
+Get:17 http://cdn.debian.or.jp sid/main cpio 2.7-4 [115kB]
+Get:18 http://cdn.debian.or.jp sid/main laptop-detect 0.13.1 [4574B]
+Get:19 http://cdn.debian.or.jp sid/main libbz2-1.0 1.0.3-7 [41.6kB]
+Get:20 http://cdn.debian.or.jp sid/main libsasl2-2 2.1.22.dfsg1-12 [108kB]
+Get:21 http://cdn.debian.or.jp sid/main manpages 2.51-1 [499kB]
+Get:22 http://cdn.debian.or.jp sid/main nano 2.0.6-2 [572kB]
+Get:23 http://cdn.debian.or.jp sid/main vim-tiny 1:7.1-000+1 [618kB]
+Get:24 http://cdn.debian.or.jp sid/main vim-common 1:7.1-000+1 [179kB]
+Get:25 http://cdn.debian.or.jp sid/main cpp 4:4.1.2-2 [11.9kB]
+Get:26 http://cdn.debian.or.jp sid/main gcc 4:4.1.2-2 [5056B]
+Get:27 http://cdn.debian.or.jp sid/main g++ 4:4.1.2-2 [1374B]
 Fetched XXXB in Xs (XXXXXB/s)
 (Reading database ... 12122 files and directories currently installed.)
 Removing libsasl2 ...
@@ -99,17 +95,6 @@ Preparing to replace e2fsprogs 1.39+1.40-WIP-2006.11.14+dfsg-2 (using .../e2fspr
 Unpacking replacement e2fsprogs ...
 Setting up e2fsprogs (1.39+1.40-WIP-2007.04.07+dfsg-2) ...
 (Reading database ... 12114 files and directories currently installed.)
-Preparing to replace findutils 4.2.30-1 (using .../findutils_4.2.31-1_amd64.deb) ...
-Unpacking replacement findutils ...
-Setting up findutils (4.2.31-1) ...
-
-(Reading database ... 12114 files and directories currently installed.)
-Preparing to replace login 1:4.0.18.1-7 (using .../login_1%3a4.0.18.1-9_amd64.deb) ...
-Unpacking replacement login ...
-Setting up login (1:4.0.18.1-9) ...
-Installing new version of config file /etc/login.defs ...
-
-(Reading database ... 12114 files and directories currently installed.)
 Preparing to replace debian-archive-keyring 2007.02.19 (using .../debian-archive-keyring_2007.02.19-0.1_all.deb) ...
 Unpacking replacement debian-archive-keyring ...
 Setting up debian-archive-keyring (2007.02.19-0.1) ...
@@ -119,12 +104,6 @@ gpg: key ADB11277: "Etch Stable Release Key <debian-release@lists.debian.org>" n
 gpg: Total number processed: 3
 gpg:              unchanged: 3
 
-(Reading database ... 12114 files and directories currently installed.)
-Preparing to replace libselinux1 1.32-3 (using .../libselinux1_2.0.15-2_amd64.deb) ...
-Unpacking replacement libselinux1 ...
-Setting up libselinux1 (2.0.15-2) ...
-init: timeout opening/writing control channel /dev/initctl
-
 Selecting previously deselected package libdevmapper1.02.1.
 (Reading database ... 12114 files and directories currently installed.)
 Unpacking libdevmapper1.02.1 (from .../libdevmapper1.02.1_2%3a1.02.18-1_amd64.deb) ...
@@ -150,31 +129,22 @@ Unpacking replacement libuuid1 ...
 Setting up libuuid1 (1.39+1.40-WIP-2007.04.07+dfsg-2) ...
 
 (Reading database ... 12120 files and directories currently installed.)
-Preparing to replace tzdata 2007f-3 (using .../tzdata_2007f-8_all.deb) ...
-Unpacking replacement tzdata ...
-Setting up tzdata (2007f-8) ...
-
-Current default timezone: 'Etc/UTC'
-Local time is now: XXXX
-Universal Time is now: XXXX
-Run 'dpkg-reconfigure tzdata' if you wish to change it.
-
-
-(Reading database ... 12120 files and directories currently installed.)
+Preparing to replace cpio 2.7-3 (using .../archives/cpio_2.7-4_amd64.deb) ...
+Unpacking replacement cpio ...
 Preparing to replace laptop-detect 0.12.1-0.1 (using .../laptop-detect_0.13.1_amd64.deb) ...
 Unpacking replacement laptop-detect ...
 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 ...
-Preparing to replace libsasl2-2 2.1.22.dfsg1-8 (using .../libsasl2-2_2.1.22.dfsg1-10_amd64.deb) ...
+Preparing to replace libsasl2-2 2.1.22.dfsg1-8 (using .../libsasl2-2_2.1.22.dfsg1-12_amd64.deb) ...
 Unpacking replacement libsasl2-2 ...
+Preparing to replace manpages 2.49-1 (using .../manpages_2.51-1_all.deb) ...
+Unpacking replacement manpages ...
 Preparing to replace nano 2.0.3-1 (using .../nano_2.0.6-2_amd64.deb) ...
 Unpacking replacement nano ...
 Preparing to replace vim-tiny 1:7.0-219+1 (using .../vim-tiny_1%3a7.1-000+1_amd64.deb) ...
 Unpacking replacement vim-tiny ...
 Preparing to replace vim-common 1:7.0-219+1 (using .../vim-common_1%3a7.1-000+1_amd64.deb) ...
 Unpacking replacement vim-common ...
-Preparing to replace passwd 1:4.0.18.1-7 (using .../passwd_1%3a4.0.18.1-9_amd64.deb) ...
-Unpacking replacement passwd ...
 Preparing to replace cpp 4:4.1.1-15 (using .../cpp_4%3a4.1.2-2_amd64.deb) ...
 Unpacking replacement cpp ...
 Preparing to replace gcc 4:4.1.1-15 (using .../gcc_4%3a4.1.2-2_amd64.deb) ...
@@ -187,20 +157,20 @@ Setting up gcc-4.1-base (4.1.2-12) ...
 
 Setting up cpp-4.1 (4.1.2-12) ...
 Setting up gcc-4.1 (4.1.2-12) ...
+Setting up cpio (2.7-4) ...
+
 Setting up laptop-detect (0.13.1) ...
 Setting up libbz2-1.0 (1.0.3-7) ...
 
-Setting up libsasl2-2 (2.1.22.dfsg1-10) ...
+Setting up libsasl2-2 (2.1.22.dfsg1-12) ...
 
+Setting up manpages (2.51-1) ...
 Setting up nano (2.0.6-2) ...
 
 Setting up vim-common (1:7.1-000+1) ...
 
 Setting up vim-tiny (1:7.1-000+1) ...
 
-Setting up passwd (1:4.0.18.1-9) ...
-Installing new version of config file /etc/default/useradd ...
-
 Setting up cpp (4:4.1.2-2) ...
 
 Setting up gcc (4:4.1.2-2) ...
diff --git a/testsuite/normal/pdebuild-internal-etch.log b/testsuite/normal/pdebuild-internal-etch.log
index 4596545..d943c10 100644
--- a/testsuite/normal/pdebuild-internal-etch.log
+++ b/testsuite/normal/pdebuild-internal-etch.log
@@ -427,11 +427,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
-Wed Jun  6 03:10:10 UTC 2007
+Sun Jun 10 03:10:28 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
-Wed Jun  6 03:10:15 UTC 2007
+Sun Jun 10 03:10:33 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-internal-lenny.log b/testsuite/normal/pdebuild-internal-lenny.log
index 62aa6e8..37032fc 100644
--- a/testsuite/normal/pdebuild-internal-lenny.log
+++ b/testsuite/normal/pdebuild-internal-lenny.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
-Wed Jun  6 03:18:21 UTC 2007
+Sun Jun 10 03:18:39 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
-Wed Jun  6 03:18:26 UTC 2007
+Sun Jun 10 03:18:44 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/normal/pdebuild-internal-sid.log b/testsuite/normal/pdebuild-internal-sid.log
index b3dcd67..f54784d 100644
--- a/testsuite/normal/pdebuild-internal-sid.log
+++ b/testsuite/normal/pdebuild-internal-sid.log
@@ -27,7 +27,7 @@ Get:3 http://cdn.debian.or.jp sid/main cdebootstrap 0.4.3 [29.0kB]
 Get:4 http://cdn.debian.or.jp sid/main pbuilder 0.169 [163kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Selecting previously deselected package libdebian-installer4.
-(Reading database ... 11066 files and directories currently installed.)
+(Reading database ... 11077 files and directories currently installed.)
 Unpacking libdebian-installer4 (from .../libdebian-installer4_0.51_amd64.deb) ...
 Selecting previously deselected package libdebian-installer-extra4.
 Unpacking libdebian-installer-extra4 (from .../libdebian-installer-extra4_0.51_amd64.deb) ...
@@ -76,7 +76,7 @@ Get:9 http://cdn.debian.or.jp sid/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:10 http://cdn.debian.or.jp sid/main libdshconfig1-dev 0.20.12-2 [25.3kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Selecting previously deselected package libmagic1.
-(Reading database ... 11168 files and directories currently installed.)
+(Reading database ... 11179 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.21-1_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.21-1_amd64.deb) ...
@@ -122,7 +122,7 @@ After unpacking 451kB of additional disk space will be used.
 Get:1 http://cdn.debian.or.jp sid/main fakeroot 1.7.1 [111kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Selecting previously deselected package fakeroot.
-(Reading database ... 11843 files and directories currently installed.)
+(Reading database ... 11854 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.7.1_amd64.deb) ...
 Setting up fakeroot (1.7.1) ...
 
@@ -417,10 +417,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
 success
 dsh: Failed executing ./invalid-exec-file with llexec call
 dsh: Failed executing ./invalid-exec-file with llexec call
@@ -428,11 +428,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
-Wed Jun  6 03:05:11 UTC 2007
+Sun Jun 10 03:05:39 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
@@ -502,14 +502,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
-Wed Jun  6 03:05:16 UTC 2007
+Sun Jun 10 03:05:44 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-normal-etch.log b/testsuite/normal/pdebuild-normal-etch.log
index b03e981..2d1093b 100644
--- a/testsuite/normal/pdebuild-normal-etch.log
+++ b/testsuite/normal/pdebuild-normal-etch.log
@@ -438,7 +438,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
-Wed Jun  6 03:09:19 UTC 2007
+Sun Jun 10 03:09: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
@@ -508,13 +508,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
-Wed Jun  6 03:09:24 UTC 2007
+Sun Jun 10 03:09:39 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
-b: b
 a: a
+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-normal-lenny.log b/testsuite/normal/pdebuild-normal-lenny.log
index 8f5cd62..a177d08 100644
--- a/testsuite/normal/pdebuild-normal-lenny.log
+++ b/testsuite/normal/pdebuild-normal-lenny.log
@@ -424,8 +424,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
@@ -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
-Wed Jun  6 03:17:25 UTC 2007
+Sun Jun 10 03:17: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,14 +507,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
-Wed Jun  6 03:17:30 UTC 2007
+Sun Jun 10 03:17:47 UTC 2007
 PASS: tests/param-F-forklimit.sh
 PASS: tests/param-gnu-getopt.sh
 PASS: tests/news-okay.sh
-c: c
-dsh: Process terminated (before write).
-a: a
 b: b
+a: a
+c: c
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh
diff --git a/testsuite/normal/pdebuild-normal-sid.log b/testsuite/normal/pdebuild-normal-sid.log
index 20f60d9..fde48bd 100644
--- a/testsuite/normal/pdebuild-normal-sid.log
+++ b/testsuite/normal/pdebuild-normal-sid.log
@@ -71,7 +71,7 @@ Get:9 http://cdn.debian.or.jp sid/main libdshconfig1 0.20.12-2 [10.9kB]
 Get:10 http://cdn.debian.or.jp sid/main libdshconfig1-dev 0.20.12-2 [25.3kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Selecting previously deselected package libmagic1.
-(Reading database ... 11066 files and directories currently installed.)
+(Reading database ... 11077 files and directories currently installed.)
 Unpacking libmagic1 (from .../libmagic1_4.21-1_amd64.deb) ...
 Selecting previously deselected package file.
 Unpacking file (from .../archives/file_4.21-1_amd64.deb) ...
@@ -117,7 +117,7 @@ After unpacking 451kB of additional disk space will be used.
 Get:1 http://cdn.debian.or.jp sid/main fakeroot 1.7.1 [111kB]
 Fetched XXXB in Xs (XXXXXB/s)
 Selecting previously deselected package fakeroot.
-(Reading database ... 11741 files and directories currently installed.)
+(Reading database ... 11752 files and directories currently installed.)
 Unpacking fakeroot (from .../fakeroot_1.7.1_amd64.deb) ...
 Setting up fakeroot (1.7.1) ...
 
@@ -424,8 +424,8 @@ 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
 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
-Wed Jun  6 03:04:16 UTC 2007
+Sun Jun 10 03:04: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
@@ -507,13 +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
-Wed Jun  6 03:04:22 UTC 2007
+Sun Jun 10 03:04: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).
+a: a
 PASS: tests/segv-catcher.sh
 l w
 PASS: tests/test-bufferoverflow.sh