Merge branch 'master' of ssh://git.debian.org/git/pbuilder/pbuilder

1 files changed, 117 insertions, 81 deletions

diff --git a/testsuite/normal/pbuilder-update-etch-sid.log b/testsuite/normal/pbuilder-update-etch-sid.log
index 15196f5..adfda96 100644
--- a/testsuite/normal/pbuilder-update-etch-sid.log
+++ b/testsuite/normal/pbuilder-update-etch-sid.log
@@ -1,6 +1,6 @@
 Upgrading for distribution sid
 Building the build Environment
- -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.HagSH18641/testimage]
+ -> extracting base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.PDwnnq3768/testimage]
  -> creating local configuration
  -> copying local configuration
   -> Installing apt-lines
@@ -11,77 +11,111 @@ Refreshing the base.tgz
  -> upgrading packages
 Get:1 http://ftp.jp.debian.org sid Release.gpg [189B]
 Get:2 http://ftp.jp.debian.org sid Release [79.6kB]
-Get:3 http://ftp.jp.debian.org sid/main Packages [5996kB]
-Fetched 6076kB in 3s (1806kB/s)
+Get:3 http://ftp.jp.debian.org sid/main Packages [6011kB]
+Fetched 6091kB in 1m3s (95.7kB/s)
 Reading package lists...
 dpkg - warning: ignoring request to remove lilo which isn't installed.
 Reading package lists...
 Building dependency tree...
 The following packages will be upgraded:
   base-files cpio debconf debconf-i18n debianutils dhcp3-client dhcp3-common
-  findutils gzip klogd laptop-detect libacl1 libattr1 libdevmapper1.02
-  libgcrypt11 libgpg-error0 libldap2 libopencdk8 libsepol1 libssl0.9.8
-  libtasn1-3 libusb-0.1-4 make man-db manpages nano netcat sysklogd tar tzdata
-  vim-common vim-tiny
-32 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
-Need to get 7393kB of archives.
-After unpacking 119kB of additional disk space will be used.
+  findutils gzip iputils-ping klogd laptop-detect libacl1 libattr1 libc6
+  libc6-dev libdevmapper1.02 libgcrypt11 libgnutls13 libgpg-error0 libldap2
+  libopencdk8 libsasl2 libsasl2-2 libsepol1 libssl0.9.8 libtasn1-3
+  libusb-0.1-4 make man-db manpages nano netcat sysklogd tar tzdata vim-common
+  vim-tiny
+38 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
+Need to get 15.1MB of archives.
+After unpacking 3514kB of additional disk space will be used.
 Get:1 http://ftp.jp.debian.org sid/main debianutils 2.18 [52.5kB]
-Get:2 http://ftp.jp.debian.org sid/main findutils 4.2.28-2 [356kB]
-Get:3 http://ftp.jp.debian.org sid/main gzip 1.3.9-2 [80.5kB]
-Get:4 http://ftp.jp.debian.org sid/main tar 1.16.1-1 [734kB]
-Get:5 http://ftp.jp.debian.org sid/main base-files 4.0 [39.9kB]
-Get:6 http://ftp.jp.debian.org sid/main debconf-i18n 1.5.13 [151kB]
-Get:7 http://ftp.jp.debian.org sid/main debconf 1.5.13 [148kB]
-Get:8 http://ftp.jp.debian.org sid/main libattr1 1:2.4.32-1.1 [9976B]
-Get:9 http://ftp.jp.debian.org sid/main libacl1 2.2.42-1 [16.1kB]
-Get:10 http://ftp.jp.debian.org sid/main libsepol1 1.14-3 [125kB]
-Get:11 http://ftp.jp.debian.org sid/main tzdata 2007e-1 [356kB]
-Get:12 http://ftp.jp.debian.org sid/main cpio 2.7-1 [114kB]
-Get:13 http://ftp.jp.debian.org sid/main dhcp3-client 3.0.4-14 [222kB]
-Get:14 http://ftp.jp.debian.org sid/main dhcp3-common 3.0.4-14 [287kB]
-Get:15 http://ftp.jp.debian.org sid/main sysklogd 1.4.1-20 [60.2kB]
-Get:16 http://ftp.jp.debian.org sid/main klogd 1.4.1-20 [40.7kB]
-Get:17 http://ftp.jp.debian.org sid/main laptop-detect 0.12.1-0.1 [3666B]
-Get:18 http://ftp.jp.debian.org sid/main libgpg-error0 1.4-2 [34.8kB]
-Get:19 http://ftp.jp.debian.org sid/main libgcrypt11 1.2.4-2 [190kB]
-Get:20 http://ftp.jp.debian.org sid/main libldap2 2.1.30-13.4 [162kB]
-Get:21 http://ftp.jp.debian.org sid/main libopencdk8 0.5.13-2 [104kB]
-Get:22 http://ftp.jp.debian.org sid/main libssl0.9.8 0.9.8e-4 [896kB]
-Get:23 http://ftp.jp.debian.org sid/main libtasn1-3 0.3.9-1 [57.8kB]
-Get:24 http://ftp.jp.debian.org sid/main libusb-0.1-4 2:0.1.12-6 [20.3kB]
-Get:25 http://ftp.jp.debian.org sid/main man-db 2.4.4-2 [764kB]
-Get:26 http://ftp.jp.debian.org sid/main manpages 2.43-0 [490kB]
-Get:27 http://ftp.jp.debian.org sid/main nano 2.0.3-1 [570kB]
-Get:28 http://ftp.jp.debian.org sid/main netcat 1.10-33 [68.3kB]
-Get:29 http://ftp.jp.debian.org sid/main vim-tiny 1:7.0-219+1 [617kB]
-Get:30 http://ftp.jp.debian.org sid/main vim-common 1:7.0-219+1 [185kB]
-Get:31 http://ftp.jp.debian.org sid/main libdevmapper1.02 2:1.02.12-1 [42.0kB]
-Get:32 http://ftp.jp.debian.org sid/main make 3.81-3 [395kB]
-
Extracting templates from packages: 93%
Extracting templates from packages: 100%
+Get:2 http://ftp.jp.debian.org sid/main debconf-i18n 1.5.13 [151kB]
+Get:3 http://ftp.jp.debian.org sid/main debconf 1.5.13 [148kB]
+Get:4 http://ftp.jp.debian.org sid/main tzdata 2007e-3 [358kB]
+Get:5 http://ftp.jp.debian.org sid/main libc6-dev 2.5-2 [2457kB]
+Get:6 http://ftp.jp.debian.org sid/main libc6 2.5-2 [4738kB]
+Get:7 http://ftp.jp.debian.org sid/main findutils 4.2.30-1 [361kB]
+Get:8 http://ftp.jp.debian.org sid/main gzip 1.3.9-2 [80.5kB]
+Get:9 http://ftp.jp.debian.org sid/main tar 1.16.1-1 [734kB]
+Get:10 http://ftp.jp.debian.org sid/main base-files 4.0 [39.9kB]
+Get:11 http://ftp.jp.debian.org sid/main libattr1 1:2.4.32-1.1 [9976B]
+Get:12 http://ftp.jp.debian.org sid/main libacl1 2.2.42-1 [16.1kB]
+Get:13 http://ftp.jp.debian.org sid/main libsepol1 1.14-3 [125kB]
+Get:14 http://ftp.jp.debian.org sid/main cpio 2.7-1 [114kB]
+Get:15 http://ftp.jp.debian.org sid/main dhcp3-client 3.0.4-14 [222kB]
+Get:16 http://ftp.jp.debian.org sid/main dhcp3-common 3.0.4-14 [287kB]
+Get:17 http://ftp.jp.debian.org sid/main iputils-ping 3:20070202-1 [45.5kB]
+Get:18 http://ftp.jp.debian.org sid/main sysklogd 1.4.1-20 [60.2kB]
+Get:19 http://ftp.jp.debian.org sid/main klogd 1.4.1-20 [40.7kB]
+Get:20 http://ftp.jp.debian.org sid/main laptop-detect 0.12.1-0.1 [3666B]
+Get:21 http://ftp.jp.debian.org sid/main libgpg-error0 1.4-2 [34.8kB]
+Get:22 http://ftp.jp.debian.org sid/main libgcrypt11 1.2.4-2 [190kB]
+Get:23 http://ftp.jp.debian.org sid/main libopencdk8 0.5.13-2 [104kB]
+Get:24 http://ftp.jp.debian.org sid/main libtasn1-3 0.3.9-1 [57.8kB]
+Get:25 http://ftp.jp.debian.org sid/main libgnutls13 1.6.1-2 [333kB]
+Get:26 http://ftp.jp.debian.org sid/main libsasl2 2.1.22.dfsg1-8+b1 [41.0kB]
+Get:27 http://ftp.jp.debian.org sid/main libsasl2-2 2.1.22.dfsg1-8+b1 [107kB]
+Get:28 http://ftp.jp.debian.org sid/main libldap2 2.1.30-13.4 [162kB]
+Get:29 http://ftp.jp.debian.org sid/main libssl0.9.8 0.9.8e-4 [896kB]
+Get:30 http://ftp.jp.debian.org sid/main libusb-0.1-4 2:0.1.12-6 [20.3kB]
+Get:31 http://ftp.jp.debian.org sid/main man-db 2.4.4-2 [764kB]
+Get:32 http://ftp.jp.debian.org sid/main manpages 2.43-0 [490kB]
+Get:33 http://ftp.jp.debian.org sid/main nano 2.0.3-1 [570kB]
+Get:34 http://ftp.jp.debian.org sid/main netcat 1.10-33 [68.3kB]
+Get:35 http://ftp.jp.debian.org sid/main vim-tiny 1:7.0-219+1 [617kB]
+Get:36 http://ftp.jp.debian.org sid/main vim-common 1:7.0-219+1 [185kB]
+Get:37 http://ftp.jp.debian.org sid/main libdevmapper1.02 2:1.02.12-1 [42.0kB]
+Get:38 http://ftp.jp.debian.org sid/main make 3.81-3 [395kB]
+
Extracting templates from packages: 78%
Extracting templates from packages: 100%
 Preconfiguring packages ...
-Fetched 7393kB in 32s (226kB/s)
+Fetched 15.1MB in 4m45s (53.0kB/s)
 (Reading database ... 12033 files and directories currently installed.)
 Preparing to replace debianutils 2.17 (using .../debianutils_2.18_amd64.deb) ...
 Unpacking replacement debianutils ...
 Setting up debianutils (2.18) ...
 
 (Reading database ... 12033 files and directories currently installed.)
-Preparing to replace findutils 4.2.28-1 (using .../findutils_4.2.28-2_amd64.deb) ...
+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_2007e-3_all.deb) ...
+Unpacking replacement tzdata ...
+Setting up debconf-i18n (1.5.13) ...
+Setting up debconf (1.5.13) ...
+
+Setting up tzdata (2007e-3) ...
+
+Current default timezone: 'Etc/UTC'
+Local time is now:      Mon Apr 16 03:48:27 UTC 2007.
+Universal Time is now:  Mon Apr 16 03:48:27 UTC 2007.
+Run 'dpkg-reconfigure tzdata' if you wish to change it.
+
+
+(Reading database ... 12039 files and directories currently installed.)
+Preparing to replace libc6-dev 2.3.6.ds1-13 (using .../libc6-dev_2.5-2_amd64.deb) ...
+Unpacking replacement libc6-dev ...
+Preparing to replace libc6 2.3.6.ds1-13 (using .../archives/libc6_2.5-2_amd64.deb) ...
+Unpacking replacement libc6 ...
+Setting up libc6 (2.5-2) ...
+Installing new version of config file /etc/init.d/glibc.sh ...
+init: timeout opening/writing control channel /dev/initctl
+
+(Reading database ... 12103 files and directories currently installed.)
+Preparing to replace findutils 4.2.28-1 (using .../findutils_4.2.30-1_amd64.deb) ...
 Unpacking replacement findutils ...
-Setting up findutils (4.2.28-2) ...
+Setting up findutils (4.2.30-1) ...
 
-(Reading database ... 12033 files and directories currently installed.)
+(Reading database ... 12103 files and directories currently installed.)
 Preparing to replace gzip 1.3.5-15 (using .../gzip_1.3.9-2_amd64.deb) ...
 Unpacking replacement gzip ...
 Setting up gzip (1.3.9-2) ...
 
-(Reading database ... 12033 files and directories currently installed.)
+(Reading database ... 12103 files and directories currently installed.)
 Preparing to replace tar 1.16-2 (using .../tar_1.16.1-1_amd64.deb) ...
 Unpacking replacement tar ...
 Setting up tar (1.16.1-1) ...
 
-(Reading database ... 12034 files and directories currently installed.)
+(Reading database ... 12104 files and directories currently installed.)
 Preparing to replace base-files 4 (using .../base-files_4.0_amd64.deb) ...
 Unpacking replacement base-files ...
 Setting up base-files (4.0) ...
@@ -89,11 +123,7 @@ Installing new version of config file /etc/debian_version ...
 Installing new version of config file /etc/issue ...
 Installing new version of config file /etc/issue.net ...
 
-(Reading database ... 12034 files and directories currently installed.)
-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 ...
+(Reading database ... 12104 files and directories currently installed.)
 Preparing to replace libattr1 2.4.32-1 (using .../libattr1_1%3a2.4.32-1.1_amd64.deb) ...
 Unpacking replacement libattr1 ...
 Preparing to replace libacl1 2.2.41-1 (using .../libacl1_2.2.42-1_amd64.deb) ...
@@ -102,25 +132,21 @@ Setting up libattr1 (2.4.32-1.1) ...
 
 Setting up libacl1 (2.2.42-1) ...
 
-(Reading database ... 12034 files and directories currently installed.)
+(Reading database ... 12104 files and directories currently installed.)
 Preparing to replace libsepol1 1.14-2 (using .../libsepol1_1.14-3_amd64.deb) ...
 Unpacking replacement libsepol1 ...
 Setting up libsepol1 (1.14-3) ...
 telinit: timeout opening/writing control channel /dev/initctl
 
-(Reading database ... 12034 files and directories currently installed.)
-Preparing to replace tzdata 2007b-1 (using .../tzdata_2007e-1_all.deb) ...
-Unpacking replacement tzdata ...
-Setting up tzdata (2007e-1) ...
-Non-interactive mode, setting timezone to UTC.  Run tzconfig to change.
-
-(Reading database ... 12040 files and directories currently installed.)
+(Reading database ... 12104 files and directories currently installed.)
 Preparing to replace cpio 2.6-17 (using .../archives/cpio_2.7-1_amd64.deb) ...
 Unpacking replacement cpio ...
 Preparing to replace dhcp3-client 3.0.4-13 (using .../dhcp3-client_3.0.4-14_amd64.deb) ...
 Unpacking replacement dhcp3-client ...
 Preparing to replace dhcp3-common 3.0.4-13 (using .../dhcp3-common_3.0.4-14_amd64.deb) ...
 Unpacking replacement dhcp3-common ...
+Preparing to replace iputils-ping 3:20020927-6 (using .../iputils-ping_3%3a20070202-1_amd64.deb) ...
+Unpacking replacement iputils-ping ...
 Preparing to replace sysklogd 1.4.1-18 (using .../sysklogd_1.4.1-20_amd64.deb) ...
 Unpacking replacement sysklogd ...
 Preparing to replace klogd 1.4.1-18 (using .../klogd_1.4.1-20_amd64.deb) ...
@@ -131,14 +157,20 @@ Preparing to replace libgpg-error0 1.4-1 (using .../libgpg-error0_1.4-2_amd64.de
 Unpacking replacement libgpg-error0 ...
 Preparing to replace libgcrypt11 1.2.3-2 (using .../libgcrypt11_1.2.4-2_amd64.deb) ...
 Unpacking replacement libgcrypt11 ...
-Preparing to replace libldap2 2.1.30-13.3 (using .../libldap2_2.1.30-13.4_amd64.deb) ...
-Unpacking replacement libldap2 ...
 Preparing to replace libopencdk8 0.5.9-2 (using .../libopencdk8_0.5.13-2_amd64.deb) ...
 Unpacking replacement libopencdk8 ...
-Preparing to replace libssl0.9.8 0.9.8c-4 (using .../libssl0.9.8_0.9.8e-4_amd64.deb) ...
-Unpacking replacement libssl0.9.8 ...
 Preparing to replace libtasn1-3 0.3.6-2 (using .../libtasn1-3_0.3.9-1_amd64.deb) ...
 Unpacking replacement libtasn1-3 ...
+Preparing to replace libgnutls13 1.4.4-3 (using .../libgnutls13_1.6.1-2_amd64.deb) ...
+Unpacking replacement libgnutls13 ...
+Preparing to replace libsasl2 2.1.22.dfsg1-8 (using .../libsasl2_2.1.22.dfsg1-8+b1_amd64.deb) ...
+Unpacking replacement libsasl2 ...
+Preparing to replace libsasl2-2 2.1.22.dfsg1-8 (using .../libsasl2-2_2.1.22.dfsg1-8+b1_amd64.deb) ...
+Unpacking replacement libsasl2-2 ...
+Preparing to replace libldap2 2.1.30-13.3 (using .../libldap2_2.1.30-13.4_amd64.deb) ...
+Unpacking replacement libldap2 ...
+Preparing to replace libssl0.9.8 0.9.8c-4 (using .../libssl0.9.8_0.9.8e-4_amd64.deb) ...
+Unpacking replacement libssl0.9.8 ...
 Preparing to replace libusb-0.1-4 2:0.1.12-5 (using .../libusb-0.1-4_2%3a0.1.12-6_amd64.deb) ...
 Unpacking replacement libusb-0.1-4 ...
 Preparing to replace man-db 2.4.3-6 (using .../man-db_2.4.4-2_amd64.deb) ...
@@ -157,22 +189,35 @@ Preparing to replace libdevmapper1.02 2:1.02.08-1 (using .../libdevmapper1.02_2%
 Unpacking replacement libdevmapper1.02 ...
 Preparing to replace make 3.81-2 (using .../archives/make_3.81-3_amd64.deb) ...
 Unpacking replacement make ...
+Setting up libc6-dev (2.5-2) ...
 Setting up cpio (2.7-1) ...
 
 Setting up dhcp3-common (3.0.4-14) ...
+Setting up dhcp3-client (3.0.4-14) ...
+
+Setting up iputils-ping (20070202-1) ...
 Setting up laptop-detect (0.12.1-0.1) ...
 Setting up libgpg-error0 (1.4-2) ...
 
 Setting up libgcrypt11 (1.2.4-2) ...
 
-Setting up libldap2 (2.1.30-13.4) ...
-
 Setting up libopencdk8 (0.5.13-2) ...
 
 Setting up libtasn1-3 (0.3.9-1) ...
 
+Setting up libgnutls13 (1.6.1-2) ...
+
+Setting up libsasl2-2 (2.1.22.dfsg1-8+b1) ...
+
+Setting up libsasl2 (2.1.22.dfsg1-8+b1) ...
+Setting up libldap2 (2.1.30-13.4) ...
+
+Setting up libssl0.9.8 (0.9.8e-4) ...
+
 Setting up libusb-0.1-4 (0.1.12-6) ...
 
+Setting up man-db (2.4.4-2) ...
+
 Setting up manpages (2.43-0) ...
 Setting up nano (2.0.3-1) ...
 
@@ -184,21 +229,12 @@ Setting up vim-tiny (7.0-219+1) ...
 Setting up libdevmapper1.02 (1.02.12-1) ...
 
 Setting up make (3.81-3) ...
-Setting up klogd (1.4.1-20) ...
-Installing new version of config file /etc/init.d/klogd ...
-
 Setting up sysklogd (1.4.1-20) ...
 Installing new version of config file /etc/init.d/sysklogd ...
 Installing new version of config file /etc/cron.daily/sysklogd ...
 
-Setting up debconf-i18n (1.5.13) ...
-Setting up debconf (1.5.13) ...
-
-Setting up dhcp3-client (3.0.4-14) ...
-
-Setting up libssl0.9.8 (0.9.8e-4) ...
-
-Setting up man-db (2.4.4-2) ...
+Setting up klogd (1.4.1-20) ...
+Installing new version of config file /etc/init.d/klogd ...
 
 Reading package lists...
 Building dependency tree...
@@ -213,9 +249,9 @@ umount: /dev/shm: not mounted
 umount: /lib/init/rw: not mounted
 cat: /var/run/inetd.pid: No such file or directory
 kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill -l [sigspec]
- -> user script /var/cache/pbuilder/build//14480/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
+ -> user script /var/cache/pbuilder/build//31235/tmp/hooks/E50-initscripts-2.86.ds1-7.workaround.sh finished
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.HagSH18641/testimage]
+ -> creating base tarball [/home/dancer/DEBIAN/pbuilder/pbuilder/testsuite/tmp.PDwnnq3768/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//14480 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//31235 and its subdirectories