summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD8
-rw-r--r--libusb-rules-noplugdev.patch36
3 files changed, 30 insertions, 18 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5f6b420eaf3a..b5fa0db69c19 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 = 9
+ pkgrel = 10
url = https://github.com/NetDirect/barry
arch = i686
arch = x86_64
@@ -26,7 +26,7 @@ pkgbase = barry
sha256sums = 1c6ecd68977da4a3184c3e6d4bea36e4c40949d6bf7bb4ad8717aa6c19fed4fa
sha256sums = d1eb3ff669d5d8490112ceb4138fe9eb107bdbbc8621c98ead5ff47b9a7faf4e
sha256sums = bd211b7323a36f255af7cad13b886d8bb45d74f1d2bcecef00733bb5a9080f2c
- sha256sums = 2da11475bb3d5c9c94f7625b33e3ae29442413b25f320e9f70d4777180d5bd4a
+ sha256sums = a68c9a86fd2a034ff25ee85be609f0ff98e371d0f79fb7902e0289b8cb37b547
pkgname = barry
diff --git a/PKGBUILD b/PKGBUILD
index 878a212f98a9..859bf79134ea 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=barry
pkgver=0.18.5
-pkgrel=9
+pkgrel=10
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')
@@ -22,7 +22,7 @@ sha256sums=('cfe5224c34b25575543bbdeebf979074f76ccc7d37116f15aef20509e6c06c91'
'1c6ecd68977da4a3184c3e6d4bea36e4c40949d6bf7bb4ad8717aa6c19fed4fa'
'd1eb3ff669d5d8490112ceb4138fe9eb107bdbbc8621c98ead5ff47b9a7faf4e'
'bd211b7323a36f255af7cad13b886d8bb45d74f1d2bcecef00733bb5a9080f2c'
- '2da11475bb3d5c9c94f7625b33e3ae29442413b25f320e9f70d4777180d5bd4a')
+ 'a68c9a86fd2a034ff25ee85be609f0ff98e371d0f79fb7902e0289b8cb37b547')
prepare() {
mv ${srcdir}/${pkgname}-${pkgname}-${pkgver} ${srcdir}/${pkgname}-${pkgver}
@@ -35,7 +35,7 @@ prepare() {
patch -Np1 -i "${srcdir}/c++11.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
+ # doesn't have plugdev. Use uaccess instead
patch -Np1 -i "${srcdir}/libusb-rules-noplugdev.patch"
autoreconf -fi
@@ -71,5 +71,5 @@ package() {
# 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
+ cp udev/70-blackberry-perms.rules ${pkgdir}/usr/lib/udev/rules.d
}
diff --git a/libusb-rules-noplugdev.patch b/libusb-rules-noplugdev.patch
index 4699adc11a86..a59dfaabf918 100644
--- a/libusb-rules-noplugdev.patch
+++ b/libusb-rules-noplugdev.patch
@@ -1,10 +1,28 @@
+diff -Nur original/udev/70-blackberry-perms.rules modified/udev/70-blackberry-perms.rules
+--- original/udev/70-blackberry-perms.rules 1970-01-01 01:00:00.000000000 +0100
++++ modified/udev/70-blackberry-perms.rules 2018-07-09 09:14:54.540911750 +0100
+@@ -0,0 +1,12 @@
++#
++# This file sets the permissions of Blackberry devices, using a very
++# broad ruleset. It runs no external commands, so this broad ruleset
++# should not impact performance at all.
++#
++ATTRS{idVendor}=="0fca", ATTRS{idProduct}=="0001", TAG+="uaccess"
++ATTRS{idVendor}=="0fca", ATTRS{idProduct}=="0004", TAG+="uaccess"
++ATTRS{idVendor}=="0fca", ATTRS{idProduct}=="0006", TAG+="uaccess"
++ATTRS{idVendor}=="0fca", ATTRS{idProduct}=="8001", TAG+="uaccess"
++ATTRS{idVendor}=="0fca", ATTRS{idProduct}=="8004", TAG+="uaccess"
++ATTRS{idVendor}=="0fca", ATTRS{idProduct}=="8007", TAG+="uaccess"
++
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.
- #
++++ modified/udev/99-blackberry-perms.rules 1970-01-01 01:00:00.000000000 +0100
+@@ -1,14 +0,0 @@
+-#
+-# This file sets the permissions of Blackberry devices, using a very
+-# 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"
@@ -13,10 +31,4 @@ diff -Nur original/udev/99-blackberry-perms.rules modified/udev/99-blackberry-pe
-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"
-
+-