version bump net-p2p/resilio-sync-2.7.0

net-p2p/resilio-sync/Manifest

@@ -1,6 +1,10 @@
-AUX confd 335 BLAKE2B b68038d40b457046c6fc0bf7d44433b2e8e8fd4b024a4352fd13bd00e60becbb029cfb685c6427e14d835cafce34e081fa9090950d42215ad3352a76a0450847 SHA512 39c616821ad8f43d7fa992bf68dbdc8f6ff315c15f4ed4f6ea73f49d0eb8b0aa39cf5a14ed633ab879df793431afefcd17d4c4def8592bf69bc114073653e8d8
+AUX resilio-sync-user.confd 299 BLAKE2B 0e534911629f22010329ae441140649cff373d102d7191f057b7e72d5217bdb335457271b780ca5f4d3b3ca989a8c33d9d796491ac15347a5bdfa08b9cf6c7b5 SHA512 a156516938e5b69199c8a0de8d62ff969b8a938e5a2fd2983c0ecfc080682b1a5abeb21cf8193fc9f96954fa2a9658519e37758d6812b21971026af9b7be54ce
-AUX initd 794 BLAKE2B 530049d6ce0659026fe0c18a75d73f27ffb9b2eac8f1b170ae2a7497c1430164420072eff0769cf974d63e9d6a6e1856d02ace9c0dc18291bbb8c45347f20fc5 SHA512 0ade9ede1819b5c3cfd47d7ccab1296743b281fde63f566e44f439cc670048b055ecb898f115462f59a0b07b348772266967e852692589bb6e758d40df172db1
+AUX resilio-sync-user.initd 767 BLAKE2B 24c55213c266eaa7d3a09dbac300dbe8b19fcc71c2eee10102ef0ea6f96b40408614b8d942d91a5863e0bf5d00e72f4262db354a16591c303145723aed2fc020 SHA512 6fc154a6c9e1a8b5978ca414ef338bd1ded30aa5e7f67929e16d934b89baffb2ecd9fda5c9e7f318493294a6846d3c5ff302155541eaf7f17eb2407358cf4c00
-DIST resilio-sync_arm-2.6.4.tar.gz 12201041 BLAKE2B 02bcce2843561efbfb5176bc08180f16f7f866e3c71430c94b5d6af83e6bacd0c5dc73a287b0ade94f7495935212f6c665e5dfddfb3cb56939baaebc1fe10474 SHA512 a23287c1f312b4eb2a78062774ba994e8085c460135e0f1572f44fc495af293768de7c0db16219b1f41aac15a778a1688bf7d3b76ff7734d6002babb970b0baf
+AUX resilio-sync-user.service 324 BLAKE2B 992753f99df59d6def6c92400f7c2e76201b426ebe67437737444eb382cd3114159f910c72aa264abfdcd798dcf2a49555da600c5f4ec4f758d41258f0486f14 SHA512 973ec9326dd4b58ac76738a764f2d0cad5151176197a6aa9a2caf0c0cf88b5d76b69aa721971f9097ce4b61e681a657fad1c9013741cd5dd6679696f98d8fbf9
-DIST resilio-sync_i386-2.6.4.tar.gz 13292992 BLAKE2B c5492bfd84b2cf1f64f32b30f868d0e24a26e370563b6c5ed0e8ff0579cbc86a13b4bdc4bfc69be013f5c4b5206bd2a74b67f2231043b54ca26e6afbb1859987 SHA512 96a6418ef74ff4429f409de69d94c035800b29180a9f55a9e2140e0d61c5143200a1d63a20547a746a4f13973e27cf057576aa33c16099f9a4f26d32545352cf
+AUX resilio-sync.confd 312 BLAKE2B eee3179791594a3af6176abc2eba5b2db3e0a14d602dd7ce44f141ba3005e0e441b94f504567eb42af1074b069bbe24c7f009ab87008005ff8fae1ee79b19dff SHA512 721e7e1afa121e6cf214ada1c3ff7f7ab1ed4d355fbb9e5adddfa073ef554c5912c5254fbda85fd4e2b8332df6a60468aa73ab4aa4779fed43a243cdb097f087
-DIST resilio-sync_x64-2.6.4.tar.gz 13323351 BLAKE2B 9ef28e2b9950e52c80e230df43015dc7f01c9ee8fd89560ac43afc5c26a260e9f4d90b83fad59b8ea0ad30029eb3982d7f02f2b03540e0fb719ec6dfedd1aa1d SHA512 074df97627423a59388496f984c152bde3b65b1aa6b8199ea70662cb9c2fceb00043c30a8d5dcce1bab1009a92373ff8f8ebfddff6663df8dc8ce1809caa97f6
+AUX resilio-sync.initd 462 BLAKE2B 775e1824d9b374bef32798bb05bb7fb2fd66ff1b859aa50d72dd02c80033bcf8b12275bf1e4d9eae2b2fdc1a1da7a1710c8e5ce1bd6da37427a4433967afb1bb SHA512 06cc963db70c969ca81a249c17c467fd4013a7cde39b37f65c934393e9e891776f247397b976f5caf20b6d29cee64865703bb2b3b78cd7a0e68be102db46a7fb
-EBUILD resilio-sync-2.6.4.ebuild 2010 BLAKE2B 25b413cedffc0262c1a2f5979f902970dc723e8d7d3e5d18263bf440706dc13af54813292320d7549d120a234544de10487e65339d1a62759979abcb250505b3 SHA512 4eb9edbbcc89fdd8c329209e710d332dfc5c0ae66e981d55985be99bf00b693cf461c993652a038d3d4c6d02506682f647e7db8921ba2d1aa92d8410a813b1d3
+AUX resilio-sync.service 382 BLAKE2B f61c181137d41aeb59c721688a2b208c16d985c0b74c32e556cf3cc5218a549c7f58da50dde584bfbfca88ce6a00f1ecbbd67e58af04e88774b3e648d4d8513e SHA512 c278b35ba0cc888beb7d4b75e5b5c5c0304ec89ba1ac0136713256d05e95896254504b58f9c3a0a534aa04aee5e36468b579b2e18397f0bfb3615527b82195db
+AUX resilio-sync.tmpfile 41 BLAKE2B fb3e9001a32e45cd230f4efef60509f20f52253ad575fb2b1493bae9846ad46210eed639c7a3f9e4a4fa7c901b42a9a7756f8583c204a4bb847e6eb96a2af323 SHA512 d9d54076785ce601023980e3fe5e2eab42e5eaf3b0bdb9caefe508e0d5fda8d32faf1338c6b901deb29488401de74228023016d72d7b0ec9db362b4c2d87edd2
+DIST resilio-sync_2.7.0.1366-1_amd64.deb 11788484 BLAKE2B f5def2072c1ab5bc99ebafc691b6cc1b6807dfcd61874196dab4ed6060484926e01121d498ccce570dfa63751397fcac10e7c88fe31d68f09043486ad2716cf5 SHA512 ba8ecad4bcaa04b87fb292b3055c451cf4d084635fad7f4bff804814c37155b93b1fdf0940bb94adefbd4089f265ddd4cd7979e2022d406b153218e603a28f3c
+DIST resilio-sync_2.7.0.1366-1_i386.deb 11890074 BLAKE2B 3767f5a4d402b2ac4a9db9befa75a9495ed7a5f5b74d23b512e80d191d29b0376c6f60e300dc88ccc1a3b19e637cff9e3562f2f9bad212efc3c85914df4ebb37 SHA512 ab55f2071b2128cbbf48430114fe6789e82d5217a977618bea33d89b459e3b0cb727181203f66c0774b34473d895e7fb72ee288780e37afa022ba071e1ab9b99
+EBUILD resilio-sync-2.7.0.1366.ebuild 2176 BLAKE2B 524b14c925436148b242fedaa6418662604111bf645940ac7c9d2ae437e66f638ac1e901d71a9ac723541c76f3147ec04687b25a2858138538b8656e6f1f88ed SHA512 cf548d4ce32aacd87da8fa89b93bc022f8412cfbfd0950f4124b36775516e962307e80645e7de8e2c28462d8dc1522a6ed98450adae95b400d49c1790250d708

net-p2p/resilio-sync/files/confd

@@ -1,12 +0,0 @@
-# conf.d file for resilio-sync
-
-# User and group daemon runs as
-SYNC_USER="rslsync"
-SYNC_GROUP="rslsync"
-
-NAME="Resilio Sync"
-SYNC_NAME="rslsync"
-SYNC_PATH="/opt/resilio-sync"
-SYNC_BINARY="${SYNC_PATH}/${SYNC_NAME}"
-SYNC_OPTS="--config /etc/resilio-sync/config --storage /var/rslsync"
-SYNC_PIDFILE="/run/resilio-sync/${SYNC_NAME}.pid"

net-p2p/resilio-sync/files/initd

@@ -1,41 +0,0 @@
-#!/sbin/openrc-run
-# Copyright (C) 2013-2014 Jonathan Vasquez <fearedbliss@funtoo.org>
-# Copyright (C) 2014 Sandy McArthur <Sandy@McArthur.org>
-# Distributed under the terms of the Simplified BSD License.
-
-depend() {
-	need localmount net
-	after bootmisc
-}
-
-start() {
-	ebegin "Starting ${NAME}"
-
-	mkdir -p $(dirname ${SYNC_PIDFILE})
-	chown ${SYNC_USER}:${SYNC_GROUP} $(dirname ${SYNC_PIDFILE})
-
-	start-stop-daemon \
-	   --start \
-	   --user "${SYNC_USER}" \
-	   --group "${SYNC_GROUP}" \
-	   --nice 5 \
-	   --ionice 3 \
-	   --exec "${SYNC_BINARY}" \
-	   -- ${SYNC_OPTS}
-
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${NAME}"
-
-	start-stop-daemon \
-	   --stop \
-	   --user "${SYNC_USER}" \
-	   --group "${SYNC_GROUP}" \
-	   --exec "${SYNC_BINARY}" \
-	   --wait 5000 \
-	   --retry SIGTERM/5 
-
-	eend $?
-}

net-p2p/resilio-sync/files/resilio-sync-user.confd

@@ -0,0 +1,12 @@
+# Config file for /etc/init.d/resilio-sync
+
+# Various options.
+# run `rslsync --help` for valid cmdline options
+#OPTS="--log /var/log/resilio-sync/resilio-sync.log"
+
+# User and group daemon runs as
+#USER="rslsync"
+#GROUP="rslsync"
+
+# Resilio Sync config file
+#CONFIG="/etc/resilio-sync/config.json"

net-p2p/resilio-sync/files/resilio-sync-user.initd

@@ -0,0 +1,27 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+USER="${RC_SVCNAME##*.}"
+command="/usr/bin/rslsync"
+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}"
+command_args="--config $config ${OPTS}"
+start_stop_daemon_args="-q"
+retry="10"
+
+depend() {
+	need net
+}
+
+start_pre() {
+	if [ "$USER" = "resilio-sync-user" ]; then
+		eerror "You are not supposed to run this script directly."
+		eerror "Create a symlink for this script:"
+		eerror "  ln -s $RC_SVCNAME /etc/init.d/$RC_SVCNAME.<user>"
+		return 1
+	fi
+}

net-p2p/resilio-sync/files/resilio-sync-user.service

@@ -0,0 +1,13 @@
+[Unit]
+Description=Resilio Sync service
+Documentation=https://help.resilio.com
+After=network.target network-online.target
+
+[Service]
+Type=forking
+Restart=on-failure
+PIDFile=%h/.config/resilio-sync/resilio-sync.pid
+ExecStart=/usr/bin/rslsync --config %h/.config/resilio-sync/config.json
+
+[Install]
+WantedBy=multi-user.target

net-p2p/resilio-sync/files/resilio-sync.confd

@@ -0,0 +1,12 @@
+# Config file for /etc/init.d/resilio-sync
+
+# Various options.
+# run `rslsync --help` for valid cmdline options
+OPTS="--log /var/log/resilio-sync/resilio-sync.log"
+
+# User and group daemon runs as
+RSLSYNC_USER="rslsync"
+RSLSYNC_GROUP="rslsync"
+
+# Resilio Sync config file
+#CONFIG="/etc/resilio-sync/config.json"

net-p2p/resilio-sync/files/resilio-sync.initd

@@ -0,0 +1,17 @@
+#!/sbin/openrc-run
+# 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="${RSLSYNC_USER:-rslsync}:${RSLSYNC_GROUP:-rslsync}"
+pidfile="/run/resilio-sync/resilio-sync.pid"
+config="${CONFIG:-/etc/resilio-sync/config.json}"
+command_args="--config $config ${OPTS}"
+start_stop_daemon_args="-q"
+retry="10"
+
+depend() {
+	need net
+}

net-p2p/resilio-sync/files/resilio-sync.service

@@ -0,0 +1,19 @@
+[Unit]
+Description=Resilio Sync service
+Documentation=https://help.resilio.com
+After=network.target network-online.target
+
+[Service]
+Type=forking
+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
+
+[Install]
+WantedBy=multi-user.target

net-p2p/resilio-sync/files/resilio-sync.tmpfile

@@ -0,0 +1 @@
+d	/run/resilio-sync	0755	rslsync	rslsync

net-p2p/resilio-sync/resilio-sync-2.6.4.ebuild

@@ -1,67 +0,0 @@
-# Copyright (C) 2013-2014 Jonathan Vasquez <fearedbliss@funtoo.org>
-# Copyright (C) 2014 Sandy McArthur <Sandy@McArthur.org>
-# Copyright (C) 2015 Scott Alfter <scott@alfter.us>
-# Copyright (C) 2016 Micha Glave <gentoo@migmedia.de>
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils user
-NAME="rslsync"
-DESCRIPTION="Magic folder style file syncing powered by BitTorrent."
-HOMEPAGE="http://www.getsync.com/"
-SRC_URI="
-	amd64?	( https://download-cdn.resilio.com/${PV}/linux-x64/${PN}_x64.tar.gz -> ${PN}_x64-${PV}.tar.gz )
-	x86?	( https://download-cdn.resilio.com/${PV}/linux-i386/${PN}_i386.tar.gz -> ${PN}_i386-${PV}.tar.gz )
-	arm?	( https://download-cdn.resilio.com/${PV}/linux-arm/${PN}_arm.tar.gz -> ${PN}_arm-${PV}.tar.gz )"
-
-RESTRICT="mirror strip"
-LICENSE="BitTorrent"
-SLOT="0"
-KEYWORDS="amd64 x86 arm"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-QA_PREBUILT="opt/${PN}/${NAME}"
-
-S="${WORKDIR}"
-
-pkg_setup() {
-	enewgroup ${NAME}
-	enewuser ${NAME} -1 -1 -1 "${NAME}"
-}
-
-src_install() {
-	einfo dodir "/opt/${PN}"
-	dodir "/opt/${PN}"
-	exeinto "/opt/${PN}"
-	doexe ${NAME}
-	insinto "/opt/${PN}"
-	doins LICENSE.TXT
-
-	newinitd "${FILESDIR}/initd" ${NAME}
-	newconfd "${FILESDIR}/confd" ${NAME}
-
-	einfo dodir "/etc/${PN}"
-	dodir "/etc/${PN}"
-	"${D}/opt/${PN}/${NAME}" --dump-sample-config > "${D}/etc/${PN}/config"
-	fowners ${NAME} "/etc/${PN}/config"
-	fperms 460 "/etc/${PN}/config"
-}
-
-pkg_preinst() {
-	# Customize for local machine
-	sed -i 's|// "pid_file".*$|   "pid_file" : "/run/resilio-sync/rslsync.pid",|' "${D}/etc/${PN}/config"
-	# Set device name to `hostname`
-	sed -i "s/My Sync Device/$(hostname) Gentoo Linux/"  "${D}/etc/${PN}/config"
-	# Update defaults to the ${NAME}'s home dir
-	sed -i "s|/home/user|$(egethome ${NAME})|"  "${D}/etc/${PN}/config"
-}
-
-pkg_postinst() {
-	elog "Init scripts launch ${NAME} daemon as ${NAME}:${NAME} "
-	elog "Please review/tweak /etc/${PN}/config for default configuration."
-	elog "Default web-gui URL is http://localhost:8888/ ."
-}

net-p2p/resilio-sync/resilio-sync-2.7.0.1366.ebuild

@@ -0,0 +1,74 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pax-utils readme.gentoo-r1 systemd tmpfiles unpacker user
+
+QA_PREBUILT="usr/bin/rslsync"
+BASE_URI="http://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} )"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+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
+	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
+}