commit: ff4f3f953873fe9b50af51139774da1fa2a5571f Author: Andrew Savchenko <bircoph <AT> gmail <DOT> com> AuthorDate: Wed Feb 11 04:15:57 2015 +0000 Commit: Andrew Savchenko <bircoph <AT> gmail <DOT> com> CommitDate: Wed Feb 11 04:15:57 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=dev/bircoph.git;a=commit;h=ff4f3f95
clsync: keep live version, releases are in the tree --- app-admin/clsync/ChangeLog | 10 ++ app-admin/clsync/Manifest | 27 +--- app-admin/clsync/clsync-0.2.1.ebuild | 86 ------------- app-admin/clsync/clsync-0.3.ebuild | 87 ------------- app-admin/clsync/clsync-0.4-r1.ebuild | 114 ----------------- app-admin/clsync/clsync-9999.ebuild | 13 +- .../clsync/files/clsync-0.4-direct_mode.patch | 61 --------- app-admin/clsync/files/clsync-0.4-gio.patch | 32 ----- .../clsync/files/clsync-0.4-handler_path.patch | 30 ----- app-admin/clsync/files/clsync-0.4-hl_locks.patch | 37 ------ app-admin/clsync/files/clsync-0.4-unset_env.patch | 43 ------- .../files/clsync-0.4-unshare-configure.patch | 38 ------ .../clsync/files/clsync-0.4-unshare-ifdef.patch | 34 ----- .../clsync/files/clsync-0.4-unused-deps.patch | 140 --------------------- app-admin/clsync/files/clsync-0.4-version.patch | 19 --- app-admin/clsync/files/clsync.conf | 2 +- app-admin/clsync/files/clsync.conf-2 | 18 --- app-admin/clsync/files/clsync.initd | 4 +- app-admin/clsync/files/clsync.initd-2 | 18 --- app-admin/clsync/metadata.xml | 6 +- 20 files changed, 27 insertions(+), 792 deletions(-) diff --git a/app-admin/clsync/ChangeLog b/app-admin/clsync/ChangeLog index 6ec60ea..87efac0 100644 --- a/app-admin/clsync/ChangeLog +++ b/app-admin/clsync/ChangeLog @@ -2,6 +2,16 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 11 Feb 2015; Andrew Savchenko <[email protected]> -clsync-0.2.1.ebuild, + -clsync-0.3.ebuild, -clsync-0.4-r1.ebuild, clsync-9999.ebuild, + -files/clsync-0.4-direct_mode.patch, -files/clsync-0.4-gio.patch, + -files/clsync-0.4-handler_path.patch, -files/clsync-0.4-hl_locks.patch, + -files/clsync-0.4-unset_env.patch, -files/clsync-0.4-unshare-configure.patch, + -files/clsync-0.4-unshare-ifdef.patch, -files/clsync-0.4-unused-deps.patch, + -files/clsync-0.4-version.patch, -files/clsync.conf-2, -files/clsync.initd-2, + files/clsync.conf, files/clsync.initd, metadata.xml: + Releases are now in portage, keep live ebuild only. + 10 Feb 2015; Andrew Savchenko <[email protected]> clsync-0.4-r1.ebuild, +files/clsync-0.4-unused-deps.patch: Port unused-depes patch from current HEAD. diff --git a/app-admin/clsync/Manifest b/app-admin/clsync/Manifest index efcf5a9..ed86b68 100644 --- a/app-admin/clsync/Manifest +++ b/app-admin/clsync/Manifest @@ -1,23 +1,6 @@ -AUX clsync-0.4-direct_mode.patch 1782 SHA256 fc429bc6b830c76233d083b5ed882f4c9dbdee14de3bfbdf944c606a07e1cfc3 SHA512 99e4074343ff2d69811af0fcbc8481e016c3c8d685d4775bce3075939527a04d14573c745e5ee000f991ff74391a4355b63c15f7ac4f692d411d50a29f119cc9 WHIRLPOOL 9606eff1cfb55126345a2502c6222074111dfaa7557cf946926d130da1bbfc27e6265bfe0bf367264ec81f840f55a27ecb2cb8ca73ccaf313a065e5052026707 -AUX clsync-0.4-gio.patch 1254 SHA256 2bc5cc03cd456ed09879e77e963e17bedb05d3deaff77f4d18bdc67c521773f1 SHA512 888f0941dcfd8843007afee889c005c613d731750882b0acbadceb08b514f177b9b75f992827050a40247002c8d29d7fcf4e75eabafe6eb54fc1d05e30893ffd WHIRLPOOL 5df5185fd97bb4d77297e40e1722b4ddfbb27c444c6a506939ee9a3075be0200aeca3c0f08f62e9650a04583cd55f1d05c106a77b7f2eb2e9af3621f9597d4f2 -AUX clsync-0.4-handler_path.patch 822 SHA256 fcd4f9ff6308e18984dd4a97bda2d3bd9c9de8bd37a9ef758d6e0ba2485c70c6 SHA512 de4a7fa17e158f5527a4b28e90414ee8513a140fed2f62815578e9e97550662c0cc7d36d3debd366c7543cb879763443dc839356640647d82f6709c954c4f0ad WHIRLPOOL 9f18153267d70f4964e8d7a14b87e3a21056874254874452a9895bc3613515f5f9d059b5c10bb8d7ffd0077e5eb00c8fcbd52059807dc65553875d59e05d3777 -AUX clsync-0.4-hl_locks.patch 899 SHA256 ee85116d992dd9e089e2e0a3f0bfbc5502705e4de08953b13a2bd00ed259d3bf SHA512 279bb3560a37a163763d9de09c894d8d98e79ed32e3f1c2f2231d567b0492f93c078a560296c706536ddabddf05e4218f106a0f271f8bcd3c9b18cee153083d0 WHIRLPOOL de98b88abb9089456157366b9145433ae371176cd81b34e3bc5a72852b238f6b7ed98610e3259831389eacd7990ff248d7c890b87a93a4afcdeb4f287d1f631b -AUX clsync-0.4-unset_env.patch 1820 SHA256 830f7d495be48faa1b13ae9794371561808dd904cb45192e40f790b33dc32475 SHA512 e89bd1834180487bb0feecfbac90a6512531547fbaa3053fe9907e776a2212e5dc0f912c7a59bccf9f15058d991dbe03f9ae7c89a741d6807c9df4fa930af915 WHIRLPOOL b058e0a41535770c81232e4587856f69e152dbae1683929c7fa3bf171db7d76cd67456bf4e2fe3e2902da6d72ba2720990247eac8a3fef6c8ae250004eee2fd3 -AUX clsync-0.4-unshare-configure.patch 1198 SHA256 c60e2f8e33e1ca04d27e8887982d83eb5efb8a3f3f6871f97feba931aaa0db74 SHA512 c0be6a085a33e3c09bfe52fc5aff3a1136fbbdde7cf928bd1ff21c7e435ae8562a626ed7d561c83e74580f17e2ad1c61be778d0a7f01b2ad0890a9d5cc1e54cd WHIRLPOOL 826d597da90d8f71b3ff902c5c55bbd3ae82bae33157f99469bfe8dec4ad93f16a1f2d10c0b78f561c58f6d01832ed2bbc2267ab619e21bd19c939034ae8b401 -AUX clsync-0.4-unshare-ifdef.patch 989 SHA256 2fc98fa742ed24068af39c950eb7fa33a048a2cbb3aab44b074928cd86c5cefb SHA512 2a6e98a2ea8d1dd663fdaf6eed0d6706c61b646c4178ca8be5598d1d6a3dd8023b92f02858f7324c5ceab601ed5c8ec1ee6bcc7210664cd57dc281a116bbde3c WHIRLPOOL 9535ac8e746e4ce980d4f17c05f554e55f5ab717d79e20ba09751f176383e46c2b52777cccce10f28422b4d459f0ef8c8a5f900c4857994a8bab5c6108bd5e27 -AUX clsync-0.4-unused-deps.patch 4281 SHA256 a9dc293dfdec61ea44d55e309115a2eb32452440c76562a9f0f29c3100f0e554 SHA512 a777744f2ef2e069cb5c533b4c6b00bc1017e6b29db079fe4aec1cb1833193e102ec9ca8c7f70743d4864d003a6efb38f061f1ecb65c879e67915bf9ae206cb7 WHIRLPOOL 36f6aa91f49b720aabfdc23b71f02834e98160cc06db8633e07bfe46b0dd26f86fdc3ea57eed889493ac5034d30b072a1bb156118bd6a2c266f99bec37d23270 -AUX clsync-0.4-version.patch 694 SHA256 8b899b74f59dc6acb134ab4b2254e222c8d148ed827054c1e263625a73405c9d SHA512 9a08ecf5c062827d8e02b4822a879115d394d36d6c81bc138dee4b65519c6a2e333445e953965057d8b32ad3bca6ced8a699f59d798d31bb022c4b9129d8b681 WHIRLPOOL fd214257b4a2fd24120a4620df55edd78010f5db507493b3e0c1bd06f91e97e2b3caffdbabad4c4b0d1cc7c3f02d9d290805c4d6e10edf5e44d081ae1b837e1b -AUX clsync.conf 586 SHA256 da5b5611d9253094828ef4ff66d72cd36e807f36c218807d8da6386f45a56dab SHA512 ecaacdd5869a3c9552dd4a1441ed313e0e2f977c82b0a19ea1300f069e45ba6b49bcc9f6b35ab3031727fe7a09af0c647b9b34248d14f3e30701746170874e6d WHIRLPOOL e6b2ea8d0267051049152fa8e2dedcec89bc7be6cab48a9a91a39810de12094b1499a622cb0b8b6c3c0880a2e82713fed834bdf4337241f46c9673d1b2fc71eb -AUX clsync.conf-2 589 SHA256 1a8689b86cf9475ef72ef42a623a1bb1ae55abff31578dcfdf3537331c681815 SHA512 46d8d786378eed0bfa46195e45f764015258ba55b35a5acf2685967e9fbd1fc7656c6aeba26b06889fa2f7c62cb11ecb84b10b856356ea3c0d463eaa4980c33d WHIRLPOOL cd9a0800b75eab476d7feec079f23538295dca5067f979ce4280c3188b9a24adf7c78e0c2ec5e2e8cadd71d11be181d873bc462d9fe321ada85e4e11690272db +AUX clsync.conf 589 SHA256 1a8689b86cf9475ef72ef42a623a1bb1ae55abff31578dcfdf3537331c681815 SHA512 46d8d786378eed0bfa46195e45f764015258ba55b35a5acf2685967e9fbd1fc7656c6aeba26b06889fa2f7c62cb11ecb84b10b856356ea3c0d463eaa4980c33d WHIRLPOOL cd9a0800b75eab476d7feec079f23538295dca5067f979ce4280c3188b9a24adf7c78e0c2ec5e2e8cadd71d11be181d873bc462d9fe321ada85e4e11690272db AUX clsync.confd 645 SHA256 ae7e9cacf618f9a32a4a1580580a901831aaaa0abb9de9e0379fbcc6a7359b0d SHA512 75dcc49d51f6da94d42eb501f1ad2868f163405dd7aa933f4c8078ec18f5b54eb6c66ff796ee744f7751699162627af843edbe5de5adf99c23712cedaebaddc5 WHIRLPOOL 06289c7645430d10b242983daa9cd2d4c2f327b34ede308012354947c64c654a7864586743ae6de7c02770a8b1c22de04b63404a6431b317b328ac6ac1e121ce -AUX clsync.initd 566 SHA256 4c33a75d993246a5a9cd2cc0da83a5ba23e9e9f34ad0da4b033a606bbabda40b SHA512 e729c8c2aa8f063f86dbdbbe87dee0185cab2d7cbfd68eaa061d38dbf00403f3d33b2d0483552888652fd2a25590452abd892fa623abe7219b5672b6fa944244 WHIRLPOOL 94a970b3d08b865ce94d8946e45e12ede0734905634f104c5aa0fe1d20e329d8aee732619874e7e1d5f83f2df5118b88b87760c54eab397410d2044e610f3b56 -AUX clsync.initd-2 573 SHA256 9200ac5bff76111853317f87f728029f6f20cafa52a0b2f90fe28e85b4780cd5 SHA512 5588dbe8d414f553692a79dcde2f147f8693235b39e166fa7f5e4e8b1dfaf7c134861d84792bbfc19fea9689ca0d428caf98b6830661bd46fdc98b410bbcc3b3 WHIRLPOOL c89f913b1bc166ab4631476d0be1da5af136da95b1319319a93e74488a8c4fc9763c215d538f9e2889c9a87a7c5cf459fcfd0e38421c34a1bcc8dc79c9343aef -DIST clsync-0.2.1.tar.gz 105886 SHA256 7fc9257a24855a0b350937bc0667a326182e84a1ba922f41b41266aeb5b2c738 SHA512 8f8b926df6b4fc1424427aa6a504527a1f10a01a9108c512968148bf5552a429f7f9bc58f46730219a9be303b3314c8c3b55747c7c4ef5832bd175f70bdf2763 WHIRLPOOL 4f8f5c7e88983bbadb3263e245f424fb9e8fb140cb6bac78702a7d572f69856ccdac68fb6cd9249193af09d0b2bf224827bd05530a0cbec99bfc3fa7138e23fa -DIST clsync-0.3.tar.gz 122664 SHA256 054f7032993f51a35cf3fdc91aeb3ad358f63432f8d1d1cbe4b75e664450b5bf SHA512 b05b41815fcaa623a794d2f9a9f2d2a02867d4ee5685488a0693b017773c2fe7da81d1d322a166bf34aa4570039f542a61362e70db4df2d2c08b721d4ddad254 WHIRLPOOL a3b401772b05dc47e0f6f9253471204ed655a3dbd06213c107ce3d760a1f4bc3bd577438748a177ccf10eec046a35688a91b0d7bbf5413c20b4d2a75ec0f5487 -DIST clsync-0.4.tar.gz 253396 SHA256 6f0ce7a5f61fbb50db53b787b62cf5347870f3be315acb02c4aee6b76206d19e SHA512 9b17f5f8f0bfc48531f3d8cb4f1c1edd3116e0b7d140e8ab2465dd1c590521c9857202ed3f36466f13fb3309abb9232fb4acbe25b5652914a816fac498f74a48 WHIRLPOOL 18ae12df2d7e0403b21c5d4ab7352cd81446729d94fb300a799b98dad9f88aeaa98deb2ba5f52858d3b6ba7406d777e53e97dae5c3a4802a229511db9c8a3482 -EBUILD clsync-0.2.1.ebuild 2148 SHA256 9069d6bbba621a368ce6f1fd1602d984aa0c37a5297df7ff43598b53603ca726 SHA512 9ab6e36e094c43f7e506c743a0159ab00e09a216676b0693a8f2f3a0df8160c5c706122bb9e36e754c0e50a6dc63856dae86743e6e3a22be80b2bbf7ef21523f WHIRLPOOL 27b60f03a084a821dda72799540605266557fae9b5379bfaa5c0601c42894d84d1ddd68d9dd6f2f8cf72f3cf7dc38cfc7e75821416290b2c8bf8c74af50b8543 -EBUILD clsync-0.3.ebuild 2219 SHA256 71f1c52b62d0379c1bf03ce4a49fe2cc612697008aabbf58d3b7b882952c35ec SHA512 2cb4ce6f305a1ebb020157915324f824cf554ccd95761ebe13b4099f8418676173b9953994095c29c16b11942d7fb6a3029cdb5b94c572803ca0af183d16c659 WHIRLPOOL 37766e003335286b13a4dad913d838f3cb4b75d3b216b5b3265d93a36353f15e365c93d0768341d6bbaaf4fbb785ff2774f554fd57d009fc396ae2fb6aaacac3 -EBUILD clsync-0.4-r1.ebuild 3255 SHA256 ad54895b48b7d55347d567c310f5f8e52fcd43ec89d98c1c422255812c4bd651 SHA512 31496ea76c46d3dc136f6e2d4d98917748a3312720e4bb642721d9a5af383ee57a42a5e9d9b2c0b17786521b7bd70b2f523a276d04e7be128d1b637a586ce3a5 WHIRLPOOL b3c5816f79668cbb2bb49901c1d55d1ca90c11f24b7db8279ab4baf158436051e9db29b237b40938fcdc77d391dd70c8439a84d391dd49b68e002b8cc889df98 -EBUILD clsync-9999.ebuild 2853 SHA256 eeddde65f68b062ad9129b7248b1ec8bdd02247d9ca820da7648f46d5407c36a SHA512 5e6206cceeb2cc7d9b459d56ec73e4b7b81fed32370e21d8fe136df2fb79fcea3ac4d0d9a8ced2ecd4a49a3465a9996b38b3ad9d6da8da40c0b32824d3e8f8ba WHIRLPOOL f2d31bebc5f8dcdec3b7af84f694c39f3f947f4995c239925363c3b5e065d820716952e0ac1b004272838269c965ef79b7a35ff06104bf3ff0653c1b05ce6f9d -MISC ChangeLog 5146 SHA256 0b3f64ffcfb0cf20f1e876a6ac0c92c58609e4467cf1997f21aaec0a3efd1862 SHA512 2715f6bd34629f5a88ded79149d7c1975abc832113bc5801ed2465a30231fa7205db2bb6a043a769aa3c9290b571e3e7fa64ea763fd914e1b2fb864557137d65 WHIRLPOOL 4801ccf56fad21fdbb53fb52923ce7e41954c173e8cd34a25c687f62590877acb7995c99ad80ad2d6252917c2131f8e02e0b58deb230d2a1c336f250a04c438d -MISC metadata.xml 1574 SHA256 240b2a1cfe605d016119c9907be0243a2c819ba39dcc2340292135255ba4644f SHA512 8ee5716ba18dc951d36bd2ae69308fa894646c89e8174613d951e91d819d46d8a13192b76e44d895341dfc37e7a3e033114cf2763a78557f85f772c0778854e3 WHIRLPOOL fa48aa4ab451e1f23f16845c49fcb5d5c5c48f29c964af90f103990e35a04094f30f3342733949ce8a79451aefaf83daa5211977b68ff4eca2b681d7400f8e1d +AUX clsync.initd 573 SHA256 1f3306dfeb4c8d8260551ed0edebe842452de2a2b7e85d07aa0fe46b88f10414 SHA512 c944388d5e61cfba73d462d457dbdcfef42c4bfc6f9ba814eea592dd630d64309e8e2b4af1cb621a41151613f28ab4508cc7d26d44def0b5a01938742cfbdd2e WHIRLPOOL c824fd5ed8e45afcd5df737dfea7645fc3460e42c5ab0512c4c462fc646f789e81597fb460126412f2347e0cb9468339b1874a697b65a40a3ff278625241f460 +EBUILD clsync-9999.ebuild 2878 SHA256 a606ba0d9672cd2d95e933880b9dab55187ca931029c6ba085fdca20da614a9f SHA512 8fde94d33544d8ed6fef6da89800dd1468c45b7cf3267f5fa775ae7e1d30df3cc4b85db8cd26c7fa7f615793b308a678692c0a6ed9a0cf294f893f35fb3ed804 WHIRLPOOL 5d56d3b321014588fb3c436bc149d15562d6c9c5bc8a7ceace4a8a13bb4aed27fdb1e3739aaa52abd47c20837a80374f6a499ba018549032067083ec713aaf12 +MISC ChangeLog 5776 SHA256 f9ccfb7c3bf3957839bcb11ba78f13d5bd69922f634eac6c16955865f17ae512 SHA512 214ad8108667c7aa55781af278a5ccf0009c71373f800a33ace7672b03ee3a143dfeca994cffad555921babd76b36225a08cf690bc14280f8e7d13c51e5283b8 WHIRLPOOL f8b4588f470bd99bc5fc05d7f78629a3fa7886340abf59d70796b8e6e6170673e07553d4f407f05b7ddf9551bfadb9fefc9f907a4d3aad96cbdb9e8b966a0737 +MISC metadata.xml 1572 SHA256 6d90b9c0f0b37dffda05a9b5ca6d02f05ce0362eb8bf8fbe19e90c3f77570940 SHA512 5be148bc1f8b1ca76e2b5713bf5a9ecfc88c4c101620fbbf1cb4efcbe7b33a923038ea0c2d5b2d66689552a04b865c4b0625887baa98a80d64f486208143ce67 WHIRLPOOL e1cd84b85b5ac476407930f14217cfed16f67d3aeb221e61dffa94c688b69ada4f29f7a7e9f4f2b610f8730c10d700bff9148d6b871ca9d98e76eaa0c5de68c8 diff --git a/app-admin/clsync/clsync-0.2.1.ebuild b/app-admin/clsync/clsync-0.2.1.ebuild deleted file mode 100644 index 65684b2..0000000 --- a/app-admin/clsync/clsync-0.2.1.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -if [[ ${PV} == "9999" ]] ; then - _GIT=git-2 - EGIT_REPO_URI="https://github.com/xaionaro/${PN}.git"; - SRC_URI="" - KEYWORDS="" -else - SRC_URI="https://github.com/xaionaro/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="x86 amd64" -fi - -inherit autotools $_GIT - -DESCRIPTION="Live sync tool based on inotify, written in GNU C" -HOMEPAGE="http://ut.mephi.ru/oss"; -LICENSE="GPL-3+" -SLOT="0" -IUSE="-caps -cluster debug doc +examples extra-hardened hardened mhash" -REQUIRED_USE=" - extra-hardened? ( hardened ) - mhash? ( cluster )" - -RDEPEND=" - caps? ( sys-libs/libcap ) - mhash? ( app-crypt/mhash ) - dev-libs/glib:2 -" -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( app-doc/doxygen ) -" - -src_prepare() { - eautoreconf -} - -src_configure() { - local harden_level=0 - use hardened && harden_level=1 - use extra-hardened && harden_level=2 - - econf \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" \ - --enable-paranoid=${harden_level} \ - $(use_enable cluster) \ - $(use_enable debug) \ - $(use_with caps capabilities) \ - $(use_with mhash) -} - -src_compile() { - emake - use doc && emake doc -} - -src_install() { - emake DESTDIR="${D}" install - use doc && dohtml -r doc/html/* - - # remove unwanted docs - rm "${ED}/usr/share/doc/${PF}"/{LICENSE,TODO} || die - use examples || rm -r "${ED}/usr/share/doc/${PF}/examples" || 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}" - doins "${FILESDIR}/${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 now be multiplexed, to use symlink init script to" - einfo "othername and use conf.d/othername to configure it." -} diff --git a/app-admin/clsync/clsync-0.3.ebuild b/app-admin/clsync/clsync-0.3.ebuild deleted file mode 100644 index ce93c4a..0000000 --- a/app-admin/clsync/clsync-0.3.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -if [[ ${PV} == "9999" ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/xaionaro/${PN}.git"; - SRC_URI="" - KEYWORDS="" -else - SRC_URI="https://github.com/xaionaro/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~x86 ~amd64" -fi - -inherit autotools - -DESCRIPTION="Live sync tool based on inotify, written in GNU C" -HOMEPAGE="http://ut.mephi.ru/oss"; -LICENSE="GPL-3+" -SLOT="0" -IUSE="caps cluster control-socket debug doc +examples extra-hardened hardened mhash" -REQUIRED_USE=" - extra-hardened? ( hardened ) - mhash? ( cluster )" - -RDEPEND=" - caps? ( sys-libs/libcap ) - mhash? ( app-crypt/mhash ) - dev-libs/glib:2 -" -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( app-doc/doxygen ) -" - -src_prepare() { - eautoreconf -} - -src_configure() { - local harden_level=0 - use hardened && harden_level=1 - use extra-hardened && harden_level=2 - - econf \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" \ - --enable-paranoid=${harden_level} \ - $(use_enable cluster) \ - $(use_enable control-socket socket) \ - $(use_enable debug) \ - $(use_with caps capabilities) \ - $(use_with mhash) -} - -src_compile() { - emake - use doc && emake doc -} - -src_install() { - emake DESTDIR="${D}" install - use doc && dohtml -r doc/html/* - - # remove unwanted docs - rm "${ED}/usr/share/doc/${PF}"/{LICENSE,TODO} || die - use examples || rm -r "${ED}/usr/share/doc/${PF}/examples" || die - - newinitd "${FILESDIR}/${PN}.initd-2" "${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-2" "${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 now be multiplexed, to use symlink init script to" - einfo "othername and use conf.d/othername to configure it." -} diff --git a/app-admin/clsync/clsync-0.4-r1.ebuild b/app-admin/clsync/clsync-0.4-r1.ebuild deleted file mode 100644 index 7be0aef..0000000 --- a/app-admin/clsync/clsync-0.4-r1.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -if [[ ${PV} == "9999" ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/xaionaro/${PN}.git"; -else - SRC_URI="https://github.com/xaionaro/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -inherit autotools eutils linux-info - -DESCRIPTION="Live sync tool based on inotify, written in GNU C" -HOMEPAGE="http://ut.mephi.ru/oss/clsync https://github.com/xaionaro/clsync"; -LICENSE="GPL-3+" -SLOT="0" -IUSE="+caps cluster control-socket cgroups debug doc +examples -extra-hardened gio hardened +highload-locks +inotify mhash -namespaces seccomp" - -REQUIRED_USE=" - || ( gio inotify ) - extra-hardened? ( hardened ) - mhash? ( cluster )" - -RDEPEND=" - dev-libs/glib:2 - cgroups? ( dev-libs/libcgroup ) - mhash? ( app-crypt/mhash ) -" -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( ~app-doc/clsync-docs-${PV} ) -" - -pkg_pretend() { - if use namespaces; then - CONFIG_CHECK="~NAMESPACES ~UTS_NS ~IPC_NS ~USER_NS ~PID_NS ~NET_NS" - check_extra_config - fi -} - -src_prepare() { - # upstream fixes for 0.4 - epatch \ - "${FILESDIR}/${P}-gio.patch" \ - "${FILESDIR}/${P}-unshare-configure.patch" \ - "${FILESDIR}/${P}-unshare-ifdef.patch" \ - "${FILESDIR}/${P}-version.patch" \ - "${FILESDIR}/${P}-direct_mode.patch" \ - "${FILESDIR}/${P}-handler_path.patch" \ - "${FILESDIR}/${P}-hl_locks.patch" \ - "${FILESDIR}/${P}-unset_env.patch" \ - "${FILESDIR}/${P}-unused-deps.patch" - eautoreconf -} - -src_configure() { - local harden_level=0 - use hardened && harden_level=1 - use extra-hardened && harden_level=2 - - econf \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" \ - --disable-socket-library \ - --enable-clsync \ - --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) \ - $(use_with cgroups libcgroup) \ - $(use_with gio gio lib) \ - $(use_with inotify inotify native) \ - $(use_with mhash) -} - -src_install() { - emake DESTDIR="${D}" install - - # remove unwanted docs - rm "${ED}/usr/share/doc/${PF}/LICENSE" || die "failed to cleanup docs" - use examples || rm -r "${ED}/usr/share/doc/${PF}/examples" || die "failed to remove examples" - - newinitd "${FILESDIR}/${PN}.initd-2" "${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-2" "${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/clsync-9999.ebuild b/app-admin/clsync/clsync-9999.ebuild index 85f5fee..10a4118 100644 --- a/app-admin/clsync/clsync-9999.ebuild +++ b/app-admin/clsync/clsync-9999.ebuild @@ -15,7 +15,7 @@ fi inherit autotools linux-info DESCRIPTION="Live sync tool based on inotify, written in GNU C" -HOMEPAGE="http://ut.mephi.ru/oss/clsync https://github.com/xaionaro/clsync"; +HOMEPAGE="https://github.com/xaionaro/clsync http://ut.mephi.ru/oss/clsync"; LICENSE="GPL-3+" SLOT="0" IUSE="+caps cluster control-socket cgroups debug doc +examples @@ -38,10 +38,9 @@ DEPEND="${RDEPEND} " pkg_pretend() { - if use namespaces; then - CONFIG_CHECK="~NAMESPACES ~UTS_NS ~IPC_NS ~USER_NS ~PID_NS ~NET_NS" - check_extra_config - fi + 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() { @@ -80,13 +79,13 @@ src_install() { rm "${ED}/usr/share/doc/${PF}/LICENSE" || die "failed to cleanup docs" use examples || rm -r "${ED}/usr/share/doc/${PF}/examples" || die "failed to remove examples" - newinitd "${FILESDIR}/${PN}.initd-2" "${PN}" + 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-2" "${PN}.conf" + newins "${FILESDIR}/${PN}.conf" "${PN}.conf" } pkg_postinst() { diff --git a/app-admin/clsync/files/clsync-0.4-direct_mode.patch b/app-admin/clsync/files/clsync-0.4-direct_mode.patch deleted file mode 100644 index 2a9c06e..0000000 --- a/app-admin/clsync/files/clsync-0.4-direct_mode.patch +++ /dev/null @@ -1,61 +0,0 @@ -commit 1fe2a05438de390dc12a653bc50ddf591fa79733 -Author: Dmitry Yu Okunev <[email protected]> -Date: Wed Jan 28 11:39:09 2015 +0300 - - Fixed the path '' in direct mode. - - '' -> '.' - - Thanks for bugreport to: Andrew A Savchenko <[email protected]> - -diff --git a/sync.c b/sync.c -index b6d3341..490ea39 100644 ---- a/sync.c -+++ b/sync.c -@@ -1959,6 +1959,25 @@ int fileischanged(ctx_t *ctx_p, indexes_t *indexes_p, const char *path_rel, stat - return 1; - } - -+static inline int sync_indexes_fpath2ei_addfixed(ctx_t *ctx_p, indexes_t *indexes_p, const char *fpath, eventinfo_t *evinfo) { -+ static const char fpath_dot[] = "."; -+ const char *fpath_fixed; -+ -+ fpath_fixed = fpath; -+ switch (ctx_p->flags[MODE]) { -+ case MODE_DIRECT: -+ -+ // If fpath is empty (that means CWD) then assign it to "." -+ if (!*fpath) -+ fpath_fixed = fpath_dot; -+ break; -+ default: -+ break; -+ } -+ -+ return indexes_fpath2ei_add(indexes_p, strdup(fpath_fixed), evinfo); -+} -+ - int sync_prequeue_loadmark - ( - int monitored, -@@ -2145,7 +2164,8 @@ int sync_prequeue_loadmark - ); - - if (isnew) -- indexes_fpath2ei_add(indexes_p, strdup(path_rel), evinfo); -+ // Fix the path (if required) and call indexes_fpath2ei_add() to remeber the new object to be synced -+ sync_indexes_fpath2ei_addfixed(ctx_p, indexes_p, path_rel, evinfo); - - return 0; - } -@@ -2288,7 +2308,9 @@ void _sync_idle_dosync_collectedevents(gpointer fpath_gp, gpointer evinfo_gp, gp - - if (isnew) { - debug(4, "Collecting \"%s\"", fpath); -- indexes_fpath2ei_add(indexes_p, strdup(fpath), evinfo_idx); -+ -+ // Fix the path (if required) and call indexes_fpath2ei_add() to remeber the new object to be synced -+ sync_indexes_fpath2ei_addfixed(ctx_p, indexes_p, fpath, evinfo_idx); - } else - free(fpath); - diff --git a/app-admin/clsync/files/clsync-0.4-gio.patch b/app-admin/clsync/files/clsync-0.4-gio.patch deleted file mode 100644 index cdcbbc2..0000000 --- a/app-admin/clsync/files/clsync-0.4-gio.patch +++ /dev/null @@ -1,32 +0,0 @@ -commit 4eea85337a3358baae0b4f0626d63a9626778a01 -Author: Andrew Savchenko <[email protected]> -Date: Wed Jan 28 02:50:36 2015 +0300 - - Add GIO to the list of allowed file monitors. - - This allows to compile clsync ONLY with GIO support. - -diff --git a/configure.ac b/configure.ac -index f497c67..a3f0324 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -262,7 +262,7 @@ dnl tre check - # ;; - #esac - --dnl kqueue/inotify/bsm -+dnl kqueue/inotify/gio/bsm - - AC_ARG_WITH(kqueue, - AS_HELP_STRING(--with-kqueue, -@@ -476,7 +476,9 @@ AM_CONDITIONAL([HAVE_SECCOMP], [test "x$HAVE_SECCOMP" != "x"]) - AM_CONDITIONAL([HAVE_TRE], [test "x$HAVE_TRE" != "x"]) - AM_CONDITIONAL([HAVE_LIBCGROUP], [test "x$HAVE_LIBCGROUP" != "x"]) - --AS_IF([test "$HAVE_KQUEUE" = '' -a "$HAVE_INOTIFY" = '' -a "$HAVE_FANOTIFY" = '' -a "$HAVE_BSM" = '' ], [AC_MSG_FAILURE([kqueue, inotify and bsm are not supported on this system])]) -+AS_IF([test "$HAVE_KQUEUE" = '' -a "$HAVE_INOTIFY" = '' -a "$HAVE_FANOTIFY" = '' -a "$HAVE_BSM" = '' -a "$HAVE_GIO" = ''], -+[AC_MSG_FAILURE([At least one monitoring engine must be enabled! -+Available (depending on system): inotify, kqueue, gio, bsm])]) - - LIBS="${GLIB_LIBS} ${LIBS}" - AM_CPPFLAGS="${GLIB_CFLAGS}" diff --git a/app-admin/clsync/files/clsync-0.4-handler_path.patch b/app-admin/clsync/files/clsync-0.4-handler_path.patch deleted file mode 100644 index 5a61544..0000000 --- a/app-admin/clsync/files/clsync-0.4-handler_path.patch +++ /dev/null @@ -1,30 +0,0 @@ -commit a747384216597df71c99453dc5161100e1b41181 -Author: Dmitry Yu Okunev <[email protected]> -Date: Wed Jan 28 11:46:57 2015 +0300 - - Fixed setting sync-handler without absoulte path - - For example "-Secho" - -diff --git a/main.c b/main.c -index 53e71ae..792f1e4 100644 ---- a/main.c -+++ b/main.c -@@ -2526,12 +2526,16 @@ int main(int _argc, char *_argv[]) { - - if (ctx_p->handlerfpath != NULL) { - char *rhandlerfpath = realpath(ctx_p->handlerfpath, NULL); -+/* - if (rhandlerfpath == NULL) { - error("Got error while realpath() on \"%s\" [#0].", ctx_p->handlerfpath); - ret = errno; - } - debug(5, "rhandlerfpath == \"%s\"", rhandlerfpath); -- ctx_p->handlerfpath = rhandlerfpath; -+ ctx_p->handlerfpath = rhandlerfpath;*/ -+ -+ if (rhandlerfpath != NULL) -+ ctx_p->handlerfpath = rhandlerfpath; - - } - diff --git a/app-admin/clsync/files/clsync-0.4-hl_locks.patch b/app-admin/clsync/files/clsync-0.4-hl_locks.patch deleted file mode 100644 index f027935..0000000 --- a/app-admin/clsync/files/clsync-0.4-hl_locks.patch +++ /dev/null @@ -1,37 +0,0 @@ -commit 76c75f8180a7e7592da927e8b4c8f5f067470d05 -Author: Dmitry Yu Okunev <[email protected]> -Date: Wed Jan 28 12:19:11 2015 +0300 - - [hl_locks] A try to fix a segfault on one core PC - - Thanks for the bugreport to: Andrew A Savchenko <[email protected]> - -diff --git a/privileged.c b/privileged.c -index fafd5b7..668a536 100644 ---- a/privileged.c -+++ b/privileged.c -@@ -1680,11 +1680,6 @@ int privileged_init(ctx_t *ctx_p) - #endif - - #ifdef CAPABILITIES_SUPPORT --# ifdef HL_LOCKS -- if (ncpus == 1) -- hl_shutdown(HLLOCK_HANDLER); --# endif -- - if (ctx_p->flags[SPLITTING] == SM_OFF) { - #endif - -@@ -1792,6 +1787,12 @@ int privileged_init(ctx_t *ctx_p) - default: - critical("Invalid ctx_p->flags[SPLITTING]: %i", ctx_p->flags[SPLITTING]); - } -+ -+# ifdef HL_LOCKS -+ if (ncpus == 1) -+ hl_shutdown(HLLOCK_HANDLER); -+# endif -+ - critical_on(!helper_isalive()); - - # ifdef UNSHARE_SUPPORT diff --git a/app-admin/clsync/files/clsync-0.4-unset_env.patch b/app-admin/clsync/files/clsync-0.4-unset_env.patch deleted file mode 100644 index 54a45d2..0000000 --- a/app-admin/clsync/files/clsync-0.4-unset_env.patch +++ /dev/null @@ -1,43 +0,0 @@ -commit 596f79fa65af66afdff4cf24b9135935bf511108 -Author: Dmitry Yu Okunev <[email protected]> -Date: Wed Jan 28 14:27:51 2015 +0300 - - Fixed a segfault on non-set "HOME" environment variable - -diff --git a/main.c b/main.c -index 792f1e4..176e1f4 100644 ---- a/main.c -+++ b/main.c -@@ -1731,18 +1731,18 @@ int configs_parse(ctx_t *ctx_p, paramsource_t paramsource) { - char **config_path_p = config_paths, *config_path_real = xmalloc(PATH_MAX); - size_t config_path_real_size=PATH_MAX; - -- char *homedir = getenv("HOME"); -- size_t homedir_len = strlen(homedir); -+ char *homedir = getenv("HOME"); -+ size_t homedir_len = (homedir == NULL ? 0 :strlen(homedir)); - -- while(*config_path_p != NULL) { -+ while (*config_path_p != NULL) { - size_t config_path_len = strlen(*config_path_p); - -- if(config_path_len+homedir_len+3 > config_path_real_size) { -+ if (config_path_len+homedir_len+3 > config_path_real_size) { - config_path_real_size = config_path_len+homedir_len+3; - config_path_real = xmalloc(config_path_real_size); - } - -- if(*config_path_p[0] != '/') { -+ if ((*config_path_p[0] != '/') && (homedir_len >= 0)) { - memcpy(config_path_real, homedir, homedir_len); - config_path_real[homedir_len] = '/'; - memcpy(&config_path_real[homedir_len+1], *config_path_p, config_path_len+1); -@@ -1750,7 +1750,7 @@ int configs_parse(ctx_t *ctx_p, paramsource_t paramsource) { - memcpy(config_path_real, *config_path_p, config_path_len+1); - - debug(1, "Trying config-file \"%s\" (case #1)", config_path_real); -- if(!g_key_file_load_from_file(gkf, config_path_real, G_KEY_FILE_NONE, NULL)) { -+ if (!g_key_file_load_from_file(gkf, config_path_real, G_KEY_FILE_NONE, NULL)) { - debug(1, "Cannot open/parse file \"%s\"", config_path_real); - config_path_p++; - continue; diff --git a/app-admin/clsync/files/clsync-0.4-unshare-configure.patch b/app-admin/clsync/files/clsync-0.4-unshare-configure.patch deleted file mode 100644 index 11d8f01..0000000 --- a/app-admin/clsync/files/clsync-0.4-unshare-configure.patch +++ /dev/null @@ -1,38 +0,0 @@ -commit a13f929cfe4a7fad58c7d814a139efff091601e0 -Author: Dmitry Yu Okunev <[email protected]> -Date: Tue Jan 27 15:51:18 2015 +0300 - - "unshare()" support is configurable now - -diff --git a/configure.ac b/configure.ac -index f474478..059ade0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -87,6 +87,17 @@ AS_HELP_STRING(--enable-socket-library, - [build libclsync socket library, default: no])) - AM_CONDITIONAL([LIBCLSYNC], [test "x$enable_socket_library" = "xyes"]) - -+dnl --enable-unshare -+AC_ARG_ENABLE(unshare, -+AS_HELP_STRING(--enable-unshare, -+[enable support of unshare(), default: yes]), [], [enable_unshare="yes"]) -+ -+HAVE_UNSHARE=0 -+AS_IF([ test "x$enable_unshare" = "xyes" ], -+[ -+ AC_CHECK_FUNC([unshare], [HAVE_UNSHARE=1], [AC_MSG_FAILURE([Cannot find function unshare()])]) -+]) -+ - dnl --enable-highload-locks - AC_ARG_ENABLE(highload-locks, - AS_HELP_STRING(--enable-highload-locks, -@@ -155,9 +166,6 @@ AC_CHECK_FUNC([getmntent], [HAVE_GETMNTENT=1]) - dnl searching for pivot_root - AC_CHECK_FUNC([pivot_root], [HAVE_PIVOTROOT=1]) - --dnl searching for unshare --AC_CHECK_FUNC([unshare], [HAVE_UNSHARE=1]) -- - dnl libcgroup check - AC_ARG_WITH(libcgroup, - AS_HELP_STRING(--with-libcgroup, diff --git a/app-admin/clsync/files/clsync-0.4-unshare-ifdef.patch b/app-admin/clsync/files/clsync-0.4-unshare-ifdef.patch deleted file mode 100644 index 84116dd..0000000 --- a/app-admin/clsync/files/clsync-0.4-unshare-ifdef.patch +++ /dev/null @@ -1,34 +0,0 @@ -commit a437518de6813202ab9cef124a6ca085d3eb555d -Author: Dmitry Yu Okunev <[email protected]> -Date: Tue Jan 27 18:56:02 2015 +0300 - - Added missed "#ifdef"-s for unshare() - -diff --git a/privileged.c b/privileged.c -index 4b35514..fafd5b7 100644 ---- a/privileged.c -+++ b/privileged.c -@@ -1747,7 +1747,9 @@ int privileged_init(ctx_t *ctx_p) - - SAFE ( pthread_mutex_lock(pthread_mutex_runner_p), return errno;); - -+# ifdef UNSHARE_SUPPORT - unshare(CLONE_NEWIPC); -+# endif - - switch (ctx_p->flags[SPLITTING]) { - case SM_THREAD: { -@@ -1792,11 +1794,13 @@ int privileged_init(ctx_t *ctx_p) - } - critical_on(!helper_isalive()); - -+# ifdef UNSHARE_SUPPORT - // The rest routines - if (ctx_p->flags[DETACH_NETWORK] == DN_NONPRIVILEGED) { - SAFE ( cap_enable(CAP_TO_MASK(CAP_SYS_ADMIN)), return errno; ); - SAFE ( unshare(CLONE_NEWNET), return errno; ); - } -+# endif - SAFE ( cap_drop(ctx_p, 0), return errno; ); - - debug(4, "Waiting for the privileged thread to get prepared"); diff --git a/app-admin/clsync/files/clsync-0.4-unused-deps.patch b/app-admin/clsync/files/clsync-0.4-unused-deps.patch deleted file mode 100644 index db547fe..0000000 --- a/app-admin/clsync/files/clsync-0.4-unused-deps.patch +++ /dev/null @@ -1,140 +0,0 @@ -Adapted commit 756ae28750b514473ae235218d466dc6fa960c30 -Author: Dmitry Yu Okunev <[email protected]> -Date: Thu Jan 29 15:17:39 2015 +0300 - - [configure.ac] Removed dependency on libseccomp; renamed "--with-libseccomp" -> "--enable-seccomp", "--with-capabilities" -> "--enable-capabilities" - ---- clsync-0.4/configure.ac.orig 2015-02-11 01:52:54.104682884 +0300 -+++ clsync-0.4/configure.ac 2015-02-11 01:58:07.397580398 +0300 -@@ -145,6 +145,51 @@ - ) - AS_IF([test $paranoid -eq 2], [CPPFLAGS="${CPPFLAGS} -DVERYPARANOID"]) - -+dnl searching for seccomp -+AC_ARG_ENABLE(seccomp, -+ AS_HELP_STRING(--enable-seccomp, -+ [Enable seccomp support be able to forbid extra syscalls; values: no, check, yes; default: check]), -+ , -+ [enable_seccomp=check] -+) -+ -+case "$enable_seccomp" in -+ yes) -+ AC_CHECK_TYPES([struct seccomp_data], [HAVE_SECCOMP=1], [AC_MSG_FAILURE([Cannot find valid linux/seccomp.h])], [[#include <linux/seccomp.h>]]) -+ ;; -+ check) -+ AC_CHECK_TYPES([struct seccomp_data], [HAVE_SECCOMP=1], , [[#include <linux/seccomp.h>]]) -+ ;; -+esac -+ -+dnl capabilities check -+AC_ARG_ENABLE(capabilities, -+ AS_HELP_STRING(--enable-capabilities, -+ [Enable linux capabilities support; values: no, check, yes; default: check]), -+ , -+ [enable_capabilities=check] -+) -+ -+case "$enable_capabilities" in -+ yes) -+ AC_CHECK_FUNC([capset], -+ [ -+ AC_CHECK_HEADER(sys/capability.h, [HAVE_CAPABILITIES=2], [AC_MSG_FAILURE([Cannot find sys/capability.h])]) -+ ], -+ [ -+ AC_MSG_FAILURE([There is no capabilities support on this system]) -+ ] -+ ) -+ ;; -+ check) -+ AC_CHECK_FUNC([capset], -+ [ -+ AC_CHECK_HEADER(sys/capability.h, [HAVE_CAPABILITIES=2]) -+ ] -+ ) -+ ;; -+esac -+ - # Checks for programs. - AC_PROG_CC_C99 - AC_PROG_INSTALL -@@ -201,34 +246,6 @@ - ;; - esac - --dnl capabilities check --AC_ARG_WITH(capabilities, -- AS_HELP_STRING(--with-capabilities, -- [Enable linux capabilities support; values: no, check, yes; default: check]), -- [], -- [with_capabilities=check] --) -- --case "$with_capabilities" in -- yes) -- AC_CHECK_FUNC([capset], -- [ -- AC_CHECK_HEADER(sys/capability.h, [HAVE_CAPABILITIES=2], [AC_MSG_FAILURE([Cannot find sys/capability.h])]) -- ], -- [ -- AC_MSG_FAILURE([There is no capabilities support on this system]) -- ] -- ) -- ;; -- check) -- AC_CHECK_FUNC([capset], -- [ -- AC_CHECK_HEADER(sys/capability.h, [HAVE_CAPABILITIES=2]) -- ] -- ) -- ;; --esac -- - dnl tre check - - #AC_ARG_WITH(tre, -@@ -433,31 +450,6 @@ - - AS_IF([test "$HAVE_INOTIFY" != ""], [AC_CHECK_FUNC([inotify_init1], [], [INOTIFY_OLD=1])]) - --dnl searching for seccomp --AC_ARG_WITH(libseccomp, -- AS_HELP_STRING(--with-libseccomp, -- [Enable seccomp support be able to forbid extra syscalls; values: no, check, yes; default: check]), -- [], -- [with_libseccomp=check] --) -- --case "$with_libseccomp" in -- yes) -- AC_CHECK_TYPES([scmp_filter_ctx], [], [AC_MSG_FAILURE([Cannot find valid seccomp.h])], [[#include <seccomp.h>]]) -- AC_CHECK_DECLS([seccomp_syscall_resolve_name_arch], [], [AC_MSG_FAILURE([Cannot find valid seccomp.h])], [[#include <seccomp.h>]]) -- AC_CHECK_TYPES([struct seccomp_data], [HAVE_SECCOMP=1], [AC_MSG_FAILURE([Cannot find valid linux/seccomp.h])], [[#include <linux/seccomp.h>]]) -- ;; -- check) -- AC_CHECK_TYPES([scmp_filter_ctx], [ -- AC_CHECK_DECLS([seccomp_syscall_resolve_name_arch], [ -- AC_CHECK_TYPES([struct seccomp_data], [HAVE_SECCOMP=1], [], [[#include <linux/seccomp.h>]]) -- ], [], [[#include <seccomp.h>]]) -- ], [], [[#include <seccomp.h>]]) -- ;; --esac --AS_IF([test "$HAVE_CAPABILITIES" != ""], [ --]) -- - AM_CONDITIONAL([HAVE_KQUEUE], [test "x$HAVE_KQUEUE" != "x"]) - AM_CONDITIONAL([HAVE_INOTIFY], [test "x$HAVE_INOTIFY" != "x"]) - AM_CONDITIONAL([INOTIFY_OLD], [test "x$INOTIFY_OLD" != "x"]) -diff --git a/privileged.c b/privileged.c -index 668a536..0e773cc 100644 ---- a/privileged.c -+++ b/privileged.c -@@ -59,7 +59,7 @@ - #include "privileged.h" - - #ifdef SECCOMP_SUPPORT --# include <seccomp.h> // __NR_* -+# include <syscall.h> // __NR_* - # include <sys/prctl.h> // prctl() - # include <linux/filter.h> // struct sock_filter - # include <linux/seccomp.h> // SECCOMP_RET_* diff --git a/app-admin/clsync/files/clsync-0.4-version.patch b/app-admin/clsync/files/clsync-0.4-version.patch deleted file mode 100644 index 58eea5e..0000000 --- a/app-admin/clsync/files/clsync-0.4-version.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit e9eeb552896a3ac3f4f1e9d72ecab6a200f3c70c -Author: Andrew Savchenko <[email protected]> -Date: Tue Jan 27 21:54:21 2015 +0300 - - update package string - -diff --git a/configure.ac b/configure.ac -index 45f5a23..3e0b3cc 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2,7 +2,7 @@ - # Process this file with autoconf to produce a configure script. - - AC_PREREQ([2.59]) --AC_INIT([clsync],[0.3],[Dmitry Yu Okunev <[email protected]>],,[https://github.com/xaionaro/clsync]) -+AC_INIT([clsync],[0.4],[Dmitry Yu Okunev <[email protected]>],,[https://github.com/xaionaro/clsync]) - AC_CONFIG_SRCDIR([sync.c]) - AC_CONFIG_MACRO_DIR([m4]) - AM_INIT_AUTOMAKE([1.11 foreign -Wall -Wno-portability]) diff --git a/app-admin/clsync/files/clsync.conf b/app-admin/clsync/files/clsync.conf index 024c0f5..91f38f1 100644 --- a/app-admin/clsync/files/clsync.conf +++ b/app-admin/clsync/files/clsync.conf @@ -13,6 +13,6 @@ #sync-handler = /etc/clsync/action.sh #rules-dir = /etc/clsync/rules #lists-dir = /tmp/clsync -#pthread = 1 +#threading = safe #delay-sync = 5 #delay-collect = 5 diff --git a/app-admin/clsync/files/clsync.conf-2 b/app-admin/clsync/files/clsync.conf-2 deleted file mode 100644 index 91f38f1..0000000 --- a/app-admin/clsync/files/clsync.conf-2 +++ /dev/null @@ -1,18 +0,0 @@ -# clsync system configuration file -# -# General recommendations: -# 1. Put --dir-lists on tmpfs. -# 2. Use --uid and --gid to drop privileges whenever possible. -# 3. Keeep your clsync rules and sync scripts in /etc/clsync/. - -[default] -# Put your options here, see clsync man pages for a list of valid options. -# Also check examples directory (/usr/share/doc/clsync-*/examples). -# -#watch-dir = /what/dir/to/sync -#sync-handler = /etc/clsync/action.sh -#rules-dir = /etc/clsync/rules -#lists-dir = /tmp/clsync -#threading = safe -#delay-sync = 5 -#delay-collect = 5 diff --git a/app-admin/clsync/files/clsync.initd b/app-admin/clsync/files/clsync.initd index 6951402..e37e9db 100644 --- a/app-admin/clsync/files/clsync.initd +++ b/app-admin/clsync/files/clsync.initd @@ -1,5 +1,5 @@ #!/sbin/runscript -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -9,7 +9,7 @@ command="/usr/bin/clsync" pidfile="/var/run/${SVCNAME}.pid" -command_args="--background --syslog --pid-file=${pidfile} \ +command_args="--background --output=syslog --pid-file=${pidfile} \ ${conffile} ${CLSYNC_OPTS}" start_stop_daemon_args="${cmd_nice} ${cmd_ionice}" diff --git a/app-admin/clsync/files/clsync.initd-2 b/app-admin/clsync/files/clsync.initd-2 deleted file mode 100644 index c305719..0000000 --- a/app-admin/clsync/files/clsync.initd-2 +++ /dev/null @@ -1,18 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -[[ -n "${CLSYNC_CONF}" ]] && conffile="--config-file ${CLSYNC_CONF}" -[[ -n "${CLSYNC_NICE}" ]] && cmd_nice="--nice ${CLSYNC_NICE}" -[[ -n "${CLSYNC_IONICE}" ]] && cmd_ionice="--ionice ${CLSYNC_IONICE}" - -command="/usr/bin/clsync" -pidfile="/var/run/${SVCNAME}.pid" -command_args="--background --output=syslog --pid-file=${pidfile} \ -${conffile} ${CLSYNC_OPTS}" -start_stop_daemon_args="${cmd_nice} ${cmd_ionice}" - -depend() { - use net -} diff --git a/app-admin/clsync/metadata.xml b/app-admin/clsync/metadata.xml index a5d0961..9bc1cbe 100644 --- a/app-admin/clsync/metadata.xml +++ b/app-admin/clsync/metadata.xml @@ -2,7 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> <maintainer> - <email>[email protected]</email> + <email>[email protected]</email> <name>Andrew Savchenko</name> </maintainer> <longdescription> @@ -18,8 +18,8 @@ <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-hardened">Enable extra security checks. This may hurt performance.</flag> - <flag name="gio">Enable GIO for FS monitoring (glib based alternative to inotify interface, not recommended, but if both are compiled, may be selected at runtime).</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>
