diff options
| author |   Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2011-03-05 23:46:44 +0000 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2011-03-05 23:46:44 +0000 |
| commit | 3cb5f7b2454975f59969490f5c94e5e89c289737 (patch) | |
| tree | 066b9e373b0554a85a9326c45ec4004531085aa4 /app-arch | |
| parent | Set SUPPORT_PYTHON_ABIS (bug #308299). (diff) | |
| download | historical-3cb5f7b2454975f59969490f5c94e5e89c289737.tar.gz historical-3cb5f7b2454975f59969490f5c94e5e89c289737.tar.bz2 historical-3cb5f7b2454975f59969490f5c94e5e89c289737.zip | |
Fix md5 deprecation warning (bug #308299).
Package-Manager: portage-2.2.0_alpha26_p6/cvs/Linux x86_64
Diffstat (limited to 'app-arch')
| -rw-r--r-- | app-arch/ipkg-utils/ChangeLog | 6 | ||||
| -rw-r--r-- | app-arch/ipkg-utils/Manifest | 5 | ||||
| -rw-r--r-- | app-arch/ipkg-utils/files/ipkg-utils-1.7.050831-hashlib.patch | 30 | ||||
| -rw-r--r-- | app-arch/ipkg-utils/ipkg-utils-1.7.050831-r1.ebuild | 3 |
4 files changed, 40 insertions, 4 deletions
diff --git a/app-arch/ipkg-utils/ChangeLog b/app-arch/ipkg-utils/ChangeLog index 04af918740c5..a82ea5f4b60b 100644 --- a/app-arch/ipkg-utils/ChangeLog +++ b/app-arch/ipkg-utils/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-arch/ipkg-utils # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/ipkg-utils/ChangeLog,v 1.16 2011/03/05 23:42:42 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/ipkg-utils/ChangeLog,v 1.17 2011/03/05 23:46:44 arfrever Exp $ + + 05 Mar 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + ipkg-utils-1.7.050831-r1.ebuild, +files/ipkg-utils-1.7.050831-hashlib.patch: + Fix md5 deprecation warning (bug #308299). 05 Mar 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> ipkg-utils-1.7.050831-r1.ebuild: diff --git a/app-arch/ipkg-utils/Manifest b/app-arch/ipkg-utils/Manifest index 43826176dca3..891da5325b3a 100644 --- a/app-arch/ipkg-utils/Manifest +++ b/app-arch/ipkg-utils/Manifest @@ -1,5 +1,6 @@ +AUX ipkg-utils-1.7.050831-hashlib.patch 614 RMD160 25ea191b1200db7235e841e42b9266ebc7444ca1 SHA1 dfc7cd65321231c4677b3d9ddf1b907ea9d6ef78 SHA256 1f4dc0c84d080b3c89fbd956eb1d5e1fc7db2b1fd7ead0e237b8a7858fcfb35c AUX ipkg-utils-tar_call_fixes.patch 1500 RMD160 de9d8e70009557549c6a392bdd98707c396e48a5 SHA1 05982c834337dbdd7b5bb14b772b5f1a8cf16d03 SHA256 b0183d519f886056d7f79b65182aaed557d5e86e8f5d7a3911235e661d40e79d DIST ipkg-utils-050831.tar.gz 29175 RMD160 0b41d3afa907013f105f704afe9327ddeda360b3 SHA1 482be22bca16fa7c04769ff39be7e43c348a6242 SHA256 1dde1111fbca85977855db9acb557097a32a5133d8764a05ea36a89a1205394b -EBUILD ipkg-utils-1.7.050831-r1.ebuild 1493 RMD160 e830c75ba39372aac07d55620b22486767396fb6 SHA1 5afc4bd4c6ce57446d095abb7d91c406a1e39fd7 SHA256 389b96d4b087df0630671f90042417914e2ae18424e098de1ab382d4e698a9ea -MISC ChangeLog 2534 RMD160 69263236d93284a08868979a167b993bff30169d SHA1 ea9705c17295fcbb70cb8471d9510a9bf84a9b64 SHA256 eb7bcd3709005f24e16a32189c99e79ea0b40efeaa56d4dd524bc36ddac8f198 +EBUILD ipkg-utils-1.7.050831-r1.ebuild 1534 RMD160 686a01a7c37b8a1d5b28334618915019dfe2cd72 SHA1 1b9a01ca6e7b207a2428b6fe36c573d60ea530ea SHA256 daf4d8ce3dfbd3b19fd9e73c75e4d328849341f39d792faca23502e2caade206 +MISC ChangeLog 2732 RMD160 f34f0f98649c1e5ca89775222ab2f7dfa99a93aa SHA1 785cf99ddf0f445a6d1516daf7f966bc6a3a04e0 SHA256 3561bb3285c3826ac6d56999c6c67f863d843c0f29ad8ef5bb0eda1a13343827 MISC metadata.xml 406 RMD160 8caf88a3ed6fe490eaeeb3bf02940395e66e0a64 SHA1 4d55723984344e72b6d93b4909b76b442ffd4e18 SHA256 ff09e957f4b18db1b1fc25423b48770381405db809185fa97bd4289560bbbede diff --git a/app-arch/ipkg-utils/files/ipkg-utils-1.7.050831-hashlib.patch b/app-arch/ipkg-utils/files/ipkg-utils-1.7.050831-hashlib.patch new file mode 100644 index 000000000000..e7cdf2de8c82 --- /dev/null +++ b/app-arch/ipkg-utils/files/ipkg-utils-1.7.050831-hashlib.patch @@ -0,0 +1,30 @@ +--- ipkg.py ++++ ipkg.py +@@ -36,12 +36,17 @@ + import os + import sys + import glob +-import md5 + import re + import string + import commands + from stat import ST_SIZE + ++try: ++ from hashlib import md5 ++except ImportError: ++ import md5 ++ md5 = md5.new ++ + class Version: + """A class for holding parsed package version information.""" + def __init__(self, epoch, version): +@@ -136,7 +141,7 @@ + + # compute the MD5. + f = open(fn, "r") +- sum = md5.new() ++ sum = md5() + while 1: + data = f.read(1024) + if not data: break diff --git a/app-arch/ipkg-utils/ipkg-utils-1.7.050831-r1.ebuild b/app-arch/ipkg-utils/ipkg-utils-1.7.050831-r1.ebuild index 5a40a361ab77..192841f4375a 100644 --- a/app-arch/ipkg-utils/ipkg-utils-1.7.050831-r1.ebuild +++ b/app-arch/ipkg-utils/ipkg-utils-1.7.050831-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/ipkg-utils/ipkg-utils-1.7.050831-r1.ebuild,v 1.3 2011/03/05 23:42:42 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/ipkg-utils/ipkg-utils-1.7.050831-r1.ebuild,v 1.4 2011/03/05 23:46:44 arfrever Exp $ EAPI="3" PYTHON_DEPEND="2" @@ -32,6 +32,7 @@ PYTHON_MODNAME="ipkg.py" src_prepare() { epatch "${FILESDIR}/${PN}-tar_call_fixes.patch" + epatch "${FILESDIR}/${P}-hashlib.patch" sed '/python setup.py build/d' -i Makefile |