* [gentoo-commits] dev/bircoph:master commit in: app-admin/clsync/files/, app-admin/clsync/
@ 2015-01-28 17:17 Andrew Savchenko
0 siblings, 0 replies; 3+ messages in thread
From: Andrew Savchenko @ 2015-01-28 17:17 UTC (permalink / raw
To: gentoo-commits
commit: 2ca1f0722f5d7959b2613080049988875e8642ad
Author: Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Wed Jan 28 17:17:00 2015 +0000
Commit: Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Wed Jan 28 17:17:00 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=dev/bircoph.git;a=commit;h=2ca1f072
Apply upsteam patches
---
app-admin/clsync/ChangeLog | 10 ++++
app-admin/clsync/Manifest | 7 ++-
.../{clsync-0.4.ebuild => clsync-0.4-r1.ebuild} | 6 ++-
.../clsync/files/clsync-0.4-direct_mode.patch | 61 ++++++++++++++++++++++
.../clsync/files/clsync-0.4-handler_path.patch | 30 +++++++++++
app-admin/clsync/files/clsync-0.4-hl_locks.patch | 37 +++++++++++++
6 files changed, 148 insertions(+), 3 deletions(-)
diff --git a/app-admin/clsync/ChangeLog b/app-admin/clsync/ChangeLog
index 684200d..59b8cd7 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: $
+*clsync-0.4-r1 (28 Jan 2015)
+
+ 28 Jan 2015; Andrew Savchenko <bircoph@gentoo.org> -clsync-0.4.ebuild,
+ +clsync-0.4-r1.ebuild, +files/clsync-0.4-direct_mode.patch,
+ +files/clsync-0.4-handler_path.patch, +files/clsync-0.4-hl_locks.patch:
+ Add upstream patches:
+ - fix highload locks segfault on unicore systems;
+ - support handlers without absolute path;
+ - fix direct mode root directory change passing.
+
28 Jan 2015; Andrew Savchenko <bircoph@gentoo.org> clsync-0.4.ebuild,
clsync-9999.ebuild:
Fix build with USE=gio
diff --git a/app-admin/clsync/Manifest b/app-admin/clsync/Manifest
index 87e4664..76cb1d4 100644
--- a/app-admin/clsync/Manifest
+++ b/app-admin/clsync/Manifest
@@ -1,4 +1,7 @@
+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-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-version.patch 694 SHA256 8b899b74f59dc6acb134ab4b2254e222c8d148ed827054c1e263625a73405c9d SHA512 9a08ecf5c062827d8e02b4822a879115d394d36d6c81bc138dee4b65519c6a2e333445e953965057d8b32ad3bca6ced8a699f59d798d31bb022c4b9129d8b681 WHIRLPOOL fd214257b4a2fd24120a4620df55edd78010f5db507493b3e0c1bd06f91e97e2b3caffdbabad4c4b0d1cc7c3f02d9d290805c4d6e10edf5e44d081ae1b837e1b
@@ -12,7 +15,7 @@ DIST clsync-0.3.tar.gz 122664 SHA256 054f7032993f51a35cf3fdc91aeb3ad358f63432f8d
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.ebuild 3096 SHA256 7e2ad252a7419d775f1b0a19a6289cf3858b4629c73d1f0b9b1c0cd929474fa7 SHA512 a08a6255f3b0d604e04e9808fb48a5eebc49c0111498d2451eecd7441c22db9c3810589a02f168ad13f53ecc1cbe8bde744263b2fee985a2ae21813d9f34a173 WHIRLPOOL ab24f67e7a1915bd5069b52c0a79e5460b8a55d3daaacb5a44f478ce00d406918ef0c7783605055a444e19f05d5b324be48b6c33b2d1306ff69b5f29b5690e75
+EBUILD clsync-0.4-r1.ebuild 3243 SHA256 c0583b29185b29fbb12116816c23c2acc962e41cfda3785a05d0cd51cb4756ad SHA512 798e41697761bd184d201faf71467e6092e63047ede2db53c0bd2e979e046df2f81e2ee99e2b1b7e6b341f13f17cd1b35f8bfa02790940f70e769eda3af7e4e5 WHIRLPOOL 31036a9fe1032b305efd2fbdf89ac0235ea9129ef8b72b91d24ac332e3193c1caed628f279078a2956e1f3446648786e9da47026275c8855fa34242346970792
EBUILD clsync-9999.ebuild 2921 SHA256 368bc238e62e6fc786f7b658e46a4675826df7f15031f9e0b4e433c293ae76a1 SHA512 b3a180645cc867d6a552472adbf4f59c35a05e43d3dc7dadafb8806266db8c3834eef0650dbb097e2cbb7344db5da46c73f17867949e56ecba17d4bb757f3d19 WHIRLPOOL 597b2f3e058c2e33c61105dd80d0afc30f719a7874d1d87fc394edbfa8442cf4114dd6ad7bbd26ef437b7e454f23914f45bcbcc77c6df86f6f6b345f7b70d34c
-MISC ChangeLog 4079 SHA256 8fa84d5e01370eaddb6f5dc17fa1fedf7f0a571e10561452e0d507b98ae66f5b SHA512 1e40d43dc7cb380247a1e782d49beede0704a098d1a82a8fb6fdb96f4dc8378273fb49572f1572e2526baa111cb98c7641a276fe0dcefe81568d9a29cd4748e1 WHIRLPOOL f3e34c4537a4af4f5741339fccaa8300f0ed3bb7c8e68df510189d586caa81dbcb9e7b2937d7474ddcb71175416041f7cd40119dfafccb62b4c82b166b78bd41
+MISC ChangeLog 4490 SHA256 bde1cd1db9e9a46e28780fded938bd79b1fd1d4c5563020ace55d2dcdbc1f27d SHA512 b9cc4630cd85fa3ba600b5fbeaf6c7857b9ba5aa5e61a21457f883518ea9bb0747df4861757561f1aeba6152888eb1df02457f429184bb6fd80f7c337b3fac18 WHIRLPOOL b851b6517b42eeba99b52a88c08ff075b5cc8ec644678c56267df7547e90ba94e6ca81874fee942bf8e402f2ecdef90df1435fc116e9f077290292acaeac7fd5
MISC metadata.xml 1668 SHA256 b11ec92e63438d8968523e38977cfca79c2598fd5b78a663fe647393f322c5b8 SHA512 9d24c1fbb0eb18971aea4bead3ee6d28b48891699c17bfe238866317f90fbe3974d65af2d3673397f6370c96de7d34d9f3b08e62b99dc0dc285bbf35bdf96bf5 WHIRLPOOL 42087cfebd77371e899b50a370334c589f917f4368d877041d874abc836d52ed70b1d24ea475b08f906df81d65b87c105a170b27e747558fb789795196dd4f77
diff --git a/app-admin/clsync/clsync-0.4.ebuild b/app-admin/clsync/clsync-0.4-r1.ebuild
similarity index 94%
rename from app-admin/clsync/clsync-0.4.ebuild
rename to app-admin/clsync/clsync-0.4-r1.ebuild
index f7bda21..263c618 100644
--- a/app-admin/clsync/clsync-0.4.ebuild
+++ b/app-admin/clsync/clsync-0.4-r1.ebuild
@@ -47,11 +47,15 @@ pkg_pretend() {
}
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}-version.patch" \
+ "${FILESDIR}/${P}-direct_mode.patch" \
+ "${FILESDIR}/${P}-handler_path.patch" \
+ "${FILESDIR}/${P}-hl_locks.patch"
eautoreconf
}
diff --git a/app-admin/clsync/files/clsync-0.4-direct_mode.patch b/app-admin/clsync/files/clsync-0.4-direct_mode.patch
new file mode 100644
index 0000000..2a9c06e
--- /dev/null
+++ b/app-admin/clsync/files/clsync-0.4-direct_mode.patch
@@ -0,0 +1,61 @@
+commit 1fe2a05438de390dc12a653bc50ddf591fa79733
+Author: Dmitry Yu Okunev <dyokunev@ut.mephi.ru>
+Date: Wed Jan 28 11:39:09 2015 +0300
+
+ Fixed the path '' in direct mode.
+
+ '' -> '.'
+
+ Thanks for bugreport to: Andrew A Savchenko <bircoph@gentoo.org>
+
+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-handler_path.patch b/app-admin/clsync/files/clsync-0.4-handler_path.patch
new file mode 100644
index 0000000..5a61544
--- /dev/null
+++ b/app-admin/clsync/files/clsync-0.4-handler_path.patch
@@ -0,0 +1,30 @@
+commit a747384216597df71c99453dc5161100e1b41181
+Author: Dmitry Yu Okunev <dyokunev@ut.mephi.ru>
+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
new file mode 100644
index 0000000..f027935
--- /dev/null
+++ b/app-admin/clsync/files/clsync-0.4-hl_locks.patch
@@ -0,0 +1,37 @@
+commit 76c75f8180a7e7592da927e8b4c8f5f067470d05
+Author: Dmitry Yu Okunev <dyokunev@ut.mephi.ru>
+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 <bircoph@gentoo.org>
+
+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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] dev/bircoph:master commit in: app-admin/clsync/files/, app-admin/clsync/
@ 2015-05-24 13:41 Andrew Savchenko
0 siblings, 0 replies; 3+ messages in thread
From: Andrew Savchenko @ 2015-05-24 13:41 UTC (permalink / raw
To: gentoo-commits
commit: 6b3247e19903e3b963e96d7da09bda27b57bf41d
Author: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
AuthorDate: Sun May 24 13:40:48 2015 +0000
Commit: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Sun May 24 13:40:48 2015 +0000
URL: https://gitweb.gentoo.org/dev/bircoph.git/commit/?id=6b3247e1
clsync: add more patches
app-admin/clsync/ChangeLog | 6 ++
app-admin/clsync/Manifest | 8 +--
app-admin/clsync/clsync-0.4.1.ebuild | 11 ++--
.../clsync/files/clsync-0.4.1-capabilities.patch | 68 ----------------------
.../files/clsync-0.4.1-check-exec-arguments.patch | 21 -------
.../clsync/files/clsync-0.4.1-splitting.patch | 35 -----------
6 files changed, 15 insertions(+), 134 deletions(-)
diff --git a/app-admin/clsync/ChangeLog b/app-admin/clsync/ChangeLog
index fd27b73..2064b92 100644
--- a/app-admin/clsync/ChangeLog
+++ b/app-admin/clsync/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 24 May 2015; Andrew Savchenko <bircoph@gentoo.org> clsync-0.4.1.ebuild,
+ -files/clsync-0.4.1-capabilities.patch,
+ -files/clsync-0.4.1-check-exec-arguments.patch,
+ -files/clsync-0.4.1-splitting.patch:
+ Apply bundled tarball of upstream fixes.
+
19 May 2015; Andrew Savchenko <bircoph@gentoo.org> clsync-9999.ebuild,
+files/clsync-0.4.1-capabilities.patch,
+files/clsync-0.4.1-check-exec-arguments.patch,
diff --git a/app-admin/clsync/Manifest b/app-admin/clsync/Manifest
index 4faf0ec..df5c912 100644
--- a/app-admin/clsync/Manifest
+++ b/app-admin/clsync/Manifest
@@ -1,11 +1,9 @@
-AUX clsync-0.4.1-capabilities.patch 2027 SHA256 3bc8150cd1479b02b132902e9b9efacce3eb94748e52e0023fea954c6933d5de SHA512 ff435c7e1d7cd93ab410f42c461b8ea4ef3807b0c7656e447fafc54e007b93e54b216b63f43b5a440e2ed9b8c01abd42cd3b31dfd575e5c8b0b07151eff79bb6 WHIRLPOOL d8b3ae0dd2fdab82fd6705181356efbdd576ef5d16f62899fff7093749432e3751659b27584550cc7da07f172c6e186b3fb503df5640ba1f7af9283cfeee9e75
-AUX clsync-0.4.1-check-exec-arguments.patch 800 SHA256 5f7711d6f79c956e0014426a94943ccbdad51cf0ea228895d8f9fd631d7f69f4 SHA512 649c07543fe3382eec23073ba3ed6901bfde984e4cb05e2eba41282fd9343c465ae4ca0e0d8534c293152764a547cbc463b7c7b625bfdf7a34a242b7f567738a WHIRLPOOL 98eefa5fcceecf3738fec98fe80a5e945183fb68d6edc827cfa98344bb7be5fbe52a2c25380cec290c276dd3be2f77323787ed1dc24dfbbd65e3d05e8f49c5c0
-AUX clsync-0.4.1-splitting.patch 983 SHA256 0f99e07d0f6cfef050b2bba1cc5c1e715741a83df1ef6e35f02d271210e46f9e SHA512 1efbe3f2341cf861926af64adaa76097894cea622df967625afbe06cf871e2d47a2f76020b8ef9b8b3942e109884f582db98848ed7734b3d8105c65e4dc4ca46 WHIRLPOOL b493c716c03e47057ff83947b30f81c1f68f3540810117c72fa1289308e9944849940ce172934043e38d7a2fe228c9e38adc416d6ec44b0e5bab198b9128ebbc
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.tar.gz 253890 SHA256 3f14a72d7c3c1747ea908e373f25bd1918ce00450492fbb7094549db6bf21e27 SHA512 875280f706026d44806b92c22fa58d016136b2792f67a6b7e77f932465081da7a1ebaf22c25e538e4b58bfe04cd1cd5450ecab99c3df53ddd2a0fa966442d444 WHIRLPOOL 10ab11821766f7d16d03993069ac4da5fe362a1e5977ea6721e49ada7044d3659e59b507b03be4de09609b0a0ca9d7878407d7b6e1f40df5dbe1d041dac373cb
-EBUILD clsync-0.4.1.ebuild 2925 SHA256 c835ef7fbcf59e58d27e5ab07aa758c855b8736b03c3df316ae62e8959203cea SHA512 00e900de4aa63f8962dd3089579ab468faa6d984f0dff0481485a7b7d20179bbee3c2753088093ba00712dfa5930b70ba2b22f7a8fd3087f97d52b5fabdc7756 WHIRLPOOL 99aaa540f719f0543064c7681400da03357d478d70574958cdf923c856393d3920391719b0e588b5f757e90448cc4030491bdf0308cd1a9b3c4e9eec36c4d2ef
+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 6012 SHA256 672c45533b851157cb9980aa0cb241fb2afc073ed1657edd99f140a7ed314aa3 SHA512 d0dd82d93686ac2ebd60153b95d617e66b06ba2b361dd04d6b438b22dc9765e6e9bbbc39063200c0bef2dddaf9ca905aa8f2afe8b4da947e1079e81cb349cdcd WHIRLPOOL 0929582207753a13ed733c136ccce5eff853ed39aa53de1e060803de32cb046dfe0c4b9dd6b2f2f948ca25237fcdf6088509c12f849acc6dabeea075cff1d187
+MISC ChangeLog 6261 SHA256 f439ec51bef7c7132c299a29253ef8470f5fc4f9ea99f0e9e54a9ce697e4e3df SHA512 b270e0c79a27cfbabb365373e3287f560365565531d0b30ea8b55407730649668832c7551d2d3a3c04b7bceee6dae6b31f7d1bd8b12b2ba04f0e06edfc63b009 WHIRLPOOL 3e967953e0b57213cc9911a3bb0686ddff7e40683b298b9a985627e20f73b21bc8ca120f4431c3025cb3b45ff8aa43a49706db4439f2c5dc5a1293622808dc27
MISC metadata.xml 1572 SHA256 6d90b9c0f0b37dffda05a9b5ca6d02f05ce0362eb8bf8fbe19e90c3f77570940 SHA512 5be148bc1f8b1ca76e2b5713bf5a9ecfc88c4c101620fbbf1cb4efcbe7b33a923038ea0c2d5b2d66689552a04b865c4b0625887baa98a80d64f486208143ce67 WHIRLPOOL e1cd84b85b5ac476407930f14217cfed16f67d3aeb221e61dffa94c688b69ada4f29f7a7e9f4f2b610f8730c10d700bff9148d6b871ca9d98e76eaa0c5de68c8
diff --git a/app-admin/clsync/clsync-0.4.1.ebuild b/app-admin/clsync/clsync-0.4.1.ebuild
index 6b60095..6dd6ec4 100644
--- a/app-admin/clsync/clsync-0.4.1.ebuild
+++ b/app-admin/clsync/clsync-0.4.1.ebuild
@@ -8,7 +8,11 @@ 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"
+ PVER="20150524"
+ 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
@@ -46,10 +50,7 @@ pkg_pretend() {
src_prepare() {
# upstream fixes for 0.4.1
- epatch \
- "${FILESDIR}/${P}-capabilities.patch" \
- "${FILESDIR}/${P}-check-exec-arguments.patch" \
- "${FILESDIR}/${P}-splitting.patch"
+ epatch "${WORKDIR}/${P}-${PVER}.patch"
eautoreconf
}
diff --git a/app-admin/clsync/files/clsync-0.4.1-capabilities.patch b/app-admin/clsync/files/clsync-0.4.1-capabilities.patch
deleted file mode 100644
index 83cf15c..0000000
--- a/app-admin/clsync/files/clsync-0.4.1-capabilities.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-commit 2589dd0217bf358c41dbd2d65390d0bf156a02b0
-Author: Dmitry Yu Okunev <dyokunev@ut.mephi.ru>
-Date: Tue May 19 13:26:32 2015 +0300
-
- Fixed: Permission denied on --enable-debug=no
-
- Bugreport: https://github.com/xaionaro/clsync/issues/133
-
-diff --git a/privileged.c b/privileged.c
-index 2a9d0f3..1c3117e 100644
---- a/privileged.c
-+++ b/privileged.c
-@@ -1054,19 +1054,28 @@ int privileged_handler(ctx_t *ctx_p)
- case -1:
- error("Cannot fork().");
- break;
-- case 0:
-+ case 0: {
-+ int rc;
-+ (void)rc; // anti-warning on ./configure --enable-debug=no
- #ifdef ANTIPARANOID
- if (ctx_p->privileged_gid != exec_gid)
- #endif
-- debug(4, "setgid(%u) == %i", exec_gid, setgid(exec_gid));
-+ {
-+ rc = setgid(exec_gid);
-+ debug(4, "setgid(%u) == %i", exec_gid, rc);
-+ }
-
- #ifdef ANTIPARANOID
- if (ctx_p->privileged_uid != exec_uid)
- #endif
-- debug(4, "setuid(%u) == %i", exec_uid, setuid(exec_uid));
-+ {
-+ rc = setuid(exec_uid);
-+ debug(4, "setuid(%u) == %i", exec_uid, rc);
-+ }
-
- debug(3, "execvp(\"%s\", argv)", file);
- exit(execvp(file, argv));
-+ }
- }
- cmd_ret_p->ret = (void *)(long)pid;
- debug(21, "/PA_FORK_EXECVP");
-@@ -1640,12 +1649,20 @@ int __privileged_fork_execvp(const char *file, char *const argv[])
- case -1:
- error("Cannot fork().");
- return -1;
-- case 0:
-- debug(4, "setgid(%u) == %i", __privileged_fork_execvp_gid, setgid(__privileged_fork_execvp_gid));
-- debug(4, "setuid(%u) == %i", __privileged_fork_execvp_uid, setuid(__privileged_fork_execvp_uid));
-+ case 0: {
-+ int rc;
-+ (void)rc; // anti-warning on ./configure --enable-debug=no
-+
-+ rc = setgid(__privileged_fork_execvp_gid);
-+ debug(4, "setgid(%u) == %i", __privileged_fork_execvp_gid, rc);
-+
-+ rc = setuid(__privileged_fork_execvp_uid);
-+ debug(4, "setuid(%u) == %i", __privileged_fork_execvp_uid, rc);
-+
- errno = 0;
- execvp(file, argv);
- exit(errno);
-+ }
- }
-
- return pid;
diff --git a/app-admin/clsync/files/clsync-0.4.1-check-exec-arguments.patch b/app-admin/clsync/files/clsync-0.4.1-check-exec-arguments.patch
deleted file mode 100644
index af76e4b..0000000
--- a/app-admin/clsync/files/clsync-0.4.1-check-exec-arguments.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 48bc49bc21ed0aea9c1b8a06434a0db31530b217
-Author: Dmitry Yu Okunev <dyokunev@ut.mephi.ru>
-Date: Tue May 19 16:45:36 2015 +0300
-
- Fixed name of option "--check-exec-arguments"
-
- Was "--check-exec-args"
-
-diff --git a/main.c b/main.c
-index 19e2fb8..e52429e 100644
---- a/main.c
-+++ b/main.c
-@@ -97,7 +97,7 @@ static const struct option long_options[] =
- {"secure-splitting", no_argument, NULL, SECURESPLITTING},
- # endif
- {"splitting", required_argument, NULL, SPLITTING},
-- {"check-execvp-args", optional_argument, NULL, CHECK_EXECVP_ARGS},
-+ {"check-execvp-arguments",optional_argument, NULL, CHECK_EXECVP_ARGS},
- {"add-permitted-hook-files",required_argument, NULL, ADDPERMITTEDHOOKFILES},
- # ifdef SECCOMP_SUPPORT
- {"seccomp-filter", optional_argument, NULL, SECCOMP_FILTER},
diff --git a/app-admin/clsync/files/clsync-0.4.1-splitting.patch b/app-admin/clsync/files/clsync-0.4.1-splitting.patch
deleted file mode 100644
index 259762d..0000000
--- a/app-admin/clsync/files/clsync-0.4.1-splitting.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-commit 582bb46d6350ad100ac5fbf1082988cf6bd5198c
-Author: Dmitry Yu Okunev <dyokunev@ut.mephi.ru>
-Date: Wed May 13 15:37:41 2015 +0300
-
- [paranoid=0] Fixed a segfault on thread/process splitting
-
- Fixes: https://github.com/xaionaro/clsync/issues/127
-
-diff --git a/malloc.c b/malloc.c
-index f320b84..a5ca48d 100644
---- a/malloc.c
-+++ b/malloc.c
-@@ -101,11 +101,11 @@ void *malloc_align(size_t size) {
- # endif
-
- total_size = size;
--# ifdef PARANOID
-+
-+ // Rounding total_size up to a number of times pagesize
- total_size += pagesize-1;
- total_size /= pagesize;
- total_size *= pagesize;
--# endif
-
- if (posix_memalign(&ret, pagesize, total_size))
- critical("(%li): Cannot allocate memory.", size);
-@@ -136,7 +136,7 @@ void *calloc_align(size_t nmemb, size_t size) {
- }
-
- char *strdup_protect(const char *src, int prot) {
-- size_t len = strlen(src);
-+ size_t len = strlen(src)+1;
- char *dst = malloc_align(len);
- strcpy(dst, src);
- if (mprotect(dst, len, prot))
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] dev/bircoph:master commit in: app-admin/clsync/files/, app-admin/clsync/
@ 2016-05-01 15:41 Andrew Savchenko
0 siblings, 0 replies; 3+ messages in thread
From: Andrew Savchenko @ 2016-05-01 15:41 UTC (permalink / raw
To: gentoo-commits
commit: 189c652cb4e3d30f777cd685a3dcba0dd4e6310c
Author: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
AuthorDate: Sun May 1 15:06:23 2016 +0000
Commit: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Sun May 1 15:06:23 2016 +0000
URL: https://gitweb.gentoo.org/dev/bircoph.git/commit/?id=189c652c
app-admin/clsync: sync with tree
- backport fixes
- GLEP 67 update
Package-Manager: portage-2.2.28
Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org>
app-admin/clsync/ChangeLog | 159 ------------------------------------
app-admin/clsync/Manifest | 6 --
app-admin/clsync/clsync-9999.ebuild | 6 +-
app-admin/clsync/files/clsync.initd | 2 +-
app-admin/clsync/metadata.xml | 34 ++++----
5 files changed, 22 insertions(+), 185 deletions(-)
diff --git a/app-admin/clsync/ChangeLog b/app-admin/clsync/ChangeLog
deleted file mode 100644
index 0f4fd77..0000000
--- a/app-admin/clsync/ChangeLog
+++ /dev/null
@@ -1,159 +0,0 @@
-# ChangeLog for app-admin/clsync
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
- 25 May 2015; Andrew Savchenko <bircoph@gentoo.org> -clsync-0.4.1.ebuild:
- Version 0.4.1 is in the tree now
-
- 24 May 2015; Andrew Savchenko <bircoph@gentoo.org> clsync-0.4.1.ebuild,
- -files/clsync-0.4.1-capabilities.patch,
- -files/clsync-0.4.1-check-exec-arguments.patch,
- -files/clsync-0.4.1-splitting.patch:
- Apply bundled tarball of upstream fixes.
-
- 19 May 2015; Andrew Savchenko <bircoph@gentoo.org> clsync-9999.ebuild,
- +files/clsync-0.4.1-capabilities.patch,
- +files/clsync-0.4.1-check-exec-arguments.patch,
- +files/clsync-0.4.1-splitting.patch:
- Version bump (0.4.1 testing)
-
- 11 Feb 2015; Andrew Savchenko <bircoph@gentoo.org> -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 <bircoph@gentoo.org> clsync-0.4-r1.ebuild,
- +files/clsync-0.4-unused-deps.patch:
- Port unused-depes patch from current HEAD.
-
- 10 Feb 2015; Andrew Savchenko <bircoph@gentoo.org> clsync-9999.ebuild:
- Adapt new chaneges
-
- 28 Jan 2015; Andrew Savchenko <bircoph@gentoo.org> metadata.xml:
- capabilities are fully implemented now
-
- 28 Jan 2015; Andrew Savchenko <bircoph@gentoo.org> clsync-0.4-r1.ebuild,
- clsync-9999.ebuild:
- Remove libcap dep: kernel interface is used now.
-
- 28 Jan 2015; Andrew Savchenko <bircoph@gentoo.org>
- +files/clsync-0.4-unset_env.patch:
- Add missed patch
-
-*clsync-0.4-r1 (28 Jan 2015)
-
- 28 Jan 2015; Andrew Savchenko <bircoph@gentoo.org> -clsync-0.4.ebuild,
- +clsync-0.4-r1.ebuild, +files/clsync-0.4-direct_mode.patch,
- +files/clsync-0.4-handler_path.patch, +files/clsync-0.4-hl_locks.patch:
- Add upstream patches:
- - fix highload locks segfault on unicore systems;
- - support handlers without absolute path;
- - fix direct mode root directory change passing;
- - fix segfault on unset $HOME.
-
- 28 Jan 2015; Andrew Savchenko <bircoph@gentoo.org> clsync-0.4.ebuild,
- clsync-9999.ebuild:
- Fix build with USE=gio
-
- 28 Jan 2015; Andrew Savchenko <bircoph@gentoo.org> clsync-0.4.ebuild,
- +files/clsync-0.4-gio.patch, +files/clsync-0.4-version.patch:
- Fix GIO only build. Update version.
-
- 28 Jan 2015; Andrew Savchenko <bircoph@gentoo.org> clsync-0.4.ebuild,
- clsync-9999.ebuild:
- Require at least one FS handler to be enabled.
-
- 27 Jan 2015; Andrew Savchenko <bircoph@gentoo.org> metadata.xml:
- Update gio USE flag description.
-
- 27 Jan 2015; Andrew Savchenko <bircoph@gentoo.org> clsync-0.4.ebuild,
- clsync-9999.ebuild:
- Remove empty variables
-
-*clsync-0.4 (27 Jan 2015)
-
- 27 Jan 2015; Andrew Savchenko <bircoph@gentoo.org> +clsync-0.4.ebuild,
- clsync-9999.ebuild, +files/clsync-0.4-unshare-configure.patch,
- +files/clsync-0.4-unshare-ifdef.patch, metadata.xml:
- Version bump.
-
-*clsync-0.3 (15 May 2014)
-
- 15 May 2014; Andrew Savchenko <bircoph@gmail.com> clsync-0.2.1.ebuild,
- +clsync-0.3.ebuild, clsync-9999.ebuild, files/clsync.conf-2,
- files/clsync.initd-2, files/clsync.conf, files/clsync.confd,
- files/clsync.initd, metadata.xml:
- Version bump. Now package.use.mask is used for flags in
- development.
-
-*clsync-0.2.1 (15 Oct 2013)
-
- 15 Oct 2013; Andrew Savchenko <bircoph@gmail.com> -clsync-0.1.ebuild,
- -files/clsync-0.1.confd, -files/clsync-0.1.initd, +clsync-0.2.1.ebuild:
- Version bump. Remove old.
-
- 27 Sep 2013; Andrew Savchenko <bircoph@gmail.com> files/clsync.initd:
- Remove tread killer hack, because bug #44 was fixed.
-
- 21 Sep 2013; Andrew Savchenko <bircoph@gmail.com> files/clsync.initd:
- Terminate clsync offsprings which are still alive after clsync
- termination. clsync send signals to its childs, but not to further
- offsprings (grandchildren and so on), so this offsprings may not
- die properly in childs doesn't handle this. Thus sophisticated
- measures are required for cleanup.
-
- 20 Sep 2013; Andrew Savchenko <bircoph@gmail.com> clsync-9999.ebuild,
- files/clsync.confd, files/clsync.initd:
- Depend mhash on clsync. Inform users about multiplexed init script.
- Update options names. Add nice, ionice and retry support.
-
- 16 Sep 2013; Andrew Savchenko <bircoph@gmail.com> clsync-9999.ebuild,
- +files/clsync-0.1.confd, +files/clsync-0.1.initd, +files/clsync.conf,
- files/clsync.confd, files/clsync.initd:
- Add config file support. For v0.1 use old init.d/conf.d because
- v0.1 doesn't support config files.
-
- 13 Sep 2013; Andrew Savchenko <bircoph@gmail.com> files/clsync.initd:
- Remove non-standard retry approach, this bug is fixed now.
- Add syslog support.
-
- 09 Sep 2013; Andrew Savchenko <bircoph@gmail.com> clsync-9999.ebuild:
- Force 0700 permissions or /etc/clsync. License update. Conf.d
- recommendations update.
-
-*clsync-0.1 (07 Sep 2013)
-
- 07 Sep 2013; Andrew Savchenko <bircoph@gmail.com> +clsync-0.1.ebuild,
- clsync-9999.ebuild, +files/clsync.confd, +files/clsync.initd, metadata.xml:
- Version bump for 0.1 release. Add capabilities support. Install
- init script and conf file. Keep config directory: rules are
- supposed to be here. Add rsync hinting information.
-
- 26 Aug 2013; Andrew Savchenko <bircoph@gmail.com> clsync-9999.ebuild,
- metadata.xml:
- Add mhash and clustering support.
-
- 21 Aug 2013; Andrew Savchenko <bircoph@gmail.com> clsync-9999.ebuild:
- Fix typo if docs path.
-
- 21 Aug 2013; Andrew Savchenko <bircoph@gmail.com> clsync-9999.ebuild,
- metadata.xml:
- Use new features of clsync build system. Utilize all flags.
-
- 21 Aug 2013; Andrew Savchenko <bircoph@gmail.com> -clsync-0.0.ebuild,
- clsync-9999.ebuild:
- Base autotools version. Installation and flags control bugs are
- still to be fixed in clsync itself.
-
- 20 Aug 2013; Andrew Savchenko <bircoph@gmail.com> -clsync-0.0.ebuild,
- clsync-9999.ebuild:
- Fix html and examples installation. Remove buggy v0.0.
-
- 20 Aug 2013; Andrew Savchenko <bircoph@gmail.com> ChangeLog:
- Initial ebuild.
-
diff --git a/app-admin/clsync/Manifest b/app-admin/clsync/Manifest
deleted file mode 100644
index 1b3d407..0000000
--- a/app-admin/clsync/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-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
-EBUILD clsync-9999.ebuild 2900 SHA256 c242932a47ef051f86fccf4e7b553f5ba0eee03ac35fc533b4fe8d6c6a8d159a SHA512 40a9a1668eb6b2b7b764c737914487e308fea312b2fb28a0162f69998fa5f8605c5538ef9511fcd16b9a1ccba81b25d6de4cb2f27ccb94c38824a8a21836e80b WHIRLPOOL 6ce58efa5aed48578b576485dbc651186dc9400965924ca3f096ba91d5f85f8c3bd4757e4e1b395f70a13c5da1358b58fdf97421643e8867089d4570f8e85849
-MISC ChangeLog 6372 SHA256 c29f45e0970b8f494b3984e447564fba06b721413fa263689b98f1c1d595f60f SHA512 b8fd4c46c76d92621e332fd402981ab87e3fe2ad77a6ca0d6c92f15f2ff43466bccb1afc153d2aa5aee37006d19a50aaadae03f1903efb554194b552a945154e WHIRLPOOL 9ad79840a4b411491e7cb3aacb8e63e1a4bc61c904f44fce3fb7969ba968c74e8702994fa1c9487f8c3e404fec15b0d264bfabb39c172bf4ebf7926c44e5dd4d
-MISC metadata.xml 1692 SHA256 ca7310d5bf9634ab1a9306bd90f9b756b1c5dcd01a3d12bc7983c42af5567499 SHA512 0a83cc81b23213b9dd6c69310de8aea050140f8b398b18eac1157bdfb1394512c0b291b35c324686ebf7716ee0816e0ad92cd7176d2cb1a8cf363950ad93ece6 WHIRLPOOL 395bf8817d1341b2d21cf98fe2205952bd6009bed4847be478787109b8da60db24b675f36fb294bce5300005087a22b62cf7c3c0912a646ea67ffee92457eeb2
diff --git a/app-admin/clsync/clsync-9999.ebuild b/app-admin/clsync/clsync-9999.ebuild
index 4816a25..617fed4 100644
--- a/app-admin/clsync/clsync-9999.ebuild
+++ b/app-admin/clsync/clsync-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
EAPI=5
@@ -29,7 +29,7 @@ REQUIRED_USE="
mhash? ( cluster )
seccomp? ( caps )
"
-RDEPEND="
+CDEPEND="
dev-libs/glib:2
cgroups? ( dev-libs/libcgroup )
mhash? ( app-crypt/mhash )
diff --git a/app-admin/clsync/files/clsync.initd b/app-admin/clsync/files/clsync.initd
index e37e9db..d350f3d 100644
--- a/app-admin/clsync/files/clsync.initd
+++ b/app-admin/clsync/files/clsync.initd
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
[[ -n "${CLSYNC_CONF}" ]] && conffile="--config-file ${CLSYNC_CONF}"
[[ -n "${CLSYNC_NICE}" ]] && cmd_nice="--nice ${CLSYNC_NICE}"
diff --git a/app-admin/clsync/metadata.xml b/app-admin/clsync/metadata.xml
index a88923a..9cbe60e 100644
--- a/app-admin/clsync/metadata.xml
+++ b/app-admin/clsync/metadata.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
- <email>bircoph@gentoo.org</email>
- <name>Andrew Savchenko</name>
-</maintainer>
-<longdescription>
+ <maintainer type="person">
+ <email>bircoph@gentoo.org</email>
+ <name>Andrew Savchenko</name>
+ </maintainer>
+ <longdescription>
Clsync recursively watches for source directory and executes external
program to sync the changes. Clsync is adapted to be used together with rsync.
This utility is much more lightweight than competitors and supports such
@@ -14,15 +14,17 @@
syncing. Clsync can use advanced features for isolation: capabilities, cgroups,
namespaces, seccomp, code hardening.
</longdescription>
-<use>
- <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>
+ <use>
+ <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>
+ </use>
+ <upstream>
+ <remote-id type="github">xaionaro/clsync</remote-id>
+ </upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-05-01 15:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-05-01 15:41 [gentoo-commits] dev/bircoph:master commit in: app-admin/clsync/files/, app-admin/clsync/ Andrew Savchenko
-- strict thread matches above, loose matches on Subject: below --
2015-05-24 13:41 Andrew Savchenko
2015-01-28 17:17 Andrew Savchenko
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox