[arch-commits] Commit in syncthing/repos/community-x86_64 (12 files)
Felix Yan
felixonmars at archlinux.org
Tue Mar 10 13:51:37 UTC 2020
Date: Tuesday, March 10, 2020 @ 13:51:35
Author: felixonmars
Revision: 593603
archrelease: copy trunk to community-x86_64
Added:
syncthing/repos/community-x86_64/PKGBUILD
(from rev 593601, syncthing/trunk/PKGBUILD)
syncthing/repos/community-x86_64/gcc-pie-segfaults-race.patch
(from rev 593602, syncthing/trunk/gcc-pie-segfaults-race.patch)
syncthing/repos/community-x86_64/syncthing-relaysrv.service
(from rev 593602, syncthing/trunk/syncthing-relaysrv.service)
syncthing/repos/community-x86_64/syncthing-relaysrv.sysusers
(from rev 593602, syncthing/trunk/syncthing-relaysrv.sysusers)
syncthing/repos/community-x86_64/syncthing-relaysrv.tmpfiles
(from rev 593602, syncthing/trunk/syncthing-relaysrv.tmpfiles)
syncthing/repos/community-x86_64/syncthing.install
(from rev 593602, 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 | 198 ++++++++++++++++++++---------------------
gcc-pie-segfaults-race.patch | 22 ++--
syncthing-relaysrv.service | 34 +++----
syncthing-relaysrv.sysusers | 4
syncthing-relaysrv.tmpfiles | 2
syncthing.install | 18 +--
6 files changed, 139 insertions(+), 139 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-03-10 13:51:11 UTC (rev 593602)
+++ PKGBUILD 2020-03-10 13:51:35 UTC (rev 593603)
@@ -1,99 +0,0 @@
-# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
-# Contributor: Martin Wimpress <code at flexion.org>
-# Contributor: Sauyon Lee <sauyonl at sauyon.com>
-# Contributor: Kevin MacMartin <prurigro at gmail.com>
-# Contributor: korjjj <korjjj+aur at gmail.com>
-
-pkgname=('syncthing' 'syncthing-relaysrv')
-pkgver=1.3.4
-pkgrel=1
-arch=('x86_64')
-url="https://syncthing.net/"
-license=('MPL')
-depends=('glibc')
-makedepends=('git' 'go-pie' 'inetutils')
-# options=('!strip')
-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=('e40227f67b4317419900353be3f49f381ed36e41044df5d168b850f6b183ae08'
- '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 GOPATH="${srcdir}" GOROOT_FINAL="/usr/bin"
- cd "${srcdir}/src/github.com/syncthing/${pkgbase}"
- 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"
-
- # 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
- 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 "${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 593601, syncthing/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-03-10 13:51:35 UTC (rev 593603)
@@ -0,0 +1,99 @@
+# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
+# Contributor: Martin Wimpress <code at flexion.org>
+# Contributor: Sauyon Lee <sauyonl at sauyon.com>
+# Contributor: Kevin MacMartin <prurigro at gmail.com>
+# Contributor: korjjj <korjjj+aur at gmail.com>
+
+pkgname=('syncthing' 'syncthing-relaysrv')
+pkgver=1.3.4
+pkgrel=2
+arch=('x86_64')
+url="https://syncthing.net/"
+license=('MPL')
+depends=('glibc')
+makedepends=('git' 'go-pie' 'inetutils')
+# options=('!strip')
+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=('e40227f67b4317419900353be3f49f381ed36e41044df5d168b850f6b183ae08'
+ '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 GOPATH="${srcdir}" GOROOT_FINAL="/usr/bin"
+ cd "${srcdir}/src/github.com/syncthing/${pkgbase}"
+ 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"
+
+ # 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
+ 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 "${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 2020-03-10 13:51:11 UTC (rev 593602)
+++ gcc-pie-segfaults-race.patch 2020-03-10 13:51:35 UTC (rev 593603)
@@ -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 593602, syncthing/trunk/gcc-pie-segfaults-race.patch)
===================================================================
--- gcc-pie-segfaults-race.patch (rev 0)
+++ gcc-pie-segfaults-race.patch 2020-03-10 13:51:35 UTC (rev 593603)
@@ -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 2020-03-10 13:51:11 UTC (rev 593602)
+++ syncthing-relaysrv.service 2020-03-10 13:51:35 UTC (rev 593603)
@@ -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 593602, syncthing/trunk/syncthing-relaysrv.service)
===================================================================
--- syncthing-relaysrv.service (rev 0)
+++ syncthing-relaysrv.service 2020-03-10 13:51:35 UTC (rev 593603)
@@ -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 2020-03-10 13:51:11 UTC (rev 593602)
+++ syncthing-relaysrv.sysusers 2020-03-10 13:51:35 UTC (rev 593603)
@@ -1,2 +0,0 @@
-u syncthing-relaysrv - "Syncthing relay server"
-g syncthing-relaysrv -
Copied: syncthing/repos/community-x86_64/syncthing-relaysrv.sysusers (from rev 593602, syncthing/trunk/syncthing-relaysrv.sysusers)
===================================================================
--- syncthing-relaysrv.sysusers (rev 0)
+++ syncthing-relaysrv.sysusers 2020-03-10 13:51:35 UTC (rev 593603)
@@ -0,0 +1,2 @@
+u syncthing-relaysrv - "Syncthing relay server"
+g syncthing-relaysrv -
Deleted: syncthing-relaysrv.tmpfiles
===================================================================
--- syncthing-relaysrv.tmpfiles 2020-03-10 13:51:11 UTC (rev 593602)
+++ syncthing-relaysrv.tmpfiles 2020-03-10 13:51:35 UTC (rev 593603)
@@ -1 +0,0 @@
-d /var/lib/syncthing-relaysrv 0700 syncthing-relaysrv syncthing-relaysrv -
Copied: syncthing/repos/community-x86_64/syncthing-relaysrv.tmpfiles (from rev 593602, syncthing/trunk/syncthing-relaysrv.tmpfiles)
===================================================================
--- syncthing-relaysrv.tmpfiles (rev 0)
+++ syncthing-relaysrv.tmpfiles 2020-03-10 13:51:35 UTC (rev 593603)
@@ -0,0 +1 @@
+d /var/lib/syncthing-relaysrv 0700 syncthing-relaysrv syncthing-relaysrv -
Deleted: syncthing.install
===================================================================
--- syncthing.install 2020-03-10 13:51:11 UTC (rev 593602)
+++ syncthing.install 2020-03-10 13:51:35 UTC (rev 593603)
@@ -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 593602, syncthing/trunk/syncthing.install)
===================================================================
--- syncthing.install (rev 0)
+++ syncthing.install 2020-03-10 13:51:35 UTC (rev 593603)
@@ -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
+}
More information about the arch-commits
mailing list