1 |
commit: 96e2f80b4d68ea5e3b55dc1bb2389ea680765f5b |
2 |
Author: Vladimir Pavljuchenkov (SpiderX) <spiderx <AT> spiderx <DOT> dp <DOT> ua> |
3 |
AuthorDate: Tue May 1 19:53:09 2018 +0000 |
4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat May 5 01:36:56 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96e2f80b |
7 |
|
8 |
net-p2p/resilio-sync: wrt #652730 |
9 |
|
10 |
1. Removed mistyped colon from initscript |
11 |
2. Added keepdir for directory with logs |
12 |
3. Regenerated manifest (#652730) |
13 |
|
14 |
Closes: https://bugs.gentoo.org/652730 |
15 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
16 |
Closes: https://github.com/gentoo/gentoo/pull/8234 |
17 |
|
18 |
net-p2p/resilio-sync/Manifest | 4 +- |
19 |
net-p2p/resilio-sync/files/resilio-sync.initd | 2 +- |
20 |
net-p2p/resilio-sync/resilio-sync-2.5.12.ebuild | 52 ++++++++++++------------- |
21 |
3 files changed, 29 insertions(+), 29 deletions(-) |
22 |
|
23 |
diff --git a/net-p2p/resilio-sync/Manifest b/net-p2p/resilio-sync/Manifest |
24 |
index 6e35938ad7c..5f5375975bd 100644 |
25 |
--- a/net-p2p/resilio-sync/Manifest |
26 |
+++ b/net-p2p/resilio-sync/Manifest |
27 |
@@ -1,2 +1,2 @@ |
28 |
-DIST resilio-sync_2.5.12-1_amd64.deb 10467196 BLAKE2B e900ac4e8b3862b29674db09d469013a5d12791c090bfd6ecae8f95af6f8ff2f990b8b9cab176b301b7625d6fcee1fcbe33b497f09bca045497a6765ccbb313c SHA512 4056df3d2cbafdb881f1d2929fca13efd258fb7af2cbdc390eae4820af1f5b2b46d410daf2a1ad1233d105edc46c4d5a8e9259e4557c0695b3392884429d95f9 |
29 |
-DIST resilio-sync_2.5.12-1_i386.deb 10333948 BLAKE2B 7a7a6e2bf8375bf5428c27053c22de98e598de07d8709f870152a8b9e2d7254a954b3ceebad69bebf286ef29b3d44b9955f33c4f396a7831041c34b9bd585dd2 SHA512 c15276bbe8818e30cab254a7b1f1222e3a25912d99a05287441548ea3ee3de8964d23a5aed56fd547ee3369f9943129cf7d3a5bd410ce28a9fbd45e13def56b4 |
30 |
+DIST resilio-sync_2.5.12-1_amd64.deb 10466894 BLAKE2B d9125bfe49738db3a2cab0d66cad9fed2ae712ee613ccd104bc1d8764bd072b082f71fc0102b15d52f791b592d88ffa4f03892e7e4088e3bf4a847b6c15b4296 SHA512 bafc8dbce182253d585185e5d0a27f0a8ca18f768bba65c348752cc089e0e690c8c1848a71cb1b125c67d2c265cbbf13e98d7c99289b0bb0268d43d3e38454d3 |
31 |
+DIST resilio-sync_2.5.12-1_i386.deb 10334238 BLAKE2B 447baf18db1f6c47a6a2518f9ba6a27b0d9a7092cc41d63958a66be6492cab3868a0ecae9faadfa91cfc5f777e1289cb62017519a0994b93ae448042de9b32d3 SHA512 bb46498070f6aa0e3debee839f50a9292116bd5f9105fe75c65d11f9f3199e6e5b8f828b34b364e7f3cb896bf88fd37a255289c68158df7414acf809e4701b32 |
32 |
|
33 |
diff --git a/net-p2p/resilio-sync/files/resilio-sync.initd b/net-p2p/resilio-sync/files/resilio-sync.initd |
34 |
index b9f0380a773..3e64f108e18 100644 |
35 |
--- a/net-p2p/resilio-sync/files/resilio-sync.initd |
36 |
+++ b/net-p2p/resilio-sync/files/resilio-sync.initd |
37 |
@@ -5,7 +5,7 @@ |
38 |
command="/usr/bin/rslsync" |
39 |
name="Resilio Sync" |
40 |
description="Resilio Sync" |
41 |
-command_user="${USER:-rslsync}::${GROUP:-rslsync}" |
42 |
+command_user="${USER:-rslsync}:${GROUP:-rslsync}" |
43 |
pidfile="/run/resilio-sync/resilio-sync.pid" |
44 |
config=${CONFIG:-/etc/resilio-sync/config.json} |
45 |
command_args="--config $config ${OPTS}" |
46 |
|
47 |
diff --git a/net-p2p/resilio-sync/resilio-sync-2.5.12.ebuild b/net-p2p/resilio-sync/resilio-sync-2.5.12.ebuild |
48 |
index 908b87b2209..33a5201ff21 100644 |
49 |
--- a/net-p2p/resilio-sync/resilio-sync-2.5.12.ebuild |
50 |
+++ b/net-p2p/resilio-sync/resilio-sync-2.5.12.ebuild |
51 |
@@ -23,53 +23,53 @@ RESTRICT="mirror" |
52 |
|
53 |
S="${WORKDIR}" |
54 |
|
55 |
-DOC_CONTENTS="You may need to review /etc/${PN}/config.json\n |
56 |
-Default metadata path is /var/lib/${PN}/.sync\n |
57 |
-Default web-gui URL is http://localhost:8888/\n\n" |
58 |
+DOC_CONTENTS="You may need to review /etc/${PN}/config.json\\n |
59 |
+Default metadata path is /var/lib/${PN}/.sync\\n |
60 |
+Default web-gui URL is http://localhost:8888/\\n\\n" |
61 |
|
62 |
pkg_setup() { |
63 |
- enewgroup ${NAME} |
64 |
- enewuser ${NAME} -1 -1 /var/lib/${PN} ${NAME} |
65 |
+ enewgroup "${NAME}" |
66 |
+ enewuser "${NAME}" -1 -1 /var/lib/"${PN}" "${NAME}" |
67 |
} |
68 |
|
69 |
src_unpack() { |
70 |
unpacker_src_unpack |
71 |
|
72 |
- unpack usr/share/man/man1/${PN}.1.gz |
73 |
+ unpack usr/share/man/man1/"${PN}".1.gz |
74 |
} |
75 |
|
76 |
src_install() { |
77 |
- dobin usr/bin/${NAME} |
78 |
- use pax_kernel && pax-mark m "${ED%/}"/usr/bin/${NAME} |
79 |
- |
80 |
- doman ${PN}.1 |
81 |
- |
82 |
- dodir /var/log/${PN} |
83 |
- keepdir /etc/${PN} /var/lib/${PN}/ /var/lib/${PN}/.sync |
84 |
- fperms 0700 /etc/${PN} /var/lib/${PN} /var/lib/${PN}/.sync /var/log/${PN} |
85 |
- fowners -R ${NAME}:${NAME} /etc/${PN} /var/lib/${PN} /var/log/${PN} |
86 |
- |
87 |
- newinitd "${FILESDIR}"/${PN}.initd ${PN} |
88 |
- newconfd "${FILESDIR}"/${PN}.confd ${PN} |
89 |
- newinitd "${FILESDIR}"/${PN}-user.initd ${PN}-user |
90 |
- newconfd "${FILESDIR}"/${PN}-user.confd ${PN}-user |
91 |
- systemd_dounit "${FILESDIR}"/${PN}.service |
92 |
- systemd_douserunit "${FILESDIR}"/${PN}-user.service |
93 |
+ dobin usr/bin/"${NAME}" |
94 |
+ use pax_kernel && pax-mark m "${ED%/}"/usr/bin/"${NAME}" |
95 |
+ |
96 |
+ doman "${PN}".1 |
97 |
+ |
98 |
+ dodir /var/log/"${PN}" |
99 |
+ keepdir /etc/"${PN}" /var/lib/"${PN}"/ /var/lib/"${PN}"/.sync /var/log/"${PN}" |
100 |
+ fperms 0700 /etc/"${PN}" /var/lib/"${PN}" /var/lib/"${PN}"/.sync /var/log/"${PN}" |
101 |
+ fowners -R "${NAME}":"${NAME}" /etc/"${PN}" /var/lib/"${PN}" /var/log/"${PN}" |
102 |
+ |
103 |
+ newinitd "${FILESDIR}"/"${PN}".initd "${PN}" |
104 |
+ newconfd "${FILESDIR}"/"${PN}".confd "${PN}" |
105 |
+ newinitd "${FILESDIR}"/"${PN}"-user.initd "${PN}"-user |
106 |
+ newconfd "${FILESDIR}"/"${PN}"-user.confd "${PN}"-user |
107 |
+ systemd_dounit "${FILESDIR}"/"${PN}".service |
108 |
+ systemd_douserunit "${FILESDIR}"/"${PN}"-user.service |
109 |
newtmpfiles "${FILESDIR}"/resilio-sync.tmpfile resilio-sync.conf |
110 |
|
111 |
readme.gentoo_create_doc |
112 |
|
113 |
# Generate sample config |
114 |
- "${ED%/}"/usr/bin/${NAME} --dump-sample-config > \ |
115 |
- "${ED%/}"/etc/${PN}/config.json || die "generate config failed" |
116 |
- fowners ${NAME}:${NAME} /etc/${PN}/config.json |
117 |
+ "${ED%/}"/usr/bin/"${NAME}" --dump-sample-config > \ |
118 |
+ "${ED%/}"/etc/"${PN}"/config.json || die "generate config failed" |
119 |
+ fowners "${NAME}":"${NAME}" /etc/"${PN}"/config.json |
120 |
# Uncomment config directives and change their values |
121 |
sed -i \ |
122 |
-e "/storage_path/s|//| |g" \ |
123 |
-e "/pid_file/s|//| |g" \ |
124 |
-e "/storage_path/s|/home/user/.sync|/var/lib/${PN}/.sync|g" \ |
125 |
-e "/pid_file/s|resilio/resilio|${PN}/${PN}|g" \ |
126 |
- "${ED%/}"/etc/${PN}/config.json || die "sed failed for config.json" |
127 |
+ "${ED%/}"/etc/"${PN}"/config.json || die "sed failed for config.json" |
128 |
} |
129 |
|
130 |
pkg_postinst() { |