[PR PATCH] socat: use different termios bits for ppc

[PR PATCH] socat: use different termios bits for ppc

[voidlinux-github]

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

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

https://github.com/void-ppc/void-packages socat
https://github.com/void-linux/void-packages/pull/14542

socat: use different termios bits for ppc
This was submitted in my staging repo, forwarding here. Also taking maintainership while at it.

Ref https://github.com/void-ppc/void-packages/pull/29

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

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

From dc894487530874b4b6fc3b221bcc376498ca64af Mon Sep 17 00:00:00 2001
From: jdu9 <jdu9@posteo.de>
Date: Wed, 18 Sep 2019 00:18:42 +0200
Subject: [PATCH] socat: use different termios bits for ppc

---
 srcpkgs/socat/template | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/socat/template b/srcpkgs/socat/template
index a3072a292f2..57b99020a92 100644
--- a/srcpkgs/socat/template
+++ b/srcpkgs/socat/template
@@ -1,15 +1,13 @@
 # Template file for 'socat'
 pkgname=socat
 version=1.7.3.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-libwrap --enable-fips
- ac_cv_have_z_modifier=yes sc_cv_sys_crdly_shift=9
- sc_cv_sys_tabdly_shift=11 sc_cv_sys_csize_shift=4
- ac_cv_ispeed_offset=13"
+ ac_cv_have_z_modifier=yes"
 makedepends="readline-devel libressl-devel"
 short_desc="Relay for bidirectional data transfer between two independent channels"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="q66 <daniel@octaforge.org>"
 license="GPL-2.0-only"
 homepage="http://www.dest-unreach.org/socat/"
 distfiles="http://www.dest-unreach.org/socat/download/socat-${version}.tar.bz2"
@@ -18,3 +16,20 @@ checksum=0dd63ffe498168a4aac41d307594c5076ff307aa0ac04b141f8f1cec6594d04a
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) CFLAGS="-D_LINUX_IF_ETHER_H";;
 esac
+
+case "$XBPS_TARGET_MACHINE" in
+	ppc*)
+		configure_args+="
+		 sc_cv_sys_crdly_shift=12
+		 sc_cv_sys_tabdly_shift=10
+		 sc_cv_sys_csize_shift=8"
+		;;
+	*)
+		configure_args+="
+		 sc_cv_sys_crdly_shift=9
+		 sc_cv_sys_tabdly_shift=11
+		 sc_cv_sys_csize_shift=4"
+		;;
+esac
+
+configure_args+=" ac_cv_ispeed_offset=13"

Re: [PR PATCH] [Merged]: socat: use different termios bits for ppc

[voidlinux-github]

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

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

socat: use different termios bits for ppc
https://github.com/void-linux/void-packages/pull/14542

Description:
This was submitted in my staging repo, forwarding here. Also taking maintainership while at it.

Ref https://github.com/void-ppc/void-packages/pull/29