git: 425467d0f48f - main - sysutils/serf: update to 0.10.1
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 27 Mar 2023 13:52:45 UTC
The branch main has been updated by fuz:
URL: https://cgit.FreeBSD.org/ports/commit/?id=425467d0f48f51c0b7f32192bd64ea8cd5800aff
commit 425467d0f48f51c0b7f32192bd64ea8cd5800aff
Author: Robert Clausecker <fuz@FreeBSD.org>
AuthorDate: 2023-03-25 11:51:55 +0000
Commit: Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2023-03-27 13:52:37 +0000
sysutils/serf: update to 0.10.1
While we are at it, fix build on riscv64 by bumping the
golang.org/x/{net,sys} dependencies to version new enough
to support riscv64-freebsd. Remove patches thus obsoleted.
Changelog: https://github.com/hashicorp/serf/releases/tag/v0.10.1
Approved by: swills (implicit)
---
sysutils/serf/Makefile | 13 +-
sysutils/serf/distinfo | 14 +-
...g_x_net_internal_socket_zsys__freebsd__arm64.go | 63 -
...r_golang.org_x_net_ipv4_zsys__freebsd__arm64.go | 96 -
...r_golang.org_x_net_ipv6_zsys__freebsd__arm64.go | 125 --
...dor_golang.org_x_sys_unix_asm__freebsd__arm64.s | 32 -
...olang.org_x_sys_unix_syscall__freebsd__arm64.go | 55 -
...olang.org_x_sys_unix_zerrors__freebsd__arm64.go | 1797 -----------------
...lang.org_x_sys_unix_zsyscall__freebsd__arm64.go | 2018 --------------------
...olang.org_x_sys_unix_zsysnum__freebsd__arm64.go | 398 ----
...golang.org_x_sys_unix_ztypes__freebsd__arm64.go | 605 ------
11 files changed, 22 insertions(+), 5194 deletions(-)
diff --git a/sysutils/serf/Makefile b/sysutils/serf/Makefile
index ea79f0e1d9bc..6a97f5428389 100644
--- a/sysutils/serf/Makefile
+++ b/sysutils/serf/Makefile
@@ -1,7 +1,6 @@
PORTNAME= serf
-PORTVERSION= 0.8.5
+PORTVERSION= 0.10.1
DISTVERSIONPREFIX= v
-PORTREVISION= 11
CATEGORIES= sysutils
PKGNAMEPREFIX= hashicorp-
@@ -15,7 +14,10 @@ USES= go:modules
USE_GITHUB= yes
GH_ACCOUNT= hashicorp
+GH_TUPLE= golang:net:v0.8.0:net \
+ golang:sys:v0.6.0:sys
+GO_MODULE= github.com/hashicorp/serf
GO_TARGET= ./cmd/${PORTNAME}
USE_RC_SUBR= serf
@@ -25,4 +27,11 @@ GROUPS= serf
PLIST_FILES= bin/serf
+pre-patch:
+.for m in net sys
+ ${RM} -r ${WRKSRC}/vendor/golang.org/x/$m
+ ${LN} -s ${WRKDIR}/$m-* ${WRKSRC}/vendor/golang.org/x/$m
+.endfor
+ ${RM} ${WRKSRC}/vendor/modules.txt
+
.include <bsd.port.mk>
diff --git a/sysutils/serf/distinfo b/sysutils/serf/distinfo
index c12ca369ef2e..2c5ffe1b1e9f 100644
--- a/sysutils/serf/distinfo
+++ b/sysutils/serf/distinfo
@@ -1,3 +1,11 @@
-TIMESTAMP = 1591638415
-SHA256 (hashicorp-serf-v0.8.5_GH0.tar.gz) = bee75f213c661b84cc1ab6436b56ba0169ec7780976605f640ecb6ebb658766b
-SIZE (hashicorp-serf-v0.8.5_GH0.tar.gz) = 1972387
+TIMESTAMP = 1679744468
+SHA256 (go/sysutils_serf/hashicorp-serf-v0.10.1_GH0/v0.10.1.mod) = 3396cc40bae0a0b33dc43748296ce745f803fd24e0959b7e75d14e89e3cfa9ae
+SIZE (go/sysutils_serf/hashicorp-serf-v0.10.1_GH0/v0.10.1.mod) = 831
+SHA256 (go/sysutils_serf/hashicorp-serf-v0.10.1_GH0/v0.10.1.zip) = 661b6ad5df497dcda0f581607b003e40646ef9f3ca09d12bdeec7cb3d16ad370
+SIZE (go/sysutils_serf/hashicorp-serf-v0.10.1_GH0/v0.10.1.zip) = 556099
+SHA256 (go/sysutils_serf/hashicorp-serf-v0.10.1_GH0/hashicorp-serf-v0.10.1_GH0.tar.gz) = cd98087010275887e90d0761a3c63c6c1be7fb00f5a827ae57ac4c82e8a55ec5
+SIZE (go/sysutils_serf/hashicorp-serf-v0.10.1_GH0/hashicorp-serf-v0.10.1_GH0.tar.gz) = 447396
+SHA256 (go/sysutils_serf/hashicorp-serf-v0.10.1_GH0/golang-net-v0.8.0_GH0.tar.gz) = f9e2128a2d6861db0595428c7cce62fe5a131348a6c7651b6efa8b03d0b10831
+SIZE (go/sysutils_serf/hashicorp-serf-v0.10.1_GH0/golang-net-v0.8.0_GH0.tar.gz) = 1244302
+SHA256 (go/sysutils_serf/hashicorp-serf-v0.10.1_GH0/golang-sys-v0.6.0_GH0.tar.gz) = b4f6d17c7a128f76169964b437cb66b3f2dbf9a33361928ec19dfecf7b03fc54
+SIZE (go/sysutils_serf/hashicorp-serf-v0.10.1_GH0/golang-sys-v0.6.0_GH0.tar.gz) = 1434234
diff --git a/sysutils/serf/files/patch-vendor_golang.org_x_net_internal_socket_zsys__freebsd__arm64.go b/sysutils/serf/files/patch-vendor_golang.org_x_net_internal_socket_zsys__freebsd__arm64.go
deleted file mode 100644
index 1abc00eb598c..000000000000
--- a/sysutils/serf/files/patch-vendor_golang.org_x_net_internal_socket_zsys__freebsd__arm64.go
+++ /dev/null
@@ -1,63 +0,0 @@
---- vendor/golang.org/x/net/internal/socket/zsys_freebsd_arm64.go.orig 2020-06-09 20:01:03 UTC
-+++ vendor/golang.org/x/net/internal/socket/zsys_freebsd_arm64.go
-@@ -0,0 +1,60 @@
-+// Code generated by cmd/cgo -godefs; DO NOT EDIT.
-+// cgo -godefs defs_freebsd.go
-+
-+package socket
-+
-+const (
-+ sysAF_UNSPEC = 0x0
-+ sysAF_INET = 0x2
-+ sysAF_INET6 = 0x1c
-+ sysSOCK_RAW = 0x3
-+)
-+
-+type iovec struct {
-+ Base *byte
-+ Len uint64
-+}
-+
-+type msghdr struct {
-+ Name *byte
-+ Namelen uint32
-+ Pad_cgo_0 [4]byte
-+ Iov *iovec
-+ Iovlen int32
-+ Pad_cgo_1 [4]byte
-+ Control *byte
-+ Controllen uint32
-+ Flags int32
-+}
-+
-+type cmsghdr struct {
-+ Len uint32
-+ Level int32
-+ Type int32
-+}
-+
-+type sockaddrInet struct {
-+ Len uint8
-+ Family uint8
-+ Port uint16
-+ Addr [4]byte /* in_addr */
-+ Zero [8]int8
-+}
-+
-+type sockaddrInet6 struct {
-+ Len uint8
-+ Family uint8
-+ Port uint16
-+ Flowinfo uint32
-+ Addr [16]byte /* in6_addr */
-+ Scope_id uint32
-+}
-+
-+const (
-+ sizeofIovec = 0x10
-+ sizeofMsghdr = 0x30
-+ sizeofCmsghdr = 0xc
-+
-+ sizeofSockaddrInet = 0x10
-+ sizeofSockaddrInet6 = 0x1c
-+)
diff --git a/sysutils/serf/files/patch-vendor_golang.org_x_net_ipv4_zsys__freebsd__arm64.go b/sysutils/serf/files/patch-vendor_golang.org_x_net_ipv4_zsys__freebsd__arm64.go
deleted file mode 100644
index fb9681d998cb..000000000000
--- a/sysutils/serf/files/patch-vendor_golang.org_x_net_ipv4_zsys__freebsd__arm64.go
+++ /dev/null
@@ -1,96 +0,0 @@
---- vendor/golang.org/x/net/ipv4/zsys_freebsd_arm64.go.orig 2020-03-30 16:34:45 UTC
-+++ vendor/golang.org/x/net/ipv4/zsys_freebsd_arm64.go
-@@ -0,0 +1,93 @@
-+// Code generated by cmd/cgo -godefs; DO NOT EDIT.
-+// cgo -godefs defs_freebsd.go
-+
-+package ipv4
-+
-+const (
-+ sysIP_OPTIONS = 0x1
-+ sysIP_HDRINCL = 0x2
-+ sysIP_TOS = 0x3
-+ sysIP_TTL = 0x4
-+ sysIP_RECVOPTS = 0x5
-+ sysIP_RECVRETOPTS = 0x6
-+ sysIP_RECVDSTADDR = 0x7
-+ sysIP_SENDSRCADDR = 0x7
-+ sysIP_RETOPTS = 0x8
-+ sysIP_RECVIF = 0x14
-+ sysIP_ONESBCAST = 0x17
-+ sysIP_BINDANY = 0x18
-+ sysIP_RECVTTL = 0x41
-+ sysIP_MINTTL = 0x42
-+ sysIP_DONTFRAG = 0x43
-+ sysIP_RECVTOS = 0x44
-+
-+ sysIP_MULTICAST_IF = 0x9
-+ sysIP_MULTICAST_TTL = 0xa
-+ sysIP_MULTICAST_LOOP = 0xb
-+ sysIP_ADD_MEMBERSHIP = 0xc
-+ sysIP_DROP_MEMBERSHIP = 0xd
-+ sysIP_MULTICAST_VIF = 0xe
-+ sysIP_ADD_SOURCE_MEMBERSHIP = 0x46
-+ sysIP_DROP_SOURCE_MEMBERSHIP = 0x47
-+ sysIP_BLOCK_SOURCE = 0x48
-+ sysIP_UNBLOCK_SOURCE = 0x49
-+ sysMCAST_JOIN_GROUP = 0x50
-+ sysMCAST_LEAVE_GROUP = 0x51
-+ sysMCAST_JOIN_SOURCE_GROUP = 0x52
-+ sysMCAST_LEAVE_SOURCE_GROUP = 0x53
-+ sysMCAST_BLOCK_SOURCE = 0x54
-+ sysMCAST_UNBLOCK_SOURCE = 0x55
-+
-+ sizeofSockaddrStorage = 0x80
-+ sizeofSockaddrInet = 0x10
-+
-+ sizeofIPMreq = 0x8
-+ sizeofIPMreqn = 0xc
-+ sizeofIPMreqSource = 0xc
-+ sizeofGroupReq = 0x88
-+ sizeofGroupSourceReq = 0x108
-+)
-+
-+type sockaddrStorage struct {
-+ Len uint8
-+ Family uint8
-+ X__ss_pad1 [6]uint8
-+ X__ss_align int64
-+ X__ss_pad2 [112]uint8
-+}
-+
-+type sockaddrInet struct {
-+ Len uint8
-+ Family uint8
-+ Port uint16
-+ Addr [4]byte /* in_addr */
-+ Zero [8]uint8
-+}
-+
-+type ipMreq struct {
-+ Multiaddr [4]byte /* in_addr */
-+ Interface [4]byte /* in_addr */
-+}
-+
-+type ipMreqn struct {
-+ Multiaddr [4]byte /* in_addr */
-+ Address [4]byte /* in_addr */
-+ Ifindex int32
-+}
-+
-+type ipMreqSource struct {
-+ Multiaddr [4]byte /* in_addr */
-+ Sourceaddr [4]byte /* in_addr */
-+ Interface [4]byte /* in_addr */
-+}
-+
-+type groupReq struct {
-+ Interface uint32
-+ Group sockaddrStorage
-+}
-+
-+type groupSourceReq struct {
-+ Interface uint32
-+ Group sockaddrStorage
-+ Source sockaddrStorage
-+}
diff --git a/sysutils/serf/files/patch-vendor_golang.org_x_net_ipv6_zsys__freebsd__arm64.go b/sysutils/serf/files/patch-vendor_golang.org_x_net_ipv6_zsys__freebsd__arm64.go
deleted file mode 100644
index c7ed963fe175..000000000000
--- a/sysutils/serf/files/patch-vendor_golang.org_x_net_ipv6_zsys__freebsd__arm64.go
+++ /dev/null
@@ -1,125 +0,0 @@
---- vendor/golang.org/x/net/ipv6/zsys_freebsd_arm64.go.orig 2020-03-30 16:34:37 UTC
-+++ vendor/golang.org/x/net/ipv6/zsys_freebsd_arm64.go
-@@ -0,0 +1,122 @@
-+// Code generated by cmd/cgo -godefs; DO NOT EDIT.
-+// cgo -godefs defs_freebsd.go
-+
-+package ipv6
-+
-+const (
-+ sysIPV6_UNICAST_HOPS = 0x4
-+ sysIPV6_MULTICAST_IF = 0x9
-+ sysIPV6_MULTICAST_HOPS = 0xa
-+ sysIPV6_MULTICAST_LOOP = 0xb
-+ sysIPV6_JOIN_GROUP = 0xc
-+ sysIPV6_LEAVE_GROUP = 0xd
-+ sysIPV6_PORTRANGE = 0xe
-+ sysICMP6_FILTER = 0x12
-+
-+ sysIPV6_CHECKSUM = 0x1a
-+ sysIPV6_V6ONLY = 0x1b
-+
-+ sysIPV6_IPSEC_POLICY = 0x1c
-+
-+ sysIPV6_RTHDRDSTOPTS = 0x23
-+
-+ sysIPV6_RECVPKTINFO = 0x24
-+ sysIPV6_RECVHOPLIMIT = 0x25
-+ sysIPV6_RECVRTHDR = 0x26
-+ sysIPV6_RECVHOPOPTS = 0x27
-+ sysIPV6_RECVDSTOPTS = 0x28
-+
-+ sysIPV6_USE_MIN_MTU = 0x2a
-+ sysIPV6_RECVPATHMTU = 0x2b
-+
-+ sysIPV6_PATHMTU = 0x2c
-+
-+ sysIPV6_PKTINFO = 0x2e
-+ sysIPV6_HOPLIMIT = 0x2f
-+ sysIPV6_NEXTHOP = 0x30
-+ sysIPV6_HOPOPTS = 0x31
-+ sysIPV6_DSTOPTS = 0x32
-+ sysIPV6_RTHDR = 0x33
-+
-+ sysIPV6_RECVTCLASS = 0x39
-+
-+ sysIPV6_AUTOFLOWLABEL = 0x3b
-+
-+ sysIPV6_TCLASS = 0x3d
-+ sysIPV6_DONTFRAG = 0x3e
-+
-+ sysIPV6_PREFER_TEMPADDR = 0x3f
-+
-+ sysIPV6_BINDANY = 0x40
-+
-+ sysIPV6_MSFILTER = 0x4a
-+
-+ sysMCAST_JOIN_GROUP = 0x50
-+ sysMCAST_LEAVE_GROUP = 0x51
-+ sysMCAST_JOIN_SOURCE_GROUP = 0x52
-+ sysMCAST_LEAVE_SOURCE_GROUP = 0x53
-+ sysMCAST_BLOCK_SOURCE = 0x54
-+ sysMCAST_UNBLOCK_SOURCE = 0x55
-+
-+ sysIPV6_PORTRANGE_DEFAULT = 0x0
-+ sysIPV6_PORTRANGE_HIGH = 0x1
-+ sysIPV6_PORTRANGE_LOW = 0x2
-+
-+ sizeofSockaddrStorage = 0x80
-+ sizeofSockaddrInet6 = 0x1c
-+ sizeofInet6Pktinfo = 0x14
-+ sizeofIPv6Mtuinfo = 0x20
-+
-+ sizeofIPv6Mreq = 0x14
-+ sizeofGroupReq = 0x88
-+ sizeofGroupSourceReq = 0x108
-+
-+ sizeofICMPv6Filter = 0x20
-+)
-+
-+type sockaddrStorage struct {
-+ Len uint8
-+ Family uint8
-+ X__ss_pad1 [6]uint8
-+ X__ss_align int64
-+ X__ss_pad2 [112]uint8
-+}
-+
-+type sockaddrInet6 struct {
-+ Len uint8
-+ Family uint8
-+ Port uint16
-+ Flowinfo uint32
-+ Addr [16]byte /* in6_addr */
-+ Scope_id uint32
-+}
-+
-+type inet6Pktinfo struct {
-+ Addr [16]byte /* in6_addr */
-+ Ifindex uint32
-+}
-+
-+type ipv6Mtuinfo struct {
-+ Addr sockaddrInet6
-+ Mtu uint32
-+}
-+
-+type ipv6Mreq struct {
-+ Multiaddr [16]byte /* in6_addr */
-+ Interface uint32
-+}
-+
-+type groupReq struct {
-+ Interface uint32
-+ Group sockaddrStorage
-+}
-+
-+type groupSourceReq struct {
-+ Interface uint32
-+ Group sockaddrStorage
-+ Source sockaddrStorage
-+}
-+
-+type icmpv6Filter struct {
-+ Filt [8]uint32
-+}
diff --git a/sysutils/serf/files/patch-vendor_golang.org_x_sys_unix_asm__freebsd__arm64.s b/sysutils/serf/files/patch-vendor_golang.org_x_sys_unix_asm__freebsd__arm64.s
deleted file mode 100644
index a8ffb4d55dcb..000000000000
--- a/sysutils/serf/files/patch-vendor_golang.org_x_sys_unix_asm__freebsd__arm64.s
+++ /dev/null
@@ -1,32 +0,0 @@
---- vendor/golang.org/x/sys/unix/asm_freebsd_arm64.s.orig 2020-06-10 09:34:47 UTC
-+++ vendor/golang.org/x/sys/unix/asm_freebsd_arm64.s
-@@ -0,0 +1,29 @@
-+// Copyright 2018 The Go Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style
-+// license that can be found in the LICENSE file.
-+
-+// +build !gccgo
-+
-+#include "textflag.h"
-+
-+//
-+// System call support for ARM64, FreeBSD
-+//
-+
-+// Just jump to package syscall's implementation for all these functions.
-+// The runtime may know about them.
-+
-+TEXT ·Syscall(SB),NOSPLIT,$0-56
-+ JMP syscall·Syscall(SB)
-+
-+TEXT ·Syscall6(SB),NOSPLIT,$0-80
-+ JMP syscall·Syscall6(SB)
-+
-+TEXT ·Syscall9(SB),NOSPLIT,$0-104
-+ JMP syscall·Syscall9(SB)
-+
-+TEXT ·RawSyscall(SB),NOSPLIT,$0-56
-+ JMP syscall·RawSyscall(SB)
-+
-+TEXT ·RawSyscall6(SB),NOSPLIT,$0-80
-+ JMP syscall·RawSyscall6(SB)
diff --git a/sysutils/serf/files/patch-vendor_golang.org_x_sys_unix_syscall__freebsd__arm64.go b/sysutils/serf/files/patch-vendor_golang.org_x_sys_unix_syscall__freebsd__arm64.go
deleted file mode 100644
index cf45d3fbf467..000000000000
--- a/sysutils/serf/files/patch-vendor_golang.org_x_sys_unix_syscall__freebsd__arm64.go
+++ /dev/null
@@ -1,55 +0,0 @@
---- vendor/golang.org/x/sys/unix/syscall_freebsd_arm64.go.orig 2020-06-10 09:34:47 UTC
-+++ vendor/golang.org/x/sys/unix/syscall_freebsd_arm64.go
-@@ -0,0 +1,52 @@
-+// Copyright 2018 The Go Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style
-+// license that can be found in the LICENSE file.
-+
-+// +build arm64,freebsd
-+
-+package unix
-+
-+import (
-+ "syscall"
-+ "unsafe"
-+)
-+
-+func setTimespec(sec, nsec int64) Timespec {
-+ return Timespec{Sec: sec, Nsec: nsec}
-+}
-+
-+func setTimeval(sec, usec int64) Timeval {
-+ return Timeval{Sec: sec, Usec: usec}
-+}
-+
-+func SetKevent(k *Kevent_t, fd, mode, flags int) {
-+ k.Ident = uint64(fd)
-+ k.Filter = int16(mode)
-+ k.Flags = uint16(flags)
-+}
-+
-+func (iov *Iovec) SetLen(length int) {
-+ iov.Len = uint64(length)
-+}
-+
-+func (msghdr *Msghdr) SetControllen(length int) {
-+ msghdr.Controllen = uint32(length)
-+}
-+
-+func (cmsg *Cmsghdr) SetLen(length int) {
-+ cmsg.Len = uint32(length)
-+}
-+
-+func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
-+ var writtenOut uint64 = 0
-+ _, _, e1 := Syscall9(SYS_SENDFILE, uintptr(infd), uintptr(outfd), uintptr(*offset), uintptr(count), 0, uintptr(unsafe.Pointer(&writtenOut)), 0, 0, 0)
-+
-+ written = int(writtenOut)
-+
-+ if e1 != 0 {
-+ err = e1
-+ }
-+ return
-+}
-+
-+func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno)
diff --git a/sysutils/serf/files/patch-vendor_golang.org_x_sys_unix_zerrors__freebsd__arm64.go b/sysutils/serf/files/patch-vendor_golang.org_x_sys_unix_zerrors__freebsd__arm64.go
deleted file mode 100644
index d0e69c8826be..000000000000
--- a/sysutils/serf/files/patch-vendor_golang.org_x_sys_unix_zerrors__freebsd__arm64.go
+++ /dev/null
@@ -1,1797 +0,0 @@
---- vendor/golang.org/x/sys/unix/zerrors_freebsd_arm64.go.orig 2020-06-10 09:34:47 UTC
-+++ vendor/golang.org/x/sys/unix/zerrors_freebsd_arm64.go
-@@ -0,0 +1,1794 @@
-+// mkerrors.sh -m64
-+// Code generated by the command above; see README.md. DO NOT EDIT.
-+
-+// +build arm64,freebsd
-+
-+// Created by cgo -godefs - DO NOT EDIT
-+// cgo -godefs -- -m64 _const.go
-+
-+package unix
-+
-+import "syscall"
-+
-+const (
-+ AF_APPLETALK = 0x10
-+ AF_ARP = 0x23
-+ AF_ATM = 0x1e
-+ AF_BLUETOOTH = 0x24
-+ AF_CCITT = 0xa
-+ AF_CHAOS = 0x5
-+ AF_CNT = 0x15
-+ AF_COIP = 0x14
-+ AF_DATAKIT = 0x9
-+ AF_DECnet = 0xc
-+ AF_DLI = 0xd
-+ AF_E164 = 0x1a
-+ AF_ECMA = 0x8
-+ AF_HYLINK = 0xf
-+ AF_IEEE80211 = 0x25
-+ AF_IMPLINK = 0x3
-+ AF_INET = 0x2
-+ AF_INET6 = 0x1c
-+ AF_INET6_SDP = 0x2a
-+ AF_INET_SDP = 0x28
-+ AF_IPX = 0x17
-+ AF_ISDN = 0x1a
-+ AF_ISO = 0x7
-+ AF_LAT = 0xe
-+ AF_LINK = 0x12
-+ AF_LOCAL = 0x1
-+ AF_MAX = 0x2a
-+ AF_NATM = 0x1d
-+ AF_NETBIOS = 0x6
-+ AF_NETGRAPH = 0x20
-+ AF_OSI = 0x7
-+ AF_PUP = 0x4
-+ AF_ROUTE = 0x11
-+ AF_SCLUSTER = 0x22
-+ AF_SIP = 0x18
-+ AF_SLOW = 0x21
-+ AF_SNA = 0xb
-+ AF_UNIX = 0x1
-+ AF_UNSPEC = 0x0
-+ AF_VENDOR00 = 0x27
-+ AF_VENDOR01 = 0x29
-+ AF_VENDOR02 = 0x2b
-+ AF_VENDOR03 = 0x2d
-+ AF_VENDOR04 = 0x2f
-+ AF_VENDOR05 = 0x31
-+ AF_VENDOR06 = 0x33
-+ AF_VENDOR07 = 0x35
-+ AF_VENDOR08 = 0x37
-+ AF_VENDOR09 = 0x39
-+ AF_VENDOR10 = 0x3b
-+ AF_VENDOR11 = 0x3d
-+ AF_VENDOR12 = 0x3f
-+ AF_VENDOR13 = 0x41
-+ AF_VENDOR14 = 0x43
-+ AF_VENDOR15 = 0x45
-+ AF_VENDOR16 = 0x47
-+ AF_VENDOR17 = 0x49
-+ AF_VENDOR18 = 0x4b
-+ AF_VENDOR19 = 0x4d
-+ AF_VENDOR20 = 0x4f
-+ AF_VENDOR21 = 0x51
-+ AF_VENDOR22 = 0x53
-+ AF_VENDOR23 = 0x55
-+ AF_VENDOR24 = 0x57
-+ AF_VENDOR25 = 0x59
-+ AF_VENDOR26 = 0x5b
-+ AF_VENDOR27 = 0x5d
-+ AF_VENDOR28 = 0x5f
-+ AF_VENDOR29 = 0x61
-+ AF_VENDOR30 = 0x63
-+ AF_VENDOR31 = 0x65
-+ AF_VENDOR32 = 0x67
-+ AF_VENDOR33 = 0x69
-+ AF_VENDOR34 = 0x6b
-+ AF_VENDOR35 = 0x6d
-+ AF_VENDOR36 = 0x6f
-+ AF_VENDOR37 = 0x71
-+ AF_VENDOR38 = 0x73
-+ AF_VENDOR39 = 0x75
-+ AF_VENDOR40 = 0x77
-+ AF_VENDOR41 = 0x79
-+ AF_VENDOR42 = 0x7b
-+ AF_VENDOR43 = 0x7d
-+ AF_VENDOR44 = 0x7f
-+ AF_VENDOR45 = 0x81
-+ AF_VENDOR46 = 0x83
-+ AF_VENDOR47 = 0x85
-+ ALTWERASE = 0x200
-+ B0 = 0x0
-+ B110 = 0x6e
-+ B115200 = 0x1c200
-+ B1200 = 0x4b0
-+ B134 = 0x86
-+ B14400 = 0x3840
-+ B150 = 0x96
-+ B1800 = 0x708
-+ B19200 = 0x4b00
-+ B200 = 0xc8
-+ B230400 = 0x38400
-+ B2400 = 0x960
-+ B28800 = 0x7080
-+ B300 = 0x12c
-+ B38400 = 0x9600
-+ B460800 = 0x70800
-+ B4800 = 0x12c0
-+ B50 = 0x32
-+ B57600 = 0xe100
-+ B600 = 0x258
-+ B7200 = 0x1c20
-+ B75 = 0x4b
-+ B76800 = 0x12c00
-+ B921600 = 0xe1000
-+ B9600 = 0x2580
-+ BIOCFEEDBACK = 0x8004427c
-+ BIOCFLUSH = 0x20004268
-+ BIOCGBLEN = 0x40044266
-+ BIOCGDIRECTION = 0x40044276
-+ BIOCGDLT = 0x4004426a
-+ BIOCGDLTLIST = 0xc0104279
-+ BIOCGETBUFMODE = 0x4004427d
-+ BIOCGETIF = 0x4020426b
-+ BIOCGETZMAX = 0x4008427f
-+ BIOCGHDRCMPLT = 0x40044274
-+ BIOCGRSIG = 0x40044272
-+ BIOCGRTIMEOUT = 0x4010426e
-+ BIOCGSEESENT = 0x40044276
-+ BIOCGSTATS = 0x4008426f
-+ BIOCGTSTAMP = 0x40044283
-+ BIOCIMMEDIATE = 0x80044270
-+ BIOCLOCK = 0x2000427a
-+ BIOCPROMISC = 0x20004269
-+ BIOCROTZBUF = 0x40184280
-+ BIOCSBLEN = 0xc0044266
-+ BIOCSDIRECTION = 0x80044277
-+ BIOCSDLT = 0x80044278
-+ BIOCSETBUFMODE = 0x8004427e
-+ BIOCSETF = 0x80104267
-+ BIOCSETFNR = 0x80104282
-+ BIOCSETIF = 0x8020426c
-+ BIOCSETWF = 0x8010427b
-+ BIOCSETZBUF = 0x80184281
-+ BIOCSHDRCMPLT = 0x80044275
-+ BIOCSRSIG = 0x80044273
-+ BIOCSRTIMEOUT = 0x8010426d
-+ BIOCSSEESENT = 0x80044277
-+ BIOCSTSTAMP = 0x80044284
-+ BIOCVERSION = 0x40044271
-+ BPF_A = 0x10
-+ BPF_ABS = 0x20
-+ BPF_ADD = 0x0
-+ BPF_ALIGNMENT = 0x8
-+ BPF_ALU = 0x4
-+ BPF_AND = 0x50
-+ BPF_B = 0x10
-+ BPF_BUFMODE_BUFFER = 0x1
-+ BPF_BUFMODE_ZBUF = 0x2
-+ BPF_DIV = 0x30
-+ BPF_H = 0x8
-+ BPF_IMM = 0x0
-+ BPF_IND = 0x40
-+ BPF_JA = 0x0
-+ BPF_JEQ = 0x10
-+ BPF_JGE = 0x30
-+ BPF_JGT = 0x20
-+ BPF_JMP = 0x5
-+ BPF_JSET = 0x40
-+ BPF_K = 0x0
-+ BPF_LD = 0x0
-+ BPF_LDX = 0x1
-+ BPF_LEN = 0x80
-+ BPF_LSH = 0x60
-+ BPF_MAJOR_VERSION = 0x1
-+ BPF_MAXBUFSIZE = 0x80000
-+ BPF_MAXINSNS = 0x200
-+ BPF_MEM = 0x60
-+ BPF_MEMWORDS = 0x10
-+ BPF_MINBUFSIZE = 0x20
-+ BPF_MINOR_VERSION = 0x1
-+ BPF_MISC = 0x7
-+ BPF_MOD = 0x90
-+ BPF_MSH = 0xa0
-+ BPF_MUL = 0x20
-+ BPF_NEG = 0x80
-+ BPF_OR = 0x40
-+ BPF_RELEASE = 0x30bb6
-+ BPF_RET = 0x6
-+ BPF_RSH = 0x70
-+ BPF_ST = 0x2
-+ BPF_STX = 0x3
-+ BPF_SUB = 0x10
-+ BPF_TAX = 0x0
-+ BPF_TXA = 0x80
-+ BPF_T_BINTIME = 0x2
-+ BPF_T_BINTIME_FAST = 0x102
-+ BPF_T_BINTIME_MONOTONIC = 0x202
-+ BPF_T_BINTIME_MONOTONIC_FAST = 0x302
-+ BPF_T_FAST = 0x100
-+ BPF_T_FLAG_MASK = 0x300
-+ BPF_T_FORMAT_MASK = 0x3
-+ BPF_T_MICROTIME = 0x0
-+ BPF_T_MICROTIME_FAST = 0x100
-+ BPF_T_MICROTIME_MONOTONIC = 0x200
-+ BPF_T_MICROTIME_MONOTONIC_FAST = 0x300
-+ BPF_T_MONOTONIC = 0x200
-+ BPF_T_MONOTONIC_FAST = 0x300
-+ BPF_T_NANOTIME = 0x1
-+ BPF_T_NANOTIME_FAST = 0x101
-+ BPF_T_NANOTIME_MONOTONIC = 0x201
-+ BPF_T_NANOTIME_MONOTONIC_FAST = 0x301
-+ BPF_T_NONE = 0x3
-+ BPF_T_NORMAL = 0x0
-+ BPF_W = 0x0
-+ BPF_X = 0x8
-+ BPF_XOR = 0xa0
-+ BRKINT = 0x2
-+ CAP_ACCEPT = 0x200000020000000
-+ CAP_ACL_CHECK = 0x400000000010000
-+ CAP_ACL_DELETE = 0x400000000020000
-+ CAP_ACL_GET = 0x400000000040000
-+ CAP_ACL_SET = 0x400000000080000
-+ CAP_ALL0 = 0x20007ffffffffff
-+ CAP_ALL1 = 0x4000000001fffff
-+ CAP_BIND = 0x200000040000000
-+ CAP_BINDAT = 0x200008000000400
-+ CAP_CHFLAGSAT = 0x200000000001400
-+ CAP_CONNECT = 0x200000080000000
-+ CAP_CONNECTAT = 0x200010000000400
-+ CAP_CREATE = 0x200000000000040
-+ CAP_EVENT = 0x400000000000020
-+ CAP_EXTATTR_DELETE = 0x400000000001000
-+ CAP_EXTATTR_GET = 0x400000000002000
-+ CAP_EXTATTR_LIST = 0x400000000004000
-+ CAP_EXTATTR_SET = 0x400000000008000
-+ CAP_FCHDIR = 0x200000000000800
-+ CAP_FCHFLAGS = 0x200000000001000
-+ CAP_FCHMOD = 0x200000000002000
-+ CAP_FCHMODAT = 0x200000000002400
-+ CAP_FCHOWN = 0x200000000004000
-+ CAP_FCHOWNAT = 0x200000000004400
-+ CAP_FCNTL = 0x200000000008000
-+ CAP_FCNTL_ALL = 0x78
-+ CAP_FCNTL_GETFL = 0x8
-+ CAP_FCNTL_GETOWN = 0x20
-+ CAP_FCNTL_SETFL = 0x10
-+ CAP_FCNTL_SETOWN = 0x40
-+ CAP_FEXECVE = 0x200000000000080
-+ CAP_FLOCK = 0x200000000010000
-+ CAP_FPATHCONF = 0x200000000020000
-+ CAP_FSCK = 0x200000000040000
-+ CAP_FSTAT = 0x200000000080000
-+ CAP_FSTATAT = 0x200000000080400
-+ CAP_FSTATFS = 0x200000000100000
-+ CAP_FSYNC = 0x200000000000100
-+ CAP_FTRUNCATE = 0x200000000000200
-+ CAP_FUTIMES = 0x200000000200000
-+ CAP_FUTIMESAT = 0x200000000200400
-+ CAP_GETPEERNAME = 0x200000100000000
-+ CAP_GETSOCKNAME = 0x200000200000000
-+ CAP_GETSOCKOPT = 0x200000400000000
-+ CAP_IOCTL = 0x400000000000080
-+ CAP_IOCTLS_ALL = 0x7fffffffffffffff
-+ CAP_KQUEUE = 0x400000000100040
-+ CAP_KQUEUE_CHANGE = 0x400000000100000
-+ CAP_KQUEUE_EVENT = 0x400000000000040
-+ CAP_LINKAT_SOURCE = 0x200020000000400
-+ CAP_LINKAT_TARGET = 0x200000000400400
-+ CAP_LISTEN = 0x200000800000000
-+ CAP_LOOKUP = 0x200000000000400
-+ CAP_MAC_GET = 0x400000000000001
-+ CAP_MAC_SET = 0x400000000000002
-+ CAP_MKDIRAT = 0x200000000800400
-+ CAP_MKFIFOAT = 0x200000001000400
-+ CAP_MKNODAT = 0x200000002000400
-+ CAP_MMAP = 0x200000000000010
-+ CAP_MMAP_R = 0x20000000000001d
-+ CAP_MMAP_RW = 0x20000000000001f
-+ CAP_MMAP_RWX = 0x20000000000003f
-+ CAP_MMAP_RX = 0x20000000000003d
-+ CAP_MMAP_W = 0x20000000000001e
-+ CAP_MMAP_WX = 0x20000000000003e
-+ CAP_MMAP_X = 0x20000000000003c
-+ CAP_PDGETPID = 0x400000000000200
-+ CAP_PDKILL = 0x400000000000800
-+ CAP_PDWAIT = 0x400000000000400
-+ CAP_PEELOFF = 0x200001000000000
-+ CAP_POLL_EVENT = 0x400000000000020
-+ CAP_PREAD = 0x20000000000000d
-+ CAP_PWRITE = 0x20000000000000e
-+ CAP_READ = 0x200000000000001
-+ CAP_RECV = 0x200000000000001
-+ CAP_RENAMEAT_SOURCE = 0x200000004000400
-+ CAP_RENAMEAT_TARGET = 0x200040000000400
-+ CAP_RIGHTS_VERSION = 0x0
-+ CAP_RIGHTS_VERSION_00 = 0x0
-+ CAP_SEEK = 0x20000000000000c
-+ CAP_SEEK_TELL = 0x200000000000004
-+ CAP_SEM_GETVALUE = 0x400000000000004
-+ CAP_SEM_POST = 0x400000000000008
-+ CAP_SEM_WAIT = 0x400000000000010
-+ CAP_SEND = 0x200000000000002
-+ CAP_SETSOCKOPT = 0x200002000000000
-+ CAP_SHUTDOWN = 0x200004000000000
-+ CAP_SOCK_CLIENT = 0x200007780000003
-+ CAP_SOCK_SERVER = 0x200007f60000003
-+ CAP_SYMLINKAT = 0x200000008000400
-+ CAP_TTYHOOK = 0x400000000000100
-+ CAP_UNLINKAT = 0x200000010000400
-+ CAP_UNUSED0_44 = 0x200080000000000
-+ CAP_UNUSED0_57 = 0x300000000000000
-+ CAP_UNUSED1_22 = 0x400000000200000
-+ CAP_UNUSED1_57 = 0x500000000000000
-+ CAP_WRITE = 0x200000000000002
-+ CFLUSH = 0xf
-+ CLOCAL = 0x8000
-+ CLOCK_MONOTONIC = 0x4
-+ CLOCK_MONOTONIC_FAST = 0xc
-+ CLOCK_MONOTONIC_PRECISE = 0xb
-+ CLOCK_PROCESS_CPUTIME_ID = 0xf
-+ CLOCK_PROF = 0x2
-+ CLOCK_REALTIME = 0x0
-+ CLOCK_REALTIME_FAST = 0xa
-+ CLOCK_REALTIME_PRECISE = 0x9
-+ CLOCK_SECOND = 0xd
-+ CLOCK_THREAD_CPUTIME_ID = 0xe
-+ CLOCK_UPTIME = 0x5
-+ CLOCK_UPTIME_FAST = 0x8
-+ CLOCK_UPTIME_PRECISE = 0x7
-+ CLOCK_VIRTUAL = 0x1
-+ CREAD = 0x800
-+ CRTSCTS = 0x30000
-+ CS5 = 0x0
-+ CS6 = 0x100
-+ CS7 = 0x200
-+ CS8 = 0x300
-+ CSIZE = 0x300
-+ CSTART = 0x11
-+ CSTATUS = 0x14
-+ CSTOP = 0x13
-+ CSTOPB = 0x400
-+ CSUSP = 0x1a
-+ CTL_HW = 0x6
-+ CTL_KERN = 0x1
-+ CTL_MAXNAME = 0x18
-+ CTL_NET = 0x4
-+ DLT_A429 = 0xb8
-+ DLT_A653_ICM = 0xb9
-+ DLT_AIRONET_HEADER = 0x78
-+ DLT_AOS = 0xde
-+ DLT_APPLE_IP_OVER_IEEE1394 = 0x8a
-+ DLT_ARCNET = 0x7
-+ DLT_ARCNET_LINUX = 0x81
-+ DLT_ATM_CLIP = 0x13
-+ DLT_ATM_RFC1483 = 0xb
-+ DLT_AURORA = 0x7e
-+ DLT_AX25 = 0x3
-+ DLT_AX25_KISS = 0xca
-+ DLT_BACNET_MS_TP = 0xa5
-+ DLT_BLUETOOTH_BREDR_BB = 0xff
-+ DLT_BLUETOOTH_HCI_H4 = 0xbb
-+ DLT_BLUETOOTH_HCI_H4_WITH_PHDR = 0xc9
-+ DLT_BLUETOOTH_LE_LL = 0xfb
-+ DLT_BLUETOOTH_LE_LL_WITH_PHDR = 0x100
-+ DLT_BLUETOOTH_LINUX_MONITOR = 0xfe
-+ DLT_CAN20B = 0xbe
-+ DLT_CAN_SOCKETCAN = 0xe3
-+ DLT_CHAOS = 0x5
-+ DLT_CHDLC = 0x68
-+ DLT_CISCO_IOS = 0x76
-+ DLT_C_HDLC = 0x68
-+ DLT_C_HDLC_WITH_DIR = 0xcd
-+ DLT_DBUS = 0xe7
-+ DLT_DECT = 0xdd
-+ DLT_DOCSIS = 0x8f
-+ DLT_DVB_CI = 0xeb
-+ DLT_ECONET = 0x73
-+ DLT_EN10MB = 0x1
-+ DLT_EN3MB = 0x2
-+ DLT_ENC = 0x6d
-+ DLT_EPON = 0x103
-+ DLT_ERF = 0xc5
-+ DLT_ERF_ETH = 0xaf
-+ DLT_ERF_POS = 0xb0
-+ DLT_FC_2 = 0xe0
-+ DLT_FC_2_WITH_FRAME_DELIMS = 0xe1
-+ DLT_FDDI = 0xa
-+ DLT_FLEXRAY = 0xd2
-+ DLT_FRELAY = 0x6b
-+ DLT_FRELAY_WITH_DIR = 0xce
-+ DLT_GCOM_SERIAL = 0xad
-+ DLT_GCOM_T1E1 = 0xac
-+ DLT_GPF_F = 0xab
-+ DLT_GPF_T = 0xaa
-+ DLT_GPRS_LLC = 0xa9
-+ DLT_GSMTAP_ABIS = 0xda
-+ DLT_GSMTAP_UM = 0xd9
-+ DLT_HHDLC = 0x79
-+ DLT_IBM_SN = 0x92
-+ DLT_IBM_SP = 0x91
-+ DLT_IEEE802 = 0x6
-+ DLT_IEEE802_11 = 0x69
-+ DLT_IEEE802_11_RADIO = 0x7f
-+ DLT_IEEE802_11_RADIO_AVS = 0xa3
-+ DLT_IEEE802_15_4 = 0xc3
-+ DLT_IEEE802_15_4_LINUX = 0xbf
-+ DLT_IEEE802_15_4_NOFCS = 0xe6
-+ DLT_IEEE802_15_4_NONASK_PHY = 0xd7
-+ DLT_IEEE802_16_MAC_CPS = 0xbc
-+ DLT_IEEE802_16_MAC_CPS_RADIO = 0xc1
-+ DLT_INFINIBAND = 0xf7
-+ DLT_IPFILTER = 0x74
-+ DLT_IPMB = 0xc7
-+ DLT_IPMB_LINUX = 0xd1
-+ DLT_IPMI_HPM_2 = 0x104
-+ DLT_IPNET = 0xe2
-+ DLT_IPOIB = 0xf2
-+ DLT_IPV4 = 0xe4
-+ DLT_IPV6 = 0xe5
-+ DLT_IP_OVER_FC = 0x7a
-+ DLT_JUNIPER_ATM1 = 0x89
-+ DLT_JUNIPER_ATM2 = 0x87
-+ DLT_JUNIPER_ATM_CEMIC = 0xee
-+ DLT_JUNIPER_CHDLC = 0xb5
-+ DLT_JUNIPER_ES = 0x84
-+ DLT_JUNIPER_ETHER = 0xb2
-+ DLT_JUNIPER_FIBRECHANNEL = 0xea
-+ DLT_JUNIPER_FRELAY = 0xb4
-+ DLT_JUNIPER_GGSN = 0x85
-+ DLT_JUNIPER_ISM = 0xc2
-+ DLT_JUNIPER_MFR = 0x86
-+ DLT_JUNIPER_MLFR = 0x83
-+ DLT_JUNIPER_MLPPP = 0x82
-+ DLT_JUNIPER_MONITOR = 0xa4
-+ DLT_JUNIPER_PIC_PEER = 0xae
-+ DLT_JUNIPER_PPP = 0xb3
-+ DLT_JUNIPER_PPPOE = 0xa7
-+ DLT_JUNIPER_PPPOE_ATM = 0xa8
-+ DLT_JUNIPER_SERVICES = 0x88
-+ DLT_JUNIPER_SRX_E2E = 0xe9
-+ DLT_JUNIPER_ST = 0xc8
-+ DLT_JUNIPER_VP = 0xb7
-+ DLT_JUNIPER_VS = 0xe8
-+ DLT_LAPB_WITH_DIR = 0xcf
-+ DLT_LAPD = 0xcb
-+ DLT_LIN = 0xd4
-+ DLT_LINUX_EVDEV = 0xd8
-+ DLT_LINUX_IRDA = 0x90
-+ DLT_LINUX_LAPD = 0xb1
-+ DLT_LINUX_PPP_WITHDIRECTION = 0xa6
-+ DLT_LINUX_SLL = 0x71
-+ DLT_LOOP = 0x6c
-+ DLT_LTALK = 0x72
-+ DLT_MATCHING_MAX = 0x104
-+ DLT_MATCHING_MIN = 0x68
-+ DLT_MFR = 0xb6
-+ DLT_MOST = 0xd3
-+ DLT_MPEG_2_TS = 0xf3
-+ DLT_MPLS = 0xdb
-+ DLT_MTP2 = 0x8c
-+ DLT_MTP2_WITH_PHDR = 0x8b
-+ DLT_MTP3 = 0x8d
-+ DLT_MUX27010 = 0xec
-+ DLT_NETANALYZER = 0xf0
-+ DLT_NETANALYZER_TRANSPARENT = 0xf1
-+ DLT_NETLINK = 0xfd
-+ DLT_NFC_LLCP = 0xf5
-+ DLT_NFLOG = 0xef
-+ DLT_NG40 = 0xf4
-+ DLT_NULL = 0x0
-+ DLT_PCI_EXP = 0x7d
-+ DLT_PFLOG = 0x75
-+ DLT_PFSYNC = 0x79
-+ DLT_PKTAP = 0x102
-+ DLT_PPI = 0xc0
-+ DLT_PPP = 0x9
-+ DLT_PPP_BSDOS = 0x10
-+ DLT_PPP_ETHER = 0x33
*** 4344 LINES SKIPPED ***