Calculate utilities 3.1.6

atratsevskiy
parent a58afcffc5
commit c7a5dc603f

@ -7,7 +7,7 @@ AUX calculate-client-3.1.5_beta1-r1.patch 1044 SHA256 e0e49973f076b3e62617f977db
DIST calculate-client-3.1.5.tar.bz2 31578 SHA256 4837b7c296bf4b3a1caa3e0e05156248ec5c32bd5c2e1dd7ae00391fb43f7a02 SHA512 9e3c88764fa7145b649e8348cba140a201de8715f60e48270e4da494fac03619314b9003761c43182d0a3665aba1af76344ca1defeac4b324de8d7c195d7844a WHIRLPOOL 75d00fa10b89be49d6449c24b3a53514ef761f227adb7bf6ef64fbb26ca29489badc6adcf7bba222adbca6a1451003efc39f947005f37aba46fddbabb36628fb
DIST calculate-client-3.1.6.tar.bz2 32036 SHA256 00b5ef665b9148f2b5acc913e59534e810ec0a6c93ee037ffc12852bba3ff290 SHA512 0547fd9320f49c1b628e446298366110dbf19eea94b8e2335ec311b69a33352b575eed3a23bbaf5c24ceb602c7166d1da5c7ea73859421b9b2d6955289956790 WHIRLPOOL d725b4396398def4eb6bc0cc6575430e46ec8bb7efefd721d3ee904c0644bbbf6fc87d43fbf9060e2c71465eaed2ff1522631522f2d829527874dd0a379a9488
EBUILD calculate-client-3.1.5-r6.ebuild 942 SHA256 578157ce1917c50cbabe5dac852623597496d1888b3d2e9b8cd2dc3d724ee231 SHA512 675b50804e76ce17f522f5a24b546b1e2d2fdc6d04b2fee1418586d09b8c3778c0d13f782c7a92c42bfc6b29e829bf53e5c7cb279e1bbd3a2000273e2b0673d2 WHIRLPOOL 2cc432879f5c583cd81ef2d179a133abf089613a94125a7556bbb5f004df2cf335049a082ae3d559d93bf90972a4b2d43a997a9d8b5bbcceb4b2ba639055fb02
EBUILD calculate-client-3.1.6.ebuild 808 SHA256 899a9d63d4bae9bba063bdd5fcf8bf88fc8afd4c3a760206cd2c469ca74a6a77 SHA512 f6efe95f4c971ffa4016b45a913c8fc88ee9017ebb1db2e0f9fc46426bb5be9810243978efb496b5b343e0c28bfa2912144a571abcca2a17dc9b164b806814f0 WHIRLPOOL 7618fb09b02cb554a2c70a2ed4b97f24ba99be275ee578f0c59513d6a143dbca6f9f16aeaa79c021c03379b0f98c6e73e936109438d1e4e1db3e6aa5b39bb4b6
EBUILD calculate-client-3.1.6.ebuild 806 SHA256 e1fb90f3ff6e73a4a4d3abf66a8bca5a135112ae75983dfb831d3282b7f60902 SHA512 5eb44441e2d7e66d5eba89ba31a43bc1ce65038552984894f7869ce2a34ff68bc51ad4d7dafb768dda47efcd09802f7c28c9767e44afb1d14fda0a49bb138ac6 WHIRLPOOL 2e8f9930605c5af9969e05cf4d8287d8338a7a4dc177ee703b39277e57c4bb4164e0b5fc5f1dd4f3466f6d65371fc863aa745f778555474d30238a46770bcad3
EBUILD calculate-client-3.1.9999.ebuild 879 SHA256 37385187f78bb708669b5cd2742173b117bb482c784f8f481ab7388554476d65 SHA512 87ebc2dfa965a9bb9d24af13a611e83e412cbabb12957bb14e2a1cd8b9f1951efbf690dcfa8f73711a02cfd0afbc9e9f37209ba9a3884b018c41b3a46e2e847b WHIRLPOOL 349da1bcb076af176079473ccb2fd1a4e3d8eb3ec2a7a6102272d1dd1073a8c181c49e02c89ede4b5cd829856f0c0f5db877b89eb0c6335ad678e58902db293b
MISC ChangeLog 21989 SHA256 065aa2c75428e965caef0348105d8e5464d4103f5f2eb16bb626c7a9278208df SHA512 76ad69386d986e2e65448394d738b4d6abbeffb4af38f13dcfbfe8af64796c9b97eda68eb8cbf749fe7ef2711067da430af1cc1a764712e8df853451f903ab57 WHIRLPOOL 58b0a2837255a2eb67606072ac1a6a06e0db7079b563d3b4c9df45b5dbe0fad31c409800da635a337ad976b31bb08549e89063796e8217d46c83ba8b5e22e1b8
MISC metadata.xml 310 SHA256 5023605d36dcbb5d5fe1b1ac54f7125a4087479b5168601075a8050ed51c38c2 SHA512 67a32e55e64108218d991282f1c1c9b1bad07c12a0d192db9e81df28557baeab75b8c9f5b134568c85f090470c15c727df18dff3c4deef05cc64f8f1be7d3943 WHIRLPOOL a9d79c91db4946f3abee5c6acc52d9eab183e49682a492fe7c7617a15eebee122f8c2f5a6b0834bed76c4f8bbd8bec8e58c726a93c2f4d04a00d92987d9c7227

@ -15,7 +15,7 @@ DESCRIPTION="The program of setting and storing the user account in the domain"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="~amd64 ~x86"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-desktop-3.1.6
!<sys-apps/calculate-client-3.1.0

@ -6,7 +6,7 @@ AUX calculate-console-gui-3.1.5_beta1-r1.patch 1669 SHA256 6806fa2c53abf7087c309
DIST calculate-console-gui-3.1.5.tar.bz2 320131 SHA256 194511aeec8518b202354e196af6c232e7600edf7341d631fe3537462a507384 SHA512 49b544b7514809a2ee4f3ed8461096697ff506d1fb49af4370d1f31a683b3661f90941125013532c6c4dd20f24fa80812b8c3b230437b27061568627e8e5ca7d WHIRLPOOL 8ea6ebbcd08c03641cfadb44fae14a7e9b42b5ba40beb9e06e3960d3c0a0165b06245e60c52d1249db53c3a5512c35131b45b0387a36433ec26767e23c1f1316
DIST calculate-console-gui-3.1.6.tar.bz2 320125 SHA256 302c17149bf6e02bb62ea5caac77a1d10425458f53434247940ed91ad0415e19 SHA512 f2d64dd8971722dbd3b0034003d3cf471982574907c6a4fe1149efcc79911eb6f18dda1af5ab0a725e1a1fe08526d6bc581e47aae5260842b3cac7cc2d33f993 WHIRLPOOL 93d58953583c7ae590a548c954fe20e06283e83825f0ba9594c032951013bbc9311727224a7122b4db31b25727520fc71eb0e16aacd78467d6eaf138cdc81958
EBUILD calculate-console-gui-3.1.5-r3.ebuild 763 SHA256 e0194739d3e3122d3e838d7d9fa503e14637f3c553d439de017cd88657886297 SHA512 c217c4e4c8ebedc33878a6a0204864c1958aea295a75c0052240e53b1b5fca2689e3cbabb24d18e345952d01b1982ffc660297d350d3af628032dae239f8b858 WHIRLPOOL 1b98673db3730a5c9fe1bc5b66a9f13766b5641f2ab8eb0cb11b596a80914219cdd471cece911f9f96ff38313298259d786dcd56842d3c67a583b0721bf2b721
EBUILD calculate-console-gui-3.1.6.ebuild 624 SHA256 433f0a2279cfb7d10c50a7420773224aa0977976d6e63e58783206a0a9aaacec SHA512 87bc66e949e5d0d4095c55e319a512ad67a48c424e63805912fe2e2d0dbe6e5048ce95ee722b4fdcc933ffbe3719ae39960b363868299f8617847ffd523386db WHIRLPOOL c2173e9e8012e1a24c0feba6c65e024f40bd9606a0a3e8614b1a0d35264232ec46ad91a1953d240afa8dad33483886df16598761f0449fce15e7399d22fcda11
EBUILD calculate-console-gui-3.1.6.ebuild 622 SHA256 a160161013673d71a44f9422a6e6ac12624752ea550bd85d940077bf2c085885 SHA512 167a1aff05bc61d3f55409dd416b2a4693522bb5451059ca9e6aad70f9831f805da8b6f4665c7a069159a01c11bc10e7d0d9cda253ec09b6dbf26c56a4f4aaf9 WHIRLPOOL ac6c914ea18abf33a1ec0cf27c827f86155d7b47d94f9e550661d4ba821e3696495f500750edebc120e6ab7359b4594f91f5dd009034c59b14486fd8d80ad687
EBUILD calculate-console-gui-3.1.9999.ebuild 578 SHA256 25c597010320e393ada128672ffc1a2c2bfbf83a4293a929861f3d58902ffa7f SHA512 cfb7305902629820bf669b238090062c1dff92fe0f6d9c82f7192776961d2f937e7c042d66273ba2711a74d7e14006462d6585f65848838fb0d8d9f2be217cc3 WHIRLPOOL d42e0f6736a830bf53aafa3635192a05b3edbb4ac335bce223ecdd0f7bf75456aaade5a0f0625d247b836485418f5a9d3cfaea4c944cdcfd81645c1d4f4d4201
MISC ChangeLog 470 SHA256 8b235f6e17c0ba8554fefe4d9272cbf6973041881d57255e1ed038190d7bc149 SHA512 6d8b7448216042425d3090693c4ed652394d9fb4b162bc2fbb6a42d29b726c683db806346018ab99c182600618c8cd5101e62d752b97664d916ceae6087ad3e9 WHIRLPOOL db05dc3ad2a014178759c8480aa2ccac0c1adeb31b54a25d3b7a09dce9a58c4a8ae59311488e50b973314b44049c8732989bb7899ce7d4f199ed22f310924b34
MISC metadata.xml 267 SHA256 1e7bf8508278ccc123ad22917ec9d37323e7e89ac15c52a56aeb6a144070a66f SHA512 e7e050662c8fcd87684083e74d1c3d643f747fb2ce1b7dd4e0c3563c44cdcc1651cb83689b820431c95711e2ba75b6ca1832166ba43d3c0cf0fba86a23d54b55 WHIRLPOOL 9bc620181bc5e8dfdf2715e123576cf026a842620c20860d1978bcd768b946a4131f4c3f0910167cbdec7eeb375d24f6c11748e68ceb81a9798ade75f25fedf5

@ -15,7 +15,7 @@ DESCRIPTION="Qt gui console client for WSDL Calculate 3"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="~amd64 ~x86"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-core-3.1.6
dev-python/dbus-python

@ -3,7 +3,7 @@ AUX calculate-console-3.1.5_beta1-r1.patch 1056 SHA256 d04461e9d6fafbe67928b5878
DIST calculate-console-3.1.5.tar.bz2 26424 SHA256 e1e74f5453ac45e179231ccbbb00fd54d3cc92f4c857291d20a3092dafafb222 SHA512 16f690cbfd5f09545848c6e4a5e6748ccf90f0fd0c16f653ecfcced122f8cf68271b05dcb23feb8daf7c4349847b4f7ba28679c1d54fd257ba0adc82d5db131b WHIRLPOOL 711bccc30e7e4ef55438d8bf99163796cffef747c6bc57af7f5fe9efe0e416d2d286f1cba610f447505ccdeb44d043c9829a3d4ec6b68e828c25712676c6097d
DIST calculate-console-3.1.6.tar.bz2 26363 SHA256 d19852e496d493037cec26a5bf794c8e9d1bdca1fa920be2f2eee37c07304c39 SHA512 2b929082798d8b5ce35fc48ff157b49430951570f30ab450539b86f309e473b9b5e50322b9cbb709c4786bc26e3e88c49d971c386ad2d77e721bc4af9e5137de WHIRLPOOL 7cbe61d5df3a968e2cb0e53bbd0476c76964b1790e6c0b6a671a7e848163f8a05a51166a8b22552c61932f3fe6fc0930266fbce5d9da9092c0c0b99c60a37a59
EBUILD calculate-console-3.1.5.ebuild 543 SHA256 9adbaf2e4d860926d0c09b05feace85318d06a361ee2a6f72d04fa04d1f07d94 SHA512 f137a6e91ae9607c9891ac7f2eb38a5b1a3483ecca7f8b20c8eb560b299e71d8e85bb02412428a549d16f08d31a081b4860188ac7472401c06e92478268ee14e WHIRLPOOL 6519b9de36e0e9071d2d7397696afdb166bef3ae810853d1c577efd7a136a618fb98cd9202999f0c90d2bc768ba98eaecc02c427a590a018a228f7f283a4372b
EBUILD calculate-console-3.1.6.ebuild 545 SHA256 fafc36d1d7fab7b7da93ee13631264e415ef0107951e9cfe0c57052534e94c5a SHA512 99d331aedbd448e09fe351918e102d3a4904ed02090e88de2ceef77fe5cbcc7be8d8cd49826eeb6baca4c1fba7fcad9fca773fa01e1890f705fa74240b62e97f WHIRLPOOL b752ddec4d10083258138d4b06764c80a75624472a02708d674efede4b1f6c54c5800acffd754c81d1234dbbba7cb384b6d426562a6fc9f397172339c95543dc
EBUILD calculate-console-3.1.6.ebuild 543 SHA256 8d0379e74afbb4070b4de8506acad319b271ace3bb37d210fe6a0d3b315ce789 SHA512 581e31ea32680e79293aaf328ae6db23aeaa7e7d1e820668cf009ed0773064ce85bb250162abb50f306765e45434b411b0541ca3edcbcb3a275f625e0d433358 WHIRLPOOL 32cdc68e20f42678b13e28d8a162571bf49ca57742ba33356609c57f1944d40b148c6d9ce5c7190d78d27b3b03e36af725535162d9a97789bef5844d00d6faa7
EBUILD calculate-console-3.1.9999.ebuild 574 SHA256 923cb57128c1c71981b53ff16ccfb63327d5b77c644241411a1eeb16e0ad1e06 SHA512 78abff95b05a359b36eaca9ce4c5990816909dcec58f2ae0beafcde55b2adfcced210ac5fdce47ee1b82ba3fd085640d80f42c18d2c9bbe73ad14f2e9251c0f9 WHIRLPOOL 495e1ad59d6cd502af03c3c2ccd25a319562532ee5263707f30bb0941d9b7d0bb85f6b1c2579e0fba56819de48f2fd159f8c857cfe539da823a16b1ab79f57ae
MISC ChangeLog 458 SHA256 044e2dbed6a26e83fe125911bae84c4fd81059582accdef3cff36787aba6a680 SHA512 3e9992df75ccebd70880679e8d836efdf93b8a9566772f0dd245d41b42ea25a22d707d07c1bc48f610b185705123cf5cf4091744b0c1c8d0c98138a7973d7038 WHIRLPOOL 8ce5e05ff566734ca93bfea52c22843f589e69e6e9ac82dd17dc9d570d384a3d38beb09f15edc96ebbdd8fef1aa8f26ffe62604ca6038786d1139b2b24bd1642
MISC metadata.xml 267 SHA256 1e7bf8508278ccc123ad22917ec9d37323e7e89ac15c52a56aeb6a144070a66f SHA512 e7e050662c8fcd87684083e74d1c3d643f747fb2ce1b7dd4e0c3563c44cdcc1651cb83689b820431c95711e2ba75b6ca1832166ba43d3c0cf0fba86a23d54b55 WHIRLPOOL 9bc620181bc5e8dfdf2715e123576cf026a842620c20860d1978bcd768b946a4131f4c3f0910167cbdec7eeb375d24f6c11748e68ceb81a9798ade75f25fedf5

@ -15,7 +15,7 @@ DESCRIPTION="Console client for WSDL Calculate 3"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="~amd64 ~x86"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-core-3.1.6"
RDEPEND="${DEPEND}"

@ -6,7 +6,7 @@ AUX calculate-core-3.1.5_beta1-r1.patch 3923 SHA256 9ac427e6112250af071b5d4d25fe
DIST calculate-core-3.1.5.tar.bz2 85114 SHA256 afee468462f6e838e2f165cacf675f7134f48302e0a7d74e9f910093ee1ec25d SHA512 c3218116abd4fc1e864df1abcad2959042f67eb1847ddce6b28237bebbd354a10720562c96820ea7ba22488630ee7c5abb1a8507cb1ddf88019d8a50007c6a0b WHIRLPOOL cc605fe5d9a50a210f97462f8c059efbf40984d17f1d18ecbf432ba2fcfc3112d034a09bfc43de3b0983d1c742735182870f48626f7897b8f36c522491af4fac
DIST calculate-core-3.1.6.tar.bz2 85099 SHA256 d582745a4b211202587cc8eda828bac8d69d5cf533e71ff51e0f3b27b15571a5 SHA512 63f9503be189af52cdcf917ab95841fa7030d181e25ff3910dba68ee0289590867ce1fe865a7c4dba778809ee43311067d4671330e8c5788397c83e162cd54e4 WHIRLPOOL ca9556855388168eb1b2b6cd4e4c7c8c879ac21cd79bede8ca6b2d765e57a52841ad1ac165bdbb9b99a8130942fa2b712bf7f09bb25e9941993225061bce97ab
EBUILD calculate-core-3.1.5-r3.ebuild 1256 SHA256 610c7d85e651ef30a8d0d838f8ad733c44746d71af9c68eadb1ea96411fcd7b7 SHA512 4ab30ae36955baca36dd14e154614cb67b05fc7e09d279dc7f20166877e8b068dc402c89bfb67aba20005ddd4506a8dda4869e38972f0981d916d8a184402178 WHIRLPOOL e9247aa1d2aedef87ddba75f92e11506ba355c969ca24791c36117774956e6639887193a2fa81f64fd7cfbb2a23d90c095b80f73c9c3275974cac400d3edf762
EBUILD calculate-core-3.1.6.ebuild 1124 SHA256 eaaea4cd7c35586513d64e7aac469315b88fab29900878cd85b1fd5e6a5c971d SHA512 fa6b963f093b8a74fccd978acf22882ff2de42d94d32150a3f852256202a153f881b3b20399fa5a5001538bf2ee4106d9cd675526785e984de253c4695cd7cec WHIRLPOOL 16da7b3ecfd745cdd6baa1376cd073419fec2cb8c98a880421237e537f65d1b37935561f60d3c12a9f0bbc5740255ac0843060f2e4fdbbe543f995ec94c063a1
EBUILD calculate-core-3.1.6.ebuild 1122 SHA256 1ebad16aafaee205ea57330d73e6c22a19062e0709a7fd75567004764430ee49 SHA512 955b3fa52323d2667c197d579eb535c1b3eae88877fde74d84fb3f5b73af526ebb5c90acf01779813fd032d1d1afa7bd69a0373744f8a635ae0fc95b04bea5cc WHIRLPOOL 67ff50852b8914156bbf3e2b209c6822cc0c77522f677dc12611fa4bf3be7f520a9d546970e6cd0d679eb9463e0a184057d1e4b40bb62f762d483fd704f42589
EBUILD calculate-core-3.1.9999.ebuild 656 SHA256 475e34d10141354a4c60e029fc1cb74b080c3a1371d9e1e44a5e2936b7130ed4 SHA512 9ba865c5effa56079a3841a96d1a4a89d4bbc27e092042aa4a87d1b4ecde9d3a690c92c73e10b330724258aaf3138d2a58d50d18d2fbea9e657c3c5d2f8395ee WHIRLPOOL 89d3bcc657324d1ffb4265eab3e28e94e3d00fb7530c6654e75b52fe002d70f72998930729cfe3320a3ff571277e6e59c649b0df2fe071bcd9b050f9d42608eb
MISC ChangeLog 382 SHA256 ce74a6d08ec1ea80ee021f5378f705102435abfcd5304d851c3f7932a967065e SHA512 f5531edead30072e8fb8f278cad1d265762b8ecdf146b86cf514704f373f2bd8068b3ed35e68186687f83129814b73c6269024d442fb592515c72a9d0e6d3ca1 WHIRLPOOL 48571b2986c2f8797109a3a3440a43f4f87b601e8e52bd41a470bd077b37eb2b6118e6baf86179df065aa2e4a840d9501b2b2455b990a19dfaa2d4ee7784c922
MISC metadata.xml 285 SHA256 821f48d3fa5fac7f73ca371b49cfc11485a7ef44cc856817e41cb1665d89b0c5 SHA512 337b11b6e13958ce6550ab955e1fbc0061b919db3c9cac6964d323c4ab1ce3782e9dd473a1924bcf03b5058452aae212feeeb01e5e6c7844bb88675380c87162 WHIRLPOOL b117f08043f61eb0e88d3881d54ce29e4dd565129442554ee7a30f498b7140d6008abf57be22342a6df8eaefbdc351356dd813788ae25b6274ce6f6fdef30d0f

@ -15,7 +15,7 @@ DESCRIPTION="The WSDL core for Calculate 3"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="~amd64 ~x86"
KEYWORDS="amd64 x86"
IUSE="minimal"
DEPEND="~sys-apps/calculate-lib-3.1.6

@ -3,9 +3,11 @@ AUX calculate-desktop-3.1.5-r2.patch 7785 SHA256 49fa8387149d4872cb34a34d1873ab0
AUX calculate-desktop-3.1.5-r3.patch 7785 SHA256 452ba03b62dfa1d4dc299a5b77483a6b60dd987e432905ece597c8b35e421eb9 SHA512 c06800e5f28590687cd2efad649580db02f024364983182471f40a06b9f890092666c1bb1f3363db4b82f67cd7e11005ff7212b723e9015310e6933f169232b3 WHIRLPOOL d9bd3c26b418d30f696b0d5ff756ae54022f7c5a0e7a3117038a985d8d439dd747741a3795712f7f2420bcc60f005f53db7f2660606436ba491c4f1bb497bbbf
AUX calculate-desktop-3.1.5-r4.patch 7785 SHA256 3b9b7c16457e40196fb9c89be8270fcfa3caa9066ea03a531dcbe93425cf26f5 SHA512 106fffe62f1d48787874f3f6a91844b577fba10990aa0e4358810c25e58bb05d1ac0ee86fb7fcc641e7ff2bfb243e87637403ab4df52c3bbf25d8eaf0beafb77 WHIRLPOOL 8771a923aec78392ea192349042f7a95222f4ccd3b6a0f15853877ca81d7458721996904086434c8b2e8f746427d46c7b1f00b6fa088d0ffdee773a38437d211
AUX calculate-desktop-3.1.5_beta1-r1.patch 738 SHA256 eef93b7c4925f12e69d328e6b4ae92f0c0db04ddedf4cfad2db0198cfb633771 SHA512 63c288004c714b7061584411c34a0b817223c51cd811f38c8770829a0d9a6d7e9ff81d990b9acd39205b9977f5bc5e52ae6cfe314041619dc4c830bdd4accd78 WHIRLPOOL 3b1f1e0de4dbbfc5e88f9e18ca0b92a9f86b8b52a780bcc8d1b7d7f7968ea7f630aaf52b19e29fd12ae3d16aca5b1d800d62fe78f6ce7d7040fd5a2080567d21
AUX calculate-desktop-3.1.6-r1.patch 4403 SHA256 be5529d2cfbf8bd5dc5903aab415943cb6b527bf97d1961502d49c17d07bb68f SHA512 829f917046377951b342470511f5479817e07333099963e90a12958321bed0307860f9b35463f97087b102d028c606f6a44d6cce9c08384b88f09f345941f576 WHIRLPOOL 3caebbf6960ecb59e31df860450c7255636bf19b333e6739584acc43b9bed1921c6cca05a899298aa3690f48dff2c96fe83c167155ff048291272aa4114ff2fa
DIST calculate-desktop-3.1.5.tar.bz2 13368 SHA256 58630f5f47b5f5ffcc137a32a95b4077ac540c38ed619ab0bb5a3db51e1757f4 SHA512 2ea99d923a43de91a9791dfa71cc546af3f6ffba31859b895d7e03e1975fdcd43a63ef220eeefaee444f43eb33970a52f223dcbe420b3ab208c902f67ba7bbf1 WHIRLPOOL 418949fe17a2b0d9178a017a761e8cd9c2f1f926384d5c784e638598618f6f6f4ae36c469717adabbc9deacb32692a4fa05ed8cef5f477d14eba156257debbc9
DIST calculate-desktop-3.1.6.tar.bz2 15486 SHA256 46782f98e36239851cbc6c4f51003b0eccd319cb86f9eccfce3b87009b217954 SHA512 61ce9a4df56a2f745ea754aba6284c3a23cd7268424c4f4a18bc0ed11d39b8c0fbacf59c7c49aa68addb16ecaa16640ac0ba430aef22ab9b186b8f7e7d63e0b4 WHIRLPOOL d039df01e9abb76590dc72212719579dab14db9398d8a961f8c82c88e6ac1b65787dc70713bc593782b8582f1e2d12e7bbb1c216b92b7b2f47581916bd394812
EBUILD calculate-desktop-3.1.5-r4.ebuild 822 SHA256 570bc4db7b382e96e60bcb16d422d9dc8c1dac9e93cc69fcc11b950b66be36d1 SHA512 4e7f0679af029ba650c28917d9261b4cd62abcfe6a8f216f4db1c66ee9a21bc4e9869ac41d4f712911a81aee70b98f302bc4e4a81b22dfc4ca2dabb2c16a026c WHIRLPOOL 093e90e815250385465ae4f2a6b2577301a00a7d5d95801a26abac088f722b80d5f3cffc45d545a86476bc1ce6017b9ec39fb0982c35ad28aa2869ab848f07e6
EBUILD calculate-desktop-3.1.6-r1.ebuild 900 SHA256 819eeafd5d01311cad836d6a16415a350c206eb39ce841e424ad647c955a6beb SHA512 4306dfa9759571a0dfb04bad337a1fcf4f6cef461002603b39f51e4286622b42ce87d3b8dc708e305428fba7a56e948dcd4bbfe27b9a93e4c3f7d3b056d6ec56 WHIRLPOOL 39a5636c85049c6c3197db62c502d4e3255d17084f476d00216b5499dad304d3e3c194a4797d7e73445454ace832c895a0570293e52e91b5550e74658a84163a
EBUILD calculate-desktop-3.1.6.ebuild 765 SHA256 02b68a3668c08466e55dae5fceecd5ded18e081b31ef32098b9e90058b32627a SHA512 a3b543fce330c6d1f623db33c6383323dd612d1e9f4df95e023ff4f04ceb004f0bd3c6e6a681d2c741a8bca44f45431c533e019880fd3ad77fb4e135693becca WHIRLPOOL 4b676c611d1bb8b55efb435f1dfc22f5083396ad0c7aaba227b802a0ab144cc8aa61c00bd0b1d6bfe49cef3baebb1862222b301014c2d7258189495e309d5848
EBUILD calculate-desktop-3.1.9999.ebuild 976 SHA256 405de66b0f54804d4bc025fe786c21ca1a040d6a25928a535efbf84cacd7f505 SHA512 69ebfdc4c04f7c236f728c9938a5538b3822369cc1e1de2593a6e83178b5441ea2e37068ffcd9cf17aa92bcf00ee133ee98da0be5a5f591d69755e1159eeadac WHIRLPOOL c61f805379983ca23af188ff60a99511251a8afb27b75d0c1f08595012a579c42c2ef36603d837865a155706780ba413f0cac74457425eea0e0a59488e3dfda2
MISC ChangeLog 16440 SHA256 2a1c3211586d5dd10a249b61e4a8abf96a27a0c4d1706715b8a563bfa8aabf07 SHA512 962d9b69daeef659f2e1d6f2a5c974d6ed152d22fa9f0ed8c35d4c27e901f976167a2fc260a71c798be29d0161c7e90fa030957b2f74e25dcf35ecdb8fdc69e4 WHIRLPOOL df646b1f4c914fcb7142365b2110eb5112f7653cfddaf1b8a79f4a8f4ac99d50b6be59d3d593a8fb9e754ed92ebbe9a2cdebe320b0941d2ddd1bb9fba85c20b0

@ -0,0 +1,38 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
SUPPORT_PYTHON_ABIS="1"
PYTHON_DEPEND="2:2.7"
RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate3/${PN}/${P}.tar.bz2"
DESCRIPTION="The program of the desktop configuration Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="amd64 x86"
IUSE=""
DEPEND="~sys-apps/calculate-core-3.1.6
>=dev-python/python-ldap-2.0[ssl]
media-gfx/feh
x11-apps/xmessage
!<sys-apps/calculate-desktop-3.1.0_alpha1
sys-apps/keyutils
sys-auth/pam_keystore
sys-auth/pam_client
dev-lang/swig"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# apply revision changes
epatch "${FILESDIR}/calculate-desktop-3.1.6-r1.patch"
}

@ -0,0 +1,102 @@
diff --git data/login.d/00init data/login.d/00init
index 5cbebf4..b56e158 100644
--- data/login.d/00init
+++ data/login.d/00init
@@ -26,6 +26,8 @@ else
fi
fi
+modprobe ecryptfs
+
if [[ "`ps axeo command | grep 'xdm/xdm --logout' | grep -v grep | \
sed -n -r 's/.* USER=([^ ]+) .*/\1/p'`" == "$USER" ]];
then
diff --git data/logout.d/98umount data/logout.d/98umount
index bf3b074..f388464 100644
--- data/logout.d/98umount
+++ data/logout.d/98umount
@@ -1,4 +1,5 @@
#!/bin/bash
+keyctl unlink $( keyctl request user $USER )
umount -l /home/$USER
exit 0
diff --git desktop/cl_desktop.py desktop/cl_desktop.py
index 11ca1de..f224bfa 100644
--- desktop/cl_desktop.py
+++ desktop/cl_desktop.py
@@ -27,17 +27,20 @@ from datavars import DataVarsDesktop, DataVars, __version__,__app__
from calculate.lib.cl_template import (Template, ProgressTemplate,
TemplatesError,templateFunction,iniParser)
-from calculate.lib.utils.files import runOsCommand, isMount,process, \
- getRunCommands,STDOUT
-from calculate.lib.utils.common import getpathenv,appendProgramToEnvFile, \
- removeProgramToEnvFile,mountEcryptfs, \
- CommonError
+from calculate.lib.utils.files import (runOsCommand, isMount,process,
+ getRunCommands,STDOUT,childMounts)
+from calculate.lib.utils.common import (getpathenv,appendProgramToEnvFile,
+ removeProgramToEnvFile,mountEcryptfs,
+ CommonError, isBootstrapDataOnly)
from calculate.core.server.func import safetyWrapper
from calculate.lib.cl_lang import setLocalTranslate,getLazyLocalTranslate
setLocalTranslate('cl_desktop3',sys.modules[__name__])
__ = getLazyLocalTranslate(_)
from itertools import ifilter
+import tarfile
+import tempfile
+import shutil
class DesktopError(Exception):
"""Desktop Error"""
@@ -76,10 +79,45 @@ class Desktop:
except CommonError as e:
raise DesktopError(_("Failed to mount ecrypt")+": \"%s\""%str(e))
else:
- e = process('/usr/bin/ecryptfs-setup-private','-u',userName,'-b','-l',userPwd,stderr=STDOUT)
- if e.failed():
- raise DesktopError(e.read()+
+ tf = None
+ try:
+ # если профиль содержит только данные от бутстрапа core
+ if isBootstrapDataOnly(userDir):
+ if childMounts(userDir):
+ raise DesktopError(
+ _("Failed to create encrypt user profile")+":"+
+ _("User home directory contains mount points"))
+ # поместить данные во временный tarfile
+ calculateName = ".calculate"
+ calculatePath = path.join(userDir,calculateName)
+ tf = tempfile.TemporaryFile()
+ with tarfile.open(fileobj=tf,mode='w:') as tarf:
+ tarf.add(calculatePath,calculateName)
+ tf.flush()
+ tf.seek(0)
+ # удалить эти данные
+ shutil.rmtree(calculatePath)
+
+ # создать шифрованные данные
+ e = process('/usr/bin/ecryptfs-setup-private','-u',userName,
+ '-b','-l',userPwd,stderr=STDOUT)
+ if e.failed():
+ raise DesktopError(e.read())
+ # если были данные от бутстрапа, то распаковать их
+ if tf:
+ with tarfile.open(fileobj=tf,mode='r:') as tarf:
+ tarf.extractall(userDir)
+ except Exception as e:
+ if tf:
+ tf.seek(0)
+ bakArchName = path.join(userDir,".calculate.tar.bz2")
+ with open(bakArchName,'w') as f:
+ f.write(tf.read())
+ raise DesktopError(str(e)+
_("Failed to create encrypt user profile"))
+ finally:
+ if tf:
+ tf.close()
def createUserDir(self, userName, uid, gid, userDir, mode=0700):
"""

@ -8,7 +8,7 @@ DIST calculate-i18n-3.1.6.tar.bz2 59986 SHA256 ae31d211982e9862e6a21f592189d3ac0
EBUILD calculate-i18n-2.2.31.ebuild 767 SHA256 e611ab3d190c836638c6e58005509c0c03464bd387bd4244071ba2931ff732f5 SHA512 6777dd2819905885949c20c58b2aa5bbc0432d2f680a793f0821cc0152eab3dde85a054869d7506b994b1776b6677a6a9e1ccb910d55a8fe619623361f395c14 WHIRLPOOL 436869eca19aaa79160296d5e5a10a539d1e3e7198fd0cda2f31870f45c1f29ca7cb8502badec58e37d1ccc8be0b7ce19c32e57240c18e375cbec1b5968c182d
EBUILD calculate-i18n-2.2.9999.ebuild 770 SHA256 2c38668205a788dd9d1ed413eba96a4f628a14e6f6c7a1ba8718bbcb0842a1ca SHA512 4ddb81ebd5b5c488d7eaad86172394d502e965f5348594054ba104bf706b830987e8f57b60893898e5167184eba1b0b108a683c954c8f80498665fe069504810 WHIRLPOOL 8c0063a90e103e6bf34d4be221aeb086703688830fe3179dbd177750cb179432ec2055886330f99ba8eada65abe97fc805da90ed9f257f8c87d7384611fa677d
EBUILD calculate-i18n-3.1.5-r1.ebuild 716 SHA256 02c8e24f246f3c266aa4a2e80cee37ff229b5d429d9832a89f297fb38341a422 SHA512 36045ae51e5b08f1b535135ef077a2c3e02b12d9ae4d9a96c6ba6e4ea4cd63e16c5098146507684c91f71484aafb20c77dda529e4f8d54c29f27c0b05e59ebf9 WHIRLPOOL 1bf88c466d68dadad4c47cc5e7b2107596e7c182d70ba997decf132b5e2bee7340a65f6851b902f980da2c8b70cb3694db3cc2b32974ea7bd80550e44e8f5849
EBUILD calculate-i18n-3.1.6.ebuild 584 SHA256 30008bd10ada991c3807a08eaee8f20349c9a8beb40ee463b9b15e94d31b30e9 SHA512 bee92a1322fa1e1be21c4bd2c0a19bbe29f88870bc42822e822c6a808b94325050323c958e88252bf64cec93782230587d9a45713c128b699025a02aaedabc32 WHIRLPOOL 3f6451aa6da5280def454d6a25da1e7ebc26f5c98144b802d470102a29a3d79c7a2a6bc15045226c1bd88c8c4498d45ee2611e1c9be008dcf101749f19656c46
EBUILD calculate-i18n-3.1.6.ebuild 582 SHA256 406be699fc53ba774f7a7b4d01c1d9d0fa08f4a1eb1e4b3fc5687268814db05c SHA512 7564dbdf3e31008bda7e9ee7ff6d6ef35a0dfeaf9473f38775f67fa4e75d94e30063acac7b06589b2f69dddd5eadccd0463adcd7c4dcea57c930475db425e54e WHIRLPOOL 079f228534f5bf96da962383a69b9a11212338be347abdeafb2770dad5487ce7e87e8f048c425ce9d4784e0080c09f8251852466e5328807cff5f6d82869f653
EBUILD calculate-i18n-3.1.9999.ebuild 583 SHA256 aa60c513b0f672aa9618bfd8099fefaf49fa5ef9b24ee2645356da69563032fa SHA512 14b87ddb0f910e1b983ef465efdc56347abe01d4cdc11d6d81d593a2e65dcba1b79357d37952d7aa7f800fad8d30592db2e337d0fc6ca9807bdba618aff48528 WHIRLPOOL 14a1c4f1ef646aee28934e820763bd149e37860cce1ee34ac2229742980ec178fc43ba284b59a2f71a740cfa8e48ff7658a613b03eb0f84d4a10cefdd65450da
MISC ChangeLog 6384 SHA256 effc6918170f5331b649c7c25ccbbc971a71320be1be056da843adff998c5054 SHA512 5cca782e736ad7b526e434e7f4e1a3ed32bebf98704fda17751f3a8aa8b94896a2864f12edd4aa3fafdbc567db8282efa6355b2313cc119b275b87a756991d31 WHIRLPOOL e24811fac9e15f95144c27b27ae2509effcb3359aa24a9338ec88faffbe0588049367ac3fb8e2c9d823a1e259b1cac3c8503124aa161a9be598a209adffab56e
MISC metadata.xml 276 SHA256 a2312171d1cbfac41a263c0be692d3d12cfa3aab51979af64487824ae674bc2c SHA512 245463edebeceaa340b3e908e9d9a867be6468f00a1f1371b0c81c34e8f0adab2fa0985a2d47bcea7ae222bc481a4da934b8c1386ea664caed110058fb5cbf03 WHIRLPOOL 6b92e6af676bdd0f173df32a5751a16b88c39e8d10f16b7c8867d18a3c4cb4a44938231c315d9e76c8995cb68a8680e858bd984e6649a4470e03d594a0e23ba2

@ -15,7 +15,7 @@ DESCRIPTION="The utilities for assembling tasks of Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="~amd64 ~x86"
KEYWORDS="amd64 x86"
RDEPEND=">=sys-apps/calculate-lib-3.1.6"

@ -16,9 +16,11 @@ AUX calculate-install-3.1.5-r9.patch 23753 SHA256 076cd24f6e569334856c63a94cf177
AUX calculate-install-3.1.5_beta1-r2.patch 2385 SHA256 57cf26530ede5d607aa98bc4ce36f1ba4521b9b8a3f34d90a9bf3cc0f10fb13e SHA512 cbb4b90c08cf34d4337957e161e3f15209a1dd359d616d27b45bb68737754d006466e01d7ebd2dd4d7c097eeb320f22355fdab25de6425f4a3293078c081167e WHIRLPOOL 5c8dda93a7ac76622867ce8973995bd898dfd86996105cb228cbdf2615ca5aea6cefb8267151c391c63b95b8b2536f4596168e774d5ba20422ea4048fcbe18b6
AUX calculate-install-3.1.5_beta1-r3.patch 3043 SHA256 f329aeab842fa4cd661662b3cc21ae43202734744d4ba565c4c0b6d0d59984ca SHA512 f45aea68159717a3d59f44f65e26c3e89ab9e44b840263fed4da8086ec563f71449c68515171bf77550fe460333551d4e9463f8c3baad02c9d9efbf1f9f76573 WHIRLPOOL b36f1905a36e8e5622c6d9c9d5c6e0eb048ded9214d256b5412af8e37a6c3774545ec0b8f494abe58368c05e9987dfc38606ae4446b6b3af6380dfdf6c9277a6
AUX calculate-install-3.1.5_beta1-r4.patch 5229 SHA256 a23ca6d36ccab6ad32aea17d3d7113c60f2418f7d13b60fc275c3f25d8e18f96 SHA512 876ed0f71a46322017de06e71a3df05c4ffdebd2f51739ea7a6d51d8db21086ff28323e4582d5cdef7e6a8d37e7a3b39363c19c54e017e36240332ddd3e940c9 WHIRLPOOL ddb6c7707b726b39f4ce3d41050933328a07d2c7076d13999168fb198a746482e3d70cf820db8680e10a886f660f6da461ed8770d0e775153c7b86525dcd3123
AUX calculate-install-3.1.6-r1.patch 1089 SHA256 fb814ea558064af3efa77cc0d75626f4f8acc16736bcb2e74fa5405ff81e1936 SHA512 9c703d483c58bfea3eed0dcc9ca365dc5e1de7442e0b9b0e9ad31bedbe67f4a6e9c688a6a2a181de540dbad8cdd763ef80d6e5b00f20e1d0c7870cd7baaa5daa WHIRLPOOL 64ff24c21a0357d38315974005bb851cb9df78983fe4e45ef6affafec2024ac6aef5b3f7560577141df7064817a7ee4f89c55a14dc059744752c610dc9a137e6
DIST calculate-install-3.1.5.tar.bz2 77476 SHA256 e423d2728cf7d6a7d1a3819adcb970da3f4af8b1c380bc81e92f94754d64115f SHA512 bd8b25799d0f6881691123dc04d2ce78c244d666e9da006b1f9d0ac37581f46d0b5bd4d0e671af650bdcd1018b8c463d4fcb0032d5da0ed24cc5e0df48030af6 WHIRLPOOL 5b1ea10254689614722aeeac398169ffb23d9302ad3e2800e558ae5beeeb4f24644fdaf74260134e89896ebc11cb527b4d66b80424500565a9036237808086b8
DIST calculate-install-3.1.6.tar.bz2 77530 SHA256 799a353e4ca01318508183d5e8a1eb205eba071dc60da00788dfc20449fdffbc SHA512 cd824bf699c63aeec3527fb51fa01737d44d5b41d50126b5553ed6d175a2ce8d46fedbbaf0b69a973f951bee559cce38c974c803c171493f0a9a4c76cd174ed4 WHIRLPOOL db65b051b7c354c35484d957d1c5f25ec04dd8be8246d6ee8551bc8c3fee8cfab98cacb8ca3ac653641d81318d17895edfc155aa45b522460be5f538bb357062
EBUILD calculate-install-3.1.5-r15.ebuild 1043 SHA256 1bd1295d4c86414aa2299fbcdfd19f08aae06957c4f850dd9a19b49b0f227dd1 SHA512 de28ce309853a94bd3df31d2fab82a1f2676a519c150045a0cde2e7cdecf03542251bdcb69ec578bbf72d3bc4de14b9fe6b845f902b611d7efdafe55b21eefda WHIRLPOOL adea702319ebde4fc48651dd1d9136b9ac7db0612531623e85a12cc3168ffd2e71807963b646fe1eb569a7c7b2c6a9f14b3ce79badcaca5e35003da293b3559e
EBUILD calculate-install-3.1.6-r1.ebuild 1042 SHA256 8426818f57091c99d22e61f6fdcca49b049e7ab77bb7779ee0a584ea22f7e42f SHA512 00a73883818f2f6a95f7d9b8f7bfc158661a6929b9eaddc2020d4f6a373c2431f39706956edb726ba7a792566bd99122b5f71bef84a90a21f1e605cfdbe3d9d3 WHIRLPOOL 01bd0d10608f22969e731ad37f970f68720cd7e7cd1bf70dbc9b426db6fe09cb06493d2436ccd179e00941abf074c04d57bb5015fe3b0296c13cf6c0fa0c07cb
EBUILD calculate-install-3.1.6.ebuild 907 SHA256 33527703fef3598925222ffdfb68e904a430663bc7b69ea457afd0466d09e5aa SHA512 fac7cfda71f39df8c10bd1dde70f0fdb54b877a84abf16931c044eaf32e2f32061e808aecf6c9d1484671f778b46d95183ae0661b5f7959f0fc68839642f76af WHIRLPOOL c848eb10ff81bafc8b044203a60c1f086d5eda505e5eb5356264bdb18d27d6ab6aa00fc6f735962c0b28e509a2703791f1c2da7f379332b9bd4d5503bf402635
EBUILD calculate-install-3.1.9999.ebuild 683 SHA256 e97dd6f046d54a16eee281fa35790c92507b150bc940f3c2b36117e6f44f0a8d SHA512 c1179c500dcaa48506f6334e9e2ccc3cc70d712b2899d7e1d9265bc202f088ab71baa1aaea462deee56fdd5244bee4ab9b9a9da72f25ec511d4f2fa0c3c35f43 WHIRLPOOL 010d35b929fce496b5f16228688e23a95c9c87ebed0d290eeb454e5c1432b55b3b276dfb5786a27222543446a1090ce2f133d80373649fe72341b508d1e16a78
MISC ChangeLog 33978 SHA256 a1cc544f9763b08b3647d90fac1ec53748016bb23260181315896c8c02431443 SHA512 11a09ba60fbc727bd47b57653b4bb0937d98774eb9ca95680a5b55997c7e22db3976cbd0878d908fa0200e04b6cc9eb0ae9ac6f1623235490e2e46e54cc1f7f4 WHIRLPOOL 50352c2950f301cbb5116b8c9972e592767dcb03bd71d081c75de5e69b2a920331abec4756658faf64e291bf6f4f41df67b8d62946683629a2c99b48274eb2f3

@ -0,0 +1,43 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
SUPPORT_PYTHON_ABIS="1"
PYTHON_DEPEND="2:2.7"
RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate3/${PN}/${P}.tar.bz2"
DESCRIPTION="The program of installation Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="amd64 x86"
IUSE="pxe minimal"
DEPEND="~sys-apps/calculate-core-3.1.6
!<sys-apps/calculate-install-2.2.29
app-portage/layman
>=virtual/udev-197
!app-misc/livecd-tools
sys-apps/iproute2[-minimal]
!minimal? ( sys-boot/grub
sys-apps/gptfdisk
>=sys-apps/util-linux-2.19.1
sys-fs/dosfstools
sys-fs/squashfs-tools
sys-block/parted )
pxe? ( sys-apps/calculate-server
net-ftp/tftp-hpa
net-misc/dhcp
net-fs/nfs-utils )"
src_unpack() {
unpack "${A}"
cd "${S}"
# apply revision changes
epatch "${FILESDIR}/calculate-install-3.1.6-r1.patch"
}

@ -0,0 +1,28 @@
diff --git install/variables/system.py install/variables/system.py
index b257227..8eb76e0 100644
--- install/variables/system.py
+++ install/variables/system.py
@@ -173,6 +173,14 @@ class VariableClInstallHomeCryptSet(UserHelper,Variable):
self.help = _("crypt user profiles")
self.label = _("Crypt user profiles")
+ def get(self):
+ return self.Get('cl_home_crypt_set')
+
+ def check(self,value):
+ if value == "on" and self.Get('cl_autologin'):
+ raise VariableError(
+ _("Crypt user profile uncompatible with autologin"))
+
class VariableClMigrateData(UserHelper,TableVariable):
"""
User migrate data table
@@ -682,7 +690,7 @@ class VariableOsAudioData(ReadonlyTableVariable):
aplay = getProgPath('/usr/bin/aplay')
if not aplay:
return [[]]
- entry = re.compile('^card (\d+): ([^,]+)')
+ entry = re.compile('^card (\d+): ([^:]+)')
return tuple(map(lambda x:x.groups(),
filter(None,map(entry.search,
process(aplay,'-l')))))

@ -7,6 +7,7 @@ AUX calculate-lib-3.1.3-r5.patch 3000 SHA256 358bdfd73ad62b1f92e3de9e8cdff542d0f
AUX calculate-lib-3.1.5-r1.patch 333 SHA256 4b6dc2b37a075316d0079ccb2cebec410c3e60c6d5da70291ea4430324d1f2e2 SHA512 ef5e268b0622bc3c94dfc1eceb352ac7faadee3632eb1e5a248ebd49d1993610b0add29f62448153889b4f5ed2eb47aff1928f5cc05722d27090b9fb368ea123 WHIRLPOOL e50d1aca845d11db98838ee567fc8175ca266ccd00f8ad0bc16373903dd4d3584881cf97784dd176643fe964a66a691d10fdac4a7723ff961cb8e90307d14931
AUX calculate-lib-3.1.5-r2.patch 1155 SHA256 52cf535353699d5a8e2034f23511e348087d3c5adf027468522af177759b1273 SHA512 8a2474d4cd1f06da8362ee51232ed89efcd10eab69c6b75d63c9f2eb8a9dc1b2c95ce26465d855e7f07540568bebe10d75f4570abc2829ddebc54ff4660ce187 WHIRLPOOL 38badd1205a83da22ffd1b4b4ee370fea9f128081f32bae5e7dfde51b52c1962fa1efc85792db60b999ce480b450fde9d6e266f252fa7fd2c2a2caf25f5b6bae
AUX calculate-lib-3.1.5-r3.patch 2339 SHA256 5a6c357684c1b42013a58379fbd34fbb32fd800e2662b6a0c16da75fe354c7b6 SHA512 0a055274d2280f25485650bfa18f795c6f0cff8cff298481da4274066f9eb9f016511396d4f691a69be178b7d144a2b7dffca4f11e8fb2266f1e227581b8ab2b WHIRLPOOL 73aaabfc82ef9a9833ee98948dad2836c97bfac40001bf6364fffdf042aab2c2882fb9117f9a89d494c5c2f95d3358e58d55783f9b6a153c0d7b7b87246281b1
AUX calculate-lib-3.1.6-r1.patch 2087 SHA256 136504f0c4fa3612ce11babb3050617c41c44c9f00302abdebe9c18ee579cb9e SHA512 1a2d722d21135e71991a2cac7277ef3bc4903582c72007d800dd63df5ed88a6af6c6fbd973e50fb902d9c0aa605a9c5cd1589c529f6e6a0485182cf6d31ea61b WHIRLPOOL 7643d4fb0b124d93e2ced7c26c1b1d98d6faee5e6ea6beda51a850c64b08d2d84dcab9d3a4f1c6d6e6b9a38e0ac7d647c6635c5e8620e82e5e6a752655720348
DIST calculate-lib-2.1.11.tar.bz2 61687 SHA256 62976c08d4fb4810389ace6f5a99abb5a962f6c8d9053ff943d0669480fb5599 SHA512 e3bc2168a55367cf19ad3a27921b53e5e845643238bf171209ab29752c91b5d4d338a2120774764ac1c79abd93f2deff8680f8faa1407940984ea9fd6a199e67 WHIRLPOOL 0ced92ea493dd8db02b0ae1514ebbb51ee76dc6f441b4a38c984c39da2121fb81dd1f2e840c4c5b71a117a12817a2a269d85676288202aa9801f69727e3338dc
DIST calculate-lib-2.2.31.tar.bz2 120044 SHA256 ba38052d8b2349a1c60adc589a74eb8a3ffcbf6f3c1124e4c1fb0da3aa777f12 SHA512 902871b9159f2bcf7a0cc767fb6df5b19902fce6cf9468d96f902c383a422738b65debe3094c92d1f82de2124936496f89631c6eb9670da00807b63156b101b7 WHIRLPOOL 5179ee691519f3a7faa3135d040ad64bd6d67c026ebf39bb17f7d641130a2b58641d1fe5da4f6cfbd45d4442d93508f0a5f641ef2cd8c43e1a322aab3d11f4b9
DIST calculate-lib-3.1.5.tar.bz2 121086 SHA256 3809b0e89c56414d488c931b279956562d6dc445ccbc385268e9881d495cec2b SHA512 9372dba87a96e79150bc26c43d49efbe90b4d1d9bf9f79b3a536663c0b621263333a792678f589a65335f230d60042254b1cdb5187760e2faac8f88b34eeb714 WHIRLPOOL f59751e50fcb0c0b95a91d0d5e45611a752dbe7b98a40289b8732a2fbb887bbfe83c5e63be4a81dd5be12ca715e32a1f4e6d50b62edd97a0f60fdd1e9da7595c
@ -16,6 +17,7 @@ EBUILD calculate-lib-2.1.9999.ebuild 555 SHA256 99ff8819b9aa2b46bab952f03b7c5bd8
EBUILD calculate-lib-2.2.31-r2.ebuild 1024 SHA256 728b75c880aff102c73c93cf715a501c3ee592cd48e830012de71ff8c0de85e3 SHA512 d0dafd99bb8f5013eb590105e9b8462f5eebfe1468c7e1efe80d591fa5f0af2018b44caa2300c582df2681c44fe5d1d3fe4121d3c104a0faa45d01455c1a35af WHIRLPOOL b9724744f644036b8160f55b7f3bd1720a54b2ab1a7f9a944971db19ef5d774ae3d83d99a4ac1bd04281ddc2e10869ed56087c797803f7c3b409dc09d98ce025
EBUILD calculate-lib-2.2.9999.ebuild 730 SHA256 ce7f2300859687d4f6c50948438bee8a8cb407fd7de56c5c48e0aba846ee6774 SHA512 789179018d82ef7c9a5428de20f529e6071380174d1e417c3a4463859d4b9ceca2a2d4ae078dbe309b976541cfba81a30348a77b6b37089b9597b862d4a45fd8 WHIRLPOOL 380084a24bf396c79fd198e1ad51d2457dcbcc5d3b59420f3794d067949cf7951766a880639bd54399f371ed0961163a03f8ea8a5e2483e512243d57408251be
EBUILD calculate-lib-3.1.5-r3.ebuild 823 SHA256 fce13480941b54bde6a3c0e31711d09f5c0449ee0268d06255869bddbf524829 SHA512 176d79c6f6a0dece3f91621aa148072db33da193484925fa1c3fc75d010abdb47feacb35ed9586c5562f8e58e8620f764adb0297d3e351e6e62ffaefe30ccf5a WHIRLPOOL 9e92056a615537ac3ea71ddc039365979c4a6ec4d5c14cde0d084663204967ef3d48357efef665b568b24aa6878a4af411ed98a28d1da5510c06e6c8624ef247
EBUILD calculate-lib-3.1.6-r1.ebuild 823 SHA256 ab3e59f8180e6d30ca0dcdfbe8755476b6286c23cabf328cf2da692284b9edc7 SHA512 2475e6f1e09bef1f6cda14809746784133f176cbd4739968520db28397c0b694ed6f07e4dc48959dc8f723d0d3da311be5f9db0c980c784f575708e54c1c6d5f WHIRLPOOL dc9d704750e85b2eb4388e00b4c26957e853bf710d6af868148dedf2d40e9041ae72f51fa32503f60397dbb6ca36a648c11f57233461eb097b164214f0a2cef0
EBUILD calculate-lib-3.1.6.ebuild 692 SHA256 565d13cfdd515cb534e56bdcb3c00e7182194d12c8de259851ec9fc5230b28a3 SHA512 a437100783152c3413c4184e90c5820f56529d1cee2e11dc4f0e88acfe3d3267b0fb85a3a9b04193709447f10dc4815d8c49e612ffe02e497a22acef11d68d95 WHIRLPOOL 3411233d326b21fe63e17106f425fec71a21c4cb77bee3d201b97a81870d76fa8a842e96515573b30aba88bb9209301607d8bc982f16b2406b70f9a84c8b4ee9
EBUILD calculate-lib-3.1.9999.ebuild 708 SHA256 a1d64b7f014831bf6b0a38928d53cb55758b7a12e5f3e98fffd28025ffacbce1 SHA512 3873859a791941d421e2338b437521955da383ce986408f1a951305e2dd75a1a4f771c9ec2caa096c5c8ea6a1776d6d0ed99e025ffa786ba029cafdbadfa439b WHIRLPOOL 5ac1a10b53f810ab527a0ebe52bc87e8397e61375cf6e0acbed89d8f6b8385e72bf234e0fdce479c3a3f1652bb6e520710ce9356750a97d644c0db0a33f6facb
MISC ChangeLog 29851 SHA256 16ca15c794bce78eefc487ed372c3d4960078fbd4c5fe4524211688d0146ef97 SHA512 be6bdf290f391529dce0deb67bf9d367e42e407601dd581f7c08d082399b5860cff2a76d4d64dd876154d51e84f34499db06c715145ac64f78d168aae7e78dbf WHIRLPOOL 2561ccd1eefe3423d97c67aff5c0fe6c8ca624e527fb885b042c8e812194bb1635d7e7d7d86c534562eb780c6b9144d92e24893f2d0696cf8a34a6a912a45788

@ -0,0 +1,35 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
SUPPORT_PYTHON_ABIS="1"
PYTHON_DEPEND="2:2.7"
RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate3/${PN}/${P}.tar.bz2"
DESCRIPTION="The library for Calculate 3"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="amd64 x86"
IUSE="minimal"
DEPEND="!minimal? ( dev-python/py-smbpasswd )
>=dev-python/pyxml-0.8
sys-apps/iproute2
sys-apps/pciutils
sys-fs/lvm2
sys-fs/mdadm
dev-python/pyinotify
sys-apps/file[python]"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# apply revision changes
epatch "${FILESDIR}/calculate-lib-3.1.6-r1.patch"
}

@ -0,0 +1,41 @@
diff --git calculate/lib/utils/common.py calculate/lib/utils/common.py
index 1799713..53e07ad 100644
--- calculate/lib/utils/common.py
+++ calculate/lib/utils/common.py
@@ -471,3 +471,13 @@ def mountEcryptfs(userName,userPwd,userDir):
# отправить пароль через stdin
mountProcess.write("passphrase_passwd="+userPwd)
return mountProcess.success()
+
+def isBootstrapDataOnly(directory):
+ """
+ Каталог содержит только сертификат, созданный командой cl-core
+ """
+ from calculate.lib.utils.files import (process,readLinesFile,STDOUT,
+ isMount)
+ userCalculate = path.join(directory,".calculate")
+ return (set(listDirectory(directory)) == set([".calculate"]) and
+ set(listDirectory(userCalculate)) == set(["client_cert"]))
diff --git calculate/lib/variables/user.py calculate/lib/variables/user.py
index e8e378f..7b3596a 100644
--- calculate/lib/variables/user.py
+++ calculate/lib/variables/user.py
@@ -21,7 +21,7 @@ import grp
from os import environ,path
from calculate.lib.datavars import Variable,VariableError,ReadonlyVariable
from calculate.lib.cl_vars_share import varsShare
-from calculate.lib.utils.common import getPasswdUsers
+from calculate.lib.utils.common import getPasswdUsers,isBootstrapDataOnly
from calculate.lib.utils.files import listDirectory
import sys
from calculate.lib.cl_lang import setLocalTranslate
@@ -229,7 +229,8 @@ class VariableUrHomeCryptSet(ReadonlyVariable):
# если пользовательского профиля нет, то шифровать ли профиль
# узнаем на уровне системы
homeDir = self.Get('ur_home_path')
- if not path.exists(homeDir) or not listDirectory(homeDir):
+ if (not path.exists(homeDir) or not listDirectory(homeDir) or
+ isBootstrapDataOnly(homeDir)):
return self.Get('cl_home_crypt_set')
# профиль не шифрованный
return "off"

@ -1,6 +1,6 @@
DIST calculate-update-3.1.5.tar.bz2 6987 SHA256 c5f7d7e113a1eae1717797e9b94c40586b4c45123691b8a3a5c20b0a6e926200 SHA512 bb3b0f2b65e5f6e5c77ca8a80f9adf0379f4a992e50de0bb43be500aac4a727e2920e330e4ed292c2a553b1ef3fc50f615ce3122c3147c5661622a6642ac92b9 WHIRLPOOL 164db94c45bd51852e6db8672341406087390007c88e0a3d1f417cd7ab5124f250fcc9ef4e623956f7e1ee9f096f95c4e1df6ddcf0715852915d8be588c31687
DIST calculate-update-3.1.6.tar.bz2 7011 SHA256 052fe75d63f2b2b7ea269a6741a3faec2114e3a3dae9638d47919bdcbd20856f SHA512 8d0483d874b23f1f15bc87e19fa1a2aa552aa8b9d38f26531befce7a46c33cbcc119a5cd28d0f25c071473ede3299405f7875942ec984be8a6fa351916b74092 WHIRLPOOL 9ea493434c208691292909014d5591f7db3a9760816c6c6530ae1e6c0f73cf4d53d40ccb13e44f72b10dddd49bd02d27b5aa6873cd6584cb64dfa36b7f139c07
EBUILD calculate-update-3.1.5.ebuild 589 SHA256 2b0825365ad96494a07704a7422b7978c7fe4cc3ac77c1dadfb1f71a23290b54 SHA512 98ebf303c495a184eba4ce66d67b4583e32c96187ae35e6f6be0a7e4b7824278fd26f322f44de3658e21439ee1f82f89b6d48647989a7e1160d6d33015c8b853 WHIRLPOOL 6902155ee5ddb983603eee5bfacac7ab9db471054309686067f0cd69440ed78f63a5699cf08015feb0d623c060c5a7e99a6d3e774cc7599098d63af51b168839
EBUILD calculate-update-3.1.6.ebuild 591 SHA256 65bff9cd4c9d230fd6f0d8bcf21dfa4e3ef1b995a29e3dad53f9be834507f429 SHA512 cbe141d33248c9ecb069009583c57ee3c1a0c1cca82a005358d64153ec6813d6aa5d629f06be751a71bb3d2d241babfa5c039618e3be1c7b5b9639857c3f5f2b WHIRLPOOL 664a99dfb8aaea548123ca77c104148bdbba94b55ee7a151f56bbd5e7c41135fbd8e208395bb453ce47c6bde40a490db988bd96a282c69cf6d5d996cbc0e17ee
EBUILD calculate-update-3.1.6.ebuild 589 SHA256 67f1ee16563e3e6d7cb4449b408b3271fc8de380611bf3fb0bf01542260f61bc SHA512 7e465b25a6122a654431e032f414bc09ae1715bdd616db42e687c8de5a089d1b087fc02b0946aeefb13de267d3fb8e6ce037b1c0b3fc0f2b92e2d882309890ba WHIRLPOOL 3f82cf3a0e058cd0ec2b34b65be74c7c1a13e918fff7e449d612f6994b70a6466a6b696c451721a5abf658409143aada776cb82b9bf2a3bfbc2f15ace68be5e6
EBUILD calculate-update-3.1.9999.ebuild 530 SHA256 f014911ae52c1eadd9615ab1a2c930eb79aab49f509260bd6573eb3985ce2ec8 SHA512 3523efdb19b9646a0d1dba6d6a4664393d07f9aa666392d355b4596cb1bca8cd80a62bbd7f6db7029c1173ebb2a16e9cf168cea1d7f2c051ba8838c86c234454 WHIRLPOOL a394a23a0277b40cc2e7242b08750638434c3b6bf0f340fec923f90e738618b1cc0e223e327484f95d24f7637e8bebec6dff4b6385b731376f6f8cc8897caf79
MISC metadata.xml 288 SHA256 9ea2bfebe4ac64765041ad92dda5b8f22f5597a4e560458f98996b00b0393b8a SHA512 88886b3e137bcf7038cc4985b786523dfac1c127aff84ad682b919d92b2c51b0b8d8f97ff60e7239a2ef49ec40fb5dcc41a59cb428ed346f1e44044ecd75b698 WHIRLPOOL d4eb5ba4901e10fe9cf440c63a8a9a59b5e6620004306eec3cd162cf902a89510460774a8c407816bf15033062dc8f96a334e7f873801bc6bcd73edeb833f36b

@ -15,7 +15,7 @@ DESCRIPTION="The program of update Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="~amd64 ~x86"
KEYWORDS="amd64 x86"
IUSE=""
DEPEND="~sys-apps/calculate-core-3.1.6

@ -1,6 +1,7 @@
EBUILD calculate-utilities-2.2.31-r17.ebuild 675 SHA256 f990a0332c77826827d022f37aa41f9f9f405b1d2820a48a6c15477c5e0d96f2 SHA512 69d6250b8630bf8da4c1735e2de187eaf3acf311ac53bb1e09401906926ca5c983acd1d471e5baed8a1107a6bc63f715cc4065675847214a27872732accc64aa WHIRLPOOL 9cc132de418f2390248e34e1e915978e44a0971ee8e98e3d9a09167da64c66c39501f9aef4a8ee5a8c2a72daa93e7a400b99368f22825d985d906060b89a84b5
EBUILD calculate-utilities-2.2.9999.ebuild 842 SHA256 56d97b7d2ce11d23b25d9036b4e2ee196b547ce1d11b0cc349a8205515b66bf1 SHA512 fc7802b92ade52210fa7381b55c48638da6d9adee6d2f03f18d6bdd0050756089b3ca8de944f4e865517554523b40737abe9f22587ecae74079eec563f80868b WHIRLPOOL f1382f0629a8dae37aaecf40cb8cbc3682bde3b43e92c9c6a84cda75897dc5d5de043233fb7a3f929749520b05fe3af94187c7a3ccdae4e252e83699d871f225
EBUILD calculate-utilities-3.1.5-r28.ebuild 771 SHA256 6a23c03fd85628987dceb99b234ce49ab362abfe0f432da6ae3251daeb70221e SHA512 6674deb14b7dd0a6b8c0b1627ad064a19580f45fb31e302505e4d96ce5c5fde44ee97615f5260b3f434aa041c0cf4b12a958ab8ae5aeca3666d910cfd721d2e5 WHIRLPOOL 74bbd188a000179546fec064c5d9af26af7748854a7d2354b1c6cc5ba3e3e2824dd55cc3d170a6651587c8724f86f0ec84c77226770ca8492db221b5b4b77a84
EBUILD calculate-utilities-3.1.6-r1.ebuild 758 SHA256 a607b77234ec2f89b55f807077e0107b23866927c3a27709668fe258fe501941 SHA512 782e2779dd89a5912304eef346a9edd7bb1396bc81cdcceb31a96b53dd6e5fa16cc51cae83dd4fcbf9c77a70d9f37be9d4cc7e1032d3a6c2daed714dfd61ad74 WHIRLPOOL c9f98d3472f32648346c4abea73f1a0f506e964ef6899a403c6915d1bb4ba63a586272dcdd14e4342b7f754a2d673101cac1aeb60a7b55b5ffa1a922e9780047
EBUILD calculate-utilities-3.1.6.ebuild 751 SHA256 2d16a50709c95db821dfd8ab018ba3091cadc598beddb4ae5e11a22d00ce369f SHA512 f420988a061c8a424b69a8cc890690d44052497b317082d5c8f7bada302caf3bcb38cf59e5f7ab4a2ba35b9f44c84917ca3b6fa6faf3899920bbed7be53611bd WHIRLPOOL b03385eaaa7b8b54ad3a1cb4761a20e16913526f6fb1005498c2de1260ac067ad178085fb9efa73b77617dc94fe1dcc884670a45d6664ccd48e89b527e78b21c
EBUILD calculate-utilities-3.1.9999.ebuild 800 SHA256 9de4807341cb552ef8d4f702e9c4a0ca10c52c9d532cc2eb741cea29b92f09b5 SHA512 b35ed4d49c4943a5ad375e646bece419271900c50301153408b30dede0fe834e098baaa42a21c130730c0bc32ba09decc588277da6782d2010c18c9d8df679ae WHIRLPOOL 78e2c5ee8ef8356c4fc0275f920177778925278cad78585ed37c08048241f775030e59a0ced0696fba6379741fe865dc339d190c46b5f2173097328a73c64a24
MISC ChangeLog 38731 SHA256 7e70a0bc1f3b34c0011f3874773a698a4bb96eb6d3dad10903575156bb8578bc SHA512 2de466ea990b9eac702b81fd097c3f5d06d1f4db1a4bd1d1b7380b45e551f6fd62c16564ecfc810246157d3ef1113ae373041580e70981d44752e50ed6134bc0 WHIRLPOOL 5ca0cee1ad0e9419f91ec11a9629b9a29db9fcbed4f5ae0aef1f8a2170ff58112c8580d61884c56ee410a0abc201fa8f4419cea35077fc8bb84e733f6fa6f4db

@ -0,0 +1,26 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=4
DESCRIPTION="Calculate Utilities meta package"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
SRC_URI=""
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="amd64 x86"
IUSE="cl_consolegui cl_client cl_desktop cl_console"
RDEPEND="${RDEPEND}
=sys-apps/calculate-install-3.1.6-r1
=sys-apps/calculate-i18n-3.1.6
=sys-apps/calculate-lib-3.1.6-r1
=sys-apps/calculate-core-3.1.6
=sys-apps/calculate-update-3.1.6
cl_client? ( =sys-apps/calculate-client-3.1.6 )
cl_desktop? ( =sys-apps/calculate-desktop-3.1.6-r1 )
cl_consolegui? ( =sys-apps/calculate-console-gui-3.1.6 )
cl_console? ( =sys-apps/calculate-console-3.1.6 )
"
Loading…
Cancel
Save