Update utilities.

14 years ago · cc0f336dcb
parent 5c543ed129
commit cc0f336dcb
9 changed files with 82 additions and 3 deletions
--- a/sys-apps/calculate-builder/Manifest
+++ b/sys-apps/calculate-builder/Manifest
@ -1,7 +1,8 @@
+AUX calculate-builder-2.2.1-fix_getdigest.patch 573 RMD160 4bbd9f5785f04cd3be86a61af5988d7502f23ed2 SHA1 ba47aba39780166c46a5a36c7abf33a03ba3b3ff SHA256 918e17ea1c3284085f863ff45de7cf97440454337982aa050e87ddd3a4b2ac88
 DIST calculate-builder-2.2.0.0.tar.bz2 18410 RMD160 a4d66a620db1cea29d33ea69019dabf1d23c6468 SHA1 314ad2c81f405a150bf7184dbf3a24636db63e1e SHA256 e9e2f1718cdc331510eb64d37ffc788dc1d37002a4d42faa32cb3928eed93b2f
 DIST calculate-builder-2.2.1.tar.bz2 27928 RMD160 c2107e708f3c346605942b2e95521f023d2bfe44 SHA1 23f8260fc8f492b4e104878be98d640c5a5c3347 SHA256 3b803d6a3287b36ebaea761936dd88ba76b138ca35d407a3e399d92a3b81bb6f
 EBUILD calculate-builder-2.2.0.0.ebuild 556 RMD160 05762b7695c471bf9f54ab14752e4166f6a09dfd SHA1 6c8904b5235a733ee57b6da52084f978d0451485 SHA256 a598f4aa2968fa394dbd30c469f5a9a4059216dede9a8a8aa82ef0b2046f31b6
-EBUILD calculate-builder-2.2.1.ebuild 591 RMD160 615a6af35925612d966fe6951fec6cac5211eea3 SHA1 92f0edc733c49293af42938c878752409c0c4577 SHA256 d657aaec4aab9f1e19c6fbefb802381e89aa628142f233dedb773e2a0c00026f
+EBUILD calculate-builder-2.2.1-r1.ebuild 725 RMD160 0ee8e648fc8f1507919a1581b0cc63993101cc9f SHA1 e50a6247b09fe7a26e85bdacf557228b262e0d40 SHA256 969fb64a88dcd0cd55f6fb3112ba5640c5c15c634f2968bde3879b4d13e4e6f2
 EBUILD calculate-builder-2.2.1_rc17.ebuild 639 RMD160 504ba7a4e90c4fb54bc190fae28a7984e45f4384 SHA1 4e38c5144f2e5ee703fb2e5fabd4bf421c278802 SHA256 61efb1d60791f93ca33edae93cfd404f5d70e511178033bd1e3ff930a6f623b5
 EBUILD calculate-builder-2.2.9999.ebuild 478 RMD160 6db2a7a0826b7d2492a0ab57057f83282427fa9c SHA1 7787dff362d8d7bb17f6a9cb2e892b9d8f3986da SHA256 f0836ca71625ca6210893fa654040928a33ba50f23ae7873ddb43431242781de
 MISC ChangeLog 6942 RMD160 78dc543e089e5cca051e0561a956523d1aa02aaa SHA1 6a75ab5992d0b658acbb5da84bddbb0662a26a3a SHA256 a282185b46c68337c192bca6442d16f28116f3aee66827413b1a1ed56f12d9a6
--- a/sys-apps/calculate-builder/calculate-builder-2.2.1-r1.ebuild
+++ b/sys-apps/calculate-builder/calculate-builder-2.2.1-r1.ebuild
@ -21,3 +21,11 @@ DEPEND="~sys-apps/calculate-install-2.2.1
 	sys-fs/squashfs-tools"

 RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+
+	# getdigest fix patch
+	epatch "${FILESDIR}/calculate-builder-2.2.1-fix_getdigest.patch"
+}
--- a/sys-apps/calculate-builder/files/calculate-builder-2.2.1-fix_getdigest.patch
+++ b/sys-apps/calculate-builder/files/calculate-builder-2.2.1-fix_getdigest.patch
@ -0,0 +1,13 @@
+diff --git a/pym/cl_builder.py b/pym/cl_builder.py
+index ac2b774..f0bf9c5 100644
+--- a/pym/cl_builder.py
+++ b/pym/cl_builder.py
+@@ -657,7 +657,7 @@ class cl_builder(color_print):
+             open(digestfile,'w').writelines(map(lambda x:template%{
+                 'alg':x.upper(),
+                 'digest': \
+-                    process("%ssum",filename).read().partition(' ')[0],
+                    process("%ssum"%x,filename).read().partition(' ')[0],
+                 'filename':path.basename(filename)},["md5","sha1"]))
+         except:
+             return False
--- a/sys-apps/calculate-install/Manifest
+++ b/sys-apps/calculate-install/Manifest
@ -1,7 +1,8 @@
+AUX calculate-install-2.2.1-fix_getversion.patch 1116 RMD160 36d457b3d7a20876220add398fc1d0e94756554d SHA1 30bdb378ad20d5c96fff70a98271fe48de341937 SHA256 e54dfade8410d0a88497fe0d8b4df4d98eae15c4885455092340fa824eaa1ecd
 DIST calculate-install-2.2.0.0.tar.bz2 56682 RMD160 8b2057a6d70d2eda5ad2514d851742400d3bf941 SHA1 a93eca1443372e1195582e8f0066f2e733a01327 SHA256 335f11a63f63668fa4c6748ca746500249a5f11d9fecebb6e058c46c2b78d298
 DIST calculate-install-2.2.1.tar.bz2 61221 RMD160 4a75e2852adc4350eaf05b37528fc9db4e5d5d1b SHA1 f2809cd20d190f0e1b1c5978871f5bcbf3503b0d SHA256 c3d31b74d021202daef5c42f7a2da6050d31d714f89564774246d3d7e1e12397
 EBUILD calculate-install-2.2.0.0.ebuild 665 RMD160 4b9f620587b032cb653fb9b806d45ce46fc28be7 SHA1 bd55339f70af4fffa3c9060d9c1fa8b5d592f47f SHA256 b5542c5ed1a3bc31a489b67152f7290a849867cdae79db95a266e66088c890bb
-EBUILD calculate-install-2.2.1.ebuild 692 RMD160 c6cabb2bb9f666abf763383325c4c9f4eee2c2c0 SHA1 d15a24b440ea872b2db424349fe5632c0ccfb35e SHA256 8ec43afaea44a4393301bb263f169da3368c32aafc3fd24f4642ed7994258523
+EBUILD calculate-install-2.2.1-r1.ebuild 828 RMD160 fec48746a29a5f39c61783174a6d751ad71f599e SHA1 c1d77479be46d67143a8367ef3c819f8a9bc4471 SHA256 b4e0df4b989b02c8fa6810e9f5e6e56f7ec0c75f147b83509008c59a54852282
 EBUILD calculate-install-2.2.1_rc17.ebuild 735 RMD160 45fdca539195006a679ba89f486efcc61879c7e4 SHA1 84b08f3cc1ed9704d0a3a23f35b401ba7a302e6f SHA256 5f4974bbb2b04f9e70849c334c9c4242d7c66d350ae4a06bfab82a03b1c6349a
 EBUILD calculate-install-2.2.9999.ebuild 540 RMD160 038eb80ed7ab1120e6305cbfe2eca480a48aa1c0 SHA1 0cc13d21f94d71f0e6bb6dce3e8abfa1f2f66a4f SHA256 7f9bd4b0b6c2fa260f2e93c78fdee24b32545dc2a98e19363f4933dcc32d3557
 MISC ChangeLog 13675 RMD160 13b6d5694ce974778fcd73638e9334fa1e5b48c4 SHA1 8aaa059ee0c0224e26807756621e9d6be26095bd SHA256 c7181ec551ffc007536a7a0f98f5ac6c6f6887c4e011cc387effc7b6d7787369
--- a/sys-apps/calculate-install/calculate-install-2.2.1-r1.ebuild
+++ b/sys-apps/calculate-install/calculate-install-2.2.1-r1.ebuild
@ -24,6 +24,14 @@ DEPEND="~sys-apps/calculate-lib-2.2.1

 RDEPEND="${DEPEND}"

+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+
+	# getversion fix patch
+	epatch "${FILESDIR}/calculate-install-2.2.1-fix_getversion.patch"
+}
+
 pkg_postinst() {
 	einfo "For configure calculate-install perform:"
 	einfo "  cl-install --install"
--- a/sys-apps/calculate-install/files/calculate-install-2.2.1-fix_getversion.patch
+++ b/sys-apps/calculate-install/files/calculate-install-2.2.1-fix_getversion.patch
@ -0,0 +1,29 @@
+diff --git a/pym/cl_fill_install.py b/pym/cl_fill_install.py
+index fc01400..a8de226 100644
+--- a/pym/cl_fill_install.py
+++ b/pym/cl_fill_install.py
+@@ -611,18 +611,17 @@ class fillVars(object, glob_attr):
+         if not imagename:
+             return ""
+         d = DistributiveRepository()._getfromcontent(imagename)
+-        if "linuxver" in d:
+        if "linuxver" in d and d['linuxver'] != "0":
+             return d['linuxver']
+-        elif "ver" in d:
+        elif "ver" in d d['ver'] != "0":
+             return d['ver']
+-        else:
+-            if self.Get('os_install_linux_shortname') == \
+-                self.Get('os_linux_shortname'):
+-                return self.Get('os_linux_ver')
+         res = DistributiveRepository.reDistName.search(imagename)
+         if res:
+             return res.groupdict()['ver']
+-        return ""
+        if self.Get('os_install_linux_shortname') == \
+            self.Get('os_linux_shortname'):
+            return self.Get('os_linux_ver')
+        return "0"
+ 
+     def get_cl_pkgdir_path(self):
+         return "/var/calculate/remote/packages/%s/%s" % (
--- a/sys-apps/calculate-lib/Manifest
+++ b/sys-apps/calculate-lib/Manifest
@ -1,3 +1,4 @@
+AUX calculate-lib-2.2.1-fix_getversion.patch 754 RMD160 89ef9a943f12a40e9447321b63c906648f97ea51 SHA1 844aac0aff94a6fc192f0b5062f640f0c804c0bf SHA256 be8fa901466c1fb7106bffe82c49c9bccec094f26f6411094931a23662109ea7
 AUX calculate-lib-2.2.1-fix_resolution.patch 652 RMD160 bd192bd2d32ddad0f467f698de789de951b50cab SHA1 61150a3489438799568fa90b5693495c398f0aa7 SHA256 6431a0bb302940adf95e45febdabc5de2eebd6af080545941bd0313b5344d515
 AUX lib_i18n_path.patch 1114 RMD160 6e561c46e91105f4e7686678771da21e8f3685a2 SHA1 b58e8906104b4b9d1a1bd8ecb6959767cad2d329 SHA256 2913821d3c069612485e6dd7fb0e71bc06e5061054309ad9ed6bac29eee732f2
 DIST calculate-lib-2.1.8.tar.bz2 61178 RMD160 4a4ed063a9b4d3b82723f5f6eb046c97ad9fcda1 SHA1 93eb20057afff6e98c409388e1259a3ad078bb7a SHA256 ef8e315001663da7a45e69b82dc7c158fb0e10bd567efa95bf8a654ed441144a
@ -5,7 +6,7 @@ DIST calculate-lib-2.2.0.0.tar.bz2 97837 RMD160 6bc2c880ceca1a694bcb1010b85325bd
 DIST calculate-lib-2.2.1.tar.bz2 105708 RMD160 297d11e2164592520d917ed50fbed7e11ba703e7 SHA1 4db2ff8b775cf3e636ca08782b4b640d307b3edb SHA256 6df14e0f8a0c5c9104d941f096c462dadf71c40e62cb542c8b69a79bc5393b72
 EBUILD calculate-lib-2.1.8-r1.ebuild 730 RMD160 a3e9d20526f3078d1f1dc8894a3ac88a090cf968 SHA1 6bc25d2449e5f54df3675311ff5211bc00dcf907 SHA256 764f5b146cc9064de5e1c920ec88b0b91c5fb696c73c853435c7f7750b8bf0db
 EBUILD calculate-lib-2.2.0.0.ebuild 673 RMD160 d001857a4549aa24cdff07c6371de3a8eb497978 SHA1 fae71f1bdd825d51e20066238b5e5f28f08a5877 SHA256 b7827fe65d2a76a93c1542e36db3d01fc95e3ae72db2fbf07a19514aaf9dfe60
-EBUILD calculate-lib-2.2.1-r1.ebuild 790 RMD160 fabd7bde2151bd1f5edfdc050029a9684ead135a SHA1 571c070f96d32299600a9315708cea2dde56e925 SHA256 0df4cfbc10ebf09768d89339eb83137400af6d42bbf5aa27a44dd5f0a4d697df
+EBUILD calculate-lib-2.2.1-r2.ebuild 877 RMD160 7f8b3b2f3bb693684194230117cf27b1e8ff70f7 SHA1 e6f054d09c2137f08ac49f017e4518b0d5d45447 SHA256 274fca3766fed2408677b63a0f9640c0cd9a9efd7a3ffb1134574c9262f02463
 EBUILD calculate-lib-2.2.1_rc17.ebuild 843 RMD160 85d844021fbf2b54afa500b885d747c0b352b19a SHA1 bf87891730cad4dc5903cfb610590d1314499fcd SHA256 cf0177dad6de996a0d705e577f05cb666eca47dab7f835dee8caaf204daf1188
 EBUILD calculate-lib-2.2.9999.ebuild 592 RMD160 e559e7ccafdb150093a055b4f90bf33666ab796c SHA1 752fe9e05ce1380af9a44bf5e81a56dc00f36506 SHA256 f4cf5511cca3007b735cf98871ee72442c6bf677be63349058d1bb029a4b1abf
 EBUILD calculate-lib-9999.ebuild 476 RMD160 e510e0aa98b7f6da9acc37197073cac0d5d6a47f SHA1 393c416fcfd77d6c05aea8932a7a1e3805aa926d SHA256 a9eee592ec352db7852e93ad33249072307051d3bda6cfdcd034ea9b96747578
--- a/sys-apps/calculate-lib/calculate-lib-2.2.1-r2.ebuild
+++ b/sys-apps/calculate-lib/calculate-lib-2.2.1-r2.ebuild
@ -29,5 +29,7 @@ src_unpack() {

 	# resolution fix patch
 	epatch "${FILESDIR}/calculate-lib-2.2.1-fix_resolution.patch"
+	# getversion fix patch
+	epatch "${FILESDIR}/calculate-lib-2.2.1-fix_getversion.patch"
 }

--- a/sys-apps/calculate-lib/files/calculate-lib-2.2.1-fix_getversion.patch
+++ b/sys-apps/calculate-lib/files/calculate-lib-2.2.1-fix_getversion.patch
@ -0,0 +1,16 @@
+diff --git a/pym/cl_vars_share.py b/pym/cl_vars_share.py
+index 8bfcf0d..347fc39 100644
+--- a/pym/cl_vars_share.py
+++ b/pym/cl_vars_share.py
+@@ -456,8 +456,9 @@ class varsShare:
+         pkgInfoDir = path.join(systemroot,'var/db/pkg/app-misc/')
+         if not os.access(pkgInfoDir,os.R_OK):
+             return None
+-        metaPkgs = filter(lambda x:"calculate-meta" in x,
+-                          os.listdir(pkgInfoDir))
+        metaPkgs = sorted(filter(lambda x:"calculate-meta" in x or \
+                                 "%s-meta"%shortname.lower() in x,
+                          os.listdir(pkgInfoDir)))
+         if metaPkgs:
+             reFindVer = re.compile("(?<=\-)\d+\.?\d*\.?\d*")
+             findVer = reFindVer.search(metaPkgs[0])