root
9 years ago
parent
95b8a11bf2
commit
c95b064020
@ -1,38 +1,28 @@
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA256
|
||||
|
||||
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-retries-arg.patch 563 SHA256 d846c0e0e33280ec24c8e20e4006d72746a39a5f4b92fcdb272bf5abdc16fef8 SHA512 14fa4bdf092dbbce8f2ed246a3746c6d590e3f728a70c103a29f956485c3ac223c5cbf9bb4d5e72f0e7cfa08ffaa86fb63812b6f7972a2b29ef8da195e8b9944 WHIRLPOOL 988fb71f5a51ce423f0e78e33f6a71b5cfcd7f4098eee0990745d1ae472c4aa8b1cd709b6dbe7f56069f3ddf235dac97aef7f0ce62c36ee707268b84c7f0939b
|
||||
AUX clsync-0.4-strtol.patch 5902 SHA256 04245b1711daa28d883b63e0f0778e60121a6841ffef49e219a62f9816149421 SHA512 930f36dc99b1c2e121c63ad5a6c4aa07f2025261f76522c635a63e4370dd2c225ffb7ca10179bb364e2668d0d4eed1f42e8d497bb03a3f8a7a94f76a951e7781 WHIRLPOOL 565b0e5e6cb6a0e72ff7a4e72c4a586401e9352ebd347cca2b34e8ea87d078f2cebd69a10c2b3e3bb3e8dfa907ef059b3c0b47e0c8677a7f365b9174448a2f45
|
||||
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 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.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
|
||||
DIST clsync-0.4.1-20150524-v2.patch.xz 13632 SHA256 90a1ef820c83629c528e8c6fe4da5183caf60f8079c4de01a6d26945734c92f7 SHA512 d39c3c4f116eff2365668374ef62f4dfd8e5926267cbbf36b430f97ad5306f92cf6be3164c0e1c3d959db55453f5ded00d98d48af62f9eacde39a9f9667cfbf9 WHIRLPOOL d22fc6a1f0a59514506377f26ab7d9c0f4faca0abab044f2ce2e61ffa973ff04b43da561a4dd5c69d99e21108baa71d77bb2ea524313661b3b2440ceddca56aa
|
||||
DIST clsync-0.4.1.tar.gz 253890 SHA256 3f14a72d7c3c1747ea908e373f25bd1918ce00450492fbb7094549db6bf21e27 SHA512 875280f706026d44806b92c22fa58d016136b2792f67a6b7e77f932465081da7a1ebaf22c25e538e4b58bfe04cd1cd5450ecab99c3df53ddd2a0fa966442d444 WHIRLPOOL 10ab11821766f7d16d03993069ac4da5fe362a1e5977ea6721e49ada7044d3659e59b507b03be4de09609b0a0ca9d7878407d7b6e1f40df5dbe1d041dac373cb
|
||||
EBUILD clsync-0.4.1.ebuild 3162 SHA256 ad09290773f5ee2612e8fcc746884db65fa76f1a0cfe945e6cb6b4817e5a9549 SHA512 982d302e91bc05f8b52bb283c1f349abb95c0df3070b6c005945f17f47b860647d10138dbbbdeb1efa3bd9e45c72dedcfcd9b6cff56d55af1a413f87fa4c498d WHIRLPOOL 9310c97945d6398122f943e756954c61157a3cc1819a9753318f4209e58084e9b610ce83d40bf7fac85f2608a74f3d795a10de3ec15b882c7998928663ce0911
|
||||
MISC ChangeLog 1882 SHA256 652aa475de2c10e3c2eefc7c707f698a8af774ddcf92f8840ba26d3e8ae12d0b SHA512 dbcd4a884892123b337406a229f65da70c9e26f42e68154fb610d31bddface0d08026d4cbb03113cd6b800ecdf95812ad9259536f812f9d5113a3750f9760fc9 WHIRLPOOL 05a5cceb254c481f8217b39d7497819a4a0f1109f0afe259cbdd68584bebacba68f38dadc6a9f7791df22ca2fb7dc3d740e16fb932c5262d6adb200945e71599
|
||||
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
|
||||
iQIcBAEBCAAGBQJVYmrnAAoJEPZTWjO6HuSN3bcP/RxPIQ0F4Qnvs7/A8F8eUoAM
|
||||
QJD3Ep4Wm37Ts43AyFeWA+7eeXCKK0CNkS61+yz7BTwvFulRf3r+yr4Cv/0CiQUQ
|
||||
OB5enWlOT9GJKkgDZMJ3Q+mMvd31FWnIRtanBS91szNrDO4L4LCCzbSYArKVsMO1
|
||||
iJRxRRq+1w6cR0wr2LIeeYeCkZqHpoW/STQ74hbT6Ms5DSixZkeyGRSslHMLZtdL
|
||||
+wdDUXO8TkgirtEw87TcAjOrfDdSlG92xLYImmFUp65PEw9LQAgAVdFAkh/LvSoo
|
||||
WVP0vtwYAukb8jFqzgTdXiiYX3iRwMK6eF7hoOkkee6VMdMTc175xekdt/VZxjGM
|
||||
USTsAJZ5VHchf3UAkKMk5SouvHOnX6qx/FI6ekwcHyMwuNzivrUUIHuUkP/3tZTT
|
||||
Rav+IamSXTWJ8YWMM031KvWhZSH5VsT29AqZ54AN2GY0l/+yA8z0R+r4kxFvaVou
|
||||
Y0YPd5p6lDiyMEqlXb4iMBidDFwNeXwksoZyG9lvYlGKhtqwiD7nSySlr1BELTEe
|
||||
IIouxd/YO7qQDWeCafQxeEBAbwdoW+zQ78TLZ+KZYnQHBy+x+k4YjVSst4nWMjbx
|
||||
pLfLBsmkz/A6vgXZ3tf6prT65idBdqj9+/hf64UNq5E/W1wu+xh5auY33jBgCqdY
|
||||
zuDM1U6ZQhKDkpDQx/me
|
||||
=CDr5
|
||||
-----END PGP SIGNATURE-----
|
||||
|
||||
@ -1,61 +0,0 @@
|
||||
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);
|
||||
|
||||
@ -1,32 +0,0 @@
|
||||
commit 4eea85337a3358baae0b4f0626d63a9626778a01
|
||||
Author: Andrew Savchenko <bircoph@gmail.com>
|
||||
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}"
|
||||
@ -1,30 +0,0 @@
|
||||
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;
|
||||
|
||||
}
|
||||
|
||||
@ -1,37 +0,0 @@
|
||||
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
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/main.c b/main.c
|
||||
index 176e1f4..48aee6a 100644
|
||||
--- a/main.c
|
||||
+++ b/main.c
|
||||
@@ -116,7 +116,7 @@ static const struct option long_options[] =
|
||||
{"cgroup-group-name", required_argument, NULL, CG_GROUPNAME},
|
||||
#endif
|
||||
{"threading", required_argument, NULL, THREADING},
|
||||
- {"retries", optional_argument, NULL, RETRIES},
|
||||
+ {"retries", required_argument, NULL, RETRIES},
|
||||
{"ignore-failures", optional_argument, NULL, IGNOREFAILURES},
|
||||
{"exit-on-sync-skipping",optional_argument, NULL, EXITONSYNCSKIP},
|
||||
{"output", required_argument, NULL, OUTPUT_METHOD},
|
||||
@ -1,179 +0,0 @@
|
||||
commit 41283d1359b652c728ca37406a33e62e8541bdda
|
||||
Author: Andrew Savchenko <bircoph@gmail.com>
|
||||
Date: Fri Feb 20 21:04:48 2015 +0300
|
||||
|
||||
parser: check correctness of str to int conversions.
|
||||
|
||||
diff --git a/main.c b/main.c
|
||||
index 48aee6a..d057489 100644
|
||||
--- a/main.c
|
||||
+++ b/main.c
|
||||
@@ -808,15 +808,33 @@ static int synchandler_arg1(char *arg, size_t arg_len, void *_ctx_p) {
|
||||
return synchandler_arg(arg, arg_len, _ctx_p, SHARGS_INITIAL);
|
||||
}
|
||||
|
||||
-int parse_customsignals(ctx_t *ctx_p, char *arg) {
|
||||
+/* strtol wrapper with error checks */
|
||||
+static inline long xstrtol(const char *str, int *err) {
|
||||
+ long res;
|
||||
+ char *endptr;
|
||||
+
|
||||
+ res = strtol(str, &endptr, 0);
|
||||
+ if (errno || *endptr) {
|
||||
+ error("argument \"%s\" can't be parsed as a number", str);
|
||||
+ *err = EINVAL;
|
||||
+ }
|
||||
+ return res;
|
||||
+}
|
||||
+
|
||||
+static inline int parse_customsignals(ctx_t *ctx_p, char *arg) {
|
||||
char *ptr = arg, *start = arg;
|
||||
+ int ret = 0;
|
||||
unsigned int signal;
|
||||
do {
|
||||
switch (*ptr) {
|
||||
case 0:
|
||||
case ',':
|
||||
case ':':
|
||||
- signal = (unsigned int)atoi(start);
|
||||
+ signal = (unsigned int)xstrtol(start, &ret);
|
||||
+ if (ret) {
|
||||
+ errno = ret;
|
||||
+ return errno;
|
||||
+ }
|
||||
if (signal == 0) {
|
||||
// flushing the setting
|
||||
int i = 0;
|
||||
@@ -883,7 +901,8 @@ int parse_customsignals(ctx_t *ctx_p, char *arg) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
-int parse_parameter(ctx_t *ctx_p, uint16_t param_id, char *arg, paramsource_t paramsource) {
|
||||
+static int parse_parameter(ctx_t *ctx_p, uint16_t param_id, char *arg, paramsource_t paramsource) {
|
||||
+ int ret = 0;
|
||||
#ifdef _DEBUG_FORCE
|
||||
fprintf(stderr, "Force-Debug: parse_parameter(): %i: %i = \"%s\"\n", paramsource, param_id, arg);
|
||||
#endif
|
||||
@@ -962,7 +981,7 @@ int parse_parameter(ctx_t *ctx_p, uint16_t param_id, char *arg, paramsource_t pa
|
||||
ctx_p->flags[param_id]++;
|
||||
|
||||
if (pwd == NULL) {
|
||||
- ctx_p->uid = (unsigned int)atol(arg);
|
||||
+ ctx_p->uid = (unsigned int)xstrtol(arg, &ret);
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -974,7 +993,7 @@ int parse_parameter(ctx_t *ctx_p, uint16_t param_id, char *arg, paramsource_t pa
|
||||
ctx_p->flags[param_id]++;
|
||||
|
||||
if (grp == NULL) {
|
||||
- ctx_p->gid = (unsigned int)atol(arg);
|
||||
+ ctx_p->gid = (unsigned int)xstrtol(arg, &ret);
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -1028,7 +1047,7 @@ int parse_parameter(ctx_t *ctx_p, uint16_t param_id, char *arg, paramsource_t pa
|
||||
ctx_p->flags[param_id]++;
|
||||
|
||||
if (pwd == NULL) {
|
||||
- ctx_p->synchandler_uid = (unsigned int)atol(arg);
|
||||
+ ctx_p->synchandler_uid = (unsigned int)xstrtol(arg, &ret);
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -1040,7 +1059,7 @@ int parse_parameter(ctx_t *ctx_p, uint16_t param_id, char *arg, paramsource_t pa
|
||||
ctx_p->flags[param_id]++;
|
||||
|
||||
if (grp == NULL) {
|
||||
- ctx_p->synchandler_gid = (unsigned int)atol(arg);
|
||||
+ ctx_p->synchandler_gid = (unsigned int)xstrtol(arg, &ret);
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -1233,7 +1252,7 @@ int parse_parameter(ctx_t *ctx_p, uint16_t param_id, char *arg, paramsource_t pa
|
||||
ctx_p->pidfile = arg;
|
||||
break;
|
||||
case RETRIES:
|
||||
- ctx_p->retries = (unsigned int)atol(arg);
|
||||
+ ctx_p->retries = (unsigned int)xstrtol(arg, &ret);
|
||||
break;
|
||||
case THREADING: {
|
||||
char *value, *arg_orig = arg;
|
||||
@@ -1279,22 +1298,22 @@ int parse_parameter(ctx_t *ctx_p, uint16_t param_id, char *arg, paramsource_t pa
|
||||
ctx_p->cluster_mcastipaddr = arg;
|
||||
break;
|
||||
case CLUSTERMCASTIPPORT:
|
||||
- ctx_p->cluster_mcastipport = (uint16_t)atoi(arg);
|
||||
+ ctx_p->cluster_mcastipport = (uint16_t)xstrtol(arg, &ret);
|
||||
break;
|
||||
case CLUSTERTIMEOUT:
|
||||
- ctx_p->cluster_timeout = (unsigned int)atol(arg);
|
||||
+ ctx_p->cluster_timeout = (unsigned int)xstrtol(arg, &ret);
|
||||
break;
|
||||
case CLUSTERNODENAME:
|
||||
ctx_p->cluster_nodename = arg;
|
||||
break;
|
||||
case CLUSTERHDLMIN:
|
||||
- ctx_p->cluster_hash_dl_min = (uint16_t)atoi(arg);
|
||||
+ ctx_p->cluster_hash_dl_min = (uint16_t)xstrtol(arg, &ret);
|
||||
break;
|
||||
case CLUSTERHDLMAX:
|
||||
- ctx_p->cluster_hash_dl_max = (uint16_t)atoi(arg);
|
||||
+ ctx_p->cluster_hash_dl_max = (uint16_t)xstrtol(arg, &ret);
|
||||
break;
|
||||
case CLUSTERSDLMAX:
|
||||
- ctx_p->cluster_scan_dl_max = (uint16_t)atoi(arg);
|
||||
+ ctx_p->cluster_scan_dl_max = (uint16_t)xstrtol(arg, &ret);
|
||||
break;
|
||||
#endif
|
||||
case OUTLISTSDIR:
|
||||
@@ -1334,16 +1353,16 @@ int parse_parameter(ctx_t *ctx_p, uint16_t param_id, char *arg, paramsource_t pa
|
||||
break;
|
||||
}
|
||||
case SYNCDELAY:
|
||||
- ctx_p->syncdelay = (unsigned int)atol(arg);
|
||||
+ ctx_p->syncdelay = (unsigned int)xstrtol(arg, &ret);
|
||||
break;
|
||||
case DELAY:
|
||||
- ctx_p->_queues[QUEUE_NORMAL].collectdelay = (unsigned int)atol(arg);
|
||||
+ ctx_p->_queues[QUEUE_NORMAL].collectdelay = (unsigned int)xstrtol(arg, &ret);
|
||||
break;
|
||||
case BFILEDELAY:
|
||||
- ctx_p->_queues[QUEUE_BIGFILE].collectdelay = (unsigned int)atol(arg);
|
||||
+ ctx_p->_queues[QUEUE_BIGFILE].collectdelay = (unsigned int)xstrtol(arg, &ret);
|
||||
break;
|
||||
case BFILETHRESHOLD:
|
||||
- ctx_p->bfilethreshold = (unsigned long)atol(arg);
|
||||
+ ctx_p->bfilethreshold = (unsigned long)xstrtol(arg, &ret);
|
||||
break;
|
||||
case CANCEL_SYSCALLS: {
|
||||
char *subopts = arg;
|
||||
@@ -1412,10 +1431,10 @@ int parse_parameter(ctx_t *ctx_p, uint16_t param_id, char *arg, paramsource_t pa
|
||||
break;
|
||||
}
|
||||
case RSYNCINCLIMIT:
|
||||
- ctx_p->rsyncinclimit = (unsigned int)atol(arg);
|
||||
+ ctx_p->rsyncinclimit = (unsigned int)xstrtol(arg, &ret);
|
||||
break;
|
||||
case SYNCTIMEOUT:
|
||||
- ctx_p->synctimeout = (unsigned int)atol(arg);
|
||||
+ ctx_p->synctimeout = (unsigned int)xstrtol(arg, &ret);
|
||||
break;
|
||||
case PREEXITHOOK:
|
||||
if (strlen(arg)) {
|
||||
@@ -1611,13 +1630,13 @@ int parse_parameter(ctx_t *ctx_p, uint16_t param_id, char *arg, paramsource_t pa
|
||||
if (arg == NULL)
|
||||
ctx_p->flags[param_id]++;
|
||||
else
|
||||
- ctx_p->flags[param_id] = atoi(arg);
|
||||
+ ctx_p->flags[param_id] = xstrtol(arg, &ret);
|
||||
#ifdef _DEBUG_FORCE
|
||||
fprintf(stderr, "Force-Debug: flag %i is set to %i\n", param_id&0xff, ctx_p->flags[param_id]);
|
||||
#endif
|
||||
break;
|
||||
}
|
||||
- return 0;
|
||||
+ return ret;
|
||||
}
|
||||
|
||||
int arguments_parse(int argc, char *argv[], struct ctx *ctx_p) {
|
||||
@ -1,43 +0,0 @@
|
||||
commit 596f79fa65af66afdff4cf24b9135935bf511108
|
||||
Author: Dmitry Yu Okunev <dyokunev@ut.mephi.ru>
|
||||
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;
|
||||
@ -1,38 +0,0 @@
|
||||
commit a13f929cfe4a7fad58c7d814a139efff091601e0
|
||||
Author: Dmitry Yu Okunev <dyokunev@ut.mephi.ru>
|
||||
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,
|
||||
@ -1,34 +0,0 @@
|
||||
commit a437518de6813202ab9cef124a6ca085d3eb555d
|
||||
Author: Dmitry Yu Okunev <dyokunev@ut.mephi.ru>
|
||||
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");
|
||||
@ -1,140 +0,0 @@
|
||||
Adapted commit 756ae28750b514473ae235218d466dc6fa960c30
|
||||
Author: Dmitry Yu Okunev <dyokunev@ut.mephi.ru>
|
||||
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_*
|
||||
@ -1,19 +0,0 @@
|
||||
commit e9eeb552896a3ac3f4f1e9d72ecab6a200f3c70c
|
||||
Author: Andrew Savchenko <bircoph@gmail.com>
|
||||
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 <dyokunev@ut.mephi.ru>],,[https://github.com/xaionaro/clsync])
|
||||
+AC_INIT([clsync],[0.4],[Dmitry Yu Okunev <dyokunev@ut.mephi.ru>],,[https://github.com/xaionaro/clsync])
|
||||
AC_CONFIG_SRCDIR([sync.c])
|
||||
AC_CONFIG_MACRO_DIR([m4])
|
||||
AM_INIT_AUTOMAKE([1.11 foreign -Wall -Wno-portability])
|
||||
@ -0,0 +1,63 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-admin/r10k/r10k-1.5.1.ebuild,v 1.1 2015/05/24 22:58:40 robbat2 Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
USE_RUBY="ruby19 ruby20 ruby21"
|
||||
|
||||
RUBY_FAKEGEM_RECIPE_TEST="rspec"
|
||||
RUBY_FAKEGEM_TASK_DOC=""
|
||||
|
||||
RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
|
||||
|
||||
inherit ruby-fakegem
|
||||
|
||||
DESCRIPTION="Puppet environment and module deployment"
|
||||
HOMEPAGE="http://github.com/adrienthebo/r10k"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE="+git"
|
||||
|
||||
ruby_add_rdepend "
|
||||
>=dev-ruby/colored-1.2
|
||||
=dev-ruby/cri-2.7*
|
||||
>=dev-ruby/systemu-2.5.2
|
||||
>=dev-ruby/log4r-1.1.10
|
||||
>=dev-ruby/faraday-0.9.0
|
||||
>=dev-ruby/faraday_middleware-0.9.0
|
||||
>=dev-ruby/faraday_middleware-multi_json-0.0.6
|
||||
>=dev-ruby/multi_json-1.10
|
||||
>=dev-ruby/semantic_puppet-0.1.1
|
||||
dev-ruby/json"
|
||||
|
||||
RDEPEND="${RDEPEND} git? ( >=dev-vcs/git-1.6.6 )"
|
||||
|
||||
all_ruby_prepare() {
|
||||
sed -i -e 's/json_pure/json/' \
|
||||
-e '/cri/ s/2\.6\../2.7/' \
|
||||
-e '/systemu/ s/2.5.2/2.5/' \
|
||||
-e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
ewarn
|
||||
ewarn "If you are upgrading from 1.1.0 and are using multiple sources, please read"
|
||||
ewarn "this. (If not, feel free to continue with your regularly scheduled day.)"
|
||||
ewarn
|
||||
ewarn "GH-48 (https://github.com/adrienthebo/r10k/issues/48) introduced the ability"
|
||||
ewarn "for environments to be prefixed with the source name so that multiple sources"
|
||||
ewarn "installed into the same directory would not overwrite each other. However"
|
||||
ewarn "prefixing was automatically enabled and would break existing setups where"
|
||||
ewarn "multiple sources were cloned into different directories."
|
||||
ewarn
|
||||
ewarn "Because this introduced a breaking change, SemVer dictates that the automatic"
|
||||
ewarn "prefixing has to be rolled back. Prefixing can be enabled but always defaults"
|
||||
ewarn "to off. If you are relying on this behavior you will need to update your r10k.yaml"
|
||||
ewarn "to enable prefixing on a per-source basis."
|
||||
ewarn
|
||||
ewarn "Please see the issue (https://github.com/adrienthebo/r10k/issues/48) for more"
|
||||
ewarn "information."
|
||||
}
|
||||
@ -1,24 +1,24 @@
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA256
|
||||
|
||||
DIST clsync-0.4.tar.gz 253396 SHA256 6f0ce7a5f61fbb50db53b787b62cf5347870f3be315acb02c4aee6b76206d19e SHA512 9b17f5f8f0bfc48531f3d8cb4f1c1edd3116e0b7d140e8ab2465dd1c590521c9857202ed3f36466f13fb3309abb9232fb4acbe25b5652914a816fac498f74a48 WHIRLPOOL 18ae12df2d7e0403b21c5d4ab7352cd81446729d94fb300a799b98dad9f88aeaa98deb2ba5f52858d3b6ba7406d777e53e97dae5c3a4802a229511db9c8a3482
|
||||
EBUILD clsync-docs-0.4.ebuild 907 SHA256 4986d73f7cfea87fdf7e2cac28cb1c2d7dccdf797a4984f0172293e5c573c346 SHA512 3edc7d1583aa0f7923426055ee11b93ea8e3faba106ceac3b12c23838aef968a0958c87d9a855affabecc6c3293578c3976f381340931ea47e85f4b7dafaca84 WHIRLPOOL 5b8c7f149d429ebfadbc3413f10d1bd24426e031e128843f229b5db0bbe97935e2c0dbf4f5b37c019716dc8674f7084c58ea06cafb887a03d4d01589962265f6
|
||||
MISC ChangeLog 387 SHA256 32e9a781812726f27b872160a9110f0ff13f301780d40d31958955375c198fbc SHA512 56d90c6b041c2cf881dfcde9046a2eac721b90c866d1e166ea86d74e8be565294c4fd225294e14be10b18d1783aab00082bc6172f65fdc0e18709720f158dbe6 WHIRLPOOL ed4a20c2063d4d217fe91f5d7e885f590ed5ff8fb85f91cc648e121f91fe9476b19daab0b84a692834190e9e10e5b01f32f16637429afe6067fa1449da3e4341
|
||||
MISC metadata.xml 386 SHA256 055dde59bada460d330345d1641e00a88477ba31ba7476160de453a2b8980f23 SHA512 69f3f9e55c1b0989edf4b1b812360bf3f660ee09075582de119bb537cce03cfbfc34ea9dea907e05c4689a32beded587a55784c81a2575a33eee39c9539fbba6 WHIRLPOOL 088269fe8eac4e254f9ab496cc99885de7e6dfa00b02fd62b015841a6236e92bde8d94aa5b81916bcdc5ec8b90755a6bae3f1b77fff0dd8ef24a84beba32dc84
|
||||
DIST clsync-0.4.1.tar.gz 253890 SHA256 3f14a72d7c3c1747ea908e373f25bd1918ce00450492fbb7094549db6bf21e27 SHA512 875280f706026d44806b92c22fa58d016136b2792f67a6b7e77f932465081da7a1ebaf22c25e538e4b58bfe04cd1cd5450ecab99c3df53ddd2a0fa966442d444 WHIRLPOOL 10ab11821766f7d16d03993069ac4da5fe362a1e5977ea6721e49ada7044d3659e59b507b03be4de09609b0a0ca9d7878407d7b6e1f40df5dbe1d041dac373cb
|
||||
EBUILD clsync-docs-0.4.1.ebuild 1153 SHA256 1065e13e530e4df72a241be6cb94514cc1db1443b8d893edb22579fa7a28b9f5 SHA512 e3afbb07910f87ed311abae7b38691292074a8363351fde2b55d2d9183b3f5fa2d8286a67aba19d2afcb2f9d043dec32b4b30fbdca3f1bed3ff7dfc434d8f38b WHIRLPOOL 8aa188e3b906cdaa2461ede5cfe8cfacc4b19b80582bb1553716a43b3d4a7f4ce7bbddf9d47b915f2eef5b6ff245f2e31e8282f4f79e925ee8dbeaccad20b858
|
||||
MISC ChangeLog 643 SHA256 da8886db10b339e928a036dd9d04a894b35bf38bd5c8476db911b396db562bf3 SHA512 e41cc4cd9e0d1d320cefb1f456f2d51558991fa1e522510e145efa5fe413159e914f174603adfaea3112018ffe55d9e0a1317c45db9221aa855c80cb0a0b8bbd WHIRLPOOL abb4995307a348fc1ece3220107052217f24d471225e5bcf2d1edb3d6c562b6b6873ed029e12e5b5d803a636ce23fce0d9d7299e1babaea229ad9fa6042e5ee1
|
||||
MISC metadata.xml 455 SHA256 0cb08fae8dfb45024854fe69cd8e5c94c9e098213ca05d2c389a83bde9dc426a SHA512 f0fc492d199e0baf0bf39cc30068a596fdeae8cc15e96e35bdb55f13a9a28b7c53b6363be6eb96ec1b22714df61aded246e450a6363b4e65a9c546f15b0c4b3b WHIRLPOOL 94bcd4f73ad6f5aaa49a82378b7e7459c593bc3cb1e8474a8de8bf8a6deeed5911eb9ebe351386e01b7395516606c2375e116f7faedc11c286801159ab122dba
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2
|
||||
|
||||
iQIcBAEBCAAGBQJU2s0GAAoJEPZTWjO6HuSNcCcP/1G13vpSATJeAH68SFaR30wv
|
||||
nnTFiP7t/sIR9vSZik/eL9h1F9X30anq3gE/m1zS1RnwGafgZZZRWDMG1+IgQ8U8
|
||||
2XCjxxjg8J0bePXTJu9REejJ7QiXK3cVZeRreaXidUBJY2wxLO9T4lZBDwRYIHEg
|
||||
EnOwE7kcLyfHsXo68AgbA52CD+P+AT6K6Jx7Ae1cjMnSMI/dPB7ZYFr36V8CVTs2
|
||||
qG1UmMOuiBRMiBK4JqePmZHuP7yN28c5TDC0w8nnlB/Zm7FylxAiXdMedKfy3oMI
|
||||
bWMBDJpdJpsLJISCswc2DaLJi1Gh6WcEbqKe3hGio+kIVZYHUVcjEsH9pCAQNzOJ
|
||||
cbxUIW3/OCCdm3YZkIChuRJkO99bwZAyFxXp4sC+54UGmsGImYsU7OQ2CgqXgBQ6
|
||||
jNkW0qZV7ud6BifPKKod8IqZF3BI1x3Bwi/ePwBh2lMV4NqeaeqBJVoRdk3XxZzd
|
||||
zZqgoJkXwToQKWlb4K7EcTL4p93JGnB4Cf4rxXVkm2LyDEhim/FEstReNFdmytPN
|
||||
5+J4/Xiob9IcYM8m8DuuWDp6JArB0rBqn1Enf6E8MQiYBRw4NddciI5BLUwn3cQX
|
||||
J8af/I5XJ8r64p0EwxpCz+R4RN5bYVGjIq43AuCFA3vk4d6BXJtcJwjRQ+S/gLyO
|
||||
U930IO7RL75QYbcK7NNu
|
||||
=wTgL
|
||||
iQIcBAEBCAAGBQJVYmtIAAoJEPZTWjO6HuSNp90P/i2x/ChtPEpEpwSsVP7+vX62
|
||||
+oTYrgSUH7wtg0Xisk3i0dClFDntqa39m/Y6pgSb/6QVUopsY/9+DdHoC/9mUHJt
|
||||
zPngH6wW9cBC4KNCI/EVjLNL3F+j8ThsLRvS0tU+rKjFj6p6b3yOiKCwf3ZK75Re
|
||||
Fv3VHRCOqT3fFmJizpyWSu0zzzAZntO1y3vLBT6byOXI0EEkgQFliJQg4iJvww4+
|
||||
/5M/g5DEd8ltvAlbrgXsbTNj66vD1P54WTNfRduxXXnqaonmYoPhJrUWToWWvse3
|
||||
chuP/1+6V+fe4+1AztYQLgUJc2xzuDqn/C1EXlSZCtGQ+2iyNkmp+Jy7whfRL+So
|
||||
TnpyOLIobZTuS/l9XRxJ93RhpFhBVr2dAqWVxEdE0ZHZDO9seNikIPPMy69JUGXw
|
||||
flMgvGEGNiezDKzo5OnoLIvTuAOP06BSYbjhzpv+ZSQXnKvp+Z0iYNkz+KSMGD54
|
||||
hed+eDaOEuZuFVnnzSf/6Jw8Gyq7rLxVmNcMZ2Pnab4FX1KSVhsu37VallvLvS5p
|
||||
78xUIb7kRbU4DI8i64begdDuKOqH6ribVWifk1BAc9ab88eAxxWEWPwTKCqWKtCQ
|
||||
HUa6K/kyeAuIWzmyukHP3Tiqm/GyKxRD+IQUcRrdqzootTpJuw94DEq1mFYnFQLN
|
||||
2aSiuf3NtBASwR5lDpoZ
|
||||
=CltG
|
||||
-----END PGP SIGNATURE-----
|
||||
|
||||
@ -0,0 +1,24 @@
|
||||
#!/sbin/runscript
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/files/virtlockd.init-r1,v 1.1 2015/05/24 21:05:42 tamiko Exp $
|
||||
|
||||
description="libvirt virtual machine lock manager"
|
||||
command="/usr/sbin/virtlockd"
|
||||
command_args="-d"
|
||||
pidfile="/var/run/virtlockd.pid"
|
||||
|
||||
extra_started_commands="reload"
|
||||
description_reload="re-exec the daemon, while maintaining locks and clients"
|
||||
|
||||
|
||||
depend() {
|
||||
after ntp-client ntpd nfs nfsmount corosync
|
||||
}
|
||||
|
||||
reload() {
|
||||
ebegin "re-exec() virtlockd"
|
||||
|
||||
start-stop-daemon --signal SIGUSR1 \
|
||||
--exec "${command}" --pidfile "${pidfile}"
|
||||
}
|
||||
@ -1,461 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.2.11-r4.ebuild,v 1.2 2015/05/05 19:03:58 tamiko Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
AUTOTOOLIZE=yes
|
||||
|
||||
MY_P="${P/_rc/-rc}"
|
||||
|
||||
inherit eutils user autotools linux-info systemd readme.gentoo
|
||||
|
||||
BACKPORTS="20150127"
|
||||
|
||||
if [[ ${PV} = *9999* ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="git://libvirt.org/libvirt.git"
|
||||
SRC_URI=""
|
||||
KEYWORDS=""
|
||||
SLOT="0"
|
||||
else
|
||||
# Versions with 4 numbers are stable updates:
|
||||
if [[ ${PV} =~ ^[0-9]+(\.[0-9]+){3} ]]; then
|
||||
SRC_URI="http://libvirt.org/sources/stable_updates/${MY_P}.tar.gz"
|
||||
else
|
||||
SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz"
|
||||
fi
|
||||
SRC_URI+=" ${BACKPORTS:+
|
||||
http://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz
|
||||
http://dev.gentoo.org/~tamiko/distfiles/${P}-${BACKPORTS}.tar.xz}"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
SLOT="0/${PV}"
|
||||
fi
|
||||
S="${WORKDIR}/${P%_rc*}"
|
||||
|
||||
DESCRIPTION="C toolkit to manipulate virtual machines"
|
||||
HOMEPAGE="http://www.libvirt.org/"
|
||||
LICENSE="LGPL-2.1"
|
||||
IUSE="audit avahi +caps firewalld fuse glusterfs iscsi +libvirtd lvm lxc \
|
||||
+macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl \
|
||||
selinux +udev uml +vepa virtualbox virt-network wireshark-plugins xen \
|
||||
elibc_glibc systemd"
|
||||
REQUIRED_USE="libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
|
||||
lxc? ( caps libvirtd )
|
||||
openvz? ( libvirtd )
|
||||
qemu? ( libvirtd )
|
||||
uml? ( libvirtd )
|
||||
vepa? ( macvtap )
|
||||
virtualbox? ( libvirtd )
|
||||
xen? ( libvirtd )
|
||||
virt-network? ( libvirtd )
|
||||
firewalld? ( virt-network )"
|
||||
|
||||
# gettext.sh command is used by the libvirt command wrappers, and it's
|
||||
# non-optional, so put it into RDEPEND.
|
||||
# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
|
||||
# package will use 3 by default. Since we don't have slot pinning in an API,
|
||||
# we must go with the most recent
|
||||
RDEPEND="sys-libs/readline:0=
|
||||
sys-libs/ncurses
|
||||
>=net-misc/curl-7.18.0
|
||||
dev-libs/libgcrypt:0
|
||||
>=dev-libs/libxml2-2.7.6
|
||||
dev-libs/libnl:3
|
||||
>=net-libs/gnutls-1.0.25
|
||||
net-libs/libssh2
|
||||
sys-apps/dmidecode
|
||||
>=sys-apps/util-linux-2.17
|
||||
sys-devel/gettext
|
||||
>=net-analyzer/netcat6-1.0-r2
|
||||
app-misc/scrub
|
||||
audit? ( sys-process/audit )
|
||||
avahi? ( >=net-dns/avahi-0.6[dbus] )
|
||||
caps? ( sys-libs/libcap-ng )
|
||||
fuse? ( >=sys-fs/fuse-2.8.6 )
|
||||
glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
|
||||
iscsi? ( sys-block/open-iscsi )
|
||||
lxc? ( !systemd? ( sys-power/pm-utils ) )
|
||||
lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
|
||||
nfs? ( net-fs/nfs-utils )
|
||||
numa? (
|
||||
>sys-process/numactl-2.0.2
|
||||
sys-process/numad
|
||||
)
|
||||
openvz? ( sys-kernel/openvz-sources:* )
|
||||
parted? (
|
||||
>=sys-block/parted-1.8[device-mapper]
|
||||
sys-fs/lvm2
|
||||
)
|
||||
pcap? ( >=net-libs/libpcap-1.0.0 )
|
||||
policykit? ( >=sys-auth/polkit-0.9 )
|
||||
qemu? (
|
||||
>=app-emulation/qemu-0.13.0
|
||||
dev-libs/yajl
|
||||
!systemd? ( sys-power/pm-utils )
|
||||
)
|
||||
rbd? ( sys-cluster/ceph )
|
||||
sasl? ( dev-libs/cyrus-sasl )
|
||||
selinux? ( >=sys-libs/libselinux-2.0.85 )
|
||||
systemd? ( sys-apps/systemd )
|
||||
virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
|
||||
wireshark-plugins? ( net-analyzer/wireshark:= )
|
||||
xen? ( app-emulation/xen-tools app-emulation/xen )
|
||||
udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 )
|
||||
virt-network? ( net-dns/dnsmasq[script]
|
||||
>=net-firewall/iptables-1.4.10
|
||||
net-misc/radvd
|
||||
net-firewall/ebtables
|
||||
sys-apps/iproute2[-minimal]
|
||||
firewalld? ( net-firewall/firewalld )
|
||||
)
|
||||
elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) )"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
app-text/xhtml1
|
||||
dev-lang/perl
|
||||
dev-libs/libxslt"
|
||||
|
||||
DOC_CONTENTS="For the basic networking support (bridged and routed networks)
|
||||
you don't need any extra software. For more complex network modes
|
||||
including but not limited to NATed network, you can enable the
|
||||
'virt-network' USE flag.\n\n
|
||||
If you are using dnsmasq on your system, you will have
|
||||
to configure /etc/dnsmasq.conf to enable the following settings:\n\n
|
||||
bind-interfaces\n
|
||||
interface or except-interface\n\n
|
||||
Otherwise you might have issues with your existing DNS server."
|
||||
|
||||
LXC_CONFIG_CHECK="
|
||||
~CGROUPS
|
||||
~CGROUP_FREEZER
|
||||
~CGROUP_DEVICE
|
||||
~CGROUP_CPUACCT
|
||||
~CGROUP_SCHED
|
||||
~CGROUP_PERF
|
||||
~BLK_CGROUP
|
||||
~NET_CLS_CGROUP
|
||||
~CGROUP_NET_PRIO
|
||||
~CPUSETS
|
||||
~RESOURCE_COUNTERS
|
||||
~NAMESPACES
|
||||
~UTS_NS
|
||||
~IPC_NS
|
||||
~PID_NS
|
||||
~NET_NS
|
||||
~USER_NS
|
||||
~DEVPTS_MULTIPLE_INSTANCES
|
||||
~VETH
|
||||
~MACVLAN
|
||||
~POSIX_MQUEUE
|
||||
~SECURITYFS
|
||||
~!GRKERNSEC_CHROOT_MOUNT
|
||||
~!GRKERNSEC_CHROOT_DOUBLE
|
||||
~!GRKERNSEC_CHROOT_PIVOT
|
||||
~!GRKERNSEC_CHROOT_CHMOD
|
||||
~!GRKERNSEC_CHROOT_CAPS
|
||||
"
|
||||
|
||||
VIRTNET_CONFIG_CHECK="
|
||||
~BRIDGE_NF_EBTABLES
|
||||
~BRIDGE_EBT_MARK_T
|
||||
~NETFILTER_ADVANCED
|
||||
~NETFILTER_XT_TARGET_CHECKSUM
|
||||
~NETFILTER_XT_CONNMARK
|
||||
~NETFILTER_XT_MARK
|
||||
"
|
||||
|
||||
BWLMT_CONFIG_CHECK="
|
||||
~BRIDGE_EBT_T_NAT
|
||||
~NET_SCH_HTB
|
||||
~NET_SCH_SFQ
|
||||
~NET_SCH_INGRESS
|
||||
~NET_CLS_FW
|
||||
~NET_CLS_U32
|
||||
~NET_ACT_POLICE
|
||||
"
|
||||
|
||||
MACVTAP_CONFIG_CHECK=" ~MACVTAP"
|
||||
|
||||
LVM_CONFIG_CHECK=" ~BLK_DEV_DM ~DM_SNAPSHOT ~DM_MULTIPATH"
|
||||
|
||||
ERROR_USER_NS="Optional depending on LXC configuration."
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup qemu 77
|
||||
enewuser qemu 77 -1 -1 qemu kvm
|
||||
|
||||
# Some people used the masked ebuild which was not adding the qemu
|
||||
# user to the kvm group originally. This results in VMs failing to
|
||||
# start for some users. bug #430808
|
||||
egetent group kvm | grep -q qemu
|
||||
if [[ $? -ne 0 ]]; then
|
||||
gpasswd -a qemu kvm
|
||||
fi
|
||||
|
||||
# Handle specific kernel versions for different features
|
||||
kernel_is lt 3 6 && LXC_CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
|
||||
kernel_is ge 3 6 && LXC_CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP ~MEMCG_KMEM"
|
||||
|
||||
CONFIG_CHECK=""
|
||||
use fuse && CONFIG_CHECK+=" ~FUSE_FS"
|
||||
use lvm && CONFIG_CHECK+="${LVM_CONFIG_CHECK}"
|
||||
use lxc && CONFIG_CHECK+="${LXC_CONFIG_CHECK}"
|
||||
use macvtap && CONFIG_CHECK+="${MACVTAP_CONFIG_CHECK}"
|
||||
use virt-network && CONFIG_CHECK+="${VIRTNET_CONFIG_CHECK}"
|
||||
# Bandwidth Limiting Support
|
||||
use virt-network && CONFIG_CHECK+="${BWLMT_CONFIG_CHECK}"
|
||||
if [[ -n ${CONFIG_CHECK} ]]; then
|
||||
linux-info_pkg_setup
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
touch "${S}/.mailmap"
|
||||
|
||||
if [[ ${PV} = *9999* ]]; then
|
||||
# git checkouts require bootstrapping to create the configure script.
|
||||
# Additionally the submodules must be cloned to the right locations
|
||||
# bug #377279
|
||||
./bootstrap || die "bootstrap failed"
|
||||
(
|
||||
git submodule status | sed 's/^[ +-]//;s/ .*//'
|
||||
git hash-object bootstrap.conf
|
||||
) >.git-module-status
|
||||
fi
|
||||
|
||||
epatch "${FILESDIR}"/${PN}-1.2.9-do_not_use_sysconf.patch
|
||||
|
||||
[[ -n ${BACKPORTS} ]] && \
|
||||
EPATCH_FORCE=yes EPATCH_SUFFIX="patch" \
|
||||
EPATCH_SOURCE="${WORKDIR}/patches" epatch
|
||||
|
||||
epatch_user
|
||||
|
||||
[[ -n ${AUTOTOOLIZE} ]] && eautoreconf
|
||||
|
||||
# Tweak the init script
|
||||
local avahi_init=
|
||||
local iscsi_init=
|
||||
local rbd_init=
|
||||
local firewalld_init=
|
||||
cp "${FILESDIR}/libvirtd.init-r14" "${S}/libvirtd.init"
|
||||
use avahi && avahi_init='avahi-daemon'
|
||||
use iscsi && iscsi_init='iscsid'
|
||||
use rbd && rbd_init='ceph'
|
||||
use firewalld && firewalld_init='need firewalld'
|
||||
|
||||
sed -e "s/USE_FLAG_FIREWALLD/${firewalld_init}/" -i "${S}/libvirtd.init"
|
||||
sed -e "s/USE_FLAG_AVAHI/${avahi_init}/" -i "${S}/libvirtd.init"
|
||||
sed -e "s/USE_FLAG_ISCSI/${iscsi_init}/" -i "${S}/libvirtd.init"
|
||||
sed -e "s/USE_FLAG_RBD/${rbd_init}/" -i "${S}/libvirtd.init"
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf=""
|
||||
|
||||
## enable/disable daemon, otherwise client only utils
|
||||
myconf+=" $(use_with libvirtd)"
|
||||
|
||||
## enable/disable the daemon using avahi to find VMs
|
||||
myconf+=" $(use_with avahi)"
|
||||
|
||||
## hypervisors on the local host
|
||||
myconf+=" $(use_with xen) $(use_with xen xen-inotify)"
|
||||
myconf+=" --without-xenapi"
|
||||
if use xen && has_version ">=app-emulation/xen-tools-4.2.0"; then
|
||||
myconf+=" --with-libxl"
|
||||
else
|
||||
myconf+=" --without-libxl"
|
||||
fi
|
||||
myconf+=" $(use_with openvz)"
|
||||
myconf+=" $(use_with lxc)"
|
||||
if use virtualbox && has_version app-emulation/virtualbox-ose; then
|
||||
myconf+=" --with-vbox=/usr/lib/virtualbox-ose/"
|
||||
else
|
||||
myconf+=" $(use_with virtualbox vbox)"
|
||||
fi
|
||||
myconf+=" $(use_with uml)"
|
||||
myconf+=" $(use_with qemu)"
|
||||
myconf+=" $(use_with qemu yajl)" # Use QMP over HMP
|
||||
myconf+=" $(use_with phyp)"
|
||||
myconf+=" --with-esx"
|
||||
myconf+=" --with-vmware"
|
||||
|
||||
## additional host drivers
|
||||
myconf+=" $(use_with virt-network network)"
|
||||
myconf+=" --with-storage-fs"
|
||||
myconf+=" $(use_with lvm storage-lvm)"
|
||||
myconf+=" $(use_with iscsi storage-iscsi)"
|
||||
myconf+=" $(use_with parted storage-disk)"
|
||||
mycond+=" $(use_with glusterfs)"
|
||||
mycond+=" $(use_with glusterfs storage-gluster)"
|
||||
myconf+=" $(use_with lvm storage-mpath)"
|
||||
myconf+=" $(use_with rbd storage-rbd)"
|
||||
myconf+=" $(use_with numa numactl)"
|
||||
myconf+=" $(use_with numa numad)"
|
||||
myconf+=" $(use_with selinux)"
|
||||
myconf+=" $(use_with fuse)"
|
||||
|
||||
# udev for device support details
|
||||
myconf+=" $(use_with udev)"
|
||||
myconf+=" --without-hal"
|
||||
|
||||
# linux capability support so we don't need privileged accounts
|
||||
myconf+=" $(use_with caps capng)"
|
||||
|
||||
## auth stuff
|
||||
myconf+=" $(use_with policykit polkit)"
|
||||
myconf+=" $(use_with sasl)"
|
||||
|
||||
# network bits
|
||||
myconf+=" $(use_with macvtap)"
|
||||
myconf+=" $(use_with pcap libpcap)"
|
||||
myconf+=" $(use_with vepa virtualport)"
|
||||
myconf+=" $(use_with firewalld)"
|
||||
|
||||
## other
|
||||
myconf+=" $(use_enable nls)"
|
||||
|
||||
# user privilege bits fir qemu/kvm
|
||||
if use caps; then
|
||||
myconf+=" --with-qemu-user=qemu"
|
||||
myconf+=" --with-qemu-group=qemu"
|
||||
else
|
||||
myconf+=" --with-qemu-user=root"
|
||||
myconf+=" --with-qemu-group=root"
|
||||
fi
|
||||
|
||||
# audit support
|
||||
myconf+=" $(use_with audit)"
|
||||
|
||||
# wireshark dissector
|
||||
myconf+=" $(use_with wireshark-plugins wireshark-dissector)"
|
||||
|
||||
## stuff we don't yet support
|
||||
myconf+=" --without-netcf"
|
||||
|
||||
# locking support
|
||||
myconf+=" --without-sanlock"
|
||||
|
||||
# systemd unit files
|
||||
myconf+=" $(use_with systemd systemd-daemon)"
|
||||
use systemd && myconf+=" --with-init-script=systemd"
|
||||
|
||||
# this is a nasty trick to work around the problem in bug
|
||||
# #275073. The reason why we don't solve this properly is that
|
||||
# it'll require us to rebuild autotools (and we don't really want
|
||||
# to do that right now). The proper solution has been sent
|
||||
# upstream and should hopefully land in 0.7.7, in the mean time,
|
||||
# mime the same functionality with this.
|
||||
case ${CHOST} in
|
||||
*cygwin* | *mingw* )
|
||||
;;
|
||||
*)
|
||||
ac_cv_prog_WINDRES=no
|
||||
;;
|
||||
esac
|
||||
|
||||
econf \
|
||||
${myconf} \
|
||||
--disable-static \
|
||||
--disable-werror \
|
||||
--with-remote \
|
||||
--docdir=/usr/share/doc/${PF} \
|
||||
--localstatedir=/var
|
||||
|
||||
if [[ ${PV} = *9999* ]]; then
|
||||
# Restore gnulib's config.sub and config.guess
|
||||
# bug #377279
|
||||
(cd .gnulib && git reset --hard > /dev/null)
|
||||
fi
|
||||
}
|
||||
|
||||
src_test() {
|
||||
# Explicitly allow parallel build of tests
|
||||
export VIR_TEST_DEBUG=1
|
||||
HOME="${T}" emake check || die "tests failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake install \
|
||||
DESTDIR="${D}" \
|
||||
HTML_DIR=/usr/share/doc/${PF}/html \
|
||||
DOCS_DIR=/usr/share/doc/${PF} \
|
||||
EXAMPLE_DIR=/usr/share/doc/${PF}/examples \
|
||||
SYSTEMD_UNIT_DIR="$(systemd_get_unitdir)" \
|
||||
|| die "emake install failed"
|
||||
|
||||
find "${D}" -name '*.la' -delete || die
|
||||
|
||||
# Remove bogus, empty directories. They are either not used, or
|
||||
# libvirtd is able to create them on demand
|
||||
rm -rf "${D}"/etc/sysconf
|
||||
rm -rf "${D}"/var/cache
|
||||
rm -rf "${D}"/var/run
|
||||
rm -rf "${D}"/var/log
|
||||
|
||||
use libvirtd || return 0
|
||||
# From here, only libvirtd-related instructions, be warned!
|
||||
|
||||
use systemd && systemd_install_serviced \
|
||||
"${FILESDIR}"/libvirtd.service.conf libvirtd.service
|
||||
|
||||
newinitd "${S}/libvirtd.init" libvirtd || die
|
||||
newconfd "${FILESDIR}/libvirtd.confd-r4" libvirtd || die
|
||||
newinitd "${FILESDIR}/virtlockd.init" virtlockd || die
|
||||
|
||||
readme.gentoo_create_doc
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
# we only ever want to generate this once
|
||||
if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
|
||||
rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
|
||||
fi
|
||||
|
||||
# We really don't want to use or support old PolicyKit cause it
|
||||
# screws with the new polkit integration
|
||||
if has_version sys-auth/policykit; then
|
||||
rm -rf "${D}"/usr/share/PolicyKit/policy/org.libvirt.unix.policy
|
||||
fi
|
||||
|
||||
# Only sysctl files ending in .conf work
|
||||
dodir /etc/sysctl.d
|
||||
mv "${D}"/usr/lib/sysctl.d/libvirtd.conf "${D}"/etc/sysctl.d/libvirtd.conf
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
|
||||
touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
|
||||
fi
|
||||
|
||||
if ! use policykit; then
|
||||
elog "To allow normal users to connect to libvirtd you must change the"
|
||||
elog "unix sock group and/or perms in /etc/libvirt/libvirtd.conf"
|
||||
fi
|
||||
|
||||
use libvirtd || return 0
|
||||
# From here, only libvirtd-related instructions, be warned!
|
||||
|
||||
readme.gentoo_print_elog
|
||||
|
||||
if use caps && use qemu; then
|
||||
elog "libvirt will now start qemu/kvm VMs with non-root privileges."
|
||||
elog "Ensure any resources your VMs use are accessible by qemu:qemu"
|
||||
fi
|
||||
|
||||
if [[ -n "${REPLACING_VERSIONS}" ]]; then
|
||||
elog ""
|
||||
elog "The systemd service-file configuration under /etc/sysconfig has"
|
||||
elog "been removed. Please use"
|
||||
elog " /etc/systemd/system/libvirtd.service.d/00gentoo.conf"
|
||||
elog "to control the '--listen' parameter for libvirtd. The configuration"
|
||||
elog "for the libvirt-guests.service is now found under"
|
||||
elog " /etc/libvirt/libvirt-guests.conf"
|
||||
elog "The openrc configuration has not been changed. Thus no action is"
|
||||
elog "required for the openrc service manager."
|
||||
elog ""
|
||||
fi
|
||||
}
|
||||
@ -0,0 +1,86 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin-debug/libreoffice-bin-debug-4.4.3.2.ebuild,v 1.1 2015/05/24 16:38:20 dilfridge Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
BASE_PACKAGENAME="debug"
|
||||
BASE_AMD64_URI="http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-${BASE_PACKAGENAME}-"
|
||||
BASE_X86_URI="http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-${BASE_PACKAGENAME}-"
|
||||
|
||||
DESCRIPTION="LibreOffice, a full office productivity suite. Binary package, debug info"
|
||||
HOMEPAGE="http://www.libreoffice.org"
|
||||
SRC_URI_AMD64="
|
||||
${BASE_AMD64_URI}libreoffice-${PVR}.tar.xz
|
||||
kde? (
|
||||
!java? ( ${BASE_AMD64_URI}libreoffice-kde-${PVR}.xd3 )
|
||||
java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PVR}.xd3 )
|
||||
)
|
||||
gnome? (
|
||||
!java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PVR}.xd3 )
|
||||
java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PVR}.xd3 )
|
||||
)
|
||||
!kde? ( !gnome? (
|
||||
java? ( ${BASE_AMD64_URI}libreoffice-java-${PVR}.xd3 )
|
||||
) )
|
||||
"
|
||||
SRC_URI_X86="
|
||||
${BASE_X86_URI}libreoffice-${PVR}.tar.xz
|
||||
kde? (
|
||||
!java? ( ${BASE_X86_URI}libreoffice-kde-${PVR}.xd3 )
|
||||
java? ( ${BASE_X86_URI}libreoffice-kde-java-${PVR}.xd3 )
|
||||
)
|
||||
gnome? (
|
||||
!java? ( ${BASE_X86_URI}libreoffice-gnome-${PVR}.xd3 )
|
||||
java? ( ${BASE_X86_URI}libreoffice-gnome-java-${PVR}.xd3 )
|
||||
)
|
||||
!kde? ( !gnome? (
|
||||
java? ( ${BASE_X86_URI}libreoffice-java-${PVR}.xd3 )
|
||||
) )
|
||||
"
|
||||
|
||||
SRC_URI="
|
||||
amd64? ( ${SRC_URI_AMD64} )
|
||||
x86? ( ${SRC_URI_X86} )
|
||||
"
|
||||
|
||||
IUSE="gnome java kde"
|
||||
LICENSE="LGPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="-* ~amd64 ~x86"
|
||||
|
||||
RDEPEND="=app-office/${PN/-debug}-${PVR}[gnome=,java=,kde=]"
|
||||
|
||||
DEPEND="dev-util/xdelta:3"
|
||||
|
||||
RESTRICT="test strip"
|
||||
|
||||
S="${WORKDIR}"
|
||||
|
||||
src_unpack() {
|
||||
einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz"
|
||||
xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
|
||||
|
||||
local patchname
|
||||
use kde && patchname="-kde"
|
||||
use gnome && patchname="-gnome"
|
||||
use java && patchname="${patchname}-java"
|
||||
|
||||
if [ -n "${patchname}" ]; then
|
||||
einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3"
|
||||
xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3" "${WORKDIR}/tmpdist.tar" || die
|
||||
mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
|
||||
fi
|
||||
|
||||
einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
|
||||
unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
|
||||
}
|
||||
|
||||
src_configure() { :; }
|
||||
|
||||
src_compile() { :; }
|
||||
|
||||
src_install() {
|
||||
dodir /usr
|
||||
cp -aR "${S}"/usr/* "${ED}"/usr/ || die
|
||||
}
|
||||
@ -0,0 +1,234 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-4.4.3.2.ebuild,v 1.1 2015/05/24 16:37:05 dilfridge Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
KDE_REQUIRED="optional"
|
||||
CMAKE_REQUIRED="never"
|
||||
|
||||
BASE_PACKAGENAME="bin"
|
||||
BASE_AMD64_URI="http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-${BASE_PACKAGENAME}-"
|
||||
BASE_X86_URI="http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-${BASE_PACKAGENAME}-"
|
||||
|
||||
PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
|
||||
PYTHON_REQ_USE="threads,xml"
|
||||
|
||||
inherit kde4-base java-pkg-opt-2 python-single-r1 pax-utils prefix versionator
|
||||
|
||||
DESCRIPTION="LibreOffice, a full office productivity suite. Binary package"
|
||||
HOMEPAGE="http://www.libreoffice.org"
|
||||
SRC_URI_AMD64="
|
||||
${BASE_AMD64_URI}libreoffice-${PVR}.tar.xz
|
||||
kde? (
|
||||
!java? ( ${BASE_AMD64_URI}libreoffice-kde-${PVR}.xd3 )
|
||||
java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PVR}.xd3 )
|
||||
)
|
||||
gnome? (
|
||||
!java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PVR}.xd3 )
|
||||
java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PVR}.xd3 )
|
||||
)
|
||||
!kde? ( !gnome? (
|
||||
java? ( ${BASE_AMD64_URI}libreoffice-java-${PVR}.xd3 )
|
||||
) )
|
||||
"
|
||||
SRC_URI_X86="
|
||||
${BASE_X86_URI}libreoffice-${PVR}.tar.xz
|
||||
kde? (
|
||||
!java? ( ${BASE_X86_URI}libreoffice-kde-${PVR}.xd3 )
|
||||
java? ( ${BASE_X86_URI}libreoffice-kde-java-${PVR}.xd3 )
|
||||
)
|
||||
gnome? (
|
||||
!java? ( ${BASE_X86_URI}libreoffice-gnome-${PVR}.xd3 )
|
||||
java? ( ${BASE_X86_URI}libreoffice-gnome-java-${PVR}.xd3 )
|
||||
)
|
||||
!kde? ( !gnome? (
|
||||
java? ( ${BASE_X86_URI}libreoffice-java-${PVR}.xd3 )
|
||||
) )
|
||||
"
|
||||
|
||||
SRC_URI="
|
||||
amd64? ( ${SRC_URI_AMD64} )
|
||||
x86? ( ${SRC_URI_X86} )
|
||||
"
|
||||
|
||||
IUSE="gnome java kde"
|
||||
LICENSE="LGPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="-* ~amd64 ~x86"
|
||||
|
||||
BIN_COMMON_DEPEND="
|
||||
=app-text/libexttextcat-3.4*
|
||||
=app-text/libmwaw-0.3*
|
||||
app-text/poppler:0/51
|
||||
dev-libs/boost:0/1.55.0
|
||||
dev-libs/icu:0/55
|
||||
=media-gfx/graphite2-1.2*
|
||||
media-libs/glew:0/1.10
|
||||
media-libs/harfbuzz:0/0.9.18[icu]
|
||||
media-libs/libpng:0/16
|
||||
>=sys-libs/glibc-2.20-r2
|
||||
virtual/jpeg:62
|
||||
kde? ( >=kde-base/kdelibs-4.14.3-r1:4 >=dev-qt/qtcore-4.8.6-r2:4 >=dev-qt/qtgui-4.8.6-r4:4 )
|
||||
"
|
||||
|
||||
# PLEASE place any restrictions that are specific to the binary builds
|
||||
# into the BIN_COMMON_DEPEND block above.
|
||||
# All dependencies below this point should remain identical to those in
|
||||
# the source ebuilds.
|
||||
|
||||
COMMON_DEPEND="
|
||||
${BIN_COMMON_DEPEND}
|
||||
${PYTHON_DEPS}
|
||||
app-arch/zip
|
||||
app-arch/unzip
|
||||
>=app-text/hunspell-1.3.2-r3
|
||||
app-text/mythes
|
||||
>=app-text/libabw-0.1.0
|
||||
>=app-text/libexttextcat-3.2
|
||||
>=app-text/libebook-0.1.1
|
||||
>=app-text/libetonyek-0.1.1
|
||||
app-text/liblangtag
|
||||
>=app-text/libmspub-0.1.0
|
||||
>=app-text/libmwaw-0.3.4
|
||||
>=app-text/libodfgen-0.1.0
|
||||
app-text/libwpd:0.10[tools]
|
||||
app-text/libwpg:0.3
|
||||
=app-text/libwps-0.3*
|
||||
>=app-text/poppler-0.16:=[xpdf-headers(+),cxx]
|
||||
>=dev-cpp/clucene-2.3.3.4-r2
|
||||
=dev-cpp/libcmis-0.5*
|
||||
dev-db/unixODBC
|
||||
>=dev-libs/boost-1.55:=
|
||||
dev-libs/expat
|
||||
>=dev-libs/hyphen-2.7.1
|
||||
>=dev-libs/icu-4.8.1.1:=
|
||||
>=dev-libs/liborcus-0.7.0
|
||||
>=dev-libs/librevenge-0.0.1
|
||||
>=dev-libs/nspr-4.8.8
|
||||
>=dev-libs/nss-3.12.9
|
||||
>=dev-lang/perl-5.0
|
||||
>=dev-libs/openssl-1.0.0d:0
|
||||
>=dev-libs/redland-1.0.16
|
||||
media-gfx/graphite2
|
||||
>=media-libs/fontconfig-2.8.0
|
||||
media-libs/freetype:2
|
||||
>=media-libs/glew-1.10
|
||||
>=media-libs/harfbuzz-0.9.18:=[icu(+)]
|
||||
media-libs/lcms:2
|
||||
>=media-libs/libpng-1.4:0=
|
||||
>=media-libs/libcdr-0.1.0
|
||||
>=media-libs/libfreehand-0.1.0
|
||||
media-libs/libpagemaker
|
||||
>=media-libs/libvisio-0.1.0
|
||||
>=net-misc/curl-7.21.4
|
||||
net-libs/neon
|
||||
net-nds/openldap
|
||||
sci-mathematics/lpsolve
|
||||
virtual/jpeg:0
|
||||
>=x11-libs/cairo-1.10.0[X]
|
||||
x11-libs/libXinerama
|
||||
x11-libs/libXrandr
|
||||
x11-libs/libXrender
|
||||
virtual/glu
|
||||
virtual/opengl
|
||||
net-print/cups
|
||||
>=dev-libs/dbus-glib-0.92
|
||||
gnome? ( gnome-extra/evolution-data-server )
|
||||
gnome? ( gnome-base/gconf:2 )
|
||||
x11-libs/gdk-pixbuf[X]
|
||||
>=x11-libs/gtk+-2.24:2
|
||||
media-libs/gstreamer:1.0
|
||||
media-libs/gst-plugins-base:1.0
|
||||
"
|
||||
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
!app-office/libreoffice
|
||||
!<app-office/openoffice-bin-3.4.0-r1
|
||||
!app-office/openoffice
|
||||
media-fonts/libertine
|
||||
media-fonts/liberation-fonts
|
||||
media-fonts/urw-fonts
|
||||
java? ( >=virtual/jre-1.6 )
|
||||
kde? ( || ( $(add_kdeapps_dep kioclient) $(add_kdebase_dep kioclient) ) )
|
||||
"
|
||||
|
||||
PDEPEND="
|
||||
=app-office/libreoffice-l10n-${PV}*
|
||||
"
|
||||
|
||||
DEPEND="dev-util/xdelta:3"
|
||||
|
||||
# only one flavor at a time
|
||||
REQUIRED_USE="kde? ( !gnome ) gnome? ( !kde )"
|
||||
|
||||
RESTRICT="test strip"
|
||||
|
||||
S="${WORKDIR}"
|
||||
|
||||
PYTHON_UPDATER_IGNORE="1"
|
||||
|
||||
pkg_pretend() {
|
||||
[[ $(gcc-major-version) -lt 4 ]] || \
|
||||
( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 4 ]] ) \
|
||||
&& die "Sorry, but gcc-4.4 and earlier won't work for libreoffice-bin package (see bug #387515)."
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
kde4-base_pkg_setup
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz"
|
||||
xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
|
||||
|
||||
local patchname
|
||||
use kde && patchname="-kde"
|
||||
use gnome && patchname="-gnome"
|
||||
use java && patchname="${patchname}-java"
|
||||
|
||||
if [ -n "${patchname}" ]; then
|
||||
einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3"
|
||||
xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3" "${WORKDIR}/tmpdist.tar" || die
|
||||
mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
|
||||
fi
|
||||
|
||||
einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
|
||||
unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
cp "${FILESDIR}"/50-${PN} "${T}"
|
||||
eprefixify "${T}"/50-${PN}
|
||||
}
|
||||
|
||||
src_configure() { :; }
|
||||
|
||||
src_compile() { :; }
|
||||
|
||||
src_install() {
|
||||
dodir /usr
|
||||
cp -aR "${S}"/usr/* "${ED}"/usr/
|
||||
|
||||
# prevent revdep-rebuild from attempting to rebuild all the time
|
||||
insinto /etc/revdep-rebuild && doins "${T}/50-${PN}"
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
# Cache updates - all handled by kde eclass for all environments
|
||||
kde4-base_pkg_preinst
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
kde4-base_pkg_postinst
|
||||
|
||||
pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
|
||||
pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
|
||||
|
||||
use java || \
|
||||
ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.'
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
kde4-base_pkg_postrm
|
||||
}
|
||||
@ -0,0 +1,92 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-text/groonga/groonga-5.0.3.ebuild,v 1.1 2015/05/25 00:29:28 grknight Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit eutils libtool user
|
||||
|
||||
DESCRIPTION="An Embeddable Fulltext Search Engine"
|
||||
HOMEPAGE="http://groonga.org/"
|
||||
SRC_URI="http://packages.groonga.org/source/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="abort benchmark debug doc dynamic-malloc-change +exact-alloc-count examples fmalloc futex libedit libevent lzo mecab msgpack +nfkc sphinx static-libs uyield zeromq zlib"
|
||||
|
||||
RDEPEND="benchmark? ( >=dev-libs/glib-2.8 )
|
||||
libedit? ( >=dev-libs/libedit-3 )
|
||||
libevent? ( dev-libs/libevent )
|
||||
lzo? ( dev-libs/lzo )
|
||||
mecab? ( >=app-text/mecab-0.80 )
|
||||
msgpack? ( dev-libs/msgpack )
|
||||
sphinx? ( >=dev-python/sphinx-1.0.1 )
|
||||
zeromq? ( net-libs/zeromq )
|
||||
zlib? ( sys-libs/zlib )"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
sphinx? ( dev-python/sphinx )"
|
||||
|
||||
REQUIRED_USE=" abort? ( dynamic-malloc-change ) fmalloc? ( dynamic-malloc-change ) sphinx? ( doc )"
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup groonga
|
||||
enewuser groonga -1 -1 -1 groonga
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
elibtoolize
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# httpd is a bundled copy of nginx; disabled for security reasons
|
||||
# prce only is used with httpd
|
||||
# kytea and libstemmer are not available in portage
|
||||
# ruby is only used for an http test
|
||||
econf \
|
||||
--disable-groonga-httpd \
|
||||
--without-pcre \
|
||||
--without-kytea \
|
||||
--without-libstemmer \
|
||||
--with-log-path="${EROOT}var/log/${PN}.log" \
|
||||
--docdir="${EROOT}usr/share/doc/${P}" \
|
||||
--without-ruby \
|
||||
$(use_enable abort) \
|
||||
$(use_enable benchmark) \
|
||||
$(use_enable debug memory-debug) \
|
||||
$(use_enable doc document) \
|
||||
$(use_enable dynamic-malloc-change) \
|
||||
$(use_enable exact-alloc-count) \
|
||||
$(use_enable fmalloc) \
|
||||
$(use_enable futex) \
|
||||
$(use_enable libedit) \
|
||||
$(use_with libevent) \
|
||||
$(use_with lzo) \
|
||||
$(use_with mecab) \
|
||||
$(use_with msgpack message-pack "${EROOT}usr") \
|
||||
$(use_enable nfkc) \
|
||||
$(use_with sphinx sphinx-build) \
|
||||
$(use_enable static-libs static) \
|
||||
$(use_enable uyield) \
|
||||
$(use_enable zeromq) \
|
||||
$(use_with zlib)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
prune_libtool_files
|
||||
|
||||
newinitd "${FILESDIR}/${PN}.initd" ${PN}
|
||||
newconfd "${FILESDIR}/${PN}.confd" ${PN}
|
||||
|
||||
keepdir /var/{log,lib}/${PN}
|
||||
fowners groonga:groonga /var/{log,lib}/${PN}
|
||||
|
||||
dodoc README.md
|
||||
|
||||
use examples || rm -r "${D}usr/share/${PN}" || die
|
||||
# Extra init script
|
||||
rm -r "${D}usr/sbin/groonga-httpd-restart" || die
|
||||
}
|
||||
@ -0,0 +1,15 @@
|
||||
Sadly the CMake side of openjpeg slotting in Gentoo is broken.
|
||||
To reliably find openjpeg:2 we need to use pkg-config.
|
||||
|
||||
diff -ruN poppler-0.33.0.orig/CMakeLists.txt poppler-0.33.0/CMakeLists.txt
|
||||
--- poppler-0.33.0.orig/CMakeLists.txt 2015-05-14 20:22:31.000000000 +0200
|
||||
+++ poppler-0.33.0/CMakeLists.txt 2015-05-24 20:39:30.163709257 +0200
|
||||
@@ -172,7 +172,7 @@
|
||||
set(USE_OPENJPEG1 ${LIBOPENJPEG_FOUND})
|
||||
set(WITH_OPENJPEG ${LIBOPENJPEG_FOUND})
|
||||
elseif(ENABLE_LIBOPENJPEG STREQUAL "openjpeg2")
|
||||
- find_package(LIBOPENJPEG2)
|
||||
+ pkg_check_modules(LIBOPENJPEG2 libopenjp2)
|
||||
set(USE_OPENJPEG2 ${LIBOPENJPEG2_FOUND})
|
||||
set(WITH_OPENJPEG ${LIBOPENJPEG2_FOUND})
|
||||
endif()
|
||||
@ -0,0 +1,112 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.33.0-r1.ebuild,v 1.1 2015/05/24 18:45:23 dilfridge Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit cmake-utils toolchain-funcs
|
||||
|
||||
if [[ "${PV}" == "9999" ]] ; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}"
|
||||
SLOT="0/9999"
|
||||
else
|
||||
SRC_URI="http://poppler.freedesktop.org/${P}.tar.xz"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
SLOT="0/52" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
|
||||
fi
|
||||
|
||||
DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
|
||||
HOMEPAGE="http://poppler.freedesktop.org/"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
IUSE="cairo cjk curl cxx debug doc +introspection +jpeg jpeg2k +lcms png qt4 qt5 tiff +utils"
|
||||
|
||||
# No test data provided
|
||||
RESTRICT="test"
|
||||
|
||||
COMMON_DEPEND="
|
||||
>=media-libs/fontconfig-2.6.0
|
||||
>=media-libs/freetype-2.3.9
|
||||
sys-libs/zlib
|
||||
cairo? (
|
||||
dev-libs/glib:2
|
||||
>=x11-libs/cairo-1.10.0
|
||||
introspection? ( >=dev-libs/gobject-introspection-1.32.1 )
|
||||
)
|
||||
curl? ( net-misc/curl )
|
||||
jpeg? ( virtual/jpeg:0 )
|
||||
jpeg2k? ( media-libs/openjpeg:2 )
|
||||
lcms? ( media-libs/lcms:2 )
|
||||
png? ( media-libs/libpng:0= )
|
||||
qt4? (
|
||||
dev-qt/qtcore:4
|
||||
dev-qt/qtgui:4
|
||||
)
|
||||
qt5? (
|
||||
dev-qt/qtcore:5
|
||||
dev-qt/qtgui:5
|
||||
dev-qt/qtxml:5
|
||||
)
|
||||
tiff? ( media-libs/tiff:0 )
|
||||
"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
virtual/pkgconfig
|
||||
"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
cjk? ( >=app-text/poppler-data-0.4.4 )
|
||||
"
|
||||
|
||||
DOCS=(AUTHORS NEWS README README-XPDF TODO)
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-0.26.0-qt5-dependencies.patch"
|
||||
"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
|
||||
"${FILESDIR}/${PN}-0.28.1-respect-cflags.patch"
|
||||
"${FILESDIR}/${PN}-0.33.0-openjpeg2.patch"
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DBUILD_GTK_TESTS=OFF
|
||||
-DBUILD_QT4_TESTS=OFF
|
||||
-DBUILD_QT5_TESTS=OFF
|
||||
-DBUILD_CPP_TESTS=OFF
|
||||
-DENABLE_SPLASH=ON
|
||||
-DENABLE_ZLIB=ON
|
||||
-DENABLE_XPDF_HEADERS=ON
|
||||
$(cmake-utils_use_enable curl LIBCURL)
|
||||
$(cmake-utils_use_enable cxx CPP)
|
||||
$(cmake-utils_use_enable utils)
|
||||
$(cmake-utils_use_with cairo)
|
||||
$(cmake-utils_use_with introspection GObjectIntrospection)
|
||||
$(cmake-utils_use_with jpeg)
|
||||
$(cmake-utils_use_with png)
|
||||
$(cmake-utils_use_with qt4)
|
||||
$(cmake-utils_use_find_package qt5 Qt5Core)
|
||||
$(cmake-utils_use_with tiff)
|
||||
)
|
||||
if use jpeg2k; then
|
||||
mycmakeargs+=(-DENABLE_LIBOPENJPEG=openjpeg2)
|
||||
else
|
||||
mycmakeargs+=(-DENABLE_LIBOPENJPEG=)
|
||||
fi
|
||||
if use lcms; then
|
||||
mycmakeargs+=(-DENABLE_CMS=lcms2)
|
||||
else
|
||||
mycmakeargs+=(-DENABLE_CMS=)
|
||||
fi
|
||||
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake-utils_src_install
|
||||
|
||||
if use cairo && use doc; then
|
||||
# For now install gtk-doc there
|
||||
insinto /usr/share/gtk-doc/html/poppler
|
||||
# nonfatal, because live version doesn't provide html documentation.
|
||||
nonfatal doins -r "${S}"/glib/reference/html/*
|
||||
fi
|
||||
}
|
||||
@ -0,0 +1,12 @@
|
||||
# ChangeLog for dev-go/godep
|
||||
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-go/godep/ChangeLog,v 1.2 2015/05/24 21:47:40 zmedico Exp $
|
||||
|
||||
24 May 2015; Zac Medico <zmedico@gentoo.org> godep-0_p20150520.ebuild:
|
||||
Disable broken tests.
|
||||
|
||||
*godep-0_p20150520 (24 May 2015)
|
||||
|
||||
24 May 2015; Zac Medico <zmedico@gentoo.org> +godep-0_p20150520.ebuild,
|
||||
+metadata.xml:
|
||||
Add godep.
|
||||
@ -0,0 +1,15 @@
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA256
|
||||
|
||||
DIST go-fs-2788f0dbd16903de03cb8186e5c7d97b69ad387b.tar.gz 4366 SHA256 5b8ebbacf88942136f42ccef13822c2d45f3304520be0aabc40309dcb931c707 SHA512 1d1687513caf338a82e5b15624fe7b3702fd42326c433cbf4100551a2f5aa587814201166946739a2dadfecf861661b0ed31934e13bfbe3aac6221ff2624733f WHIRLPOOL 3c38f344d232daf7109449bed55158c95f4657d9067d3623a05abadecfed274033f65375c715518c4617c30985519e735440474fb984a654739c081792c19324
|
||||
DIST godep-0_p20150520.tar.gz 20433 SHA256 3c461f14db4a65a1fa72ad3e4444986d25e75b99461b978452e65e9b751fb25d SHA512 f26bad4094ee5d35bc2cb4518094b113a84c55d196bdb59d3ffc48715151f64136cc32103bb624c28d72db97bca3aff94af71922b5daf32285421e85ee164dfd WHIRLPOOL 2a03b9c7724715a06228ac216a578974f11646f553b3e5a0c763907b673c872ac536c733f1230a15ca3603c18346a24c38ce10fe66fb779011a9a02e0f95ec3c
|
||||
EBUILD godep-0_p20150520.ebuild 1286 SHA256 d264b9fc474804b5541b561d4213a39c7a64288c582e24b2ff3aac58065db18d SHA512 4785ed0e67cfc476e353359357388e43d9e43e90daed07ff4e9c50583fe8ef3e8417ec0c01b7c3580665cceb96795f15279df5318791b9053be1ff7be4d34fe1 WHIRLPOOL 400febe701823399ae124671601952c6059d8d39f3b9e2ac11a555417675f5bce74377a079a3d7f28699eba5610d7780c70d7651ec46304f6688a420cbbded6d
|
||||
MISC ChangeLog 434 SHA256 b8bfa2e4cf3d7200b8f2ac90dd0b5c55b65ad5c06094485021650c4ca2d35b2d SHA512 9fa2af3b4e55e0ec850be051cb5804bd22e079a960cd49c69c0a26d4bff32c2bb69e49dac47373b79b9c8ace0b65d7fadede89cd1a8e494432cfc4be7602839b WHIRLPOOL 5df3ad98d4c60d4a9de46506443b12c6a9e47fab257b94bb749bea82059249e46369a23e09192393316d727c3443bed71223157a51c48faa788f7e1534c7fcd3
|
||||
MISC metadata.xml 208 SHA256 67f4cd233dc8d6d341b8da89aef2654cae64f7e3b62fbcdd3a35e6e30e898e36 SHA512 5213f6c100db04c6bbbf73b4e52042caf1744aa805af76053f5ecaf5f921ffdd35c41507b492da65c6071f1699472db6c9334dcd5bb7da752dca8efe7e1c7aa4 WHIRLPOOL a43dc0ecd7f37ba8cf4d510a1195338816b6193e5c5517c8e005662a06d7fb62c725a3c2981474a872cba628c268de1bea0fb67a31ae1842a252c0fdc723eb4d
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2
|
||||
|
||||
iEYEAREIAAYFAlViRv0ACgkQ/ejvha5XGaM8hwCfZO4C4VcTu5Nr+QNMsvOY8lFH
|
||||
zeEAn0SbE1di07MVnwcrJ2BWXCsChPzy
|
||||
=o14r
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -0,0 +1,47 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-go/godep/godep-0_p20150520.ebuild,v 1.2 2015/05/24 21:47:40 zmedico Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
KEYWORDS="~amd64"
|
||||
DESCRIPTION="dependency tool for go"
|
||||
GO_PN=github.com/tools/${PN}
|
||||
HOMEPAGE="https://${GO_PN}"
|
||||
EGIT_COMMIT="98f5c2e8906df47a9eaafebbcd406adde2c8d0a7"
|
||||
SRC_URI="https://${GO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
|
||||
https://github.com/kr/fs/archive/2788f0dbd16903de03cb8186e5c7d97b69ad387b.tar.gz -> go-fs-2788f0dbd16903de03cb8186e5c7d97b69ad387b.tar.gz"
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
DEPEND=">=dev-lang/go-1.4"
|
||||
RDEPEND=""
|
||||
S="${WORKDIR}/src/${GO_PN}"
|
||||
STRIP_MASK="*.a"
|
||||
|
||||
src_unpack() {
|
||||
default
|
||||
mkdir -p src/${GO_PN%/*} || die
|
||||
mv ${PN}-${EGIT_COMMIT} src/${GO_PN} || die
|
||||
mkdir -p src/github.com/kr || die
|
||||
mv fs-2788f0dbd16903de03cb8186e5c7d97b69ad387b src/github.com/kr/fs || die
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# disable broken tests
|
||||
sed -e 's:TestSave(:_\0:' -i save_test.go || die
|
||||
sed -e 's:TestUpdate(:_\0:' -i update_test.go || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
GOPATH=${WORKDIR} go install -v -x -work ${GO_PN}/... || die
|
||||
}
|
||||
|
||||
src_test() {
|
||||
GOPATH=${WORKDIR} \
|
||||
go test -x -v ${GO_PN}/... || die $?
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dobin "${WORKDIR}"/bin/*
|
||||
}
|
||||
@ -0,0 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer>
|
||||
<email>zmedico@gentoo.org</email>
|
||||
</maintainer>
|
||||
</pkgmetadata>
|
||||
@ -0,0 +1,71 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-configuration/commons-configuration-1.6-r1.ebuild,v 1.1 2015/05/24 19:32:56 monsieurp Exp $
|
||||
|
||||
EAPI=1
|
||||
|
||||
JAVA_PKG_IUSE="doc source"
|
||||
|
||||
inherit eutils java-pkg-2 java-ant-2
|
||||
|
||||
DESCRIPTION="Generic interface for reading configuration data from a variety of sources"
|
||||
HOMEPAGE="http://commons.apache.org/configuration/"
|
||||
SRC_URI="mirror://apache/commons/configuration/source/${P}-src.tar.gz"
|
||||
|
||||
# it needs functionality from ant-core, although not providing an ant task
|
||||
# the functionality is apparently needed only for 1.4 jdk
|
||||
# but I don't feel like adding virtual for this
|
||||
COMMON_DEPENDS="
|
||||
>=dev-java/commons-beanutils-1.7.0:1.7
|
||||
>=dev-java/commons-codec-1.3:0
|
||||
>=dev-java/commons-collections-3.1:0
|
||||
>=dev-java/commons-digester-1.8:0
|
||||
>=dev-java/commons-jxpath-1.2:0
|
||||
>=dev-java/commons-lang-2.4:2.1
|
||||
>=dev-java/commons-logging-1.1.1:0
|
||||
java-virtuals/servlet-api:2.5
|
||||
dev-java/ant-core:0"
|
||||
|
||||
DEPEND=">=virtual/jdk-1.6
|
||||
${COMMON_DEPENDS}"
|
||||
RDEPEND=">=virtual/jre-1.6
|
||||
${COMMON_DEPENDS}"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
|
||||
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
S="${WORKDIR}/${P}-src"
|
||||
|
||||
src_unpack() {
|
||||
unpack ${A}
|
||||
cd "${S}"
|
||||
|
||||
# Tweak build classpath and don't automatically run tests
|
||||
epatch "${FILESDIR}/${P}-gentoo.patch"
|
||||
|
||||
java-ant_rewrite-classpath
|
||||
}
|
||||
|
||||
EANT_GENTOO_CLASSPATH="
|
||||
commons-beanutils:1.7
|
||||
commons-codec
|
||||
commons-collections
|
||||
commons-digester
|
||||
commons-jxpath
|
||||
commons-lang:2.1
|
||||
commons-logging
|
||||
servlet-api:2.5
|
||||
ant-core"
|
||||
|
||||
# Would need mockobjects with j2ee support which we don't have
|
||||
# Check overlay for ebuild with test support
|
||||
RESTRICT="test"
|
||||
|
||||
src_install() {
|
||||
java-pkg_newjar target/${P}.jar
|
||||
dodoc RELEASE-NOTES.txt || die
|
||||
use doc && java-pkg_dojavadoc dist/docs/api
|
||||
use source && java-pkg_dosrc src/java/*
|
||||
}
|
||||
@ -0,0 +1,59 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jxpath/commons-jxpath-1.3-r1.ebuild,v 1.1 2015/05/24 21:56:29 monsieurp Exp $
|
||||
|
||||
EAPI=1
|
||||
JAVA_PKG_IUSE="doc source test"
|
||||
|
||||
inherit java-pkg-2 java-ant-2
|
||||
|
||||
DESCRIPTION="Applies XPath expressions to graphs of objects of all kinds"
|
||||
HOMEPAGE="http://commons.apache.org/jxpath/"
|
||||
SRC_URI="mirror://apache/commons/jxpath/source/${P}-src.tar.gz"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
|
||||
IUSE=""
|
||||
|
||||
S="${WORKDIR}/${P}-src"
|
||||
|
||||
CDEPEND="dev-java/commons-beanutils:1.7
|
||||
java-virtuals/servlet-api:2.5
|
||||
dev-java/jdom:1.0"
|
||||
RDEPEND=">=virtual/jre-1.6
|
||||
${CDEPEND}"
|
||||
DEPEND=">=virtual/jdk-1.6
|
||||
test? (
|
||||
dev-java/commons-collections:0
|
||||
dev-java/commons-logging:0
|
||||
)
|
||||
${CDEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack ${A}
|
||||
cd "${S}"
|
||||
|
||||
# Don't automatically run tests
|
||||
sed 's/depends="compile,test"/depends="compile"/' -i build.xml || die
|
||||
|
||||
mkdir -p "${S}/target/lib"
|
||||
cd "${S}/target/lib"
|
||||
java-pkg_jar-from commons-beanutils-1.7
|
||||
java-pkg_jar-from servlet-api-2.5
|
||||
java-pkg_jar-from jdom-1.0
|
||||
}
|
||||
|
||||
src_test() {
|
||||
# this one needs mockrunner #259027
|
||||
rm src/test/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java || die
|
||||
java-pkg_jar-from --into target/lib \
|
||||
commons-collections,commons-logging,junit
|
||||
ANT_TASKS="ant-junit" eant test
|
||||
}
|
||||
|
||||
src_install() {
|
||||
java-pkg_dojar target/${PN}.jar
|
||||
use doc && java-pkg_dojavadoc dist/docs/api
|
||||
use source && java-pkg_dosrc src/java/*
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue