[PR PATCH] libsigrok: update to 0.5.2.

[PR PATCH] libsigrok: update to 0.5.2.

[Gigahawk]

[-- Attachment #1: Type: text/plain, Size: 341 bytes --]

There is a new pull request by Gigahawk against master on the void-packages repository

https://github.com/Gigahawk/void-packages libsigrok-uaccess-fix
https://github.com/void-linux/void-packages/pull/23581

libsigrok: update to 0.5.2.
Fixes #23580 

A patch file from https://github.com/void-linux/void-packages/pull/23581.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libsigrok-uaccess-fix-23581.patch --]
[-- Type: text/x-diff, Size: 3292 bytes --]

From 4985fdbcda51f1be9b80d54c0d3a1d77da6b209f Mon Sep 17 00:00:00 2001
From: Jasper Chan <jasperchan515@gmail.com>
Date: Tue, 14 Jul 2020 20:19:41 -0700
Subject: [PATCH] libsigrok: update to 0.5.2.

---
 ...Add-udev-rule-file-for-dialout-group.patch | 48 +++++++++++++++++++
 srcpkgs/libsigrok/template                    |  4 +-
 2 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/libsigrok/patches/0001-Add-udev-rule-file-for-dialout-group.patch

diff --git a/srcpkgs/libsigrok/patches/0001-Add-udev-rule-file-for-dialout-group.patch b/srcpkgs/libsigrok/patches/0001-Add-udev-rule-file-for-dialout-group.patch
new file mode 100644
index 00000000000..c20d6373dde
--- /dev/null
+++ b/srcpkgs/libsigrok/patches/0001-Add-udev-rule-file-for-dialout-group.patch
@@ -0,0 +1,48 @@
+From a5358ef3056554cf16d4064189016e9ffc1db6d8 Mon Sep 17 00:00:00 2001
+From: Jasper Chan <jasperchan515@gmail.com>
+Date: Tue, 14 Jul 2020 20:14:11 -0700
+Subject: [PATCH] Add udev rule file for dialout group
+
+---
+ contrib/61-libsigrok-dialout.rules | 29 +++++++++++++++++++++++++++++
+ 1 file changed, 29 insertions(+)
+ create mode 100644 contrib/61-libsigrok-dialout.rules
+
+diff --git contrib/61-libsigrok-dialout.rules contrib/61-libsigrok-dialout.rules
+new file mode 100644
+index 00000000..c6b2cbc0
+--- /dev/null
++++ contrib/61-libsigrok-dialout.rules
+@@ -0,0 +1,29 @@
++##
++## This file is part of the libsigrok project.
++##
++## Copyright (C) 2017 Stefan Bruens <stefan.bruens@rwth-aachen.de>
++##
++## This program is free software; you can redistribute it and/or modify
++## it under the terms of the GNU General Public License as published by
++## the Free Software Foundation; either version 2 of the License, or
++## (at your option) any later version.
++##
++## This program is distributed in the hope that it will be useful,
++## but WITHOUT ANY WARRANTY; without even the implied warranty of
++## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++## GNU General Public License for more details.
++##
++## You should have received a copy of the GNU General Public License
++## along with this program; if not, see <http://www.gnu.org/licenses/>.
++##
++
++# Grant access permissions to users who are in the "dialout" group.
++#
++# This file, when installed, must be installed with a name lexicographically
++# sorted later than the accompanied 60-libsigrok.rules
++
++ACTION!="add|change", GOTO="libsigrok_rules_dialout_end"
++
++ENV{ID_SIGROK}=="1", MODE="660", GROUP="dialout"
++
++LABEL="libsigrok_rules_dialout_end"
+-- 
+2.27.0
+
diff --git a/srcpkgs/libsigrok/template b/srcpkgs/libsigrok/template
index 87939ce82fa..4aeb2f03268 100644
--- a/srcpkgs/libsigrok/template
+++ b/srcpkgs/libsigrok/template
@@ -1,7 +1,7 @@
 # Template file for 'libsigrok'
 pkgname=libsigrok
 version=0.5.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config doxygen python3"
 makedepends="glib-devel libzip-devel glibmm-devel libserialport-devel
@@ -19,7 +19,7 @@ esac
 
 post_install() {
 	vinstall contrib/60-libsigrok.rules 0644 /usr/lib/udev/rules.d
-	vinstall contrib/61-libsigrok-uaccess.rules 0644 /usr/lib/udev/rules.d
+	vinstall contrib/61-libsigrok-dialout.rules 0644 /usr/lib/udev/rules.d
 }
 
 libsigrok-devel_package() {

Re: libsigrok: update to 0.5.2.

[Gigahawk]

[-- Attachment #1: Type: text/plain, Size: 556 bytes --]

New comment by Gigahawk on void-packages repository

https://github.com/void-linux/void-packages/pull/23581#issuecomment-658523313

Comment:
Original udev rule uses `TAG+=uaccess` which doesn't seem to be supported due to not using systemd-logind. 

The repo provides a similar rules file that allows access for users in the `plugdev` group which is usually only present on Debian based distros, so I've made a copy of it for the `dialout` group instead.

Not sure if it's preferred to patch an existing file or to use some group other than `dialout`.

Re: libsigrok: update to 0.5.2.

[sgn]

[-- Attachment #1: Type: text/plain, Size: 776 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/23581#issuecomment-659760681

Comment:
> Original udev rule uses `TAG+=uaccess` which doesn't seem to be supported due to not using systemd-logind.

Doesn't `elogind` provide systemd-logind? `airspy`, `hackrf`, and `libnfc` patched `plugdev` to `uaccess`, so, it should works already.

> The repo provides a similar rules file that allows access for users in the `plugdev` group which is usually only present on Debian based distros, so I've made a copy of it for the `dialout` group instead.
> 
> Not sure if it's preferred to patch an existing file or to use some group other than `dialout`.


`libu2f-host` patches:
```sed
s:GROUP="plugdev":GROUP="users":
```

Re: [PR PATCH] [Updated] libsigrok: update to 0.5.2.

[Gigahawk]

[-- Attachment #1: Type: text/plain, Size: 346 bytes --]

There is an updated pull request by Gigahawk against master on the void-packages repository

https://github.com/Gigahawk/void-packages libsigrok-uaccess-fix
https://github.com/void-linux/void-packages/pull/23581

libsigrok: update to 0.5.2.
Fixes #23580 

A patch file from https://github.com/void-linux/void-packages/pull/23581.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libsigrok-uaccess-fix-23581.patch --]
[-- Type: text/x-diff, Size: 2198 bytes --]

From a9844c4e4c070d81d888511307f1cb0ef78daf91 Mon Sep 17 00:00:00 2001
From: Jasper Chan <jasperchan515@gmail.com>
Date: Tue, 14 Jul 2020 20:19:41 -0700
Subject: [PATCH] libsigrok: update to 0.5.2.

---
 .../0001-Change-plugdev-to-users.patch        | 24 +++++++++++++++++++
 srcpkgs/libsigrok/template                    |  4 ++--
 2 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/libsigrok/patches/0001-Change-plugdev-to-users.patch

diff --git a/srcpkgs/libsigrok/patches/0001-Change-plugdev-to-users.patch b/srcpkgs/libsigrok/patches/0001-Change-plugdev-to-users.patch
new file mode 100644
index 00000000000..05a3c88bb50
--- /dev/null
+++ b/srcpkgs/libsigrok/patches/0001-Change-plugdev-to-users.patch
@@ -0,0 +1,24 @@
+From 1cf31f45c0b4ac2ccd08827be589391393db9e58 Mon Sep 17 00:00:00 2001
+From: Jasper Chan <jasperchan515@gmail.com>
+Date: Mon, 27 Jul 2020 18:41:19 -0700
+Subject: [PATCH] Change plugdev to users
+
+---
+ contrib/61-libsigrok-plugdev.rules | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git contrib/61-libsigrok-plugdev.rules contrib/61-libsigrok-plugdev.rules
+index 2fddba48..ff03a8ee 100644
+--- contrib/61-libsigrok-plugdev.rules
++++ contrib/61-libsigrok-plugdev.rules
+@@ -26,6 +26,6 @@
+ 
+ ACTION!="add|change", GOTO="libsigrok_rules_plugdev_end"
+ 
+-ENV{ID_SIGROK}=="1", MODE="660", GROUP="plugdev"
++ENV{ID_SIGROK}=="1", MODE="660", GROUP="users"
+ 
+ LABEL="libsigrok_rules_plugdev_end"
+-- 
+2.27.0
+
diff --git a/srcpkgs/libsigrok/template b/srcpkgs/libsigrok/template
index 87939ce82fa..344d3372e40 100644
--- a/srcpkgs/libsigrok/template
+++ b/srcpkgs/libsigrok/template
@@ -1,7 +1,7 @@
 # Template file for 'libsigrok'
 pkgname=libsigrok
 version=0.5.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config doxygen python3"
 makedepends="glib-devel libzip-devel glibmm-devel libserialport-devel
@@ -19,7 +19,7 @@ esac
 
 post_install() {
 	vinstall contrib/60-libsigrok.rules 0644 /usr/lib/udev/rules.d
-	vinstall contrib/61-libsigrok-uaccess.rules 0644 /usr/lib/udev/rules.d
+	vinstall contrib/61-libsigrok-plugdev.rules 0644 /usr/lib/udev/rules.d
 }
 
 libsigrok-devel_package() {

Re: libsigrok: update to 0.5.2.

[Gigahawk]

[-- Attachment #1: Type: text/plain, Size: 362 bytes --]

New comment by Gigahawk on void-packages repository

https://github.com/void-linux/void-packages/pull/23581#issuecomment-664727483

Comment:
Ok, I've switched to patching the plugdev file.

As for `elogind` it shouldn't be assumed that all users are using a login manager.
My personal setup is just a tty login with an .xinitrc that starts my window manager.

Re: [PR REVIEW] libsigrok: update to 0.5.2.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 357 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/23581#discussion_r559814077

Comment:
For what it's worth, `openocd` has a `plugdev` group. Maybe we could add that or make a small package that only adds the `plugdev` group? And then everything that uses it can depend on the plugdev meta-package.

Re: libsigrok: update to 0.5.2.

[paper42]

[-- Attachment #1: Type: text/plain, Size: 229 bytes --]

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/23581#issuecomment-923051957

Comment:
done in 179065ff7e05381ac2063f6877d8da33b97bae19 without the patch, do we still need it?

Re: libsigrok: update to 0.5.2.

[0x5c]

[-- Attachment #1: Type: text/plain, Size: 459 bytes --]

New comment by 0x5c on void-packages repository

https://github.com/void-linux/void-packages/pull/23581#issuecomment-1067247566

Comment:
@ericonr There's a couple packages that have `system_groups="plugdev"`, are they currently conflicting? If not, then the solution would simply be to add that line to libsigrok. There's also similar-ish kinds of packages (SDRs like `hackrf` and `airspy`) that apply a patch like this PR, but that seems a tad hacky to me.

Re: libsigrok: update to 0.5.2.

[0x5c]

[-- Attachment #1: Type: text/plain, Size: 620 bytes --]

New comment by 0x5c on void-packages repository

https://github.com/void-linux/void-packages/pull/23581#issuecomment-1067247566

Comment:
@ericonr There's a couple packages that have `system_groups="plugdev"`, are they currently conflicting? If not, then the solution would simply be to add that line to libsigrok. There's also similar-ish kinds of packages (SDRs like `hackrf` and `airspy`) that apply a patch like this PR, but that seems a tad hacky to me.

As an asside, some of the packages that add `plugdev` do not have an `INSTALL.msg` file informing of the need to be in the group, should they have one added?

Re: libsigrok: update to 0.5.2.

[0x5c]

[-- Attachment #1: Type: text/plain, Size: 366 bytes --]

New comment by 0x5c on void-packages repository

https://github.com/void-linux/void-packages/pull/23581#issuecomment-1067411328

Comment:
@Gigahawk I made https://github.com/void-linux/void-packages/pull/36144 which takes a different approach: it creates the group and adds an install message indicating that you need to be added to the group. Does it work for you?

Re: libsigrok: update to 0.5.2.

[Gigahawk]

[-- Attachment #1: Type: text/plain, Size: 414 bytes --]

New comment by Gigahawk on void-packages repository

https://github.com/void-linux/void-packages/pull/23581#issuecomment-1067413399

Comment:
> @Gigahawk I made https://github.com/void-linux/void-packages/pull/36144 which takes a different approach: it creates the group and adds an install message indicating that you need to be added to the group. Does it work for you?

Yea that's fine, should I close this PR?

Re: libsigrok: update to 0.5.2.

[0x5c]

[-- Attachment #1: Type: text/plain, Size: 249 bytes --]

New comment by 0x5c on void-packages repository

https://github.com/void-linux/void-packages/pull/23581#issuecomment-1067419892

Comment:
The actual update has already been merged so if you feel the other approach to the fix is adequate, probably

Re: [PR PATCH] [Closed]: libsigrok: update to 0.5.2.

[abenson]

[-- Attachment #1: Type: text/plain, Size: 174 bytes --]

There's a closed pull request on the void-packages repository

libsigrok: update to 0.5.2.
https://github.com/void-linux/void-packages/pull/23581

Description:
Fixes #23580 

Re: libsigrok: update to 0.5.2.

[0x5c]

[-- Attachment #1: Type: text/plain, Size: 449 bytes --]

New comment by 0x5c on void-packages repository

https://github.com/void-linux/void-packages/pull/23581#issuecomment-1091082468

Comment:
@Gigahawk Both parts of the fix have been merged, so once you get the `libsigrok` and the `base-files` update you should have a new `plugdev` group on your machine. After adding it to your user (`usermod -aG plugdev <username>`, followed by logging back in), sigrok should be working without the need for sudo.

Re: libsigrok: update to 0.5.2.

[Gigahawk]

[-- Attachment #1: Type: text/plain, Size: 464 bytes --]

New comment by Gigahawk on void-packages repository

https://github.com/void-linux/void-packages/pull/23581#issuecomment-1091083040

Comment:
> @Gigahawk Both parts of the fix have been merged, so once you get the `libsigrok` and the `base-files` update you should have a new `plugdev` group on your machine. After adding it to your user (`usermod -aG plugdev <username>`, followed by logging back in), sigrok should be working without the need for sudo.

Thanks!