Version bump.

Signed-off-by: Andrew Savchenko <bircoph@gentoo.org>
Package-Manager: portage-2.2.20/cvs/Linux i686
Manifest-Sign-Key: 0x565953B95372756C

4 files changed, 142 insertions, 16 deletions

diff --git a/app-admin/clsync/ChangeLog b/app-admin/clsync/ChangeLog
index 13c685d91e02..7b994670d857 100644
--- a/app-admin/clsync/ChangeLog
+++ b/app-admin/clsync/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/clsync
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/clsync/ChangeLog,v 1.4 2015/02/28 21:38:00 bircoph Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/clsync/ChangeLog,v 1.5 2015/05/25 00:11:52 bircoph Exp $
+
+*clsync-0.4.1 (25 May 2015)
+
+  25 May 2015; Andrew Savchenko <bircoph@gentoo.org> +clsync-0.4.1.ebuild,
+  metadata.xml:
+  Version bump. Apply upstream fixes. Add extra debugging support.
 
   28 Feb 2015; Andrew Savchenko <bircoph@gentoo.org> metadata.xml:
   seccomp USE flag is now global, removing from metadata
diff --git a/app-admin/clsync/Manifest b/app-admin/clsync/Manifest
index 4f2311543a9d..7be668d31433 100644
--- a/app-admin/clsync/Manifest
+++ b/app-admin/clsync/Manifest
@@ -15,24 +15,27 @@ AUX clsync-0.4-version.patch 694 SHA256 8b899b74f59dc6acb134ab4b2254e222c8d148ed
 AUX clsync.conf 589 SHA256 1a8689b86cf9475ef72ef42a623a1bb1ae55abff31578dcfdf3537331c681815 SHA512 46d8d786378eed0bfa46195e45f764015258ba55b35a5acf2685967e9fbd1fc7656c6aeba26b06889fa2f7c62cb11ecb84b10b856356ea3c0d463eaa4980c33d WHIRLPOOL cd9a0800b75eab476d7feec079f23538295dca5067f979ce4280c3188b9a24adf7c78e0c2ec5e2e8cadd71d11be181d873bc462d9fe321ada85e4e11690272db
 AUX clsync.confd 645 SHA256 ae7e9cacf618f9a32a4a1580580a901831aaaa0abb9de9e0379fbcc6a7359b0d SHA512 75dcc49d51f6da94d42eb501f1ad2868f163405dd7aa933f4c8078ec18f5b54eb6c66ff796ee744f7751699162627af843edbe5de5adf99c23712cedaebaddc5 WHIRLPOOL 06289c7645430d10b242983daa9cd2d4c2f327b34ede308012354947c64c654a7864586743ae6de7c02770a8b1c22de04b63404a6431b317b328ac6ac1e121ce
 AUX clsync.initd 671 SHA256 1efaac7d85e4f22e3b346af1451cac8574549743df7460feb664d4e57d818234 SHA512 61e8ca7f1e04cb2ff4d3e374c9419112bc05e6ffa77b40505f5a5ad7e215d8d5c2961795b804afd19ec153945bc004bf0611cb15e1ffae44746c6877805d967a WHIRLPOOL c605b0cb37e4bfac4fbb652d560515df9890d872e10616d2b039898d382abbcc8a5c6185f8556ac32d7d9e77198cc15d53490e33403a14fa5b9a6b656b912a29
+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
 DIST clsync-0.4.tar.gz 253396 SHA256 6f0ce7a5f61fbb50db53b787b62cf5347870f3be315acb02c4aee6b76206d19e SHA512 9b17f5f8f0bfc48531f3d8cb4f1c1edd3116e0b7d140e8ab2465dd1c590521c9857202ed3f36466f13fb3309abb9232fb4acbe25b5652914a816fac498f74a48 WHIRLPOOL 18ae12df2d7e0403b21c5d4ab7352cd81446729d94fb300a799b98dad9f88aeaa98deb2ba5f52858d3b6ba7406d777e53e97dae5c3a4802a229511db9c8a3482
 EBUILD clsync-0.4-r1.ebuild 3457 SHA256 4303d9a9a12aa718994bc2ff98598a481ea3436fed71f2c82a5c8787b66fc024 SHA512 9e22522f2c1d5bbd694794c5cf27716ab2e138b30e770d4af16e26d1274d5a18ab2da1172fa938a3faec2691c04560736d64cb999428773bff64ad1b428e9606 WHIRLPOOL 3c3b37004e5509effbe80ca490798335001590e89688b49319e9d51e7a7f118ef3251cf8af5154a3172be843bfe179318bab0d7a992bb4d0b136797739cff8f3
-MISC ChangeLog 1197 SHA256 ea0faa618529aeb5962c3e65b92ddf347bf00d41c48110073717aba33549006c SHA512 8eae719789b2b2a2b1b335a45a7dd1bae40bc36a2a23e38961f278ee45e12611a0d9d6d7e1a3680116be941cd7f16025b21f9dea4860cbc58f3593b9f3eea698 WHIRLPOOL 92ddebcedf1339a60ca5614ddd35686533591fe8d64ed6c87120c8f1572576968ba345b44f8ad651aab4258485b6ad371482be8a14ef08a43db23d64010a6a68
-MISC metadata.xml 1501 SHA256 a421976bb55c1f25fb3b90eea0ee041c8418cc964e38e03d0b892891553ecdad SHA512 86f191e8282161bd53fc8576add163ae5efe37123ae8f0799338d72a492fcf1f6f53aae7fd73c4ed481125261c269c8dceeb55be018846e723403ed7b2101428 WHIRLPOOL fca20280ca956e1a49c05968dbced7e9cfffa8062e2f7f0dfc7f863a41d3e4aca92f7166acddf44d58e8727581dfca6efc4ed60ea157deec12497e8f3c19dfe5
+EBUILD clsync-0.4.1.ebuild 3162 SHA256 ad09290773f5ee2612e8fcc746884db65fa76f1a0cfe945e6cb6b4817e5a9549 SHA512 982d302e91bc05f8b52bb283c1f349abb95c0df3070b6c005945f17f47b860647d10138dbbbdeb1efa3bd9e45c72dedcfcd9b6cff56d55af1a413f87fa4c498d WHIRLPOOL 9310c97945d6398122f943e756954c61157a3cc1819a9753318f4209e58084e9b610ce83d40bf7fac85f2608a74f3d795a10de3ec15b882c7998928663ce0911
+MISC ChangeLog 1385 SHA256 6789fe905b9598e72551552beb3e7d03da10950095b12aea3b7ff878155eb2dd SHA512 e310105a84b9858a370519c5cf977e9bf3ebc2d1d2ca5d222f7a418dd5edbbb69f726ff8bbe883e6f098f51de5a3a37d5b7766aabcf09714838434bde1126f0d WHIRLPOOL 1b0e690a50a9376eeb19a5376497efb157094f7c0da578c350f2a1d1790005ff536a668f3fc42fce3a663d13b2f7db07df21ade69069ecad88bbb72d63a911eb
+MISC metadata.xml 1692 SHA256 ca7310d5bf9634ab1a9306bd90f9b756b1c5dcd01a3d12bc7983c42af5567499 SHA512 0a83cc81b23213b9dd6c69310de8aea050140f8b398b18eac1157bdfb1394512c0b291b35c324686ebf7716ee0816e0ad92cd7176d2cb1a8cf363950ad93ece6 WHIRLPOOL 395bf8817d1341b2d21cf98fe2205952bd6009bed4847be478787109b8da60db24b675f36fb294bce5300005087a22b62cf7c3c0912a646ea67ffee92457eeb2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU8jU5AAoJEPZTWjO6HuSNmecP/i2Qjn35CjMvCjeV+KFqRDzi
-pe3ZTXwslkcPdIWo8c/xWiUupCsEbj5ThF2musY+FVKQAiEiHPpHWzcsR/qifPnK
-bk/gnsWXUdopBuWsOOqbqk4hqlbQkUaNSliaZTPG7WlPIS1ZucMXLgT+eOkmTMyP
-JU7mSxCKYGHcAZbLekiS5lcXvxc5Pkv3KJguJLViE4/juu1itOfjy0sE3nWDMNwN
-XI0ojT++WaOOz6fY5bhECgm1cKiTFJ2w9H12CUf4qnlCkLzkB99uOeCNV3bOy7RC
-ymZsaoJxJCYNNDyru+mbTdNOXBp6ftG8lIj2vv/ULer1H6+Nv/gXfdlWyCCm8FvA
-oISniihnyc5zniq1OcjCWwejWvHlmHgAqvvmRQ6DnnlLWnbSzI4Iywp2WUrDCHTT
-IauuSS2AvxUrondefSeKQJUA1g+DYFaptaWrww8Jrzg7C+LLscMFkJpmTD8ye76f
-I+yIv3YVh4Qs6o0oh5VUPCPv4g4JwfWJ/nD8QyheWSZjoy5f5q7EGHV4N4BrgpmI
-9ZFzB1/MdHTKbp6IS4SLDcEIYrTjdoa8NI+4pIaTc4vv96fU9bVOoY+XPLgWCnbA
-oArMZE+rVw6Pzn/xbgUsKg2z722LCKvDGyTYL+lt4vCW4B8SYsxImEwKGOdtJW+G
-6V1wtuu2SKjLmhsU/C0X
-=pzc2
+iQIcBAEBCAAGBQJVYmjJAAoJEPZTWjO6HuSNXykP/j0xkNkZT0yj6/nHFcGy30uI
+FafxCfIhaqpThxYg0Pq+VFRkYW3k8N9Ae8UJ/Q1R3JtABu8SubgjmiyjHPefQRNA
+nUmVT0q8dElk3ogY0O6ylQFTgFKBc1aOJ6BxuzQdIi6Ripb+TM9BbZItJrRm9nxO
+JVJ/QLVocc2n1Rh8PMXPDTuBIkPB+/Tql2T21ROS+thY/PT3ix9WKyV7T/xBFE+u
+5LeXWpZVOBaq7YpJV2y//Tnz38R6nNvetFmjdye2HuwGQW2g6AGpn4D5LyZa5Ybm
+Cfn4M6r4EXuvyQaUZuRxJHV2vSUXyRCkiACybHccEYBXK94otMD0D86Y/gv4U+ky
+M5jCOqO2z3PB0f4UGk/OuHTzkjqiZ0o6eoyvhXGX97YQftpxJ1xzIIpfw38AmtPD
+WtEf8J9EU1zEWsqwotpL8wp0eAG+SMuW8ZPjzwNfY/gfR3DGIWD85DOfKSI424wJ
+n6YCcRuyxzDFjtdIQMW6T78hiAHEeBLCJBugzcsu0dni6dyizAcdVZOezYm++eZx
+cOeobkJJcsdntKCtJFliiUcrZC47nO2t6Yp6rRz7K0UlXOSrW22WkUDKK1MLmZup
+ElDZRmTFZJK6iQA28CfesBj9sF2cUQAkytZAYEayGstz9hC9Y+Ddn79nQRii04Ao
+rDaFW/Em1uLL62ZpxLoi
+=1CSB
 -----END PGP SIGNATURE-----
diff --git a/app-admin/clsync/clsync-0.4.1.ebuild b/app-admin/clsync/clsync-0.4.1.ebuild
new file mode 100644
index 000000000000..045b0c1cae67
--- /dev/null
+++ b/app-admin/clsync/clsync-0.4.1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/clsync/clsync-0.4.1.ebuild,v 1.1 2015/05/25 00:11:52 bircoph Exp $
+
+EAPI=5
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/xaionaro/${PN}.git"
+else
+	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
+	"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+inherit autotools eutils linux-info
+
+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-debug
+extra-hardened gio hardened +highload-locks +inotify mhash
+namespaces seccomp"
+
+REQUIRED_USE="
+	|| ( gio inotify )
+	extra-debug? ( debug )
+	extra-hardened? ( hardened )
+	mhash? ( cluster )
+	seccomp? ( caps )
+"
+RDEPEND="
+	dev-libs/glib:2
+	cgroups? ( dev-libs/libcgroup )
+	mhash? ( app-crypt/mhash )
+"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+"
+RDEPEND="${CDEPEND}
+	~app-doc/clsync-docs-${PV}
+"
+
+pkg_pretend() {
+	use namespaces && CONFIG_CHECK="~NAMESPACES ~UTS_NS ~IPC_NS ~USER_NS ~PID_NS ~NET_NS"
+	use seccomp && CONFIG_CHECK+=" ~SECCOMP"
+	check_extra_config
+}
+
+src_prepare() {
+	# upstream fixes for 0.4.1
+	epatch "${WORKDIR}/${P}-${PVER}.patch"
+	eautoreconf
+}
+
+src_configure() {
+	local harden_level=0
+	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 highload-locks) \
+		$(use_enable namespaces unshare) \
+		$(use_enable seccomp) \
+		$(use_with cgroups libcgroup) \
+		$(use_with gio gio lib) \
+		$(use_with inotify inotify native) \
+		$(use_with mhash)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# docs go into clsync-docs
+	rm -rf "${ED}/usr/share/doc" || die
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+
+	# filter rules and sync scripts are supposed to be here
+	keepdir "${EPREFIX}/etc/${PN}"
+	insinto "/etc/${PN}"
+	newins "${FILESDIR}/${PN}.conf" "${PN}.conf"
+}
+
+pkg_postinst() {
+	einfo "${PN} is just a convenient way to run synchronization tools on live data,"
+	einfo "it doesn't copy data itself, so you need to install software to do actual"
+	einfo "data transfer. Usually net-misc/rsync is a good choise, but ${PN} is"
+	einfo "is flexible enough to use any user tool, see manual page for details."
+	einfo
+	einfo "${PN} init script can be multiplexed, to use symlink init script to"
+	einfo "othername and use conf.d/othername to configure it."
+	einfo
+	einfo "If you're interested in improved security, enable"
+	einfo "USE=\"caps cgroups hardened namespaces seccomp\""
+}
diff --git a/app-admin/clsync/metadata.xml b/app-admin/clsync/metadata.xml
index 23b5336cf73e..a88923a20219 100644
--- a/app-admin/clsync/metadata.xml
+++ b/app-admin/clsync/metadata.xml
@@ -18,9 +18,11 @@
 	<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. Be ready for 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>
 	<flag name="namespaces">Enable namespaces isolation.</flag>
+	<flag name="seccomp">Enable seccomp for system call filtering.</flag>
 </use>
 </pkgmetadata>