uppkg

4 files changed, 37 insertions, 46 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7ccd157..ef69f3d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,9 @@
 pkgbase = polkit-git
 	pkgdesc = Application development toolkit for controlling system-wide privileges
-	pkgver = 0.113.r29.g3272a98
+	pkgver = 0.115.r7.g42227b5
 	pkgrel = 1
 	epoch = 1
-	url = http://www.freedesktop.org/wiki/Software/polkit
-	install = polkit.install
+	url = https://www.freedesktop.org/wiki/Software/polkit/
 	arch = i686
 	arch = x86_64
 	license = LGPL
@@ -12,17 +11,18 @@ pkgbase = polkit-git
 	makedepends = gtk-doc
 	makedepends = gobject-introspection
 	makedepends = git
+	makedepends = autoconf-archive
+	makedepends = python-six
 	depends = glib2
 	depends = pam
 	depends = expat
 	depends = systemd
-	depends = js
+	depends = js52
 	provides = polkit
 	conflicts = polkit
+	options = !emptydirs
 	source = polkit-git::git+http://anongit.freedesktop.org/git/polkit.git
-	source = polkit.pam
-	md5sums = SKIP
-	md5sums = 6564f95878297b954f0572bc1610dd15
+	sha256sums = SKIP
 
 pkgname = polkit-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 1b5ab0d..3f69aef 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,20 +4,20 @@
 # Contributor: Aline Freitas <aline@alinefreitas.com.br>
 
 pkgname=polkit-git
-pkgver=0.113.r29.g3272a98
+pkgver=0.115.r7.g42227b5
 pkgrel=1
 epoch=1
 pkgdesc="Application development toolkit for controlling system-wide privileges"
 arch=(i686 x86_64)
 license=(LGPL)
-url="http://www.freedesktop.org/wiki/Software/polkit"
-depends=(glib2 pam expat systemd js)
-makedepends=(intltool gtk-doc gobject-introspection git)
-install=polkit.install
+url="https://www.freedesktop.org/wiki/Software/polkit/"
+depends=(glib2 pam expat systemd js52)
+makedepends=(intltool gtk-doc gobject-introspection git autoconf-archive python-six)
 provides=('polkit')
 conflicts=('polkit')
-source=($pkgname::git+http://anongit.freedesktop.org/git/polkit.git
-	polkit.pam)
+options=('!emptydirs')
+source=($pkgname::git+http://anongit.freedesktop.org/git/polkit.git)
+sha256sums=('SKIP')
 
 pkgver() {
   cd $pkgname
@@ -28,20 +28,36 @@ build() {
   cd $pkgname
 
   ./autogen.sh --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --libexecdir=/usr/lib/polkit-1 \
+      --localstatedir=/var --libexecdir=/usr/lib \
       --enable-libsystemd-login=yes --disable-static \
-      --enable-gtk-doc --with-mozjs=mozjs-17.0
+      --enable-gtk-doc --with-os-type=redhat
+
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
   make
 }
 
+check() {
+  cd $pkgname
+  make -k check || :
+}
+
 package() {
   cd $pkgname
   make DESTDIR="$pkgdir" install
 
-  chown 102 "$pkgdir/etc/polkit-1/rules.d"
-  chown 102 "$pkgdir/usr/share/polkit-1/rules.d"
+  chmod 0755 "$pkgdir/etc/polkit-1/rules.d"
+  chmod 0755 "$pkgdir/usr/share/polkit-1/rules.d"
+
+  install -Dm644 /dev/stdin "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf" <<END
+d /etc/polkit-1/rules.d 0750 root polkitd -
+d /usr/share/polkit-1/rules.d 0750 root polkitd -
+END
 
-  install -m644 "$srcdir/polkit.pam" "$pkgdir/etc/pam.d/polkit-1"
+  install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/$pkgname.conf" <<END
+u polkitd 102 "PolicyKit daemon"
+m polkitd proc
+END
 }
-md5sums=('SKIP'
-	 '6564f95878297b954f0572bc1610dd15')
+
+# vim: ts=2 sw=2 et:
diff --git a/polkit.install b/polkit.install
deleted file mode 100644
index fbb9891..0000000
--- a/polkit.install
+++ /dev/null
@@ -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
-}
diff --git a/polkit.pam b/polkit.pam
deleted file mode 100644
index 04f53e0..0000000
--- a/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