gentoo resync : 22.10.2018

8 files changed, 98 insertions, 20 deletions

diff --git a/net-p2p/resilio-sync/Manifest b/net-p2p/resilio-sync/Manifest
index 245e10157002..64603a841ab1 100644
--- a/net-p2p/resilio-sync/Manifest
+++ b/net-p2p/resilio-sync/Manifest
@@ -1,11 +1,14 @@
 AUX resilio-sync-user.confd 299 BLAKE2B 0e534911629f22010329ae441140649cff373d102d7191f057b7e72d5217bdb335457271b780ca5f4d3b3ca989a8c33d9d796491ac15347a5bdfa08b9cf6c7b5 SHA512 a156516938e5b69199c8a0de8d62ff969b8a938e5a2fd2983c0ecfc080682b1a5abeb21cf8193fc9f96954fa2a9658519e37758d6812b21971026af9b7be54ce
-AUX resilio-sync-user.initd 768 BLAKE2B b4dd9bab04ac242e258b5fd8412a2292f515535caf2845f2b2795584666924725c2c34684d6a6dfe50677b2ecc86e18a7a2c801467f8d352767138aa986f4aab SHA512 a46d90b7f85fc0d5ec88bded35cef42e105cbf8df1f65032dc79bada56ac8c50d42206fea0c5fa6cb82c4ee56eaa27f2059d283501d84ba90503b3ac6a9f9ef5
-AUX resilio-sync-user.service 324 BLAKE2B 5cec927346956c5219470021fdc73bf2be5486499e917453fd5fad94717e4ad6fc5467948b11b551b5f4cdc94d6ffbfbbd4a65fe21e62a4831f610437b92574c SHA512 95621e4df7de0f26da8c057432302a98927db47b4bf9484efe00cb0649020099050feba22a107b01e4c3998ff7d05edb77bdd1ba1f8899839c92984725427504
-AUX resilio-sync.confd 296 BLAKE2B c7fef752df5dcd4e903ebef2bc6da2780c9f19f5f690c505b8abd493081a1bc18a9ae18bba1700df15467786b2c50ca5b12e60cf1eef70a4169d7fc7e17a7897 SHA512 5db62947a34c3c5cedec1b4902b8291bfc46c10490f355ed1612a0f37854f3927d3e4550d1a920cd567a4a69403a80b3dd4150c8bd38906123be6542cd35459f
-AUX resilio-sync.initd 469 BLAKE2B 60002b8baa5889b82ac489aa8c29a9e814453c22ec08f81faea33527f18666350276b9cfadbe10324170eb97dcd9a7bef8048a6559e29fea6466718780edabd0 SHA512 930bb80ea365957c8336e744445ed3c74c4af166588447fcd502879bd9aed6851366a5897d199e4695972114b5247f4028e7463bc6a1e94ac5f4ff890c3c0802
-AUX resilio-sync.service 380 BLAKE2B bab5ea03b7f0db9845a29334f56839dec68fe1d8caf32015445b5b039389f87f729367748f839667b0eb933f95d4389e7c4e0481fb70fd1936b416eacc897a50 SHA512 af50f438111808426f6d80b7bfc77daf665e583540485831c7f51300e3f4768316d0cac2712d9564f1ffcccd7cfe21c48e3c72ba595776057038c230bb3cbdd8
+AUX resilio-sync-user.initd 767 BLAKE2B 24c55213c266eaa7d3a09dbac300dbe8b19fcc71c2eee10102ef0ea6f96b40408614b8d942d91a5863e0bf5d00e72f4262db354a16591c303145723aed2fc020 SHA512 6fc154a6c9e1a8b5978ca414ef338bd1ded30aa5e7f67929e16d934b89baffb2ecd9fda5c9e7f318493294a6846d3c5ff302155541eaf7f17eb2407358cf4c00
+AUX resilio-sync-user.service 324 BLAKE2B 992753f99df59d6def6c92400f7c2e76201b426ebe67437737444eb382cd3114159f910c72aa264abfdcd798dcf2a49555da600c5f4ec4f758d41258f0486f14 SHA512 973ec9326dd4b58ac76738a764f2d0cad5151176197a6aa9a2caf0c0cf88b5d76b69aa721971f9097ce4b61e681a657fad1c9013741cd5dd6679696f98d8fbf9
+AUX resilio-sync.confd 312 BLAKE2B eee3179791594a3af6176abc2eba5b2db3e0a14d602dd7ce44f141ba3005e0e441b94f504567eb42af1074b069bbe24c7f009ab87008005ff8fae1ee79b19dff SHA512 721e7e1afa121e6cf214ada1c3ff7f7ab1ed4d355fbb9e5adddfa073ef554c5912c5254fbda85fd4e2b8332df6a60468aa73ab4aa4779fed43a243cdb097f087
+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.5.12-1_amd64.deb 10466894 BLAKE2B d9125bfe49738db3a2cab0d66cad9fed2ae712ee613ccd104bc1d8764bd072b082f71fc0102b15d52f791b592d88ffa4f03892e7e4088e3bf4a847b6c15b4296 SHA512 bafc8dbce182253d585185e5d0a27f0a8ca18f768bba65c348752cc089e0e690c8c1848a71cb1b125c67d2c265cbbf13e98d7c99289b0bb0268d43d3e38454d3
 DIST resilio-sync_2.5.12-1_i386.deb 10334238 BLAKE2B 447baf18db1f6c47a6a2518f9ba6a27b0d9a7092cc41d63958a66be6492cab3868a0ecae9faadfa91cfc5f777e1289cb62017519a0994b93ae448042de9b32d3 SHA512 bb46498070f6aa0e3debee839f50a9292116bd5f9105fe75c65d11f9f3199e6e5b8f828b34b364e7f3cb896bf88fd37a255289c68158df7414acf809e4701b32
+DIST resilio-sync_2.6.1-1_amd64.deb 11576892 BLAKE2B 710bd96b91be84bc7210d8efe0d8954a33be878fc948694e7a1c62e7b53b5ac94133a16b89c4872e18798bc03f3508c7c130d4d56a3480c35d30edff5589ef3a SHA512 a37d73a621a740f57b4f2824cc2a3178f365ccc8180a0e814480dde8d1b74b9d54da4e07bd18c89cc6a93c12b526f8a43e08165d3c2f0fdc913e1f38e46eb183
+DIST resilio-sync_2.6.1-1_i386.deb 11465194 BLAKE2B b56e01f79c5beec6a5ebd09724bebd1ce8c6d44eac694cd7fb89dc44823ccba22531b14e241fdd985ae63e6e0f177021becb593923eac8ac0183629e533ac72d SHA512 84676c3fe5fcee484bcd58c6496aba0d2e3c86c339adb90b8b3cef28ae46d7b6f28c5fd0371a2cfe612ab8b3658eca2b9b2f6cfc9caa70aaff95946942a5c749
 EBUILD resilio-sync-2.5.12.ebuild 2349 BLAKE2B 3299319dec3fc935935c327a35a663307830a6d3ecb0caa1d9b4668385cfaf197796d9cb26b894eb784244f72ad9ff1eb4e4f92a751f33a5d18cc0ac75736d7b SHA512 8f8507ef0676b1265845201d3df6c4eb6b29b9d1a744967ab84414424c3edda4a805386898b6e9960eb56139ff7c04312f7bcc60c156242f6ba631b70f8bf628
-MISC metadata.xml 889 BLAKE2B e1ace94f1fe08c07df2825107b7f73a028894f551c5fb9a6a5986ee0fcecb29204ec19a87231153cdb16de672178eec045fabf01923bf16cb6c0307a024bdeca SHA512 cafa6e1e9a127ddc8ae14b5d52502caf5a297cb397e0770c3e7ef0bd810c4b12c197061ab1429a549054ab8c9674c9ef9d29639825f4f899892d57de41a21707
+EBUILD resilio-sync-2.6.1.ebuild 2229 BLAKE2B d23975c7f37c48b79e94e0a30fbabd14fa715beadce66b9afe2f2c83d35a698afa2e4d20c4552197099b9575e68f55a4f3043d5e0936093d67aee8cfa6c56a4e SHA512 dc85455bd1943f99a664dfea988d8899a18db51c4fc5e349eea8211773487afa5d0326f918177a8a14dbccc171c442ca325fb19a6455f0c24664ae79e9c4745d
+MISC metadata.xml 889 BLAKE2B e6e81874032bbb5ae212b3894f04cb1dbcefae1bf87dd94f86e16a5e6547cfa4e17c1db9214bfe9d2da35c86011501776ee1ed0e0327a8aa607db39ddac2595a SHA512 0943a2d2215dbe2534622e3f90edf51b340613294d9b0b2ed2594b4223c7a26a8c1d054e7d90d957874e204f7fe32cf5d6f00d43e16164d618e193ac86a96b4c
diff --git a/net-p2p/resilio-sync/files/resilio-sync-user.initd b/net-p2p/resilio-sync/files/resilio-sync-user.initd
index efcaa2d7778c..6772f6dc14d9 100644
--- a/net-p2p/resilio-sync/files/resilio-sync-user.initd
+++ b/net-p2p/resilio-sync/files/resilio-sync-user.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 USER="${RC_SVCNAME##*.}"
@@ -8,7 +8,7 @@ name="Resilio Sync for $USER"
 description="Resilio Sync"
 command_user="${USER:-rslsync}:${GROUP:-rslsync}"
 pidfile="${PIDFILE:-/home/$USER/.config/resilio-sync/resilio-sync.pid}"
-config=${CONFIG:-/home/$USER/.config/resilio-sync/config.json}
+config="${CONFIG:-/home/$USER/.config/resilio-sync/config.json}"
 command_args="--config $config ${OPTS}"
 start_stop_daemon_args="-q"
 retry="10"
diff --git a/net-p2p/resilio-sync/files/resilio-sync-user.service b/net-p2p/resilio-sync/files/resilio-sync-user.service
index 6c82440ac679..bb57c738b6d5 100644
--- a/net-p2p/resilio-sync/files/resilio-sync-user.service
+++ b/net-p2p/resilio-sync/files/resilio-sync-user.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Resilio Sync service
-Documentation=http://help.getsync.com/
+Documentation=https://help.resilio.com
 After=network.target network-online.target
 
 [Service]
diff --git a/net-p2p/resilio-sync/files/resilio-sync.confd b/net-p2p/resilio-sync/files/resilio-sync.confd
index 08c4255fe296..7d8e9ea27cff 100644
--- a/net-p2p/resilio-sync/files/resilio-sync.confd
+++ b/net-p2p/resilio-sync/files/resilio-sync.confd
@@ -5,8 +5,8 @@
 OPTS="--log /var/log/resilio-sync/resilio-sync.log"
 
 # User and group daemon runs as
-USER="rslsync"
-GROUP="rslsync"
+RSLSYNC_USER="rslsync"
+RSLSYNC_GROUP="rslsync"
 
 # Resilio Sync config file
 #CONFIG="/etc/resilio-sync/config.json"
diff --git a/net-p2p/resilio-sync/files/resilio-sync.initd b/net-p2p/resilio-sync/files/resilio-sync.initd
index 3e64f108e18a..8a7263446a5f 100644
--- a/net-p2p/resilio-sync/files/resilio-sync.initd
+++ b/net-p2p/resilio-sync/files/resilio-sync.initd
@@ -1,18 +1,17 @@
 #!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 command="/usr/bin/rslsync"
 name="Resilio Sync"
 description="Resilio Sync"
-command_user="${USER:-rslsync}:${GROUP:-rslsync}"
+command_user="${RSLSYNC_USER:-rslsync}:${RSLSYNC_GROUP:-rslsync}"
 pidfile="/run/resilio-sync/resilio-sync.pid"
-config=${CONFIG:-/etc/resilio-sync/config.json}
+config="${CONFIG:-/etc/resilio-sync/config.json}"
 command_args="--config $config ${OPTS}"
 start_stop_daemon_args="-q"
 retry="10"
 
 depend() {
 	need net
-	provide resilio-sync
 }
diff --git a/net-p2p/resilio-sync/files/resilio-sync.service b/net-p2p/resilio-sync/files/resilio-sync.service
index 32f24a95aa84..1f1a0b95bc72 100644
--- a/net-p2p/resilio-sync/files/resilio-sync.service
+++ b/net-p2p/resilio-sync/files/resilio-sync.service
@@ -1,15 +1,17 @@
 [Unit]
 Description=Resilio Sync service
-Documentation=http://help.getsync.com/
+Documentation=https://help.resilio.com
 After=network.target network-online.target
 
 [Service]
 Type=forking
-User=rslsync
-Group=rslsync
 UMask=0002
 Restart=on-failure
 PermissionsStartOnly=true
+
+User=rslsync
+Group=rslsync
+
 PIDFile=/var/run/resilio-sync/resilio-sync.pid
 ExecStart=/usr/bin/rslsync --config /etc/resilio-sync/config.json
 
diff --git a/net-p2p/resilio-sync/metadata.xml b/net-p2p/resilio-sync/metadata.xml
index 35827ed4235b..1e9a6697329a 100644
--- a/net-p2p/resilio-sync/metadata.xml
+++ b/net-p2p/resilio-sync/metadata.xml
@@ -18,7 +18,7 @@
 		<flag name="pax_kernel">Use paxctl to mark binaries</flag>
 	</use>
 	<upstream>
-		<doc>https://help.getsync.com/</doc>
-		<bugs-to>https://help.getsync.com/hc/en-us/requests/new?ticket_form_id=91563</bugs-to>
+		<doc>https://help.resilio.com/</doc>
+		<bugs-to>https://help.resilio.com/hc/en-us/requests/new?ticket_form_id=91563</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/net-p2p/resilio-sync/resilio-sync-2.6.1.ebuild b/net-p2p/resilio-sync/resilio-sync-2.6.1.ebuild
new file mode 100644
index 000000000000..f4738e0d4d9a
--- /dev/null
+++ b/net-p2p/resilio-sync/resilio-sync-2.6.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit pax-utils readme.gentoo-r1 systemd tmpfiles unpacker user
+
+QA_PREBUILT="usr/bin/rslsync"
+BASE_URI="http://linux-packages.resilio.com/${PN}/deb/pool/non-free/r/${PN}/${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} )"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pax_kernel"
+RESTRICT="bindist mirror"
+
+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"
+
+pkg_setup() {
+	enewgroup rslsync
+	enewuser rslsync -1 -1 /var/lib/resilio-sync rslsync
+}
+
+src_unpack() {
+	unpacker_src_unpack
+
+	unpack usr/share/man/man1/resilio-sync.1.gz
+}
+
+src_install() {
+	dobin usr/bin/rslsync
+	use pax_kernel && pax-mark m "${ED%/}"/usr/bin/rslsync
+
+	doman resilio-sync.1
+
+	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 -orslsync -grslsync -m0644
+	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 -orslsync -grslsync -m0700
+	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
+}