Skip to content

Commit

Permalink
Add patch to fix jonathanspw#2
Browse files Browse the repository at this point in the history
- PR #1480 upstream
- Adjust day in changelog to by the proper day to fix warning during build
- Bump release to 3
  • Loading branch information
codyro committed Aug 8, 2023
1 parent c15c288 commit 2930918
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 2 deletions.
18 changes: 18 additions & 0 deletions 1480.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
--- app.go 2023-08-07 21:07:21.939069312 -0400
+++ app_patched.go 2023-08-07 21:06:32.726425788 -0400
@@ -760,7 +760,6 @@
// Stop listening (and unlink the socket if unix type):
socketListener.Close()

- <-h.cancelStateUpdateChan
close(h.stateUpdateChan)
close(h.cancelStateUpdateChan)

@@ -775,6 +774,7 @@

// And we're done:
cancel()
+ return
}
}
}
11 changes: 9 additions & 2 deletions headscale.spec
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ An open source, self-hosted implementation of the Tailscale control server.}
%global golicenses LICENSE

Name: headscale
Release: 2
Release: 3
Summary: An open source, self-hosted implementation of the Tailscale control server

License: BSD-3-Clause
Expand All @@ -40,6 +40,9 @@ Source4: config.yaml

# https://github.com/juanfont/headscale/pull/1287
#Patch: 1287.patch
# https://github.com/juanfont/headscale/pull/1480
# https://github.com/jonathanspw/headscale-rpm/issues/2
Patch: 1480.patch

BuildRequires: git-core
BuildRequires: systemd-rpm-macros
Expand Down Expand Up @@ -118,7 +121,11 @@ install -p -D -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/headscale/config.yam


%changelog
* Fri Jun 07 2023 Dusty Mabe <dusty@dustymabe.com> - 0.22.3-2
* Mon Aug 07 2023 Cody Robertson <cody@almalinux.org> - 0.22.3-3
- Add Fix hangs on SIGTERM patch (#1480)
- Fix incorrect day in changelog

* Wed Jun 07 2023 Dusty Mabe <dusty@dustymabe.com> - 0.22.3-2
- Add Requires on systemd

* Fri May 12 2023 Jonathan Wright <jonathan@almalinux.org> - 0.22.3-1
Expand Down

0 comments on commit 2930918

Please sign in to comment.