[pkgsrc/trunk]: pkgsrc/databases/influxdb/patches influxdb: remove patches th...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/406a66e17d65
branches:  trunk
changeset: 399372:406a66e17d65
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Aug 08 06:01:17 2019 +0000

description:
influxdb: remove patches that were removed from distinfo (v1.2)

diffstat:

 databases/influxdb/patches/patch-.._.._pkg_term_termios_ioctl__solaris.go   |  13 -
 databases/influxdb/patches/patch-.._.._pkg_term_termios_termios__solaris.go |  77 ----------
 2 files changed, 0 insertions(+), 90 deletions(-)

diffs (98 lines):

diff -r 9ff7ac55a931 -r 406a66e17d65 databases/influxdb/patches/patch-.._.._pkg_term_termios_ioctl__solaris.go
--- a/databases/influxdb/patches/patch-.._.._pkg_term_termios_ioctl__solaris.go Thu Aug 08 06:00:19 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-.._.._pkg_term_termios_ioctl__solaris.go,v 1.1 2019/05/15 18:03:34 jperkin Exp $
-
-Apply SunOS fix from https://github.com/pkg/term/pull/41
-
---- ../../pkg/term/termios/ioctl_solaris.go.orig       2018-07-30 02:16:39.000000000 +0000
-+++ ../../pkg/term/termios/ioctl_solaris.go
-@@ -3,5 +3,5 @@ package termios
- import "golang.org/x/sys/unix"
- 
- func ioctl(fd, request, argp uintptr) error {
--      return unix.IoctlSetInt(int(fd), int(request), int(argp))
-+      return unix.IoctlSetInt(int(fd), uint(request), int(argp))
- }
diff -r 9ff7ac55a931 -r 406a66e17d65 databases/influxdb/patches/patch-.._.._pkg_term_termios_termios__solaris.go
--- a/databases/influxdb/patches/patch-.._.._pkg_term_termios_termios__solaris.go       Thu Aug 08 06:00:19 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +0,0 @@
-$NetBSD: patch-.._.._pkg_term_termios_termios__solaris.go,v 1.1 2019/05/15 18:03:34 jperkin Exp $
-
-Apply SunOS fix from https://github.com/pkg/term/pull/41
-
---- ../../pkg/term/termios/termios_solaris.go.orig     2019-04-25 03:19:22.118815385 +0000
-+++ ../../pkg/term/termios/termios_solaris.go
-@@ -31,13 +31,13 @@ const FIORDCHK = C.FIORDCHK
- // Tcgetattr gets the current serial port settings.
- func Tcgetattr(fd uintptr, argp *syscall.Termios) error {
-       termios, err := unix.IoctlGetTermios(int(fd), unix.TCGETS)
--      *argp = syscall.Termios(*termios)
-+      *argp = *(tiosToSyscall(termios))
-       return err
- }
- 
- // Tcsetattr sets the current serial port settings.
- func Tcsetattr(fd, action uintptr, argp *syscall.Termios) error {
--      return unix.IoctlSetTermios(int(fd), int(action), (*unix.Termios)(argp))
-+      return unix.IoctlSetTermios(int(fd), uint(action), tiosToUnix(argp))
- }
- 
- // Tcsendbreak transmits a continuous stream of zero-valued bits for a specific
-@@ -77,26 +77,50 @@ func Tiocoutq(fd uintptr, argp *int) err
- 
- // Cfgetispeed returns the input baud rate stored in the termios structure.
- func Cfgetispeed(attr *syscall.Termios) uint32 {
--      solTermios := (*unix.Termios)(attr)
-+      solTermios := tiosToUnix(attr)
-       return uint32(C.cfgetispeed((*C.termios_t)(unsafe.Pointer(solTermios))))
- }
- 
- // Cfsetispeed sets the input baud rate stored in the termios structure.
- func Cfsetispeed(attr *syscall.Termios, speed uintptr) error {
--      solTermios := (*unix.Termios)(attr)
-+      solTermios := tiosToUnix(attr)
-       _, err := C.cfsetispeed((*C.termios_t)(unsafe.Pointer(solTermios)), C.speed_t(speed))
-       return err
- }
- 
- // Cfgetospeed returns the output baud rate stored in the termios structure.
- func Cfgetospeed(attr *syscall.Termios) uint32 {
--      solTermios := (*unix.Termios)(attr)
-+      solTermios := tiosToUnix(attr)
-       return uint32(C.cfgetospeed((*C.termios_t)(unsafe.Pointer(solTermios))))
- }
- 
- // Cfsetospeed sets the output baud rate stored in the termios structure.
- func Cfsetospeed(attr *syscall.Termios, speed uintptr) error {
--      solTermios := (*unix.Termios)(attr)
-+      solTermios := tiosToUnix(attr)
-       _, err := C.cfsetospeed((*C.termios_t)(unsafe.Pointer(solTermios)), C.speed_t(speed))
-       return err
- }
-+
-+// tiosToUnix copies a syscall.Termios to a x/sys/unix.Termios.
-+// This is needed since type conversions between the two fail due to
-+// more recent x/sys/unix.Termios renaming the padding field.
-+func tiosToUnix(st *syscall.Termios) *unix.Termios {
-+      return &unix.Termios{
-+              Iflag:  st.Iflag,
-+              Oflag:  st.Oflag,
-+              Cflag:  st.Cflag,
-+              Lflag:  st.Lflag,
-+              Cc:     st.Cc,
-+      }
-+}
-+
-+// tiosToSyscall copies a x/sys/unix.Termios to a syscall.Termios.
-+func tiosToSyscall(ut *unix.Termios) *syscall.Termios {
-+      return &syscall.Termios{
-+              Iflag:  ut.Iflag,
-+              Oflag:  ut.Oflag,
-+              Cflag:  ut.Cflag,
-+              Lflag:  ut.Lflag,
-+              Cc:     ut.Cc,
-+      }
-+}