diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /app-arch/ipkg-utils/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'app-arch/ipkg-utils/files')
-rw-r--r-- | app-arch/ipkg-utils/files/ipkg-utils-1.7.050831-hashlib.patch | 30 | ||||
-rw-r--r-- | app-arch/ipkg-utils/files/ipkg-utils-tar_call_fixes.patch | 28 |
2 files changed, 58 insertions, 0 deletions
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/files/ipkg-utils-tar_call_fixes.patch b/app-arch/ipkg-utils/files/ipkg-utils-tar_call_fixes.patch new file mode 100644 index 000000000000..da1e02b4fddb --- /dev/null +++ b/app-arch/ipkg-utils/files/ipkg-utils-tar_call_fixes.patch @@ -0,0 +1,28 @@ +Index: ipkg-utils-050831/ipkg.py +=================================================================== +--- ipkg-utils-050831/ipkg.py {cset c946c633-8984-433c-8beb-a6cf3926b0af} ++++ ipkg-utils-050831/ipkg.py {local clone} +@@ -152,9 +152,9 @@ class Package: + self.filename = os.path.basename(fn) + ## sys.stderr.write(" extracting control.tar.gz from %s\n"% (fn,)) + if self.isdeb: +- control = os.popen("ar p "+fn+" control.tar.gz | tar xfzO - '*control'","r") ++ control = os.popen("ar p "+fn+" control.tar.gz | gtar xfzO - --wildcards '*control'","r") + else: +- control = os.popen("tar xfzO "+fn+" '*control.tar.gz' | tar xfzO - '*control'","r") ++ control = os.popen("gtar xfzO "+fn+" --wildcards '*control.tar.gz' | gtar xfzO - --wildcards '*control'","r") + line = control.readline() + while 1: + if not line: break +@@ -181,7 +181,7 @@ class Package: + if self.isdeb: + data = os.popen("ar p "+fn+" data.tar.gz | tar tfz -","r") + else: +- data = os.popen("tar xfzO "+fn+" '*data.tar.gz' | tar tfz -","r") ++ data = os.popen("gtar xfzO "+fn+" --wildcards '*data.tar.gz' | gtar tfz -","r") + while 1: + line = data.readline() + if not line: break +# Checksums: MD5 +# 3b32292e44cc49af1d6c599fd8a44fb8 ipkg.py +# a103926695d45fe3c6d08a841ed6cd99 ipkg.py [diff] |