Date: Friday, May 6, 2022 @ 17:41:54 Author: jlichtblau Revision: 1196024
archrelease: copy trunk to community-x86_64 Added: syncthing/repos/community-x86_64/PKGBUILD (from rev 1196023, syncthing/trunk/PKGBUILD) syncthing/repos/community-x86_64/gcc-pie-segfaults-race.patch (from rev 1196023, syncthing/trunk/gcc-pie-segfaults-race.patch) syncthing/repos/community-x86_64/syncthing-relaysrv.service (from rev 1196023, syncthing/trunk/syncthing-relaysrv.service) syncthing/repos/community-x86_64/syncthing-relaysrv.sysusers (from rev 1196023, syncthing/trunk/syncthing-relaysrv.sysusers) syncthing/repos/community-x86_64/syncthing-relaysrv.tmpfiles (from rev 1196023, syncthing/trunk/syncthing-relaysrv.tmpfiles) syncthing/repos/community-x86_64/syncthing.install (from rev 1196023, syncthing/trunk/syncthing.install) Deleted: syncthing/repos/community-x86_64/PKGBUILD syncthing/repos/community-x86_64/gcc-pie-segfaults-race.patch syncthing/repos/community-x86_64/syncthing-relaysrv.service syncthing/repos/community-x86_64/syncthing-relaysrv.sysusers syncthing/repos/community-x86_64/syncthing-relaysrv.tmpfiles syncthing/repos/community-x86_64/syncthing.install ------------------------------+ PKGBUILD | 222 ++++++++++++++++++++--------------------- gcc-pie-segfaults-race.patch | 22 ++-- syncthing-relaysrv.service | 34 +++--- syncthing-relaysrv.sysusers | 4 syncthing-relaysrv.tmpfiles | 2 syncthing.install | 18 +-- 6 files changed, 151 insertions(+), 151 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2022-05-06 17:41:43 UTC (rev 1196023) +++ PKGBUILD 2022-05-06 17:41:54 UTC (rev 1196024) @@ -1,111 +0,0 @@ -# Maintainer: Jaroslav Lichtblau <svetlemo...@archlinux.org> -# Maintainer: Caleb Maclennan <ca...@alerque.com> -# Contributor: Martin Wimpress <c...@flexion.org> -# Contributor: Sauyon Lee <sauy...@sauyon.com> -# Contributor: Kevin MacMartin <pruri...@gmail.com> -# Contributor: korjjj <korjjj+...@gmail.com> - -pkgname=('syncthing' 'syncthing-relaysrv') -pkgver=1.20.0 -pkgrel=1 -arch=('x86_64') -url="https://syncthing.net/" -license=('MPL') -depends=('glibc') -makedepends=('git' 'go') -source=(https://github.com/syncthing/syncthing/releases/download/v$pkgver/syncthing-source-v${pkgver}.tar.gz{,.asc} - syncthing-relaysrv.sysusers - syncthing-relaysrv.tmpfiles - syncthing-relaysrv.service - gcc-pie-segfaults-race.patch) -validpgpkeys=('37C84554E7E0A261E4F76E1ED26E6ED000654A3E') # Syncthing Release Management -sha256sums=('6dc78dbe046f2fa9a4f70b04cf2500705d3a22618f5cf430ffcb7338cce968c7' - 'SKIP' - '6ab96a5949e223d315d49663734ad27b70c72469c691a61ac198cb7794cb5eaa' - 'f899998985f2d374af57f17ef6362c37a305467858195b74d1c1def71d97273f' - '7c2fbc9608d81f8080f8a9102b867a52a050b61f426a0c182ccc1cb5815e4981' - '4e00b06544a900b206fc41b9250ab75ea51b8e1489b1eff042da4f08d8a84ab0') - -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" -} - -build() { - export CGO_ENABLED=0 - export BUILD_HOST=archlinux - export BUILD_USER=${pkgbase} - export EXTRA_LDFLAGS="-linkmode external -extldflags \"${LDFLAGS}\"" - export GOPATH="${srcdir}" GOROOT_FINAL="/usr/bin" - cd "${srcdir}/src/github.com/syncthing/${pkgbase}" - export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw" - go run build.go -no-upgrade -version v${pkgver} build - go run build.go -no-upgrade -version v${pkgver} build strelaysrv -} - -check() { - export GOPATH="${srcdir}" GOROOT_FINAL="/usr/bin" - cd "${srcdir}/src/github.com/syncthing/${pkgbase}" - if [ "${CARCH}" == "x86_64" ] ; then - go run build.go -no-upgrade test - fi -} - -package_syncthing() { - pkgdesc="Open Source Continuous Replication / Cluster Synchronization Thing" - install=$pkgname.install - - cd "${srcdir}/src/github.com/syncthing/${pkgbase}" - install -Dm755 ${pkgname} "${pkgdir}/usr/bin/${pkgname}" - install -Dm644 README.md "${pkgdir}/usr/share/doc/${pkgname}/README.md" - install -Dm644 "etc/linux-systemd/system/${pkgname}-resume.service" \ - "${pkgdir}/usr/lib/systemd/system/${pkgname}-resume.service" - install -Dm644 "etc/linux-systemd/system/${pkgname}@.service" \ - "${pkgdir}/usr/lib/systemd/system/${pkgname}@.service" - install -Dm644 "etc/linux-systemd/user/${pkgname}.service" \ - "${pkgdir}/usr/lib/systemd/user/${pkgname}.service" - - # license - install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE - - # ufw preset - install -Dm644 etc/firewall-ufw/syncthing \ - "${pkgdir}/etc/ufw/applications.d/ufw-syncthing" - - # sysctl conf - install -Dm644 etc/linux-sysctl/30-syncthing.conf \ - "${pkgdir}/usr/lib/sysctl.d/30-syncthing.conf" - - # man pages - cd "${srcdir}/src/github.com/syncthing/${pkgname}/man" -# for file in $(find . -name '*.1' -print); do -# install -Dm644 $file "${pkgdir}"/usr/share/man/man1/$file -# done - install -Dm644 $pkgname.1 "${pkgdir}"/usr/share/man/man1/$pkgname.1 - for file in $(find . -name '*.5' -print); do - install -Dm644 $file "${pkgdir}"/usr/share/man/man5/$file - done - for file in $(find . -name '*.7' -print); do - install -Dm644 $file "${pkgdir}"/usr/share/man/man7/$file - done -} - -package_syncthing-relaysrv() { - pkgdesc='Relay server for Syncthing' - - cd "${srcdir}/src/github.com/syncthing/${pkgbase}" - install -Dm755 strelaysrv "${pkgdir}"/usr/bin/${pkgname} - - install -Dm644 man/strelaysrv.1 \ - "${pkgdir}"/usr/share/man/man1/$pkgname.1 - - install -Dm644 "${srcdir}"/${pkgname}.service \ - "${pkgdir}"/usr/lib/systemd/system/${pkgname}.service - install -Dm644 "${srcdir}/${pkgname}.tmpfiles" \ - "$pkgdir/usr/lib/tmpfiles.d/${pkgname}.conf" - install -Dm644 "${srcdir}/${pkgname}.sysusers" \ - "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf" -} Copied: syncthing/repos/community-x86_64/PKGBUILD (from rev 1196023, syncthing/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2022-05-06 17:41:54 UTC (rev 1196024) @@ -0,0 +1,111 @@ +# Maintainer: Jaroslav Lichtblau <svetlemo...@archlinux.org> +# Maintainer: Caleb Maclennan <ca...@alerque.com> +# Contributor: Martin Wimpress <c...@flexion.org> +# Contributor: Sauyon Lee <sauy...@sauyon.com> +# Contributor: Kevin MacMartin <pruri...@gmail.com> +# Contributor: korjjj <korjjj+...@gmail.com> + +pkgname=('syncthing' 'syncthing-relaysrv') +pkgver=1.20.1 +pkgrel=1 +arch=('x86_64') +url="https://syncthing.net/" +license=('MPL') +depends=('glibc') +makedepends=('git' 'go') +source=(https://github.com/syncthing/syncthing/releases/download/v$pkgver/syncthing-source-v${pkgver}.tar.gz{,.asc} + syncthing-relaysrv.sysusers + syncthing-relaysrv.tmpfiles + syncthing-relaysrv.service + gcc-pie-segfaults-race.patch) +validpgpkeys=('37C84554E7E0A261E4F76E1ED26E6ED000654A3E') # Syncthing Release Management +sha256sums=('a88fabaea11a8df5cc134075c37dc87f1fb33b48d3d8afb1dc8ea11b3c0925bc' + 'SKIP' + '6ab96a5949e223d315d49663734ad27b70c72469c691a61ac198cb7794cb5eaa' + 'f899998985f2d374af57f17ef6362c37a305467858195b74d1c1def71d97273f' + '7c2fbc9608d81f8080f8a9102b867a52a050b61f426a0c182ccc1cb5815e4981' + '4e00b06544a900b206fc41b9250ab75ea51b8e1489b1eff042da4f08d8a84ab0') + +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" +} + +build() { + export CGO_ENABLED=0 + export BUILD_HOST=archlinux + export BUILD_USER=${pkgbase} + export EXTRA_LDFLAGS="-linkmode external -extldflags \"${LDFLAGS}\"" + export GOPATH="${srcdir}" GOROOT_FINAL="/usr/bin" + cd "${srcdir}/src/github.com/syncthing/${pkgbase}" + export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw" + go run build.go -no-upgrade -version v${pkgver} build + go run build.go -no-upgrade -version v${pkgver} build strelaysrv +} + +check() { + export GOPATH="${srcdir}" GOROOT_FINAL="/usr/bin" + cd "${srcdir}/src/github.com/syncthing/${pkgbase}" + if [ "${CARCH}" == "x86_64" ] ; then + go run build.go -no-upgrade test + fi +} + +package_syncthing() { + pkgdesc="Open Source Continuous Replication / Cluster Synchronization Thing" + install=$pkgname.install + + cd "${srcdir}/src/github.com/syncthing/${pkgbase}" + install -Dm755 ${pkgname} "${pkgdir}/usr/bin/${pkgname}" + install -Dm644 README.md "${pkgdir}/usr/share/doc/${pkgname}/README.md" + install -Dm644 "etc/linux-systemd/system/${pkgname}-resume.service" \ + "${pkgdir}/usr/lib/systemd/system/${pkgname}-resume.service" + install -Dm644 "etc/linux-systemd/system/${pkgname}@.service" \ + "${pkgdir}/usr/lib/systemd/system/${pkgname}@.service" + install -Dm644 "etc/linux-systemd/user/${pkgname}.service" \ + "${pkgdir}/usr/lib/systemd/user/${pkgname}.service" + + # license + install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE + + # ufw preset + install -Dm644 etc/firewall-ufw/syncthing \ + "${pkgdir}/etc/ufw/applications.d/ufw-syncthing" + + # sysctl conf + install -Dm644 etc/linux-sysctl/30-syncthing.conf \ + "${pkgdir}/usr/lib/sysctl.d/30-syncthing.conf" + + # man pages + cd "${srcdir}/src/github.com/syncthing/${pkgname}/man" +# for file in $(find . -name '*.1' -print); do +# install -Dm644 $file "${pkgdir}"/usr/share/man/man1/$file +# done + install -Dm644 $pkgname.1 "${pkgdir}"/usr/share/man/man1/$pkgname.1 + for file in $(find . -name '*.5' -print); do + install -Dm644 $file "${pkgdir}"/usr/share/man/man5/$file + done + for file in $(find . -name '*.7' -print); do + install -Dm644 $file "${pkgdir}"/usr/share/man/man7/$file + done +} + +package_syncthing-relaysrv() { + pkgdesc='Relay server for Syncthing' + + cd "${srcdir}/src/github.com/syncthing/${pkgbase}" + install -Dm755 strelaysrv "${pkgdir}"/usr/bin/${pkgname} + + install -Dm644 man/strelaysrv.1 \ + "${pkgdir}"/usr/share/man/man1/$pkgname.1 + + install -Dm644 "${srcdir}"/${pkgname}.service \ + "${pkgdir}"/usr/lib/systemd/system/${pkgname}.service + install -Dm644 "${srcdir}/${pkgname}.tmpfiles" \ + "$pkgdir/usr/lib/tmpfiles.d/${pkgname}.conf" + install -Dm644 "${srcdir}/${pkgname}.sysusers" \ + "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf" +} Deleted: gcc-pie-segfaults-race.patch =================================================================== --- gcc-pie-segfaults-race.patch 2022-05-06 17:41:43 UTC (rev 1196023) +++ gcc-pie-segfaults-race.patch 2022-05-06 17:41:54 UTC (rev 1196024) @@ -1,11 +0,0 @@ -diff -aur syncthing.old/build.go syncthing/build.go ---- syncthing.old/build.go 2019-09-07 20:03:56.466643638 +0200 -+++ syncthing/build.go 2019-09-07 20:05:18.164000404 +0200 -@@ -343,7 +343,6 @@ - if runtime.GOARCH == "amd64" { - switch runtime.GOOS { - case "darwin", "linux", "freebsd": // , "windows": # See https://github.com/golang/go/issues/27089 -- args = append(args, "-race") - } - } - Copied: syncthing/repos/community-x86_64/gcc-pie-segfaults-race.patch (from rev 1196023, syncthing/trunk/gcc-pie-segfaults-race.patch) =================================================================== --- gcc-pie-segfaults-race.patch (rev 0) +++ gcc-pie-segfaults-race.patch 2022-05-06 17:41:54 UTC (rev 1196024) @@ -0,0 +1,11 @@ +diff -aur syncthing.old/build.go syncthing/build.go +--- syncthing.old/build.go 2019-09-07 20:03:56.466643638 +0200 ++++ syncthing/build.go 2019-09-07 20:05:18.164000404 +0200 +@@ -343,7 +343,6 @@ + if runtime.GOARCH == "amd64" { + switch runtime.GOOS { + case "darwin", "linux", "freebsd": // , "windows": # See https://github.com/golang/go/issues/27089 +- args = append(args, "-race") + } + } + Deleted: syncthing-relaysrv.service =================================================================== --- syncthing-relaysrv.service 2022-05-06 17:41:43 UTC (rev 1196023) +++ syncthing-relaysrv.service 2022-05-06 17:41:54 UTC (rev 1196024) @@ -1,17 +0,0 @@ -[Unit] -Description=Syncthing relay server -After=network.target - -[Service] -User=syncthing-relaysrv -Group=syncthing-relaysrv -ExecStart=/usr/bin/syncthing-relaysrv -WorkingDirectory=/var/lib/syncthing-relaysrv - -PrivateTmp=true -ProtectSystem=full -ProtectHome=true -NoNewPrivileges=true - -[Install] -WantedBy=multi-user.target Copied: syncthing/repos/community-x86_64/syncthing-relaysrv.service (from rev 1196023, syncthing/trunk/syncthing-relaysrv.service) =================================================================== --- syncthing-relaysrv.service (rev 0) +++ syncthing-relaysrv.service 2022-05-06 17:41:54 UTC (rev 1196024) @@ -0,0 +1,17 @@ +[Unit] +Description=Syncthing relay server +After=network.target + +[Service] +User=syncthing-relaysrv +Group=syncthing-relaysrv +ExecStart=/usr/bin/syncthing-relaysrv +WorkingDirectory=/var/lib/syncthing-relaysrv + +PrivateTmp=true +ProtectSystem=full +ProtectHome=true +NoNewPrivileges=true + +[Install] +WantedBy=multi-user.target Deleted: syncthing-relaysrv.sysusers =================================================================== --- syncthing-relaysrv.sysusers 2022-05-06 17:41:43 UTC (rev 1196023) +++ syncthing-relaysrv.sysusers 2022-05-06 17:41:54 UTC (rev 1196024) @@ -1,2 +0,0 @@ -u syncthing-relaysrv - "Syncthing relay server" -g syncthing-relaysrv - Copied: syncthing/repos/community-x86_64/syncthing-relaysrv.sysusers (from rev 1196023, syncthing/trunk/syncthing-relaysrv.sysusers) =================================================================== --- syncthing-relaysrv.sysusers (rev 0) +++ syncthing-relaysrv.sysusers 2022-05-06 17:41:54 UTC (rev 1196024) @@ -0,0 +1,2 @@ +u syncthing-relaysrv - "Syncthing relay server" +g syncthing-relaysrv - Deleted: syncthing-relaysrv.tmpfiles =================================================================== --- syncthing-relaysrv.tmpfiles 2022-05-06 17:41:43 UTC (rev 1196023) +++ syncthing-relaysrv.tmpfiles 2022-05-06 17:41:54 UTC (rev 1196024) @@ -1 +0,0 @@ -d /var/lib/syncthing-relaysrv 0700 syncthing-relaysrv syncthing-relaysrv - Copied: syncthing/repos/community-x86_64/syncthing-relaysrv.tmpfiles (from rev 1196023, syncthing/trunk/syncthing-relaysrv.tmpfiles) =================================================================== --- syncthing-relaysrv.tmpfiles (rev 0) +++ syncthing-relaysrv.tmpfiles 2022-05-06 17:41:54 UTC (rev 1196024) @@ -0,0 +1 @@ +d /var/lib/syncthing-relaysrv 0700 syncthing-relaysrv syncthing-relaysrv - Deleted: syncthing.install =================================================================== --- syncthing.install 2022-05-06 17:41:43 UTC (rev 1196023) +++ syncthing.install 2022-05-06 17:41:54 UTC (rev 1196024) @@ -1,9 +0,0 @@ -post_upgrade() { - if (( "$(vercmp $2 0.14.14-1)" < 0 )); then - cat << EOF - Syncing symlinks between v0.14.14 and previous versions will not work. - See https://github.com/syncthing/syncthing/releases/tag/v0.14.14 for details. - -EOF - fi -} Copied: syncthing/repos/community-x86_64/syncthing.install (from rev 1196023, syncthing/trunk/syncthing.install) =================================================================== --- syncthing.install (rev 0) +++ syncthing.install 2022-05-06 17:41:54 UTC (rev 1196024) @@ -0,0 +1,9 @@ +post_upgrade() { + if (( "$(vercmp $2 0.14.14-1)" < 0 )); then + cat << EOF + Syncing symlinks between v0.14.14 and previous versions will not work. + See https://github.com/syncthing/syncthing/releases/tag/v0.14.14 for details. + +EOF + fi +}