diff --git a/extra/polkit/PKGBUILD b/extra/polkit/PKGBUILD index 0b563da62..3933b1a55 100644 --- a/extra/polkit/PKGBUILD +++ b/extra/polkit/PKGBUILD @@ -5,8 +5,8 @@ # - moved rules.d directory ownership to polkit.install pkgname=polkit -pkgver=0.112 -pkgrel=4 +pkgver=0.113 +pkgrel=2 pkgdesc="Application development toolkit for controlling system-wide privileges" arch=(i686 x86_64) license=(LGPL) @@ -14,26 +14,20 @@ url="http://www.freedesktop.org/wiki/Software/polkit" depends=(glib2 pam expat systemd js17) makedepends=(intltool gtk-doc gobject-introspection git) install=polkit.install -source=("git://anongit.freedesktop.org/polkit#commit=fb5076b7c05d01a532d593a4079a29cf2d63a228" - polkit.pam) -md5sums=('SKIP' - '6564f95878297b954f0572bc1610dd15') +source=("http://www.freedesktop.org/software/polkit/releases/$pkgname-$pkgver.tar.gz") +md5sums=('4b77776c9e4f897dcfe03b2c34198edf') build() { - cd $pkgname - - NOCONFIGURE=1 ./autogen.sh + cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --libexecdir=/usr/lib/polkit-1 \ --enable-libsystemd-login=yes --disable-static \ - --enable-gtk-doc + --enable-gtk-doc --with-os-type=redhat make } package() { - cd $pkgname + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install - - install -m644 "$srcdir/polkit.pam" "$pkgdir/etc/pam.d/polkit-1" } diff --git a/extra/polkit/polkit.install b/extra/polkit/polkit.install index 6a4dbfd36..b9aa5f3e4 100644 --- a/extra/polkit/polkit.install +++ b/extra/polkit/polkit.install @@ -1,11 +1,14 @@ 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 - chown 102 "$pkgdir/etc/polkit-1/rules.d" - chown 102 "$pkgdir/usr/share/polkit-1/rules.d" + getent group polkitd >/dev/null || groupadd -g 102 polkitd + getent passwd polkitd >/dev/null || useradd -c 'Policy Kit Daemon' -u 102 -g polkitd -G proc -d '/' -s /bin/nologin polkitd + passwd -l polkitd &>/dev/null + chown 102 "$pkgdir/etc/polkit-1/rules.d" + chown 102 "$pkgdir/usr/share/polkit-1/rules.d" } post_upgrade() { - post_install + post_install + if (( $(vercmp $2 0.113-2) < 0 )); then + usermod -aG proc -s /usr/bin/nologin polkitd + fi } diff --git a/extra/polkit/polkit.pam b/extra/polkit/polkit.pam deleted file mode 100644 index 04f53e0db..000000000 --- a/extra/polkit/polkit.pam +++ /dev/null @@ -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