forked from lingochamp/sys
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
unix: re-enable Capsicum on FreeBSD 386
Capsicum support was added by https://golang.org/cl/47290, but only for amd64. This broke the freebsd/386 build which was subsequently fixed by http://golang.org/cl/51270. However, even with this fix the tests still fail to build due to the missing Capsicum functions and types. Fix the build/test on freebsd/386 for real by re-running mkall.sh on FreeBSD 11.1-RELEASE (inside VirtualBox) to get all the Capsicum functions and types. Some zerrors constants were removed or converted to enums in the FreeBSD headers. Manually move them to a dedicated file. Do the same for amd64, where these constants were removed by accident in https://golang.org/cl/47290. Updates golang/go#21136 Change-Id: I54fe2c4567674b07dedad677756369a43a1f0ef6 Reviewed-on: https://go-review.googlesource.com/51570 Reviewed-by: Brad Fitzpatrick <[email protected]> Run-TryBot: Brad Fitzpatrick <[email protected]> TryBot-Result: Gobot Gobot <[email protected]>
- Loading branch information
1 parent
28490d2
commit 64e86cf
Showing
7 changed files
with
2,295 additions
and
1,825 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,227 @@ | ||
| // Copyright 2017 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. | ||
|
|
||
| // Constants that were deprecated or moved to enums in the FreeBSD headers. Keep | ||
| // them here for backwards compatibility. | ||
|
|
||
| package unix | ||
|
|
||
| const ( | ||
| IFF_SMART = 0x20 | ||
| 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_BSC = 0x53 | ||
| 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_IEEE80211 = 0x47 | ||
| IFT_IEEE80212 = 0x37 | ||
| IFT_IEEE8023ADLAG = 0xa1 | ||
| IFT_IFGSN = 0x91 | ||
| IFT_IMT = 0xbe | ||
| 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_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_PPPMULTILINKBUNDLE = 0x6c | ||
| IFT_PROPBWAP2MP = 0xb8 | ||
| IFT_PROPCNLS = 0x59 | ||
| IFT_PROPDOCSWIRELESSDOWNSTREAM = 0xb5 | ||
| IFT_PROPDOCSWIRELESSMACLAYER = 0xb4 | ||
| IFT_PROPDOCSWIRELESSUPSTREAM = 0xb6 | ||
| IFT_PROPMUX = 0x36 | ||
| 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 | ||
| IPPROTO_MAXID = 0x34 | ||
| IPV6_FAITH = 0x1d | ||
| IP_FAITH = 0x16 | ||
| MAP_NORESERVE = 0x40 | ||
| MAP_RENAME = 0x20 | ||
| NET_RT_MAXID = 0x6 | ||
| RTF_PRCLONING = 0x10000 | ||
| RTM_OLDADD = 0x9 | ||
| RTM_OLDDEL = 0xa | ||
| SIOCADDRT = 0x8030720a | ||
| SIOCALIFADDR = 0x8118691b | ||
| SIOCDELRT = 0x8030720b | ||
| SIOCDLIFADDR = 0x8118691d | ||
| SIOCGLIFADDR = 0xc118691c | ||
| SIOCGLIFPHYADDR = 0xc118694b | ||
| SIOCSLIFPHYADDR = 0x8118694a | ||
| ) |
Oops, something went wrong.