From b8368021f307a6e2dcd85dfd4900183ddfda24b4 Mon Sep 17 00:00:00 2001 From: Mike khiretskiy Date: Wed, 5 Feb 2014 09:37:54 +0400 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20calculate-client.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Исправлено подключение пользовательских удаленных ресурсов после suspend. --- sys-apps/calculate-client/Manifest | 2 + .../calculate-client-3.1.9-r3.ebuild | 40 +++++++ .../files/calculate-client-3.1.9-r3.patch | 112 ++++++++++++++++++ sys-apps/calculate-utilities/Manifest | 1 + .../calculate-utilities-3.1.9-r22.ebuild | 26 ++++ 5 files changed, 181 insertions(+) create mode 100644 sys-apps/calculate-client/calculate-client-3.1.9-r3.ebuild create mode 100644 sys-apps/calculate-client/files/calculate-client-3.1.9-r3.patch create mode 100644 sys-apps/calculate-utilities/calculate-utilities-3.1.9-r22.ebuild diff --git a/sys-apps/calculate-client/Manifest b/sys-apps/calculate-client/Manifest index 891fa2ae1..55484f9fa 100644 --- a/sys-apps/calculate-client/Manifest +++ b/sys-apps/calculate-client/Manifest @@ -5,6 +5,7 @@ AUX calculate-client-3.1.8-r5.patch 10264 SHA256 ebc38bc4de54dc6e26016e673e4c092 AUX calculate-client-3.1.8-r6.patch 10495 SHA256 b08b1ddeab24143002d31e56b32b424670997f0c3e1b426b70a0c6327f36025b SHA512 d3449084284aca9cedf4065796d3609ae5d2e0c1993e3b36210dcf3c980ae9d1a37f1b055ee7d62271985a862baa3112e505a89bded2baee23307afe4cfd150b WHIRLPOOL 0a5deef568d9cc9df21e0ff3fb901b8d63952b961724378e18203b5bdee50358f6842d78a73ee557b2a57b53aba84a331b5cfc2fe9e9a368d322130c324b4593 AUX calculate-client-3.1.9-r1.patch 1149 SHA256 9065f622c66281e4a5a2936e6f316f019bf73229f0e7eee17a244c156f6cfa14 SHA512 913695a6c265202fdfc433254c6b8ce9368840b33176aaf293749663ce9a9084752c45b40200facfdd2d6f7b5dbf802a93e07e406bab7ad6ddaef2f11df61981 WHIRLPOOL 622a9a960e4364b80ff76d725b9d322f411ecc1373435d1b75b5353536c87c0b4f357b018cf5884defd1d4f23937c04bb0b02ec7570d3f5d12b0a07a1a57ac2f AUX calculate-client-3.1.9-r2.patch 2677 SHA256 a6d945034ac818556a62cff918c2a868a046e9a03196d57da3639534d3f7347a SHA512 c413cfb27ee4bfa91d7259b16810a8cbae5d2c8c2973fd737749624dc922a280cd717083b11cf72f3ec80299d512ba9226c680a4ee978dfca019ee46e1d7384a WHIRLPOOL c845c6b35601cb8517d4c5ab07acdfde8208bb42886138aa0e3530cb36a163b1faa8821f43394db360727ce5e7d5ee20ee37d1bec478ed5da6d76e70ce701981 +AUX calculate-client-3.1.9-r3.patch 3672 SHA256 8ab2d1a33a64d5cad2190ca7fdfd4133233c1edad5f8e5a1a127dcb1c5ea810e SHA512 ae6dd5e93f8ff5fc4d282776e83046f61b4ffa1ff4aa02fb3ea6bce2548fd4ffc33091b8d95bb6397daffa0c4b72e9b32064c5bab8117180e2cd97b1083107a8 WHIRLPOOL 30f208f8b6835fb24c1f8bc21bebb08c8d85940ef6cfd5a0f97594c3ad8283f333bfca5af8ef60e2f8535fe7d1cf43b4a4737282471203909b171c08286aedb2 DIST calculate-client-3.1.6.tar.bz2 32036 SHA256 00b5ef665b9148f2b5acc913e59534e810ec0a6c93ee037ffc12852bba3ff290 SHA512 0547fd9320f49c1b628e446298366110dbf19eea94b8e2335ec311b69a33352b575eed3a23bbaf5c24ceb602c7166d1da5c7ea73859421b9b2d6955289956790 WHIRLPOOL d725b4396398def4eb6bc0cc6575430e46ec8bb7efefd721d3ee904c0644bbbf6fc87d43fbf9060e2c71465eaed2ff1522631522f2d829527874dd0a379a9488 DIST calculate-client-3.1.8.tar.bz2 30229 SHA256 0984d93181531340e5985255c66392a54da53dea876c71b1965d6540b4a8c410 SHA512 aac43e8df3d9a30e5e6b1975eff2bcf793c2baf8421a460ff7cf8149026ba99fd36d500ded8f3e34ce75c234eea392b91e4ac7b04935b11b18867069d088557e WHIRLPOOL cae75d2d3b6e8be59ac84a88b09148b197496e384550351e2cd3ffbd24799dd0224755605957d020f85d8f4eb75cff3feff41745b78c47c2ac57d9cc4833545d DIST calculate-client-3.1.9.tar.bz2 31260 SHA256 a45cd33d150bb5d6488aaeb9a79f1784cc99ce3a069b5e580a9f7217dc016c63 SHA512 b493a04429638c1252f2154b9ce638fb6e0ced4f869c970cb1fa4dbda183fab62192b39d09f220b3808c9ec1e65d99827e40d2955c60fd7b84f2289b65f706a6 WHIRLPOOL 764260f5a625aca9dacc60e966182a2293a9756f60eaae8ffb0cc7bcb8838ec2ecc81ac3e5cc61dc3f36efe5bdebdd4e1bc6959293da1b50e9dea164add7bec3 @@ -17,6 +18,7 @@ EBUILD calculate-client-3.1.8-r6.ebuild 958 SHA256 3a7f14029a3a3d792b5bafc229f6f EBUILD calculate-client-3.1.8.ebuild 806 SHA256 b7c39ada2360f3ee9cc63c9b5edb2986c9820ad4080c977e4e973bc9cdbb129f SHA512 1c342cf72d72326d30614210a477c849c3b7ca71cbb53a946a17cbcee3a6a549ea22eb3c16afbffd4f1108a47ed1428e2d7e9c3ebfc240e6769d09e02411f057 WHIRLPOOL 4a0678ab5995db203cbd870d89ac3065b0307ef4c426e2952efde3853eb6c9654a8a2255540a316e63589956103d199bc3cacf4d89207d78ae8fe1f9976259f0 EBUILD calculate-client-3.1.9-r1.ebuild 958 SHA256 8c8898bcda909b7b4376bd78c71237a4abebb3990b9e20aace0aafcb31da8a43 SHA512 db2b62202264a7f869cfc601569f73488e86cfb42fb9ef129f925045636e2ac27d250d0b9837e424be8ff7947d3c910af929ae7fa3f5d770e1ca8a51937a68dc WHIRLPOOL fbfc4af7f5d2545341229173ca599795e85c763f94afbddb74477e0285557d428c059f0cfa3ec8b0d7297668b05504fac828e43dcc671aacd7f263d578e2568d EBUILD calculate-client-3.1.9-r2.ebuild 958 SHA256 fba383c00acc0674fed73ff1ad44971d9b78206ce5ea310280609c03b8e0fadb SHA512 34d61923c1559132f363ba1925490e7e0cf0361c0c9d0529eff269336b2ea4bcab586c43390a31f1837d2bda3b761e7d8730d8b0707ce2969aab7c596e80c1e3 WHIRLPOOL 4de3f55697dd500ed084398a620286f142e9a4dfd48e7fdf5c5529ca25626ab52f485dafc9e21bf3ce0c67f4ae617257eb66ad4f6dc9a085e2dfe9e2b45f2471 +EBUILD calculate-client-3.1.9-r3.ebuild 958 SHA256 c4b1f6e293a3c3a14cb751b3287d3a4f85dd52d840ca1b7ba8de732fe39338c0 SHA512 35697c4ba398cf2d7ef84fe290e1f61b06f52e3934ca11f0e568eb8143a07bbf94b646ebd078d8d2a8dc0575b1ecc68eae0315a62a89717f79abbcac3e98384e WHIRLPOOL 5f2aec1412379f2a3ddbb2075298022c0027e9279f81df905af4bc84ff4a8cbabe633ff88e073106bfc8d24c5802bb9fa386278a68f228aa1fab07c7803aa34c EBUILD calculate-client-3.1.9.ebuild 821 SHA256 528187dfbcc7a198872395d3b5994d3b744326f4ea77eb1ae7b2856d0d485136 SHA512 d0a1bea78357e78f66a5e63533e21667fa85b595df070634d29c1e021e661d23d0fbe10eb90f41efd0e66db89f0c6531461bcab23208c893edd433b5696844ec WHIRLPOOL 6bfbc459a134640a8fc520b825b08824f6f299f107d8fb0fc2680fabc513edca60c11be43b26a405bf67f404fd99b371f8cd23d28fc7c60b4b9eccd8fbc218fb EBUILD calculate-client-3.1.9999.ebuild 879 SHA256 37385187f78bb708669b5cd2742173b117bb482c784f8f481ab7388554476d65 SHA512 87ebc2dfa965a9bb9d24af13a611e83e412cbabb12957bb14e2a1cd8b9f1951efbf690dcfa8f73711a02cfd0afbc9e9f37209ba9a3884b018c41b3a46e2e847b WHIRLPOOL 349da1bcb076af176079473ccb2fd1a4e3d8eb3ec2a7a6102272d1dd1073a8c181c49e02c89ede4b5cd829856f0c0f5db877b89eb0c6335ad678e58902db293b MISC ChangeLog 21989 SHA256 065aa2c75428e965caef0348105d8e5464d4103f5f2eb16bb626c7a9278208df SHA512 76ad69386d986e2e65448394d738b4d6abbeffb4af38f13dcfbfe8af64796c9b97eda68eb8cbf749fe7ef2711067da430af1cc1a764712e8df853451f903ab57 WHIRLPOOL 58b0a2837255a2eb67606072ac1a6a06e0db7079b563d3b4c9df45b5dbe0fad31c409800da635a337ad976b31bb08549e89063796e8217d46c83ba8b5e22e1b8 diff --git a/sys-apps/calculate-client/calculate-client-3.1.9-r3.ebuild b/sys-apps/calculate-client/calculate-client-3.1.9-r3.ebuild new file mode 100644 index 000000000..fdc3d71bf --- /dev/null +++ b/sys-apps/calculate-client/calculate-client-3.1.9-r3.ebuild @@ -0,0 +1,40 @@ +# 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 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" + +DEPEND="~sys-apps/calculate-desktop-3.1.9 + !=dev-python/python-ldap-2.0[ssl] + >=sys-auth/pam_ldap-180[ssl] + >=sys-auth/nss_ldap-239 + >=sys-apps/keyexec-0.1.2 + dev-qt/qtdbus + 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-client-3.1.9-r3.patch" +} diff --git a/sys-apps/calculate-client/files/calculate-client-3.1.9-r3.patch b/sys-apps/calculate-client/files/calculate-client-3.1.9-r3.patch new file mode 100644 index 000000000..b1b106b82 --- /dev/null +++ b/sys-apps/calculate-client/files/calculate-client-3.1.9-r3.patch @@ -0,0 +1,112 @@ +diff --git data/cl-client-resume-remount data/cl-client-resume-remount +index 68cdadc..0efe516 100644 +--- data/cl-client-resume-remount ++++ data/cl-client-resume-remount +@@ -1,7 +1,7 @@ + #!/usr/bin/env python + #-*- coding: utf-8 -*- + +-# Copyright 2013 Calculate Ltd. http://www.calculate-linux.org ++# Copyright 2013-2014 Calculate Ltd. http://www.calculate-linux.org + # + # Licensed under the Apache License, Version 2.0 (the "License"); + # you may not use this file except in compliance with the License. +@@ -89,8 +89,11 @@ class ResourceRemounter: + print("Restoring remote mounts for user %s"%self.dv.Get('ur_login')) + # waiting for the domain + for wait in [1,2,5,10]: +- if self.check_server(True): +- break ++ try: ++ if self.check_server(True): ++ break ++ except: ++ pass + sleep(wait) + # check and remount remote resources + self.remount_remote() +diff --git data/client data/client +index 64da473..e3285f2 100644 +--- data/client ++++ data/client +@@ -43,14 +43,14 @@ start() { + local NET_CONF=`cl-core-variables-show --only-value install.os_install_net_conf` + if [[ $NET_CONF = "networkmanager" ]] + then +- for COUNT in $( seq 0 24 ) ++ for COUNT in $( seq 0 24 ) + do +- NET_STATE=`qdbus --system org.freedesktop.NetworkManager /org/freedesktop/NetworkManager org.freedesktop.NetworkManager.state` ++ NET_STATE=`qdbus --system org.freedesktop.NetworkManager /org/freedesktop/NetworkManager org.freedesktop.NetworkManager.state` + if [[ $NET_STATE = 40 ]] + then +- ping -w4 -i0.5 -c3 $SERVERLIVE &>/dev/null && break || sleep 0.5 ++ ping -w4 -i0.5 -c3 $SERVERLIVE &>/dev/null && break || sleep 0.5 + else +- break ++ break + fi + done + else +@@ -61,7 +61,8 @@ start() { + fi + if [[ -z $SERVER ]] + then +- cl-client $SERVERLIVE && cl-setup-system -l remote &>/dev/null ++ cl-client -T overlay,local $SERVERLIVE && res=$? && ++ cl-setup-system -T remote &>/dev/null + else + cl-client --mount + fi +diff --git data/login.d/10client data/login.d/10client +index c1158e9..c90af42 100644 +--- data/login.d/10client ++++ data/login.d/10client +@@ -13,7 +13,7 @@ + # See the License for the specific language governing permissions and + # limitations under the License. + +-env-update ++/usr/sbin/env-update + source /etc/profile + source /usr/share/calculate/xdm/functions + +diff --git data/login.d/15resume_remount data/login.d/15resume_remount +index ff93653..a991817 100644 +--- data/login.d/15resume_remount ++++ data/login.d/15resume_remount +@@ -13,7 +13,7 @@ + # See the License for the specific language governing permissions and + # limitations under the License. + +-env-update ++/usr/sbin/env-update + source /etc/profile + source /usr/share/calculate/xdm/functions + +diff --git data/logout.d/10client data/logout.d/10client +index 37cf2ec..9737480 100644 +--- data/logout.d/10client ++++ data/logout.d/10client +@@ -13,7 +13,7 @@ + # See the License for the specific language governing permissions and + # limitations under the License. + +-env-update ++/usr/sbin/env-update + source /etc/profile + source /usr/share/calculate/xdm/functions + +diff --git data/logout.d/15resume_remount data/logout.d/15resume_remount +index 802a28b..b49adb6 100644 +--- data/logout.d/15resume_remount ++++ data/logout.d/15resume_remount +@@ -13,7 +13,7 @@ + # See the License for the specific language governing permissions and + # limitations under the License. + +-env-update ++/usr/sbin/env-update + source /etc/profile + source /usr/share/calculate/xdm/functions + diff --git a/sys-apps/calculate-utilities/Manifest b/sys-apps/calculate-utilities/Manifest index 584f3436d..3cb340544 100644 --- a/sys-apps/calculate-utilities/Manifest +++ b/sys-apps/calculate-utilities/Manifest @@ -35,6 +35,7 @@ EBUILD calculate-utilities-3.1.9-r19.ebuild 771 SHA256 3cb688a673b710a6855d3d4fb EBUILD calculate-utilities-3.1.9-r2.ebuild 755 SHA256 d8ddfbab1db607f85edbc87db7010c0ab2c5653d52bec1c45448d0ee73be73a5 SHA512 9915e5edb2cf659f64ac1bb2f495c06b15e3e66f4df04ddef31d6da0cc275778d4ec574fb276ef7999677abd986da40862720f69b44625e699c673ae4dc3d717 WHIRLPOOL deb8fc8969e6c9e2898205762d99e3ce295d53c2b8829ffc3c9590452b0a16b0b003e0d2e19ae8c2d17b9b29c6f74b7c03b878a848f481d1bbe6d4b40ba924ba EBUILD calculate-utilities-3.1.9-r20.ebuild 771 SHA256 0ef94707cc116a9e2e1ab20075f31c5a7aaf47a13dd9bfec0531c419b982c947 SHA512 f09c2a0495f13bcb32eac239a624189207d89bd35fbde6c957f4efc393577732951bb2a5c43e441f5d0227192fbb3e0a7371dad0536c57e4ca41f20eb6058a45 WHIRLPOOL 337c78f9543c6f5016f4fffe086312742f68c458ab0786148ef594be00817a1d10308a66a31353f24b79ce1479a14d8933d7374f99bbfc47903bbddb3b0c29a7 EBUILD calculate-utilities-3.1.9-r21.ebuild 771 SHA256 fe74e1adec707a20a1009cce880240da6843407fc46a1a9b20bf3c8a1c8adf56 SHA512 0edf9734128c06f59fa67fd239b7d927bc481574527d8ba966b91204209f8c02a2b08ad04b8a1d0f039236b6270199bb281de00c8dc3c3e18907339d8b3db741 WHIRLPOOL 93e568749f19ad79a36d2fa04ab03e473a933f6f7952437d2eb845a6b3c7458b18929df255713aa382b241e8cc94c3bcae1115105040f8f5081a9906e9e18b71 +EBUILD calculate-utilities-3.1.9-r22.ebuild 771 SHA256 efc99cc1a4fe388d6e7ba320b83aca4d103892394a2af3646d1a4e2bc18539ce SHA512 4cbc7d2f80737fb566f8aecd1e23add2a4a67ab243e10bea633081af2d95e75539c72f7df24b69211b58bd6763f64813d3b0adc7fd78832f0185f4c90bca588b WHIRLPOOL 76fa7a4b3f4f330a1b975c8ae5fef2791c0f138df05e67d3cb9df751cf42f9f3d105bcf0dace919845b69ab0d7235afe1b4ec46ec78f8645d8857b6c250c1b89 EBUILD calculate-utilities-3.1.9-r3.ebuild 758 SHA256 7bdb0132b728c1a0b8ea57f0ea585afdc82f9d80aff5a13909bc152321a7ec28 SHA512 228155e8264c47456a5b375ef160e64557a87aa7e32adcb6136ef0df78f6a5b93c83d1293bf682bb00c7caa39821560ebf7c0c07200c5b65cf385b26e9607e64 WHIRLPOOL a2b35dd15636e6528f7828c9ebc1b1084c8cc3ba5384e68aea826f0c3b0220cd4376b35220eec77b40194c2ba62be1bc652407b45efab5ee999167d6c9cc90c7 EBUILD calculate-utilities-3.1.9-r4.ebuild 761 SHA256 14ec84c6cad91bc692b12b8ba2f3f78698f76a1570faf6cbf84f644aac6baecf SHA512 a51fa4a937eb13eb6ad7048f68e86903fcdbf37531668def216a3f745c253e353b5f893e91982bc16c874bfe82146dea2165c24ef26a9a28164923a772b72f40 WHIRLPOOL 4b185030c44756d36afda759a4d5f83156b42c7b9378f4045ba5cb9cbd3e9a1f1cb337184d642be9f844962fbfe4aa1d40086c07226b8688b7ea1e1078301845 EBUILD calculate-utilities-3.1.9-r5.ebuild 761 SHA256 a6ddc522be5784c19c22e360f17c5c1149f92c7c23eabe724a00d0b20be9424d SHA512 2b8d02937095edfb747926d11140a2cc44ee266668b9b830dba86efe149e03b4cc0eeea662e2c2c299f58039de70c8dec089422e9636470a6e7039f5dd7752ab WHIRLPOOL 391954432a980cbaddf39ba75a65483067941f62375e2d955820525c8f0513e3b8c766dd377b28f4cb3d52aaab4fbb447ee2093f6bd60b39cac27973887d6b3e diff --git a/sys-apps/calculate-utilities/calculate-utilities-3.1.9-r22.ebuild b/sys-apps/calculate-utilities/calculate-utilities-3.1.9-r22.ebuild new file mode 100644 index 000000000..726418115 --- /dev/null +++ b/sys-apps/calculate-utilities/calculate-utilities-3.1.9-r22.ebuild @@ -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.9-r5 + =sys-apps/calculate-i18n-3.1.9 + =sys-apps/calculate-lib-3.1.9-r12 + =sys-apps/calculate-core-3.1.9-r4 + =sys-apps/calculate-update-3.1.9 + cl_client? ( =sys-apps/calculate-client-3.1.9-r3 ) + cl_desktop? ( =sys-apps/calculate-desktop-3.1.9-r4 ) + cl_consolegui? ( =sys-apps/calculate-console-gui-3.1.9-r1 ) + cl_console? ( =sys-apps/calculate-console-3.1.9-r1 ) +"