Date: Monday, January 2, 2023 @ 09:19:52 Author: alerque Revision: 1372887
upgpkg: syncthing 1.23.0-1 Modified: syncthing/trunk/PKGBUILD syncthing/trunk/gcc-pie-segfaults-race.patch ------------------------------+ PKGBUILD | 20 ++++++++++++-------- gcc-pie-segfaults-race.patch | 7 ++++--- 2 files changed, 16 insertions(+), 11 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2023-01-02 09:15:55 UTC (rev 1372886) +++ PKGBUILD 2023-01-02 09:19:52 UTC (rev 1372887) @@ -5,8 +5,12 @@ # Contributor: Kevin MacMartin <[email protected]> # Contributor: korjjj <[email protected]> +# Mocked networking tests not currently functional, last known working version +# of tests was 1.22.1 +BUILDENV+=(!check) + pkgname=('syncthing' 'syncthing-relaysrv') -pkgver=1.22.1 +pkgver=1.23.0 pkgrel=1 arch=('x86_64') url="https://syncthing.net/"; @@ -19,19 +23,19 @@ syncthing-relaysrv.service gcc-pie-segfaults-race.patch) validpgpkeys=('37C84554E7E0A261E4F76E1ED26E6ED000654A3E') # Syncthing Release Management -sha256sums=('b024d112167e0e81a785ab98c1a044aee1ac041dfe57a62772c08284f875a5bd' +sha256sums=('0f66d3dd2a7915a6f3ca6773c1dc02345444b2644a533211ce1ee57b371ae458' 'SKIP' '6ab96a5949e223d315d49663734ad27b70c72469c691a61ac198cb7794cb5eaa' 'f899998985f2d374af57f17ef6362c37a305467858195b74d1c1def71d97273f' '7c2fbc9608d81f8080f8a9102b867a52a050b61f426a0c182ccc1cb5815e4981' - 'b571fe7ccf516a49efb295ae58b51bb36ef3bfcaa5ed99f36d419cfa262c65f1') + '6a58227c09a18fc7049ec38351a0fd98195688d15821d67d5af4facda401cbba') prepare() { - install -d "src/github.com/syncthing" - mv "${pkgbase}" "src/github.com/syncthing/${pkgbase}" - # go-pie with -race segfaults - cd "${srcdir}/src/github.com/syncthing/${pkgbase}" - patch -Np1 -i "${srcdir}/gcc-pie-segfaults-race.patch" + local _srcdir="src/github.com/syncthing" + rm -rf "${_srcdir}" + install -d "${_srcdir}" + mv "${pkgbase}" "${_srcdir}/${pkgbase}" + patch -Np1 -i gcc-pie-segfaults-race.patch } build() { Modified: gcc-pie-segfaults-race.patch =================================================================== --- gcc-pie-segfaults-race.patch 2023-01-02 09:15:55 UTC (rev 1372886) +++ gcc-pie-segfaults-race.patch 2023-01-02 09:19:52 UTC (rev 1372887) @@ -1,10 +1,11 @@ ---- syncthing/build.go~ 2022-09-06 14:51:47.767992021 +0300 -+++ syncthing/build.go 2022-09-06 14:51:56.744676970 +0300 -@@ -396,7 +396,6 @@ +--- src/src/github.com/syncthing/syncthing/build.go~ 2023-01-02 11:59:44.508141672 +0300 ++++ src/src/github.com/syncthing/syncthing/build.go 2023-01-02 12:00:13.064820683 +0300 +@@ -397,7 +397,7 @@ if runtime.GOARCH == "amd64" { switch runtime.GOOS { case buildpkg.Darwin, buildpkg.Linux, buildpkg.FreeBSD: // , "windows": # See https://github.com/golang/go/issues/27089 - args = append(args, "-race") ++ //args = append(args, "-race") } }
