Here's an update to syncthing-1.3.0. Whilst figuring out what changed in the build system, I realised that we install a load of stuff which is not useful to end users. Hence we install fewer binaries now.
(The manual pages all still look useful) Discussion about that here: https://github.com/syncthing/syncthing/issues/6118#issuecomment-549036494 (The crashes on the end of that GitHub thread was the uvm bug that was fixed over the weekend.) Please test! Index: Makefile =================================================================== RCS file: /cvs/ports/net/syncthing/Makefile,v retrieving revision 1.27 diff -u -p -r1.27 Makefile --- Makefile 29 Jun 2019 14:05:19 -0000 1.27 +++ Makefile 4 Nov 2019 23:13:06 -0000 @@ -2,7 +2,7 @@ COMMENT = open decentralized synchronization utility -V = 1.1.4 +V = 1.3.0 DISTNAME = syncthing-${V} DISTFILES = syncthing-source-v${V}${EXTRACT_SUFX} @@ -25,18 +25,23 @@ SUBST_VARS += VARBASE MODULES = lang/go MODGO_TYPE = bin +# Syncthing contains a lot of stuff that end users wouldn't be interested in, +# so we package only these binaries. +ST_CMDS = syncthing stdiscosrv strelaysrv stcli + do-build: - cd ${WRKSRC} && ${MODGO_CMD} run build.go \ - -version v${V} -no-upgrade +.for cmd in ${ST_CMDS} + cd ${WRKSRC} && ${MODGO_CMD} run build.go -version v${V} \ + -no-upgrade install ${cmd} +.endfor -# A couple of test failures caused by a bug in the test suite (but not in -# Syncthing itself): -# https://github.com/syncthing/syncthing/issues/5796#issuecomment-502473144 do-test: cd ${WRKSRC} && ${MODGO_CMD} run build.go test do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/bin/* ${PREFIX}/bin/ +.for cmd in ${ST_CMDS} + ${INSTALL_PROGRAM} ${WRKSRC}/bin/${cmd} ${PREFIX}/bin/ +.endfor .for sec in 1 5 7 ${INSTALL_MAN} ${WRKSRC}/man/*.${sec} ${PREFIX}/man/man${sec}/ .endfor Index: distinfo =================================================================== RCS file: /cvs/ports/net/syncthing/distinfo,v retrieving revision 1.17 diff -u -p -r1.17 distinfo --- distinfo 29 Jun 2019 14:05:19 -0000 1.17 +++ distinfo 2 Nov 2019 12:26:35 -0000 @@ -1,2 +1,2 @@ -SHA256 (syncthing-source-v1.1.4.tar.gz) = 1GSIS/2S6sLy28g1x0DqfVvZ5uvQvKfNpJaCsNpOa14= -SIZE (syncthing-source-v1.1.4.tar.gz) = 9364374 +SHA256 (syncthing-source-v1.3.0.tar.gz) = aExHALb1HU/Im0IvvD8myucD30ZJ504geDwtDPhFU44= +SIZE (syncthing-source-v1.3.0.tar.gz) = 10250741 Index: patches/patch-build_go =================================================================== RCS file: /cvs/ports/net/syncthing/patches/patch-build_go,v retrieving revision 1.9 diff -u -p -r1.9 patch-build_go --- patches/patch-build_go 29 Jun 2019 14:05:19 -0000 1.9 +++ patches/patch-build_go 20 Oct 2019 09:40:54 -0000 @@ -2,7 +2,7 @@ $OpenBSD: patch-build_go,v 1.9 2019/06/2 Index: build.go --- build.go.orig +++ build.go -@@ -189,6 +189,20 @@ var targets = map[string]target{ +@@ -202,6 +202,20 @@ var targets = map[string]target{ {src: "AUTHORS", dst: "deb/usr/share/doc/syncthing-relaypoolsrv/AUTHORS.txt", perm: 0644}, }, }, @@ -23,7 +23,7 @@ Index: build.go } // These are repos we need to clone to run "go generate" -@@ -439,7 +453,7 @@ func appendParameters(args []string, tags []string, ta +@@ -451,7 +465,7 @@ func appendParameters(args []string, tags []string, ta if !debugBinary { // Regular binaries get version tagged and skip some debug symbols Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/net/syncthing/pkg/PLIST,v retrieving revision 1.6 diff -u -p -r1.6 PLIST --- pkg/PLIST 3 May 2019 12:59:00 -0000 1.6 +++ pkg/PLIST 2 Nov 2019 12:29:00 -0000 @@ -8,26 +8,10 @@ @extraunexec rm -rf ${VARBASE}/syncthing/{.,}* @owner @group -@bin bin/stbench @bin bin/stcli -@bin bin/stcompdirs -@bin bin/stdisco @bin bin/stdiscosrv -@bin bin/stevents -@bin bin/stfileinfo -@bin bin/stfinddevice -@bin bin/stfindignored -@bin bin/stgenfiles -@bin bin/stindex -@bin bin/strelaypoolsrv @bin bin/strelaysrv -@bin bin/stsigtool -@bin bin/stvanity -@bin bin/stwatchfile @bin bin/syncthing -@bin bin/testutil -@bin bin/uraggregate -@bin bin/ursrv @man man/man1/stdiscosrv.1 @man man/man1/strelaysrv.1 @man man/man1/syncthing.1 -- Best Regards Edd Barrett http://www.theunixzoo.co.uk
