Date: Thu, 16 Apr 2020 15:16:29 +0000 (UTC) From: Mikael Urankar <mikael@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r531855 - in head/net-mgmt/alertmanager: . files Message-ID: <202004161516.03GFGT88006634@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mikael Date: Thu Apr 16 15:16:28 2020 New Revision: 531855 URL: https://svnweb.freebsd.org/changeset/ports/531855 Log: net-mgmt/alertmanager: update 0.20.0 - update 0.20.0 - fix build on aarch64 PR: 245350 Approved by: michal@hanu.la (maintainer) Added: head/net-mgmt/alertmanager/files/patch-vendor_golang.org_x_net_ipv4_zsys__freebsd__arm64.go (contents, props changed) head/net-mgmt/alertmanager/files/patch-vendor_golang.org_x_net_ipv6_zsys__freebsd__arm64.go (contents, props changed) head/net-mgmt/alertmanager/files/patch-vendor_golang.org_x_sys_unix_ztypes__freebsd__arm64.go (contents, props changed) Modified: head/net-mgmt/alertmanager/Makefile head/net-mgmt/alertmanager/distinfo Modified: head/net-mgmt/alertmanager/Makefile ============================================================================== --- head/net-mgmt/alertmanager/Makefile Thu Apr 16 15:01:04 2020 (r531854) +++ head/net-mgmt/alertmanager/Makefile Thu Apr 16 15:16:28 2020 (r531855) @@ -3,8 +3,7 @@ PORTNAME= alertmanager DISTVERSIONPREFIX= v -DISTVERSION= 0.18.0 -PORTREVISION= 1 +DISTVERSION= 0.20.0 CATEGORIES= net-mgmt MAINTAINER= michal@hanu.la Modified: head/net-mgmt/alertmanager/distinfo ============================================================================== --- head/net-mgmt/alertmanager/distinfo Thu Apr 16 15:01:04 2020 (r531854) +++ head/net-mgmt/alertmanager/distinfo Thu Apr 16 15:16:28 2020 (r531855) @@ -1,3 +1,3 @@ -TIMESTAMP = 1563397402 -SHA256 (prometheus-alertmanager-v0.18.0_GH0.tar.gz) = aa9536f001c4c46ceb5aa1767c81922777b3a2740529d25d86c9f27554cbd466 -SIZE (prometheus-alertmanager-v0.18.0_GH0.tar.gz) = 5181819 +TIMESTAMP = 1585677487 +SHA256 (prometheus-alertmanager-v0.20.0_GH0.tar.gz) = 4789ef95b09ba86a66a2923c3535d1bfe30a566390770784c52052c7c83ee1bc +SIZE (prometheus-alertmanager-v0.20.0_GH0.tar.gz) = 5837531 Added: head/net-mgmt/alertmanager/files/patch-vendor_golang.org_x_net_ipv4_zsys__freebsd__arm64.go ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/alertmanager/files/patch-vendor_golang.org_x_net_ipv4_zsys__freebsd__arm64.go Thu Apr 16 15:16:28 2020 (r531855) @@ -0,0 +1,96 @@ +--- vendor/golang.org/x/net/ipv4/zsys_freebsd_arm64.go.orig 2020-03-30 16:34:45.209286000 +0200 ++++ vendor/golang.org/x/net/ipv4/zsys_freebsd_arm64.go 2020-03-30 16:33:50.132563000 +0200 +@@ -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 ++} Added: head/net-mgmt/alertmanager/files/patch-vendor_golang.org_x_net_ipv6_zsys__freebsd__arm64.go ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/alertmanager/files/patch-vendor_golang.org_x_net_ipv6_zsys__freebsd__arm64.go Thu Apr 16 15:16:28 2020 (r531855) @@ -0,0 +1,125 @@ +--- vendor/golang.org/x/net/ipv6/zsys_freebsd_arm64.go.orig 2020-03-30 16:34:37.257053000 +0200 ++++ vendor/golang.org/x/net/ipv6/zsys_freebsd_arm64.go 2020-03-30 16:34:20.602073000 +0200 +@@ -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 ++} Added: head/net-mgmt/alertmanager/files/patch-vendor_golang.org_x_sys_unix_ztypes__freebsd__arm64.go ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/alertmanager/files/patch-vendor_golang.org_x_sys_unix_ztypes__freebsd__arm64.go Thu Apr 16 15:16:28 2020 (r531855) @@ -0,0 +1,24 @@ +From 33540a1f603772f9d4b761f416f5c10dade23e96 Mon Sep 17 00:00:00 2001 +From: Tobias Klauser <tklauser@distanz.ch> +Date: Fri, 25 Oct 2019 21:13:51 +0200 +Subject: [PATCH] unix: don't use non-existing uint128 type on freebsd/arm64 + +CL 179099 introduced type FpReg on freebsd, on freebsd/arm64 using a +type uint128. This type doesn't exist in Go. + +Change-Id: Ie7f065f38f2cc2c163abdfa7dddad886b8edbe3b +Reviewed-on: https://go-review.googlesource.com/c/sys/+/203419 +Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com> +TryBot-Result: Gobot Gobot <gobot@golang.org> +Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org> +--- vendor/golang.org/x/sys/unix/ztypes_freebsd_arm64.go.orig 2019-08-18 13:42:05 UTC ++++ vendor/golang.org/x/sys/unix/ztypes_freebsd_arm64.go +@@ -397,7 +397,7 @@ type Reg struct { + } + + type FpReg struct { +- Fp_q [32]uint128 ++ Fp_q [512]uint8 + Fp_sr uint32 + Fp_cr uint32 + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004161516.03GFGT88006634>