Install udev rules file to allow barrybackup to be launched as non-root user

3 files changed, 38 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c458feda7c6a..e2db920105b3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = barry
 	pkgdesc = Barry is an Open Source application that provides a Desktop GUI, synchronization, backup, restore and program management for BlackBerry ™ devices.
 	pkgver = 0.18.5
-	pkgrel = 6
+	pkgrel = 8
 	url = https://github.com/NetDirect/barry
 	arch = i686
 	arch = x86_64
@@ -24,6 +24,7 @@ pkgbase = barry
 	source = wx3.0-compat.patch
 	source = c++11.patch
 	source = iterator-buildfix.patch
+	source = libusb-rules-noplugdev.patch
 	sha256sums = cfe5224c34b25575543bbdeebf979074f76ccc7d37116f15aef20509e6c06c91
 	sha256sums = aa97e456e0bb1f39cf0d95b1f35080d328947a3bcf40b2b97a0ab11ad34ccc21
 	sha256sums = 1c6ecd68977da4a3184c3e6d4bea36e4c40949d6bf7bb4ad8717aa6c19fed4fa
@@ -31,6 +32,7 @@ pkgbase = barry
 	sha256sums = d89dec40916c99355426a9430130a34b9c9f8deccf2e0bd2be75c6eea46249f3
 	sha256sums = bd211b7323a36f255af7cad13b886d8bb45d74f1d2bcecef00733bb5a9080f2c
 	sha256sums = 690d6d9cdd5f84ac120e5e2a0c974916217a059c25ad08dd1b45b33d858993ad
+	sha256sums = 2da11475bb3d5c9c94f7625b33e3ae29442413b25f320e9f70d4777180d5bd4a
 
 pkgname = barry
 
diff --git a/PKGBUILD b/PKGBUILD
index bc6cb2461d0e..e9e79c16916c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=barry
 pkgver=0.18.5
-pkgrel=6
+pkgrel=8
 pkgdesc="Barry is an Open Source application that provides a Desktop GUI, synchronization, backup, restore and program management for BlackBerry ™ devices."
 url=https://github.com/NetDirect/barry
 license=('GPL')
@@ -19,14 +19,16 @@ source=("https://github.com/NetDirect/${pkgname}/archive/${pkgname}-${pkgver}.ta
         "fix-sizeof-use.patch"
         "wx3.0-compat.patch"
         "c++11.patch"
-        "iterator-buildfix.patch")
+        "iterator-buildfix.patch"
+        "libusb-rules-noplugdev.patch")
 sha256sums=('cfe5224c34b25575543bbdeebf979074f76ccc7d37116f15aef20509e6c06c91'
             'aa97e456e0bb1f39cf0d95b1f35080d328947a3bcf40b2b97a0ab11ad34ccc21'
             '1c6ecd68977da4a3184c3e6d4bea36e4c40949d6bf7bb4ad8717aa6c19fed4fa'
             'd1eb3ff669d5d8490112ceb4138fe9eb107bdbbc8621c98ead5ff47b9a7faf4e'
             'd89dec40916c99355426a9430130a34b9c9f8deccf2e0bd2be75c6eea46249f3'
             'bd211b7323a36f255af7cad13b886d8bb45d74f1d2bcecef00733bb5a9080f2c'
-            '690d6d9cdd5f84ac120e5e2a0c974916217a059c25ad08dd1b45b33d858993ad')
+            '690d6d9cdd5f84ac120e5e2a0c974916217a059c25ad08dd1b45b33d858993ad'
+            '2da11475bb3d5c9c94f7625b33e3ae29442413b25f320e9f70d4777180d5bd4a')
 
 prepare() {
   mv ${srcdir}/${pkgname}-${pkgname}-${pkgver} ${srcdir}/${pkgname}-${pkgver}
@@ -42,6 +44,10 @@ prepare() {
   # Fix build failure for functions that return reverse iterators
   patch -Np1 -i "${srcdir}/iterator-buildfix.patch"
 
+  # Don't set device group ownership to plugdev in the udev rules file as Arch
+  # doesn't have plugdev. Just apply read-write globally
+  patch -Np1 -i "${srcdir}/libusb-rules-noplugdev.patch"
+
   autoreconf -fi
 }
 
@@ -78,4 +84,8 @@ package() {
   # desktop entry file
   # cp ../barrydesktop.desktop ${pkgdir}/usr/share/applications
   cp ../barrybackup.desktop ${pkgdir}/usr/share/applications
+
+  # Install udev rules to allow barrybackup to access devices without root
+  mkdir -p ${pkgdir}/usr/lib/udev/rules.d
+  cp udev/99-blackberry-perms.rules ${pkgdir}/usr/lib/udev/rules.d
 }
diff --git a/libusb-rules-noplugdev.patch b/libusb-rules-noplugdev.patch
new file mode 100644
index 000000000000..4699adc11a86
--- /dev/null
+++ b/libusb-rules-noplugdev.patch
@@ -0,0 +1,22 @@
+diff -Nur original/udev/99-blackberry-perms.rules modified/udev/99-blackberry-perms.rules
+--- original/udev/99-blackberry-perms.rules	2013-11-17 23:56:58.000000000 +0000
++++ modified/udev/99-blackberry-perms.rules	2018-07-05 14:54:40.502657538 +0100
+@@ -3,12 +3,10 @@
+ # broad ruleset.  It runs no external commands, so this broad ruleset
+ # should not impact performance at all.
+ #
+-# Note: for opensuse-11.1, use the group 'dialout'
+-#
+-ATTRS{idVendor}=="0fca", ATTRS{idProduct}=="0001", GROUP="plugdev", MODE="0664"
+-ATTRS{idVendor}=="0fca", ATTRS{idProduct}=="0004", GROUP="plugdev", MODE="0664"
+-ATTRS{idVendor}=="0fca", ATTRS{idProduct}=="0006", GROUP="plugdev", MODE="0664"
+-ATTRS{idVendor}=="0fca", ATTRS{idProduct}=="8001", GROUP="plugdev", MODE="0664"
+-ATTRS{idVendor}=="0fca", ATTRS{idProduct}=="8004", GROUP="plugdev", MODE="0664"
+-ATTRS{idVendor}=="0fca", ATTRS{idProduct}=="8007", GROUP="plugdev", MODE="0664"
++ATTRS{idVendor}=="0fca", ATTRS{idProduct}=="0001", MODE="0666"
++ATTRS{idVendor}=="0fca", ATTRS{idProduct}=="0004", MODE="0666"
++ATTRS{idVendor}=="0fca", ATTRS{idProduct}=="0006", MODE="0666"
++ATTRS{idVendor}=="0fca", ATTRS{idProduct}=="8001", MODE="0666"
++ATTRS{idVendor}=="0fca", ATTRS{idProduct}=="8004", MODE="0666"
++ATTRS{idVendor}=="0fca", ATTRS{idProduct}=="8007", MODE="0666"
+