[arch-commits] Commit in polkit/repos (18 files)

Jan Steffens heftig at archlinux.org
Sat Sep 29 12:13:31 UTC 2012


    Date: Saturday, September 29, 2012 @ 08:13:31
  Author: heftig
Revision: 167252

archrelease: copy trunk to gnome-unstable-i686, gnome-unstable-x86_64

Added:
  polkit/repos/gnome-unstable-i686/PKGBUILD
    (from rev 167251, polkit/trunk/PKGBUILD)
  polkit/repos/gnome-unstable-i686/autogen.sh
    (from rev 167251, polkit/trunk/autogen.sh)
  polkit/repos/gnome-unstable-i686/fix-empty-wheel.patch
    (from rev 167251, polkit/trunk/fix-empty-wheel.patch)
  polkit/repos/gnome-unstable-i686/polkit.install
    (from rev 167251, polkit/trunk/polkit.install)
  polkit/repos/gnome-unstable-i686/polkit.pam
    (from rev 167251, polkit/trunk/polkit.pam)
  polkit/repos/gnome-unstable-x86_64/PKGBUILD
    (from rev 167251, polkit/trunk/PKGBUILD)
  polkit/repos/gnome-unstable-x86_64/autogen.sh
    (from rev 167251, polkit/trunk/autogen.sh)
  polkit/repos/gnome-unstable-x86_64/fix-empty-wheel.patch
    (from rev 167251, polkit/trunk/fix-empty-wheel.patch)
  polkit/repos/gnome-unstable-x86_64/polkit.install
    (from rev 167251, polkit/trunk/polkit.install)
  polkit/repos/gnome-unstable-x86_64/polkit.pam
    (from rev 167251, polkit/trunk/polkit.pam)
Deleted:
  polkit/repos/gnome-unstable-i686/PKGBUILD
  polkit/repos/gnome-unstable-i686/autogen.sh
  polkit/repos/gnome-unstable-i686/polkit.install
  polkit/repos/gnome-unstable-i686/polkit.pam
  polkit/repos/gnome-unstable-x86_64/PKGBUILD
  polkit/repos/gnome-unstable-x86_64/autogen.sh
  polkit/repos/gnome-unstable-x86_64/polkit.install
  polkit/repos/gnome-unstable-x86_64/polkit.pam

---------------------------------------------+
 gnome-unstable-i686/PKGBUILD                |   82 ++++----
 gnome-unstable-i686/autogen.sh              |  246 +++++++++++++-------------
 gnome-unstable-i686/fix-empty-wheel.patch   |   47 ++++
 gnome-unstable-i686/polkit.install          |   36 +--
 gnome-unstable-i686/polkit.pam              |   14 -
 gnome-unstable-x86_64/PKGBUILD              |   82 ++++----
 gnome-unstable-x86_64/autogen.sh            |  246 +++++++++++++-------------
 gnome-unstable-x86_64/fix-empty-wheel.patch |   47 ++++
 gnome-unstable-x86_64/polkit.install        |   36 +--
 gnome-unstable-x86_64/polkit.pam            |   14 -
 10 files changed, 476 insertions(+), 374 deletions(-)

Deleted: gnome-unstable-i686/PKGBUILD
===================================================================
--- gnome-unstable-i686/PKGBUILD	2012-09-29 12:12:01 UTC (rev 167251)
+++ gnome-unstable-i686/PKGBUILD	2012-09-29 12:13:31 UTC (rev 167252)
@@ -1,39 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=polkit
-pkgver=0.107
-pkgrel=3
-pkgdesc="Application development toolkit for controlling system-wide privileges"
-arch=(i686 x86_64)
-license=('LGPL')
-url="http://www.freedesktop.org/wiki/Software/PolicyKit"
-depends=('glib2' 'pam' 'expat' 'libsystemd' 'js')
-makedepends=('intltool' 'gtk-doc' 'gobject-introspection')
-replaces=('policykit')
-options=('!libtool')
-install=polkit.install
-source=(http://www.freedesktop.org/software/polkit/releases/$pkgname-$pkgver.tar.gz
-        polkit.pam)
-md5sums=('0e4f9c53f43fd1b25ac3f0d2e09b2ae1'
-         '6564f95878297b954f0572bc1610dd15')
-
-build() {
-  cd $pkgname-$pkgver
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --libexecdir=/usr/lib/polkit-1 \
-      --with-systemdsystemunitdir=/usr/lib/systemd/system \
-      --disable-static --enable-gtk-doc
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  chown 102 "$pkgdir/etc/polkit-1/rules.d"
-  chown 102 "$pkgdir/usr/share/polkit-1/rules.d"
-
-  install -m644 "$srcdir/polkit.pam" "$pkgdir/etc/pam.d/polkit-1"
-}

Copied: polkit/repos/gnome-unstable-i686/PKGBUILD (from rev 167251, polkit/trunk/PKGBUILD)
===================================================================
--- gnome-unstable-i686/PKGBUILD	                        (rev 0)
+++ gnome-unstable-i686/PKGBUILD	2012-09-29 12:13:31 UTC (rev 167252)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=polkit
+pkgver=0.107
+pkgrel=4
+pkgdesc="Application development toolkit for controlling system-wide privileges"
+arch=(i686 x86_64)
+license=('LGPL')
+url="http://www.freedesktop.org/wiki/Software/PolicyKit"
+depends=('glib2' 'pam' 'expat' 'libsystemd' 'js')
+makedepends=('intltool' 'gtk-doc' 'gobject-introspection')
+replaces=('policykit')
+options=('!libtool')
+install=polkit.install
+source=(http://www.freedesktop.org/software/polkit/releases/$pkgname-$pkgver.tar.gz
+        polkit.pam fix-empty-wheel.patch)
+md5sums=('0e4f9c53f43fd1b25ac3f0d2e09b2ae1'
+         '6564f95878297b954f0572bc1610dd15'
+         'c99ab2a7919ad0b69fde4804c043b07f')
+
+build() {
+  cd $pkgname-$pkgver
+
+  # https://bugs.archlinux.org/task/31717
+  patch -Np1 -i ../fix-empty-wheel.patch
+
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --libexecdir=/usr/lib/polkit-1 \
+      --with-systemdsystemunitdir=/usr/lib/systemd/system \
+      --disable-static --enable-gtk-doc
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+
+  chown 102 "$pkgdir/etc/polkit-1/rules.d"
+  chown 102 "$pkgdir/usr/share/polkit-1/rules.d"
+
+  install -m644 "$srcdir/polkit.pam" "$pkgdir/etc/pam.d/polkit-1"
+}

Deleted: gnome-unstable-i686/autogen.sh
===================================================================
--- gnome-unstable-i686/autogen.sh	2012-09-29 12:12:01 UTC (rev 167251)
+++ gnome-unstable-i686/autogen.sh	2012-09-29 12:13:31 UTC (rev 167252)
@@ -1,123 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-DIE=0
-
-(test -f $srcdir/configure.ac) || {
-    echo -n "**Error**: Directory $srcdir does not look like the"
-    echo " top-level package directory"
-    exit 1
-}
-
-olddir=`pwd`
-cd "$srcdir"
-
-touch ChangeLog
-
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
-  echo
-  echo "**Error**: You must have autoconf installed."
-  echo "Download the appropriate package for your distribution,"
-  echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
-  DIE=1
-}
-
-(grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null) && {
-  (libtoolize --version) < /dev/null > /dev/null 2>&1 || {
-    echo
-    echo "**Error**: You must have libtool installed."
-    echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
-    DIE=1
-  }
-}
-
-(gtkdocize --flavour no-tmpl) < /dev/null > /dev/null 2>&1 || {
-	echo
-	echo "You must have gtk-doc installed to compile $PROJECT."
-	echo "Install the appropriate package for your distribution,"
-	echo "or get the source tarball at http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/"
-	DIE=1
-}
-
-(automake --version) < /dev/null > /dev/null 2>&1 || {
-  echo
-  echo "**Error**: You must have automake installed."
-  echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
-  DIE=1
-  NO_AUTOMAKE=yes
-}
-
-
-# if no automake, don't bother testing for aclocal
-test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
-  echo
-  echo "**Error**: Missing aclocal.  The version of automake"
-  echo "installed doesn't appear recent enough."
-  echo "You can get automake from ftp://ftp.gnu.org/pub/gnu/"
-  DIE=1
-}
-
-
-# if no automake, don't bother testing for autoreconf
-test -n "$NO_AUTOMAKE" || (autoreconf --version) < /dev/null > /dev/null 2>&1 || {
-  echo
-  echo "**Error**: You must have autoreconf installed."
-  echo "You can get autoreconf from ..."
-  DIE=1
-}
-
-
-if test "$DIE" -eq 1; then
-  exit 1
-fi
-
-if test -z "$*"; then
-  echo "**Warning**: I am going to run configure with no arguments."
-  echo "If you wish to pass any to it, please specify them on the"
-  echo $0 " command line."
-  echo
-fi
-
-case $CC in
-xlc )
-  am_opt=--include-deps;;
-esac
-
-      aclocalinclude="$ACLOCAL_FLAGS"
-
-      echo "Running autoreconf on test/mocklibc ..."
-      (cd "test/mocklibc"; autoreconf --install)
-
-      if grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null; then
-	if test -z "$NO_LIBTOOLIZE" ; then 
-	  echo "Running libtoolize..."
-	  libtoolize --force --copy
-	fi
-      fi
-      echo "Running aclocal $aclocalinclude ..."
-      aclocal $aclocalinclude
-      if grep "^AM_CONFIG_HEADER" configure.ac >/dev/null; then
-	echo "Running autoheader..."
-	autoheader
-      fi
-      echo "Running automake --gnu -Wno-portability $am_opt ..."
-      automake --add-missing --gnu -Wno-portability $am_opt
-      echo "Running autoconf ..."
-      autoconf
-
-intltoolize --copy --force --automake                  || exit 1
-
-cd "$olddir"
-
-conf_flags="--enable-maintainer-mode --enable-gtk-doc"
-
-if test x$NOCONFIGURE = x; then
-  echo "Running $srcdir/configure $conf_flags $@ ..."
-  $srcdir/configure $conf_flags "$@" \
-  && echo "Now type make to compile." || exit 1
-else
-  echo "Skipping configure process."
-fi

Copied: polkit/repos/gnome-unstable-i686/autogen.sh (from rev 167251, polkit/trunk/autogen.sh)
===================================================================
--- gnome-unstable-i686/autogen.sh	                        (rev 0)
+++ gnome-unstable-i686/autogen.sh	2012-09-29 12:13:31 UTC (rev 167252)
@@ -0,0 +1,123 @@
+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+DIE=0
+
+(test -f $srcdir/configure.ac) || {
+    echo -n "**Error**: Directory $srcdir does not look like the"
+    echo " top-level package directory"
+    exit 1
+}
+
+olddir=`pwd`
+cd "$srcdir"
+
+touch ChangeLog
+
+(autoconf --version) < /dev/null > /dev/null 2>&1 || {
+  echo
+  echo "**Error**: You must have autoconf installed."
+  echo "Download the appropriate package for your distribution,"
+  echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
+  DIE=1
+}
+
+(grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null) && {
+  (libtoolize --version) < /dev/null > /dev/null 2>&1 || {
+    echo
+    echo "**Error**: You must have libtool installed."
+    echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
+    DIE=1
+  }
+}
+
+(gtkdocize --flavour no-tmpl) < /dev/null > /dev/null 2>&1 || {
+	echo
+	echo "You must have gtk-doc installed to compile $PROJECT."
+	echo "Install the appropriate package for your distribution,"
+	echo "or get the source tarball at http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/"
+	DIE=1
+}
+
+(automake --version) < /dev/null > /dev/null 2>&1 || {
+  echo
+  echo "**Error**: You must have automake installed."
+  echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
+  DIE=1
+  NO_AUTOMAKE=yes
+}
+
+
+# if no automake, don't bother testing for aclocal
+test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
+  echo
+  echo "**Error**: Missing aclocal.  The version of automake"
+  echo "installed doesn't appear recent enough."
+  echo "You can get automake from ftp://ftp.gnu.org/pub/gnu/"
+  DIE=1
+}
+
+
+# if no automake, don't bother testing for autoreconf
+test -n "$NO_AUTOMAKE" || (autoreconf --version) < /dev/null > /dev/null 2>&1 || {
+  echo
+  echo "**Error**: You must have autoreconf installed."
+  echo "You can get autoreconf from ..."
+  DIE=1
+}
+
+
+if test "$DIE" -eq 1; then
+  exit 1
+fi
+
+if test -z "$*"; then
+  echo "**Warning**: I am going to run configure with no arguments."
+  echo "If you wish to pass any to it, please specify them on the"
+  echo $0 " command line."
+  echo
+fi
+
+case $CC in
+xlc )
+  am_opt=--include-deps;;
+esac
+
+      aclocalinclude="$ACLOCAL_FLAGS"
+
+      echo "Running autoreconf on test/mocklibc ..."
+      (cd "test/mocklibc"; autoreconf --install)
+
+      if grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null; then
+	if test -z "$NO_LIBTOOLIZE" ; then 
+	  echo "Running libtoolize..."
+	  libtoolize --force --copy
+	fi
+      fi
+      echo "Running aclocal $aclocalinclude ..."
+      aclocal $aclocalinclude
+      if grep "^AM_CONFIG_HEADER" configure.ac >/dev/null; then
+	echo "Running autoheader..."
+	autoheader
+      fi
+      echo "Running automake --gnu -Wno-portability $am_opt ..."
+      automake --add-missing --gnu -Wno-portability $am_opt
+      echo "Running autoconf ..."
+      autoconf
+
+intltoolize --copy --force --automake                  || exit 1
+
+cd "$olddir"
+
+conf_flags="--enable-maintainer-mode --enable-gtk-doc"
+
+if test x$NOCONFIGURE = x; then
+  echo "Running $srcdir/configure $conf_flags $@ ..."
+  $srcdir/configure $conf_flags "$@" \
+  && echo "Now type make to compile." || exit 1
+else
+  echo "Skipping configure process."
+fi

Copied: polkit/repos/gnome-unstable-i686/fix-empty-wheel.patch (from rev 167251, polkit/trunk/fix-empty-wheel.patch)
===================================================================
--- gnome-unstable-i686/fix-empty-wheel.patch	                        (rev 0)
+++ gnome-unstable-i686/fix-empty-wheel.patch	2012-09-29 12:13:31 UTC (rev 167252)
@@ -0,0 +1,47 @@
+From fa04223240d46641b0773dbf9f7d72f529046bea Mon Sep 17 00:00:00 2001
+From: David Zeuthen <zeuthen at gmail.com>
+Date: Tue, 18 Sep 2012 18:47:06 +0000
+Subject: Fall back to authenticating as uid 0 if the list of admin identities is empty
+
+For example, this can happen if the wheel group has no members. This
+was reported in Red Hat bug 834494, see
+
+ https://bugzilla.redhat.com/show_bug.cgi?id=834494
+
+Signed-off-by: David Zeuthen <zeuthen at gmail.com>
+---
+diff --git a/src/polkitbackend/polkitbackendinteractiveauthority.c b/src/polkitbackend/polkitbackendinteractiveauthority.c
+index 1d4a555..3bd2f0b 100644
+--- a/src/polkitbackend/polkitbackendinteractiveauthority.c
++++ b/src/polkitbackend/polkitbackendinteractiveauthority.c
+@@ -1293,15 +1293,11 @@ polkit_backend_interactive_authority_get_admin_identities (PolkitBackendInteract
+                                                            PolkitDetails                     *details)
+ {
+   PolkitBackendInteractiveAuthorityClass *klass;
+-  GList *ret;
++  GList *ret = NULL;
+ 
+   klass = POLKIT_BACKEND_INTERACTIVE_AUTHORITY_GET_CLASS (authority);
+ 
+-  if (klass->get_admin_identities == NULL)
+-    {
+-      ret = g_list_prepend (NULL, polkit_unix_user_new (0));
+-    }
+-  else
++  if (klass->get_admin_identities != NULL)
+     {
+       ret = klass->get_admin_identities (authority,
+                                          caller,
+@@ -2257,6 +2253,10 @@ authentication_agent_initiate_challenge (AuthenticationAgent         *agent,
+         }
+     }
+ 
++  /* Fall back to uid 0 if no users are available (rhbz #834494) */
++  if (user_identities == NULL)
++    user_identities = g_list_prepend (NULL, polkit_unix_user_new (0));
++
+   session = authentication_session_new (agent,
+                                         cookie,
+                                         subject,
+--
+cgit v0.9.0.2-2-gbebe

Deleted: gnome-unstable-i686/polkit.install
===================================================================
--- gnome-unstable-i686/polkit.install	2012-09-29 12:12:01 UTC (rev 167251)
+++ gnome-unstable-i686/polkit.install	2012-09-29 12:13:31 UTC (rev 167252)
@@ -1,18 +0,0 @@
-post_install() {
-       getent group polkitd >/dev/null || groupadd -g 102 polkitd
-       getent passwd polkitd >/dev/null || useradd -c 'Policy Kit Daemon' -u 102 -g polkitd -d '/' -s /bin/false polkitd
-       passwd -l polkitd &>/dev/null
-}
-
-post_upgrade() {
-       post_install
-}
-
-post_remove() {
-       if getent passwd polkitd >/dev/null; then
-               userdel polkitd
-       fi
-       if getent group polkitd >/dev/null; then
-               groupdel polkitd
-       fi
-}

Copied: polkit/repos/gnome-unstable-i686/polkit.install (from rev 167251, polkit/trunk/polkit.install)
===================================================================
--- gnome-unstable-i686/polkit.install	                        (rev 0)
+++ gnome-unstable-i686/polkit.install	2012-09-29 12:13:31 UTC (rev 167252)
@@ -0,0 +1,18 @@
+post_install() {
+       getent group polkitd >/dev/null || groupadd -g 102 polkitd
+       getent passwd polkitd >/dev/null || useradd -c 'Policy Kit Daemon' -u 102 -g polkitd -d '/' -s /bin/false polkitd
+       passwd -l polkitd &>/dev/null
+}
+
+post_upgrade() {
+       post_install
+}
+
+post_remove() {
+       if getent passwd polkitd >/dev/null; then
+               userdel polkitd
+       fi
+       if getent group polkitd >/dev/null; then
+               groupdel polkitd
+       fi
+}

Deleted: gnome-unstable-i686/polkit.pam
===================================================================
--- gnome-unstable-i686/polkit.pam	2012-09-29 12:12:01 UTC (rev 167251)
+++ gnome-unstable-i686/polkit.pam	2012-09-29 12:13:31 UTC (rev 167252)
@@ -1,7 +0,0 @@
-auth            requisite       pam_nologin.so
-auth            required        pam_env.so
-auth            required        pam_unix.so
-account         required        pam_unix.so
-session         required        pam_limits.so
-session         required        pam_unix.so
-password        required        pam_unix.so

Copied: polkit/repos/gnome-unstable-i686/polkit.pam (from rev 167251, polkit/trunk/polkit.pam)
===================================================================
--- gnome-unstable-i686/polkit.pam	                        (rev 0)
+++ gnome-unstable-i686/polkit.pam	2012-09-29 12:13:31 UTC (rev 167252)
@@ -0,0 +1,7 @@
+auth            requisite       pam_nologin.so
+auth            required        pam_env.so
+auth            required        pam_unix.so
+account         required        pam_unix.so
+session         required        pam_limits.so
+session         required        pam_unix.so
+password        required        pam_unix.so

Deleted: gnome-unstable-x86_64/PKGBUILD
===================================================================
--- gnome-unstable-x86_64/PKGBUILD	2012-09-29 12:12:01 UTC (rev 167251)
+++ gnome-unstable-x86_64/PKGBUILD	2012-09-29 12:13:31 UTC (rev 167252)
@@ -1,39 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=polkit
-pkgver=0.107
-pkgrel=3
-pkgdesc="Application development toolkit for controlling system-wide privileges"
-arch=(i686 x86_64)
-license=('LGPL')
-url="http://www.freedesktop.org/wiki/Software/PolicyKit"
-depends=('glib2' 'pam' 'expat' 'libsystemd' 'js')
-makedepends=('intltool' 'gtk-doc' 'gobject-introspection')
-replaces=('policykit')
-options=('!libtool')
-install=polkit.install
-source=(http://www.freedesktop.org/software/polkit/releases/$pkgname-$pkgver.tar.gz
-        polkit.pam)
-md5sums=('0e4f9c53f43fd1b25ac3f0d2e09b2ae1'
-         '6564f95878297b954f0572bc1610dd15')
-
-build() {
-  cd $pkgname-$pkgver
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --libexecdir=/usr/lib/polkit-1 \
-      --with-systemdsystemunitdir=/usr/lib/systemd/system \
-      --disable-static --enable-gtk-doc
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  chown 102 "$pkgdir/etc/polkit-1/rules.d"
-  chown 102 "$pkgdir/usr/share/polkit-1/rules.d"
-
-  install -m644 "$srcdir/polkit.pam" "$pkgdir/etc/pam.d/polkit-1"
-}

Copied: polkit/repos/gnome-unstable-x86_64/PKGBUILD (from rev 167251, polkit/trunk/PKGBUILD)
===================================================================
--- gnome-unstable-x86_64/PKGBUILD	                        (rev 0)
+++ gnome-unstable-x86_64/PKGBUILD	2012-09-29 12:13:31 UTC (rev 167252)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=polkit
+pkgver=0.107
+pkgrel=4
+pkgdesc="Application development toolkit for controlling system-wide privileges"
+arch=(i686 x86_64)
+license=('LGPL')
+url="http://www.freedesktop.org/wiki/Software/PolicyKit"
+depends=('glib2' 'pam' 'expat' 'libsystemd' 'js')
+makedepends=('intltool' 'gtk-doc' 'gobject-introspection')
+replaces=('policykit')
+options=('!libtool')
+install=polkit.install
+source=(http://www.freedesktop.org/software/polkit/releases/$pkgname-$pkgver.tar.gz
+        polkit.pam fix-empty-wheel.patch)
+md5sums=('0e4f9c53f43fd1b25ac3f0d2e09b2ae1'
+         '6564f95878297b954f0572bc1610dd15'
+         'c99ab2a7919ad0b69fde4804c043b07f')
+
+build() {
+  cd $pkgname-$pkgver
+
+  # https://bugs.archlinux.org/task/31717
+  patch -Np1 -i ../fix-empty-wheel.patch
+
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --libexecdir=/usr/lib/polkit-1 \
+      --with-systemdsystemunitdir=/usr/lib/systemd/system \
+      --disable-static --enable-gtk-doc
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+
+  chown 102 "$pkgdir/etc/polkit-1/rules.d"
+  chown 102 "$pkgdir/usr/share/polkit-1/rules.d"
+
+  install -m644 "$srcdir/polkit.pam" "$pkgdir/etc/pam.d/polkit-1"
+}

Deleted: gnome-unstable-x86_64/autogen.sh
===================================================================
--- gnome-unstable-x86_64/autogen.sh	2012-09-29 12:12:01 UTC (rev 167251)
+++ gnome-unstable-x86_64/autogen.sh	2012-09-29 12:13:31 UTC (rev 167252)
@@ -1,123 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-DIE=0
-
-(test -f $srcdir/configure.ac) || {
-    echo -n "**Error**: Directory $srcdir does not look like the"
-    echo " top-level package directory"
-    exit 1
-}
-
-olddir=`pwd`
-cd "$srcdir"
-
-touch ChangeLog
-
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
-  echo
-  echo "**Error**: You must have autoconf installed."
-  echo "Download the appropriate package for your distribution,"
-  echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
-  DIE=1
-}
-
-(grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null) && {
-  (libtoolize --version) < /dev/null > /dev/null 2>&1 || {
-    echo
-    echo "**Error**: You must have libtool installed."
-    echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
-    DIE=1
-  }
-}
-
-(gtkdocize --flavour no-tmpl) < /dev/null > /dev/null 2>&1 || {
-	echo
-	echo "You must have gtk-doc installed to compile $PROJECT."
-	echo "Install the appropriate package for your distribution,"
-	echo "or get the source tarball at http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/"
-	DIE=1
-}
-
-(automake --version) < /dev/null > /dev/null 2>&1 || {
-  echo
-  echo "**Error**: You must have automake installed."
-  echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
-  DIE=1
-  NO_AUTOMAKE=yes
-}
-
-
-# if no automake, don't bother testing for aclocal
-test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
-  echo
-  echo "**Error**: Missing aclocal.  The version of automake"
-  echo "installed doesn't appear recent enough."
-  echo "You can get automake from ftp://ftp.gnu.org/pub/gnu/"
-  DIE=1
-}
-
-
-# if no automake, don't bother testing for autoreconf
-test -n "$NO_AUTOMAKE" || (autoreconf --version) < /dev/null > /dev/null 2>&1 || {
-  echo
-  echo "**Error**: You must have autoreconf installed."
-  echo "You can get autoreconf from ..."
-  DIE=1
-}
-
-
-if test "$DIE" -eq 1; then
-  exit 1
-fi
-
-if test -z "$*"; then
-  echo "**Warning**: I am going to run configure with no arguments."
-  echo "If you wish to pass any to it, please specify them on the"
-  echo $0 " command line."
-  echo
-fi
-
-case $CC in
-xlc )
-  am_opt=--include-deps;;
-esac
-
-      aclocalinclude="$ACLOCAL_FLAGS"
-
-      echo "Running autoreconf on test/mocklibc ..."
-      (cd "test/mocklibc"; autoreconf --install)
-
-      if grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null; then
-	if test -z "$NO_LIBTOOLIZE" ; then 
-	  echo "Running libtoolize..."
-	  libtoolize --force --copy
-	fi
-      fi
-      echo "Running aclocal $aclocalinclude ..."
-      aclocal $aclocalinclude
-      if grep "^AM_CONFIG_HEADER" configure.ac >/dev/null; then
-	echo "Running autoheader..."
-	autoheader
-      fi
-      echo "Running automake --gnu -Wno-portability $am_opt ..."
-      automake --add-missing --gnu -Wno-portability $am_opt
-      echo "Running autoconf ..."
-      autoconf
-
-intltoolize --copy --force --automake                  || exit 1
-
-cd "$olddir"
-
-conf_flags="--enable-maintainer-mode --enable-gtk-doc"
-
-if test x$NOCONFIGURE = x; then
-  echo "Running $srcdir/configure $conf_flags $@ ..."
-  $srcdir/configure $conf_flags "$@" \
-  && echo "Now type make to compile." || exit 1
-else
-  echo "Skipping configure process."
-fi

Copied: polkit/repos/gnome-unstable-x86_64/autogen.sh (from rev 167251, polkit/trunk/autogen.sh)
===================================================================
--- gnome-unstable-x86_64/autogen.sh	                        (rev 0)
+++ gnome-unstable-x86_64/autogen.sh	2012-09-29 12:13:31 UTC (rev 167252)
@@ -0,0 +1,123 @@
+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+DIE=0
+
+(test -f $srcdir/configure.ac) || {
+    echo -n "**Error**: Directory $srcdir does not look like the"
+    echo " top-level package directory"
+    exit 1
+}
+
+olddir=`pwd`
+cd "$srcdir"
+
+touch ChangeLog
+
+(autoconf --version) < /dev/null > /dev/null 2>&1 || {
+  echo
+  echo "**Error**: You must have autoconf installed."
+  echo "Download the appropriate package for your distribution,"
+  echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
+  DIE=1
+}
+
+(grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null) && {
+  (libtoolize --version) < /dev/null > /dev/null 2>&1 || {
+    echo
+    echo "**Error**: You must have libtool installed."
+    echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
+    DIE=1
+  }
+}
+
+(gtkdocize --flavour no-tmpl) < /dev/null > /dev/null 2>&1 || {
+	echo
+	echo "You must have gtk-doc installed to compile $PROJECT."
+	echo "Install the appropriate package for your distribution,"
+	echo "or get the source tarball at http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/"
+	DIE=1
+}
+
+(automake --version) < /dev/null > /dev/null 2>&1 || {
+  echo
+  echo "**Error**: You must have automake installed."
+  echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
+  DIE=1
+  NO_AUTOMAKE=yes
+}
+
+
+# if no automake, don't bother testing for aclocal
+test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
+  echo
+  echo "**Error**: Missing aclocal.  The version of automake"
+  echo "installed doesn't appear recent enough."
+  echo "You can get automake from ftp://ftp.gnu.org/pub/gnu/"
+  DIE=1
+}
+
+
+# if no automake, don't bother testing for autoreconf
+test -n "$NO_AUTOMAKE" || (autoreconf --version) < /dev/null > /dev/null 2>&1 || {
+  echo
+  echo "**Error**: You must have autoreconf installed."
+  echo "You can get autoreconf from ..."
+  DIE=1
+}
+
+
+if test "$DIE" -eq 1; then
+  exit 1
+fi
+
+if test -z "$*"; then
+  echo "**Warning**: I am going to run configure with no arguments."
+  echo "If you wish to pass any to it, please specify them on the"
+  echo $0 " command line."
+  echo
+fi
+
+case $CC in
+xlc )
+  am_opt=--include-deps;;
+esac
+
+      aclocalinclude="$ACLOCAL_FLAGS"
+
+      echo "Running autoreconf on test/mocklibc ..."
+      (cd "test/mocklibc"; autoreconf --install)
+
+      if grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null; then
+	if test -z "$NO_LIBTOOLIZE" ; then 
+	  echo "Running libtoolize..."
+	  libtoolize --force --copy
+	fi
+      fi
+      echo "Running aclocal $aclocalinclude ..."
+      aclocal $aclocalinclude
+      if grep "^AM_CONFIG_HEADER" configure.ac >/dev/null; then
+	echo "Running autoheader..."
+	autoheader
+      fi
+      echo "Running automake --gnu -Wno-portability $am_opt ..."
+      automake --add-missing --gnu -Wno-portability $am_opt
+      echo "Running autoconf ..."
+      autoconf
+
+intltoolize --copy --force --automake                  || exit 1
+
+cd "$olddir"
+
+conf_flags="--enable-maintainer-mode --enable-gtk-doc"
+
+if test x$NOCONFIGURE = x; then
+  echo "Running $srcdir/configure $conf_flags $@ ..."
+  $srcdir/configure $conf_flags "$@" \
+  && echo "Now type make to compile." || exit 1
+else
+  echo "Skipping configure process."
+fi

Copied: polkit/repos/gnome-unstable-x86_64/fix-empty-wheel.patch (from rev 167251, polkit/trunk/fix-empty-wheel.patch)
===================================================================
--- gnome-unstable-x86_64/fix-empty-wheel.patch	                        (rev 0)
+++ gnome-unstable-x86_64/fix-empty-wheel.patch	2012-09-29 12:13:31 UTC (rev 167252)
@@ -0,0 +1,47 @@
+From fa04223240d46641b0773dbf9f7d72f529046bea Mon Sep 17 00:00:00 2001
+From: David Zeuthen <zeuthen at gmail.com>
+Date: Tue, 18 Sep 2012 18:47:06 +0000
+Subject: Fall back to authenticating as uid 0 if the list of admin identities is empty
+
+For example, this can happen if the wheel group has no members. This
+was reported in Red Hat bug 834494, see
+
+ https://bugzilla.redhat.com/show_bug.cgi?id=834494
+
+Signed-off-by: David Zeuthen <zeuthen at gmail.com>
+---
+diff --git a/src/polkitbackend/polkitbackendinteractiveauthority.c b/src/polkitbackend/polkitbackendinteractiveauthority.c
+index 1d4a555..3bd2f0b 100644
+--- a/src/polkitbackend/polkitbackendinteractiveauthority.c
++++ b/src/polkitbackend/polkitbackendinteractiveauthority.c
+@@ -1293,15 +1293,11 @@ polkit_backend_interactive_authority_get_admin_identities (PolkitBackendInteract
+                                                            PolkitDetails                     *details)
+ {
+   PolkitBackendInteractiveAuthorityClass *klass;
+-  GList *ret;
++  GList *ret = NULL;
+ 
+   klass = POLKIT_BACKEND_INTERACTIVE_AUTHORITY_GET_CLASS (authority);
+ 
+-  if (klass->get_admin_identities == NULL)
+-    {
+-      ret = g_list_prepend (NULL, polkit_unix_user_new (0));
+-    }
+-  else
++  if (klass->get_admin_identities != NULL)
+     {
+       ret = klass->get_admin_identities (authority,
+                                          caller,
+@@ -2257,6 +2253,10 @@ authentication_agent_initiate_challenge (AuthenticationAgent         *agent,
+         }
+     }
+ 
++  /* Fall back to uid 0 if no users are available (rhbz #834494) */
++  if (user_identities == NULL)
++    user_identities = g_list_prepend (NULL, polkit_unix_user_new (0));
++
+   session = authentication_session_new (agent,
+                                         cookie,
+                                         subject,
+--
+cgit v0.9.0.2-2-gbebe

Deleted: gnome-unstable-x86_64/polkit.install
===================================================================
--- gnome-unstable-x86_64/polkit.install	2012-09-29 12:12:01 UTC (rev 167251)
+++ gnome-unstable-x86_64/polkit.install	2012-09-29 12:13:31 UTC (rev 167252)
@@ -1,18 +0,0 @@
-post_install() {
-       getent group polkitd >/dev/null || groupadd -g 102 polkitd
-       getent passwd polkitd >/dev/null || useradd -c 'Policy Kit Daemon' -u 102 -g polkitd -d '/' -s /bin/false polkitd
-       passwd -l polkitd &>/dev/null
-}
-
-post_upgrade() {
-       post_install
-}
-
-post_remove() {
-       if getent passwd polkitd >/dev/null; then
-               userdel polkitd
-       fi
-       if getent group polkitd >/dev/null; then
-               groupdel polkitd
-       fi
-}

Copied: polkit/repos/gnome-unstable-x86_64/polkit.install (from rev 167251, polkit/trunk/polkit.install)
===================================================================
--- gnome-unstable-x86_64/polkit.install	                        (rev 0)
+++ gnome-unstable-x86_64/polkit.install	2012-09-29 12:13:31 UTC (rev 167252)
@@ -0,0 +1,18 @@
+post_install() {
+       getent group polkitd >/dev/null || groupadd -g 102 polkitd
+       getent passwd polkitd >/dev/null || useradd -c 'Policy Kit Daemon' -u 102 -g polkitd -d '/' -s /bin/false polkitd
+       passwd -l polkitd &>/dev/null
+}
+
+post_upgrade() {
+       post_install
+}
+
+post_remove() {
+       if getent passwd polkitd >/dev/null; then
+               userdel polkitd
+       fi
+       if getent group polkitd >/dev/null; then
+               groupdel polkitd
+       fi
+}

Deleted: gnome-unstable-x86_64/polkit.pam
===================================================================
--- gnome-unstable-x86_64/polkit.pam	2012-09-29 12:12:01 UTC (rev 167251)
+++ gnome-unstable-x86_64/polkit.pam	2012-09-29 12:13:31 UTC (rev 167252)
@@ -1,7 +0,0 @@
-auth            requisite       pam_nologin.so
-auth            required        pam_env.so
-auth            required        pam_unix.so
-account         required        pam_unix.so
-session         required        pam_limits.so
-session         required        pam_unix.so
-password        required        pam_unix.so

Copied: polkit/repos/gnome-unstable-x86_64/polkit.pam (from rev 167251, polkit/trunk/polkit.pam)
===================================================================
--- gnome-unstable-x86_64/polkit.pam	                        (rev 0)
+++ gnome-unstable-x86_64/polkit.pam	2012-09-29 12:13:31 UTC (rev 167252)
@@ -0,0 +1,7 @@
+auth            requisite       pam_nologin.so
+auth            required        pam_env.so
+auth            required        pam_unix.so
+account         required        pam_unix.so
+session         required        pam_limits.so
+session         required        pam_unix.so
+password        required        pam_unix.so




More information about the arch-commits mailing list