Исправлено определение dhcp в CLS.

11 years ago · b46bdff194
parent 97e49b1823
commit b46bdff194
5 changed files with 210 additions and 0 deletions
--- a/sys-apps/calculate-lib/Manifest
+++ b/sys-apps/calculate-lib/Manifest
@ -9,6 +9,7 @@ AUX calculate-lib-3.1.8-r1.patch 964 SHA256 db745543d0c3f0e1830058b9adaec8a5ed81
 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
 AUX calculate-lib-3.1.8-r4.patch 3834 SHA256 ac7a72672237ab7ea52331fc9fca1e57000502e0b3ed601b8ef6147c81c40720 SHA512 ca76b00282c0155dfe1311fc3ca8eb37308c7465ebd358e9b09581e197b65c501d703c9e0bf97177f48ac141e854b0c4880b4dde62e7ec3711bd330c79d5493f WHIRLPOOL 80cb3116fdf7be95f77de750c0dee7fd7165ae29b76aa2bd33adff6d4c7366925ffe3c6fc7b8c00313bb5b562dcd36484bb993af6723bab6d8e5fd0c31fbf19b
+AUX calculate-lib-3.1.8-r5.patch 5258 SHA256 ce6d9860fb69c69aebcca38ff2ceb40cafa65833b602c16303c64c0017a867fb SHA512 ba6b5a7363e133f87ed4c2c857bcb2094759d731784a2af50bccfcfef04de18df1b27123b13bc227801b878ccc677504589014efe460e8632da186282f50c59b WHIRLPOOL cc9d897183d0eae712d719574a8671bd4869a8f825fd95a2b611928ebe38354873940cec0330065a332d87415ca3ba43d2e7c83e6e3fcd1bff9783642a7c7108
 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
@ -22,6 +23,7 @@ EBUILD calculate-lib-3.1.8-r1.ebuild 824 SHA256 efdb1261df13aafc739f3ba52f278752
 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-r4.ebuild 824 SHA256 4e1232bd35181b158e3813c7623f4e93d77289d88247c825757a11a7f69d62dd SHA512 34705e68a1128a3409489bff1cfb3153e090edd4ab9c62ea961f0bcfa30f807d28aea6f653d3a221ae6f7c61608fd3e6a64596fc182c78d0ccd022d3787bd652 WHIRLPOOL 27fbe25423e9bf661efd5da606d0702793c901497da9d552457d4d75c47088cb7ba5bf405d56caaa82b173637efddce0b004ffc8f22d7543a15412eda5b17f19
+EBUILD calculate-lib-3.1.8-r5.ebuild 824 SHA256 acdbb4cd0fc89d78fe04dafbc157b037d6ea188f245276399fb96b6372207f8c SHA512 28ab954fe1ecb06f649c77a84a627755c250f16cf5c49700c9f280c276adde31516425033f533e4e8721be65c6719bf7ec8bc281a445dc4966a3a59fdc0ded59 WHIRLPOOL f64e8cb981bbccf72ad06e05f4d02c6c10b96d8ad95b6ab1c5b5bf59f2a08edac4b6fad84169ff74d218ae34dd87b3669a6263a6eccdff40cc1fba9a5e2a5982
 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
--- a/sys-apps/calculate-lib/calculate-lib-3.1.8-r5.ebuild
+++ b/sys-apps/calculate-lib/calculate-lib-3.1.8-r5.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-r5.patch"
+}
--- a/sys-apps/calculate-lib/files/calculate-lib-3.1.8-r5.patch
+++ b/sys-apps/calculate-lib/files/calculate-lib-3.1.8-r5.patch
@ -0,0 +1,145 @@
+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..1f57029 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):
+@@ -1305,7 +1305,10 @@ class DataVars(SimpleDataVars):
+         if zipVars is None:
+             zipVars = self.ZipVars
+         if func:
+-            filterFunc = func
+            if func.func_code.co_argcount > 1:
+                filterFunc = lambda x:func(*x[:func.func_code.co_argcount])
+            else:
+                filterFunc = func
+         elif eq != None:
+             filterFunc = lambda x:x[0] == eq
+         elif ne != None:
+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/utils/ip.py calculate/lib/utils/ip.py
+index 8ac17e6..5fd7c18 100644
+--- calculate/lib/utils/ip.py
+++ calculate/lib/utils/ip.py
+@@ -15,7 +15,7 @@
+ #  limitations under the License.
+ 
+ from files import ( process, checkUtils, readFile, listDirectory,readLinesFile, 
+-                   getRunCommands )
+                   getRunCommands, getProgPath )
+ import sys,os
+ import re
+ import struct,fcntl,socket,math,ctypes
+@@ -158,11 +158,23 @@ def isIpInNet(checkip,*ipnets):
+ def isDhcpIp(interface="eth0"):
+     """Get ip by dhcp or static"""
+     # dhclients (dhcpcd, dhclient (dhcp), udhcpc (busybox)
+    commands = getRunCommands()
+     dhcpProgs = ("dhcpcd","dhclient","udhcpc")
+     if filter(lambda x:interface in x and any(prog in x for prog in dhcpProgs),
+-       getRunCommands()):
+       commands):
+         return True
+     else:
+        # если запущен демон dhcpcd
+        if filter(lambda x:"dhcpcd\x00-q" in x,commands):
+            curIp = getIp(interface)
+            dhcpcd = getProgPath('/sbin/dhcpcd')
+            leaseIp = \
+                map(lambda x:x.group(1),
+                filter(None,
+                map(re.compile('^ip_address=(.*)$').search,
+                process(dhcpcd,'-U',interface))))
+            if not curIp or leaseIp and leaseIp[0] == curIp:
+                return True
+         return False
+ 
+ def getRouteTable(onlyIface=[]):
+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"
--- a/sys-apps/calculate-utilities/Manifest
+++ b/sys-apps/calculate-utilities/Manifest
@ -9,6 +9,7 @@ EBUILD calculate-utilities-3.1.8-r13.ebuild 764 SHA256 f840519f891b465bf26a120da
 EBUILD calculate-utilities-3.1.8-r14.ebuild 764 SHA256 a6358d7abe6df1d1e702273d1281a9aeea4d8d164cd24a8382910ea5ff693a82 SHA512 701f79db7202b2d8e13bd20d2f3f40802eac5294bf673aa6c5e367a701d5b10694f68965c6fe8f4b9c791b026c9325c98c7c7860396639a744af7ee64d5ef338 WHIRLPOOL c42cc56b0b99a09524164d75c040312c6a4a4911104739f751eab9cba24c7dfb99e24ca0e9b533c148cc92e315e93e8d3d8db78fd206382451e79ac0b168adcc
 EBUILD calculate-utilities-3.1.8-r15.ebuild 764 SHA256 1749519559b69c322f95cc91e1dd5c094b544fd2f4225d0d40000ef3ab08046b SHA512 a1e918e2a5c38882b6554bdf53cee0bfbd6b7c2061a581e05434edc70704b6426a0adfb2afedb5d27b825d5a94f2b12ae60560bb8aad1028c9e74220247bc85b WHIRLPOOL ed70176e13d99c02f03f3a4bbcf7760053a92ce6965913b5063fc18c455ee9c0d0669395c0769397fd1f39c669dd868f43658f12e73a46929bfdae6a8cdefdcf
 EBUILD calculate-utilities-3.1.8-r16.ebuild 765 SHA256 884a68a4c527a02ce1c911f38e25e66616cd622f0e4fbe036df111e49716b150 SHA512 cc0e81ca175561cfa4bf3742641df2d6c86288a3290801a025a7938468af74dc5a3b57610ba5de2f15058ec9a393936b4891485fc84bc1fdf5ae173246de1d8a WHIRLPOOL 62b9677b39c598c21b5fcbfb4b3ba40d1b72b2b8a3bd66b789b7f8af90c5ecab14877888a8285e0e6657c5355845fc9b0436ec217a8bf41f7050d68c0b60a4d0
+EBUILD calculate-utilities-3.1.8-r17.ebuild 765 SHA256 8a74e068c8b4e9d9f3b08c8ba86980732bf05a1fc16b65be0f838f02fb873002 SHA512 94ad018398ee0c626a59b220f278af749b7435edbd77c486f40b638171c82617c8d2ef957a1d36c73399aa2c40017b5a4fc0b36f69d8f3e8f045c3f26bc00cb1 WHIRLPOOL e62f5fa2cda9db5fa8921cff14234a93f1d57e4793178c3044bb41e60d10bac5676d326abc570fac9873c322fc07eabe24fcb94ae28790e14b00940a31d2e0b5
 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
--- a/sys-apps/calculate-utilities/calculate-utilities-3.1.8-r17.ebuild
+++ b/sys-apps/calculate-utilities/calculate-utilities-3.1.8-r17.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-r10
+	=sys-apps/calculate-i18n-3.1.8
+	=sys-apps/calculate-lib-3.1.8-r5
+	=sys-apps/calculate-core-3.1.8-r2
+	=sys-apps/calculate-update-3.1.8
+	cl_client? ( =sys-apps/calculate-client-3.1.8-r6 )
+	cl_desktop? ( =sys-apps/calculate-desktop-3.1.8-r4 )
+	cl_consolegui? ( =sys-apps/calculate-console-gui-3.1.8 )
+	cl_console? ( =sys-apps/calculate-console-3.1.8 )
+"