diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-06-02 21:50:54 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-06-02 21:50:54 -0300 |
| commit | 134aab80b9d1855bcf43800f4e6e67bfc6a54cae (patch) | |
| tree | 664b98cdfd38f5a86bdb296de5b6229841e156dc | |
| parent | 888ba65470b25311d05aa55c9f88fb6736ece938 (diff) | |
| download | abslibre-134aab80b9d1855bcf43800f4e6e67bfc6a54cae.tar.gz abslibre-134aab80b9d1855bcf43800f4e6e67bfc6a54cae.tar.bz2 abslibre-134aab80b9d1855bcf43800f4e6e67bfc6a54cae.zip | |
xbmc-libre-13.0-6: updating revision 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
| -rw-r--r-- | libre/xbmc-libre/PKGBUILD | 10 | ||||
| -rw-r--r-- | libre/xbmc-libre/polkit.rules | 12 | ||||
| -rw-r--r-- | libre/xbmc-libre/xbmc.install | 6 |
3 files changed, 6 insertions, 22 deletions
diff --git a/libre/xbmc-libre/PKGBUILD b/libre/xbmc-libre/PKGBUILD index f865e8820..df4d37f38 100644 --- a/libre/xbmc-libre/PKGBUILD +++ b/libre/xbmc-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 111871 2014-05-26 05:27:25Z idevolder $ +# $Id: PKGBUILD 112480 2014-06-02 19:00:07Z idevolder $ # Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor (Arch): Brad Fanella <bradfanella@archlinux.us> # Contributor (Arch): [vEX] <niechift.dot.vex.at.gmail.dot.com> @@ -13,7 +13,7 @@ _pkgname=xbmc pkgname=xbmc-libre pkgver=13.0 _codename=Gotham_r2 -pkgrel=5 +pkgrel=6 pkgdesc="A software media player and entertainment hub for digital media (Gotham version), without nonfree addons and unrar support" arch=('i686' 'x86_64') url="http://xbmc.org" @@ -51,7 +51,6 @@ mksource=( source=( "https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver.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' @@ -62,7 +61,6 @@ mksha256sums=( sha256sums=( 'a23b416f7cdc5f2b3d5544fc9a2ac22c4cdddd117ba82fe8aab25805552ff974' 'f83097388e6c9b301cac78de95cf1797d4aaa11e4021734c28d643320e76d919' - '4ea78374a08e13a64dcf6a424b111b8bfc11de03ed5829744fc6d9b5fc1ec96e' '0239e33e87292c7340ed2092f2b5f1e82f5e283b1f763fb125b3aee78f50c355' '4d643f1bc5a0f9a6bba36c8c2c2d220351acb58172c57d86417b67c02d39fa2b' '5f5fe2932050265ad71c82b5d23efe5eaf7b2b3a152bdc6da66675cfb655fabe' @@ -153,10 +151,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/polkit.rules b/libre/xbmc-libre/polkit.rules deleted file mode 100644 index 4b6d0fda0..000000000 --- a/libre/xbmc-libre/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/xbmc.install b/libre/xbmc-libre/xbmc.install index 6e477d103..406476198 100644 --- a/libre/xbmc-libre/xbmc.install +++ b/libre/xbmc-libre/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() { |