Date: Monday, June 2, 2014 @ 21:00:07 Author: idevolder Revision: 112480
xbmc :: 13.0-6 FS#40264 - [xbmc] polkit rules should be in /usr/share/polkit-1/rules.d/ https://bugs.archlinux.org/task/40264#comment123415 FS#40597 - [xbmc] screwing with local user xbmc Modified: xbmc/trunk/PKGBUILD xbmc/trunk/xbmc.install Deleted: xbmc/trunk/polkit.rules --------------+ PKGBUILD | 8 +------- polkit.rules | 12 ------------ xbmc.install | 6 ++++-- 3 files changed, 5 insertions(+), 21 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-06-02 18:37:10 UTC (rev 112479) +++ PKGBUILD 2014-06-02 19:00:07 UTC (rev 112480) @@ -12,7 +12,7 @@ pkgname=xbmc pkgver=13.0 _codename=Gotham_r2 -pkgrel=5 +pkgrel=6 pkgdesc="A software media player and entertainment hub for digital media" arch=('i686' 'x86_64') url="http://xbmc.org" @@ -45,7 +45,6 @@ source=( "xbmc-$pkgver.tar.gz::https://github.com/xbmc/xbmc/archive/$pkgver-$_codename.tar.gz" 'xbmc.service' - 'polkit.rules' 'enable-external-ffmpeg.patch' '0001-rtmp-check-m_rtmp-for-non-NULL-fixes-crashes-with-mi.patch' '0001-make-sure-applications-xbmc.desktop-does-nt-have-exe.patch' @@ -53,7 +52,6 @@ sha256sums=( '663b99f3e196ead51d90f06ccfa864b4e5ade385dfc5972acb0f854d525f2903' 'f83097388e6c9b301cac78de95cf1797d4aaa11e4021734c28d643320e76d919' - '4ea78374a08e13a64dcf6a424b111b8bfc11de03ed5829744fc6d9b5fc1ec96e' '0239e33e87292c7340ed2092f2b5f1e82f5e283b1f763fb125b3aee78f50c355' '4d643f1bc5a0f9a6bba36c8c2c2d220351acb58172c57d86417b67c02d39fa2b' '5f5fe2932050265ad71c82b5d23efe5eaf7b2b3a152bdc6da66675cfb655fabe' @@ -134,10 +132,6 @@ # install systemd service install -Dm0644 "$srcdir/xbmc.service" "$pkgdir/usr/lib/systemd/system/xbmc.service" - # install polkit rules - install -dm700 "$pkgdir/usr/share/polkit-1/rules.d" - install -Dm0644 "$srcdir/polkit.rules" "$pkgdir/usr/share/polkit-1/rules.d/10-xbmc.rules" - # XBMC user home install -dm 700 "${pkgdir}"/var/lib/xbmc chown 420:420 "${pkgdir}"/var/lib/xbmc Deleted: polkit.rules =================================================================== --- polkit.rules 2014-06-02 18:37:10 UTC (rev 112479) +++ polkit.rules 2014-06-02 19:00:07 UTC (rev 112480) @@ -1,12 +0,0 @@ -polkit.addRule(function(action, subject) { - if (subject.user == "xbmc") { - polkit.log("action=" + action); - polkit.log("subject=" + subject); - if (action.id.indexOf("org.freedesktop.login1.") == 0) { - return polkit.Result.YES; - } - if (action.id.indexOf("org.freedesktop.udisks.") == 0) { - return polkit.Result.YES; - } - } -}); Modified: xbmc.install =================================================================== --- xbmc.install 2014-06-02 18:37:10 UTC (rev 112479) +++ xbmc.install 2014-06-02 19:00:07 UTC (rev 112480) @@ -1,8 +1,10 @@ post_install() { update_icons getent group xbmc > /dev/null || groupadd -g 420 xbmc - getent passwd xbmc > /dev/null || useradd -c 'XBMC user' -u 420 -g xbmc -G audio,video,network,optical -d /var/lib/xbmc -s /sbin/nologin xbmc - passwd -l xbmc > /dev/null + if ! getent passwd xbmc > /dev/null; then + useradd -c 'XBMC user' -u 420 -g xbmc -G audio,video,network,optical -d /var/lib/xbmc -s /sbin/nologin xbmc + passwd -l xbmc > /dev/null + fi } post_upgrade() {