On Wed, Aug 19, 2020 at 01:45:12PM +0100, Stuart Henderson wrote:
> Alternatively we can mark it broken so people don't waste their time
> on it...
Here's a diff to fix this mess.
It must be built using go-1.15 that abieber@ just committed, and the
syncthing version is a release candidate, as the stable version doesn't
contain the go-quic fix we require.
aarch64 remains busted, but abieber@ is going to look into that I think.
All tests pass on amd64.
Give this a shot. OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/syncthing/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- Makefile 17 May 2020 16:10:25 -0000 1.30
+++ Makefile 21 Aug 2020 22:45:02 -0000
@@ -1,10 +1,13 @@
# $OpenBSD: Makefile,v 1.30 2020/05/17 16:10:25 edd Exp $
+BROKEN-aarch64 =golang.org/x/Sys/cpu panic (illegal instruction)
+
COMMENT = open decentralized synchronization utility
-V = 1.5.0
-DISTNAME = syncthing-${V}
-DISTFILES = syncthing-source-v${V}${EXTRACT_SUFX}
+# Release candidate used so as to fix critical quic-go problem.
+V = 1.9.0
+DISTNAME = syncthing-${V}-rc4
+DISTFILES = syncthing-source-v${V}-rc.4${EXTRACT_SUFX}
CATEGORIES = net
HOMEPAGE = https://syncthing.net/
@@ -14,9 +17,7 @@ MAINTAINER = Edd Barrett <e...@openbsd.or
# MPL 2.0
PERMIT_PACKAGE = Yes
-WANTLIB += c pthread
-
-MASTER_SITES = https://github.com/syncthing/syncthing/releases/download/v${V}/
+MASTER_SITES =
https://github.com/syncthing/syncthing/releases/download/v${V}-rc.4/
WRKDIST = ${WRKDIR}/syncthing
WRKSRC = ${WRKDIR}/go/src/github.com/syncthing/syncthing
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/syncthing/distinfo,v
retrieving revision 1.20
diff -u -p -r1.20 distinfo
--- distinfo 17 May 2020 16:10:25 -0000 1.20
+++ distinfo 21 Aug 2020 22:46:07 -0000
@@ -1,2 +1,2 @@
-SHA256 (syncthing-source-v1.5.0.tar.gz) =
S048m76d15aRnTABGLaBft/j25UTsGelhZFSSzxaJI0=
-SIZE (syncthing-source-v1.5.0.tar.gz) = 10475068
+SHA256 (syncthing-source-v1.9.0-rc.4.tar.gz) =
F6cI6y/vvFwxfQi+U4lwf8II4PMyXUhKnWv1t/LMZ+o=
+SIZE (syncthing-source-v1.9.0-rc.4.tar.gz) = 11142237
Index: patches/patch-build_go
===================================================================
RCS file: /cvs/ports/net/syncthing/patches/patch-build_go,v
retrieving revision 1.11
diff -u -p -r1.11 patch-build_go
--- patches/patch-build_go 3 Jan 2020 17:57:35 -0000 1.11
+++ patches/patch-build_go 20 Aug 2020 18:47:05 -0000
@@ -23,12 +23,12 @@ Index: build.go
}
// These are repos we need to clone to run "go generate"
-@@ -466,7 +480,7 @@ func appendParameters(args []string, tags []string, pk
+@@ -527,7 +541,7 @@ func appendParameters(args []string, tags []string, pk
if !debugBinary {
// Regular binaries get version tagged and skip some debug
symbols
-- args = append(args, "-ldflags", ldflags(path.Base(pkg)))
-+ args = append(args, "-x", "-ldflags", ldflags(path.Base(pkg)))
+- args = append(args, "-ldflags", ldflags(tags))
++ args = append(args, "-x", "-ldflags", ldflags(tags))
} else {
// -gcflags to disable optimizations and inlining. Skip -ldflags
// because `Could not launch program: decoding dwarf section
info at
--
Best Regards
Edd Barrett
http://www.theunixzoo.co.uk
