From 9a7a03953cf9c174b5ced86a9ac8d2ed5288b5f1 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 6 Oct 2012 15:32:40 +0200 Subject: [PATCH] polkit: update to 0.107. --- srcpkgs/polkit/files/polkit.tmpfiles | 2 ++ srcpkgs/polkit/files/polkitd.service | 15 --------------- srcpkgs/polkit/polkit-devel.template | 10 +++++----- srcpkgs/polkit/polkit.rshlibs | 1 + srcpkgs/polkit/template | 24 ++++++++---------------- 5 files changed, 16 insertions(+), 36 deletions(-) create mode 100644 srcpkgs/polkit/files/polkit.tmpfiles delete mode 100644 srcpkgs/polkit/files/polkitd.service diff --git a/srcpkgs/polkit/files/polkit.tmpfiles b/srcpkgs/polkit/files/polkit.tmpfiles new file mode 100644 index 00000000000..722a399d672 --- /dev/null +++ b/srcpkgs/polkit/files/polkit.tmpfiles @@ -0,0 +1,2 @@ +d /etc/polkit-1/rules.d 0700 polkitd polkitd +d /usr/share/polkit-1/rules.d 0700 polkitd polkitd diff --git a/srcpkgs/polkit/files/polkitd.service b/srcpkgs/polkit/files/polkitd.service deleted file mode 100644 index d7033608384..00000000000 --- a/srcpkgs/polkit/files/polkitd.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Policy Manager -After=syslog.target - -[Service] -Type=dbus -BusName=org.freedesktop.PolicyKit1 -ExecStart=/usr/libexec/polkitd -n - -[Install] -# We pull this in by graphical.target instead of waiting for the bus -# activation, to speed things up a little: gdm uses this anyway so it is nice -# if it is already around when gdm wants to use it and doesn't have to wait for -# it. -WantedBy=graphical.target diff --git a/srcpkgs/polkit/polkit-devel.template b/srcpkgs/polkit/polkit-devel.template index e85656baba9..db5cebc2a24 100644 --- a/srcpkgs/polkit/polkit-devel.template +++ b/srcpkgs/polkit/polkit-devel.template @@ -1,6 +1,7 @@ # Template file for 'polkit-devel'. # -depends="glib-devel polkit>=$version" +noarch=yes +depends="glib-devel polkit>=${version}" replaces="PolicyKit-devel>=0" short_desc="${short_desc} (development files)" long_desc="${long_desc} @@ -8,8 +9,7 @@ long_desc="${long_desc} This package contains files for development, headers, static libs, etc." do_install() { - mkdir -p ${DESTDIR}/usr/lib ${DESTDIR}/usr/share - mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/share/gir* ${DESTDIR}/usr/share + vmove usr/include usr + vmove usr/lib/pkgconfig usr/lib + vmove usr/share/gir-1.0 usr/share } diff --git a/srcpkgs/polkit/polkit.rshlibs b/srcpkgs/polkit/polkit.rshlibs index 6dd894e8aa9..7e1452dbd62 100644 --- a/srcpkgs/polkit/polkit.rshlibs +++ b/srcpkgs/polkit/polkit.rshlibs @@ -1,3 +1,4 @@ +libmozjs185.so.1.0 libgobject-2.0.so.0 libglib-2.0.so.0 libpthread.so.0 diff --git a/srcpkgs/polkit/template b/srcpkgs/polkit/template index ed4727e90e8..65f7c9b9cd1 100644 --- a/srcpkgs/polkit/template +++ b/srcpkgs/polkit/template @@ -1,11 +1,12 @@ # Template file for 'polkit' pkgname=polkit -version=0.105 -revision=4 +version=0.107 +revision=1 build_style=gnu-configure -configure_args="--disable-static --enable-systemd=yes" +configure_args="--disable-static --enable-systemd=yes --with-authfw=pam +--with-systemdsystemunitdir=/usr/lib/systemd/system" makedepends="pkg-config intltool libxslt docbook-xsl glib-devel -expat-devel pam-devel systemd-devel gobject-introspection" +expat-devel pam-devel systemd-devel gobject-introspection js-devel" replaces="PolicyKit>=0" subpackages="polkit-devel" short_desc="Authorization Toolkit" @@ -13,7 +14,7 @@ maintainer="Juan RP " homepage="http://www.freedesktop.org/wiki/Software/PolicyKit" license="GPL-2" distfiles="http://www.freedesktop.org/software/polkit/releases/$pkgname-$version.tar.gz" -checksum=8fdc7cc8ba4750fcce1a4db9daa759c12afebc7901237e1c993c38f08985e1df +checksum=c826973db2b226dc8f807af5143f7b8be5d0270f46c0c1241a83b067db9d8311 long_desc=" PolicyKit is an application-level toolkit for defining and handling the policy that allows unprivileged processes to speak to privileged processes. @@ -22,18 +23,9 @@ long_desc=" to granting access to privileged operations (like calling the HAL Mount() method) for unprivileged (desktop) applications." -make_dirs=" -/etc/polkit-1/localauthority 700 root root -/var/lib/polkit-1 700 root root" +system_accounts="polkitd" post_install() { vinstall ${FILESDIR}/polkit-1.pam 644 etc/pam.d polkit-1 - vinstall ${FILESDIR}/polkitd.service 644 usr/lib/systemd/system - - for f in 10-vendor 20-org 30-site 50-local 90-mandatory; do - vmkdir etc/polkit-1/localauthority/${f}.d - touch ${DESTDIR}/etc/polkit-1/localauthority/${f}.d/.owned - vmkdir var/lib/polkit-1/localauthority/${f}.d - touch ${DESTDIR}/var/lib/polkit-1/localauthority/${f}.d/.owned - done + vinstall ${FILESDIR}/polkit.tmpfiles 644 usr/lib/tmpfiles.d polkit.conf }