Bug#519276: sbuild doesn't properly set APR_CONFIG

[Francois-Denis Gonthier]

Package: sbuild
Version: 0.58.0-1
Severity: important
Tags: patch

I reported this bug yesterday but it never made it to the bug tracker
because my MTA was misconfigured.  This is a good thing in retrospec
because now I have a patch!

sbuild did not properly set the APT_CONFIG environment variable when
building, which broke the $apt_allow_unauthenticated option, and
probably some other options set through the apt configuration file.

-- System Information:
Debian Release: squeeze/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'stable'), (1, 'experimental')
Architecture: i386 (i686)

Kernel: Linux 2.6.26-1-686 (SMP w/1 CPU core)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages sbuild depends on:
ii  adduser                       3.110      add and remove users and groups
ii  apt                           0.7.20.2   Advanced front-end for dpkg
ii  dctrl-tools                   2.13.1     Command-line tools to process Debi
ii  devscripts                    2.10.47    scripts to make the life of a Debi
ii  dpkg-dev                      1.14.25    Debian package development tools
ii  perl                          5.10.0-19  Larry Wall's Practical Extraction 
ii  perl-modules                  5.10.0-19  Core Perl modules
ii  postfix [mail-transport-agent 2.5.5-1.1  High-performance mail transport ag
ii  schroot                       1.2.1-1    Execute commands in a chroot envir

Versions of packages sbuild recommends:
ii  debootstrap       1.0.3build1-0kryptiva4 Bootstrap a basic Debian system
ii  fakeroot          1.12.2                 Gives a fake root environment

Versions of packages sbuild suggests:
ii  deborphan                     1.7.28     program that can find unused packa
ii  wget                          1.11.4-2   retrieves files from the web

-- no debconf information

diff --git a/bin/sbuild b/bin/sbuild
index 361e3d0..57cc203 100755
--- a/bin/sbuild
+++ b/bin/sbuild
@@ -178,10 +178,8 @@ sub main () {
 	$chroot_defaults->{'STREAMIN'} = $devnull;
 	$chroot_defaults->{'STREAMOUT'} = $build->get('Log Stream');
 	$chroot_defaults->{'STREAMERR'} = $build->get('Log Stream');
-	$chroot_defaults->{'ENV'} = {
-	    'LC_ALL' => 'POSIX',
-	    'SHELL' => $programs{'SHELL'}
-	};
+	$chroot_defaults->{'ENV'}->{'LC_ALL'} = 'POSIX';
+        $chroot_defaults->{'ENV'}->{'POSIX'} = $programs{'SHELL'};
 
 	$build->set('Session', $session);
 

diff --git a/bin/sbuild b/bin/sbuild
index 361e3d0..57cc203 100755
--- a/bin/sbuild
+++ b/bin/sbuild
@@ -178,10 +178,8 @@ sub main () {
 	$chroot_defaults->{'STREAMIN'} = $devnull;
 	$chroot_defaults->{'STREAMOUT'} = $build->get('Log Stream');
 	$chroot_defaults->{'STREAMERR'} = $build->get('Log Stream');
-	$chroot_defaults->{'ENV'} = {
-	    'LC_ALL' => 'POSIX',
-	    'SHELL' => $programs{'SHELL'}
-	};
+	$chroot_defaults->{'ENV'}->{'LC_ALL'} = 'POSIX';
+        $chroot_defaults->{'ENV'}->{'POSIX'} = $programs{'SHELL'};
 
 	$build->set('Session', $session);