diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-06-02 21:57:58 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-06-02 21:57:58 -0300 |
| commit | 1e3c2d63629bd2c390f05a016d0677586b0745ed (patch) | |
| tree | da428a956679e327a3dc8a79d47a8ad95c42ef8c /libre/xbmc-libre-lts | |
| parent | 134aab80b9d1855bcf43800f4e6e67bfc6a54cae (diff) | |
xbmc-libre-lts-12.3-3: updating revision based on xbmc from Arch
FIXES:
FS#40264 (https://bugs.archlinux.org/task/40264#comment123415) - [xbmc] polkit rules should be in /usr/share/polkit-1/rules.d/
FS#40597 (https://bugs.archlinux.org/task/40597) - [xbmc] screwing with local user xbmc
Diffstat (limited to 'libre/xbmc-libre-lts')
| -rw-r--r-- | libre/xbmc-libre-lts/PKGBUILD | 8 | ||||
| -rw-r--r-- | libre/xbmc-libre-lts/polkit.rules | 12 | ||||
| -rw-r--r-- | libre/xbmc-libre-lts/xbmc.install | 6 |
3 files changed, 5 insertions, 21 deletions
diff --git a/libre/xbmc-libre-lts/PKGBUILD b/libre/xbmc-libre-lts/PKGBUILD index 9be7cda0c..8a146c2dc 100644 --- a/libre/xbmc-libre-lts/PKGBUILD +++ b/libre/xbmc-libre-lts/PKGBUILD @@ -12,7 +12,7 @@ _pkgname=xbmc pkgname=xbmc-libre-lts pkgver=12.3 _codename=Frodo -pkgrel=2 +pkgrel=3 pkgdesc="A software media player and entertainment hub for digital media (Frodo version), without nonfree addons and unrar support" arch=('i686' 'x86_64') url="http://xbmc.org" @@ -45,7 +45,6 @@ mksource=( source=( "https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz" 'xbmc.service' - 'polkit.rules' "libass.patch::https://bugs.archlinux.org/index.php?getfile=11285" '0001-make-sure-applications-xbmc.desktop-does-nt-have-exe.patch' ) @@ -55,7 +54,6 @@ mkmd5sums=( md5sums=( '7c71af50af55b097e4365a58b70754e8' 'de331663cc8adc94f2fe44a262cfff58' - '02f7951824ee13103344f36009c0ef2a' '7fd6399d2ffbdf06b724f0cc2efa0784' '8998bc505ae4c66604c90b1c005be8c2' ) @@ -154,10 +152,6 @@ package() { # 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 diff --git a/libre/xbmc-libre-lts/polkit.rules b/libre/xbmc-libre-lts/polkit.rules deleted file mode 100644 index 4b6d0fda0..000000000 --- a/libre/xbmc-libre-lts/polkit.rules +++ /dev/null @@ -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; - } - } -}); diff --git a/libre/xbmc-libre-lts/xbmc.install b/libre/xbmc-libre-lts/xbmc.install index 6e477d103..406476198 100644 --- a/libre/xbmc-libre-lts/xbmc.install +++ b/libre/xbmc-libre-lts/xbmc.install @@ -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() { |