Fix call cat

11 years ago · 74b7e66c07
parent 0ae0a0aa70
commit 74b7e66c07
5 changed files with 134 additions and 0 deletions
--- a/sys-apps/calculate-lib/Manifest
+++ b/sys-apps/calculate-lib/Manifest
@ -7,6 +7,7 @@ AUX calculate-lib-3.1.2-r1.patch 1128 SHA256 a527535f0a4f2ad11a581e4d9e96b9d20cc
 AUX calculate-lib-3.1.3-r1.patch 541 SHA256 172e9dd4ed633507c0f63d63a59a386b3606a5c91ba186446f72554973c75c7a SHA512 86a00541fb27a2c8e69ab835c5599706ea1af2f8847586a237f5d713835be430fc6dac5cdc13d0c51149920bbb8bbe223b16916c7f99e6c068305d5883a85a2d WHIRLPOOL 884148cf53e113bb375b1dcaf23a1e792e6655e9a0d4657017b8e93c26d8bb7f718b1c1c93070e25692e5e65ae76a5409ee49e8c167d7c11549d7071523861cd
 AUX calculate-lib-3.1.3-r2.patch 2045 SHA256 b878df324884e058be1b60030234b56fa96e4a3141850e6029b15210d4f084d0 SHA512 38feb1d1e9d47457e564740e17c690a5667eb1d44da6c5090b3cddf7204a8ceaa6e3ff70cf9029a459bcc38c41f6542d187f431ed52974a07e58e24246402e0f WHIRLPOOL 02249e143acd79a7753b4bb4c72c44ea96d01d2b1f348b2c4c4e19108d25e4c52f4f9c21fed053a3a9d01c25315612d2ee40173a42ec9ef2b8fae8bea324c4e3
 AUX calculate-lib-3.1.3-r3.patch 2862 SHA256 dfb922689c2c37b04c6cd9eff4747a659d9feebc65ebc062241ac9e9fd4aa6a4 SHA512 d7e27e8fe13af69d22416145c228e582d6a5fce78355091cd6a84be24e6063b2efcb8f665a3d0344786d749835b6e801661c76c9ee861de72e2e006268f619cb WHIRLPOOL ee214c5ba3b126c65e28907b096edef988aacc6a89d1aa8c09d83850fbca6fc70afb951f68cf277f766fbc6979eec1eef6a729617cb5093a752a9c80760e1997
+AUX calculate-lib-3.1.3-r4.patch 2985 SHA256 a3450d93337b5dcc3a07fa87916a7abdcab3439b0ce2ee38f804272eee909dc3 SHA512 2a31a6e69dbe4606e3142d31cce6a6b2f6112c7ad9e19ad550a6f4180bcc10ed0bd8d32eea52975f24b67bfe6117630107f5dd1bd00389b59e969e9202dcc7c1 WHIRLPOOL c5904939c3b7a897ccc914ec398854ecd2d3db644bab5e18bc55325ad1fd103657611342c9a56ad5b8ed93fd46516ce9600c6f3da343369de06fc728e711bed0
 AUX calculate-lib-3.1.3_alpha1-r1.patch 13055 SHA256 6216c7c04873752b7600fffe44e5038ea879373ebced66a02ec0fe31e2c917c6 SHA512 22c5fa427a5ac01e1add1ef835f6aa726192ca8aeffba8f64bd672a03c8f70c1b314035e347004d9d436d0d180e7a397801d7265ae6f9326e35d9a2ecd04a44f WHIRLPOOL 3a797914d934ab089e37aa82a50c921c3065aaa69ac1ae29d01cfeb68f52da6b7314552f23c5bbca468eb4e938ab8e9b725ab8981ee40053c48b7311de94ffb0
 AUX calculate-lib-3.1.3_alpha2-r1.patch 1875 SHA256 35c90a86233ebba723803b04115ef38dbd9e3919907dbea120aa90da6450f74a SHA512 ff29fceaf4d671bdb9087e0a240f142f50c574d5c60e2fa583e5249da3fe69a92cbf49330a589350439f7a99109b6f1cb7dfbfc07c9776620b3ab3f1d94f98ae WHIRLPOOL 8eef41fad6a0e7b2b02a5b9198d3f78ab84cf1dab365838e2b2d7d0be82fd0623833c407131ac0843eacb905f4347df31bbef065397adf4b8b4416cb1250c581
 AUX calculate-lib-3.1.3_beta1-r1.patch 2790 SHA256 c4484dd1cfab42e26a1d72fb272bbd68ac0c102c09c1a21f2affa9a96a653720 SHA512 18f40b1dbcbcbda9e53101bb9910e65e5d255846c0dc59e04b48d656d26bffe787756cf83145dd5ac98326c28926e89fb511d671557db58be36a66ca32eb0188 WHIRLPOOL 3f8c7c3c46cd8b523043064d414f975a525889d0caefd7120e2b50df36d5a3fb52c4f6d6d64253a34cb90aa28ad334cbd130393f39485076fd099deb5bfc941f
@ -32,6 +33,7 @@ EBUILD calculate-lib-3.1.2.ebuild 690 SHA256 3bd21cbec14f6815642f44234e640f48815
 EBUILD calculate-lib-3.1.3-r1.ebuild 823 SHA256 5aff6894339d3568af6f5955ceea7b228e8adf79176a2075e5425b8890f58625 SHA512 3b8fd8a0fc101d1e15feebd1c937152ba523141fbc01427a46995a21db41b4f3c6eb5803fc09dba411663cf590eeb52747e065980578346bb3c06f074c756431 WHIRLPOOL 7b83a2b8b5867be2a24a8242c8fc60ba83a49a12ca2d6ea7affe2e8ba96b3b6cb79cf9b0d790a7a43f86c6f9f2759ec4aef9071cc6f3df288a2957b4ef46876c
 EBUILD calculate-lib-3.1.3-r2.ebuild 823 SHA256 cba6bf84334afb94f68b8aaf45f0b3ff5df58e6f806b4e6973b9d66e19aa368c SHA512 e00106a47813cbee0e57faa8ce5e48466840d6b40736d84564567072e2e25b3cf873bd4301e4825dafe099590b0dec3f1488ede4aac66e4936d6315a543e61cc WHIRLPOOL a079e2c87d92638b2e9793606e8f632bc6a76ff62fd7206c6c7a9a54d34a3a47a5060dd4bcbef1a59a877eea8df005a86d379eb7b23f8daf4c6bcace965fc27c
 EBUILD calculate-lib-3.1.3-r3.ebuild 823 SHA256 e5d36df6dd226265c66b0342a8c60e79fcfebcd2fa391e9efb639e1715dcd856 SHA512 bfad97ee9a9e2fbe8f906d209f017da1068a99ebd7391fd0516c513d3bf2312f6177f19a5332782ec3cb832a887238c42a32e76cd0642735c5a567c8c76dbc19 WHIRLPOOL 2b0a235dda8290b52ae93dd1b7f4f91de8ebbed98b86a6329c3c08696cf29523988319d12452a7e62684fdaffad6a3f9a9adbb3b647a867f11d5310ad98d6369
+EBUILD calculate-lib-3.1.3-r4.ebuild 823 SHA256 c0f36e755ed9166cbd35a13b2b87d0cf1f15eb47875ae05f5db2a7ed176769c2 SHA512 b609f0141ffa448bc0429a2ef9ddb12ab168bf456d0fdcd9fd2d4507066932606ef23067e1be474e26e4036d50f67a81103f65f84afa419d292368eb86e4535d WHIRLPOOL d4f205e60327bdf1b5511d3c08edb361d98c7377abbd142a731587349e6b8ff2fb6ddaa490f20f1f00c65f047fd197156ab8375f22423335c85b788ae78a1c04
 EBUILD calculate-lib-3.1.3.ebuild 690 SHA256 c89c29f5de3f70146e98f15035366506933f03e8a5066b1ad55aeccbebdeae2c SHA512 a7277c2e5fa64a5e5840be7fc8d3df9a31f41926386c5fe6a9bed31eeed6321af5881c218d9ce7eeb12aee518edb682b438e10397dcb815cc63645100430e43e WHIRLPOOL 8f19e4d46381e26fec81e20fa35599f4658b3891d6372c921a8b1354ad3b1821ea9c78f71caebf54610e0b5aacfb6e6ded018e155e1979322406a0ac1e823d09
 EBUILD calculate-lib-3.1.3_alpha1-r1.ebuild 821 SHA256 d570c8307c595e374d1997846ea5cb75266e6f560cc6f6554e0b58bd8370a50b SHA512 705422d60f52445c418df545298d4eaa1772b90acaf110c836aff30eb5168528c9a770e210721d4993eac9554913a84a9fd8b44af46becc13fbbee13fd9e9fc0 WHIRLPOOL a63b6a1349a7d3bcdbe8b19f23a34e105868e0eb73b12eb190d16610fd494870ee89f0f88b29b09c4ba3b5bb238c7f75cc8f01c2e267d5cf8ad9b99a6042b8c8
 EBUILD calculate-lib-3.1.3_alpha1.ebuild 681 SHA256 6a6332013e5a56db775c6490b63b60f959528660b0982e6a414f1614c0b0ffa5 SHA512 19a71823543fe843a05a548207509ee4dcffa784c61e23c56cf17d2c651effbfc63914beb03f0977b804c5cc647407eecdcbdaed4d7478783bec46eee72a50fb WHIRLPOOL 5ffd414c804671057fe2a7a2176999eee0a75574a5043332d3c01f08b93635773800e6b5d9901993e4fbf7f95d175659d621be9231d08f8bdada2654e45f8e1d
--- a/sys-apps/calculate-lib/calculate-lib-3.1.3-r4.ebuild
+++ b/sys-apps/calculate-lib/calculate-lib-3.1.3-r4.ebuild
@ -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.3-r4.patch"
+}
--- a/sys-apps/calculate-lib/files/calculate-lib-3.1.3-r4.patch
+++ b/sys-apps/calculate-lib/files/calculate-lib-3.1.3-r4.patch
@ -0,0 +1,70 @@
+diff --git calculate/lib/cl_template.py calculate/lib/cl_template.py
+index c42dfbb..cda5c00 100644
+--- calculate/lib/cl_template.py
+++ calculate/lib/cl_template.py
+@@ -5457,6 +5457,8 @@ gettext -d cl_template "$*"
+                 return ([], False)
+             if not objHeadNew.body.strip():
+                 preReturn(pathProg)
+                if "protected" in objHeadNew.params:
+                    self.protectedFiles += applyFiles
+                 return (applyFiles, False)
+         else:
+             applyFiles = [pathOldFile]
+diff --git calculate/lib/datavars.py calculate/lib/datavars.py
+index b8fcb3b..4b57578 100644
+--- calculate/lib/datavars.py
+++ calculate/lib/datavars.py
+@@ -57,6 +57,9 @@ class VariableError(Exception):
+ class PasswordError(VariableError):
+     """Exception of password change error"""
+ 
+class CommonVariableError(VariableError):
+    """Exception for command line"""
+
+ import cl_template
+ 
+ def makePath(dirs,mode=755):
+@@ -1493,10 +1496,14 @@ class DataVars(SimpleDataVars):
+                     messages = e.message if type(e.message) == list \
+                                else [e]
+                     mess = "\n".join(map(lambda x:str(x),self.plainList(*messages)))
+-                    if isinstance(e,PasswordError) or \
+-                        type(e.message) == list and \
+-                        all(isinstance(x,PasswordError) for x in e.message):
+-                        typeError = 'pwderror'
+                    mapError = {PasswordError:'pwderror',
+                                CommonVariableError:'commonerror'}
+                    for k,v in mapError.items():
+                        if isinstance(e,k) or \
+                            type(e.message) == list and \
+                            all(isinstance(x,k) for x in e.message):
+                            typeError = v
+                            break
+                     else:
+                         typeError = 'error'
+                     errors.append({'type':typeError, 'field':var, 'message':mess})
+diff --git calculate/lib/utils/files.py calculate/lib/utils/files.py
+index 938b44a..1f6d153 100644
+--- calculate/lib/utils/files.py
+++ calculate/lib/utils/files.py
+@@ -272,7 +272,18 @@ class typeFile:
+ 
+     def getMType(self, filename):
+         """Информация о типе файла"""
+-        return self.magicObject.file(filename)
+        ret = self.magicObject.file(filename)
+        # fix for kernel 3.7.7 (bad work samba)
+        if ret is None and self.magicObject.errno() == 5:
+            r,w = os.pipe()
+            devnull = os.open(os.devnull,os.O_WRONLY)
+            cat = subprocess.Popen(['/bin/cat',filename],stdout=w,
+                    stderr=devnull)
+            ret = self.magicObject.descriptor(r)
+            os.close(w)
+            os.close(devnull)
+            cat.poll()
+        return ret
+ 
+     def isBinary(self, filename):
+         """является ли файл бинарным"""
--- a/sys-apps/calculate-utilities/Manifest
+++ b/sys-apps/calculate-utilities/Manifest
@ -12,6 +12,7 @@ EBUILD calculate-utilities-3.1.3-r3.ebuild 755 SHA256 0636e41f341508e07af93e726d
 EBUILD calculate-utilities-3.1.3-r4.ebuild 764 SHA256 0ef52cb12dfc7a127149f9c7fa1c66fce81298dbfda76443d046df3d0d517762 SHA512 594f0682c289f40a99b6328e4657dd7324ebfe9b08ed217ec87b8c140b1e63ee261885a802466283a3d60e1ccf2e9d0d28d89aebf77c7cee8d6284166e0fb5e8 WHIRLPOOL 72a8836194afc0af3f99d14bf03a6c4d2c6909ae246df41e581cb0db6413e716ffa84e43bce5f8902c06bc4d74855322d93c704ddd15c71a87162834275ebd2c
 EBUILD calculate-utilities-3.1.3-r5.ebuild 764 SHA256 8047360944d0cfd1d775def28c0b1c528caeb0d2d3b9be61fae758c62a438bf9 SHA512 a3653a159b2adeac96b8d49ebace8a24a5dc1b3a8935566c80339603a5d0146effbed7b1edf22b49fc61146dd9faf3e99f5f8f6f92e1eaf2faa9c7b94a714100 WHIRLPOOL 6465bade3b228354071643038558d25b21c228d5f42c1362d6ce235abb4bb734a23abc55e39bc6071dd94e8ec86dc9621d4732998c58cc7b4b6b4ad69c605160
 EBUILD calculate-utilities-3.1.3-r6.ebuild 764 SHA256 d653a65be8bbe63554f4397b330873598a86d3ea5254485aca71986e073d5122 SHA512 9beb385d9864a6e93a0f72090f7ebab7873c319ab97c15103a3f231661deaac95441c65ced0758780f58a12f3a05323e8d2969a44ec04f5e1b9aa7c43a894ba6 WHIRLPOOL 2a6aa7f680d23c46bf0ec93fd9b3125e0580ab61627808c873b484f8a3a01f96f73fb08290bd131dcf200b4c29ff96be87caf8cfb895a502da5840438a4302ab
+EBUILD calculate-utilities-3.1.3-r7.ebuild 764 SHA256 6f1741651cc662e893d0bc94fbb202fb815d614f6a0c6a7fa13053388c1a8018 SHA512 7602b23045f8dbaff13fb4d84f9d47ac9f40e5189f4b48137e3b5eed0c55d61809109588a4d5eb45a47a235bf53ff1d7ea08c472d8b4e794645a2440fb1ee9cf WHIRLPOOL f27b2ca5e5cbc2aa5acd07ef96bc93bbdabcae86fdda03a19ac75ac1d5146a4ecf36ff5035de4880ba07e985bcb8f6ee61a2f0a56ded8d3888606ad277bb5c81
 EBUILD calculate-utilities-3.1.3.ebuild 749 SHA256 ea5509536141215632bbea7f9e967437cf0362c3bb7c839f61bbf04f1498dc81 SHA512 d59b948931a7160e4aa1191a892d5eef24148b2fe99826aae09fa254a3ec4187226a599018a62464abb48ee54d1865d9c2fbcfceec0c3ae037acc808358e8c7e WHIRLPOOL fcb9fad7f5d41c956cc371ccad2bda946f905d4e21f0d7aa83c819ddd756f267c10cceaf5b88f371ad2095c7c08b38d001c49c98c89b9e3c1831be3049a28c30
 EBUILD calculate-utilities-3.1.3_alpha1-r1.ebuild 818 SHA256 9381052d8609547b849322555d695c96661792a6e8106a9cbf17e69b158ec1a0 SHA512 ad74b7a70bfea421b5d28a50b30c2367e77bc42de55a1375cd9776f1a3f19c0a324e715c759ccf3509eb3634e95e1bbce40aabcf2791fb872adb3cecae4eed4f WHIRLPOOL 357adffc40512951f5a9a50ee4a47544a8e0ba622dbfd528332004e8c4f8999e4fd50c68de0bf5c42a6af54af688a24f94cb09510b8cea3a35b8245efbb0e579
 EBUILD calculate-utilities-3.1.3_alpha1.ebuild 803 SHA256 7ef89ba267b68943d2f00e4b36d58aa43bacdbd2c41c46199fd29a7781ba4ff7 SHA512 afebbd3b0f55d94c941586309a325909e256f331e86b8f71698a97d3dc956d3354a81d0e09ae0f794c06078164bf1a89640dc50192560459b412952c8366d1b8 WHIRLPOOL dad73afc7addffd0bd6dc63fd85be1efd23ec41b31ff98e3bd60d9d58a1a6cd522ee9c0c8ebdcfea8e54b63b0696a7e80c62365208328900c3946661233d1373
--- a/sys-apps/calculate-utilities/calculate-utilities-3.1.3-r7.ebuild
+++ b/sys-apps/calculate-utilities/calculate-utilities-3.1.3-r7.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.3-r4
+	=sys-apps/calculate-i18n-3.1.3-r2
+	=sys-apps/calculate-lib-3.1.3-r4
+	=sys-apps/calculate-core-3.1.3-r1
+	=sys-apps/calculate-update-3.1.3
+	cl_client? ( =sys-apps/calculate-client-3.1.3 )
+	cl_desktop? ( =sys-apps/calculate-desktop-3.1.3 )
+	cl_consolegui? ( =sys-apps/calculate-console-gui-3.1.3-r1 )
+	cl_console? ( =sys-apps/calculate-console-3.1.3 )
+"