net-p2p/syncthing: bump to 1.1.4

Signed-off-by: Marek Szuba <marecki@gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11

2 files changed, 168 insertions, 0 deletions

diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index 82f201c1266f..f02d4efc2902 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -14,6 +14,7 @@ DIST github.com-go-ldap-ldap-v2.5.1.tar.gz 36393 BLAKE2B 5960961d019058f3cd5bdd5
 DIST github.com-go-yaml-yaml-v2.0.0.tar.gz 64746 BLAKE2B 5e73cb1c987eb40dbe3d3a1ba3bcaf866322f61fd08f1c240cd746128670229dd83c936e701e8c4ca10be3827f4280d8e0addbb102d3f38d9ef3c00e8f719da2 SHA512 29f3f33e53b7a1f2625c89c74818e3ad1f2c78b2461113fc43a8f3924adde5813d3b7a9495d864cd32fb4842a04dd9adfdb81f53cf65f5319e76f30d21b11217
 DIST github.com-gobwas-glob-51eb1ee00b6d931c66d229ceeb7c31b985563420.tar.gz 25031 BLAKE2B 6dd32175053b576e8d59e8de18841b7a1237274a9a8da25906c51f878cbef70ab3f756fc98689e414e596ff8a125a7da044f058c20bb7fbd4fa6363d2b8c8384 SHA512 b393292834ef91224a1179bb84a98733f2d99c34fa89208603554b6dcd2bf90b6f4f795366a551b764e5cf615f2b68381ddc6f7f58e9700bc7b1ec7e8a473b57
 DIST github.com-gogo-protobuf-v1.2.0.tar.gz 2011389 BLAKE2B 4c3fcca9ae18854e490cb4ab89f1f4d4b894cef4fc9cbe0301153843bd6b5951354efb47f76996799c819b058bb8573a5bbafcb2b400c1ee624ca6b1584c3ba8 SHA512 562f4e0c10b364831479c2881a974693c224ddf6c6c724f226b7044fc9a87b8a12a17b1a533c13fd97423dfe7094692c79919cf8453f9e176fc556f4d3678d75
+DIST github.com-gogo-protobuf-v1.2.1.tar.gz 2017393 BLAKE2B d55fc545759add352512c2ef81d948c598f71131fdb1649ee526b59989457a324b03144e989a3c651b5614a2eee9e7b1652d3d259733cd3752c97fc2f6720705 SHA512 7cb48dc85e76cf6b116015441e29e86a25514667b409c0a1d335ce1c844a080fc9b37f48911959531aac8ece009b6d8401b1fb7bc463fc8e6fb5e133c9846e64
 DIST github.com-golang-crypto-0fcca4842a8d74bfddc2c96a073bd2a4d2a7a2e8.tar.gz 1444273 BLAKE2B f304c3984fc3239077dd2ad41972f37ecd4dff7d8dbaf5299811cdd15e2d74d1e98eba4fe7542daeb7961c362d9a4310c48379a3da748d8dde713c689a966765 SHA512 09ed21929d26480f6b9f760c655b8c3445daecd65acf71d084a7807253ee73dd0fec46ed058ecd2e3761b431761df6dff2a4e12586631b6ecf9dc1e12f66c584
 DIST github.com-golang-groupcache-84a468cf14b4376def5d68c722b139b881c450a4.tar.gz 25841 BLAKE2B 38026e1d9783d366af5996ed0c25f6fcd366a56e976c2665d7b815ac8aff371aa6b7c322176f1cd4c79e0dd1a29de2ec4f563a05ef8473876f74a0816cf628c7 SHA512 e56e2e7c604f485a188bc7be3c3e58cd129359d346ccfd30f55c0c768b7128390d7d0264f093387d75484aa687b9c2c811ce7b2a272942bf14854775270a0648
 DIST github.com-golang-net-351d144fa1fc0bd934e2408202be0c29f25e35a0.tar.gz 967715 BLAKE2B b18360cf29bc50b936ed6a0c48fc3a8a283e4610bad302ab732a345e51a9fc2922904a824e173047cba15c189e169160af14d717ffe3877a44a1c74d90723440 SHA512 6778a4d08064c8cbfc9d7ea0dc30a4bd6af7c68f9101c1dc4cda4b037348acde3fcd8c72fd25a61e94a64c659851380137e0d60c54edace03af3bc7f05554053
@@ -26,12 +27,15 @@ DIST github.com-jackpal-gateway-5795ac81146e01d3fab7bcf21c043c3d6a32b006.tar.gz
 DIST github.com-kballard-go-shellquote-cd60e84ee657ff3dc51de0b4f55dd299a3e136f2.tar.gz 4205 BLAKE2B c9df02705dff0d28cfdb4bd8cd4e5e74b490bd15c5b9d28138f7f4f4abc085f7dc59b34227adbe7d25874c8928a96b0f19cfebffbc79068d314eaf90d87cd4fa SHA512 d738d2bce5abac7c3246f20f52ff069f43cd6b4e43e3e03c245688342d178f8bb2ae6923f9dca2d191458fd46356d17c3e065d09c1918541d27544ac2f046f8f
 DIST github.com-kr-pretty-v0.1.0.tar.gz 8550 BLAKE2B 210bbedee436b225b678ccbc363a2feb09b6903bf459e34d0d6950333dc273db5713a828b003ad0b52da0718de38aa3665ff7be6c99b865a7766998e37e55fb9 SHA512 7a367c317043d40cfbf7fac631a286c0bbb8b45a716fe7388d6271431e354b3913505398b8ccf7ffbb01abf71f04216738936a4282c3c9645e26c51b7692e820
 DIST github.com-lib-pq-v1.0.0.tar.gz 91416 BLAKE2B c41cbef1509fbf940315649c74b68ac8148c0ae51d8fcd85f46673d0c856f5ee9b8c75fc44ac0f6617b5656c0848b0d019b0d196d5bfc428300cbe3ca41338f3 SHA512 7a7d015e97600d885f2ca0d21803919358a077c5ee60229e3cb0981b19d8ebb220a28da36ed310832186ad819f469d35e117d69dc21de4a05f439c9c0a28f096
+DIST github.com-lib-pq-v1.1.1.tar.gz 95305 BLAKE2B 2e7cdc435305effb1c4dd65919a6c2c1fbf6bf1c8ce621b6484f20dca8b767b1004bb85bff17eb2b2a7692b904b58fcaeeda81ddee389d01453c4044be7c622c SHA512 62e991b80458841a1aff7996a91bb085eb33ed8f4e36de7f6fb0acd8d4c974df1358431740a85628ac0a020b0a31777c4448ab8d5659f20d7e1cbfe262c91b19
 DIST github.com-mattn-go-isatty-v0.0.4.tar.gz 3377 BLAKE2B 3d24124c57c5a7d888014555ddd221790ee1c281e083f39595f0b28f7485065f3e7c25d6503df291dd09ad5a17b10fcc3d3e5018f846bc141f2e9b1bae44fb0c SHA512 3021fa12e408b5f0dee7cf6b04be48db5de032e7226fe07d6ba77aa1ac54ea8531b7fe14ef7fcb41d2df15ff14f524594a21859693623cb1e937d58578c4fb67
+DIST github.com-mattn-go-isatty-v0.0.7.tar.gz 3559 BLAKE2B 1f65f3d33cf25459b63fb70912810dd094e3fc6f3f94db293539d4c95e22e495bc93e7d676d161e15f5a8ca6afe082d17dd5173a931382e66ce2cefcc44a59ef SHA512 f067811fd5483c8f49770132f42156e78256843672891448d725c9dbdd25ecaa941802e5e9d08ca9c20ae23a553e51a4653e8205f48f7cc979e5be0b4646f13e
 DIST github.com-matttproud-golang_protobuf_extensions-v1.0.1.tar.gz 37184 BLAKE2B 9ad023f9b70938f45e6dd44624a7008c1895e488e63124bcd8f8492292ef98479e966ed627a62de32e0fe84a57e60710227e02e4a276aabece81f021af9408a5 SHA512 63d9963502e967e47253f638a19dfbeaa2b63efab74ed790539ceaa9b4a0b695aa107f9e0c920c0da547ac1abe81af22d47f6de547c500deeb005fd8a5e22660
 DIST github.com-minio-sha256-simd-cc1980cb03383b1d46f518232672584432d7532d.tar.gz 64704 BLAKE2B 6838142d5f7b3496e9a28cb829ae54a08fafcb022f46b6eeab462d851428d2040a1941b2b8532340f35597afd311e6904bf2b0e126441e48d8db48ee6c6b6ae9 SHA512 2d8307280540919af2154d551b2b76b0ea929770d18af0266440e05e39d0f16469b6b98db739f022eb579d8f40bccd67dd5f66bed9575f304e863bd07a5e6e97
 DIST github.com-onsi-ginkgo-6c46eb8334b30dc55b42f1a1c725d5ce97375390.tar.gz 127951 BLAKE2B b8b981f2c98bfaecd4e65db1a97f00190c8935da866f5b7cb77a0c437063dab8cb94fb19eb77ec6bff9b361d91aa772945cc51dbafabc7870268326b0e458da0 SHA512 f6e99db70c540a08e064358c0034e8978f2cb7d2c27be439f3a90d0fd0c741ade9a15a30c837da71ee1c8df6b80b124799f4820ca25b71994d7e8de207ba4eb2
 DIST github.com-onsi-gomega-ba3724c94e4dd5d5690d37c190f1c54b2c1b4e64.tar.gz 81608 BLAKE2B 78522352a6774340d5de89545ec8189102bfdf002e6e2d637c3e4aa6a6b270f4cac7d999bebc5c0741ecf6d2580bf34f5983dab173ec5d8ba04a722475c1fda1 SHA512 7f8ec51545f322537b50173338a3ecc04eb4214d1536395ae08ef41e3353b9455ffcfa7c0c69717e8e4bf316bec4d17e37ee1d1f604da38abec46afe5c7d76e6
 DIST github.com-oschwald-geoip2-golang-v1.1.0.tar.gz 6153 BLAKE2B 17c69a78ca58edbb04313111d083a6a72aaf3bf55c5d38cf297a2cae2604061cdaa2c9b10653cde09b16860db67a3c5af8eb35d46eb771a66a6c833ce4633194 SHA512 59885c1bd8045899dbb0298b9ab8a5ef8c5852b83da97e29ab178e9d39a49f959b5435b78cfefc75c32633960ca194de8965c173e90cce2c8de3fccd781d9001
+DIST github.com-oschwald-geoip2-golang-v1.3.0.tar.gz 6595 BLAKE2B 4d6eb86ef10e97284de0ac9326ffa348e421f034fdbb85565f93ddb774546197a196270bc65a1ec32bd8c99684cd39a31a5f4e806886bc79860f2c9c07b66bdc SHA512 841a716429fb01775e72d1398c3780294257be606b568524631a076ad22cd1330a11aa70b4f7c8b4bedccd22432613919b9cadf3bd4c4b34c097e1b123834209
 DIST github.com-oschwald-maxminddb-golang-26fe5ace1c706491c2936119e1dc69c1a9c04d7f.tar.gz 17818 BLAKE2B ce68d48e238a674f492b2cbe63d9c74f2a839d3cbb744df8442f4bdd7d5705f0a5d4f2114bd4faa431c76c05331d67edd090db658ccb5546a266e40386d9ccbb SHA512 41c37ab97728b1d1a3e30dac22f29846cad487dff7e8211d2225f1d1b70a05849680dbce79134d5f9685a46f5db51c23a2b11744fea237a79ccefd90bc840c92
 DIST github.com-petermattis-goid-3db12ebb2a599ba4a96bea1c17b61c2f78a40e02.tar.gz 6598 BLAKE2B 39b08b8bbf3525bb16279beec310dbcb9756960d3475f75866a483aa30e5ce4189dbf1d7324b02e284c4abf40543a15d3272630f8bfc55bb8c36d07e03e1806c SHA512 60c161fa5c1e1f21c8ed1568aeadf9bcc3744bf52b4ff51124095d436b1c5b665b18d9b151bcb1fef98cccf48b420d8135a8df1c40cee88a4bdbd37980c44b54
 DIST github.com-pkg-errors-v0.8.1.tar.gz 11009 BLAKE2B 02adfe3cea02b0ddb7cde923c22dc8a035491098d138d6254e8b833f58f4388a7bd172a15a22f3dbd6b0ce8909b6167f62561d32ec3d21566eef00005c1a025d SHA512 8f93cdae71789e417da11a45c667954169ec4adc04fb618f938ffc2e513cb021f140bc2b94f3e634fd4f19b73be7c9bc483d541bb7baea54c7c9700becc4d438
@@ -52,3 +56,4 @@ DIST syncthing-0.14.52.tar.gz 10583112 BLAKE2B cceaf0aba9dff96df0551d7aab855cb71
 DIST syncthing-1.0.1.tar.gz 7114455 BLAKE2B 71c80afaab5a546551e8e72e63272ab277df33645d4de19005376de599d8fe0bad9d4a1e7758321d116f8c46cd73067a770f641a0c736ad678a09579716f44a8 SHA512 7f9fd48e00fae2f0913eb9eeddadaad1d5d7559164a24020706e70411f8ec43420192c4c9422699be6faa1641a382d5b8627038ca9a5dad38ee0e189970efbb7
 DIST syncthing-1.1.0.tar.gz 4658059 BLAKE2B 7b145d0299eada05662f500269d15bee078d00a16ea1cd621fcae0179e6ffc0180741867be33b3736392bb850bf82770a245002d735ba518a48574a11c5c2c07 SHA512 9fd3b7b29fc5842ec0764a274d8695772c1dc23d9c971c4741ea4fba93f93afbdc0df6e743345ebe83a26556e2a693b808a409190d6cc6c61d8d6b9850e5e998
 DIST syncthing-1.1.3.tar.gz 4686497 BLAKE2B d80718bc084212657cb7f1c3a4b5c41f22e43ddbba6923d1daf20328789135fcfca8a0f40adaedd68c1a3c29b891eaed39b0fac2099777999a1e2ed3f980c676 SHA512 43dff52336c19a9a8ce39413a9288d0f500d633589e0f3ff3989ad38d9c6fe6af5b01b27b3143e6beb0841e1e6bc6c590f4859530720e2730cdf214130c99a3a
+DIST syncthing-1.1.4.tar.gz 4700261 BLAKE2B bf766d7d3701ac66d0d4ac266d9b4a9f02b2f97a6fa320b192f3e46fbe9055091ea5ae71bf405ccce4a9665efdf41477098af3b98562ea06bf0c4f828653bd51 SHA512 cb57cdf6bbab0147a700f72e800cddff0855835280a176883089e5e1dc06352e0dacf615569a35b16f98a857651f534c915f369c46bb592d416d7a01efe5b5ba
diff --git a/net-p2p/syncthing/syncthing-1.1.4.ebuild b/net-p2p/syncthing/syncthing-1.1.4.ebuild
new file mode 100644
index 000000000000..7666efeb812c
--- /dev/null
+++ b/net-p2p/syncthing/syncthing-1.1.4.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_PN="github.com/${PN}/${PN}"
+
+EGO_VENDOR=(
+	"github.com/AudriusButkevicius/go-nat-pmp 452c97607362b2ab5a7839b8d1704f0396b640ca"
+	"github.com/AudriusButkevicius/recli v0.0.5"
+	"github.com/bkaradzic/go-lz4 7224d8d8f27ef618c0a95f1ae69dbb0488abc33a"
+	"github.com/calmh/du v1.0.1"
+	"github.com/calmh/xdr v1.1.0"
+	"github.com/chmduquesne/rollinghash a60f8e7142b536ea61bb5d84014171189eeaaa81"
+	"github.com/d4l3k/messagediff v1.2.1"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/flynn-archive/go-shlex 3f9db97f856818214da2e1057f8ad84803971cff"
+	"github.com/gobwas/glob 51eb1ee00b6d931c66d229ceeb7c31b985563420"
+	"github.com/gogo/protobuf v1.2.1"
+	"github.com/golang/groupcache 84a468cf14b4376def5d68c722b139b881c450a4"
+	"github.com/golang/snappy 553a641470496b2327abcac10b36396bd98e45c9"
+	"github.com/jackpal/gateway 5795ac81146e01d3fab7bcf21c043c3d6a32b006"
+	"github.com/kballard/go-shellquote cd60e84ee657ff3dc51de0b4f55dd299a3e136f2"
+	"github.com/kr/pretty v0.1.0"
+	"github.com/lib/pq v1.1.1"
+	"github.com/mattn/go-isatty v0.0.7"
+	"github.com/minio/sha256-simd cc1980cb03383b1d46f518232672584432d7532d"
+	"github.com/onsi/ginkgo 6c46eb8334b30dc55b42f1a1c725d5ce97375390"
+	"github.com/onsi/gomega ba3724c94e4dd5d5690d37c190f1c54b2c1b4e64"
+	"github.com/oschwald/geoip2-golang v1.3.0"
+	"github.com/oschwald/maxminddb-golang 26fe5ace1c706491c2936119e1dc69c1a9c04d7f"
+	"github.com/petermattis/goid 3db12ebb2a599ba4a96bea1c17b61c2f78a40e02"
+	"github.com/pkg/errors v0.8.1"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/prometheus/client_golang v0.9.2"
+	"github.com/rcrowley/go-metrics e181e095bae94582363434144c61a9653aff6e50"
+	"github.com/sasha-s/go-deadlock v0.2.0"
+	"github.com/stretchr/testify v1.2.2"
+	"github.com/syncthing/notify 4e389ea6c0d84e6195eb585ffaf62c8c143306ae"
+	"github.com/syndtr/goleveldb 34011bf325bce385408353a30b101fe5e923eb6e"
+	"github.com/thejerf/suture v3.0.2"
+	"github.com/urfave/cli v1.20.0"
+	"github.com/vitrun/qart bf64b92db6b05651d6c25a3dabf2d543b360c0aa"
+	"golang.org/x/crypto 0fcca4842a8d74bfddc2c96a073bd2a4d2a7a2e8 github.com/golang/crypto"
+	"golang.org/x/net 351d144fa1fc0bd934e2408202be0c29f25e35a0 github.com/golang/net"
+	"golang.org/x/sys 4d1cda033e0619309c606fc686de3adcf599539e github.com/golang/sys"
+	"golang.org/x/text e19ae1496984b1c655b8044a65c0300a3c878dd3 github.com/golang/text"
+	"golang.org/x/time 6dc17368e09b0e8634d71cac8168d853e869a0c7 github.com/golang/time"
+	"gopkg.in/asn1-ber.v1 v1.2 github.com/go-asn1-ber/asn1-ber"
+	"gopkg.in/check.v1 788fd78401277ebd861206a03c884797c6ec5541 github.com/go-check/check"
+	"gopkg.in/ldap.v2 v2.5.1 github.com/go-ldap/ldap"
+	"gopkg.in/yaml.v2 v2.0.0 github.com/go-yaml/yaml"
+	# These are only used by the test suite but conditional vendoring is messy
+	"github.com/beorn7/perks 3a771d992973f24aa725d07868b467d1ddfceafb"
+	"github.com/golang/protobuf v1.2.0"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1"
+	"github.com/prometheus/client_model 5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f"
+	"github.com/prometheus/common v0.1.0"
+	"github.com/prometheus/procfs 1dc9a6cbc91aacc3e8b2d63db4d2e957a5394ac4"
+)
+
+inherit golang-vcs-snapshot systemd user xdg-utils
+
+DESCRIPTION="Open Source Continuous File Synchronization"
+HOMEPAGE="https://syncthing.net"
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="selinux tools"
+
+BDEPEND=">=dev-lang/go-1.12"
+RDEPEND="selinux? ( sec-policy/selinux-syncthing )"
+
+DOCS=( README.md AUTHORS CONTRIBUTING.md )
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+
+	if use tools ; then
+		# separate user for the discovery server
+		enewgroup stdiscosrv
+		enewuser stdiscosrv -1 -1 /var/lib/stdiscosrv stdiscosrv
+		keepdir /var/lib/stdiscosrv
+		fowners stdiscosrv:stdiscosrv /var/lib/stdiscosrv
+
+		# separate user for the relay server
+		enewgroup strelaysrv
+		enewuser strelaysrv -1 -1 /var/lib/strelaysrv strelaysrv
+		# and his home folder
+		keepdir /var/lib/strelaysrv
+		fowners strelaysrv:strelaysrv /var/lib/strelaysrv
+	fi
+}
+
+src_prepare() {
+	# Bug #679280
+	xdg_environment_reset
+
+	default
+	sed -i \
+		's|^ExecStart=.*|ExecStart=/usr/libexec/syncthing/strelaysrv|' \
+		src/${EGO_PN}/cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \
+		|| die
+}
+
+src_compile() {
+	export GOPATH="${S}:$(get_golibdir_gopath)"
+	cd src/${EGO_PN} || die
+	go run build.go -version "v${PV}" -no-upgrade install \
+		$(usex tools "all" "") || die "build failed"
+}
+
+src_test() {
+	cd src/${EGO_PN} || die
+	go run build.go test || die "test failed"
+}
+
+src_install() {
+	pushd src/${EGO_PN} >& /dev/null || die
+	doman man/*.[157]
+	einstalldocs
+
+	dobin bin/syncthing
+	if use tools ; then
+		exeinto /usr/libexec/syncthing
+		local exe
+		for exe in bin/* ; do
+			[[ "${exe}" == "bin/syncthing" ]] || doexe "${exe}"
+		done
+	fi
+	popd >& /dev/null || die
+
+	# openrc and systemd service files
+	systemd_dounit src/${EGO_PN}/etc/linux-systemd/system/${PN}{@,-resume}.service
+	systemd_douserunit src/${EGO_PN}/etc/linux-systemd/user/${PN}.service
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+
+	keepdir /var/{lib,log}/${PN}
+	fowners ${PN}:${PN} /var/{lib,log}/${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	if use tools ; then
+		# openrc and systemd service files
+
+		systemd_dounit "${FILESDIR}/stdiscosrv.service"
+		newconfd "${FILESDIR}/stdiscosrv.confd" stdiscosrv
+		newinitd "${FILESDIR}/stdiscosrv.initd" stdiscosrv
+
+		systemd_dounit src/${EGO_PN}/cmd/strelaysrv/etc/linux-systemd/strelaysrv.service
+		newconfd "${FILESDIR}/strelaysrv.confd" strelaysrv
+		newinitd "${FILESDIR}/strelaysrv.initd" strelaysrv
+
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/stdiscosrv.logrotate" strelaysrv
+		newins "${FILESDIR}/strelaysrv.logrotate" strelaysrv
+	fi
+}