Attachment #228011 for bug #258602

View | Details | Raw Unified | Return to bug 258602
Collapse All | Expand All




# Created by: Michal Hanula <michal@hanu.la>

PORTNAME=	alertmanager
PORTVERSION=	0.23.0
DISTVERSIONPREFIX=	v
DISTVERSION=	0.20.0
CATEGORIES=	net-mgmt

MAINTAINER=	michal@hanu.la

LICENSE=	APACHE20
LICENSE_FILE=	${WRKSRC}/LICENSE

USES=		go:modules
GO_MODULE=	github.com/prometheus/alertmanager

USE_RC_SUBR=	alertmanager

GO_TARGET=	./cmd/alertmanager ./cmd/amtool

Lines 1-3 Link Here

(-)b/net-mgmt/alertmanager/distinfo (-3 / +5 lines)
1	TIMESTAMP = 1585677487	1	TIMESTAMP = 1632059302
2	SHA256 (prometheus-alertmanager-v0.20.0_GH0.tar.gz) = 4789ef95b09ba86a66a2923c3535d1bfe30a566390770784c52052c7c83ee1bc	2	SHA256 (go/net-mgmt_alertmanager/alertmanager-v0.23.0/v0.23.0.mod) = 881af68a643b2757bebac58e6cde7b5bb05495a255c8bd9046bbd76422e95059
3	SIZE (prometheus-alertmanager-v0.20.0_GH0.tar.gz) = 5837531	3	SIZE (go/net-mgmt_alertmanager/alertmanager-v0.23.0/v0.23.0.mod) = 1552
		4	SHA256 (go/net-mgmt_alertmanager/alertmanager-v0.23.0/v0.23.0.zip) = 1c51abe35f12ebc11de46e0d888c93fe8e85b146ced1c2ab2a49dd97cf2b1c6a
		5	SIZE (go/net-mgmt_alertmanager/alertmanager-v0.23.0/v0.23.0.zip) = 2306041




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
 }

Return to bug 258602

Lines 1-8 Link Here

(-)b/net-mgmt/alertmanager/Makefile (-4 / +4 lines)
1	# Created by: Michal Hanula <michal@hanu.la>	1	# Created by: Michal Hanula <michal@hanu.la>
2		2
3	PORTNAME= alertmanager	3	PORTNAME= alertmanager
		4	PORTVERSION= 0.23.0
4	DISTVERSIONPREFIX= v	5	DISTVERSIONPREFIX= v
5	DISTVERSION= 0.20.0
6	CATEGORIES= net-mgmt	6	CATEGORIES= net-mgmt
7		7
8	MAINTAINER= michal@hanu.la	8	MAINTAINER= michal@hanu.la
Lines 11-19 COMMENT= Alert routing for prometheus Link Here
11	LICENSE= APACHE20	11	LICENSE= APACHE20
12	LICENSE_FILE= ${WRKSRC}/LICENSE	12	LICENSE_FILE= ${WRKSRC}/LICENSE
13		13
14	USES= gmake go:modules	14	USES= go:modules
15	USE_GITHUB= yes	15	GO_MODULE= github.com/prometheus/alertmanager
16	GH_ACCOUNT= prometheus	16
17	USE_RC_SUBR= alertmanager	17	USE_RC_SUBR= alertmanager
18		18
19	GO_TARGET= ./cmd/alertmanager ./cmd/amtool	19	GO_TARGET= ./cmd/alertmanager ./cmd/amtool

Removed Link Here

(-)a/net-mgmt/alertmanager/files/patch-vendor_golang.org_x_sys_unix_ztypes__freebsd__arm64.go (-24 lines)
1	From 33540a1f603772f9d4b761f416f5c10dade23e96 Mon Sep 17 00:00:00 2001
2	From: Tobias Klauser <tklauser@distanz.ch>
3	Date: Fri, 25 Oct 2019 21:13:51 +0200
4	Subject: [PATCH] unix: don't use non-existing uint128 type on freebsd/arm64
5
6	CL 179099 introduced type FpReg on freebsd, on freebsd/arm64 using a
7	type uint128. This type doesn't exist in Go.
8
9	Change-Id: Ie7f065f38f2cc2c163abdfa7dddad886b8edbe3b
10	Reviewed-on: https://go-review.googlesource.com/c/sys/+/203419
11	Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com>
12	TryBot-Result: Gobot Gobot <gobot@golang.org>
13	Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
14	--- vendor/golang.org/x/sys/unix/ztypes_freebsd_arm64.go.orig 2019-08-18 13:42:05 UTC
15	+++ vendor/golang.org/x/sys/unix/ztypes_freebsd_arm64.go
16	@@ -397,7 +397,7 @@ type Reg struct {
17	}
18
19	type FpReg struct {
20	- Fp_q [32]uint128
21	+ Fp_q [512]uint8
22	Fp_sr uint32
23	Fp_cr uint32
24	}