git: b78fa20368bb - main - sysutils/paladin: fix build on riscv64
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 11 Mar 2023 08:39:24 UTC
The branch main has been updated by fuz:
URL: https://cgit.FreeBSD.org/ports/commit/?id=b78fa20368bbbb1fc06c168daa5490a105642470
commit b78fa20368bbbb1fc06c168daa5490a105642470
Author: Robert Clausecker <fuz@FreeBSD.org>
AuthorDate: 2023-03-08 19:30:45 +0000
Commit: Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2023-03-11 08:38:44 +0000
sysutils/paladin: fix build on riscv64
Bump golang.org/x/sys dependency to a version new enough
to support riscv64-freebsd. This subsumes the patches
previously included for AArch64 support.
While we are at it, fix configuration when PREFIX is not
/usr/local.
Sponsored by: Berliner Linux User Group e.V.
Approved by: portmgr (build fix blanket)
---
sysutils/paladin/Makefile | 9 +-
sysutils/paladin/distinfo | 4 +-
...dor_golang.org_x_sys_unix_asm__freebsd__arm64.s | 32 -
...olang.org_x_sys_unix_syscall__freebsd__arm64.go | 64 -
...olang.org_x_sys_unix_zerrors__freebsd__arm64.go | 1751 --------------------
...lang.org_x_sys_unix_zsyscall__freebsd__arm64.go | 1668 -------------------
...olang.org_x_sys_unix_zsysnum__freebsd__arm64.go | 354 ----
...golang.org_x_sys_unix_ztypes__freebsd__arm64.go | 508 ------
8 files changed, 10 insertions(+), 4380 deletions(-)
diff --git a/sysutils/paladin/Makefile b/sysutils/paladin/Makefile
index d89d7e0a72dc..bbe359db494b 100644
--- a/sysutils/paladin/Makefile
+++ b/sysutils/paladin/Makefile
@@ -1,6 +1,6 @@
PORTNAME= paladin
PORTVERSION= 2.0.1
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= sysutils
MAINTAINER= rwestlun@gmail.com
@@ -12,10 +12,15 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
USES= go
GO_PKGNAME= github.com/${GH_ACCOUNT}/${PORTNAME}
-GO_BUILDFLAGS= -ldflags="-X main.localbase=/usr/local"
+GO_BUILDFLAGS= -ldflags="-X main.localbase=${PREFIX}"
USE_GITHUB= yes
GH_ACCOUNT= rwestlund
+GH_TUPLE= golang:sys:v0.5.0:sys/vendor/golang.org/x/sys_
+
+pre-patch:
+ ${RM} -r ${WRKSRC}/vendor/golang.org/x/sys
+ ${MV} ${WRKSRC}/vendor/golang.org/x/sys_ ${WRKSRC}/vendor/golang.org/x/sys
post-install:
@${CP} ${WRKSRC}/etc/paladin.conf.sample ${STAGEDIR}/${LOCALBASE}/etc/
diff --git a/sysutils/paladin/distinfo b/sysutils/paladin/distinfo
index fc4c070a8e48..e49358854635 100644
--- a/sysutils/paladin/distinfo
+++ b/sysutils/paladin/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1565646362
+TIMESTAMP = 1678303640
SHA256 (rwestlund-paladin-2.0.1_GH0.tar.gz) = 2dece7e7a78f014e16031b4bcd746a2ec9dfb1f7a6aa626373e1417ea548192a
SIZE (rwestlund-paladin-2.0.1_GH0.tar.gz) = 615627
+SHA256 (golang-sys-v0.5.0_GH0.tar.gz) = 810c8f1b7704674971ab6b2b614aba20a5a1765018fd2c639f528dbbcbf88b1f
+SIZE (golang-sys-v0.5.0_GH0.tar.gz) = 1429723
diff --git a/sysutils/paladin/files/patch-vendor_golang.org_x_sys_unix_asm__freebsd__arm64.s b/sysutils/paladin/files/patch-vendor_golang.org_x_sys_unix_asm__freebsd__arm64.s
deleted file mode 100644
index 45fa1c47593d..000000000000
--- a/sysutils/paladin/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 2021-09-13 12:54:00 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/paladin/files/patch-vendor_golang.org_x_sys_unix_syscall__freebsd__arm64.go b/sysutils/paladin/files/patch-vendor_golang.org_x_sys_unix_syscall__freebsd__arm64.go
deleted file mode 100644
index d5272fec2cbd..000000000000
--- a/sysutils/paladin/files/patch-vendor_golang.org_x_sys_unix_syscall__freebsd__arm64.go
+++ /dev/null
@@ -1,64 +0,0 @@
---- vendor/golang.org/x/sys/unix/syscall_freebsd_arm64.go.orig 2021-09-13 12:54:00 UTC
-+++ vendor/golang.org/x/sys/unix/syscall_freebsd_arm64.go
-@@ -0,0 +1,61 @@
-+// 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 Getpagesize() int { return 4096 }
-+
-+func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-+
-+func NsecToTimespec(nsec int64) (ts Timespec) {
-+ ts.Sec = nsec / 1e9
-+ ts.Nsec = nsec % 1e9
-+ return
-+}
-+
-+func NsecToTimeval(nsec int64) (tv Timeval) {
-+ nsec += 999 // round up to microsecond
-+ tv.Usec = nsec % 1e9 / 1e3
-+ tv.Sec = int64(nsec / 1e9)
-+ return
-+}
-+
-+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/paladin/files/patch-vendor_golang.org_x_sys_unix_zerrors__freebsd__arm64.go b/sysutils/paladin/files/patch-vendor_golang.org_x_sys_unix_zerrors__freebsd__arm64.go
deleted file mode 100644
index 2d85e48f5c0c..000000000000
--- a/sysutils/paladin/files/patch-vendor_golang.org_x_sys_unix_zerrors__freebsd__arm64.go
+++ /dev/null
@@ -1,1751 +0,0 @@
---- vendor/golang.org/x/sys/unix/zerrors_freebsd_arm64.go.orig 2021-09-13 12:54:00 UTC
-+++ vendor/golang.org/x/sys/unix/zerrors_freebsd_arm64.go
-@@ -0,0 +1,1748 @@
-+// mkerrors.sh -m64
-+// MACHINE GENERATED BY THE COMMAND ABOVE; 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
-+ 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_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
-+ BRKINT = 0x2
-+ 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
-+ CS5 = 0x0
-+ CS6 = 0x100
-+ CS7 = 0x200
-+ CS8 = 0x300
-+ CSIZE = 0x300
-+ CSTART = 0x11
-+ CSTATUS = 0x14
-+ CSTOP = 0x13
-+ CSTOPB = 0x400
-+ CSUSP = 0x1a
-+ 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_HCI_H4 = 0xbb
-+ DLT_BLUETOOTH_HCI_H4_WITH_PHDR = 0xc9
-+ 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_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_IPFILTER = 0x74
-+ DLT_IPMB = 0xc7
-+ DLT_IPMB_LINUX = 0xd1
-+ 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 = 0xf6
-+ 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_NFC_LLCP = 0xf5
-+ DLT_NFLOG = 0xef
-+ DLT_NG40 = 0xf4
-+ DLT_NULL = 0x0
-+ DLT_PCI_EXP = 0x7d
-+ DLT_PFLOG = 0x75
-+ DLT_PFSYNC = 0x79
-+ DLT_PPI = 0xc0
-+ DLT_PPP = 0x9
-+ DLT_PPP_BSDOS = 0x10
-+ DLT_PPP_ETHER = 0x33
-+ DLT_PPP_PPPD = 0xa6
-+ DLT_PPP_SERIAL = 0x32
-+ DLT_PPP_WITH_DIR = 0xcc
-+ DLT_PPP_WITH_DIRECTION = 0xa6
-+ DLT_PRISM_HEADER = 0x77
-+ DLT_PRONET = 0x4
-+ DLT_RAIF1 = 0xc6
-+ DLT_RAW = 0xc
-+ DLT_RIO = 0x7c
-+ DLT_SCCP = 0x8e
-+ DLT_SITA = 0xc4
-+ DLT_SLIP = 0x8
-+ DLT_SLIP_BSDOS = 0xf
-+ DLT_STANAG_5066_D_PDU = 0xed
-+ DLT_SUNATM = 0x7b
-+ DLT_SYMANTEC_FIREWALL = 0x63
-+ DLT_TZSP = 0x80
-+ DLT_USB = 0xba
-+ DLT_USB_LINUX = 0xbd
-+ DLT_USB_LINUX_MMAPPED = 0xdc
-+ DLT_USER0 = 0x93
-+ DLT_USER1 = 0x94
-+ DLT_USER10 = 0x9d
-+ DLT_USER11 = 0x9e
-+ DLT_USER12 = 0x9f
-+ DLT_USER13 = 0xa0
-+ DLT_USER14 = 0xa1
-+ DLT_USER15 = 0xa2
-+ DLT_USER2 = 0x95
-+ DLT_USER3 = 0x96
-+ DLT_USER4 = 0x97
-+ DLT_USER5 = 0x98
-+ DLT_USER6 = 0x99
-+ DLT_USER7 = 0x9a
-+ DLT_USER8 = 0x9b
-+ DLT_USER9 = 0x9c
-+ DLT_WIHART = 0xdf
-+ DLT_X2E_SERIAL = 0xd5
-+ DLT_X2E_XORAYA = 0xd6
-+ DT_BLK = 0x6
-+ DT_CHR = 0x2
-+ DT_DIR = 0x4
-+ DT_FIFO = 0x1
-+ DT_LNK = 0xa
-+ DT_REG = 0x8
-+ DT_SOCK = 0xc
-+ DT_UNKNOWN = 0x0
-+ DT_WHT = 0xe
-+ ECHO = 0x8
-+ ECHOCTL = 0x40
-+ ECHOE = 0x2
-+ ECHOK = 0x4
-+ ECHOKE = 0x1
-+ ECHONL = 0x10
-+ ECHOPRT = 0x20
-+ EVFILT_AIO = -0x3
-+ EVFILT_FS = -0x9
-+ EVFILT_LIO = -0xa
-+ EVFILT_PROC = -0x5
-+ EVFILT_READ = -0x1
-+ EVFILT_SIGNAL = -0x6
-+ EVFILT_SYSCOUNT = 0xb
-+ EVFILT_TIMER = -0x7
-+ EVFILT_USER = -0xb
-+ EVFILT_VNODE = -0x4
-+ EVFILT_WRITE = -0x2
-+ EV_ADD = 0x1
-+ EV_CLEAR = 0x20
-+ EV_DELETE = 0x2
-+ EV_DISABLE = 0x8
-+ EV_DISPATCH = 0x80
-+ EV_DROP = 0x1000
-+ EV_ENABLE = 0x4
-+ EV_EOF = 0x8000
-+ EV_ERROR = 0x4000
-+ EV_FLAG1 = 0x2000
-+ EV_ONESHOT = 0x10
-+ EV_RECEIPT = 0x40
-+ EV_SYSFLAGS = 0xf000
-+ EXTA = 0x4b00
-+ EXTATTR_NAMESPACE_EMPTY = 0x0
-+ EXTATTR_NAMESPACE_SYSTEM = 0x2
-+ EXTATTR_NAMESPACE_USER = 0x1
-+ EXTB = 0x9600
-+ EXTPROC = 0x800
-+ FD_CLOEXEC = 0x1
-+ FD_SETSIZE = 0x400
-+ FLUSHO = 0x800000
-+ F_CANCEL = 0x5
-+ F_DUP2FD = 0xa
-+ F_DUP2FD_CLOEXEC = 0x12
-+ F_DUPFD = 0x0
-+ F_DUPFD_CLOEXEC = 0x11
-+ F_GETFD = 0x1
-+ F_GETFL = 0x3
-+ F_GETLK = 0xb
-+ F_GETOWN = 0x5
-+ F_OGETLK = 0x7
-+ F_OK = 0x0
-+ F_OSETLK = 0x8
-+ F_OSETLKW = 0x9
-+ F_RDAHEAD = 0x10
-+ F_RDLCK = 0x1
-+ F_READAHEAD = 0xf
-+ F_SETFD = 0x2
-+ F_SETFL = 0x4
-+ F_SETLK = 0xc
-+ F_SETLKW = 0xd
-+ F_SETLK_REMOTE = 0xe
-+ F_SETOWN = 0x6
-+ F_UNLCK = 0x2
-+ F_UNLCKSYS = 0x4
-+ F_WRLCK = 0x3
-+ HUPCL = 0x4000
-+ ICANON = 0x100
-+ ICMP6_FILTER = 0x12
-+ ICRNL = 0x100
-+ IEXTEN = 0x400
-+ IFAN_ARRIVAL = 0x0
-+ IFAN_DEPARTURE = 0x1
-+ IFF_ALLMULTI = 0x200
-+ IFF_ALTPHYS = 0x4000
-+ IFF_BROADCAST = 0x2
-+ IFF_CANTCHANGE = 0x218f72
-+ IFF_CANTCONFIG = 0x10000
-+ IFF_DEBUG = 0x4
-+ IFF_DRV_OACTIVE = 0x400
-+ IFF_DRV_RUNNING = 0x40
-+ IFF_DYING = 0x200000
-+ IFF_LINK0 = 0x1000
-+ IFF_LINK1 = 0x2000
-+ IFF_LINK2 = 0x4000
-+ IFF_LOOPBACK = 0x8
-+ IFF_MONITOR = 0x40000
-+ IFF_MULTICAST = 0x8000
-+ IFF_NOARP = 0x80
-+ IFF_OACTIVE = 0x400
-+ IFF_POINTOPOINT = 0x10
-+ IFF_PPROMISC = 0x20000
-+ IFF_PROMISC = 0x100
-+ IFF_RENAMING = 0x400000
-+ IFF_RUNNING = 0x40
-+ IFF_SIMPLEX = 0x800
-+ IFF_SMART = 0x20
-+ IFF_STATICARP = 0x80000
-+ IFF_UP = 0x1
-+ IFNAMSIZ = 0x10
-+ IFT_1822 = 0x2
-+ IFT_A12MPPSWITCH = 0x82
-+ IFT_AAL2 = 0xbb
-+ IFT_AAL5 = 0x31
-+ IFT_ADSL = 0x5e
-+ IFT_AFLANE8023 = 0x3b
-+ IFT_AFLANE8025 = 0x3c
-+ IFT_ARAP = 0x58
-+ IFT_ARCNET = 0x23
-+ IFT_ARCNETPLUS = 0x24
-+ IFT_ASYNC = 0x54
-+ IFT_ATM = 0x25
-+ IFT_ATMDXI = 0x69
-+ IFT_ATMFUNI = 0x6a
-+ IFT_ATMIMA = 0x6b
-+ IFT_ATMLOGICAL = 0x50
-+ IFT_ATMRADIO = 0xbd
-+ IFT_ATMSUBINTERFACE = 0x86
-+ IFT_ATMVCIENDPT = 0xc2
-+ IFT_ATMVIRTUAL = 0x95
-+ IFT_BGPPOLICYACCOUNTING = 0xa2
-+ IFT_BRIDGE = 0xd1
-+ IFT_BSC = 0x53
-+ IFT_CARP = 0xf8
-+ IFT_CCTEMUL = 0x3d
-+ IFT_CEPT = 0x13
-+ IFT_CES = 0x85
-+ IFT_CHANNEL = 0x46
-+ IFT_CNR = 0x55
-+ IFT_COFFEE = 0x84
-+ IFT_COMPOSITELINK = 0x9b
-+ IFT_DCN = 0x8d
-+ IFT_DIGITALPOWERLINE = 0x8a
-+ IFT_DIGITALWRAPPEROVERHEADCHANNEL = 0xba
-+ IFT_DLSW = 0x4a
-+ IFT_DOCSCABLEDOWNSTREAM = 0x80
-+ IFT_DOCSCABLEMACLAYER = 0x7f
-+ IFT_DOCSCABLEUPSTREAM = 0x81
-+ IFT_DS0 = 0x51
-+ IFT_DS0BUNDLE = 0x52
-+ IFT_DS1FDL = 0xaa
-+ IFT_DS3 = 0x1e
-+ IFT_DTM = 0x8c
-+ IFT_DVBASILN = 0xac
-+ IFT_DVBASIOUT = 0xad
-+ IFT_DVBRCCDOWNSTREAM = 0x93
-+ IFT_DVBRCCMACLAYER = 0x92
-+ IFT_DVBRCCUPSTREAM = 0x94
-+ IFT_ENC = 0xf4
-+ IFT_EON = 0x19
-+ IFT_EPLRS = 0x57
-+ IFT_ESCON = 0x49
-+ IFT_ETHER = 0x6
-+ IFT_FAITH = 0xf2
-+ IFT_FAST = 0x7d
-+ IFT_FASTETHER = 0x3e
-+ IFT_FASTETHERFX = 0x45
-+ IFT_FDDI = 0xf
-+ IFT_FIBRECHANNEL = 0x38
-+ IFT_FRAMERELAYINTERCONNECT = 0x3a
-+ IFT_FRAMERELAYMPI = 0x5c
-+ IFT_FRDLCIENDPT = 0xc1
-+ IFT_FRELAY = 0x20
-+ IFT_FRELAYDCE = 0x2c
-+ IFT_FRF16MFRBUNDLE = 0xa3
-+ IFT_FRFORWARD = 0x9e
-+ IFT_G703AT2MB = 0x43
-+ IFT_G703AT64K = 0x42
-+ IFT_GIF = 0xf0
-+ IFT_GIGABITETHERNET = 0x75
-+ IFT_GR303IDT = 0xb2
-+ IFT_GR303RDT = 0xb1
-+ IFT_H323GATEKEEPER = 0xa4
-+ IFT_H323PROXY = 0xa5
-+ IFT_HDH1822 = 0x3
-+ IFT_HDLC = 0x76
-+ IFT_HDSL2 = 0xa8
-+ IFT_HIPERLAN2 = 0xb7
-+ IFT_HIPPI = 0x2f
-+ IFT_HIPPIINTERFACE = 0x39
-+ IFT_HOSTPAD = 0x5a
-+ IFT_HSSI = 0x2e
-+ IFT_HY = 0xe
-+ IFT_IBM370PARCHAN = 0x48
-+ IFT_IDSL = 0x9a
-+ IFT_IEEE1394 = 0x90
-+ IFT_IEEE80211 = 0x47
-+ IFT_IEEE80212 = 0x37
-+ IFT_IEEE8023ADLAG = 0xa1
-+ IFT_IFGSN = 0x91
-+ IFT_IMT = 0xbe
-+ IFT_INFINIBAND = 0xc7
-+ IFT_INTERLEAVE = 0x7c
-+ IFT_IP = 0x7e
-+ IFT_IPFORWARD = 0x8e
-+ IFT_IPOVERATM = 0x72
-+ IFT_IPOVERCDLC = 0x6d
-+ IFT_IPOVERCLAW = 0x6e
-+ IFT_IPSWITCH = 0x4e
-+ IFT_IPXIP = 0xf9
-+ IFT_ISDN = 0x3f
-+ IFT_ISDNBASIC = 0x14
-+ IFT_ISDNPRIMARY = 0x15
-+ IFT_ISDNS = 0x4b
-+ IFT_ISDNU = 0x4c
-+ IFT_ISO88022LLC = 0x29
-+ IFT_ISO88023 = 0x7
-+ IFT_ISO88024 = 0x8
-+ IFT_ISO88025 = 0x9
-+ IFT_ISO88025CRFPINT = 0x62
-+ IFT_ISO88025DTR = 0x56
-+ IFT_ISO88025FIBER = 0x73
-+ IFT_ISO88026 = 0xa
-+ IFT_ISUP = 0xb3
-+ IFT_L2VLAN = 0x87
-+ IFT_L3IPVLAN = 0x88
-+ IFT_L3IPXVLAN = 0x89
-+ IFT_LAPB = 0x10
-+ IFT_LAPD = 0x4d
-+ IFT_LAPF = 0x77
-+ IFT_LOCALTALK = 0x2a
-+ IFT_LOOP = 0x18
-+ IFT_MEDIAMAILOVERIP = 0x8b
-+ IFT_MFSIGLINK = 0xa7
-+ IFT_MIOX25 = 0x26
-+ IFT_MODEM = 0x30
-+ IFT_MPC = 0x71
-+ IFT_MPLS = 0xa6
-+ IFT_MPLSTUNNEL = 0x96
-+ IFT_MSDSL = 0x8f
-+ IFT_MVL = 0xbf
-+ IFT_MYRINET = 0x63
-+ IFT_NFAS = 0xaf
-+ IFT_NSIP = 0x1b
-+ IFT_OPTICALCHANNEL = 0xc3
-+ IFT_OPTICALTRANSPORT = 0xc4
-+ IFT_OTHER = 0x1
-+ IFT_P10 = 0xc
-+ IFT_P80 = 0xd
-+ IFT_PARA = 0x22
-+ IFT_PFLOG = 0xf6
-+ IFT_PFSYNC = 0xf7
-+ IFT_PLC = 0xae
-+ IFT_POS = 0xab
-+ IFT_PPP = 0x17
-+ IFT_PPPMULTILINKBUNDLE = 0x6c
-+ IFT_PROPBWAP2MP = 0xb8
-+ IFT_PROPCNLS = 0x59
-+ IFT_PROPDOCSWIRELESSDOWNSTREAM = 0xb5
-+ IFT_PROPDOCSWIRELESSMACLAYER = 0xb4
-+ IFT_PROPDOCSWIRELESSUPSTREAM = 0xb6
-+ IFT_PROPMUX = 0x36
-+ IFT_PROPVIRTUAL = 0x35
-+ IFT_PROPWIRELESSP2P = 0x9d
-+ IFT_PTPSERIAL = 0x16
-+ IFT_PVC = 0xf1
-+ IFT_QLLC = 0x44
-+ IFT_RADIOMAC = 0xbc
-+ IFT_RADSL = 0x5f
-+ IFT_REACHDSL = 0xc0
-+ IFT_RFC1483 = 0x9f
-+ IFT_RS232 = 0x21
-+ IFT_RSRB = 0x4f
-+ IFT_SDLC = 0x11
-+ IFT_SDSL = 0x60
-+ IFT_SHDSL = 0xa9
-+ IFT_SIP = 0x1f
-+ IFT_SLIP = 0x1c
-+ IFT_SMDSDXI = 0x2b
-+ IFT_SMDSICIP = 0x34
-+ IFT_SONET = 0x27
-+ IFT_SONETOVERHEADCHANNEL = 0xb9
-+ IFT_SONETPATH = 0x32
-+ IFT_SONETVT = 0x33
-+ IFT_SRP = 0x97
-+ IFT_SS7SIGLINK = 0x9c
-+ IFT_STACKTOSTACK = 0x6f
-+ IFT_STARLAN = 0xb
-+ IFT_STF = 0xd7
-+ IFT_T1 = 0x12
-+ IFT_TDLC = 0x74
-+ IFT_TERMPAD = 0x5b
-+ IFT_TR008 = 0xb0
-+ IFT_TRANSPHDLC = 0x7b
-+ IFT_TUNNEL = 0x83
-+ IFT_ULTRA = 0x1d
-+ IFT_USB = 0xa0
-+ IFT_V11 = 0x40
-+ IFT_V35 = 0x2d
-+ IFT_V36 = 0x41
-+ IFT_V37 = 0x78
-+ IFT_VDSL = 0x61
-+ IFT_VIRTUALIPADDRESS = 0x70
-+ IFT_VOICEEM = 0x64
-+ IFT_VOICEENCAP = 0x67
-+ IFT_VOICEFXO = 0x65
-+ IFT_VOICEFXS = 0x66
-+ IFT_VOICEOVERATM = 0x98
-+ IFT_VOICEOVERFRAMERELAY = 0x99
-+ IFT_VOICEOVERIP = 0x68
-+ IFT_X213 = 0x5d
-+ IFT_X25 = 0x5
-+ IFT_X25DDN = 0x4
-+ IFT_X25HUNTGROUP = 0x7a
-+ IFT_X25MLP = 0x79
-+ IFT_X25PLE = 0x28
-+ IFT_XETHER = 0x1a
-+ IGNBRK = 0x1
-+ IGNCR = 0x80
-+ IGNPAR = 0x4
-+ IMAXBEL = 0x2000
-+ INLCR = 0x40
-+ INPCK = 0x10
-+ IN_CLASSA_HOST = 0xffffff
-+ IN_CLASSA_MAX = 0x80
-+ IN_CLASSA_NET = 0xff000000
-+ IN_CLASSA_NSHIFT = 0x18
-+ IN_CLASSB_HOST = 0xffff
-+ IN_CLASSB_MAX = 0x10000
-+ IN_CLASSB_NET = 0xffff0000
-+ IN_CLASSB_NSHIFT = 0x10
-+ IN_CLASSC_HOST = 0xff
-+ IN_CLASSC_NET = 0xffffff00
-+ IN_CLASSC_NSHIFT = 0x8
-+ IN_CLASSD_HOST = 0xfffffff
-+ IN_CLASSD_NET = 0xf0000000
-+ IN_CLASSD_NSHIFT = 0x1c
-+ IN_LOOPBACKNET = 0x7f
-+ IN_RFC3021_MASK = 0xfffffffe
-+ IPPROTO_3PC = 0x22
-+ IPPROTO_ADFS = 0x44
-+ IPPROTO_AH = 0x33
-+ IPPROTO_AHIP = 0x3d
-+ IPPROTO_APES = 0x63
-+ IPPROTO_ARGUS = 0xd
-+ IPPROTO_AX25 = 0x5d
-+ IPPROTO_BHA = 0x31
-+ IPPROTO_BLT = 0x1e
-+ IPPROTO_BRSATMON = 0x4c
-+ IPPROTO_CARP = 0x70
-+ IPPROTO_CFTP = 0x3e
-+ IPPROTO_CHAOS = 0x10
-+ IPPROTO_CMTP = 0x26
-+ IPPROTO_CPHB = 0x49
-+ IPPROTO_CPNX = 0x48
-+ IPPROTO_DDP = 0x25
-+ IPPROTO_DGP = 0x56
-+ IPPROTO_DIVERT = 0x102
-+ IPPROTO_DONE = 0x101
-+ IPPROTO_DSTOPTS = 0x3c
-+ IPPROTO_EGP = 0x8
-+ IPPROTO_EMCON = 0xe
-+ IPPROTO_ENCAP = 0x62
-+ IPPROTO_EON = 0x50
-+ IPPROTO_ESP = 0x32
-+ IPPROTO_ETHERIP = 0x61
-+ IPPROTO_FRAGMENT = 0x2c
-+ IPPROTO_GGP = 0x3
-+ IPPROTO_GMTP = 0x64
-+ IPPROTO_GRE = 0x2f
-+ IPPROTO_HELLO = 0x3f
-+ IPPROTO_HIP = 0x8b
-+ IPPROTO_HMP = 0x14
-+ IPPROTO_HOPOPTS = 0x0
-+ IPPROTO_ICMP = 0x1
-+ IPPROTO_ICMPV6 = 0x3a
-+ IPPROTO_IDP = 0x16
-+ IPPROTO_IDPR = 0x23
-+ IPPROTO_IDRP = 0x2d
-+ IPPROTO_IGMP = 0x2
-+ IPPROTO_IGP = 0x55
-+ IPPROTO_IGRP = 0x58
-+ IPPROTO_IL = 0x28
-+ IPPROTO_INLSP = 0x34
*** 3498 LINES SKIPPED ***