Date: Monday, March 18, 2013 @ 19:19:23 Author: jgc Revision: 180234 Remove obsolete patch upgpkg: polkit 0.110-1
Modified: polkit/trunk/PKGBUILD Deleted: polkit/trunk/fix-xauthority.patch ----------------------+ PKGBUILD | 12 +++------- fix-xauthority.patch | 58 ------------------------------------------------- 2 files changed, 4 insertions(+), 66 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-03-18 17:44:06 UTC (rev 180233) +++ PKGBUILD 2013-03-18 18:19:23 UTC (rev 180234) @@ -2,7 +2,7 @@ # Maintainer: Jan de Groot <[email protected]> pkgname=polkit -pkgver=0.109 +pkgver=0.110 pkgrel=1 pkgdesc="Application development toolkit for controlling system-wide privileges" arch=(i686 x86_64) @@ -14,17 +14,13 @@ options=('!libtool') install=polkit.install source=(http://www.freedesktop.org/software/polkit/releases/$pkgname-$pkgver.tar.gz - polkit.pam - fix-xauthority.patch) -md5sums=('8c3f08287dd3e1e546e3c2ae00090908' - '6564f95878297b954f0572bc1610dd15' - '78db344a30d7aa089b4705009ec95b58') + polkit.pam) +md5sums=('06e0d3b72e566ac277fc35c8206d2a28' + '6564f95878297b954f0572bc1610dd15') build() { cd $pkgname-$pkgver - patch -Np1 -i ../fix-xauthority.patch - ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --libexecdir=/usr/lib/polkit-1 \ --with-systemdsystemunitdir=/usr/lib/systemd/system \ Deleted: fix-xauthority.patch =================================================================== --- fix-xauthority.patch 2013-03-18 17:44:06 UTC (rev 180233) +++ fix-xauthority.patch 2013-03-18 18:19:23 UTC (rev 180234) @@ -1,58 +0,0 @@ -From d6acecdd0ebb42e28ff28e04e0207cb01fa20910 Mon Sep 17 00:00:00 2001 -From: David Zeuthen <[email protected]> -Date: Wed, 19 Dec 2012 19:28:29 +0000 -Subject: Set XAUTHORITY environment variable if is unset - -The way it works is that if XAUTHORITY is unset, then its default -value is $HOME/.Xauthority. But since we're changing user identity -this will not work since $HOME will now change. Therefore, if -XAUTHORITY is unset, just set its default value before changing -identity. This bug only affected login managers using X Window -Authorization but not explicitly setting the XAUTHORITY variable. - -You can argue that XAUTHORITY is broken since it forces uid-changing -apps like pkexec(1) to do more work - and get involved in intimate -details of how X works and so on - but that doesn't change how things -work. - -Based on a patch from Peter Wu <[email protected]>. - -https://bugs.freedesktop.org/show_bug.cgi?id=51623 - -Signed-off-by: David Zeuthen <[email protected]> ---- -diff --git a/src/programs/pkexec.c b/src/programs/pkexec.c -index 840eb3c..da9784a 100644 ---- a/src/programs/pkexec.c -+++ b/src/programs/pkexec.c -@@ -608,6 +608,28 @@ main (int argc, char *argv[]) - g_ptr_array_add (saved_env, g_strdup (value)); - } - -+ /* $XAUTHORITY is "special" - if unset, we need to set it to ~/.Xauthority. Yes, -+ * this is broken but it's unfortunately how things work (see fdo #51623 for -+ * details) -+ */ -+ if (g_getenv ("XAUTHORITY") == NULL) -+ { -+ const gchar *home; -+ -+ /* pre-2.36 GLib does not examine $HOME (it always looks in /etc/passwd) and -+ * this is not what we want -+ */ -+ home = g_getenv ("HOME"); -+ if (home == NULL) -+ home = g_get_home_dir (); -+ -+ if (home != NULL) -+ { -+ g_ptr_array_add (saved_env, g_strdup ("XAUTHORITY")); -+ g_ptr_array_add (saved_env, g_build_filename (home, ".Xauthority", NULL)); -+ } -+ } -+ - /* Nuke the environment to get a well-known and sanitized environment to avoid attacks - * via e.g. the DBUS_SYSTEM_BUS_ADDRESS environment variable and similar. - */ --- -cgit v0.9.0.2-2-gbebe
