1 |
commit: 189c652cb4e3d30f777cd685a3dcba0dd4e6310c |
2 |
Author: Andrew Savchenko <bircoph <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun May 1 15:06:23 2016 +0000 |
4 |
Commit: Andrew Savchenko <bircoph <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun May 1 15:06:23 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/dev/bircoph.git/commit/?id=189c652c |
7 |
|
8 |
app-admin/clsync: sync with tree |
9 |
|
10 |
- backport fixes |
11 |
- GLEP 67 update |
12 |
|
13 |
Package-Manager: portage-2.2.28 |
14 |
Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org> |
15 |
|
16 |
app-admin/clsync/ChangeLog | 159 ------------------------------------ |
17 |
app-admin/clsync/Manifest | 6 -- |
18 |
app-admin/clsync/clsync-9999.ebuild | 6 +- |
19 |
app-admin/clsync/files/clsync.initd | 2 +- |
20 |
app-admin/clsync/metadata.xml | 34 ++++---- |
21 |
5 files changed, 22 insertions(+), 185 deletions(-) |
22 |
|
23 |
diff --git a/app-admin/clsync/ChangeLog b/app-admin/clsync/ChangeLog |
24 |
deleted file mode 100644 |
25 |
index 0f4fd77..0000000 |
26 |
--- a/app-admin/clsync/ChangeLog |
27 |
+++ /dev/null |
28 |
@@ -1,159 +0,0 @@ |
29 |
-# ChangeLog for app-admin/clsync |
30 |
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
31 |
-# $Header: $ |
32 |
- |
33 |
- 25 May 2015; Andrew Savchenko <bircoph@g.o> -clsync-0.4.1.ebuild: |
34 |
- Version 0.4.1 is in the tree now |
35 |
- |
36 |
- 24 May 2015; Andrew Savchenko <bircoph@g.o> clsync-0.4.1.ebuild, |
37 |
- -files/clsync-0.4.1-capabilities.patch, |
38 |
- -files/clsync-0.4.1-check-exec-arguments.patch, |
39 |
- -files/clsync-0.4.1-splitting.patch: |
40 |
- Apply bundled tarball of upstream fixes. |
41 |
- |
42 |
- 19 May 2015; Andrew Savchenko <bircoph@g.o> clsync-9999.ebuild, |
43 |
- +files/clsync-0.4.1-capabilities.patch, |
44 |
- +files/clsync-0.4.1-check-exec-arguments.patch, |
45 |
- +files/clsync-0.4.1-splitting.patch: |
46 |
- Version bump (0.4.1 testing) |
47 |
- |
48 |
- 11 Feb 2015; Andrew Savchenko <bircoph@g.o> -clsync-0.2.1.ebuild, |
49 |
- -clsync-0.3.ebuild, -clsync-0.4-r1.ebuild, clsync-9999.ebuild, |
50 |
- -files/clsync-0.4-direct_mode.patch, -files/clsync-0.4-gio.patch, |
51 |
- -files/clsync-0.4-handler_path.patch, -files/clsync-0.4-hl_locks.patch, |
52 |
- -files/clsync-0.4-unset_env.patch, -files/clsync-0.4-unshare-configure.patch, |
53 |
- -files/clsync-0.4-unshare-ifdef.patch, -files/clsync-0.4-unused-deps.patch, |
54 |
- -files/clsync-0.4-version.patch, -files/clsync.conf-2, -files/clsync.initd-2, |
55 |
- files/clsync.conf, files/clsync.initd, metadata.xml: |
56 |
- Releases are now in portage, keep live ebuild only. |
57 |
- |
58 |
- 10 Feb 2015; Andrew Savchenko <bircoph@g.o> clsync-0.4-r1.ebuild, |
59 |
- +files/clsync-0.4-unused-deps.patch: |
60 |
- Port unused-depes patch from current HEAD. |
61 |
- |
62 |
- 10 Feb 2015; Andrew Savchenko <bircoph@g.o> clsync-9999.ebuild: |
63 |
- Adapt new chaneges |
64 |
- |
65 |
- 28 Jan 2015; Andrew Savchenko <bircoph@g.o> metadata.xml: |
66 |
- capabilities are fully implemented now |
67 |
- |
68 |
- 28 Jan 2015; Andrew Savchenko <bircoph@g.o> clsync-0.4-r1.ebuild, |
69 |
- clsync-9999.ebuild: |
70 |
- Remove libcap dep: kernel interface is used now. |
71 |
- |
72 |
- 28 Jan 2015; Andrew Savchenko <bircoph@g.o> |
73 |
- +files/clsync-0.4-unset_env.patch: |
74 |
- Add missed patch |
75 |
- |
76 |
-*clsync-0.4-r1 (28 Jan 2015) |
77 |
- |
78 |
- 28 Jan 2015; Andrew Savchenko <bircoph@g.o> -clsync-0.4.ebuild, |
79 |
- +clsync-0.4-r1.ebuild, +files/clsync-0.4-direct_mode.patch, |
80 |
- +files/clsync-0.4-handler_path.patch, +files/clsync-0.4-hl_locks.patch: |
81 |
- Add upstream patches: |
82 |
- - fix highload locks segfault on unicore systems; |
83 |
- - support handlers without absolute path; |
84 |
- - fix direct mode root directory change passing; |
85 |
- - fix segfault on unset $HOME. |
86 |
- |
87 |
- 28 Jan 2015; Andrew Savchenko <bircoph@g.o> clsync-0.4.ebuild, |
88 |
- clsync-9999.ebuild: |
89 |
- Fix build with USE=gio |
90 |
- |
91 |
- 28 Jan 2015; Andrew Savchenko <bircoph@g.o> clsync-0.4.ebuild, |
92 |
- +files/clsync-0.4-gio.patch, +files/clsync-0.4-version.patch: |
93 |
- Fix GIO only build. Update version. |
94 |
- |
95 |
- 28 Jan 2015; Andrew Savchenko <bircoph@g.o> clsync-0.4.ebuild, |
96 |
- clsync-9999.ebuild: |
97 |
- Require at least one FS handler to be enabled. |
98 |
- |
99 |
- 27 Jan 2015; Andrew Savchenko <bircoph@g.o> metadata.xml: |
100 |
- Update gio USE flag description. |
101 |
- |
102 |
- 27 Jan 2015; Andrew Savchenko <bircoph@g.o> clsync-0.4.ebuild, |
103 |
- clsync-9999.ebuild: |
104 |
- Remove empty variables |
105 |
- |
106 |
-*clsync-0.4 (27 Jan 2015) |
107 |
- |
108 |
- 27 Jan 2015; Andrew Savchenko <bircoph@g.o> +clsync-0.4.ebuild, |
109 |
- clsync-9999.ebuild, +files/clsync-0.4-unshare-configure.patch, |
110 |
- +files/clsync-0.4-unshare-ifdef.patch, metadata.xml: |
111 |
- Version bump. |
112 |
- |
113 |
-*clsync-0.3 (15 May 2014) |
114 |
- |
115 |
- 15 May 2014; Andrew Savchenko <bircoph@×××××.com> clsync-0.2.1.ebuild, |
116 |
- +clsync-0.3.ebuild, clsync-9999.ebuild, files/clsync.conf-2, |
117 |
- files/clsync.initd-2, files/clsync.conf, files/clsync.confd, |
118 |
- files/clsync.initd, metadata.xml: |
119 |
- Version bump. Now package.use.mask is used for flags in |
120 |
- development. |
121 |
- |
122 |
-*clsync-0.2.1 (15 Oct 2013) |
123 |
- |
124 |
- 15 Oct 2013; Andrew Savchenko <bircoph@×××××.com> -clsync-0.1.ebuild, |
125 |
- -files/clsync-0.1.confd, -files/clsync-0.1.initd, +clsync-0.2.1.ebuild: |
126 |
- Version bump. Remove old. |
127 |
- |
128 |
- 27 Sep 2013; Andrew Savchenko <bircoph@×××××.com> files/clsync.initd: |
129 |
- Remove tread killer hack, because bug #44 was fixed. |
130 |
- |
131 |
- 21 Sep 2013; Andrew Savchenko <bircoph@×××××.com> files/clsync.initd: |
132 |
- Terminate clsync offsprings which are still alive after clsync |
133 |
- termination. clsync send signals to its childs, but not to further |
134 |
- offsprings (grandchildren and so on), so this offsprings may not |
135 |
- die properly in childs doesn't handle this. Thus sophisticated |
136 |
- measures are required for cleanup. |
137 |
- |
138 |
- 20 Sep 2013; Andrew Savchenko <bircoph@×××××.com> clsync-9999.ebuild, |
139 |
- files/clsync.confd, files/clsync.initd: |
140 |
- Depend mhash on clsync. Inform users about multiplexed init script. |
141 |
- Update options names. Add nice, ionice and retry support. |
142 |
- |
143 |
- 16 Sep 2013; Andrew Savchenko <bircoph@×××××.com> clsync-9999.ebuild, |
144 |
- +files/clsync-0.1.confd, +files/clsync-0.1.initd, +files/clsync.conf, |
145 |
- files/clsync.confd, files/clsync.initd: |
146 |
- Add config file support. For v0.1 use old init.d/conf.d because |
147 |
- v0.1 doesn't support config files. |
148 |
- |
149 |
- 13 Sep 2013; Andrew Savchenko <bircoph@×××××.com> files/clsync.initd: |
150 |
- Remove non-standard retry approach, this bug is fixed now. |
151 |
- Add syslog support. |
152 |
- |
153 |
- 09 Sep 2013; Andrew Savchenko <bircoph@×××××.com> clsync-9999.ebuild: |
154 |
- Force 0700 permissions or /etc/clsync. License update. Conf.d |
155 |
- recommendations update. |
156 |
- |
157 |
-*clsync-0.1 (07 Sep 2013) |
158 |
- |
159 |
- 07 Sep 2013; Andrew Savchenko <bircoph@×××××.com> +clsync-0.1.ebuild, |
160 |
- clsync-9999.ebuild, +files/clsync.confd, +files/clsync.initd, metadata.xml: |
161 |
- Version bump for 0.1 release. Add capabilities support. Install |
162 |
- init script and conf file. Keep config directory: rules are |
163 |
- supposed to be here. Add rsync hinting information. |
164 |
- |
165 |
- 26 Aug 2013; Andrew Savchenko <bircoph@×××××.com> clsync-9999.ebuild, |
166 |
- metadata.xml: |
167 |
- Add mhash and clustering support. |
168 |
- |
169 |
- 21 Aug 2013; Andrew Savchenko <bircoph@×××××.com> clsync-9999.ebuild: |
170 |
- Fix typo if docs path. |
171 |
- |
172 |
- 21 Aug 2013; Andrew Savchenko <bircoph@×××××.com> clsync-9999.ebuild, |
173 |
- metadata.xml: |
174 |
- Use new features of clsync build system. Utilize all flags. |
175 |
- |
176 |
- 21 Aug 2013; Andrew Savchenko <bircoph@×××××.com> -clsync-0.0.ebuild, |
177 |
- clsync-9999.ebuild: |
178 |
- Base autotools version. Installation and flags control bugs are |
179 |
- still to be fixed in clsync itself. |
180 |
- |
181 |
- 20 Aug 2013; Andrew Savchenko <bircoph@×××××.com> -clsync-0.0.ebuild, |
182 |
- clsync-9999.ebuild: |
183 |
- Fix html and examples installation. Remove buggy v0.0. |
184 |
- |
185 |
- 20 Aug 2013; Andrew Savchenko <bircoph@×××××.com> ChangeLog: |
186 |
- Initial ebuild. |
187 |
- |
188 |
|
189 |
diff --git a/app-admin/clsync/Manifest b/app-admin/clsync/Manifest |
190 |
deleted file mode 100644 |
191 |
index 1b3d407..0000000 |
192 |
--- a/app-admin/clsync/Manifest |
193 |
+++ /dev/null |
194 |
@@ -1,6 +0,0 @@ |
195 |
-AUX clsync.conf 589 SHA256 1a8689b86cf9475ef72ef42a623a1bb1ae55abff31578dcfdf3537331c681815 SHA512 46d8d786378eed0bfa46195e45f764015258ba55b35a5acf2685967e9fbd1fc7656c6aeba26b06889fa2f7c62cb11ecb84b10b856356ea3c0d463eaa4980c33d WHIRLPOOL cd9a0800b75eab476d7feec079f23538295dca5067f979ce4280c3188b9a24adf7c78e0c2ec5e2e8cadd71d11be181d873bc462d9fe321ada85e4e11690272db |
196 |
-AUX clsync.confd 645 SHA256 ae7e9cacf618f9a32a4a1580580a901831aaaa0abb9de9e0379fbcc6a7359b0d SHA512 75dcc49d51f6da94d42eb501f1ad2868f163405dd7aa933f4c8078ec18f5b54eb6c66ff796ee744f7751699162627af843edbe5de5adf99c23712cedaebaddc5 WHIRLPOOL 06289c7645430d10b242983daa9cd2d4c2f327b34ede308012354947c64c654a7864586743ae6de7c02770a8b1c22de04b63404a6431b317b328ac6ac1e121ce |
197 |
-AUX clsync.initd 573 SHA256 1f3306dfeb4c8d8260551ed0edebe842452de2a2b7e85d07aa0fe46b88f10414 SHA512 c944388d5e61cfba73d462d457dbdcfef42c4bfc6f9ba814eea592dd630d64309e8e2b4af1cb621a41151613f28ab4508cc7d26d44def0b5a01938742cfbdd2e WHIRLPOOL c824fd5ed8e45afcd5df737dfea7645fc3460e42c5ab0512c4c462fc646f789e81597fb460126412f2347e0cb9468339b1874a697b65a40a3ff278625241f460 |
198 |
-EBUILD clsync-9999.ebuild 2900 SHA256 c242932a47ef051f86fccf4e7b553f5ba0eee03ac35fc533b4fe8d6c6a8d159a SHA512 40a9a1668eb6b2b7b764c737914487e308fea312b2fb28a0162f69998fa5f8605c5538ef9511fcd16b9a1ccba81b25d6de4cb2f27ccb94c38824a8a21836e80b WHIRLPOOL 6ce58efa5aed48578b576485dbc651186dc9400965924ca3f096ba91d5f85f8c3bd4757e4e1b395f70a13c5da1358b58fdf97421643e8867089d4570f8e85849 |
199 |
-MISC ChangeLog 6372 SHA256 c29f45e0970b8f494b3984e447564fba06b721413fa263689b98f1c1d595f60f SHA512 b8fd4c46c76d92621e332fd402981ab87e3fe2ad77a6ca0d6c92f15f2ff43466bccb1afc153d2aa5aee37006d19a50aaadae03f1903efb554194b552a945154e WHIRLPOOL 9ad79840a4b411491e7cb3aacb8e63e1a4bc61c904f44fce3fb7969ba968c74e8702994fa1c9487f8c3e404fec15b0d264bfabb39c172bf4ebf7926c44e5dd4d |
200 |
-MISC metadata.xml 1692 SHA256 ca7310d5bf9634ab1a9306bd90f9b756b1c5dcd01a3d12bc7983c42af5567499 SHA512 0a83cc81b23213b9dd6c69310de8aea050140f8b398b18eac1157bdfb1394512c0b291b35c324686ebf7716ee0816e0ad92cd7176d2cb1a8cf363950ad93ece6 WHIRLPOOL 395bf8817d1341b2d21cf98fe2205952bd6009bed4847be478787109b8da60db24b675f36fb294bce5300005087a22b62cf7c3c0912a646ea67ffee92457eeb2 |
201 |
|
202 |
diff --git a/app-admin/clsync/clsync-9999.ebuild b/app-admin/clsync/clsync-9999.ebuild |
203 |
index 4816a25..617fed4 100644 |
204 |
--- a/app-admin/clsync/clsync-9999.ebuild |
205 |
+++ b/app-admin/clsync/clsync-9999.ebuild |
206 |
@@ -1,6 +1,6 @@ |
207 |
-# Copyright 1999-2015 Gentoo Foundation |
208 |
+# Copyright 1999-2016 Gentoo Foundation |
209 |
# Distributed under the terms of the GNU General Public License v2 |
210 |
-# $Header: $ |
211 |
+# $Id$ |
212 |
|
213 |
EAPI=5 |
214 |
|
215 |
@@ -29,7 +29,7 @@ REQUIRED_USE=" |
216 |
mhash? ( cluster ) |
217 |
seccomp? ( caps ) |
218 |
" |
219 |
-RDEPEND=" |
220 |
+CDEPEND=" |
221 |
dev-libs/glib:2 |
222 |
cgroups? ( dev-libs/libcgroup ) |
223 |
mhash? ( app-crypt/mhash ) |
224 |
|
225 |
diff --git a/app-admin/clsync/files/clsync.initd b/app-admin/clsync/files/clsync.initd |
226 |
index e37e9db..d350f3d 100644 |
227 |
--- a/app-admin/clsync/files/clsync.initd |
228 |
+++ b/app-admin/clsync/files/clsync.initd |
229 |
@@ -1,7 +1,7 @@ |
230 |
#!/sbin/runscript |
231 |
# Copyright 1999-2015 Gentoo Foundation |
232 |
# Distributed under the terms of the GNU General Public License v2 |
233 |
-# $Header: $ |
234 |
+# $Id$ |
235 |
|
236 |
[[ -n "${CLSYNC_CONF}" ]] && conffile="--config-file ${CLSYNC_CONF}" |
237 |
[[ -n "${CLSYNC_NICE}" ]] && cmd_nice="--nice ${CLSYNC_NICE}" |
238 |
|
239 |
diff --git a/app-admin/clsync/metadata.xml b/app-admin/clsync/metadata.xml |
240 |
index a88923a..9cbe60e 100644 |
241 |
--- a/app-admin/clsync/metadata.xml |
242 |
+++ b/app-admin/clsync/metadata.xml |
243 |
@@ -1,11 +1,11 @@ |
244 |
<?xml version="1.0" encoding="UTF-8"?> |
245 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
246 |
<pkgmetadata> |
247 |
-<maintainer> |
248 |
- <email>bircoph@g.o</email> |
249 |
- <name>Andrew Savchenko</name> |
250 |
-</maintainer> |
251 |
-<longdescription> |
252 |
+ <maintainer type="person"> |
253 |
+ <email>bircoph@g.o</email> |
254 |
+ <name>Andrew Savchenko</name> |
255 |
+ </maintainer> |
256 |
+ <longdescription> |
257 |
Clsync recursively watches for source directory and executes external |
258 |
program to sync the changes. Clsync is adapted to be used together with rsync. |
259 |
This utility is much more lightweight than competitors and supports such |
260 |
@@ -14,15 +14,17 @@ |
261 |
syncing. Clsync can use advanced features for isolation: capabilities, cgroups, |
262 |
namespaces, seccomp, code hardening. |
263 |
</longdescription> |
264 |
-<use> |
265 |
- <flag name="cluster">Enable clustering support (allows master-master clsync on multiple hosts). Not fully implemented yet.</flag> |
266 |
- <flag name="control-socket">Enable AF_UNIX control socket support.</flag> |
267 |
- <flag name="cgroups">Use cgroups to limit /dev access.</flag> |
268 |
- <flag name="extra-debug">Enable extra debugging. This will hurt performance badly. Be ready for tons of output.</flag> |
269 |
- <flag name="extra-hardened">Enable extra security checks. This will hurt performance.</flag> |
270 |
- <flag name="gio">Enable GIO for FS monitoring (glib based alternative to inotify interface, not recommended; if both are compiled, may be selected at runtime).</flag> |
271 |
- <flag name="highload-locks">Allows to use spinlocks for short delays instead of mutexes, but only on SMP systems.</flag> |
272 |
- <flag name="namespaces">Enable namespaces isolation.</flag> |
273 |
- <flag name="seccomp">Enable seccomp for system call filtering.</flag> |
274 |
-</use> |
275 |
+ <use> |
276 |
+ <flag name="cluster">Enable clustering support (allows master-master clsync on multiple hosts). Not fully implemented yet.</flag> |
277 |
+ <flag name="control-socket">Enable AF_UNIX control socket support.</flag> |
278 |
+ <flag name="cgroups">Use cgroups to limit /dev access.</flag> |
279 |
+ <flag name="extra-debug">Enable extra debugging. This will hurt performance badly. Be ready for tons of output.</flag> |
280 |
+ <flag name="extra-hardened">Enable extra security checks. This will hurt performance.</flag> |
281 |
+ <flag name="gio">Enable GIO for FS monitoring (glib based alternative to inotify interface, not recommended; if both are compiled, may be selected at runtime).</flag> |
282 |
+ <flag name="highload-locks">Allows to use spinlocks for short delays instead of mutexes, but only on SMP systems.</flag> |
283 |
+ <flag name="namespaces">Enable namespaces isolation.</flag> |
284 |
+ </use> |
285 |
+ <upstream> |
286 |
+ <remote-id type="github">xaionaro/clsync</remote-id> |
287 |
+ </upstream> |
288 |
</pkgmetadata> |