Bump to 1.1.1 & use bundled drop-in files

5 files changed, 13 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 944485776ac7..f5373f95c486 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,15 @@
 pkgbase = ego
 	pkgdesc = Alter Ego: run Linux desktop applications under a different local user
-	pkgver = 1.1.0
-	pkgrel = 2
+	pkgver = 1.1.1
+	pkgrel = 1
 	url = https://github.com/intgr/ego
 	arch = x86_64
 	license = MIT
 	makedepends = cargo
 	depends = acl
 	optdepends = xdg-desktop-portal-gtk: improved desktop integration
-	source = ego-1.1.0.tar.gz::https://crates.io/api/v1/crates/ego/1.1.0/download
-	source = ego.sysusers
-	source = ego.sudoers
-	source = ego.rules
-	sha512sums = 19fcec3766382a62b35d07590da513955dbbb85678b56d85e932addd47f9ae433054bd61f77f594cfbcf5d541b51c50e6becdda6088f5ecd6c68d6fe9d8eac28
-	sha512sums = 070f1e202f8ec3d46bb248855485a918fe7fd3671033a89628fad3d788dcd656f453373942a9e5adc2856484fe776434d0a333ee534b65399ee1225aae610ee6
-	sha512sums = e89f7f63c680be625fa8b138de3bd9307536173e9690c00c086a1e3cc2948764137c2ea22e29b37d33ae13bcdf4e67190462a5942d913521652ff3b33a9f49c3
-	sha512sums = ed8df913a45f0e5029fdd9370fc6124eb5b7a617ef62fb616b9f13aecb47a54f92751de6ccac03034afbdd1e3f33ad11847a34e1f78b9481b8225f881ad5d69b
+	source = ego-1.1.1.tar.gz::https://crates.io/api/v1/crates/ego/1.1.1/download
+	sha512sums = ccb62a3933d10426c11e560268da7d07ed7fc573c147d4a5cfe590b11b426f1efe8e4b17ac9a523b411105a0ff1c3d915dc3c0a4e208444aa5fdc8a19f3c57f7
 
 pkgname = ego
 
diff --git a/PKGBUILD b/PKGBUILD
index 46379c33b6b1..3a87a8558da5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Marti Raudsepp <marti@juffo.org>
 pkgname=ego
-pkgver=1.1.0
-pkgrel=2
+pkgver=1.1.1
+pkgrel=1
 pkgdesc="Alter Ego: run Linux desktop applications under a different local user"
 arch=('x86_64')
 url="https://github.com/intgr/ego"
@@ -9,15 +9,8 @@ license=('MIT')
 depends=('acl')
 makedepends=('cargo')
 optdepends=('xdg-desktop-portal-gtk: improved desktop integration')
-#source=("$pkgname-$pkgver.tar.gz::https://github.com/intgr/$pkgname/archive/$pkgver.tar.gz")
-source=("$pkgname-$pkgver.tar.gz::https://crates.io/api/v1/crates/$pkgname/$pkgver/download"
-        "ego.sysusers"
-        "ego.sudoers"
-        "ego.rules")
-sha512sums=('19fcec3766382a62b35d07590da513955dbbb85678b56d85e932addd47f9ae433054bd61f77f594cfbcf5d541b51c50e6becdda6088f5ecd6c68d6fe9d8eac28'
-            '070f1e202f8ec3d46bb248855485a918fe7fd3671033a89628fad3d788dcd656f453373942a9e5adc2856484fe776434d0a333ee534b65399ee1225aae610ee6'
-            'e89f7f63c680be625fa8b138de3bd9307536173e9690c00c086a1e3cc2948764137c2ea22e29b37d33ae13bcdf4e67190462a5942d913521652ff3b33a9f49c3'
-            'ed8df913a45f0e5029fdd9370fc6124eb5b7a617ef62fb616b9f13aecb47a54f92751de6ccac03034afbdd1e3f33ad11847a34e1f78b9481b8225f881ad5d69b')
+source=("$pkgname-$pkgver.tar.gz::https://crates.io/api/v1/crates/$pkgname/$pkgver/download")
+sha512sums=('ccb62a3933d10426c11e560268da7d07ed7fc573c147d4a5cfe590b11b426f1efe8e4b17ac9a523b411105a0ff1c3d915dc3c0a4e208444aa5fdc8a19f3c57f7')
 
 build() {
   cd "$pkgname-$pkgver"
@@ -35,11 +28,11 @@ package() {
   install -Dm644 "README.md" "$pkgdir/usr/share/doc/${pkgname}/README.md"
   install -Dm644 "LICENSE" "$pkgdir/usr/share/doc/${pkgname}/LICENSE"
 
-  install -Dm644 "$srcdir/ego.sysusers" "$pkgdir/usr/lib/sysusers.d/ego.conf"
-  install -dm750 "$pkgdir/etc/sudoers.d"
-  install -Dm644 "$srcdir/ego.sudoers" "$pkgdir/etc/sudoers.d/50-ego.conf"
-  install -dm750 "$pkgdir/etc/polkit-1/rules.d"
-  install -Dm644 "$srcdir/ego.rules" "$pkgdir/etc/polkit-1/rules.d/50-ego.rules"
+  install -Dm644 "varia/ego.sysusers.conf" "$pkgdir/usr/lib/sysusers.d/ego.conf"
+  install -dm750                    "$pkgdir/etc/sudoers.d"
+  install -m644 "varia/ego.sudoers" "$pkgdir/etc/sudoers.d/50_ego"
+  install -dm750                  "$pkgdir/usr/share/polkit-1/rules.d"
+  install -m644 "varia/ego.rules" "$pkgdir/usr/share/polkit-1/rules.d/50-ego.rules"
 
   install -Dm644 "varia/ego-completion.zsh" "$pkgdir/usr/share/zsh/site-functions/_ego"
   install -Dm644 "varia/ego-completion.bash"  "$pkgdir/usr/share/bash-completion/completions/ego"
diff --git a/ego.rules b/ego.rules
deleted file mode 100644
index 19a44fa87d05..000000000000
--- a/ego.rules
+++ /dev/null
@@ -1,8 +0,0 @@
-/* Allow users in 'ego-users' group to invoke commands as 'ego' */
-polkit.addRule(function(action, subject) {
-    if (action.id == "org.freedesktop.machine1.host-shell" &&
-        action.lookup("user") == "ego" &&
-        subject.isInGroup("ego-users")) {
-            return polkit.Result.YES;
-    }
-});
diff --git a/ego.sudoers b/ego.sudoers
deleted file mode 100644
index 5a4f9ece7e87..000000000000
--- a/ego.sudoers
+++ /dev/null
@@ -1,2 +0,0 @@
-# Allow users in 'ego-users' group to invoke commands as 'ego'
-%ego-users      ALL=(ego) NOPASSWD:ALL
diff --git a/ego.sysusers b/ego.sysusers
deleted file mode 100644
index 90ddc019ad5c..000000000000
--- a/ego.sysusers
+++ /dev/null
@@ -1,3 +0,0 @@
-#Type Name      ID       GECOS                 Home directory Shell
-u     ego       -        "Alter Ego"           /home/ego      /bin/bash
-g     ego-users -