gentoo auto-resync : 05:09:2022 - 16:24:39

3 files changed, 95 insertions, 24 deletions

diff --git a/net-p2p/resilio-sync/Manifest b/net-p2p/resilio-sync/Manifest
index 7e168101aa34..0c9d48dfc112 100644
--- a/net-p2p/resilio-sync/Manifest
+++ b/net-p2p/resilio-sync/Manifest
@@ -5,10 +5,17 @@ AUX resilio-sync.confd 312 BLAKE2B eee3179791594a3af6176abc2eba5b2db3e0a14d602dd
 AUX resilio-sync.initd 462 BLAKE2B 775e1824d9b374bef32798bb05bb7fb2fd66ff1b859aa50d72dd02c80033bcf8b12275bf1e4d9eae2b2fdc1a1da7a1710c8e5ce1bd6da37427a4433967afb1bb SHA512 06cc963db70c969ca81a249c17c467fd4013a7cde39b37f65c934393e9e891776f247397b976f5caf20b6d29cee64865703bb2b3b78cd7a0e68be102db46a7fb
 AUX resilio-sync.service 382 BLAKE2B f61c181137d41aeb59c721688a2b208c16d985c0b74c32e556cf3cc5218a549c7f58da50dde584bfbfca88ce6a00f1ecbbd67e58af04e88774b3e648d4d8513e SHA512 c278b35ba0cc888beb7d4b75e5b5c5c0304ec89ba1ac0136713256d05e95896254504b58f9c3a0a534aa04aee5e36468b579b2e18397f0bfb3615527b82195db
 AUX resilio-sync.tmpfile 41 BLAKE2B fb3e9001a32e45cd230f4efef60509f20f52253ad575fb2b1493bae9846ad46210eed639c7a3f9e4a4fa7c901b42a9a7756f8583c204a4bb847e6eb96a2af323 SHA512 d9d54076785ce601023980e3fe5e2eab42e5eaf3b0bdb9caefe508e0d5fda8d32faf1338c6b901deb29488401de74228023016d72d7b0ec9db362b4c2d87edd2
-DIST resilio-sync_2.6.3-1_amd64.deb 12111264 BLAKE2B e4b4d3d0bda910db5f10131d9072c47d7daccd6ff37267546385fb2657c84d9b12e9ae637df8380175f175c3e3a304fc3424ab93aa71b69d9890320d3464cf58 SHA512 92097e155fe74c07a89034db75e889fb3679fbd6cc497a361e4cf403bd1ffb5c2bc9f2a327d65d20b03067e5b7b898635a2dbeff7d4d9937b5e5ffe4daf4ba9d
-DIST resilio-sync_2.6.3-1_i386.deb 12062034 BLAKE2B 9c92e118ee8977a7e26948a21c61e1ff7c0692a2a76ff11e1b6ea8ef0edb08032d33453963b8c400c8945ed67cc561ce8334391fc4d8edc2e4bf37ff3c8acaff SHA512 4254de420b2b2263779befbfd93bddb8fa5352fbcce80e2a21efb463f0f3008a282fd07eb6602d4785ca6f0e770980b6da66c8d33911ae68938aee5e09e08e44
 DIST resilio-sync_2.7.2.1375-1_amd64.deb 11845750 BLAKE2B 894b975327f18ef4c5fe124466d9b1b50de72d08c106fe9f61a634e42b98042c2f5b40ed6c1afc2550fea3506e6cdef7d58eb041604624b26a5a877d62d941e5 SHA512 563643aab506f521c320e5b2ddc08d7d6893ea0908ecedeb11237495c47fb0585a781f83d0daacaf7de2084d9312784b947ad2e626995a05cdd03ffaae413665
 DIST resilio-sync_2.7.2.1375-1_i386.deb 11921570 BLAKE2B 8595bfa5ca1c366fdeb93a4126b5634ef65ffab1883a6b9a5f557d172b18a6f1966f891ff79407e576eaa3315b8d67b7fe11c7b8a760a5ab0272e1bcb4224552 SHA512 114af90ea5e89c6f3698cfd9eb8f5dd8bd5316ab5fd0873238a78a29e4c33d0e96a19f61687d47f46d708b79a2f1877166075e7c3e11b4e4fe4f517cc26d2231
-EBUILD resilio-sync-2.6.3-r2.ebuild 2187 BLAKE2B 75d26f7eb5c778c87a61f165187b5cd376b9230e06354f05b281057109a2565f80ed58733d762edaa7590f36e39edc22c74e8ccd72f3f49d16db0d69e1d43e65 SHA512 ec23b001751cf58d7a44d9aeacfac9597425561ee6e8b5b199ef3d8f937f57a733022c46db1239d96fe811eff407fc101d7dd79fe8459d0c5db11d838248390b
+DIST resilio-sync_2.7.3.1381-1_amd64.deb 11891248 BLAKE2B a5b3f7ba0b364cac706660bc2ab105f042fd367679c894c0e84a10c299c7ace99f051057a1e1679de43d9a219dd58f76b817d708f87776a18caf9d1808a6f4c0 SHA512 0417e8b0d9f6b20105145dd93d602b5682484f72d600f865241dc3016bb007b2adabe7ce288d18a95a63e31c32c12069909580a5afa93665cef5eb9b22cecd2e
+DIST resilio-sync_2.7.3.1381-1_arm64.deb 11239146 BLAKE2B fee89f4f2b8a20043981c5dc4662e2df5cac983020847897c7b0797119723a1266fbdfaf34ffea28bfe1d01786994376ad30ad475f9808372f93601cb6af8d89 SHA512 5c421ddb6ee853395e6e43d3ffd9c483c2038be7f3b0c7db797b86e403e249e3bd2143f7e476d1e547ce529369f175c27d19f3f84057ee0d1478306c9e14c509
+DIST resilio-sync_2.7.3.1381-1_armhf.deb 10985236 BLAKE2B 8b24181ac10b1d671c8e6412910ace20932e1e4386a5493b0c9030fb26b8d145c43da7d1e4b281d5d80da003469ab4197573d123dd5e9256eec27be139e62cef SHA512 cb725ff8051a84b0511204f81d9e34ab14f48dc9c274620efbd81c8c1cdbf641e26373f397e185c0afc1ec02ba8925e179a7953f5f8df780f1659b5952eeb4cb
+DIST resilio-sync_2.7.3.1381-1_i386.deb 11968124 BLAKE2B 251a70fe03e4916e6fccbcb49c36e0b3b0508c469c69244ccc00e5db7448d701d08a44ae545c677f2db1a34ff0ffe1908b6efd137c792981f885fc0be4d80c69 SHA512 e28b6098dacdf707ce5e9c15ededf10eaee614e331f0515ec200bd17211e1826c4bc4fb0cc7692abbf90fb9d1bb78765b4a13ae106fbf4e6bd3b72282e709b78
+DIST resilio-sync_arm64.tar.gz 13108308 BLAKE2B d6b9038041cada6017a925ccbc38094c6e876f6aa009ac5a6cd134d883458764c1549c5fab38f53a0bc16593fe51dcd816fa91c75a0a7ef7ecb9ac3a378107b3 SHA512 0b0ee23a8709272f8e3d346377891a88aac57d68ce3161777383c8d16b6456017920f8f10baa37bd524eaefb4e20e6d9646b084bedfb3124f33b5da8e4085388
+DIST resilio-sync_armhf.tar.gz 12124154 BLAKE2B 19b5ede578e51e851320d1fe202c73987c1d5a833a9ac6134a34c1302c133140ea708e5fa9500099f47378fbc8ac877ff08ab88c16040f38584e4cfdc2778927 SHA512 f0666b237f5f1a82299818df2dc24461456d61ea7ed51768ee5318ddcd5bcb2c49bf011c34d20f156b689bc29f43ec7895c368517b2fef4d4fb4ca10601fdf53
+DIST resilio-sync_i386.tar.gz 13675137 BLAKE2B c0d0e738acab7b8117edcaf027f6fd1223154f1cc998ff585946cc0ed7c2981356b4ab6b4914a2939fa8a423dae5b7fe5677f32c3f7835fbdc8f931717219836 SHA512 24159f581c47e94d2f8a664450a1a33d76f5cade44e9d5b0ad15246c6c5cdcf91f267f8dac20382e0618ebe0f9df5b30befe5eab600c395e7893da1d359b5982
+DIST resilio-sync_x64.tar.gz 13563546 BLAKE2B ae1f7a0a4fb4605c310464871628a36531986913429d86955a9b10fb0bb7ad58f29c7a6d400479b8fd154052282ed3bc7e37060c7d32f36486e316bd5ae77e2b SHA512 cfbf522761e6c9f0c77dfbb38b5a17f23360b147138cad9932400cd41fef6a14874cd1b58d737430ff5a9ae3a5e9d09f210b745bc5d2219d583c0def9f29dffc
 EBUILD resilio-sync-2.7.2.1375.ebuild 2187 BLAKE2B b0248fc4396da3d84a0edf95eb532599e2754e6edbb3cbd493865ecb7e36abc886dcdf393a60ec211e7ad23e89da8c6d6c2b0a798a803631b78345f73424025a SHA512 9de4097fa36832d06b8b3fd8915c39c02b5848a80aea6b10585e5b3f4ef5ba334349ebfc2fb0ef5bacbec46e128546f0e1554cfbab0010d009e86cfaca947b56
+EBUILD resilio-sync-2.7.3.1381.ebuild 2252 BLAKE2B f6afbdd8b3b4d9bbc6036d68e51f4831629c71e405f14a63ad8b8719410ccbbd4e1e44bcf51f3c98660e8181f6ea8ad0d11b682c079113928e799c6078314693 SHA512 285c7a3c58fffa67c65521a6d3b5983331045927aee4278464e34a92e18a199a59f6f6570e1fa7fadd3a3ea3afc438dc9a20b834ce3988a1cacb04c3cb07ed49
+EBUILD resilio-sync-9999.ebuild 2131 BLAKE2B 45c67c501c5e377db81d1011250e328b6c929f3a757dd8776a4b3ecf36c2d593fdf75e85ac8fd1c0c3d598b3e4cd8dfabca0e51386980ee903861e39516a460e SHA512 d0847ba202064f339229b54102d482c6d2485e2e26cd3d55db4b08b6ae0cbce4e67305c68134caa1e8e48025592fb3a11e756d02617b810fd9c24165d10f0eb0
 MISC metadata.xml 844 BLAKE2B a3273855cb30dbb80eb72b6d0c1f37ab5a0b5a055f17f39ad805a8f3eb4bcfc27d4c46a9d4c05fa0c325234c2379d1c4763aecc6ff56bd6f7a8234b72bd2f8d6 SHA512 379322c3d4c8c6a471683c60b3700b4984872b3511b22ad3847c3a1cb71ff791f45b601e2ad1a7b9f72aa346b5f9e51d83c8e92694940c06357b1d22965f406c
diff --git a/net-p2p/resilio-sync/resilio-sync-2.6.3-r2.ebuild b/net-p2p/resilio-sync/resilio-sync-2.7.3.1381.ebuild
index 166fe8dcb1d0..4aad7886ab3c 100644
--- a/net-p2p/resilio-sync/resilio-sync-2.6.3-r2.ebuild
+++ b/net-p2p/resilio-sync/resilio-sync-2.7.3.1381.ebuild
@@ -1,37 +1,32 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit pax-utils readme.gentoo-r1 systemd tmpfiles unpacker
 
 QA_PREBUILT="usr/bin/rslsync"
-BASE_URI="http://download-cdn.resilio.com/${PV}/Debian/${PN}_${PV}-1_@arch@.deb"
+BASE_URI="https://download-cdn.resilio.com/${PV}/Debian/${PN}_${PV}-1_@arch@.deb"
 
 DESCRIPTION="Resilient, fast and scalable file synchronization tool"
-HOMEPAGE="https://resilio.com/"
-SRC_URI="
-	amd64? ( ${BASE_URI/@arch@/amd64} )
-	x86? ( ${BASE_URI/@arch@/i386} )
-"
-S="${WORKDIR}"
+HOMEPAGE="https://www.resilio.com"
+SRC_URI="amd64? ( ${BASE_URI/@arch@/amd64} )
+	arm? ( ${BASE_URI/@arch@/armhf} )
+	arm64? ( ${BASE_URI/@arch@/arm64} )
+	x86? ( ${BASE_URI/@arch@/i386} )"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE=""
 RESTRICT="bindist mirror"
 
-DEPEND="
-	acct-group/rslsync
+RDEPEND="acct-group/rslsync
 	acct-user/rslsync
-"
+	virtual/libcrypt:="
+DEPEND="${RDEPEND}"
 
-RDEPEND="
-	${DEPEND}
-	|| (
-		sys-libs/libxcrypt[compat]
-		sys-libs/glibc[crypt(+)]
-	)"
+S="${WORKDIR}"
 
 DOC_CONTENTS="You may need to review /etc/resilio-sync/config.json\\n
 Default metadata path is /var/lib/resilio-sync/.sync\\n
@@ -60,7 +55,7 @@ src_install() {
 	readme.gentoo_create_doc
 
 	# Generate sample config, uncomment config directives and change values
-	insopts -orslsync -grslsync -m0644
+	insopts -o rslsync -g rslsync -m 0644
 	insinto /etc/resilio-sync
 	newins - config.json < <("${ED}"/usr/bin/rslsync --dump-sample-config | \
 		sed \
@@ -70,8 +65,9 @@ src_install() {
 			-e "/pid_file/s|resilio/resilio|resilio-sync/resilio-sync|g" \
 			|| die "sed failed for config.json" )
 
-	diropts -orslsync -grslsync -m0700
-	keepdir /etc/resilio-sync /var/lib/resilio-sync/.sync /var/log/resilio-sync
+	diropts -o rslsync -g rslsync -m 0700
+	keepdir /etc/resilio-sync /var/lib/resilio-sync/ \
+		/var/lib/resilio-sync/.sync /var/log/resilio-sync
 }
 
 pkg_postinst() {
diff --git a/net-p2p/resilio-sync/resilio-sync-9999.ebuild b/net-p2p/resilio-sync/resilio-sync-9999.ebuild
new file mode 100644
index 000000000000..3026eaaee2b2
--- /dev/null
+++ b/net-p2p/resilio-sync/resilio-sync-9999.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit pax-utils readme.gentoo-r1 systemd tmpfiles
+
+QA_PREBUILT="usr/bin/rslsync"
+BASE_URI="https://download-cdn.resilio.com/stable/linux-@arch@/${PN}_@arch@.tar.gz"
+
+DESCRIPTION="Resilient, fast and scalable file synchronization tool"
+HOMEPAGE="https://www.resilio.com"
+SRC_URI="amd64? ( ${BASE_URI//@arch@/x64} )
+	arm? ( ${BASE_URI//@arch@/armhf} )
+	arm64? ( ${BASE_URI//@arch@/arm64} )
+	x86? ( ${BASE_URI//@arch@/i386} )"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="bindist mirror"
+
+RDEPEND="acct-group/rslsync
+	acct-user/rslsync
+	virtual/libcrypt:="
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"
+
+DOC_CONTENTS="You may need to review /etc/resilio-sync/config.json\\n
+Default metadata path is /var/lib/resilio-sync/.sync\\n
+Default web-gui URL is http://localhost:8888/\\n\\n"
+
+src_install() {
+	dobin rslsync
+	pax-mark m "${ED}"/usr/bin/rslsync
+
+	newinitd "${FILESDIR}"/resilio-sync.initd resilio-sync
+	newconfd "${FILESDIR}"/resilio-sync.confd resilio-sync
+	newinitd "${FILESDIR}"/resilio-sync-user.initd resilio-sync-user
+	newconfd "${FILESDIR}"/resilio-sync-user.confd resilio-sync-user
+	systemd_dounit "${FILESDIR}"/resilio-sync.service
+	systemd_douserunit "${FILESDIR}"/resilio-sync-user.service
+	newtmpfiles "${FILESDIR}"/resilio-sync.tmpfile resilio-sync.conf
+
+	readme.gentoo_create_doc
+
+	# Generate sample config, uncomment config directives and change values
+	insopts -o rslsync -g rslsync -m 0644
+	insinto /etc/resilio-sync
+	newins - config.json < <("${ED}"/usr/bin/rslsync --dump-sample-config | \
+		sed \
+			-e "/storage_path/s|//| |g" \
+			-e "/pid_file/s|//| |g" \
+			-e "/storage_path/s|/home/user/.sync|/var/lib/resilio-sync/.sync|g" \
+			-e "/pid_file/s|resilio/resilio|resilio-sync/resilio-sync|g" \
+			|| die "sed failed for config.json" )
+
+	diropts -o rslsync -g rslsync -m 0700
+	keepdir /etc/resilio-sync /var/lib/resilio-sync/ \
+		/var/lib/resilio-sync/.sync /var/log/resilio-sync
+}
+
+pkg_postinst() {
+	tmpfiles_process resilio-sync.conf
+	readme.gentoo_print_elog
+}