[PR PATCH] add patch to prevent libserialport from using termiox, which has been removed from recent kernels

[PR PATCH] add patch to prevent libserialport from using termiox, which has been removed from recent kernels

[PoroCYon]

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

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

https://github.com/PoroCYon/void-packages patch-libsigrok-notermiox
https://github.com/void-linux/void-packages/pull/32025

add patch to prevent libserialport from using termiox, which has been removed from recent kernels
Without this patch, libserialport will fail opening a tty device with an "No such ioctl for device"-error. This prevents eg. sigrok/pulseview from working with a SUMP-compatible logic analyzer.

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (x86_64-glibc)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl


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

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

From d528b127d81ec5b08e4fc9f9eafe2dee94d1ed89 Mon Sep 17 00:00:00 2001
From: PoroCYon <porocyon@titandemo.org>
Date: Sat, 17 Jul 2021 22:11:09 +0200
Subject: [PATCH] add patch to prevent libserialport from using termiox, which
 has been removed from recent kernels

---
 ...-as-it-has-been-removed-from-recent-ke.patch | 17 +++++++++++++++++
 srcpkgs/libserialport/template                  |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/libserialport/patches/0001-Remove-termiox-as-it-has-been-removed-from-recent-ke.patch

diff --git a/srcpkgs/libserialport/patches/0001-Remove-termiox-as-it-has-been-removed-from-recent-ke.patch b/srcpkgs/libserialport/patches/0001-Remove-termiox-as-it-has-been-removed-from-recent-ke.patch
new file mode 100644
index 000000000000..9f43ccbf57f7
--- /dev/null
+++ b/srcpkgs/libserialport/patches/0001-Remove-termiox-as-it-has-been-removed-from-recent-ke.patch
@@ -0,0 +1,17 @@
+diff --git a/libserialport_internal.h b/libserialport_internal.new.h
+index 669152b..9a57b81 100644
+--- libserialport_internal.h
++++ libserialport_internal.h
+@@ -69,11 +69,6 @@
+ #include "linux/serial.h"
+ #endif
+ #include "linux_termios.h"
+-
+-/* TCGETX/TCSETX is not available everywhere. */
+-#if defined(TCGETX) && defined(TCSETX) && defined(HAVE_STRUCT_TERMIOX)
+-#define USE_TERMIOX
+-#endif
+ #endif
+ 
+ /* TIOCINQ/TIOCOUTQ is not available everywhere. */
+
diff --git a/srcpkgs/libserialport/template b/srcpkgs/libserialport/template
index 23b6b92a42fe..7d1cdd3c7631 100644
--- a/srcpkgs/libserialport/template
+++ b/srcpkgs/libserialport/template
@@ -1,7 +1,7 @@
 # Template file for 'libserialport'
 pkgname=libserialport
 version=0.1.1
-revision=2
+revision=3
 build_style=gnu-configure
 short_desc="Cross-platform library for accessing serial ports"
 maintainer="lemmi <lemmi@nerd2nerd.org>"

Re: [PR PATCH] [Updated] add patch to prevent libserialport from using termiox, which has been removed from recent kernels

[PoroCYon]

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

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

https://github.com/PoroCYon/void-packages patch-libsigrok-notermiox
https://github.com/void-linux/void-packages/pull/32025

add patch to prevent libserialport from using termiox, which has been removed from recent kernels
Without this patch, libserialport will fail opening a tty device with an "No such ioctl for device"-error. This prevents eg. sigrok/pulseview from working with a SUMP-compatible logic analyzer.

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl


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

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

From 87be8293964e372f620996929dca7b007efc159d Mon Sep 17 00:00:00 2001
From: PoroCYon <porocyon@titandemo.org>
Date: Sat, 17 Jul 2021 22:11:09 +0200
Subject: [PATCH] add patch so libserialport doesn't use termiox

termios has been removed from recent kernels, so not having this patch
causes "no such ioctl for device"-errors, preventing any use of the
library
---
 ...-as-it-has-been-removed-from-recent-ke.patch | 17 +++++++++++++++++
 srcpkgs/libserialport/template                  |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/libserialport/patches/0001-Remove-termiox-as-it-has-been-removed-from-recent-ke.patch

diff --git a/srcpkgs/libserialport/patches/0001-Remove-termiox-as-it-has-been-removed-from-recent-ke.patch b/srcpkgs/libserialport/patches/0001-Remove-termiox-as-it-has-been-removed-from-recent-ke.patch
new file mode 100644
index 000000000000..9f43ccbf57f7
--- /dev/null
+++ b/srcpkgs/libserialport/patches/0001-Remove-termiox-as-it-has-been-removed-from-recent-ke.patch
@@ -0,0 +1,17 @@
+diff --git a/libserialport_internal.h b/libserialport_internal.new.h
+index 669152b..9a57b81 100644
+--- libserialport_internal.h
++++ libserialport_internal.h
+@@ -69,11 +69,6 @@
+ #include "linux/serial.h"
+ #endif
+ #include "linux_termios.h"
+-
+-/* TCGETX/TCSETX is not available everywhere. */
+-#if defined(TCGETX) && defined(TCSETX) && defined(HAVE_STRUCT_TERMIOX)
+-#define USE_TERMIOX
+-#endif
+ #endif
+ 
+ /* TIOCINQ/TIOCOUTQ is not available everywhere. */
+
diff --git a/srcpkgs/libserialport/template b/srcpkgs/libserialport/template
index 23b6b92a42fe..7d1cdd3c7631 100644
--- a/srcpkgs/libserialport/template
+++ b/srcpkgs/libserialport/template
@@ -1,7 +1,7 @@
 # Template file for 'libserialport'
 pkgname=libserialport
 version=0.1.1
-revision=2
+revision=3
 build_style=gnu-configure
 short_desc="Cross-platform library for accessing serial ports"
 maintainer="lemmi <lemmi@nerd2nerd.org>"

Re: [PR PATCH] [Updated] add patch to prevent libserialport from using termiox, which has been removed from recent kernels

[PoroCYon]

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

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

https://github.com/PoroCYon/void-packages patch-libsigrok-notermiox
https://github.com/void-linux/void-packages/pull/32025

add patch to prevent libserialport from using termiox, which has been removed from recent kernels
Without this patch, libserialport will fail opening a tty device with an "No such ioctl for device"-error. This prevents eg. sigrok/pulseview from working with a SUMP-compatible logic analyzer.

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl


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

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

From fe265bac727a772fd315dbbd1a466470a1d9d39f Mon Sep 17 00:00:00 2001
From: PoroCYon <porocyon@titandemo.org>
Date: Sat, 17 Jul 2021 22:11:09 +0200
Subject: [PATCH] libserialport: add patch so it doesn't use termiox

termios has been removed from recent kernels, so not having this patch
causes "no such ioctl for device"-errors, preventing any use of the
library
---
 ...-as-it-has-been-removed-from-recent-ke.patch | 17 +++++++++++++++++
 srcpkgs/libserialport/template                  |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/libserialport/patches/0001-Remove-termiox-as-it-has-been-removed-from-recent-ke.patch

diff --git a/srcpkgs/libserialport/patches/0001-Remove-termiox-as-it-has-been-removed-from-recent-ke.patch b/srcpkgs/libserialport/patches/0001-Remove-termiox-as-it-has-been-removed-from-recent-ke.patch
new file mode 100644
index 000000000000..9f43ccbf57f7
--- /dev/null
+++ b/srcpkgs/libserialport/patches/0001-Remove-termiox-as-it-has-been-removed-from-recent-ke.patch
@@ -0,0 +1,17 @@
+diff --git a/libserialport_internal.h b/libserialport_internal.new.h
+index 669152b..9a57b81 100644
+--- libserialport_internal.h
++++ libserialport_internal.h
+@@ -69,11 +69,6 @@
+ #include "linux/serial.h"
+ #endif
+ #include "linux_termios.h"
+-
+-/* TCGETX/TCSETX is not available everywhere. */
+-#if defined(TCGETX) && defined(TCSETX) && defined(HAVE_STRUCT_TERMIOX)
+-#define USE_TERMIOX
+-#endif
+ #endif
+ 
+ /* TIOCINQ/TIOCOUTQ is not available everywhere. */
+
diff --git a/srcpkgs/libserialport/template b/srcpkgs/libserialport/template
index 23b6b92a42fe..7d1cdd3c7631 100644
--- a/srcpkgs/libserialport/template
+++ b/srcpkgs/libserialport/template
@@ -1,7 +1,7 @@
 # Template file for 'libserialport'
 pkgname=libserialport
 version=0.1.1
-revision=2
+revision=3
 build_style=gnu-configure
 short_desc="Cross-platform library for accessing serial ports"
 maintainer="lemmi <lemmi@nerd2nerd.org>"

Re: add patch to prevent libserialport from using termiox, which has been removed from recent kernels

[PoroCYon]

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

New comment by PoroCYon on void-packages repository

https://github.com/void-linux/void-packages/pull/32025#issuecomment-881955283

Comment:
Hm, some builders seem to fail due to outdated local repos? Others do seem to work, though...

Re: libserialport: add patch to prevent it from using termiox, which has been removed from recent kernels

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32025#issuecomment-881961100

Comment:
That upstream commit should be linked in the patch.

@lemmi 

Re: libserialport: add patch to prevent it from using termiox, which has been removed from recent kernels

[lemmi]

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

New comment by lemmi on void-packages repository

https://github.com/void-linux/void-packages/pull/32025#issuecomment-881962332

Comment:
@PoroCYon did you upstream's patch by any chance? Because you could just run `git format-patch -1 6f9b03e` and use that patch. That would include all attribution and the explanation of the patch.

Re: libserialport: add patch to prevent it from using termiox, which has been removed from recent kernels

[PoroCYon]

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

New comment by PoroCYon on void-packages repository

https://github.com/void-linux/void-packages/pull/32025#issuecomment-881962930

Comment:
I tested it, but it adds hostmakedepends on autoconf automake etc., idk if that's wanted here?

Re: libserialport: add patch to prevent it from using termiox, which has been removed from recent kernels

[PoroCYon]

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

New comment by PoroCYon on void-packages repository

https://github.com/void-linux/void-packages/pull/32025#issuecomment-881962930

Comment:
I tested it, but it adds hostmakedepends on autoconf automake etc., idk if that's wanted here?

EDIT: and now I'm getting the same error as some of the builders:
```
=> ERROR: libserialport-0.1.1_3: failed to install 'autoconf-2.69_9' dependency! (error 16)
ERROR: [trans] failed to download `less-590_1' signature from `https://alpha.de.repo.voidlinux.org/current': Not Found
Transaction failed! see above for errors.
1 package will be downloaded:

8 packages will be installed:

  m4-1.4.18_2 
  libpcre-8.44_1 
  less-590_1 
  gdbm-1.19_1 
  libdb-5.3.28_8 
  perl-5.32.1_2 
  autoconf-2.69_9 
  automake-1.16.2_2 

Size to download:              122KB
Size required on disk:          77MB
Space available on disk:       114GB


[*] Downloading packages
```

so I can't really test things anymore...

Re: libserialport: add patch to prevent it from using termiox, which has been removed from recent kernels

[lemmi]

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

New comment by lemmi on void-packages repository

https://github.com/void-linux/void-packages/pull/32025#issuecomment-881963487

Comment:
Ah, that makes sense. I think we can add this, but as @ericonr said, please drop a short comment about upstreams patch.

Re: [PR PATCH] [Updated] libserialport: add patch to prevent it from using termiox, which has been removed from recent kernels

[PoroCYon]

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

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

https://github.com/PoroCYon/void-packages patch-libsigrok-notermiox
https://github.com/void-linux/void-packages/pull/32025

libserialport: add patch to prevent it from using termiox, which has been removed from recent kernels
Without this patch, libserialport will fail opening a tty device with an "No such ioctl for device"-error. This prevents eg. sigrok/pulseview from working with a SUMP-compatible logic analyzer.

EDIT: some clarification: [see here](https://sigrok.org/gitweb/?p=libserialport.git;a=commit;h=6f9b03e597ea7200eb616a4e410add3dd1690cb1), something like their patches would work better, but, honestly, libserialport should have a new release, 0.1.1 is from years ago.

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl


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

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

From fe24a6de4b81b55fc127a66982ed972ed1148c29 Mon Sep 17 00:00:00 2001
From: PoroCYon <porocyon@titandemo.org>
Date: Sat, 17 Jul 2021 22:11:09 +0200
Subject: [PATCH] libserialport: add patch so it doesn't use termiox

termios has been removed from recent kernels, so not having this patch
causes "no such ioctl for device"-errors, preventing any use of the
library
---
 ...s-it-has-been-removed-from-recent-ke.patch | 36 +++++++++++++++++++
 srcpkgs/libserialport/template                |  2 +-
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/libserialport/patches/0001-Remove-termiox-as-it-has-been-removed-from-recent-ke.patch

diff --git a/srcpkgs/libserialport/patches/0001-Remove-termiox-as-it-has-been-removed-from-recent-ke.patch b/srcpkgs/libserialport/patches/0001-Remove-termiox-as-it-has-been-removed-from-recent-ke.patch
new file mode 100644
index 000000000000..43ccc125e4bb
--- /dev/null
+++ b/srcpkgs/libserialport/patches/0001-Remove-termiox-as-it-has-been-removed-from-recent-ke.patch
@@ -0,0 +1,36 @@
+Inspired by this commit from the upstream package:
+https://sigrok.org/gitweb/?p=libserialport.git;a=commit;h=6f9b03e597ea7200eb616a4e410add3dd1690cb1
+
+Applying this patch directly added some extra dependencies (autoconf,
+automake), as the configure script needs to be regenerated with the
+original commit.
+
+original commit message:
+
+termiox was removed from linux in e0efb3168d34
+Some more information available in https://www.spinics.net/lists/linux-serial/msg41926.html
+
+Attempting to use the termiox ioctls on more modern kernels results in
+"Inappropriate IOCTL" errors.
+
+While the "right" solution might be to remove the termiox code from the
+linux path, simply not checking for termiox builds a libserialport that
+functions on modern linux kernels.
+---
+diff --git a/libserialport_internal.h b/libserialport_internal.new.h
+index 669152b..9a57b81 100644
+--- libserialport_internal.h
++++ libserialport_internal.h
+@@ -69,11 +69,6 @@
+ #include "linux/serial.h"
+ #endif
+ #include "linux_termios.h"
+-
+-/* TCGETX/TCSETX is not available everywhere. */
+-#if defined(TCGETX) && defined(TCSETX) && defined(HAVE_STRUCT_TERMIOX)
+-#define USE_TERMIOX
+-#endif
+ #endif
+ 
+ /* TIOCINQ/TIOCOUTQ is not available everywhere. */
+
diff --git a/srcpkgs/libserialport/template b/srcpkgs/libserialport/template
index 23b6b92a42fe..7d1cdd3c7631 100644
--- a/srcpkgs/libserialport/template
+++ b/srcpkgs/libserialport/template
@@ -1,7 +1,7 @@
 # Template file for 'libserialport'
 pkgname=libserialport
 version=0.1.1
-revision=2
+revision=3
 build_style=gnu-configure
 short_desc="Cross-platform library for accessing serial ports"
 maintainer="lemmi <lemmi@nerd2nerd.org>"

Re: libserialport: add patch to prevent it from using termiox, which has been removed from recent kernels

[PoroCYon]

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

New comment by PoroCYon on void-packages repository

https://github.com/void-linux/void-packages/pull/32025#issuecomment-881963740

Comment:
Something like this? Seems to work (`./xbps-src -I` still works), but I can't test a patch that needs autoconf & automake right now.

Re: libserialport: add patch to prevent it from using termiox, which has been removed from recent kernels

[lemmi]

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

New comment by lemmi on void-packages repository

https://github.com/void-linux/void-packages/pull/32025#issuecomment-881964510

Comment:
Looks fine, I'll run the CI again tomorrow when the repository issues are solved.

Re: [PR PATCH] [Merged]: libserialport: add patch to prevent it from using termiox, which has been removed from recent kernels

[lemmi]

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

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

libserialport: add patch to prevent it from using termiox, which has been removed from recent kernels
https://github.com/void-linux/void-packages/pull/32025

Description:
Without this patch, libserialport will fail opening a tty device with an "No such ioctl for device"-error. This prevents eg. sigrok/pulseview from working with a SUMP-compatible logic analyzer.

EDIT: some clarification: [see here](https://sigrok.org/gitweb/?p=libserialport.git;a=commit;h=6f9b03e597ea7200eb616a4e410add3dd1690cb1), something like their patches would work better, but, honestly, libserialport should have a new release, 0.1.1 is from years ago.

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl