commit: 72688a6d5b29591d506bbaaf826742fa07f6f947
Author: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
AuthorDate: Sun May 24 16:54:31 2015 +0000
Commit: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Sun May 24 16:54:31 2015 +0000
URL: https://gitweb.gentoo.org/dev/bircoph.git/commit/?id=72688a6d
Add UI fixes and extra-debugging support.
app-admin/clsync/Manifest | 10 +++++-----
app-admin/clsync/clsync-0.4.1.ebuild | 19 +++++++++++++------
app-admin/clsync/clsync-9999.ebuild | 17 ++++++++++++-----
app-admin/clsync/metadata.xml | 1 +
4 files changed, 31 insertions(+), 16 deletions(-)
diff --git a/app-admin/clsync/Manifest b/app-admin/clsync/Manifest
index df5c912..a58aeae 100644
--- a/app-admin/clsync/Manifest
+++ b/app-admin/clsync/Manifest
@@ -1,9 +1,9 @@
AUX clsync.conf 589 SHA256
1a8689b86cf9475ef72ef42a623a1bb1ae55abff31578dcfdf3537331c681815 SHA512
46d8d786378eed0bfa46195e45f764015258ba55b35a5acf2685967e9fbd1fc7656c6aeba26b06889fa2f7c62cb11ecb84b10b856356ea3c0d463eaa4980c33d
WHIRLPOOL
cd9a0800b75eab476d7feec079f23538295dca5067f979ce4280c3188b9a24adf7c78e0c2ec5e2e8cadd71d11be181d873bc462d9fe321ada85e4e11690272db
AUX clsync.confd 645 SHA256
ae7e9cacf618f9a32a4a1580580a901831aaaa0abb9de9e0379fbcc6a7359b0d SHA512
75dcc49d51f6da94d42eb501f1ad2868f163405dd7aa933f4c8078ec18f5b54eb6c66ff796ee744f7751699162627af843edbe5de5adf99c23712cedaebaddc5
WHIRLPOOL
06289c7645430d10b242983daa9cd2d4c2f327b34ede308012354947c64c654a7864586743ae6de7c02770a8b1c22de04b63404a6431b317b328ac6ac1e121ce
AUX clsync.initd 573 SHA256
1f3306dfeb4c8d8260551ed0edebe842452de2a2b7e85d07aa0fe46b88f10414 SHA512
c944388d5e61cfba73d462d457dbdcfef42c4bfc6f9ba814eea592dd630d64309e8e2b4af1cb621a41151613f28ab4508cc7d26d44def0b5a01938742cfbdd2e
WHIRLPOOL
c824fd5ed8e45afcd5df737dfea7645fc3460e42c5ab0512c4c462fc646f789e81597fb460126412f2347e0cb9468339b1874a697b65a40a3ff278625241f460
-DIST clsync-0.4.1-20150524.patch.xz 13216 SHA256
330897d477e37388eb574ba48261e2e7c470f72d4f63cdeed55da43f240bbe71 SHA512
6fd816f1b4864a04ab390f1949c0bdf6e4e61d81fbbe7a0b7899b2e1d71a68559fc1db5c865ec214ab6cf1bc705e40afa03a490e7029684e731e9a9a9c4ddb3d
WHIRLPOOL
4e30cd44933dedb5f4bf99e5fe8623a840c19bdcd53f9bf240144ba81cbb6068c77bf1d662d89ae1c6d13266480ccfc8499946370ad973e7c42d40e0c8435d81
+DIST clsync-0.4.1-20150524-v2.patch.xz 13632 SHA256
90a1ef820c83629c528e8c6fe4da5183caf60f8079c4de01a6d26945734c92f7 SHA512
d39c3c4f116eff2365668374ef62f4dfd8e5926267cbbf36b430f97ad5306f92cf6be3164c0e1c3d959db55453f5ded00d98d48af62f9eacde39a9f9667cfbf9
WHIRLPOOL
d22fc6a1f0a59514506377f26ab7d9c0f4faca0abab044f2ce2e61ffa973ff04b43da561a4dd5c69d99e21108baa71d77bb2ea524313661b3b2440ceddca56aa
DIST clsync-0.4.1.tar.gz 253890 SHA256
3f14a72d7c3c1747ea908e373f25bd1918ce00450492fbb7094549db6bf21e27 SHA512
875280f706026d44806b92c22fa58d016136b2792f67a6b7e77f932465081da7a1ebaf22c25e538e4b58bfe04cd1cd5450ecab99c3df53ddd2a0fa966442d444
WHIRLPOOL
10ab11821766f7d16d03993069ac4da5fe362a1e5977ea6721e49ada7044d3659e59b507b03be4de09609b0a0ca9d7878407d7b6e1f40df5dbe1d041dac373cb
-EBUILD clsync-0.4.1.ebuild 2911 SHA256
3fc1d6d73109990a96a9be3bd9c341ac05383f35c154505aac38f56033fe4c12 SHA512
27fe999bc9a96ea28e0108b6cab4a705f274809e93f5e4dd1c8af47567853bf0cd7da320176aab1e5640ce413a6cebfa0a95847b2e8a29abbaa9295c1d565980
WHIRLPOOL
92221be2fd460f325c5fd424e7051d6831414acd37452672d2c358a361958b888fceba4698c43f5f1d1d74f6918eed124808c6943bce13e028ac474c3474d35f
-EBUILD clsync-9999.ebuild 2751 SHA256
3d1ced06980c5693db5b137e49d63df18b980810e0cf672eeb13de28467be6bd SHA512
b091afffbb922e588df5eabc99a8bb6ca1ff3874068699b97a7e6062017fa871812f991a31132e330091362c83d6f1ddb0f410929d4010339a855497d28fa8b8
WHIRLPOOL
035211cf315a0924c38fec39895b66bd9cddbbd3d80ec6da3a4e90a466199cbb29fb006a46de61fb0bb749a6f555d272a009eb11455c17aa14d042fac4c66b1b
-MISC ChangeLog 6261 SHA256
f439ec51bef7c7132c299a29253ef8470f5fc4f9ea99f0e9e54a9ce697e4e3df SHA512
b270e0c79a27cfbabb365373e3287f560365565531d0b30ea8b55407730649668832c7551d2d3a3c04b7bceee6dae6b31f7d1bd8b12b2ba04f0e06edfc63b009
WHIRLPOOL
3e967953e0b57213cc9911a3bb0686ddff7e40683b298b9a985627e20f73b21bc8ca120f4431c3025cb3b45ff8aa43a49706db4439f2c5dc5a1293622808dc27
-MISC metadata.xml 1572 SHA256
6d90b9c0f0b37dffda05a9b5ca6d02f05ce0362eb8bf8fbe19e90c3f77570940 SHA512
5be148bc1f8b1ca76e2b5713bf5a9ecfc88c4c101620fbbf1cb4efcbe7b33a923038ea0c2d5b2d66689552a04b865c4b0625887baa98a80d64f486208143ce67
WHIRLPOOL
e1cd84b85b5ac476407930f14217cfed16f67d3aeb221e61dffa94c688b69ada4f29f7a7e9f4f2b610f8730c10d700bff9148d6b871ca9d98e76eaa0c5de68c8
+EBUILD clsync-0.4.1.ebuild 3063 SHA256
162a9d53a43a113494c56216a391928c9953ac55719f9fa2f63b459f862bb81a SHA512
9db373511211ae9a2cda1c79081327248e556eb824d4d420030efd463443b1b16ac187b8c04a48108bf989857abd4a9f37789c95edacf88c241868de7645df7d
WHIRLPOOL
7e6878488329109111acc1419f20aa19bc7527432b5e1388efb38ec21de08abfd7a8c63d938aab0fe8593a91aba66cde4a1b24c17ee7f26bc8169c3db3445c36
+EBUILD clsync-9999.ebuild 2900 SHA256
c242932a47ef051f86fccf4e7b553f5ba0eee03ac35fc533b4fe8d6c6a8d159a SHA512
40a9a1668eb6b2b7b764c737914487e308fea312b2fb28a0162f69998fa5f8605c5538ef9511fcd16b9a1ccba81b25d6de4cb2f27ccb94c38824a8a21836e80b
WHIRLPOOL
6ce58efa5aed48578b576485dbc651186dc9400965924ca3f096ba91d5f85f8c3bd4757e4e1b395f70a13c5da1358b58fdf97421643e8867089d4570f8e85849
+MISC ChangeLog 6012 SHA256
672c45533b851157cb9980aa0cb241fb2afc073ed1657edd99f140a7ed314aa3 SHA512
d0dd82d93686ac2ebd60153b95d617e66b06ba2b361dd04d6b438b22dc9765e6e9bbbc39063200c0bef2dddaf9ca905aa8f2afe8b4da947e1079e81cb349cdcd
WHIRLPOOL
0929582207753a13ed733c136ccce5eff853ed39aa53de1e060803de32cb046dfe0c4b9dd6b2f2f948ca25237fcdf6088509c12f849acc6dabeea075cff1d187
+MISC metadata.xml 1689 SHA256
bc8fa17f23dd0779d14433c04c2bffa4aade46e976ed6dc9864f322e4f1251d6 SHA512
f3f95a879416f4c46f40278a5e12a038809e0b5a4434d4fc1205e0161ee74f60e07312f72575206422a1fb70b54fb31284d48c546cf99e2896ca893bf64bd8de
WHIRLPOOL
f4f94d86482008480f527ae57c13c40e832234ef26b7e5d33ed6bc650832209e399841a292816e1b0446830ae4e8bd67e5e78461b981cf2c56161c999e08f82f
diff --git a/app-admin/clsync/clsync-0.4.1.ebuild
b/app-admin/clsync/clsync-0.4.1.ebuild
index 6dd6ec4..1d3772e 100644
--- a/app-admin/clsync/clsync-0.4.1.ebuild
+++ b/app-admin/clsync/clsync-0.4.1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/xaionaro/${PN}.git";
else
- PVER="20150524"
+ PVER="20150524-v2"
SRC_URI="
https://github.com/xaionaro/${PN}/archive/v${PV}.tar.gz ->
${P}.tar.gz
http://dev.gentoo.org/~bircoph/patches/${P}-${PVER}.patch.xz
@@ -22,14 +22,17 @@ DESCRIPTION="Live sync tool based on inotify, written in
GNU C"
HOMEPAGE="https://github.com/xaionaro/clsync http://ut.mephi.ru/oss/clsync";
LICENSE="GPL-3+"
SLOT="0"
-IUSE="+caps cluster control-socket cgroups debug extra-hardened
-gio hardened +highload-locks +inotify mhash namespaces seccomp"
+IUSE="+caps cluster control-socket cgroups debug extra-debug
+extra-hardened gio hardened +highload-locks +inotify mhash
+namespaces seccomp"
REQUIRED_USE="
|| ( gio inotify )
+ extra-debug? ( debug )
extra-hardened? ( hardened )
- mhash? ( cluster )"
-
+ mhash? ( cluster )
+ seccomp? ( caps )
+"
RDEPEND="
dev-libs/glib:2
cgroups? ( dev-libs/libcgroup )
@@ -59,17 +62,21 @@ src_configure() {
use hardened && harden_level=1
use extra-hardened && harden_level=2
+ local debug_level=0
+ use debug && debug_level=1
+ use extra-debug && debug_level=2
+
econf \
--docdir="${EPREFIX}/usr/share/doc/${PF}" \
--disable-socket-library \
--enable-clsync \
+ --enable-debug=${debug_level} \
--enable-paranoid=${harden_level} \
--without-bsm \
--without-kqueue \
$(use_enable caps capabilities) \
$(use_enable cluster) \
$(use_enable control-socket socket) \
- $(use_enable debug) \
$(use_enable highload-locks) \
$(use_enable namespaces unshare) \
$(use_enable seccomp) \
diff --git a/app-admin/clsync/clsync-9999.ebuild
b/app-admin/clsync/clsync-9999.ebuild
index 5ba6875..4816a25 100644
--- a/app-admin/clsync/clsync-9999.ebuild
+++ b/app-admin/clsync/clsync-9999.ebuild
@@ -18,14 +18,17 @@ DESCRIPTION="Live sync tool based on inotify, written in
GNU C"
HOMEPAGE="https://github.com/xaionaro/clsync http://ut.mephi.ru/oss/clsync";
LICENSE="GPL-3+"
SLOT="0"
-IUSE="+caps cluster control-socket cgroups debug extra-hardened
-gio hardened +highload-locks +inotify mhash namespaces seccomp"
+IUSE="+caps cluster control-socket cgroups debug extra-debug
+extra-hardened gio hardened +highload-locks +inotify mhash
+namespaces seccomp"
REQUIRED_USE="
|| ( gio inotify )
+ extra-debug? ( debug )
extra-hardened? ( hardened )
- mhash? ( cluster )"
-
+ mhash? ( cluster )
+ seccomp? ( caps )
+"
RDEPEND="
dev-libs/glib:2
cgroups? ( dev-libs/libcgroup )
@@ -53,17 +56,21 @@ src_configure() {
use hardened && harden_level=1
use extra-hardened && harden_level=2
+ local debug_level=0
+ use debug && debug_level=1
+ use extra-debug && debug_level=2
+
econf \
--docdir="${EPREFIX}/usr/share/doc/${PF}" \
--disable-socket-library \
--enable-clsync \
+ --enable-debug=${debug_level} \
--enable-paranoid=${harden_level} \
--without-bsm \
--without-kqueue \
$(use_enable caps capabilities) \
$(use_enable cluster) \
$(use_enable control-socket socket) \
- $(use_enable debug) \
$(use_enable highload-locks) \
$(use_enable namespaces unshare) \
$(use_enable seccomp) \
diff --git a/app-admin/clsync/metadata.xml b/app-admin/clsync/metadata.xml
index 9bc1cbe..4c51b7d 100644
--- a/app-admin/clsync/metadata.xml
+++ b/app-admin/clsync/metadata.xml
@@ -18,6 +18,7 @@
<flag name="cluster">Enable clustering support (allows master-master
clsync on multiple hosts). Not fully implemented yet.</flag>
<flag name="control-socket">Enable AF_UNIX control socket
support.</flag>
<flag name="cgroups">Use cgroups to limit /dev access.</flag>
+ <flag name="extra-debug">Enable extra debugging. This will hurt
performance badly generating tons of output.</flag>
<flag name="extra-hardened">Enable extra security checks. This will
hurt performance.</flag>
<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>
<flag name="highload-locks">Allows to use spinlocks for short delays
instead of mutexes, but only on SMP systems.</flag>
