diff -Nru policykit-1-0.104/debian/changelog policykit-1-0.104/debian/changelog
--- policykit-1-0.104/debian/changelog	2012-02-11 22:48:51.000000000 +0000
+++ policykit-1-0.104/debian/changelog	2012-05-15 22:19:24.000000000 +0000
@@ -1,3 +1,12 @@
+policykit-1 (0.104-2ubuntu1) quantal; urgency=low
+
+  * debian/patches/07_pam_environment.patch: set process environment
+    from pam_getenvlist().  Closes LP: #982684.
+  * debian/patches/01_pam_polkit.patch: adjust patch to invoke pam_env, so
+    our global settings from /etc/environment are applied correctly.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 15 May 2012 15:15:52 -0700
+
 policykit-1 (0.104-2) unstable; urgency=low
 
   * debian/control: Add Build-Depends on libglib2.0-doc and libgtk-3-doc for
diff -Nru policykit-1-0.104/debian/control policykit-1-0.104/debian/control
--- policykit-1-0.104/debian/control	2012-02-11 22:48:51.000000000 +0000
+++ policykit-1-0.104/debian/control	2012-05-15 22:18:46.000000000 +0000
@@ -1,7 +1,8 @@
 Source: policykit-1
 Section: admin
 Priority: optional
-Maintainer: Utopia Maintenance Team <pkg-utopia-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Utopia Maintenance Team <pkg-utopia-maintainers@lists.alioth.debian.org>
 Uploaders: Michael Biebl <biebl@debian.org>, Martin Pitt <mpitt@debian.org>
 Build-Depends: debhelper (>= 8.1.3),
  autotools-dev,
diff -Nru policykit-1-0.104/debian/patches/01_pam_polkit.patch policykit-1-0.104/debian/patches/01_pam_polkit.patch
--- policykit-1-0.104/debian/patches/01_pam_polkit.patch	2012-02-11 22:48:51.000000000 +0000
+++ policykit-1-0.104/debian/patches/01_pam_polkit.patch	2012-05-15 22:14:49.000000000 +0000
@@ -1,6 +1,8 @@
---- a/data/polkit-1.in
-+++ b/data/polkit-1.in
-@@ -1,6 +1,6 @@
+Index: trunk/data/polkit-1.in
+===================================================================
+--- trunk.orig/data/polkit-1.in
++++ trunk/data/polkit-1.in
+@@ -1,6 +1,8 @@
  #%PAM-1.0
  
 -auth       include      @PAM_FILE_INCLUDE_AUTH@
@@ -10,4 +12,6 @@
 +@include common-auth
 +@include common-account
 +@include common-password
++session       required   pam_env.so readenv=1 user_readenv=0
++session       required   pam_env.so readenv=1 envfile=/etc/default/locale user_readenv=0
 +@include common-session
diff -Nru policykit-1-0.104/debian/patches/07_pam_environment.patch policykit-1-0.104/debian/patches/07_pam_environment.patch
--- policykit-1-0.104/debian/patches/07_pam_environment.patch	1970-01-01 00:00:00.000000000 +0000
+++ policykit-1-0.104/debian/patches/07_pam_environment.patch	2012-05-15 22:04:56.000000000 +0000
@@ -0,0 +1,33 @@
+Author: Steve Langasek <steve.langasek@canonical.com>
+Description: set process environment from pam_getenvlist()
+ Various pam modules provide environment variables that are intended to be
+ set in the environment of the pam session.  pkexec needs to process the
+ output of pam_getenvlist() to get these.
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/982684
+Index: trunk/src/programs/pkexec.c
+===================================================================
+--- trunk.orig/src/programs/pkexec.c
++++ trunk/src/programs/pkexec.c
+@@ -145,6 +145,7 @@
+   gboolean ret;
+   gint rc;
+   pam_handle_t *pam_h;
++  char **envlist;
+   struct pam_conv conversation;
+ 
+   ret = FALSE;
+@@ -176,6 +177,14 @@
+ 
+   ret = TRUE;
+ 
++  envlist = pam_getenvlist (pam_h);
++  if (envlist != NULL) {
++    int i;
++    for (i = 0; envlist[i]; i++)
++      putenv(envlist[i]);
++    free (envlist);
++  }
++
+ out:
+   if (pam_h != NULL)
+     pam_end (pam_h, rc);
diff -Nru policykit-1-0.104/debian/patches/series policykit-1-0.104/debian/patches/series
--- policykit-1-0.104/debian/patches/series	2012-02-11 22:48:51.000000000 +0000
+++ policykit-1-0.104/debian/patches/series	2012-05-15 21:47:17.000000000 +0000
@@ -4,3 +4,4 @@
 04_get_cwd.patch
 05_revert-admin-identities-unix-group-wheel.patch
 06_systemd-service.patch
+07_pam_environment.patch