net-p2p/resilio-sync: wrt #652730

1. Removed mistyped colon from initscript
2. Added keepdir for directory with logs
3. Regenerated manifest (#652730)

Closes: https://bugs.gentoo.org/652730
Package-Manager: Portage-2.3.24, Repoman-2.3.6
Closes: https://github.com/gentoo/gentoo/pull/8234

diff --git a/net-p2p/resilio-sync/Manifest b/net-p2p/resilio-sync/Manifest
index 6e35938ad7c13fa8ce8af6a012ba740bad9a54c2..5f5375975bd6ba753a5931037118004655261003 100644 (file)
--- a/net-p2p/resilio-sync/Manifest
+++ b/net-p2p/resilio-sync/Manifest
@@ -1,2 +1,2 @@
-DIST resilio-sync_2.5.12-1_amd64.deb 10467196 BLAKE2B e900ac4e8b3862b29674db09d469013a5d12791c090bfd6ecae8f95af6f8ff2f990b8b9cab176b301b7625d6fcee1fcbe33b497f09bca045497a6765ccbb313c SHA512 4056df3d2cbafdb881f1d2929fca13efd258fb7af2cbdc390eae4820af1f5b2b46d410daf2a1ad1233d105edc46c4d5a8e9259e4557c0695b3392884429d95f9
-DIST resilio-sync_2.5.12-1_i386.deb 10333948 BLAKE2B 7a7a6e2bf8375bf5428c27053c22de98e598de07d8709f870152a8b9e2d7254a954b3ceebad69bebf286ef29b3d44b9955f33c4f396a7831041c34b9bd585dd2 SHA512 c15276bbe8818e30cab254a7b1f1222e3a25912d99a05287441548ea3ee3de8964d23a5aed56fd547ee3369f9943129cf7d3a5bd410ce28a9fbd45e13def56b4
+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

diff --git a/net-p2p/resilio-sync/files/resilio-sync.initd b/net-p2p/resilio-sync/files/resilio-sync.initd
index b9f0380a773a36ff3643e1431aa0b107d8dbeb7d..3e64f108e18ace8d419c3f904f18fc36e154115a 100644 (file)
--- a/net-p2p/resilio-sync/files/resilio-sync.initd
+++ b/net-p2p/resilio-sync/files/resilio-sync.initd
@@ -5,7 +5,7 @@
 command="/usr/bin/rslsync"
 name="Resilio Sync"
 description="Resilio Sync"
-command_user="${USER:-rslsync}::${GROUP:-rslsync}"
+command_user="${USER:-rslsync}:${GROUP:-rslsync}"
 pidfile="/run/resilio-sync/resilio-sync.pid"
 config=${CONFIG:-/etc/resilio-sync/config.json}
 command_args="--config $config ${OPTS}"

diff --git a/net-p2p/resilio-sync/resilio-sync-2.5.12.ebuild b/net-p2p/resilio-sync/resilio-sync-2.5.12.ebuild
index 908b87b2209d6e32cd2f1a53c7ac7ad5b5be29dc..33a5201ff2192cf8fe148ebab9d77003011c82c5 100644 (file)
--- a/net-p2p/resilio-sync/resilio-sync-2.5.12.ebuild
+++ b/net-p2p/resilio-sync/resilio-sync-2.5.12.ebuild
@@ -23,53 +23,53 @@ RESTRICT="mirror"
 
 S="${WORKDIR}"
 
-DOC_CONTENTS="You may need to review /etc/${PN}/config.json\n
-Default metadata path is /var/lib/${PN}/.sync\n
-Default web-gui URL is http://localhost:8888/\n\n"
+DOC_CONTENTS="You may need to review /etc/${PN}/config.json\\n
+Default metadata path is /var/lib/${PN}/.sync\\n
+Default web-gui URL is http://localhost:8888/\\n\\n"
 
 pkg_setup() {
-       enewgroup ${NAME}
-       enewuser ${NAME} -1 -1 /var/lib/${PN} ${NAME}
+       enewgroup "${NAME}"
+       enewuser "${NAME}" -1 -1 /var/lib/"${PN}" "${NAME}"
 }
 
 src_unpack() {
        unpacker_src_unpack
 
-       unpack usr/share/man/man1/${PN}.1.gz
+       unpack usr/share/man/man1/"${PN}".1.gz
 }
 
 src_install() {
-       dobin usr/bin/${NAME}
-       use pax_kernel && pax-mark m "${ED%/}"/usr/bin/${NAME}
-
-       doman ${PN}.1
-
-       dodir /var/log/${PN}
-       keepdir /etc/${PN} /var/lib/${PN}/ /var/lib/${PN}/.sync
-       fperms 0700 /etc/${PN} /var/lib/${PN} /var/lib/${PN}/.sync /var/log/${PN}
-       fowners -R ${NAME}:${NAME} /etc/${PN} /var/lib/${PN} /var/log/${PN}
-
-       newinitd "${FILESDIR}"/${PN}.initd ${PN}
-       newconfd "${FILESDIR}"/${PN}.confd ${PN}
-       newinitd "${FILESDIR}"/${PN}-user.initd ${PN}-user
-       newconfd "${FILESDIR}"/${PN}-user.confd ${PN}-user
-       systemd_dounit "${FILESDIR}"/${PN}.service
-       systemd_douserunit "${FILESDIR}"/${PN}-user.service
+       dobin usr/bin/"${NAME}"
+       use pax_kernel && pax-mark m "${ED%/}"/usr/bin/"${NAME}"
+
+       doman "${PN}".1
+
+       dodir /var/log/"${PN}"
+       keepdir /etc/"${PN}" /var/lib/"${PN}"/ /var/lib/"${PN}"/.sync /var/log/"${PN}"
+       fperms 0700 /etc/"${PN}" /var/lib/"${PN}" /var/lib/"${PN}"/.sync /var/log/"${PN}"
+       fowners -R "${NAME}":"${NAME}" /etc/"${PN}" /var/lib/"${PN}" /var/log/"${PN}"
+
+       newinitd "${FILESDIR}"/"${PN}".initd "${PN}"
+       newconfd "${FILESDIR}"/"${PN}".confd "${PN}"
+       newinitd "${FILESDIR}"/"${PN}"-user.initd "${PN}"-user
+       newconfd "${FILESDIR}"/"${PN}"-user.confd "${PN}"-user
+       systemd_dounit "${FILESDIR}"/"${PN}".service
+       systemd_douserunit "${FILESDIR}"/"${PN}"-user.service
        newtmpfiles "${FILESDIR}"/resilio-sync.tmpfile resilio-sync.conf
 
        readme.gentoo_create_doc
 
        # Generate sample config
-       "${ED%/}"/usr/bin/${NAME} --dump-sample-config > \
-               "${ED%/}"/etc/${PN}/config.json || die "generate config failed"
-       fowners ${NAME}:${NAME} /etc/${PN}/config.json
+       "${ED%/}"/usr/bin/"${NAME}" --dump-sample-config > \
+               "${ED%/}"/etc/"${PN}"/config.json || die "generate config failed"
+       fowners "${NAME}":"${NAME}" /etc/"${PN}"/config.json
        # Uncomment config directives and change their values
        sed -i \
                -e "/storage_path/s|//| |g" \
                -e "/pid_file/s|//| |g" \
                -e "/storage_path/s|/home/user/.sync|/var/lib/${PN}/.sync|g" \
                -e "/pid_file/s|resilio/resilio|${PN}/${PN}|g" \
-               "${ED%/}"/etc/${PN}/config.json || die "sed failed for config.json"
+               "${ED%/}"/etc/"${PN}"/config.json || die "sed failed for config.json"
 }
 
 pkg_postinst() {