[arch-commits] Commit in xbmc/trunk (PKGBUILD polkit.rules xbmc.install)
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
===
--- PKGBUILD2014-06-02 18:37:10 UTC (rev 112479)
+++ PKGBUILD2014-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.rules2014-06-02 18:37:10 UTC (rev 112479)
+++ polkit.rules2014-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.install2014-06-02 18:37:10 UTC (rev 112479)
+++ xbmc.install2014-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() {
[arch-commits] Commit in xbmc/trunk (PKGBUILD polkit.rules xbmc.install xbmc.service)
Date: Thursday, November 28, 2013 @ 12:19:57
Author: spupykin
Revision: 101586
upgpkg: xbmc 12.2-7
upd
Added:
xbmc/trunk/polkit.rules
Modified:
xbmc/trunk/PKGBUILD
xbmc/trunk/xbmc.install
xbmc/trunk/xbmc.service
--+
PKGBUILD | 10 ++
polkit.rules | 11 +++
xbmc.install |2 +-
xbmc.service |4 ++--
4 files changed, 20 insertions(+), 7 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-11-28 09:48:48 UTC (rev 101585)
+++ PKGBUILD2013-11-28 11:19:57 UTC (rev 101586)
@@ -9,7 +9,7 @@
pkgname=xbmc
pkgver=12.2
-pkgrel=6
+pkgrel=7
pkgdesc=A software media player and entertainment hub for digital media
arch=('i686' 'x86_64')
url=http://xbmc.org;
@@ -31,9 +31,11 @@
'xorg-xinit: autostart xbmc')
install=${pkgname}.install
source=(http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz;
- xbmc.service)
+ xbmc.service
+ polkit.rules)
md5sums=('489f3877decae4e265ece54f9eaef0ba'
- '76fae229ebc3bcfaab7e7f27e4fb51f5')
+ '8312d6d4ac5d7c3d9eed40ab08a17d3b'
+ 'd4cbb6609c8e7b713c714241f529000e')
build() {
cd ${srcdir}/xbmc-$pkgver
@@ -106,7 +108,7 @@
mv ${pkgdir}${_prefix}/share/doc/xbmc/${licensef}
${pkgdir}${_prefix}/share/licenses/${pkgname}
done
- # systemd stuff
install -Dm0644 $srcdir/xbmc.service
$pkgdir/usr/lib/systemd/system/xbmc.service
+ install -Dm0644 $srcdir/polkit.rules
$pkgdir/etc/polkit-1/rules.d/10-xbmc.rules
}
# vim:set ts=2 sw=2 et:
Added: polkit.rules
===
--- polkit.rules(rev 0)
+++ polkit.rules2013-11-28 11:19:57 UTC (rev 101586)
@@ -0,0 +1,11 @@
+polkit.addRule(function(action, subject) {
+ if (action.id.match(org.freedesktop.login1.)
subject.isInGroup(power)) {
+return polkit.Result.YES;
+ }
+});
+
+polkit.addRule(function(action, subject) {
+ if (action.id.indexOf(org.freedesktop.udisks) == 0
subject.isInGroup(storage)) {
+return polkit.Result.YES;
+ }
+});
Modified: xbmc.install
===
--- xbmc.install2013-11-28 09:48:48 UTC (rev 101585)
+++ xbmc.install2013-11-28 11:19:57 UTC (rev 101586)
@@ -3,7 +3,7 @@
[[ $(type -p update-desktop-database) ]] usr/bin/update-desktop-database
-q usr/share/applications
getent group xbmc /dev/null || groupadd xbmc
getent passwd xbmc /dev/null || useradd -m -d /var/lib/xbmc -g xbmc xbmc
- usermod -a -G xbmc,audio,video,power,network,optical,storage,disk xbmc
+ usermod -a -G
xbmc,audio,video,power,network,optical,storage,disk,upower,udisks xbmc
}
post_upgrade() {
Modified: xbmc.service
===
--- xbmc.service2013-11-28 09:48:48 UTC (rev 101585)
+++ xbmc.service2013-11-28 11:19:57 UTC (rev 101586)
@@ -6,8 +6,8 @@
User = xbmc
Group = xbmc
Type = simple
-ExecStart = /usr/bin/xinit /usr/bin/xbmc-standalone -- :0 -nolisten tcp
-Restart = always
+ExecStart = /usr/bin/xinit /usr/bin/xbmc-standalone -l /run/lirc/lircd -- :0
-nolisten tcp
+Restart = on-abort
[Install]
WantedBy = multi-user.target
