From 571ce2b0b92dd4dbeac466a9a21b0cb5fee77100 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
<41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 3 Jun 2022 08:49:19 +0000
Subject: [PATCH 1/4] docs(README): update contributors
---
README.md | 49 ++++++++++++++++++++++++++++---------------------
1 file changed, 28 insertions(+), 21 deletions(-)
diff --git a/README.md b/README.md
index a00b41a..98738bc 100644
--- a/README.md
+++ b/README.md
@@ -276,6 +276,13 @@ make build
Hoàng Đức Hiếu
+
+
+ 
+
+ bravechamp
+
+ |
@@ -283,6 +290,8 @@ make build
Deon Thomas
|
+
+
@@ -290,8 +299,6 @@ make build
Mevan Samaratunga
|
-
-
@@ -327,6 +334,8 @@ make build
Pavlos Vinieratos
|
+
+
@@ -334,8 +343,6 @@ make build
Silver Bullet
|
-
-
@@ -371,6 +378,15 @@ make build
Antoine POPINEAU
|
+
+
+
+
+ 
+
+ Anton Schubert
+
+ |
@@ -378,8 +394,6 @@ make build
Aofei Sheng
|
-
-
@@ -408,6 +422,8 @@ make build
Felix Kronlage-Dammers
|
+
+
@@ -422,8 +438,6 @@ make build
JJGadgets
|
-
-
@@ -452,6 +466,8 @@ make build
rcursaru
|
+
+
@@ -466,8 +482,6 @@ make build
Ryan Fowler
|
-
-
@@ -496,6 +510,8 @@ make build
The Gitter Badger
|
+
+
@@ -510,8 +526,6 @@ make build
Tjerk Woudsma
|
-
-
@@ -533,13 +547,6 @@ make build
ZiYuan
|
-
-
-
-
- bravechamp
-
- |
@@ -547,6 +554,8 @@ make build
derelm
|
+
+
@@ -554,8 +563,6 @@ make build
henning mueller
|
-
-
From 2653c2f5e81fe97105f43103597043e8ee2746aa Mon Sep 17 00:00:00 2001
From: Kristoffer Dalby
Date: Fri, 3 Jun 2022 17:34:06 +0000
Subject: [PATCH 2/4] Drop arm32 (armhf) for linux and add Darwin arm64
---
.goreleaser.yml | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/.goreleaser.yml b/.goreleaser.yml
index bd517d9..eb9cf78 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -1,7 +1,7 @@
---
before:
hooks:
- - go mod tidy -compat=1.17
+ - go mod tidy -compat=1.18
release:
prerelease: auto
@@ -21,17 +21,15 @@ builds:
ldflags:
- -s -w -X github.com/juanfont/headscale/cmd/headscale/cli.Version=v{{.Version}}
- - id: linux-armhf
+ - id: darwin-arm64
main: ./cmd/headscale/headscale.go
mod_timestamp: "{{ .CommitTimestamp }}"
env:
- CGO_ENABLED=0
goos:
- - linux
+ - darwin
goarch:
- - arm
- goarm:
- - "7"
+ - arm64
flags:
- -mod=readonly
ldflags:
@@ -65,7 +63,7 @@ archives:
- id: golang-cross
builds:
- darwin-amd64
- - linux-armhf
+ - darwin-arm64
- linux-amd64
- linux-arm64
name_template: "{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}"
From 1486adb25a01c3976856efc15d87ca1cf1be528b Mon Sep 17 00:00:00 2001
From: Kristoffer Dalby
Date: Fri, 3 Jun 2022 17:35:47 +0000
Subject: [PATCH 3/4] Update changelog
---
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bd93f70..e991f13 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
### Changes
+- **Drop** armhf (32-bit ARM) support. [#609](https://github.com/juanfont/headscale/pull/609)
- Headscale fails to serve if the ACL policy file cannot be parsed [#537](https://github.com/juanfont/headscale/pull/537)
- Fix labels cardinality error when registering unknown pre-auth key [#519](https://github.com/juanfont/headscale/pull/519)
- Fix send on closed channel crash in polling [#542](https://github.com/juanfont/headscale/pull/542)
From 2201ec890542f2185961edbea38702a85a029293 Mon Sep 17 00:00:00 2001
From: Jiang Zhu
Date: Sat, 4 Jun 2022 18:11:10 +0800
Subject: [PATCH 4/4] some GOOS do not support pie build, detect in makefile
and fall back to non-pie build
---
Makefile | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 35338ac..3327fe6 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,13 @@ version = $(git describe --always --tags --dirty)
rwildcard=$(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2) $(filter $(subst *,%,$2),$d))
+# Determine if OS supports pie
+GOOS ?= $(shell uname | tr '[:upper:]' '[:lower:]')
+ifeq ($(filter $(GOOS), openbsd netbsd soloaris plan9), )
+ pieflags = -buildmode=pie
+else
+endif
+
# GO_SOURCES = $(wildcard *.go)
# PROTO_SOURCES = $(wildcard **/*.proto)
GO_SOURCES = $(call rwildcard,,*.go)
@@ -10,7 +17,7 @@ PROTO_SOURCES = $(call rwildcard,,*.proto)
build:
- CGO_ENABLED=0 go build -trimpath -buildmode=pie -mod=readonly -ldflags "-s -w -X github.com/juanfont/headscale/cmd/headscale/cli.Version=$(version)" cmd/headscale/headscale.go
+ GOOS=$(GOOS) CGO_ENABLED=0 go build -trimpath $(pieflags) -mod=readonly -ldflags "-s -w -X github.com/juanfont/headscale/cmd/headscale/cli.Version=$(version)" cmd/headscale/headscale.go
dev: lint test build
|