From 774bce133dbbd44f11929eee8b5950e78e0d6abb Mon Sep 17 00:00:00 2001 From: Mike khiretskiy Date: Thu, 14 Nov 2013 14:14:30 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=83=D1=82=D0=B8=D0=BB=D0=B8=D1=82=20?= =?UTF-8?q?=D0=B4=D0=BE=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D0=B8=203.1.8.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sys-apps/calculate-client/Manifest | 2 + .../calculate-client-3.1.8-r3.ebuild | 40 +++ .../files/calculate-client-3.1.8-r3.patch | 280 ++++++++++++++++++ sys-apps/calculate-lib/Manifest | 2 + .../calculate-lib-3.1.8-r3.ebuild | 36 +++ .../files/calculate-lib-3.1.8-r3.patch | 95 ++++++ sys-apps/calculate-utilities/Manifest | 1 + .../calculate-utilities-3.1.8-r13.ebuild | 26 ++ 8 files changed, 482 insertions(+) create mode 100644 sys-apps/calculate-client/calculate-client-3.1.8-r3.ebuild create mode 100644 sys-apps/calculate-client/files/calculate-client-3.1.8-r3.patch create mode 100644 sys-apps/calculate-lib/calculate-lib-3.1.8-r3.ebuild create mode 100644 sys-apps/calculate-lib/files/calculate-lib-3.1.8-r3.patch create mode 100644 sys-apps/calculate-utilities/calculate-utilities-3.1.8-r13.ebuild diff --git a/sys-apps/calculate-client/Manifest b/sys-apps/calculate-client/Manifest index cb87e689c..52d406bfe 100644 --- a/sys-apps/calculate-client/Manifest +++ b/sys-apps/calculate-client/Manifest @@ -1,10 +1,12 @@ AUX calculate-client-3.1.6-r2.patch 2173 SHA256 d2b167af98dddb8f656b41b802293e717df637ee0e409c9fbbd252afd438fd37 SHA512 a6de3ba61e6940c2f269a2d22cdaeb3d980a6c354387ac6598137100782e837fa25f6f54e8043ed1d869d6c93f2fb35e6a40b2705240bb23b30ba5f255e1fdb6 WHIRLPOOL 64df8bed944d5da2f762c65130e4fedd5fdc61c5ca27d3ba652a2ae7e5e78c39018f29e4b611e3af868aab7ff575c41b7cfd163a21605487f200a312b740847a AUX calculate-client-3.1.8-r2.patch 7631 SHA256 6dcd72c6ca1afe33d45cf607fb74593870e45899dc3fe9c222bb8e190f185008 SHA512 c834bb4e9be102cb7ad0c02f3ca33ed842f46c45edaef10de4bdb4764cf9bf6f4ecc47715b48420117cd61b087036b19fef86bbb58a86154157d4ba2e2126a0a WHIRLPOOL 10bb116d13f5150600ca66e5fa886584858e16909298537a39b678ba366418e88f4a073a14a066563f3c030b639c7f67aec5ac1e26c158ad78d6584941d6a0ca +AUX calculate-client-3.1.8-r3.patch 10264 SHA256 ebc38bc4de54dc6e26016e673e4c092d771010f6392e5812273ef5bee9fd1cc0 SHA512 f81e1815b176c53accbd271409dba01b57f85524c8abe628c1b7d5418ff7d2df05b6d4197623e53bd13551e249ed9e87a4a8ec89cdcd138a7f8e8cf2c48297e2 WHIRLPOOL 0d23bde1949f2f02ca45647689a1b6765dbb6c078129ecf67c795c12ed01b7e8e3ddcfc3223b88be0a001237bb73f322feb18af3fcbb71bce0a28bf1411eb5f0 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 EBUILD calculate-client-3.1.6-r2.ebuild 942 SHA256 76532e1629b536602e982c6d12cb7345a181fb7160ba3a3531219934239120c3 SHA512 28dc00fd5a237a049ecf2f2feb7659c5f75c3f6bc52b350b0e4da2a5c5dc5b1b2bfa06ed273a3fcf4b285176277a79618de42e2eb46465c9a1964e1ce85377a5 WHIRLPOOL c672ec4b902c624ac2dedc828c83c2589b70ed5b4c14a9c0cdedeee9921d48529b9bd885240b6b7257ec332aa131f19a71862e59fb102ae207053a1a372a300d EBUILD calculate-client-3.1.8-r1.ebuild 821 SHA256 9ce11bb43895f97ee1c218b9c352e426c6dbe50bf0b96d7742436b77c97b9b0b SHA512 833f072d4c212fa717d000f85b3270fae2ae8192752542c1b81e649922184c59b6f524332d2e7ed98ad81ad449e691ce9d291bb9d548ec15a13e7d2b8636b2ed WHIRLPOOL 2ba62b00ac58894bfee12d7d3d96479872778bbe25bc6a37a88f7dbf871eee54fb8a01f0360347322b16ef89dd28eeaf1c7a2dbe80cabba202a6ca16b9e7c9c2 EBUILD calculate-client-3.1.8-r2.ebuild 958 SHA256 a85216c47b582d842d4468794501d77e3948221474e44930471ecb992920d9cf SHA512 27b62ef5b34eb3c75386f9a4330c3b69bf5dad038030ba2ed093b57304af30bf5cf6c4221baf5431e7864093e822801e2678bcb2043e4cb66574bb03986cb79b WHIRLPOOL 5fbfcbdbb9aa1851dac9e9c794b862a83037aec2eb8b03c1e83c079564e42d9cae38d53e438bb798062b5545572babf1384b4b5c66d7b654dd4b366c9c65da7d +EBUILD calculate-client-3.1.8-r3.ebuild 958 SHA256 6685e24b0f03d582eada23fd1d6d4c5ab6af6002402e98cbe529f0e68c005cb6 SHA512 cca6a6d25ad744192205938115e44ee5ab52b7eebfe7f844b28396303017adebccd899cfc08fb882991967fd28dfe8c275024e6b79453ae2c6d920017c99a715 WHIRLPOOL 803c89b249614b686c7992752f697938275829170f17e022321eedd7ee93a5a01b2921e5b2e71c42c33b1d9d31585cc747f4450211970882482f1900468234ab EBUILD calculate-client-3.1.8.ebuild 806 SHA256 b7c39ada2360f3ee9cc63c9b5edb2986c9820ad4080c977e4e973bc9cdbb129f SHA512 1c342cf72d72326d30614210a477c849c3b7ca71cbb53a946a17cbcee3a6a549ea22eb3c16afbffd4f1108a47ed1428e2d7e9c3ebfc240e6769d09e02411f057 WHIRLPOOL 4a0678ab5995db203cbd870d89ac3065b0307ef4c426e2952efde3853eb6c9654a8a2255540a316e63589956103d199bc3cacf4d89207d78ae8fe1f9976259f0 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.8-r3.ebuild b/sys-apps/calculate-client/calculate-client-3.1.8-r3.ebuild new file mode 100644 index 000000000..b20c497a3 --- /dev/null +++ b/sys-apps/calculate-client/calculate-client-3.1.8-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.8 + !=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.8-r3.patch" +} diff --git a/sys-apps/calculate-client/files/calculate-client-3.1.8-r3.patch b/sys-apps/calculate-client/files/calculate-client-3.1.8-r3.patch new file mode 100644 index 000000000..44cd5972f --- /dev/null +++ b/sys-apps/calculate-client/files/calculate-client-3.1.8-r3.patch @@ -0,0 +1,280 @@ +diff --git client/client.py client/client.py +index a7d6118..9f3f8dd 100644 +--- client/client.py ++++ client/client.py +@@ -271,13 +271,13 @@ class Client(commandServer, encrypt, Desktop): + p = process(mountCmd,"-t","cifs","-o", + "cache=loose,user=%s,uid=%d,gid=%d,noperm"%(userName,uid,gid), + "//%s/%s"%(host,res),rpath, +- envdict={"PASSWD":userPwd}) ++ envdict={"PASSWD":userPwd},stderr=STDOUT) + return p.success() + else: + p = process(mountCmd,"-t","cifs","-o", + "cache=loose,user=%s"%userName, + "//%s/%s"%(host,res),rpath, +- envdict={"PASSWD":userPwd}) ++ envdict={"PASSWD":userPwd},stderr=STDOUT) + return p.success() + + def mountSleepRes(self,host,userName,userPwd,res,rpath,uid=None,gid=None): +@@ -1059,7 +1059,7 @@ class Client(commandServer, encrypt, Desktop): + if remotePw: + self.printERROR(_("Wrong password")) + # не запрашвать пароль при загрузке системы +- if not path.exists('/prc/self/fd/0') or \ ++ if not path.exists('/proc/self/fd/0') or \ + os.readlink('/proc/self/fd/0') != '/dev/console': + yield self.askPassword(\ + _("Domain password for the desktop"),False) +diff --git client/variables/action.py client/variables/action.py +index 30ca950..dd1b241 100644 +--- client/variables/action.py ++++ client/variables/action.py +@@ -46,8 +46,9 @@ class VariableAcClientDomain(ActionVariable): + remoteAuth = self.Get("os_remote_auth") + if cl_action == "domain": + return "on" +- elif cl_action == "merge" and \ +- remoteHost and remoteAuth: ++ elif ((cl_action in "merge" or ++ cl_action == 'sync' and self.Get('cl_merge_pkg')) ++ and remoteHost and remoteAuth): + return "on" + return "off" + +diff --git data/cl-client-resume-remount data/cl-client-resume-remount +new file mode 100644 +index 0000000..254e9a5 +--- /dev/null ++++ data/cl-client-resume-remount +@@ -0,0 +1,141 @@ ++#!/usr/bin/env python ++#-*- coding: utf-8 -*- ++ ++# Copyright 2013 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. ++# You may obtain a copy of the License at ++# ++# http://www.apache.org/licenses/LICENSE-2.0 ++# ++# Unless required by applicable law or agreed to in writing, software ++# distributed under the License is distributed on an "AS IS" BASIS, ++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++# See the License for the specific language governing permissions and ++# limitations under the License. ++ ++import sys ++import __future__ ++ ++import gobject ++ ++import dbus ++import dbus.mainloop.glib ++from calculate.lib.datavars import DataVars, VariableError ++from calculate.lib.utils.files import isMount, getRunCommands ++from calculate.client.client import Client ++from argparse import ArgumentParser ++from time import sleep ++ ++class ResourceRemounter: ++ """ ++ Object contains one method for handle 'Resuming' dbus signal. ++ ++ 'handle_resuming' method checks and remounts user remote resources. ++ Also the object refreshes NSS-cache. ++ """ ++ def __init__(self,dv): ++ self.dv = dv ++ self.dv.defaultModule = 'client' ++ self.client = Client() ++ self.client.clVars = dv ++ self.check_server(True) ++ ++ def check_server(self,refresh_nscd=False): ++ """ ++ Check the available of domain server and refresh nscd cache ++ """ ++ if self.client.checkDomainServer( ++ self.dv.Get('cl_remote_host'), ++ self.dv.Get('os_net_domain')): ++ try: ++ if refresh_nscd and path.exists(self.nscd_refresh): ++ os.system(self.nscd_refresh) ++ except: ++ pass ++ return True ++ return False ++ ++ nscd_refresh = "/usr/sbin/nscd-refresh" ++ ++ def remount_remote(self): ++ """ ++ Remount remote resource of the domain ++ """ ++ try: ++ self.client.mountRemoteRes(self.dv.Get('cl_remote_pw'), ++ self.dv.Get('cl_client_remote_path'), ++ self.dv.Get('cl_remote_host')) ++ except: ++ pass ++ ++ def remount_user_resources(self): ++ """ ++ Remount user resource of the domain ++ """ ++ try: ++ self.client.mountUserDomainRes(self.dv.Get('ur_login'), ++ self.dv.Get('desktop.ur_password'), ++ int(self.dv.Get('ur_uid')), ++ int(self.dv.Get('ur_gid')), ++ "unix","share","homes","ftp") ++ except: ++ pass ++ ++ def handle_resuming(self,statename): ++ 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 ++ sleep(wait) ++ # check and remount remote resources ++ self.remount_remote() ++ self.remount_user_resources() ++ ++ ++ def unlock_screensaver(status): ++ """ ++ Handle screensaver unlock ++ """ ++ if status == 0: ++ self.check_server(True) ++ ++def main(argv): ++ # processing the user argument ++ argp = ArgumentParser(add_help=True) ++ argp.add_argument("user",help="tracked user",metavar="USER") ++ namespace = argp.parse_args(argv[1:]) ++ ++ dbus.mainloop.glib.DBusGMainLoop(set_as_default=True) ++ ++ bus = dbus.SystemBus() ++ sessionbus = dbus.SessionBus() ++ # initialization calculate datavars and quitting on an error ++ try: ++ dv = DataVars() ++ dv.importData() ++ dv.flIniFile() ++ dv.Set('ur_login',namespace.user) ++ if dv.Get('desktop.ur_domain_set') == 'off': ++ print("%s isn't a domain user"%namespace.user) ++ sys.exit(0) ++ except VariableError as e: ++ sys.stderr.write(str(e)+'\n') ++ sys.exit(1) ++ ++ rm = ResourceRemounter(dv) ++ bus.add_signal_receiver(rm.handle_resuming,dbus_interface="org.freedesktop.UPower", ++ signal_name = "NotifyResume") ++ sessionbus.add_signal_receiver(rm.unlock_screensaver,dbus_interface="org.gnome.ScreenSaver", ++ signal_name = "ActiveChanged") ++ loop = gobject.MainLoop() ++ context = loop.get_context() ++ while True: ++ # need for dbus processing ++ context.iteration(1) ++ sleep(1) ++ ++if __name__ == '__main__': ++ main(sys.argv) +diff --git data/login.d/15resume_remount data/login.d/15resume_remount +new file mode 100644 +index 0000000..ff93653 +--- /dev/null ++++ data/login.d/15resume_remount +@@ -0,0 +1,25 @@ ++#! /bin/sh ++# Copyright 2013 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. ++# You may obtain a copy of the License at ++# ++# http://www.apache.org/licenses/LICENSE-2.0 ++# ++# Unless required by applicable law or agreed to in writing, software ++# distributed under the License is distributed on an "AS IS" BASIS, ++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++# See the License for the specific language governing permissions and ++# limitations under the License. ++ ++env-update ++source /etc/profile ++source /usr/share/calculate/xdm/functions ++ ++if [[ "${DOMAIN_USER}" == "on" ]] ++then ++ /usr/sbin/cl-client-resume-remount ${USER} & ++fi ++ ++exit 0 +diff --git data/logout.d/15resume_remount data/logout.d/15resume_remount +new file mode 100644 +index 0000000..802a28b +--- /dev/null ++++ data/logout.d/15resume_remount +@@ -0,0 +1,25 @@ ++#! /bin/sh ++# Copyright 2013 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. ++# You may obtain a copy of the License at ++# ++# http://www.apache.org/licenses/LICENSE-2.0 ++# ++# Unless required by applicable law or agreed to in writing, software ++# distributed under the License is distributed on an "AS IS" BASIS, ++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++# See the License for the specific language governing permissions and ++# limitations under the License. ++ ++env-update ++source /etc/profile ++source /usr/share/calculate/xdm/functions ++ ++if [[ "${DOMAIN_USER}" == "on" ]] ++then ++ pkill -f "cl-client-resume-remount ${USER}" ++fi ++ ++exit 0 +diff --git setup.py setup.py +index 768905f..7a4b9e0 100755 +--- setup.py ++++ setup.py +@@ -29,8 +29,13 @@ data_files = [] + + data_files += [('/etc/init.d', ['data/client'])] + data_files += [('/usr/sbin', ['data/logout'])] ++data_files += [('/usr/sbin', ['data/cl-client-resume-remount'])] + data_files += [('/usr/share/calculate/xdm/login.d', + ['data/login.d/10client'])] +\ ++ [('/usr/share/calculate/xdm/login.d', ++ ['data/login.d/15resume_remount'])] +\ ++ [('/usr/share/calculate/xdm/logout.d', ++ ['data/logout.d/15resume_remount'])] +\ + [('/usr/share/calculate/xdm/logout.d', + ['data/logout.d/10client'])] +\ + [('/usr/share/calculate/xdm/',['data/wait_domain'])] +@@ -73,6 +78,7 @@ class cl_install_data(install_data): + install_data.run(self) + data_file = [("/etc/init.d/client",0755), + ("/usr/sbin/logout",0755), ++ ("/usr/sbin/cl-client-resume-remount",0755), + ("/usr/share/calculate/xdm/wait_domain",0755)] + fileNames = map(lambda x: os.path.split(x[0])[1], data_file) + listNames = map(lambda x: filter(lambda y: y, x[0].split("/")), diff --git a/sys-apps/calculate-lib/Manifest b/sys-apps/calculate-lib/Manifest index 7665f3d4e..cf1b572c1 100644 --- a/sys-apps/calculate-lib/Manifest +++ b/sys-apps/calculate-lib/Manifest @@ -7,6 +7,7 @@ AUX calculate-lib-2.2.31-iso_UEFI.patch 1462 SHA256 1e376b916768c40fd523939e737e AUX calculate-lib-3.1.6-r7.patch 18897 SHA256 c69c10571632e477023fbf7ccbb7ca9ed6caf6d8605b6ffe254a84833f9bb1b7 SHA512 6393d10e99cc589cb3c72524a43537190f091987c97a25b7a1c1b36e2ed282c23bfbc597e6758d729cea5472afa24fa5032c46155c8d2313e65d45d62df3b716 WHIRLPOOL c78681fb28c08ef6fe3a1f161c5c4203b7c588f5b57855e12847ae5395b5108382a22e38f2cfc6549b5101d85a800a5f93f8b74907d36424edc8bd367cc18ebe AUX calculate-lib-3.1.8-r1.patch 964 SHA256 db745543d0c3f0e1830058b9adaec8a5ed81a85f554a87cfa4980b61083c169d SHA512 eba607867835038cfed70790dd76bb9b28a0ddef0209d277fd08ea654ff423e63d835c9581b1a14c8a59923b2bd25c4c3ad3d1720b6b04269a0e5173b108e30b WHIRLPOOL 6ae59d7b577f115f494776076a94a21f8d51b40bb02dc8e7d614acd411d9bde68c8c3b82b06e49abd869af433b364a5cc5e43ad7d752035e99027731be380e80 AUX calculate-lib-3.1.8-r2.patch 1530 SHA256 bc7c287837bc1e2c360ff3c23bff6ce2c8d3a32a25aa90ec93e5a61afb7799c4 SHA512 c91f42e4540c04b307899a6716b6bb207ae810ae1fba71118886bf53fea411fbfbfa8340423008202e336e5fb4da5f4e8657e945b206eb4ee525b20ae9ebf921 WHIRLPOOL 0103b4365ac0e4f25bca20a16ebe994d6f9cb449f7c4862adbc97001c4fabf763d7f51b322a679ce02f4d8280bb602824f8b15ee6ab76eafee00ffdc563c510e +AUX calculate-lib-3.1.8-r3.patch 3388 SHA256 b0d8c4611aa43dbc4c6a38b642d8970ef5abb040fb20e515abecd55e51d8316f SHA512 cb6fc3d87f244a172e2ebc089c8d73255d6aa70ce3e1f0039b03be0ed78c430bd9c3844bd4838ea1e02e8b248a0d203824014144874852843319c43aa9ae4885 WHIRLPOOL 11f73712ef5ed75ac6589ff7443b52e5c9a84c64e0ed6121fe05a3a5c54b8ee591e6f7deba96b935374d19367eab45757683d3e248eeb87b9c55845bd7297117 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.6.tar.bz2 121830 SHA256 4dc08cb3246b533466457905d4fe44f7ee75266b66e8450ac7ddcb3d210980ca SHA512 578fa1f731c7b04b061abb68de8ceeb5e7cadac6858a7957f3e57f7249f9692965419da05bf3c16963c397ddbbc10a24ea5c7feda043d067f0274a52d2c56dac WHIRLPOOL ceea0a4719a5c8a0ef645f51f07bb7f813ecdb8fe8ed99f574523cd2c242223eec92c6078a15192d40a366e8231b6ff72acf63954b7f48d0f34e5c006f2eca95 @@ -18,6 +19,7 @@ EBUILD calculate-lib-2.2.9999.ebuild 730 SHA256 ce7f2300859687d4f6c50948438bee8a EBUILD calculate-lib-3.1.6-r7.ebuild 824 SHA256 5aab4e17277422301131329e5204459c99eb3fb523df5b21c59f429620776594 SHA512 47f0eaf9575573b2fd490b5eb2615f9cd9625dd700730ca33b430b272a8707697e7de0fb1c43adba0d6f558f92b193910c2c77e3ec336b1532d4946304b7a773 WHIRLPOOL bbc8b530cb1b3ebbd1783cf1ba9f8511ba1811d49980eb8c9bb6cde7472fea10b2ad3ac572f0b44b5c72e5d76a213650b12ee869fc152304adf4a8d3a5d90752 EBUILD calculate-lib-3.1.8-r1.ebuild 824 SHA256 efdb1261df13aafc739f3ba52f278752c80679ed5e562a6384b1fbbfa6cb669e SHA512 471c37f8bc2cb1926493d16acdbacac3d0c672ff6e0bfe59830e3bae1e5b9db1c47b23204128585740ae3b8c949a70d91ff7d9ed64d15b2a12e45d4772aae782 WHIRLPOOL afc350072644d970cf149e78fccc832e47347e89b4c02cfc8bb9f2f2257e8c07539c2b08b3f75a8d01d8bd75a9bf44cf171b3ded0c417ef08ed303948aa1bba9 EBUILD calculate-lib-3.1.8-r2.ebuild 824 SHA256 b8cf32c88f2db3f0ca7a99aafc39dc7373dac01afb3a03d593d0a1a6b4dc1d20 SHA512 67ccef05830100d64cca2d449bed7a7fb52b21e75760f6e64e5247943ef5daadab123b23d452cd980c992fa308b072411b73ea3e93a20e1cd4a9dd28da3201e2 WHIRLPOOL 05554bfe0a2013447b81ba9deee432f63379b659fbb9feb07b43b15ec62e6cbfdd8c6bc7aedd3fa1ae094efdd78d1a321508e2d53e4a6e2219f70c1f4ef78e1f +EBUILD calculate-lib-3.1.8-r3.ebuild 824 SHA256 4fb3da3e834c22ef032cd497e99835aa7ab2c31cb9e8cd0a6cdbe6b1cc5d2a15 SHA512 9c272fdf3e3178e7d6b0bb2ddd9526540458844012581c0fcdef3a7d979744324027ad00056104467d9d6dcc8ae1d5e4f3b884735c14dba04f8d1170e497e5a5 WHIRLPOOL 6467bab45690a1bf336c90f5e5f6ee7d95e51f06160983d6c38d857d182d06e28d7017f6c167956afa77af1f1a384831e3741e357911ad6083efcfa951afcc53 EBUILD calculate-lib-3.1.8.ebuild 690 SHA256 c89c29f5de3f70146e98f15035366506933f03e8a5066b1ad55aeccbebdeae2c SHA512 a7277c2e5fa64a5e5840be7fc8d3df9a31f41926386c5fe6a9bed31eeed6321af5881c218d9ce7eeb12aee518edb682b438e10397dcb815cc63645100430e43e WHIRLPOOL 8f19e4d46381e26fec81e20fa35599f4658b3891d6372c921a8b1354ad3b1821ea9c78f71caebf54610e0b5aacfb6e6ded018e155e1979322406a0ac1e823d09 EBUILD calculate-lib-3.1.9999.ebuild 708 SHA256 a1d64b7f014831bf6b0a38928d53cb55758b7a12e5f3e98fffd28025ffacbce1 SHA512 3873859a791941d421e2338b437521955da383ce986408f1a951305e2dd75a1a4f771c9ec2caa096c5c8ea6a1776d6d0ed99e025ffa786ba029cafdbadfa439b WHIRLPOOL 5ac1a10b53f810ab527a0ebe52bc87e8397e61375cf6e0acbed89d8f6b8385e72bf234e0fdce479c3a3f1652bb6e520710ce9356750a97d644c0db0a33f6facb MISC ChangeLog 29851 SHA256 16ca15c794bce78eefc487ed372c3d4960078fbd4c5fe4524211688d0146ef97 SHA512 be6bdf290f391529dce0deb67bf9d367e42e407601dd581f7c08d082399b5860cff2a76d4d64dd876154d51e84f34499db06c715145ac64f78d168aae7e78dbf WHIRLPOOL 2561ccd1eefe3423d97c67aff5c0fe6c8ca624e527fb885b042c8e812194bb1635d7e7d7d86c534562eb780c6b9144d92e24893f2d0696cf8a34a6a912a45788 diff --git a/sys-apps/calculate-lib/calculate-lib-3.1.8-r3.ebuild b/sys-apps/calculate-lib/calculate-lib-3.1.8-r3.ebuild new file mode 100644 index 000000000..f8f376a57 --- /dev/null +++ b/sys-apps/calculate-lib/calculate-lib-3.1.8-r3.ebuild @@ -0,0 +1,36 @@ +# 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.8-r3.patch" +} diff --git a/sys-apps/calculate-lib/files/calculate-lib-3.1.8-r3.patch b/sys-apps/calculate-lib/files/calculate-lib-3.1.8-r3.patch new file mode 100644 index 000000000..9fd7e2b7b --- /dev/null +++ b/sys-apps/calculate-lib/files/calculate-lib-3.1.8-r3.patch @@ -0,0 +1,95 @@ +diff --git calculate/lib/cl_ldap.py calculate/lib/cl_ldap.py +index b4ee12c..802ded4 100644 +--- calculate/lib/cl_ldap.py ++++ calculate/lib/cl_ldap.py +@@ -251,6 +251,7 @@ class ldapUser(_error): + if not self.ldapObj: + ldapObj = ldapFun(bindDn, bindPw, host) + if ldapObj.getError(): ++ ldapObj.clearErrors() + return False + # Устанавливаем у объекта соединение и объект LDAP функций + self.ldapObj = ldapObj +diff --git calculate/lib/cl_template.py calculate/lib/cl_template.py +index 14912c6..6c98b35 100644 +--- calculate/lib/cl_template.py ++++ calculate/lib/cl_template.py +@@ -3948,7 +3948,7 @@ re.M|re.S) + def executeTemplate(self, code, execPath): + """Execute template""" + p = process(execPath,lang=self.objVar.Get('os_locale_locale'), +- envdict=os.environ) ++ envdict=dict(os.environ)) + if "/bin/bash" in code.partition('\n')[0]: + p.write("""function translate() { + gettext -d cl_template "$*" +diff --git calculate/lib/datavars.py calculate/lib/datavars.py +index ffae995..bf36bdc 100644 +--- calculate/lib/datavars.py ++++ calculate/lib/datavars.py +@@ -263,15 +263,15 @@ class Variable: + section = self.parent.iniCache[self.name]['section'] + value = self.parent.unserialize(self.type, + value.encode('utf-8')) +- try: +- if self.mode == READONLY: +- raise VariableError( +- _("Attempt to rewrite readonly variable %s")% +- varname) +- else: ++ if self.mode == READONLY: ++ raise VariableError( ++ _("Attempt to rewrite readonly variable %s")% ++ self.name) ++ else: ++ try: + self._set(value) +- except Exception as e: +- return False ++ except Exception as e: ++ return False + return True + + def _get(self): +diff --git calculate/lib/utils/common.py calculate/lib/utils/common.py +index a334435..9f13c66 100644 +--- calculate/lib/utils/common.py ++++ calculate/lib/utils/common.py +@@ -51,7 +51,7 @@ class _error: + return True + + def clearErrors(self): +- for i in range(len(self.error)): ++ while(self.error): + self.error.pop() + + class _warning: +diff --git calculate/lib/variables/__init__.py calculate/lib/variables/__init__.py +index 5004263..6608f3a 100644 +--- calculate/lib/variables/__init__.py ++++ calculate/lib/variables/__init__.py +@@ -41,4 +41,4 @@ class VariableClVer(ReadonlyVariable): + """ + Package version + """ +- value = "3.1.8" ++ value = "3.1.8.1" +diff --git calculate/lib/variables/system.py calculate/lib/variables/system.py +index 70bcf87..1e43f15 100644 +--- calculate/lib/variables/system.py ++++ calculate/lib/variables/system.py +@@ -154,3 +154,14 @@ class VariableClUsedAction(ReadonlyVariable): + type = "table" + def get(self): + return [] ++ ++class VariableClSystemBootSet(ReadonlyVariable): ++ """ ++ Система находится в стадии загрузки ++ """ ++ type = "bool" ++ def get(self): ++ if os.readlink('/proc/self/fd/0') == '/dev/console': ++ return "on" ++ else: ++ return "off" diff --git a/sys-apps/calculate-utilities/Manifest b/sys-apps/calculate-utilities/Manifest index 79f4642a1..ddf5194e6 100644 --- a/sys-apps/calculate-utilities/Manifest +++ b/sys-apps/calculate-utilities/Manifest @@ -5,6 +5,7 @@ EBUILD calculate-utilities-3.1.8-r1.ebuild 755 SHA256 3bec5752d8439e0bb64c921fe5 EBUILD calculate-utilities-3.1.8-r10.ebuild 764 SHA256 03420e6042f5d72200f8b445ca5b9e89b4a7b9fb7f42c8fc4eef10b08096c2b9 SHA512 bb6ed3e14c986a97918eccf2c5db9fdef81e6f326a939c7067c19b0f4595e1431a5579dd65210bf413af13029201cdec1d47c975097eda42cc0e929b7e0fe596 WHIRLPOOL 7609b5fe8649be395c26e55b557125223beb72e8a5c9542713167f16ce683faf3342689c7368ff86aa2834743afbc3549303a8f71c28932791af2eb7fd9f0457 EBUILD calculate-utilities-3.1.8-r11.ebuild 764 SHA256 252cb0046646e86768da6ec19cd043d4761b49b27677cde402672f12da76f635 SHA512 8404bdaefa9af083cc315a23bc09d874f6795a28c691a4dab7063fbd295c05736489b2569d9d98c5ac58a50feff7f29e26d85264a3abd40ab5e1efb8acd3b57b WHIRLPOOL 16b39967d7a62c4b99d15ebadc4c1d97576ee444cf7c9951773dd3c330bbc2e8a439e3b023c92077660f4a67fe34bef0cc4fb2cdf7b1b4d19876ebb19ae56ef2 EBUILD calculate-utilities-3.1.8-r12.ebuild 764 SHA256 479823f019989ff30db871e21f0f7e3b95c8419a027a04ad332f6363fd6dc476 SHA512 cd9f022fc063984a284e61d3d35f7a41a499c815e346a5a2fb1adc5d7d5d09eb08d1819137b728cf9f9ecc6de80179b604817615199fbc86a791b44ad5c78856 WHIRLPOOL 46ae7a1b7bcea6f05db7ac469d335ffaa82c75123cb20698dcc91f07ebb3a5dde0f2cf51599ea22e738577688064e68aac5e964702fd7982c3a87c5f1250b937 +EBUILD calculate-utilities-3.1.8-r13.ebuild 764 SHA256 f840519f891b465bf26a120da731abc1272c139fadf917b12ad479c3e34eb8c8 SHA512 f01aea0b0a9a356b767508d0a1cb2d0b2fac54f953028b31904b27f4b728d05e457dc84c9992e7f2a7226c4355d8a89bd0ba456d5559f4394d6d0b0981e1d102 WHIRLPOOL 004970e0351a0d279e3f56cbcaba96168264cd480e8dfe0a2f49e61cc769819403da4df60f3e76409ca7c9e57b7526d8f70a870dcb20088091b0d1d212dcf635 EBUILD calculate-utilities-3.1.8-r2.ebuild 758 SHA256 6c9a774ddc3966c0a1c07c109eccd718fd11bfc3aea41b1b29035b07f0ec5ece SHA512 72a35fc08d180fb15bcd264c84d16887faa1b724875346b18bb48de598488c6b8eb5d763738690432b1f6184f66ed75fc2554fa4c125f57408153bc00d8d8c36 WHIRLPOOL 537c7dcd309a5a4365d3789992a93857ba0d706ae2448d4cb5abc6fc2173953df88a627595f7a3607c1c13d7401ab82e5d9e652896c957d8cc508ec4e4e153b2 EBUILD calculate-utilities-3.1.8-r3.ebuild 758 SHA256 db3952e343cd4cd87b7e00f08ecb7fc78606599f125dd58f53a5414afff0dfd3 SHA512 fbb985c0b255fa6753c58f313c990e58dc95a4a0dd7d9c66f74d2a3d9f6cbf3a74c37efcbef8e34f050813213dc2db11eb19699984a4b7a6447067196eee5040 WHIRLPOOL 603c4c43325024f593da74918bc09c4eeb03743ebcc37c16dfca63ae8156b9ca4e44e73673f5700edf7ac662685f9173d6c4d0939fc0246eb821c4a9e4143890 EBUILD calculate-utilities-3.1.8-r4.ebuild 758 SHA256 2b54aa30c5a8c59a364009c38382ff404ec93329a1acb1240ff05b4ac177b49b SHA512 81ec2e91290d0385a72bb681ceea15fc70e1813e81fcb53694b447efee193be690fbe7579263c767b15994573012070c49b8eec57af63587a307b61736e5bb76 WHIRLPOOL 37f238a04982487934b4b6372c1e03c70bf55a3106be5992facaffbe5dce6bd8638711631e9acee08346907414e7db8efc0c8e7972301088117644c25cdb3420 diff --git a/sys-apps/calculate-utilities/calculate-utilities-3.1.8-r13.ebuild b/sys-apps/calculate-utilities/calculate-utilities-3.1.8-r13.ebuild new file mode 100644 index 000000000..ab0c7ca19 --- /dev/null +++ b/sys-apps/calculate-utilities/calculate-utilities-3.1.8-r13.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.8-r9 + =sys-apps/calculate-i18n-3.1.8 + =sys-apps/calculate-lib-3.1.8-r3 + =sys-apps/calculate-core-3.1.8-r2 + =sys-apps/calculate-update-3.1.8 + cl_client? ( =sys-apps/calculate-client-3.1.8-r3 ) + cl_desktop? ( =sys-apps/calculate-desktop-3.1.8-r2 ) + cl_consolegui? ( =sys-apps/calculate-console-gui-3.1.8 ) + cl_console? ( =sys-apps/calculate-console-3.1.8 ) +"